huskies: merge 1036

server/src/agents/pool/auto_assign/merge.rs

@@ -40,6 +40,7 @@ impl AgentPool {
             commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
             claim: None,
             retries: 0,
+            server_start_time: None,
         };
         let merge_items = scan_stage_items(&merge_stage);
         for story_id in &merge_items {

server/src/agents/pool/auto_assign/merge_failure_block_subscriber.rs

@@ -187,6 +187,7 @@ mod tests {
                 commits_ahead: NonZeroU32::new(1).unwrap(),
                 claim: None,
                 retries: 0,
+                server_start_time: None,
             },
             after: Stage::MergeFailure {
                 kind: kind.clone(),

server/src/agents/pool/auto_assign/merge_failure_subscriber.rs

@@ -162,6 +162,7 @@ mod tests {
                 commits_ahead: NonZeroU32::new(1).unwrap(),
                 claim: None,
                 retries: 0,
+                server_start_time: None,
             },
             after: crate::pipeline_state::Stage::MergeFailure {
                 kind: kind.clone(),