feat(plan): support annotating plans with feedback for iteration

docs/cli/plan-mode.md

@@ -111,6 +111,10 @@ structure, and consultation level are proportional to the task's complexity:
       [preferred external editor]. This allows you to manually refine the plan
       steps before approval. The CLI will automatically refresh and show the
       updated plan after you save and close the editor.
+    - **Review edits:** If you added inline annotations or feedback for the
+      agent to consider in the plan file, you can select the **"No, review plan
+      edits as feedback"** option to send the plan back to the agent for
+      iteration.
 
 For more complex or specialized planning tasks, you can
 [customize the planning workflow with skills](#customizing-planning-with-skills).

packages/cli/src/ui/components/ExitPlanModeDialog.test.tsx

@@ -235,6 +235,28 @@ Implement a comprehensive authentication system with multiple providers.
         });
       });
 
+      it('calls onFeedback with the review message when Review is selected', async () => {
+        const { stdin, lastFrame } = renderDialog({ useAlternateBuffer });
+
+        await act(async () => {
+          vi.runAllTimers();
+        });
+
+        await waitFor(() => {
+          expect(lastFrame()).toContain('Add user authentication');
+        });
+
+        writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\r');
+
+        await waitFor(() => {
+          expect(onFeedback).toHaveBeenCalledWith(
+            'I have annotated the plan with feedback. Please review the edited plan file and update the plan accordingly.',
+          );
+        });
+      });
+
       it('calls onFeedback when feedback is typed and submitted', async () => {
         const { stdin, lastFrame } = renderDialog({ useAlternateBuffer });
 
@@ -249,6 +271,7 @@ Implement a comprehensive authentication system with multiple providers.
         // Navigate to feedback option
         writeKey(stdin, '\x1b[B'); // Down arrow
         writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\x1b[B'); // Down arrow
 
         // Type feedback
         for (const char of 'Add tests') {
@@ -376,6 +399,7 @@ Implement a comprehensive authentication system with multiple providers.
         // Navigate to feedback option and start typing
         writeKey(stdin, '\x1b[B'); // Down arrow
         writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\x1b[B'); // Down arrow
         writeKey(stdin, '\r'); // Select to focus input
 
         // Type some feedback
@@ -460,6 +484,7 @@ Implement a comprehensive authentication system with multiple providers.
         // Navigate to feedback option
         writeKey(stdin, '\x1b[B'); // Down arrow
         writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\x1b[B'); // Down arrow
 
         // Type some feedback
         for (const char of 'test') {
@@ -501,6 +526,7 @@ Implement a comprehensive authentication system with multiple providers.
         // Navigate to feedback option
         writeKey(stdin, '\x1b[B'); // Down arrow
         writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\x1b[B'); // Down arrow
 
         // Press Enter without typing anything
         writeKey(stdin, '\r');
@@ -528,6 +554,7 @@ Implement a comprehensive authentication system with multiple providers.
         // Navigate to feedback option and start typing
         writeKey(stdin, '\x1b[B'); // Down arrow
         writeKey(stdin, '\x1b[B'); // Down arrow
+        writeKey(stdin, '\x1b[B'); // Down arrow
 
         // Type some feedback
         for (const char of 'test') {
@@ -536,6 +563,7 @@ Implement a comprehensive authentication system with multiple providers.
 
         // Now use up arrow to navigate back to a different option
         writeKey(stdin, '\x1b[A'); // Up arrow
+        writeKey(stdin, '\x1b[A'); // Up arrow
 
         // Press Enter to select the second option (manually accept edits)
         writeKey(stdin, '\r');

packages/cli/src/ui/components/ExitPlanModeDialog.tsx

@@ -51,6 +51,7 @@ interface PlanContentState {
 enum ApprovalOption {
   Auto = 'Yes, automatically accept edits',
   Manual = 'Yes, manually accept edits',
+  Review = 'No, review plan edits as feedback',
 }
 
 /**
@@ -240,6 +241,11 @@ export const ExitPlanModeDialog: React.FC<ExitPlanModeDialogProps> = ({
                 description:
                   'Approves plan but requires confirmation for each tool',
               },
+              {
+                label: ApprovalOption.Review,
+                description:
+                  'Return plan with annotations to the agent for iteration',
+              },
             ],
             placeholder: 'Type your feedback...',
             multiSelect: false,
@@ -251,6 +257,10 @@ export const ExitPlanModeDialog: React.FC<ExitPlanModeDialogProps> = ({
             onApprove(ApprovalMode.AUTO_EDIT);
           } else if (answer === ApprovalOption.Manual) {
             onApprove(ApprovalMode.DEFAULT);
+          } else if (answer === ApprovalOption.Review) {
+            onFeedback(
+              'I have annotated the plan with feedback. Please review the edited plan file and update the plan accordingly.',
+            );
           } else if (answer) {
             onFeedback(answer);
           }

packages/cli/src/ui/components/__snapshots__/ExitPlanModeDialog.test.tsx.snap

@@ -17,11 +17,14 @@ Files to Modify
  - src/index.ts - Add auth middleware
  - src/config.ts - Add auth configuration options
 
+▲
   1.  Yes, automatically accept edits
       Approves plan and allows tools to run automatically
 ● 2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+▼
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -44,11 +47,14 @@ Files to Modify
  - src/index.ts - Add auth middleware
  - src/config.ts - Add auth configuration options
 
+▲
 ● 1.  Yes, automatically accept edits
       Approves plan and allows tools to run automatically
   2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+▼
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -76,11 +82,14 @@ Implementation Steps
  8. Add multi-factor authentication in src/auth/MFAService.ts
 ... last 22 lines hidden (Ctrl+O to show) ...
 
+▲
 ● 1.  Yes, automatically accept edits
       Approves plan and allows tools to run automatically
   2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+▼
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -103,11 +112,14 @@ Files to Modify
  - src/index.ts - Add auth middleware
  - src/config.ts - Add auth configuration options
 
+▲
 ● 1.  Yes, automatically accept edits
       Approves plan and allows tools to run automatically
   2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+▼
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -134,7 +146,9 @@ Files to Modify
       Approves plan and allows tools to run automatically
 ● 2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+  4.  Type your feedback...
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -161,7 +175,9 @@ Files to Modify
       Approves plan and allows tools to run automatically
   2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+  4.  Type your feedback...
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -214,7 +230,9 @@ Testing Strategy
       Approves plan and allows tools to run automatically
   2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+  4.  Type your feedback...
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "
@@ -241,7 +259,9 @@ Files to Modify
       Approves plan and allows tools to run automatically
   2.  Yes, manually accept edits
       Approves plan but requires confirmation for each tool
-  3.  Type your feedback...
+  3.  No, review plan edits as feedback
+      Return plan with annotations to the agent for iteration
+  4.  Type your feedback...
 
 Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel
 "

packages/cli/src/ui/components/__snapshots__/ToolConfirmationQueue.test.tsx.snap

@@ -83,7 +83,9 @@ exports[`ToolConfirmationQueue > renders ExitPlanMode tool confirmation with Suc
 │       Approves plan and allows tools to run automatically                    │
 │   2.  Yes, manually accept edits                                             │
 │       Approves plan but requires confirmation for each tool                  │
-│   3.  Type your feedback...                                                  │
+│   3.  No, review plan edits as feedback                                      │
+│       Return plan with annotations to the agent for iteration                │
+│   4.  Type your feedback...                                                  │
 │                                                                              │
 │ Enter to select · ↑/↓ to navigate · Ctrl+X to edit plan · Esc to cancel      │
 ╰──────────────────────────────────────────────────────────────────────────────╯