Let the agent stop a merge for review after substantive conflict fixes

This commit is contained in:
Ian Gulliver
2026-10-15 19:36:42 -07:00
parent a2067c2ba0
commit 55b6a32263
7 changed files with 59 additions and 8 deletions
+1 -1
View File
@@ -514,7 +514,7 @@ func (m *Manager) ensureLive(ctx context.Context, sess api.AgentSession, task ap
if err != nil {
return nil, err
}
tools := []mcp.Tool{m.askTool(l), m.cancelQuestionTool(l), m.createTaskTool(l), m.setMergeTitleTool(l), m.exposePortTool(l)}
tools := []mcp.Tool{m.askTool(l), m.cancelQuestionTool(l), m.createTaskTool(l), m.setMergeTitleTool(l), m.stopMergeTool(l), m.exposePortTool(l)}
env := portEnv(task)
stdio := []mcp.Stdio{}
if sess.Role == api.Reviewer {