Remove plan mode from merge-ready UI

static/app.js

@@ -1555,7 +1555,6 @@ function initializeEventListeners() {
   const MODE_TOOLS = [
     { btnId: 'web-toggle-btn',  checkboxId: 'web-toggle',  stateKey: 'web' },
     { btnId: 'bash-toggle-btn', checkboxId: 'bash-toggle', stateKey: 'bash' },
-    { btnId: 'plan-toggle-btn', checkboxId: 'plan-toggle', stateKey: 'plan' },
   ];
 
   function _modeKey(stateKey, mode) { return `${stateKey}_${mode}`; }
@@ -1564,9 +1563,6 @@ function initializeEventListeners() {
     const state = loadToggleState();
     const key = _modeKey(stateKey, mode);
     if (Object.prototype.hasOwnProperty.call(state, key)) return !!state[key];
-    // Plan mode is opt-in: never default it on, otherwise every agent turn
-    // would be forced into planning.
-    if (stateKey === 'plan') return false;
     return mode === 'agent'; // default: ON in agent, OFF in chat
   }
 
@@ -1579,7 +1575,6 @@ function initializeEventListeners() {
   const TOOL_TOGGLE_TOAST_LABELS = {
     web: 'Web search',
     bash: 'Shell',
-    plan: 'Plan mode',
   };
 
   function showToolToggleToast(stateKey, active) {
@@ -1592,8 +1587,8 @@ function initializeEventListeners() {
     MODE_TOOLS.forEach(({ btnId, checkboxId, stateKey }) => {
       const btn = el(btnId);
       if (!btn) return;
-      // Hide bash and plan buttons in chat mode
-      if (mode === 'chat' && (stateKey === 'bash' || stateKey === 'plan')) {
+      // Hide bash button in chat mode
+      if (mode === 'chat' && stateKey === 'bash') {
         btn.style.display = 'none';
         return;
       }
@@ -1614,12 +1609,10 @@ function initializeEventListeners() {
     const state = loadToggleState();
     let currentMode = state.mode || 'chat';
 
-    // Immediately hide bash/plan buttons in chat mode on page load
+    // Immediately hide bash button in chat mode on page load
     if (currentMode === 'chat') {
       const bashBtn = el('bash-toggle-btn');
-      const planBtn = el('plan-toggle-btn');
       if (bashBtn) bashBtn.style.display = 'none';
-      if (planBtn) planBtn.style.display = 'none';
     }
 
     function setMode(mode) {
@@ -1710,79 +1703,6 @@ function initializeEventListeners() {
   setupToggle('web-toggle-btn', 'web-toggle', 'web');
   setupToggle('bash-toggle-btn', 'bash-toggle', 'bash');
   try { workspaceModule.initWorkspace(); } catch (_) {}
-  setupToggle('plan-toggle-btn', 'plan-toggle', 'plan');
-
-  // Set plan mode on/off directly (checkbox + button state + saved pref) WITHOUT
-  // going through the button's click handler — used by the plan menu and by the
-  // "Approve & Run" flow. Going through .click() would hit the plan-menu
-  // intercept below (a stored plan re-opens the menu instead of toggling), which
-  // is exactly the bug that left approved plans stuck in plan mode.
-  function _setPlanMode(on) {
-    const btn = el('plan-toggle-btn');
-    const chk = el('plan-toggle');
-    const mode = (loadToggleState().mode) || 'chat';
-    if (chk) chk.checked = !!on;
-    if (btn) { btn.classList.toggle('active', !!on); btn.setAttribute('aria-pressed', String(!!on)); }
-    saveToolPref('plan', mode, !!on);
-  }
-  window._setPlanMode = _setPlanMode;
-
-  // ── Plan-button menu ──
-  // When a plan exists for this chat, clicking the plan button opens a small
-  // menu (Show plan / Plan mode on-off) instead of plain-toggling — so the plan
-  // window can be re-opened and docked at any time while the agent works. With
-  // no plan, the button behaves as before (one-click toggle).
-  (function initPlanMenu() {
-    const planBtn = el('plan-toggle-btn');
-    if (!planBtn) return;
-    const _hasPlan = () => { try { return !!(window._getStoredPlan && window._getStoredPlan()); } catch (_) { return false; } };
-    const _close = () => { const m = document.getElementById('plan-menu'); if (m) m.remove(); };
-    function _open() {
-      _close();
-      const planChk = el('plan-toggle');
-      const on = !!(planChk && planChk.checked);
-      const menu = document.createElement('div');
-      menu.id = 'plan-menu';
-      menu.className = 'overflow-menu plan-menu';
-      menu.innerHTML =
-        '<button type="button" class="overflow-menu-item" data-act="show">'
-        + '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 11l3 3L22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/></svg>'
-        + '<span>Show plan</span></button>'
-        + '<button type="button" class="overflow-menu-item" data-act="toggle">'
-        + '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="9"/><path d="M12 7v5l3 2"/></svg>'
-        + '<span>Plan mode: ' + (on ? 'On' : 'Off') + '</span></button>';
-      document.body.appendChild(menu);
-      const r = planBtn.getBoundingClientRect();
-      menu.style.position = 'fixed';
-      menu.style.left = Math.round(r.left) + 'px';
-      menu.style.top = Math.round(r.top - menu.offsetHeight - 6) + 'px';
-      menu.querySelector('[data-act="show"]').addEventListener('click', () => {
-        _close();
-        const txt = window._getStoredPlan ? window._getStoredPlan() : '';
-        if (txt && window.planWindowModule) window.planWindowModule.openPlanWindow(txt, null);
-      });
-      menu.querySelector('[data-act="toggle"]').addEventListener('click', () => {
-        _close();
-        _setPlanMode(!on);   // flip state directly (no click → no menu re-open)
-      });
-      // Dismiss on any outside click (capture so it beats other handlers) / Escape.
-      setTimeout(() => {
-        const off = (e) => {
-          if (!menu.contains(e.target) && e.target !== planBtn) {
-            _close(); document.removeEventListener('click', off, true); document.removeEventListener('keydown', esc, true);
-          }
-        };
-        const esc = (e) => { if (e.key === 'Escape') { _close(); document.removeEventListener('click', off, true); document.removeEventListener('keydown', esc, true); } };
-        document.addEventListener('click', off, true);
-        document.addEventListener('keydown', esc, true);
-      }, 0);
-    }
-    planBtn.addEventListener('click', (e) => {
-      // With a stored plan, the button opens the menu (Show plan / toggle).
-      // Without one, it falls through to the normal one-click toggle.
-      if (_hasPlan()) { e.preventDefault(); e.stopImmediatePropagation(); _open(); }
-    }, true);  // capture phase: intercept before setupToggle's bubble handler
-  })();
 
   try { workspaceModule.initWorkspace(); } catch (_) {}
 

static/index.html

@@ -1084,12 +1084,6 @@
             <span style="font-size:11px;margin-left:2px;max-width:120px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;" id="workspace-indicator-name"></span>
             <svg class="tool-indicator-x" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg>
           </button>
-          <!-- Plan mode (investigate read-only, propose a plan to approve) -->
-          <button type="button" class="input-icon-btn" title="Plan mode — investigate read-only, then propose a plan to approve" id="plan-toggle-btn" data-mode-tool="true">
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-              <path d="M9 11l3 3L22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/>
-            </svg>
-          </button>
           <!-- RAG toolbar indicator (hidden until active) -->
           <button type="button" class="input-icon-btn tool-indicator" title="RAG active — click to deactivate" id="rag-indicator-btn" style="display:none;">
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
@@ -1138,7 +1132,6 @@
       <!-- Hidden checkboxes for state -->
       <input type="checkbox" id="web-toggle" style="display:none;">
       <input type="checkbox" id="bash-toggle" style="display:none;">
-      <input type="checkbox" id="plan-toggle" style="display:none;">
     </div>
     <form id="chat-form" autocomplete="off" action="javascript:void(0);" style="display:none;"></form>
 

static/js/slashCommands.js

@@ -1254,23 +1254,6 @@ async function _cmdWorkspace(args, ctx) {
   slashReply('Usage: <code>/workspace</code> · <code>set /path</code> · <code>clear</code> · <code>pick</code>');
   return true;
 }
-// Plan mode: drive the real toggle pill (#plan-toggle-btn) so its per-mode
-// persistence/UI logic runs. Only meaningful in agent mode.
-async function _cmdTogglePlan(args, ctx) {
-  const btn = document.getElementById('plan-toggle-btn');
-  const chk = document.getElementById('plan-toggle');
-  if (!btn || btn.style.display === 'none' || btn.offsetParent === null) {
-    slashReply('Plan mode is only available in agent mode — switch to Agent first.');
-    return true;
-  }
-  const cur = !!(chk && chk.checked);
-  const v = (args[0] || '').toLowerCase();
-  const target = v === 'on' ? true : v === 'off' ? false : !cur;
-  if (target !== cur) btn.click();
-  slashReply(`Plan mode: ${target ? 'on' : 'off'}`);
-  return true;
-}
-
 async function _cmdToggleShow(args, ctx) {
   const name = (args[0] || '').toLowerCase();
   const val = (args[1] || '').toLowerCase();
@@ -5782,13 +5765,6 @@ const COMMANDS = {
     noUserBubble: true,
     usage: '/workspace [set <path> | clear | pick]',
   },
-  plan: {
-    alias: [],
-    category: 'Quick toggles',
-    help: 'Toggle plan mode (agent)',
-    handler: _cmdTogglePlan,
-    usage: '/plan [on|off]',
-  },
   memory: {
     alias: ['m'],
     category: 'Memory',