@co0ontty/wand 1.18.1 → 1.20.4

package/dist/web-ui/content/scripts.js

@@ -167,6 +167,17 @@
             return false;
           }
         })(),
+        topbarMoreOpen: false,
+        gitStatus: null,
+        gitStatusSessionId: null,
+        gitStatusLoading: false,
+        gitStatusInflight: null,
+        gitStatusLastFetchAt: 0,
+        quickCommitOpen: false,
+        quickCommitSubmitting: false,
+        quickCommitGenerating: false,
+        quickCommitError: "",
+        quickCommitForm: { autoMessage: false, customMessage: "", makeTag: false, tag: "", push: false },
         chatAutoFollow: (function() {
           try {
             var saved = localStorage.getItem(CHAT_AUTO_FOLLOW_STORAGE_KEY);
@@ -182,6 +193,8 @@
         chatScrollHandler: null,
         lastForegroundSyncAt: 0,
         foregroundSyncTimer: null,
+        wsReconnectAttempts: 0,
+        wsReconnectTimer: null,
         currentMessages: [],
         lastRenderedHash: 0,
         lastRenderedMsgCount: 0,
@@ -802,14 +815,11 @@
 
       function updateInstallPrompt() {
         // 显示或隐藏菜单栏中的安装按钮
+        var visible = !!(state.showInstallPrompt && state.deferredPrompt);
         var installBtn = document.getElementById('pwa-install-button');
-        if (installBtn) {
-          if (state.showInstallPrompt && state.deferredPrompt) {
-            installBtn.classList.remove('hidden');
-          } else {
-            installBtn.classList.add('hidden');
-          }
-        }
+        if (installBtn) installBtn.classList.toggle('hidden', !visible);
+        var topbarInstallItem = document.getElementById('topbar-install-item');
+        if (topbarInstallItem) topbarInstallItem.classList.toggle('hidden', !visible);
       }
 
       function renderBootLoading() {
@@ -824,36 +834,48 @@
           '</div>';
       }
 
-      function scheduleForegroundSync(reason) {
+      function scheduleForegroundSync(reason, opts) {
         if (!state.config) return;
         if (document.hidden) return;
+        var immediate = opts && opts.immediate === true;
         var now = Date.now();
-        if (now - state.lastForegroundSyncAt < 1500) return;
+        // 节流只是为了防止 visibilitychange/focus/pageshow 在前台切换时
+        // 连珠炮式触发同一份重连工作，不再借此延迟实际同步——之前用
+        // 80ms 兜延迟的版本会在前台事件后再去 loadOutput 全量重写
+        // terminal，但 wterm cols 那时还没被 ResizeObserver 自适应到，
+        // 写进去的全是按错列宽排版的内容，结果"切回前台/刷新页面 →
+        // 中间一大段都看不到"反而成了常态。
+        if (!immediate && now - state.lastForegroundSyncAt < 1500) return;
         state.lastForegroundSyncAt = now;
         if (state.foregroundSyncTimer) {
           clearTimeout(state.foregroundSyncTimer);
-        }
-        state.foregroundSyncTimer = setTimeout(function() {
           state.foregroundSyncTimer = null;
-          syncOnForeground(reason);
-        }, 80);
+        }
+        syncOnForeground(reason, immediate);
       }
 
-      function syncOnForeground(reason) {
+      function syncOnForeground(reason, force) {
         if (!state.config) return Promise.resolve();
         if (document.hidden) return Promise.resolve();
-        if (!state.ws || (state.ws.readyState !== WebSocket.OPEN && state.ws.readyState !== WebSocket.CONNECTING)) {
+        // On Android resume the previous WS may still report OPEN/CONNECTING
+        // for a few seconds because the close frame hasn't been delivered
+        // yet (TCP keepalive / Doze suspended the network stack). Force a
+        // fresh socket so we don't sit on a zombie connection.
+        if (force) {
+          forceReconnectWebSocket("resume-force");
+        } else if (!state.ws || (state.ws.readyState !== WebSocket.OPEN && state.ws.readyState !== WebSocket.CONNECTING)) {
           initWebSocket();
         }
         if (state.claudeHistoryLoaded) {
           loadClaudeHistory();
         }
-        return loadSessions({ skipSelectedOutputReload: true }).then(function() {
-          if (state.selectedId) {
-            return loadOutput(state.selectedId);
-          }
-          scheduleChatRender(true);
-        }).catch(function(e) {
+        // 不再 loadOutput 当前会话——WS 重连后服务端会主动推一条 init
+        // 消息，那条路径已经走 ensureTerminalFitWithRetry 强制按真实
+        // cols 重排 history，足够覆盖前台恢复时的同步需求。这里多加
+        // 一次 fetch + syncTerminalBuffer 反而会在 ws/http 两路的 output
+        // 之间来回 reset，导致 alt-screen 中正在绘制的 Claude TUI 被
+        // 中途清掉。只把会话列表刷一下，保证状态条/会话名等元数据是新的。
+        return loadSessions({ skipSelectedOutputReload: true }).catch(function(e) {
           console.error("[wand] foreground sync failed:", reason, e);
         });
       }
@@ -863,8 +885,15 @@
         window.__wandForegroundSyncBound = true;
 
         document.addEventListener("visibilitychange", function() {
-          if (!document.hidden) {
+          if (document.hidden) {
+            // Stop the reconnect backoff while hidden — the OS may freeze
+            // timers and then deliver them in a burst when we resume,
+            // creating a thundering-herd of connect attempts. The resume
+            // event will trigger one decisive reconnect instead.
+            cancelWsReconnect();
+          } else {
             scheduleForegroundSync("visibility");
+            ensureTerminalFitWithRetry("visibility");
           }
         });
 
@@ -879,6 +908,18 @@
         window.addEventListener("resume", function() {
           scheduleForegroundSync("resume");
         });
+
+        // Bridge from Android WebView host: MainActivity.onResume() calls
+        // evaluateJavascript to dispatch this event, which is the only
+        // reliable foreground signal once Doze/process-suspension has
+        // frozen page-level events (visibilitychange/focus/pageshow may
+        // fire late or not at all after a long suspend). Force-reconnect
+        // and force-refit immediately rather than waiting for the
+        // throttled scheduleForegroundSync path.
+        window.addEventListener("wand-android-resume", function() {
+          scheduleForegroundSync("android-resume", { immediate: true });
+          ensureTerminalFitWithRetry("android-resume");
+        });
       }
 
       function restoreLoginSession() {
@@ -992,6 +1033,11 @@
             syncSessionModalUI();
           }
         }
+
+        // 初始加载或会话切换后惰性触发 git 状态拉取（loadGitStatus 自带节流）。
+        if (isLoggedIn && state.selectedId && state.gitStatusSessionId !== state.selectedId) {
+          loadGitStatus(state.selectedId);
+        }
       }
 
       function renderShortcutKeys() {
@@ -1172,12 +1218,39 @@
             '</aside>' +
             '<main class="main-content">' +
               '<div class="main-header-row">' +
-                '<button id="sessions-toggle-button" class="floating-sidebar-toggle' + (state.sessionsDrawerOpen ? ' active' : '') + '" aria-label="切换会话侧栏" type="button">' +
-                  '<span class="hamburger-icon">' +
-                    '<span></span><span></span><span></span>' +
-                  '</span>' +
-                '</button>' +
-                '<span class="current-task hidden" id="current-task"></span>' +
+                '<div class="topbar-left">' +
+                  '<button id="sessions-toggle-button" class="floating-sidebar-toggle' + (state.sessionsDrawerOpen ? ' active' : '') + '" aria-label="切换会话侧栏" type="button">' +
+                    '<span class="hamburger-icon">' +
+                      '<span></span><span></span><span></span>' +
+                    '</span>' +
+                  '</button>' +
+                  '<span class="topbar-brand" aria-hidden="true">W</span>' +
+                '</div>' +
+                '<div class="topbar-center">' +
+                  (selectedSession
+                    ? (
+                        '<span class="topbar-session-title" title="' + escapeHtml(selectedSession.command || "") + '">' + escapeHtml(shortCommand(selectedSession.command)) + '</span>' +
+                        '<span class="session-status-pill ' + getSessionStatusClass(selectedSession) + '" title="' + escapeHtml(getSessionStatusLabel(selectedSession)) + '"><span class="session-status-dot"></span><span class="session-status-text">' + escapeHtml(getSessionStatusLabel(selectedSession)) + '</span></span>' +
+                        '<span class="current-task hidden" id="current-task"></span>' +
+                        (selectedSession.cwd ? '<span class="topbar-cwd" id="topbar-cwd" title="' + escapeHtml(selectedSession.cwd) + '" role="button" tabindex="0">' + escapeHtml(selectedSession.cwd) + '</span>' : '')
+                      )
+                    : '<span class="topbar-tagline">Wand 控制台</span>' +
+                      '<span class="current-task hidden" id="current-task"></span>'
+                  ) +
+                '</div>' +
+                '<div class="topbar-right">' +
+                  (selectedSession && selectedSession.cwd ? '<button id="topbar-file-button" class="topbar-btn square' + (state.filePanelOpen ? ' active' : '') + '" type="button" aria-label="文件" title="文件"><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="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg></button>' : '') +
+                  '<span id="topbar-git-slot" class="topbar-git-slot">' + renderTopbarGitBadgeHtml() + '</span>' +
+                  '<div class="topbar-more-wrap">' +
+                    '<button id="topbar-more-button" class="topbar-btn square' + (state.topbarMoreOpen ? ' active' : '') + '" type="button" aria-label="更多" aria-haspopup="menu" aria-expanded="' + (state.topbarMoreOpen ? 'true' : 'false') + '" title="更多"><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="1"/><circle cx="12" cy="5" r="1"/><circle cx="12" cy="19" r="1"/></svg></button>' +
+                    '<div id="topbar-more-menu" class="topbar-more-menu' + (state.topbarMoreOpen ? '' : ' hidden') + '" role="menu">' +
+                      '<button class="topbar-more-item" data-action="settings" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg><span>设置</span></button>' +
+                      '<button class="topbar-more-item" data-action="refresh" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/></svg><span>刷新</span></button>' +
+                      '<button class="topbar-more-item' + (state.showInstallPrompt && state.deferredPrompt ? '' : ' hidden') + '" id="topbar-install-item" data-action="install" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg><span>安装应用</span></button>' +
+                      '<button class="topbar-more-item topbar-more-item-danger" data-action="logout" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"/><polyline points="16 17 21 12 16 7"/><line x1="21" y1="12" x2="9" y2="12"/></svg><span>退出</span></button>' +
+                    '</div>' +
+                  '</div>' +
+                '</div>' +
               '</div>' +
               // File panel backdrop (mobile)
               '<div id="file-panel-backdrop" class="file-panel-backdrop' + (state.filePanelOpen ? " open" : "") + '"></div>' +
@@ -1256,6 +1329,15 @@
                   '</div>' +
                 '</div>' +
                 '<div class="input-composer">' +
+                  '<button id="prompt-optimize-btn" class="prompt-optimize-btn" type="button" title="提示词优化（AI）" aria-label="提示词优化">' +
+                    '<svg class="prompt-optimize-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+                      '<path d="M12 3l1.6 4.4L18 9l-4.4 1.6L12 15l-1.6-4.4L6 9l4.4-1.6z" fill="currentColor" opacity="0.25"/>' +
+                      '<path d="M12 3l1.6 4.4L18 9l-4.4 1.6L12 15l-1.6-4.4L6 9l4.4-1.6z"/>' +
+                      '<path d="M19 14l.7 1.9L21.6 17l-1.9.7L19 19.6l-.7-1.9L16.4 17l1.9-.7z" fill="currentColor" opacity="0.35"/>' +
+                      '<path d="M5 4l.5 1.4L7 6l-1.5.6L5 8l-.5-1.4L3 6l1.5-.6z" fill="currentColor" opacity="0.35"/>' +
+                    '</svg>' +
+                    '<span class="prompt-optimize-spinner" aria-hidden="true"></span>' +
+                  '</button>' +
                   '<textarea id="input-box" class="input-textarea" placeholder="' + getComposerPlaceholder(selectedSession, state.terminalInteractive) + '" rows="1">' + escapeHtml(currentDraft) + '</textarea>' +
                   '<div id="attachment-preview" class="attachment-preview hidden"></div>' +
                   '<div class="input-composer-bar">' +
@@ -1332,7 +1414,322 @@
               '</section>' +
             '</main>' +
           '</div>' +
-        '</div>' + renderSessionModal() + renderWorktreeMergeModal() + renderSettingsModal();
+        '</div>' + renderSessionModal() + renderWorktreeMergeModal() + renderSettingsModal() + renderQuickCommitModal();
+      }
+
+      function renderTopbarGitBadgeHtml() {
+        if (!state.selectedId || !state.gitStatus || !state.gitStatus.isGit) return "";
+        if (state.gitStatusSessionId !== state.selectedId) return "";
+        var branch = state.gitStatus.branch || "?";
+        var count = state.gitStatus.modifiedCount || 0;
+        var titleText = branch + (count ? "  ·  " + count + " 个文件待提交" : "  ·  工作区干净");
+        return '<button id="topbar-git-badge" class="topbar-git-badge" type="button" title="' + escapeHtml(titleText) + '" aria-label="快捷提交">'
+          + '<svg class="topbar-git-icon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="6" cy="6" r="2"/><circle cx="6" cy="18" r="2"/><circle cx="18" cy="9" r="2"/><path d="M6 8v8"/><path d="M18 11v1a3 3 0 0 1-3 3H9"/></svg>'
+          + '<span class="topbar-git-branch">' + escapeHtml(branch) + '</span>'
+          + (count > 0
+              ? '<span class="topbar-git-count">·' + count + '</span>'
+              : '<span class="topbar-git-clean" aria-hidden="true">✓</span>')
+          + '</button>';
+      }
+
+      function updateTopbarGitBadge() {
+        var slot = document.getElementById("topbar-git-slot");
+        if (!slot) return;
+        slot.innerHTML = renderTopbarGitBadgeHtml();
+        var btn = document.getElementById("topbar-git-badge");
+        if (btn) {
+          btn.addEventListener("click", function(e) {
+            e.preventDefault();
+            openQuickCommitModal();
+          });
+        }
+      }
+
+      function loadGitStatus(sessionId, options) {
+        if (!sessionId) return Promise.resolve(null);
+        var force = options && options.force;
+        // Same session, fetched within 1s, and no force → skip.
+        var now = Date.now();
+        if (!force && state.gitStatusSessionId === sessionId && state.gitStatus && (now - state.gitStatusLastFetchAt) < 1000) {
+          return Promise.resolve(state.gitStatus);
+        }
+        if (state.gitStatusInflight && state.gitStatusInflight.sessionId === sessionId) {
+          return state.gitStatusInflight.promise;
+        }
+        state.gitStatusLoading = true;
+        var promise = fetch("/api/sessions/" + encodeURIComponent(sessionId) + "/git-status", {
+          credentials: "same-origin"
+        })
+          .then(function(res) { return res.ok ? res.json() : { isGit: false }; })
+          .then(function(data) {
+            state.gitStatus = data || { isGit: false };
+            state.gitStatusSessionId = sessionId;
+            state.gitStatusLastFetchAt = Date.now();
+            updateTopbarGitBadge();
+            return data;
+          })
+          .catch(function() {
+            state.gitStatus = { isGit: false };
+            state.gitStatusSessionId = sessionId;
+            state.gitStatusLastFetchAt = Date.now();
+            updateTopbarGitBadge();
+            return null;
+          })
+          .finally(function() {
+            state.gitStatusLoading = false;
+            if (state.gitStatusInflight && state.gitStatusInflight.sessionId === sessionId) {
+              state.gitStatusInflight = null;
+            }
+          });
+        state.gitStatusInflight = { sessionId: sessionId, promise: promise };
+        return promise;
+      }
+
+      var quickCommitEscHandler = null;
+
+      function openQuickCommitModal() {
+        if (!state.selectedId) return;
+        state.quickCommitOpen = true;
+        state.quickCommitSubmitting = false;
+        state.quickCommitError = "";
+        state.quickCommitForm = { autoMessage: false, customMessage: "", makeTag: false, tag: "", push: false };
+        closeWorktreeMergeModal();
+        closeSessionModal();
+        closeSettingsModal();
+        rerenderQuickCommitModal();
+        var modal = document.getElementById("quick-commit-modal");
+        if (modal) {
+          modal.classList.remove("hidden");
+          lastFocusedElement = document.activeElement;
+          setupFocusTrap(modal);
+        }
+        if (quickCommitEscHandler) document.removeEventListener("keydown", quickCommitEscHandler);
+        quickCommitEscHandler = function(e) {
+          if (e.key === "Escape" && state.quickCommitOpen && !state.quickCommitSubmitting) {
+            closeQuickCommitModal();
+          }
+        };
+        document.addEventListener("keydown", quickCommitEscHandler);
+        loadGitStatus(state.selectedId, { force: true }).then(function() {
+          if (!state.quickCommitOpen) return;
+          rerenderQuickCommitModal();
+        });
+      }
+
+      function closeQuickCommitModal() {
+        state.quickCommitOpen = false;
+        state.quickCommitSubmitting = false;
+        state.quickCommitError = "";
+        var modal = document.getElementById("quick-commit-modal");
+        if (modal) modal.classList.add("hidden");
+        if (focusTrapHandler) {
+          document.removeEventListener("keydown", focusTrapHandler);
+          focusTrapHandler = null;
+        }
+        if (quickCommitEscHandler) {
+          document.removeEventListener("keydown", quickCommitEscHandler);
+          quickCommitEscHandler = null;
+        }
+        if (lastFocusedElement && typeof lastFocusedElement.focus === "function") {
+          lastFocusedElement.focus();
+        }
+      }
+
+      function rerenderQuickCommitModal() {
+        var modal = document.getElementById("quick-commit-modal");
+        if (!modal) return;
+        var html = renderQuickCommitModal();
+        var temp = document.createElement("div");
+        temp.innerHTML = html;
+        var fresh = temp.querySelector("#quick-commit-modal");
+        if (!fresh) return;
+        modal.innerHTML = fresh.innerHTML;
+        attachQuickCommitModalListeners();
+      }
+
+      function attachQuickCommitModalListeners() {
+        var closeBtn = document.getElementById("quick-commit-close-btn");
+        if (closeBtn) closeBtn.addEventListener("click", closeQuickCommitModal);
+        var cancelBtn = document.getElementById("quick-commit-cancel-btn");
+        if (cancelBtn) cancelBtn.addEventListener("click", closeQuickCommitModal);
+        var submitBtn = document.getElementById("quick-commit-submit-btn");
+        if (submitBtn) submitBtn.addEventListener("click", submitQuickCommit);
+        var aiBtn = document.getElementById("quick-commit-ai-btn");
+        if (aiBtn) aiBtn.addEventListener("click", generateCommitMessageAI);
+        var msgEl = document.getElementById("quick-commit-message");
+        if (msgEl) msgEl.addEventListener("input", function() {
+          state.quickCommitForm.customMessage = msgEl.value;
+        });
+        var tagCb = document.getElementById("quick-commit-make-tag");
+        if (tagCb) tagCb.addEventListener("change", function() {
+          state.quickCommitForm.makeTag = tagCb.checked;
+          var row = document.getElementById("quick-commit-tag-row");
+          if (row) row.classList.toggle("hidden", !tagCb.checked);
+        });
+        var tagInput = document.getElementById("quick-commit-tag");
+        if (tagInput) tagInput.addEventListener("input", function() {
+          state.quickCommitForm.tag = tagInput.value;
+        });
+        var pushCb = document.getElementById("quick-commit-push");
+        if (pushCb) pushCb.addEventListener("change", function() {
+          state.quickCommitForm.push = pushCb.checked;
+        });
+      }
+
+      function generateCommitMessageAI() {
+        if (!state.selectedId || state.quickCommitGenerating) return;
+        var msgEl = document.getElementById("quick-commit-message");
+        if (msgEl) state.quickCommitForm.customMessage = msgEl.value;
+        state.quickCommitGenerating = true;
+        state.quickCommitError = "";
+        rerenderQuickCommitModal();
+        fetch("/api/sessions/" + encodeURIComponent(state.selectedId) + "/generate-commit-message", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({})
+        })
+          .then(function(res) {
+            return res.json().then(function(data) { return { ok: res.ok, data: data }; });
+          })
+          .then(function(result) {
+            if (!result.ok) throw new Error((result.data && result.data.error) || "AI 生成失败。");
+            state.quickCommitForm.customMessage = (result.data && result.data.message) || "";
+            var currentMsgEl = document.getElementById("quick-commit-message");
+            if (currentMsgEl) currentMsgEl.value = state.quickCommitForm.customMessage;
+          })
+          .catch(function(error) {
+            state.quickCommitError = (error && error.message) || "AI 生成失败。";
+          })
+          .finally(function() {
+            state.quickCommitGenerating = false;
+            if (state.quickCommitOpen) rerenderQuickCommitModal();
+          });
+      }
+
+      function submitQuickCommit() {
+        if (!state.selectedId || state.quickCommitSubmitting) return;
+        var msgEl = document.getElementById("quick-commit-message");
+        if (msgEl) state.quickCommitForm.customMessage = msgEl.value;
+        var form = state.quickCommitForm || {};
+        var userTag = form.makeTag ? (form.tag || "").trim() : "";
+        var message = (form.customMessage || "").trim();
+        var payload = {
+          autoMessage: false,
+          customMessage: message,
+          tag: userTag,
+          autoTag: form.makeTag && !userTag,
+          push: !!form.push
+        };
+        if (!message) {
+          state.quickCommitError = "请填写 commit message，或点击 AI 生成。";
+          rerenderQuickCommitModal();
+          return;
+        }
+        state.quickCommitSubmitting = true;
+        state.quickCommitError = "";
+        rerenderQuickCommitModal();
+        fetch("/api/sessions/" + encodeURIComponent(state.selectedId) + "/quick-commit", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(payload)
+        })
+          .then(function(res) {
+            return res.json().then(function(data) { return { ok: res.ok, data: data }; });
+          })
+          .then(function(result) {
+            if (!result.ok) throw new Error((result.data && result.data.error) || "快捷提交失败。");
+            var data = result.data || {};
+            var hash = data.commit && data.commit.hash ? data.commit.hash.substring(0, 7) : "";
+            var tagName = data.tag && data.tag.name ? data.tag.name : "";
+            var base = "已提交" + (hash ? " " + hash : "") + (tagName ? "，已打 tag " + tagName : "");
+            var pushRequested = !!payload.push;
+            if (pushRequested && data.pushError) {
+              var msg = base + "；push 失败：" + data.pushError;
+              if (typeof showToast === "function") showToast(msg, "error");
+            } else {
+              var okMsg = base + (data.pushed ? "，已 push" : "");
+              if (typeof showToast === "function") showToast(okMsg, "success");
+            }
+            closeQuickCommitModal();
+            if (state.selectedId) loadGitStatus(state.selectedId, { force: true });
+          })
+          .catch(function(error) {
+            state.quickCommitError = (error && error.message) || "快捷提交失败。";
+          })
+          .finally(function() {
+            state.quickCommitSubmitting = false;
+            if (state.quickCommitOpen) rerenderQuickCommitModal();
+          });
+      }
+
+      function renderQuickCommitModal() {
+        var s = state.gitStatus || {};
+        var f = state.quickCommitForm || { autoMessage: false, customMessage: "", makeTag: false, tag: "", push: false };
+        var langValue = (state.config && (state.config.language || "")) || "";
+        var langLabel = langValue ? langValue : "中文";
+        var files = Array.isArray(s.files) ? s.files : [];
+        var fileRows = files.map(function(item) {
+          var status = (item.status || "  ").substring(0, 2);
+          var flag = status.trim() || "?";
+          var cls = "qc-flag";
+          if (flag === "A" || status[0] === "A") cls += " qc-flag-add";
+          else if (flag === "D" || status[0] === "D") cls += " qc-flag-del";
+          else if (flag === "M" || status[0] === "M") cls += " qc-flag-mod";
+          else if (flag === "??" || status === "??") cls += " qc-flag-untracked";
+          else if (flag === "R") cls += " qc-flag-ren";
+          var subBadge = "";
+          if (item.isSubmodule) {
+            var st = item.submoduleState || {};
+            var parts = [];
+            if (st.commitChanged) parts.push("新指针");
+            if (st.hasTrackedChanges) parts.push("dirty");
+            if (st.hasUntracked) parts.push("未跟踪");
+            var label = parts.length ? "submodule · " + parts.join(" / ") : "submodule";
+            subBadge = '<span class="qc-submodule-badge">' + escapeHtml(label) + '</span>';
+          }
+          return '<div class="qc-file-row"><span class="' + cls + '">' + escapeHtml(status) + '</span><span class="qc-file-path">' + escapeHtml(item.path || "") + '</span>' + subBadge + '</div>';
+        }).join("");
+        if (!fileRows) fileRows = '<div class="qc-empty">工作区干净，没有可提交的改动。</div>';
+        var hasChanges = (s.modifiedCount || 0) > 0;
+
+        return '<section id="quick-commit-modal" class="modal-backdrop' + (state.quickCommitOpen ? '' : ' hidden') + '">' +
+          '<div class="modal quick-commit-modal" role="dialog" aria-labelledby="quick-commit-title">' +
+            '<div class="modal-header">' +
+              '<div>' +
+                '<h2 id="quick-commit-title" class="modal-title">快捷提交</h2>' +
+                '<p class="modal-subtitle">' + escapeHtml((s.branch || "(no branch)") + ' · ' + (s.modifiedCount || 0) + ' 个改动') + '</p>' +
+              '</div>' +
+              '<button id="quick-commit-close-btn" class="btn btn-ghost btn-icon" type="button" aria-label="关闭">&times;</button>' +
+            '</div>' +
+            '<div class="modal-body">' +
+              '<div class="qc-files-wrap">' + fileRows + '</div>' +
+              '<div class="qc-message-row" id="quick-commit-message-row">' +
+                '<div class="qc-message-header"><label class="field-label" for="quick-commit-message">commit message</label>' +
+                  '<button type="button" id="quick-commit-ai-btn" class="btn btn-ghost btn-sm"' + (state.quickCommitGenerating ? ' disabled' : '') + '>' + (state.quickCommitGenerating ? '生成中…' : 'AI 生成') + '</button>' +
+                '</div>' +
+                '<textarea id="quick-commit-message" class="field-input" rows="2" placeholder="输入 commit message 或点击 AI 生成">' + escapeHtml(f.customMessage || "") + '</textarea>' +
+              '</div>' +
+              '<label class="qc-checkbox-row">' +
+                '<input type="checkbox" id="quick-commit-make-tag"' + (f.makeTag ? ' checked' : '') + '>' +
+                '<span>提交后打 tag' + (s.latestTag ? '（当前：' + escapeHtml(s.latestTag) + '）' : '') + '</span>' +
+              '</label>' +
+              '<div class="qc-tag-row' + (f.makeTag ? '' : ' hidden') + '" id="quick-commit-tag-row">' +
+                '<input type="text" id="quick-commit-tag" class="field-input" placeholder="留空自动 bump patch' + (s.suggestedNextTag ? '（如 ' + escapeHtml(s.suggestedNextTag) + '）' : '') + '" value="' + escapeHtml(f.tag || "") + '">' +
+              '</div>' +
+              '<label class="qc-checkbox-row">' +
+                '<input type="checkbox" id="quick-commit-push"' + (f.push ? ' checked' : '') + '>' +
+                '<span>提交后 push 到远端</span>' +
+              '</label>' +
+              '<p id="quick-commit-error" class="error-message' + (state.quickCommitError ? '' : ' hidden') + '">' + escapeHtml(state.quickCommitError || "") + '</p>' +
+              '<div class="worktree-merge-actions">' +
+                '<button id="quick-commit-cancel-btn" class="btn btn-secondary" type="button">取消</button>' +
+                '<button id="quick-commit-submit-btn" class="btn btn-primary" type="button"' + (hasChanges && !state.quickCommitSubmitting ? '' : ' disabled') + '>' + (state.quickCommitSubmitting ? '提交中…' : '执行') + '</button>' +
+              '</div>' +
+            '</div>' +
+          '</div>' +
+        '</section>';
       }
 
       function renderWorktreeMergeModal() {
@@ -1821,7 +2218,7 @@
       }
 
       function renderSessions() {
-        var activeSessions = state.sessions.filter(function(session) { return !session.archived && !session.resumedToSessionId; });
+        var activeSessions = state.sessions.filter(function(session) { return !session.archived; });
         var archivedSessions = state.sessions.filter(function(session) { return session.archived; });
         var groups = [];
         groups.push(renderSessionManageBar());
@@ -1994,9 +2391,7 @@
       }
 
       function getSelectableSessions() {
-        return state.sessions.filter(function(session) {
-          return session.archived || !session.resumedToSessionId;
-        });
+        return state.sessions.slice();
       }
 
       function countSelectableItems() {
@@ -2743,10 +3138,8 @@
         var statusMap = {
           "stopped": "已停止",
           "running": "运行中",
-          "idle": "空闲",
-          "thinking": "思考中",
-          "waiting-input": "等待输入",
-          "initializing": "启动中"
+          "exited": "已退出",
+          "failed": "已失败"
         };
         return statusMap[session.status] || session.status;
       }
@@ -3699,6 +4092,11 @@
             fileInput.value = "";
           });
         }
