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

story-kit: merge 119_story_mergemaster_should_resolve_merge_conflicts_instead_of_leaving_conflict_markers_on_master

Browse Source
This commit is contained in:
Dave
2026-02-23 23:22:24 +00:00
parent 52e1db789a
commit b928eace9c
3 changed files with 741 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1399,10 +1399,12 @@ async fn tool_merge_agent_work(args: &Value, ctx: &AppContext) -> Result<String,
let project_root = ctx.agents.get_project_root(&ctx.state)?;
let report = ctx.agents.merge_agent_work(&project_root, story_id).await?;
let status_msg = if report.success && report.gates_passed {
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."
} else if report.success && report.gates_passed {
"Merge complete: all quality gates passed. Story archived and worktree cleaned up."
} else if report.had_conflicts {
"Merge failed: conflicts detected. Merge was aborted. Resolve conflicts manually and retry."
} 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 {
"Merge committed but quality gates failed. Review gate_output and fix issues before re-running."
} else {
@@ -1414,6 +1416,7 @@ async fn tool_merge_agent_work(args: &Value, ctx: &AppContext) -> Result<String,
"agent_name": agent_name,
"success": report.success,
"had_conflicts": report.had_conflicts,
"conflicts_resolved": report.conflicts_resolved,
"conflict_details": report.conflict_details,
"gates_passed": report.gates_passed,
"gate_output": report.gate_output,