Merge pull request #2586 from nsalvacao/fix/exit-plan-mode-yolo-2522

fix(tools): exit_plan_mode now exits correctly in YOLO mode

Author: tanzhenxin

packages/core/src/tools/exitPlanMode.test.ts

@@ -240,4 +240,35 @@ describe('ExitPlanModeTool', () => {
       expect(tool.description).toContain('Help me implement yank mode for vim');
     });
   });
+
+  describe('YOLO mode', () => {
+    it('should exit plan mode without onConfirm being called when approval mode is YOLO', async () => {
+      // Simulate YOLO: scheduler sets approvalMode=YOLO but never calls onConfirm
+      approvalMode = ApprovalMode.YOLO;
+      const params: ExitPlanModeParams = { plan: 'YOLO test plan' };
+      const signal = new AbortController().signal;
+
+      const invocation = tool.build(params);
+      // Do NOT call onConfirm — this mirrors what the YOLO scheduler does
+      const result = await invocation.execute(signal);
+
+      expect(result.llmContent).toContain(
+        'User has approved your plan. You can now start coding',
+      );
+      expect(result.llmContent).not.toContain('not approved');
+    });
+
+    it('should not downgrade approval mode to AUTO_EDIT when YOLO', async () => {
+      approvalMode = ApprovalMode.YOLO;
+      const params: ExitPlanModeParams = { plan: 'YOLO test plan' };
+      const signal = new AbortController().signal;
+
+      const invocation = tool.build(params);
+      await invocation.execute(signal);
+
+      // Approval mode must remain YOLO — do not downgrade to AUTO_EDIT
+      expect(mockConfig.setApprovalMode).not.toHaveBeenCalled();
+      expect(approvalMode).toBe(ApprovalMode.YOLO);
+    });
+  });
 });

packages/core/src/tools/exitPlanMode.ts

@@ -133,7 +133,12 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
     const { plan } = this.params;
 
     try {
-      if (!this.wasApproved) {
+      // In YOLO mode the scheduler auto-approves without calling onConfirm(),
+      // so wasApproved stays false. Treat YOLO as implicit approval.
+      const isYolo = this.config.getApprovalMode() === ApprovalMode.YOLO;
+      const effectivelyApproved = this.wasApproved || isYolo;
+
+      if (!effectivelyApproved) {
         const rejectionMessage =
           'Plan execution was not approved. Remaining in plan mode.';
         return {