+
+        var promptOptimizeBtn = document.getElementById("prompt-optimize-btn");
+        if (promptOptimizeBtn) {
+          promptOptimizeBtn.addEventListener("click", function() { optimizePromptText(); });
+        }
         var composer = document.querySelector(".input-composer");
         if (composer) {
           composer.addEventListener("dragover", function(e) {
@@ -3790,6 +4188,88 @@
         var filePanelBackdrop = document.getElementById("file-panel-backdrop");
         if (filePanelBackdrop) filePanelBackdrop.addEventListener("click", closeFilePanel);
 
+        // Topbar: file button (mirrors toggleFilePanel)
+        var topbarFileBtn = document.getElementById("topbar-file-button");
+        if (topbarFileBtn) topbarFileBtn.addEventListener("click", toggleFilePanel);
+
+        // Topbar: cwd click → open file panel
+        var topbarCwdEl = document.getElementById("topbar-cwd");
+        if (topbarCwdEl) {
+          topbarCwdEl.addEventListener("click", function() {
+            if (!state.filePanelOpen) toggleFilePanel();
+          });
+          topbarCwdEl.addEventListener("keydown", function(e) {
+            if (e.key === "Enter" || e.key === " ") {
+              e.preventDefault();
+              if (!state.filePanelOpen) toggleFilePanel();
+            }
+          });
+        }
+
+        // Topbar: more menu
+        var topbarMoreBtn = document.getElementById("topbar-more-button");
+        var topbarMoreMenu = document.getElementById("topbar-more-menu");
+        if (topbarMoreBtn && topbarMoreMenu) {
+          topbarMoreBtn.addEventListener("click", function(e) {
+            e.stopPropagation();
+            state.topbarMoreOpen = !state.topbarMoreOpen;
+            topbarMoreMenu.classList.toggle("hidden", !state.topbarMoreOpen);
+            topbarMoreBtn.classList.toggle("active", state.topbarMoreOpen);
+            topbarMoreBtn.setAttribute("aria-expanded", state.topbarMoreOpen ? "true" : "false");
+          });
+          topbarMoreMenu.addEventListener("click", function(e) {
+            var btn = e.target && e.target.closest ? e.target.closest(".topbar-more-item") : null;
+            if (!btn) return;
+            var action = btn.getAttribute("data-action");
+            // Close menu first regardless of action
+            state.topbarMoreOpen = false;
+            topbarMoreMenu.classList.add("hidden");
+            topbarMoreBtn.classList.remove("active");
+            topbarMoreBtn.setAttribute("aria-expanded", "false");
+            switch (action) {
+              case "settings":
+                openSettingsModal();
+                break;
+              case "refresh":
+                window.location.reload();
+                break;
+              case "install":
+                if (state.deferredPrompt) {
+                  state.deferredPrompt.prompt();
+                  state.deferredPrompt.userChoice.then(function() {
+                    state.deferredPrompt = null;
+                    state.showInstallPrompt = false;
+                    updateInstallPrompt();
+                  });
+                }
+                break;
+              case "logout":
+                logout();
+                break;
+            }
+          });
+          // Close on outside click
+          document.addEventListener("click", function(e) {
+            if (!state.topbarMoreOpen) return;
+            var wrap = topbarMoreMenu.parentElement;
+            if (wrap && !wrap.contains(e.target)) {
+              state.topbarMoreOpen = false;
+              topbarMoreMenu.classList.add("hidden");
+              topbarMoreBtn.classList.remove("active");
+              topbarMoreBtn.setAttribute("aria-expanded", "false");
+            }
+          });
+          // Close on ESC
+          document.addEventListener("keydown", function(e) {
+            if (e.key === "Escape" && state.topbarMoreOpen) {
+              state.topbarMoreOpen = false;
+              topbarMoreMenu.classList.add("hidden");
+              topbarMoreBtn.classList.remove("active");
+              topbarMoreBtn.setAttribute("aria-expanded", "false");
+            }
+          });
+        }
+
         // Terminal scale controls (topbar)
         var scaleDownBtn = document.getElementById("terminal-scale-down-top");
         var scaleUpBtn = document.getElementById("terminal-scale-up-top");
@@ -3804,7 +4284,9 @@
             location.reload();
             return;
           }
-          softRefreshCurrentView();
+          softResyncTerminal();
+          resetChatRenderCache();
+          scheduleChatRender(true);
         });
         var jumpBottomBtn = document.getElementById("terminal-jump-bottom");
         if (jumpBottomBtn) jumpBottomBtn.addEventListener("click", function() {
@@ -4200,6 +4682,23 @@
           });
         }
 
