Merge pull request #2198 from acamq/feat/no-auto-commit-work-plan

feat(start-work): add auto_commit config option

src/hooks/atlas/atlas-hook.ts

@@ -7,6 +7,7 @@ import type { AtlasHookOptions, SessionState } from "./types"
 export function createAtlasHook(ctx: PluginInput, options?: AtlasHookOptions) {
   const sessions = new Map<string, SessionState>()
   const pendingFilePaths = new Map<string, string>()
+  const autoCommit = options?.autoCommit ?? true
 
   function getState(sessionID: string): SessionState {
     let state = sessions.get(sessionID)
@@ -20,6 +21,6 @@ export function createAtlasHook(ctx: PluginInput, options?: AtlasHookOptions) {
   return {
     handler: createAtlasEventHandler({ ctx, options, sessions, getState }),
     "tool.execute.before": createToolExecuteBeforeHandler({ ctx, pendingFilePaths }),
-    "tool.execute.after": createToolExecuteAfterHandler({ ctx, pendingFilePaths }),
+    "tool.execute.after": createToolExecuteAfterHandler({ ctx, pendingFilePaths, autoCommit }),
   }
 }

src/hooks/atlas/tool-execute-after.ts

@@ -14,9 +14,9 @@ import type { ToolExecuteAfterInput, ToolExecuteAfterOutput } from "./types"
 export function createToolExecuteAfterHandler(input: {
   ctx: PluginInput
   pendingFilePaths: Map<string, string>
-}): (toolInput: ToolExecuteAfterInput, toolOutput: ToolExecuteAfterOutput) => Promise<void> {
-  const { ctx, pendingFilePaths } = input
-
+  autoCommit: boolean
+  }): (toolInput: ToolExecuteAfterInput, toolOutput: ToolExecuteAfterOutput) => Promise<void> {
+  const { ctx, pendingFilePaths, autoCommit } = input
   return async (toolInput, toolOutput): Promise<void> => {
     // Guard against undefined output (e.g., from /review command - see issue #1035)
     if (!toolOutput) {
@@ -76,7 +76,7 @@ export function createToolExecuteAfterHandler(input: {
         // Preserve original subagent response - critical for debugging failed tasks
         const originalResponse = toolOutput.output
 
-        toolOutput.output = `
+toolOutput.output = `
 ## SUBAGENT WORK COMPLETED
 
 ${fileChanges}
@@ -88,9 +88,8 @@ ${fileChanges}
 ${originalResponse}
 
 <system-reminder>
-${buildOrchestratorReminder(boulderState.plan_name, progress, subagentSessionId)}
+${buildOrchestratorReminder(boulderState.plan_name, progress, subagentSessionId, autoCommit)}
 </system-reminder>`
-
         log(`[${HOOK_NAME}] Output transformed for orchestrator mode (boulder)`, {
           plan: boulderState.plan_name,
           progress: `${progress.completed}/${progress.total}`,

src/hooks/atlas/types.ts

@@ -8,6 +8,8 @@ export interface AtlasHookOptions {
   backgroundManager?: BackgroundManager
   isContinuationStopped?: (sessionID: string) => boolean
   agentOverrides?: AgentOverrides
+  /** Enable auto-commit after each atomic task completion (default: true) */
+  autoCommit?: boolean
 }
 
 export interface ToolExecuteAfterInput {

src/hooks/atlas/verification-reminders.ts

@@ -14,9 +14,22 @@ task(session_id="${sessionId}", prompt="fix: [describe the specific failure]")
 export function buildOrchestratorReminder(
   planName: string,
   progress: { total: number; completed: number },
-  sessionId: string
+  sessionId: string,
+  autoCommit: boolean = true
 ): string {
   const remaining = progress.total - progress.completed
+  
+  const commitStep = autoCommit
+    ? `
+**STEP 8: COMMIT ATOMIC UNIT**
+
+- Stage ONLY the verified changes
+- Commit with clear message describing what was done
+`
+    : ""
+
+  const nextStepNumber = autoCommit ? 9 : 8
+
   return `
 ---
 
@@ -60,13 +73,8 @@ Update the plan file \`.sisyphus/plans/${planName}.md\`:
 - Use \`Edit\` tool to modify the checkbox
 
 **DO THIS BEFORE ANYTHING ELSE. Unmarked = Untracked = Lost progress.**
-
-**STEP 8: COMMIT ATOMIC UNIT**
-
-- Stage ONLY the verified changes
-- Commit with clear message describing what was done
-
-**STEP 9: PROCEED TO NEXT TASK**
+${commitStep}
+**STEP ${nextStepNumber}: PROCEED TO NEXT TASK**
 
 - Read the plan file AGAIN to identify the next \`- [ ]\` task
 - Start immediately - DO NOT STOP