huskies: merge 945

server/src/agents/pool/start/spawn.rs

@@ -574,7 +574,11 @@ pub(super) async fn run_agent_spawn(
                     }
                 };
                 if is_genuine {
-                    crate::crdt_state::set_mergemaster_attempted(&sid, true);
+                    let _ = crate::pipeline_state::apply_transition_str(
+                        &sid,
+                        crate::pipeline_state::PipelineEvent::MergemasterAttempted,
+                        None,
+                    );
                 }
                 let _ = tx_done.send(AgentEvent::Done {
                     story_id: sid.clone(),

server/src/agents/pool/start/tests_selection.rs

@@ -293,7 +293,6 @@ stage = "coder"
         None,
         None,
         None,
-        None,
     );
 
     let pool = AgentPool::new_test(3011);