+        var topbarGitBadge = document.getElementById("topbar-git-badge");
+        if (topbarGitBadge) {
+          topbarGitBadge.addEventListener("click", function(e) {
+            e.preventDefault();
+            openQuickCommitModal();
+          });
+        }
+        var quickCommitModal = document.getElementById("quick-commit-modal");
+        if (quickCommitModal) {
+          quickCommitModal.addEventListener("click", function(e) {
+            if (e.target.id === "quick-commit-modal" && !state.quickCommitSubmitting) {
+              closeQuickCommitModal();
+            }
+          });
+        }
+        attachQuickCommitModalListeners();
+
         initTerminal();
         setupMobileKeyboardHandlers();
         setupVisualViewportHandlers();
@@ -4659,42 +5158,174 @@
         requestSyncScrollbar();
       }
 
+      // ──────── East-Asian-Wide padding for wterm WASM ────────
+      //
+      // wterm's WASM grid (as of @wterm/core 0.1.8/0.1.9) treats every
+      // codepoint as occupying exactly 1 cell, while node-pty's backend
+      // and Claude Code's TUI emit cursor-positioning sequences that
+      // assume CJK / fullwidth / emoji codepoints occupy 2 columns
+      // (Unicode TR11 East-Asian-Width = W or F). The mismatch makes
+      // every CSI cursor move after CJK output drift by N/2 columns,
+      // causing in-place rewrites (thinking spinner, todo list,
+      // permission menus) to leave torn residue like "替替换换".
+      //
+      // Fix: insert U+2060 (Word Joiner — zero-width, unbreakable) after
+      // each wide codepoint before handing the byte stream to the WASM
+      // grid. The WJ takes one cell, so wide chars now occupy 2 cells —
+      // matching the backend's column accounting exactly. The browser
+      // renders WJ at zero width, so the visual layout stays correct.
+      //
+      // The scanner is ANSI-aware: it tracks ESC / CSI / OSC / DCS
+      // / PM / APC state across chunk boundaries so wide codepoints
+      // inside escape sequences (e.g. OSC window-title payloads) are
+      // not padded — that would break sequence parsing.
+      function isEastAsianWide(cp) {
+        if (cp < 0x1100) return false;
+        return (
+          (cp >= 0x1100 && cp <= 0x115f) ||
+          (cp >= 0x2329 && cp <= 0x232a) ||
+          (cp >= 0x2e80 && cp <= 0x303e) ||
+          (cp >= 0x3041 && cp <= 0x33ff) ||
+          (cp >= 0x3400 && cp <= 0x4dbf) ||
+          (cp >= 0x4e00 && cp <= 0x9fff) ||
+          (cp >= 0xa000 && cp <= 0xa4cf) ||
+          (cp >= 0xac00 && cp <= 0xd7a3) ||
+          (cp >= 0xf900 && cp <= 0xfaff) ||
+          (cp >= 0xfe30 && cp <= 0xfe4f) ||
+          (cp >= 0xff00 && cp <= 0xff60) ||
+          (cp >= 0xffe0 && cp <= 0xffe6) ||
+          (cp >= 0x1f000 && cp <= 0x1f9ff) ||
+          (cp >= 0x20000 && cp <= 0x2fffd) ||
+          (cp >= 0x30000 && cp <= 0x3fffd)
+        );
+      }
+
+      var WAND_WIDE_FILLER = "\u2060";
+
+      function createWideParserState() { return { mode: "normal" }; }
+
+      function widePadAnsi(data, st) {
+        if (!data) return "";
+        var s = String(data);
+        var out = "";
+        for (var i = 0; i < s.length; i++) {
+          var code = s.charCodeAt(i);
+          var cp = code;
+          var consumed = 1;
+          if (code >= 0xd800 && code <= 0xdbff && i + 1 < s.length) {
+            var lo = s.charCodeAt(i + 1);
+            if (lo >= 0xdc00 && lo <= 0xdfff) {
+              cp = (code - 0xd800) * 0x400 + (lo - 0xdc00) + 0x10000;
+              consumed = 2;
+            }
+          }
+          var ch = consumed === 2 ? s.substr(i, 2) : s.charAt(i);
+          switch (st.mode) {
+            case "normal":
+              if (cp === 0x1b) { st.mode = "esc"; out += ch; }
+              else if (cp === 0x9b) { st.mode = "csi"; out += ch; }
+              else if (cp === 0x9d || cp === 0x90 || cp === 0x9e || cp === 0x9f) {
+                st.mode = "string"; out += ch;
+              } else {
+                out += ch;
+                if (isEastAsianWide(cp)) out += WAND_WIDE_FILLER;
+              }
+              break;
+            case "esc":
+              out += ch;
+              if (cp === 0x5b) st.mode = "csi";
+              else if (cp === 0x5d || cp === 0x50 || cp === 0x58 ||
+                       cp === 0x5e || cp === 0x5f) st.mode = "string";
+              else st.mode = "normal";
+              break;
+            case "csi":
+              out += ch;
+              if (cp >= 0x40 && cp <= 0x7e) st.mode = "normal";
+              break;
+            case "string":
+              out += ch;
+              if (cp === 0x07 || cp === 0x9c) st.mode = "normal";
+              else if (cp === 0x1b) st.mode = "string-esc";
+              break;
+            case "string-esc":
+              out += ch;
+              if (cp === 0x5c) st.mode = "normal";
+              else st.mode = "string";
+              break;
+          }
+          i += consumed - 1;
+        }
+        return out;
+      }
+
+      function wandTerminalWrite(terminal, data) {
+        if (!terminal || data == null) return;
+        if (!state.wideParserState) state.wideParserState = createWideParserState();
+        terminal.write(widePadAnsi(data, state.wideParserState));
+      }
+
+      function resetWideParserState() {
+        state.wideParserState = createWideParserState();
+      }
+
+      // Strip the wide-pad filler from copied text so users pasting
+      // selected terminal output don't get hidden U+2060 sprinkled
+      // through every CJK string.
+      function stripWideFillerForCopy() {
+        if (typeof document === "undefined") return;
+        document.addEventListener("copy", function(e) {
+          var sel = window.getSelection && window.getSelection();
+          if (!sel || sel.isCollapsed) return;
+          var anchor = sel.anchorNode;
+          var node = anchor && anchor.nodeType === 3 ? anchor.parentNode : anchor;
+          var output = document.getElementById("output");
+          if (!output || !node || !output.contains(node)) return;
+          var text = sel.toString();
+          if (text.indexOf(WAND_WIDE_FILLER) === -1) return;
+          if (e.clipboardData) {
+            e.clipboardData.setData("text/plain", text.split(WAND_WIDE_FILLER).join(""));
+            e.preventDefault();
+          }
+        });
+      }
+      stripWideFillerForCopy();
+
       function resetTerminal() {
-        if (!state.terminal || typeof state.terminal.reset !== "function") return;
-        state.terminal.reset();
+        if (!state.terminal) return;
+        // 优先走 wterm-entry.js 自定义 WTerm 子类暴露的 reset()：它会调用
+        // bridge.init(cols, rows) 让 WASM 重新初始化整个状态机——包含
+        // grid、光标、属性 *和* scrollback。这是跨会话切换时清空旧
+        // scrollback 的唯一可靠方式，避免新会话向上滚还能看到旧会话内容。
+        // 单纯写 ANSI RIS (\x1bc) 在 WASM 实现里只清当前 grid，不动 scrollback。
+        if (typeof state.terminal.reset === "function") {
+          state.terminal.reset();
+          resetWideParserState();
+          return;
+        }
+        if (typeof state.terminal.write === "function") {
+          state.terminal.write("\x1bc");
+        }
+        resetWideParserState();
       }
 
       // Soft resync terminal: reset WASM grid and replay full output buffer.
       // Clears any stale DOM rows left over from CSI cursor-jump sequences
       // (e.g. Claude permission menus redrawing in place while user holds arrow keys).
