feat(plan): add "Yes, restore previous mode" option when exiting plan mode#3008
Merged
Conversation
… mode When exiting plan mode, users previously had no way to restore their original approval mode (e.g. YOLO). Add a new default option that restores the pre-plan approval mode, with a dynamic label showing which mode will be restored. Closes #3002
Contributor
📋 Review SummaryThis PR implements a "Restore Previous Mode" option when exiting plan mode, allowing users to return to their pre-plan approval mode (e.g., YOLO, AUTO_EDIT). The implementation is well-structured with comprehensive test coverage and proper i18n support across 6 locales. 🔍 General Feedback
🎯 Specific Feedback🟡 High
🟢 Medium
🔵 Low
✅ Highlights
|
Contributor
Code Coverage Summary
CLI Package - Full Text ReportCore Package - Full Text ReportFor detailed HTML reports, please see the 'coverage-reports-22.x-ubuntu-latest' artifact from the main CI run. |
Collaborator
Author
|
Demo： |
Collaborator
Author
What this PR doesWhen exiting plan mode, the approval dialog previously offered 3 options — none of which could restore the user's original mode (e.g., YOLO → plan → ???). This PR adds a 4th option "Yes, restore previous mode (xxx)" as the default selection, using the existing The 4 options are now:
Key changes:
Manual testingTested locally by building and running qwen-code in YOLO mode:
Unit test resultsAll 22 tests pass, including 4 new tests for TypeScript compiles clean, build succeeds. |
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a new default confirmation option when exiting plan mode to restore the approval mode that was active before entering plan mode (e.g., yolo / auto-edit / default), addressing the inability for YOLO users to easily return to YOLO after approving a plan.
Changes:
- Adds
ToolConfirmationOutcome.RestorePreviousand passesprePlanModethrough plan confirmation details. - Implements
RestorePrevioushandling inexit_plan_modeand updates CLI + ACP/WebUI option lists to include it as the first/default choice. - Adds i18n strings for the new option and expands exit-plan-mode test coverage.
Reviewed changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| packages/core/src/tools/tools.ts | Extends plan confirmation details with prePlanMode and introduces RestorePrevious outcome. |
| packages/core/src/tools/exitPlanMode.ts | Implements restore-previous behavior when confirming plan exit. |
| packages/core/src/tools/exitPlanMode.test.ts | Adds tests for restoring pre-plan mode and for including prePlanMode in details. |
| packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx | Adds the new “restore previous mode” option as the first/default CLI selection. |
| packages/cli/src/acp-integration/session/permissionUtils.ts | Adds the new option to ACP permission options for plan confirmations. |
| packages/cli/src/acp-integration/session/Session.ts | Updates outcome exhaustiveness handling to include RestorePrevious. |
| packages/cli/src/i18n/locales/{en,de,ja,pt,ru,zh}.js | Adds translations for the new option label. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Add RestorePrevious to telemetry decision mapping as ACCEPT - Fix sendCurrentModeUpdateNotification to read actual mode for RestorePrevious instead of defaulting to 'default'
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 14 out of 14 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
tanzhenxin
approved these changes
Apr 9, 2026
tanzhenxin
left a comment
Collaborator
There was a problem hiding this comment.
Review — feat(plan): add "Yes, restore previous mode" option when exiting plan mode
Files changed: 14 (+142 / -0)
Core mechanism is correctly implemented — closure-based capture of prePlanMode avoids race conditions, good test coverage for the core logic, and clean integration with the existing ToolConfirmationOutcome enum. LGTM!
xaelistic
pushed a commit
to xaelistic/qwen-code
that referenced
this pull request
Jun 7, 2026
… mode (QwenLM#3008) * feat(plan): add "Yes, restore previous mode" option when exiting plan mode When exiting plan mode, users previously had no way to restore their original approval mode (e.g. YOLO). Add a new default option that restores the pre-plan approval mode, with a dynamic label showing which mode will be restored. Closes QwenLM#3002 * test: add fallback test for RestorePrevious when no prePlanMode recorded * fix: handle RestorePrevious in telemetry and ACP mode notification - Add RestorePrevious to telemetry decision mapping as ACCEPT - Fix sendCurrentModeUpdateNotification to read actual mode for RestorePrevious instead of defaulting to 'default' * test: add plan confirmation tests for RestorePrevious in permissionUtils
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
yolo,auto-edit,default)Changes
tools.ts: AddRestorePrevioustoToolConfirmationOutcomeenum; addprePlanModefield toToolPlanConfirmationDetailsexitPlanMode.ts: HandleRestorePreviousoutcome; passprePlanModeto confirmation detailsToolConfirmationMessage.tsx: Add new option as first (default) selectionpermissionUtils.ts: Add new option for ACP/WebUISession.ts: HandleRestorePreviousin exhaustive switchTest plan
RestorePreviousrestores YOLO when entered from YOLORestorePreviousrestores AUTO_EDIT when entered from AUTO_EDITprePlanModeis included in confirmation detailsProceedOncestill sets DEFAULT (unchanged)ProceedAlwaysstill sets AUTO_EDIT (unchanged)Closes #3002