huskies: merge 945

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

@@ -594,13 +594,15 @@ mod tests {
         )
         .unwrap();
         crate::db::ensure_content_store();
+        // Story 945: "blocked AND in 4_merge" is no longer representable as
+        // separate states.  A blocked story lives in `Stage::Blocked` (which
+        // maps to wire-form "blocked"), so auto-assign won't see it in 4_merge.
         crate::db::write_item_with_content(
             "9863_story_blocked_conflict",
-            "4_merge",
+            "blocked",
             "CONFLICT (content): foo.rs",
             crate::db::ItemMeta {
                 name: Some("Blocked conflict".to_string()),
-                blocked: Some(true),
                 ..Default::default()
             },
         );
@@ -633,13 +635,13 @@ mod tests {
         )
         .unwrap();
         crate::db::ensure_content_store();
+        // Story 945: "mergemaster attempted" is now `Stage::MergeFailureFinal`.
         crate::db::write_item_with_content(
             "9862_story_attempted",
-            "4_merge",
+            "merge_failure_final",
             "CONFLICT (content): foo.rs",
             crate::db::ItemMeta::named("Already tried"),
         );
-        crate::crdt_state::set_mergemaster_attempted("9862_story_attempted", true);
 
         let pool = AgentPool::new_test(3001);
         pool.auto_assign_available_work(tmp.path()).await;
@@ -712,16 +714,13 @@ mod tests {
         .unwrap();
         crate::crdt_state::init_for_test();
         crate::db::ensure_content_store();
-        // mergemaster_attempted is set by the exit path when genuine give-up occurs.
+        // Story 945: the genuine give-up state is now `Stage::MergeFailureFinal`.
         crate::db::write_item_with_content(
             "920_story_genuine",
-            "4_merge_failure",
+            "merge_failure_final",
             "CONFLICT (content): bar.rs",
             crate::db::ItemMeta::named("Genuine"),
         );
-        // The CRDT register is the sole authority; set it explicitly as the
-        // spawn exit path would after report_merge_failure.
-        crate::crdt_state::set_mergemaster_attempted("920_story_genuine", true);
 
         let pool = AgentPool::new_test(3001);
         pool.auto_assign_available_work(tmp.path()).await;