-      function softResyncTerminal() {
+      // Pass { skipFit: true } when the caller knows the grid was just sized
+      // correctly (e.g. wterm.onResize fired this resync — bouncing back into
+      // ensureTerminalFit would just trigger another remeasure → resize → onResize
+      // → softResyncTerminal recursion).
+      function softResyncTerminal(options) {
         if (!state.terminal || !state.terminalOutput) return false;
+        var opts = options || {};
         resetTerminal();
-        state.terminal.write(state.terminalOutput);
+        wandTerminalWrite(state.terminal, state.terminalOutput);
         state.lastTerminalResyncAt = Date.now();
         maybeScrollTerminalToBottom("output");
-        // Remeasure against real container: the refresh button used to only
-        // reset+write, so a stale cols/rows (set at mount time with hidden
-        // container) would survive the refresh and keep wrapping output wrong.
-        // Suppress the auto-replay branch in ensureTerminalFit — we just
-        // replayed, no point doing it again on the next rAF tick.
-        state.suppressFitReplay = true;
-        ensureTerminalFit("refresh");
+        if (!opts.skipFit) ensureTerminalFit("refresh");
         return true;
       }
 
-      // Soft refresh the whole current view without losing page state:
-      // - Replays terminal buffer to clear residue
-      // - Clears chat render cache and forces a full rebuild
-      // Used by the refresh button and by automatic triggers
-      // (e.g. permission escalation appearing/disappearing).
-      function softRefreshCurrentView() {
-        softResyncTerminal();
-        if (typeof resetChatRenderCache === "function") resetChatRenderCache();
-        if (typeof scheduleChatRender === "function") scheduleChatRender(true);
-        else if (typeof render === "function") render();
-      }
-
       function scheduleSoftResyncTerminal(delayMs) {
         if (state.softResyncTimer) clearTimeout(state.softResyncTimer);
         state.softResyncTimer = setTimeout(function() {
@@ -4703,6 +5334,28 @@
         }, typeof delayMs === "number" ? delayMs : 150);
       }
 
+      // Claude CLI 的 permission 菜单 / 选择列表，在用户按方向键时会
+      // 发送光标定位 (CSI H/f)、光标移动 (CSI A-D)、擦除显示/行 (CSI
+      // J/K) 等序列在原地重绘整块区域。wterm 在这种高频原地重绘下，
+      // DOM 行经常残留或错位，导致新写入的内容被堆到 grid 顶部 ——
+      // 用户体感就是"明明在改菜单，结果跑到最上面去了"。
+      //
+      // 已有的 pendingEscalation/permissionBlocked 状态变化触发的
+      // scheduleSoftResyncTerminal 在这种场景下不会触发（这两个布尔
+      // 在菜单交互过程中不变），health check 的 30s 兜底也太慢，且
+      // 连续按键时 chunkPause 永远不成立（lastChunkAt 一直在刷新）。
+      //
+      // 这里在写 chunk 时被动检测：含上述序列就 schedule 一次 350ms
+      // debounce 的 softResync。连续按键时 timer 反复被重置，仅在
+      // 停顿后真正重放一次 buffer，开销可控。
+      var IN_PLACE_REDRAW_RE = /\x1b\[\d*(?:;\d*)?[ABCDfHJK]/;
+      function maybeScheduleResyncForChunk(chunk) {
+        if (!chunk || typeof chunk !== "string") return;
+        if (chunk.indexOf("\x1b[") === -1) return;
+        if (!IN_PLACE_REDRAW_RE.test(chunk)) return;
+        scheduleSoftResyncTerminal(350);
+      }
+
       function syncTerminalBuffer(sessionId, output, options) {
         if (!state.terminal) return false;
         var normalizedOutput = normalizeTerminalOutput(output || "");
@@ -4734,7 +5387,7 @@
           if (normalizedOutput !== currentOutput) {
             resetTerminal();
             if (normalizedOutput) {
-              state.terminal.write(normalizedOutput);
+              wandTerminalWrite(state.terminal, normalizedOutput);
             }
             wrote = true;
           }
@@ -4745,7 +5398,8 @@
         } else if (normalizedOutput.startsWith(currentOutput)) {
           var delta = normalizedOutput.slice(currentOutput.length);
           if (delta) {
-            state.terminal.write(delta);
+            wandTerminalWrite(state.terminal, delta);
+            maybeScheduleResyncForChunk(delta);
             wrote = true;
           }
         } else if (currentOutput && currentOutput.startsWith(normalizedOutput)) {
@@ -4753,7 +5407,7 @@
         } else {
           resetTerminal();
           if (normalizedOutput) {
-            state.terminal.write(normalizedOutput);
+            wandTerminalWrite(state.terminal, normalizedOutput);
           }
           wrote = true;
         }
@@ -4785,6 +5439,28 @@
         state.terminalInitRetries = 0;
         state.terminalInitializing = true;
 
+        // wterm 构造与 init() 内部都通过 getBoundingClientRect 测字符宽高，
+        // 要求容器及祖先链都不是 display:none。.terminal-container 默认
+        // display:none，必须 .active 才变 flex。switchToSessionView 里
+        // initTerminal() 在 applyCurrentView() 之前同步执行——那时容器还是
+        // display:none，_measureCharSize 返回 null → ResizeObserver 不挂
+        // 载、首屏 cols 永远停在硬编码的 120，必须用户刷新/弹键盘/调窗口
+        // 才能恢复。这里在创建 wterm 之前先把 active 类挂上，让容器进入
+        // flex 布局，确保 _measureCharSize 拿到真实字符尺寸。
+        if (state.selectedId) {
+          container.classList.remove("hidden");
+          container.classList.add("active");
+        }
+
+        // 防御式清理：teardownTerminal 已经会移除残留 termWrap，但若有
+        // 调用路径绕过 teardown（比如 outputContainer 被外部 render 重建），
+        // 这里再扫一次确保新会话不会和旧 termWrap 叠在同一位置。
+        var staleWraps = container.querySelectorAll(".terminal-scroll-wrap");
+        for (var i = 0; i < staleWraps.length; i++) {
+          var stale = staleWraps[i];
+          if (stale.parentNode === container) container.removeChild(stale);
+        }
+
         var termWrap = document.createElement("div");
         termWrap.className = "terminal-scroll-wrap";
         container.appendChild(termWrap);
@@ -4800,6 +5476,16 @@
           },
           onResize: function(cols, rows) {
             sendTerminalResize(cols, rows);
+            // wterm.resize() just ran renderer.setup() (DOM rows wiped) and
+            // bridge.resize() (WASM grid reflowed). terminalOutput is the
+            // canonical raw byte stream — replay it now so historical lines
+            // and any in-flight CSI sequences re-render at the new width.
+            // skipFit: wterm already did the sizing work; calling
+            // ensureTerminalFit again here would just cycle back through
+            // remeasure → resize → onResize → softResyncTerminal.
+            if (state.terminal && state.terminalOutput) {
+              softResyncTerminal({ skipFit: true });
+            }
           }
         });
 
