feat: restore previous permission mode when exiting plan mode (#866)

2026-02-08 21:10:21 -06:00
parent 89ace569d7
commit f5c143ec74
3 changed files with 58 additions and 3 deletions
--- a/src/cli/App.tsx
+++ b/src/cli/App.tsx
@@ -9559,9 +9559,11 @@ ${SYSTEM_REMINDER_CLOSE}
      lastPlanFilePathRef.current = planFilePath;

      // Exit plan mode
-      const newMode = acceptEdits ? "acceptEdits" : "default";
-      permissionMode.setMode(newMode);
-      setUiPermissionMode(newMode);
+      const restoreMode = acceptEdits
+        ? "acceptEdits"
+        : (permissionMode.getModeBeforePlan() ?? "default");
+      permissionMode.setMode(restoreMode);
+      setUiPermissionMode(restoreMode);

      try {
        // Execute ExitPlanMode tool to get the result