From 7b3853bad0e694f8bab2f1466a0d01ca0418cced Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Tue, 24 Feb 2026 18:38:13 +0000
Subject: [PATCH] story-kit: merge
 165_bug_pipeline_log_message_says_archived_instead_of_done

---
 server/src/agents.rs   | 6 +++---
 server/src/http/mcp.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/agents.rs b/server/src/agents.rs
index f7abc8f..f59b0ad 100644
--- a/server/src/agents.rs
+++ b/server/src/agents.rs
@@ -996,10 +996,10 @@ impl AgentPool {
 
                 if passed {
                     slog!(
-                        "[pipeline] Post-merge tests passed for '{story_id}'. Archiving."
+                        "[pipeline] Post-merge tests passed for '{story_id}'. Moving to done."
                     );
                     if let Err(e) = move_story_to_archived(&project_root, story_id) {
-                        slog_error!("[pipeline] Failed to archive '{story_id}': {e}");
+                        slog_error!("[pipeline] Failed to move '{story_id}' to done: {e}");
                     }
                     self.remove_agents_for_story(story_id);
                     // Mergemaster slot is now free — pick up any other items in 4_merge/.
@@ -1017,7 +1017,7 @@ impl AgentPool {
                     //     );
                     // }
                     slog!(
-                        "[pipeline] Story '{story_id}' archived. Worktree preserved for inspection."
+                        "[pipeline] Story '{story_id}' done. Worktree preserved for inspection."
                     );
                 } else {
                     slog!(
diff --git a/server/src/http/mcp.rs b/server/src/http/mcp.rs
index 7cb3f15..d1dce4d 100644
--- a/server/src/http/mcp.rs
+++ b/server/src/http/mcp.rs
@@ -1417,9 +1417,9 @@ async fn tool_merge_agent_work(args: &Value, ctx: &AppContext) -> Result<String,
     let report = ctx.agents.merge_agent_work(&project_root, story_id).await?;
 
     let status_msg = if report.success && report.gates_passed && report.conflicts_resolved {
-        "Merge complete: conflicts were auto-resolved and all quality gates passed. Story archived and worktree cleaned up."
+        "Merge complete: conflicts were auto-resolved and all quality gates passed. Story moved to done and worktree cleaned up."
     } else if report.success && report.gates_passed {
-        "Merge complete: all quality gates passed. Story archived and worktree cleaned up."
+        "Merge complete: all quality gates passed. Story moved to done and worktree cleaned up."
     } else if report.had_conflicts && !report.conflicts_resolved {
         "Merge failed: conflicts detected that could not be auto-resolved. Merge was aborted — master is untouched. Report the conflict details so the human can resolve them."
     } else if report.success && !report.gates_passed {