@@ -4853,7 +5539,7 @@
               syncTerminalBuffer(session.id, session.output || "", { mode: "append", scroll: false });
             }
           } else {
-            term.write("点击上方「新对话」开始你的第一次对话。\r\n");
+            wandTerminalWrite(term, "点击上方「新对话」开始你的第一次对话。\r\n");
           }
 
           state.terminalClickHandler = focusInputBox;
@@ -4865,7 +5551,7 @@
           // Container may have been hidden / zero-width at construction
           // time (hard-coded 120x36). Remeasure against the real container
           // so wterm reflows the just-written history to the correct cols.
-          ensureTerminalFit("mount");
+          ensureTerminalFit("mount", { forceReplay: true });
         }).catch(function(err) {
           state.terminalInitializing = false;
           console.error("[wand] wterm init failed:", err);
@@ -4994,7 +5680,7 @@
           return "会话已结束，无法继续发送";
         }
         return session && isStructuredSession(session) && session.structuredState && session.structuredState.inFlight
-          ? "思考中，可继续发送，消息会自动排队"
+          ? "思考中 · 发送新消息将中断当前回复"
           : "输入消息...";
       }
 
@@ -5525,6 +6211,9 @@
               }
             }
             updateShellChrome();
+            if (state.selectedId && state.gitStatusSessionId !== state.selectedId) {
+              loadGitStatus(state.selectedId);
+            }
 
             var reloadPromise = Promise.resolve();
             if (!opts.skipSelectedOutputReload && state.selectedId) {
@@ -5623,12 +6312,17 @@
           initTerminal();
         }
 
-        if (selectedSession && state.terminal) {
-          syncTerminalBuffer(selectedSession.id, selectedSession.output || "", { mode: "append", scroll: false });
-        } else if (!selectedSession) {
+        if (!selectedSession) {
           state.terminalSessionId = null;
           state.terminalOutput = "";
         }
+        // 之前这里会用 selectedSession.output 再 syncTerminalBuffer 一次。
+        // 但 updateShellChrome 在 updateSessionsList、status 推送、init
+        // 等多个高频路径都会被调，每次都拿"可能不带 output 的 slim 快照"
+        // 兜回来 sync 一遍：要么早返回浪费判断，要么 prefix 不匹配触发
+        // reset+全量重写、把 alt-screen 中正在绘制的 Claude TUI 切走。
+        // terminal 写入应当只走 chunk hot-path 与 ws init 这两条权威路径，
+        // 这里不再插手，避免引入二次覆盖。
 
         if (state.terminal && selectedSession && state.currentView === "terminal") {
           maybeScrollTerminalToBottom("view");
@@ -5681,10 +6375,25 @@
             updateShellChrome();
 
             if (state.terminal && id === state.selectedId && data.output !== undefined) {
-              syncTerminalBuffer(id, data.output, { mode: "append" });
-              // Session-switch / history replay: force a real fit so wterm
-              // reflows the just-written output against the real container.
-              ensureTerminalFit("session-switch");
+              // ws 在线时不要在这里写终端：HTTP 这边返回的是 PTY transcript
+              // 完整磁盘文件（可达数十 MB），ws 订阅 init 拿到的是内存 ring
+              // buffer 末尾窗口（约 200KB），二者长度+起点都不同。两路都
+              // syncTerminalBuffer 时，append 模式的前缀检查必然失败，
+              // 落到 else 分支的 reset+全量重写，与 ws init 的 reset+
+              // 写入交叠，造成首屏「两份内容错位重叠」。
+              // 设计原则：terminal 写入只走 ws init 与 chunk hot-path 两条
+              // 权威路径——参见 case "init" 的 replace 写入与 onmessage
+              // chunk 处理。这里只在 ws 离线兜底时才 append 写入。
+              if (!state.wsConnected) {
+                syncTerminalBuffer(id, data.output, { mode: "append" });
+                // 离线兜底路径自己负责 fit + replay，否则尺寸不对。
+                ensureTerminalFit("session-switch", { forceReplay: true });
+              } else {
+                // ws 在线场景：仅校准列宽，不重 replay（init 的
+                // ensureTerminalFitWithRetry("init") 会负责按真实
+                // 宽度的全量基线写入）。
+                ensureTerminalFit("session-switch");
+              }
             }
 
             var selectedSession = state.sessions.find(function(s) { return s.id === id; });
@@ -5699,6 +6408,9 @@
         if (!foundSession) {
           return;
         }
+        if (state.selectedId !== id) {
+          teardownTerminal();
+        }
         state.selectedId = id;
         persistSelectedId();
         state.toolContentCache = {};
@@ -5729,6 +6441,11 @@
         }
         loadOutput(id).then(function() { focusInputBox(true); });
         subscribeToSession(id);
+        // 切换会话时清掉旧 git 状态，再异步刷新
+        state.gitStatus = null;
+        state.gitStatusSessionId = null;
+        updateTopbarGitBadge();
+        loadGitStatus(id, { force: true });
       }
 
       function updatePinState() {
@@ -7622,6 +8339,148 @@
         }
       }
 
