huskies: merge 974

server/src/agents/lifecycle.rs

@@ -344,6 +344,8 @@ fn map_stage_move_to_event(
         (Stage::MergeFailure { .. }, "current") => Ok(PipelineEvent::FixupRequested),
         // Story 972: send MergeFailure story back to Qa for a QA agent to re-review.
         (Stage::MergeFailure { .. }, "qa") => Ok(PipelineEvent::ReQueuedForQa),
+        // Story 974: reopen a Done story for a post-merge hotfix.
+        (Stage::Done { .. }, "current") => Ok(PipelineEvent::HotfixRequested),
         (
             Stage::Archived {
                 reason: ArchiveReason::Blocked { .. },
@@ -809,6 +811,61 @@ mod tests {
         );
     }
 
+    // ── Story 974: Done → Coding hotfix tests ────────────────────────────────
+
+    /// AC1 (story 974): move_story_to_stage to "current" from Done succeeds
+    /// and lands the story in Coding stage so auto-assign can pick it up.
+    #[test]
+    fn move_story_to_stage_from_done_lands_in_coding() {
+        crate::crdt_state::init_for_test();
+        crate::db::ensure_content_store();
+
+        let story_id = "99974_story_hotfix_done_to_coding";
+        crate::db::write_item_with_content(
+            story_id,
+            "done",
+            "---\nname: Hotfix Test\n---\n",
+            crate::db::ItemMeta::named("Hotfix Test"),
+        );
+
+        move_story_to_stage(story_id, "current").expect("move from Done to Coding must succeed");
+
+        let item = crate::pipeline_state::read_typed(story_id)
+            .expect("CRDT read must succeed")
+            .expect("item must exist");
+        assert_eq!(
+            item.stage.dir_name(),
+            "coding",
+            "story must be in coding after hotfix move"
+        );
+    }
+
+    /// AC1 (story 974): retry_count is reset to 0 after Done→Coding so the
+    /// fresh coder session starts clean.
+    #[test]
+    fn move_story_from_done_to_coding_resets_retry_count() {
+        crate::crdt_state::init_for_test();
+        crate::db::ensure_content_store();
+
+        let story_id = "99975_story_hotfix_retry_count";
+        crate::db::write_item_with_content(
+            story_id,
+            "done",
+            "---\nname: Hotfix Retry Count\n---\n",
+            crate::db::ItemMeta::named("Hotfix Retry Count"),
+        );
+
+        move_story_to_stage(story_id, "current").expect("move from Done to Coding must succeed");
+
+        let retry_count = crate::crdt_state::read_item(story_id)
+            .expect("CRDT item must exist")
+            .retry_count();
+        assert_eq!(
+            retry_count, 0,
+            "retry_count must be 0 after hotfix move so coder starts fresh"
+        );
+    }
+
     /// Bug 226: feature_branch_has_unmerged_changes returns false when no
     /// feature branch exists.
     #[test]