dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: merge 165_bug_pipeline_log_message_says_archived_instead_of_done

Browse Source
This commit is contained in:
Dave
2026-02-24 18:38:13 +00:00
parent 3fc886a271
commit 7b3853bad0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/http/mcp.rs
View File

@@ -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 {