+      function createOptimizeShimmer(inputBox, text) {
+        var composer = inputBox.closest(".input-composer");
+        if (!composer) return null;
+        // 用 mirror 元素同步 textarea 的文字 + 字体 + 排版参数，叠在
+        // textarea 之上。mirror 自身 color: transparent + background-clip:
+        // text，让动画渐变只在文字字符形状内显示——空白处完全透明，所以
+        // 视觉上只有"几个字"被光扫过，像魔法橡皮擦掠过文字本身，而不是
+        // 整个输入框背景在闪。
+        var rect = inputBox.getBoundingClientRect();
+        var composerRect = composer.getBoundingClientRect();
+        var style = window.getComputedStyle(inputBox);
+        var mirror = document.createElement("div");
+        mirror.className = "prompt-optimize-shimmer-overlay";
+        mirror.textContent = text;
+        // 与 textarea 同坐标同尺寸（composer 是 position:relative，所以
+        // 用相对 composer 的 offset；不直接用 inputBox.offsetTop 是因为
+        // textarea 可能有变换/包裹元素，getBoundingClientRect 更稳）。
+        mirror.style.top = (rect.top - composerRect.top) + "px";
+        mirror.style.left = (rect.left - composerRect.left) + "px";
+        mirror.style.width = rect.width + "px";
+        mirror.style.height = rect.height + "px";
+        // 复制 textarea 的字符排版，确保 mirror 上的字符与 textarea 渲染
+        // 的字符像素级对齐（错位会让"光从文字扫过"看起来糊掉）。
+        mirror.style.fontFamily = style.fontFamily;
+        mirror.style.fontSize = style.fontSize;
+        mirror.style.fontWeight = style.fontWeight;
+        mirror.style.fontStyle = style.fontStyle;
+        mirror.style.lineHeight = style.lineHeight;
+        mirror.style.letterSpacing = style.letterSpacing;
+        mirror.style.wordSpacing = style.wordSpacing;
+        mirror.style.textAlign = style.textAlign;
+        mirror.style.textIndent = style.textIndent;
+        mirror.style.paddingTop = style.paddingTop;
+        mirror.style.paddingRight = style.paddingRight;
+        mirror.style.paddingBottom = style.paddingBottom;
+        mirror.style.paddingLeft = style.paddingLeft;
+        mirror.style.boxSizing = style.boxSizing;
+        composer.appendChild(mirror);
+        return mirror;
+      }
+
+      var promptOptimizeInFlight = false;
+      function optimizePromptText() {
+        if (promptOptimizeInFlight) return;
+        var inputBox = document.getElementById("input-box");
+        var btn = document.getElementById("prompt-optimize-btn");
+        var composer = document.querySelector(".input-composer");
+        if (!inputBox) return;
+        var raw = (inputBox.value || "").trim();
+        if (!raw) {
+          if (typeof showToast === "function") showToast("请先输入要优化的内容。", "info");
+          inputBox.focus();
+          return;
+        }
+        promptOptimizeInFlight = true;
+        if (btn) {
+          btn.classList.add("is-loading");
+          btn.disabled = true;
+          btn.setAttribute("title", "正在优化…");
+        }
+        if (composer) composer.classList.add("is-optimizing");
+        var shimmerOverlay = createOptimizeShimmer(inputBox, raw);
+        inputBox.setAttribute("aria-busy", "true");
+        var prevReadOnly = inputBox.readOnly;
+        inputBox.readOnly = true;
+
+        var payload = { text: raw };
+        if (state && state.selectedId) payload.sessionId = state.selectedId;
+
+        fetch("/api/optimize-prompt", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify(payload)
+        })
+          .then(function(res) {
+            return res.json().then(function(data) { return { ok: res.ok, data: data }; });
+          })
+          .then(function(result) {
+            if (!result.ok) throw new Error((result.data && result.data.error) || "提示词优化失败。");
+            var optimized = (result.data && result.data.optimized) || "";
+            if (!optimized) throw new Error("Claude 返回为空。");
+            animateOptimizedReplace(inputBox, optimized);
+          })
+          .catch(function(error) {
+            if (typeof showToast === "function") showToast((error && error.message) || "提示词优化失败。", "error");
+            if (btn) {
+              btn.classList.remove("is-loading");
+              btn.classList.add("is-shake");
+              setTimeout(function() { if (btn) btn.classList.remove("is-shake"); }, 400);
+            }
+          })
+          .finally(function() {
+            promptOptimizeInFlight = false;
+            if (btn) {
+              btn.classList.remove("is-loading");
+              btn.disabled = false;
+              btn.setAttribute("title", "提示词优化（AI）");
+            }
+            if (composer) composer.classList.remove("is-optimizing");
+            if (shimmerOverlay && shimmerOverlay.parentNode) {
+              shimmerOverlay.parentNode.removeChild(shimmerOverlay);
+            }
+            inputBox.removeAttribute("aria-busy");
+            inputBox.readOnly = prevReadOnly;
+          });
+      }
+
+      function animateOptimizedReplace(inputBox, finalText) {
+        if (!inputBox) return;
+        // Typewriter-style fill so user sees the replacement happen
+        var chars = Array.from(finalText);
+        var total = chars.length;
+        if (total === 0) {
+          inputBox.value = "";
+          setDraftValue("", true);
+          autoResizeInput(inputBox);
+          return;
+        }
+        var totalDuration = Math.min(700, Math.max(220, total * 8));
+        var stepCount = Math.min(total, 60);
+        var charsPerStep = Math.ceil(total / stepCount);
+        var stepDelay = totalDuration / stepCount;
+        var i = 0;
+        inputBox.value = "";
+        autoResizeInput(inputBox);
+        function tick() {
+          i = Math.min(total, i + charsPerStep);
+          inputBox.value = chars.slice(0, i).join("");
+          autoResizeInput(inputBox);
+          if (i < total) {
+            setTimeout(tick, stepDelay);
+          } else {
+            setDraftValue(finalText, true);
+            try { inputBox.setSelectionRange(finalText.length, finalText.length); } catch (e) { /* ignore */ }
+            inputBox.classList.add("optimize-flash");
+            setTimeout(function() { inputBox.classList.remove("optimize-flash"); }, 900);
+          }
+        }
+        tick();
+      }
+
       function autoResizeInput(el) {
         if (!el) return;
         var minHeight = 36;
@@ -8060,7 +8919,7 @@
         // Container just flipped from hidden -> visible (or geometry changed
         // because chat/terminal panels swapped). Refit now so the terminal
         // picks up the real cols/rows instead of keeping the stale ones.
-        if (!structured) ensureTerminalFit("view-switch");
+        if (!structured) ensureTerminalFit("view-switch", { forceReplay: true });
       }
 
 
@@ -8121,7 +8980,8 @@
 
             return ensureSessionReadyForInput(selectedSession).then(function(readySession) {
               if (!readySession) {
-                showToast("会话未就绪，将稍后重试。", "info");
+                // ensureSessionReadyForInput / resumeClaudeSessionById 已经在失败路径里
+                // 自行 toast，这里不再重复提示，避免叠两条消息。
                 return null;
               }
               var submitView = state.currentView;
@@ -8155,29 +9015,25 @@
           return Promise.resolve();
         }
 
-        var isQueueing = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
-        if (!isQueueing) {
-          // Immediately render user message with thinking indicator
-          var userTurn = { role: "user", content: [{ type: "text", text: input }] };
-          var userMsgs = stripRenderOnlyStructuredMessages(Array.isArray(session.messages) ? session.messages.slice() : []);
-          userMsgs.push(userTurn);
-          var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
-          // Write optimistic user turn into session.messages so WS updates
-          // that arrive before the HTTP response don't erase it.
-          updateSessionSnapshot({
-            id: session.id,
-            status: "running",
-            messages: userMsgs,
-            structuredState: optimisticStructuredState,
-          });
-          state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
-            status: "running",
-            messages: userMsgs,
-            structuredState: optimisticStructuredState,
-          }), userMsgs);
-          updateInputHint("思考中…");
-          renderChat(true);
-        }
+        var isInterrupting = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
+        // Immediately render user message with thinking indicator
+        var userTurn = { role: "user", content: [{ type: "text", text: input }] };
+        var userMsgs = stripRenderOnlyStructuredMessages(Array.isArray(session.messages) ? session.messages.slice() : []);
+        userMsgs.push(userTurn);
+        var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
+        updateSessionSnapshot({
+          id: session.id,
+          status: "running",
+          messages: userMsgs,
+          structuredState: optimisticStructuredState,
+        });
+        state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
+          status: "running",
+          messages: userMsgs,
+          structuredState: optimisticStructuredState,
+        }), userMsgs);
+        updateInputHint("思考中…");
+        renderChat(true);
 
         if (inputBox) {
           inputBox.value = "";
@@ -8194,17 +9050,21 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({ input: input })
+          body: JSON.stringify({ input: input, interrupt: isInterrupting || undefined })
+        })
+        .then(function(res) {
+          if (!res.ok) {
+            return res.json().catch(function() { return { error: "请求失败" }; }).then(function(payload) {
+              throw new Error((payload && payload.error) || "无法发送结构化消息。");
+            });
+          }
+          return res.json();
         })
-        .then(function(res) { return res.json(); })
         .then(function(snapshot) {
           if (snapshot && snapshot.error) {
             throw new Error(snapshot.error);
           }
           if (snapshot && snapshot.id) {
-            // If a WS update has already bumped the queue epoch, the HTTP
-            // response's queuedMessages is stale — drop it to avoid
-            // re-introducing already-dequeued items.
             if (state.queueEpoch > epochBeforePost && snapshot.queuedMessages) {
               delete snapshot.queuedMessages;
             }
@@ -8212,13 +9072,8 @@
             var refreshedSession = state.sessions.find(function(s) { return s.id === snapshot.id; }) || snapshot;
             state.currentMessages = buildMessagesForRender(refreshedSession, getPreferredMessages(refreshedSession, snapshot.output, false));
             renderChat(true);
-            if (isQueueing) {
-              var queuedCount = getStructuredQueuedInputs(refreshedSession).length;
-              if (queuedCount > 0) {
-                showToast("已排队（第 " + queuedCount + " 条），将在当前消息处理完成后自动发送。", "info");
-              }
-            } else {
-              updateInputHint("Enter 发送 · Shift+Enter 换行");
+            if (isInterrupting) {
+              showToast("已中断上一条回复，正在处理新消息…", "info");
             }
           }
         })
@@ -8359,7 +9214,10 @@
       }
 
       function canAutoResumeSession(session) {
-        return !!(session && session.provider === "claude" && session.status === "exited" && session.claudeSessionId && hasRealConversationHistory(session));
+        // 只要是 Claude provider + 非运行中 + 有 claudeSessionId，
+        // 就允许在用户发送时静默触发恢复。不再要求 messages 里同时
+        // 有 user + assistant 文本（slim 列表/截断历史会让该判断失真）。
+        return !!(session && session.provider === "claude" && session.status !== "running" && session.claudeSessionId);
       }
 
       function ensureSessionReadyForInput(session, errorEl) {
@@ -8376,7 +9234,7 @@
           return Promise.resolve(null);
         }
 
-        showToast("正在恢复历史会话…", "info");
+        // 静默恢复：不再弹 "正在恢复历史会话…" 提示，让用户发送动作看起来无缝。
         return resumeClaudeSessionById(session.claudeSessionId, errorEl).then(function(data) {
           if (!data) return null;
           updateSessionSnapshot(data);
@@ -8729,17 +9587,20 @@
           }
         }
         var disableStructuredInput = !!selectedSession && structured && isCodex && !isRunning;
+        // 历史会话只要可自动恢复（Claude provider + 有 claudeSessionId），
+        // 输入框/发送按钮就保持可用——发送时由 ensureSessionReadyForInput 透明完成恢复。
+        var canResumeOnSend = !structured && !isRunning && canAutoResumeSession(selectedSession);
         if (composer) {
           composer.placeholder = getComposerPlaceholder(selectedSession, state.terminalInteractive);
-          composer.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning);
+          composer.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning && !canResumeOnSend);
           composer.setAttribute("aria-disabled", composer.disabled ? "true" : "false");
         }
         var sendBtn = document.getElementById("send-input-button");
         if (sendBtn) {
-          sendBtn.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning);
+          sendBtn.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning && !canResumeOnSend);
           sendBtn.setAttribute("title", isCodex
             ? (isRunning ? "发送给 Codex" : "Codex 会话已结束")
-            : (structured ? "发送" : (!selectedSession || isRunning ? "发送" : "会话已结束")));
+            : (structured ? "发送" : (!selectedSession || isRunning || canResumeOnSend ? "发送" : "会话已结束")));
         }
         var container = document.getElementById("output");
         if (container) container.classList.toggle("interactive", !structured && state.terminalInteractive);
