Reduce agent eagerness to re-enter plan mode mid-task

Author: charlesvien

packages/agent/src/adapters/claude/session/instructions.ts

@@ -0,0 +1,19 @@
+const BRANCH_NAMING = `
+# Branch Naming
+
+When working in a detached HEAD state, create a descriptive branch name based on the work being done before committing. Do this automatically without asking the user.
+`;
+
+const PLAN_MODE = `
+# Plan Mode
+
+Only enter plan mode (EnterPlanMode) when the user is requesting a significant change in approach or direction mid-task. Do NOT enter plan mode for:
+- Confirmations or approvals ("yes", "looks good", "continue", "go ahead")
+- Minor clarifications or small adjustments
+- Answers to questions you asked (unless you are still in the initial planning phase and have not yet started executing)
+- Feedback that does not require replanning
+
+When in doubt, continue executing and incorporate the feedback inline.
+`;
+
+export const APPENDED_INSTRUCTIONS = BRANCH_NAMING + PLAN_MODE;

packages/agent/src/adapters/claude/session/options.ts

@@ -17,6 +17,7 @@ import {
   type OnModeChange,
 } from "../hooks.js";
 import type { CodeExecutionMode } from "../tools.js";
+import { APPENDED_INSTRUCTIONS } from "./instructions.js";
 import { DEFAULT_MODEL } from "./models.js";
 import type { SettingsManager } from "./settings.js";
 
@@ -45,27 +46,22 @@ export interface BuildOptionsParams {
   onProcessExited?: (pid: number) => void;
 }
 
-const BRANCH_NAMING_INSTRUCTIONS = `
-# Branch Naming
-
-When working in a detached HEAD state, create a descriptive branch name based on the work being done before committing. Do this automatically without asking the user.
-`;
 
 export function buildSystemPrompt(
   customPrompt?: unknown,
 ): Options["systemPrompt"] {
   const defaultPrompt: Options["systemPrompt"] = {
     type: "preset",
     preset: "claude_code",
-    append: BRANCH_NAMING_INSTRUCTIONS,
+    append: APPENDED_INSTRUCTIONS,
   };
 
   if (!customPrompt) {
     return defaultPrompt;
   }
 
   if (typeof customPrompt === "string") {
-    return customPrompt + BRANCH_NAMING_INSTRUCTIONS;
+    return customPrompt + APPENDED_INSTRUCTIONS;
   }
 
   if (
@@ -76,7 +72,7 @@ export function buildSystemPrompt(
   ) {
     return {
       ...defaultPrompt,
-      append: customPrompt.append + BRANCH_NAMING_INSTRUCTIONS,
+      append: customPrompt.append + APPENDED_INSTRUCTIONS,
     };
   }