@@ -8902,6 +9763,12 @@
       function flushPendingMessages() {
         if (state.pendingMessages.length === 0) return;
 
+        var selectedSession = getSelectedSession();
+        if (isStructuredSession(selectedSession)) {
+          state.pendingMessages = [];
+          return;
+        }
+
         // Send queued messages in order, bypassing the session-running check
         // since our local state may be stale right after reconnect
         var queue = state.pendingMessages.slice();
@@ -9169,6 +10036,10 @@
 
       function activateSession(data) {
         if (!data || !data.id) return Promise.resolve();
+        state.selectedId = data.id;
+        persistSelectedId();
+        state.currentMessages = [];
+        teardownTerminal();
         resetChatRenderCache();
         switchToSessionView(data.id);
         updateSessionSnapshot(data);
@@ -9359,15 +10230,15 @@
       }
 
       function updateInputPanelViewportSpacing() {
+        // 旧实现给 input-panel 加底部 padding = 键盘高度，意图是腾出键盘
+        // 空间。但 input-panel 本身位置由 flex 决定，padding 增大只是把
+        // panel 自身撑高、内部底部多出空白，textarea（panel 顶部）反而
+        // 被往上推、离键盘更远。新方案改为让 body 高度跟随 visualViewport
+        // 收缩（见 syncAppViewportHeight），input-panel 自然贴键盘上沿。
+        // 这里清掉旧 keyboard-offset，避免新旧双重补偿。
         var inputPanel = document.querySelector('.input-panel');
         if (!inputPanel) return;
-        if (!('visualViewport' in window) || !isTouchDevice()) {
-          inputPanel.style.removeProperty('--keyboard-offset');
-          return;
-        }
-        var vv = window.visualViewport;
-        var offsetBottom = Math.max(0, window.innerHeight - vv.height - vv.offsetTop);
-        inputPanel.style.setProperty('--keyboard-offset', offsetBottom + 'px');
+        inputPanel.style.removeProperty('--keyboard-offset');
       }
 
       function resetInputPanelViewportSpacing() {
@@ -9420,7 +10291,7 @@
           // The container height restores but terminal needs time to
           // fill the expanded space, and the scroll position needs resetting.
           if (isTouchDevice()) {
-            ensureTerminalFit();
+            ensureTerminalFit("keyboard-blur", { forceReplay: true });
             maybeScrollTerminalToBottom("force");
           }
         }, 100);
@@ -10098,14 +10969,14 @@
         var terminalContainer = document.querySelector('.terminal-container');
 
         // Virtual Keyboard API (Chrome/Edge)
+        // 不再给 input-panel 直接 setPaddingBottom——新方案通过
+        // syncAppViewportHeight 让 body 跟随可见视口收缩，input-panel
+        // 自然上移。这里只把事件留作未来钩子，避免和新方案双重补偿。
         if ('virtualKeyboard' in navigator) {
           var vk = navigator.virtualKeyboard;
-
           vk.addEventListener('geometrychange', function() {
             if (!inputPanel) return;
-            var rect = vk.boundingRect;
-            var kbHeight = rect ? rect.height : 0;
-            inputPanel.style.paddingBottom = kbHeight > 0 ? kbHeight + 'px' : '';
+            inputPanel.style.removeProperty('padding-bottom');
           });
         }
 
@@ -10128,6 +10999,26 @@
         }
       }
 
+      // 把 body / .app-container 的高度从 100dvh 切换为可见视口高度，
+      // 这样键盘弹起时整个 flex column 自动收缩，input-panel 跟着上移到
+      // 键盘上沿。Android targetSdk 36 在 edge-to-edge 默认开启时，
+      // adjustResize 不再自动 resize WebView 内容；同时仅给 input-panel
+      // 加 padding-bottom 只是把 panel 内部底部撑空，并不会让 panel 自身
+      // 上移。这里通过 CSS 变量驱动整层高度，是跨 WebView/Chrome/PWA 的
+      // 统一兜底。仅在视口比窗口明显变小时（典型 = 软键盘弹起）覆盖，
+      // 桌面与无键盘场景维持 100dvh 不抖。
+      function syncAppViewportHeight() {
+        var vv = window.visualViewport;
+        if (!vv) return;
+        var diff = window.innerHeight - vv.height - vv.offsetTop;
+        var root = document.documentElement;
+        if (diff > 50) {
+          root.style.setProperty('--app-viewport-height', vv.height + 'px');
+        } else {
+          root.style.removeProperty('--app-viewport-height');
+        }
+      }
+
       // Visual viewport handling for better mobile keyboard support
       function setupVisualViewportHandlers() {
         if (!('visualViewport' in window)) return;
@@ -10143,6 +11034,10 @@
           var isKeyboardOpen = offsetBottom > 50;
           var heightChanged = Math.abs(vv.height - lastHeight) > 8;
 
+          // 键盘开/关与视口尺寸变化时同步 --app-viewport-height，
+          // 让 body 高度跟随可见区域，input-panel 自然贴键盘上沿。
+          syncAppViewportHeight();
+
           if (isKeyboardOpen && (!keyboardOpen || heightChanged) && shouldAdjustForKeyboard(vv, inputBox)) {
             syncInputBoxScroll(inputBox);
           }
@@ -10152,14 +11047,14 @@
           // Without an immediate refit, any chunk arriving while the keyboard
           // animates in renders against the old grid and tears the screen.
           if (!keyboardOpen && isKeyboardOpen) {
-            ensureTerminalFit("keyboard-open");
+            ensureTerminalFit("keyboard-open", { forceReplay: true });
           }
 
           // Keyboard just closed — force terminal refit and scroll to bottom
           // after a delay so the keyboard dismiss animation and layout settle.
           if (keyboardOpen && !isKeyboardOpen) {
             setTimeout(function() {
-              ensureTerminalFit("keyboard-close");
+              ensureTerminalFit("keyboard-close", { forceReplay: true });
               maybeScrollTerminalToBottom("force");
             }, 200);
           }
@@ -10293,11 +11188,11 @@
         // Page returning from background: container dimensions may have
         // drifted (PWA standalone, tab switch, iOS address-bar toggle).
         state.visibilityHandler = function() {
-          if (!document.hidden) ensureTerminalFit("visibility");
+          if (!document.hidden) ensureTerminalFit("visibility", { forceReplay: true });
         };
         document.addEventListener("visibilitychange", state.visibilityHandler);
         // Mobile device rotation — large geometry change.
-        state.orientationHandler = function() { ensureTerminalFit("orientation"); };
+        state.orientationHandler = function() { ensureTerminalFit("orientation", { forceReplay: true }); };
         window.addEventListener("orientationchange", state.orientationHandler);
         requestAnimationFrame(function() { scheduleTerminalResize(true); });
       }
@@ -10393,6 +11288,18 @@
           state.terminal.destroy();
           state.terminal = null;
         }
+        // wterm.destroy() 只把 termWrap.innerHTML 置空，节点本身还挂在
+        // #output 上。多次会话切换会让 N 个 .terminal-scroll-wrap 叠在
+        // 同一 inset:0 位置；新 init 又 appendChild 一个新 termWrap，
+        // 旧节点的 DOM 行虽被清空，但 scroll/层叠状态可能造成跨会话视觉
+        // 污染。这里把残留节点彻底移除。
+        if (output) {
+          var staleWraps = output.querySelectorAll(".terminal-scroll-wrap");
+          for (var i = 0; i < staleWraps.length; i++) {
+            var wrap = staleWraps[i];
+            if (wrap.parentNode === output) output.removeChild(wrap);
+          }
+        }
         state.terminalSessionId = null;
         state.terminalOutput = "";
         state.terminalAutoFollow = true;
@@ -10416,40 +11323,53 @@
         }
       }
 
-      // Unified entry point for re-fitting the xterm grid to its container.
-      // Why: wterm's `autoResize` ResizeObserver only fires on subsequent
-      // container size changes. If the terminal is mounted or written to
-      // while the container is hidden/zero-width, cols/rows stay wrong and
-      // new output renders with broken wrapping (content visually piles at
-      // the top). Call this after any layout change that might have altered
-      // container geometry (mount, session switch, view switch, refresh).
-      function ensureTerminalFit(reason) {
+      // Unified entry point for re-fitting the wterm grid to its container.
+      //
+      // wterm's internal ResizeObserver only fires when newCols/newRows
+      // actually differ from the current values. So a "soft refresh" path
+      // (refresh button, ws-reconnect, view-switch — container size unchanged)
+      // never reaches wterm.resize() on its own; we have to drive replay
+      // explicitly via { forceReplay: true }.
+      //
+      // When cols *do* change in the rAF body, our remeasure() calls
+      // wterm.resize() which synchronously fires the onResize callback —
+      // and that callback already runs softResyncTerminal({ skipFit: true }).
+      // So the rAF body must NOT replay again in that case (would flicker /
+      // double-scroll). The two outcomes are mutually exclusive: either
+      // remeasure resized and onResize replayed, or cols stayed put and we
+      // honor forceReplay.
+      function ensureTerminalFit(reason, options) {
         if (!state.terminal) return false;
+        var opts = options || {};
+        var forceReplay = opts.forceReplay === true;
         var el = document.getElementById("output");
-        if (!el || el.offsetWidth === 0 || el.offsetHeight === 0) return false;
+        if (!el || el.offsetWidth === 0 || el.offsetHeight === 0) {
+          // Container has no visible size yet (hidden, mid-transition,
+          // pre-keyboard layout frame, Android WebView resume). Defer to
+          // the retry loop; without it, a missed fit means PTY chunks keep
+          // wrapping at the wrong width until the next external trigger
+          // (rotation, keyboard toggle), and content piles at the top.
+          ensureTerminalFitWithRetry(reason || "fit-retry", { forceReplay: forceReplay });
+          return false;
+        }
         var prevCols = state.terminal.cols;
         var prevRows = state.terminal.rows;
         requestAnimationFrame(function() {
           requestAnimationFrame(function() {
             if (!state.terminal) return;
             if (typeof state.terminal.remeasure === "function") {
+              // remeasure → wterm.resize (if cols changed) → onResize →
+              // softResyncTerminal({ skipFit: true }). Replay happens there.
               state.terminal.remeasure();
             }
             sendTerminalResize(state.terminal.cols, state.terminal.rows);
-            // Cache the container width that produced this cols/rows so the
-            // hot-path chunk writer can detect drift cheaply (avoids running
-            // a full remeasure on every WebSocket message).
-            state.lastFitContainerWidth = el.offsetWidth;
-            state.lastFitContainerHeight = el.offsetHeight;
-            // If cols actually changed, the previously written buffer was
-            // wrapped to the old width. Replay the full buffer so historical
-            // lines and any in-flight CSI cursor sequences re-render against
-            // the new grid — this is what fixes the "torn" screens users see
-            // after rotating, opening the keyboard, or resizing the panel.
-            var skipReplay = state.suppressFitReplay === true;
-            state.suppressFitReplay = false;
-            if (!skipReplay && (state.terminal.cols !== prevCols || state.terminal.rows !== prevRows)) {
-              if (state.terminalOutput) softResyncTerminal();
+            var didResize = state.terminal.cols !== prevCols
+                         || state.terminal.rows !== prevRows;
+            // Mutex: didResize already replayed via onResize; otherwise the
+            // caller may still demand a replay (e.g. ws-reconnect, refresh
+            // button — DOM may be stale even at the same cols).
+            if (!didResize && forceReplay && state.terminalOutput) {
+              softResyncTerminal({ skipFit: true });
             }
             if (state.terminalAutoFollow || isTerminalNearBottom()) {
               maybeScrollTerminalToBottom("resize");
@@ -10459,41 +11379,40 @@
         return true;
       }
 
-      // Cheap cols/rows drift check — call before writing a new PTY chunk so
-      // the chunk renders against the correct grid even if ResizeObserver
-      // hasn't fired yet (e.g. mobile keyboard mid-animation, iOS PWA address
-      // bar collapse, panel drag in progress). Only runs a real remeasure
-      // when the container width changed since the last fit; otherwise it is
-      // effectively a single offsetWidth read.
-      function maybeRefitTerminal() {
+      // Same as ensureTerminalFit but spins through requestAnimationFrame /
+      // setTimeout up to ~8 frames waiting for a non-zero container size
+      // (Android WebView.onResume, keyboard transitions, hidden→visible
+      // panel flips). Forwards forceReplay so the caller's intent is
+      // preserved when the container finally settles.
+      function ensureTerminalFitWithRetry(reason, options) {
         if (!state.terminal) return;
-        var el = document.getElementById("output");
-        if (!el) return;
-        var w = el.offsetWidth;
-        var h = el.offsetHeight;
-        if (w === 0 || h === 0) return;
-        // First call: just record the baseline and let ensureTerminalFit
-        // (called from initTerminal/mount) own the initial sync.
-        if (state.lastFitContainerWidth === undefined) {
-          state.lastFitContainerWidth = w;
-          state.lastFitContainerHeight = h;
-          return;
-        }
-        if (w === state.lastFitContainerWidth && h === state.lastFitContainerHeight) return;
-        state.lastFitContainerWidth = w;
-        state.lastFitContainerHeight = h;
-        var prevCols = state.terminal.cols;
-        var prevRows = state.terminal.rows;
-        if (typeof state.terminal.remeasure === "function") {
-          state.terminal.remeasure();
-        }
-        if (state.terminal.cols !== prevCols || state.terminal.rows !== prevRows) {
-          sendTerminalResize(state.terminal.cols, state.terminal.rows);
-          // Don't replay here: the caller is about to write a fresh chunk and
-          // a softResync would race with it. The chunk itself will reach the
-          // correct grid; older buffer drift is repaired by the next
-          // ensureTerminalFit / health check / manual refresh.
+        var opts = options || {};
+        var forceReplay = opts.forceReplay !== false; // default true: retry path implies "may be stale"
+        var attempts = 0;
+        var maxAttempts = 8;
+        function tryFit() {
+          if (!state.terminal) return;
+          var el = document.getElementById("output");
+          if (el) {
+            // Force a layout flush so offsetWidth reflects the post-resume
+            // container size, not a stale 0 from the suspended frame.
+            void el.offsetHeight;
+          }
+          if (el && el.offsetWidth > 0 && el.offsetHeight > 0) {
+            ensureTerminalFit(reason, { forceReplay: forceReplay });
+            return;
+          }
+          if (++attempts >= maxAttempts) return;
+          // Mix rAF and timeout: some Android WebView versions skip rAF
+          // during the first frame after resume, so falling back to a
+          // 16ms timer guarantees forward progress.
+          if (attempts <= 4) {
+            requestAnimationFrame(tryFit);
+          } else {
+            setTimeout(tryFit, 32);
+          }
         }
+        tryFit();
       }
 
       function scheduleTerminalResize(immediate) {
@@ -10535,7 +11454,54 @@
         if (timeEls.length > 0) scheduleSessionListUpdate();
       }, 30000);
 
-      function initWebSocket() {
+      function cancelWsReconnect() {
+        if (state.wsReconnectTimer) {
+          clearTimeout(state.wsReconnectTimer);
+          state.wsReconnectTimer = null;
+        }
+      }
+
+      // Drop any in-flight socket and start a new one *now* — used by the
+      // Android resume bridge to recover from zombie connections (socket
+      // still says OPEN, but the TCP path was torn down by Doze). Skips
+      // the backoff timer; the caller has already decided this is urgent.
+      function forceReconnectWebSocket(reason) {
+        cancelWsReconnect();
+        if (state.ws) {
+          var stale = state.ws;
+          // Detach handlers so the imminent close doesn't trigger another
+          // reconnect path while we're already starting a fresh one.
+          try { stale.onclose = null; } catch (e) { /* ignore */ }
+          try { stale.onerror = null; } catch (e) { /* ignore */ }
+          try { stale.close(); } catch (e) { /* ignore */ }
+          state.ws = null;
+        }
+        state.wsConnected = false;
+        state.wsReconnectAttempts = 0;
+        initWebSocket(reason);
+      }
+
+      function scheduleWsReconnect() {
+        if (state.wsReconnectTimer) return;
+        // Don't burn battery reconnecting while hidden — the resume
+        // listener will kick a fresh connect when we're foreground.
+        if (document.hidden) return;
+        var attempt = state.wsReconnectAttempts || 0;
+        // 0.5s, 1s, 2s, 4s, then capped at 8s. Faster than the old
+        // fixed 2s on the first retry (matters for transient blips)
+        // and bounded so a flapping server doesn't get hammered.
+        var delays = [500, 1000, 2000, 4000, 8000];
+        var delay = delays[attempt < delays.length ? attempt : delays.length - 1];
+        state.wsReconnectAttempts = attempt + 1;
+        state.wsReconnectTimer = setTimeout(function() {
+          state.wsReconnectTimer = null;
+          if (state.config && !state.ws && !document.hidden) {
+            initWebSocket("backoff");
+          }
+        }, delay);
+      }
+
+      function initWebSocket(reason) {
         if (!window.WebSocket) return false;
 
         // Prevent duplicate connections
@@ -10553,6 +11519,10 @@
           ws.onopen = function() {
             state.ws = ws;
             state.wsConnected = true;
+            // Reset backoff on a successful connect so the next disconnect
+            // starts the ladder from 500ms again.
+            state.wsReconnectAttempts = 0;
+            cancelWsReconnect();
             // Subscribe to current session if any
             subscribeToSession(state.selectedId);
             // Flush pending messages after reconnection
@@ -10560,7 +11530,10 @@
             // Re-fit terminal on reconnect — the viewport may have changed
             // while disconnected, so remeasure against real container size
             // rather than sending stale cols/rows from before the disconnect.
-            ensureTerminalFit("ws-reconnect");
+            // Use the retry variant: when the reconnect is triggered by
+            // Android resume, the WebView container may still be 0×0 for
+            // the first 1–2 frames while layout settles.
+            ensureTerminalFitWithRetry("ws-reconnect");
           };
 
           ws.onmessage = function(event) {
@@ -10575,12 +11548,7 @@
           ws.onclose = function() {
             state.ws = null;
             state.wsConnected = false;
-            // Reconnect after 2 seconds
-            setTimeout(function() {
-              if (state.config && !state.ws) {
-                initWebSocket();
-              }
-            }, 2000);
+            scheduleWsReconnect();
           };
 
           ws.onerror = function() {
@@ -10589,6 +11557,9 @@
 
           return true;
         } catch (e) {
+          // Constructor threw (rare — bad URL, blocked scheme). Try again
+          // through the backoff path so we don't get stuck.
+          scheduleWsReconnect();
           return false;
         }
       }
@@ -10675,11 +11646,14 @@
                 // Fast path: write chunk directly to avoid full-output comparison.
                 state.lastChunkAt = Date.now();
                 state.terminalLiveStreamSessions[msg.sessionId] = true;
-                // Detect cheap container-width drift before applying the chunk
-                // so absolute-cursor CSI sequences in the chunk land on the
-                // right grid (otherwise content tears or stacks at the top).
-                maybeRefitTerminal();
-                state.terminal.write(msg.data.chunk);
+                // 不再在 hot-path 调 maybeRefitTerminal/remeasure。它会偷偷把
+                // wterm 的 this.cols 改成新值，让 wterm 自己的 ResizeObserver
+                // 误判 newCols === this.cols 而跳过 wterm.resize() —— 那条路径
+                // 才会真正调 Renderer.setup() 重建 DOM 行。绕过它就让容器尺寸
+                // 变化的视觉错位无法被自愈，直到用户手动改窗口才修。现在让
+                // wterm 内部 ResizeObserver 独占 cols 跟踪职责。
+                wandTerminalWrite(state.terminal, msg.data.chunk);
+                maybeScheduleResyncForChunk(msg.data.chunk);
                 state.terminalSessionId = msg.sessionId;
                 if (msg.data.output) {
                   state.terminalOutput = normalizeTerminalOutput(msg.data.output);
@@ -10813,14 +11787,19 @@
               renderChat(true);
               updateTaskDisplay();
               updateApprovalStats();
-              updateTerminalOutput(msg.data.output || "", msg.sessionId, "append");
-              // Ensure terminal is properly fitted after receiving initial data
-              scheduleTerminalResize(true);
-              if (state.terminal && state.terminal.remeasure) {
-                requestAnimationFrame(function() {
-                  if (state.terminal) state.terminal.remeasure();
-                });
-              }
+              // ws 重新订阅时拿到的是服务端 ring buffer 的最新窗口（最多
+              // 120KB）；客户端缓存的 terminalOutput 可能早于服务端窗口
+              // 的起点。append 模式有 prefix 检查，prefix 不匹配就 reset+
+              // 全量重写、全等就直接 return false——前者会把 alt-screen
+              // 中的 Claude TUI 切走，后者会把"应该按真实 cols 重写"的
+              // 机会跳过。改用 replace 强制 reset+按当前 cols 重写一次，
+              // 这是订阅时唯一可信的全量基线。
+              updateTerminalOutput(msg.data.output || "", msg.sessionId, "replace");
+              // 紧接着等容器有真实尺寸再 fit + softResync：wterm 启动
+              // 硬编码 cols=120，replace 写入也可能落在错的列宽上，
+              // ResizeObserver 的回调是异步的，得用 fit-with-retry 兜
+              // 一次，确保最终一定按真实宽度重排。
+              ensureTerminalFitWithRetry("init");
             }
             break;
           case 'usage':