@co0ontty/wand 1.18.12 → 1.20.4

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

@@ -168,6 +168,16 @@
           }
         })(),
         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);
@@ -1023,6 +1033,11 @@
             syncSessionModalUI();
           }
         }
+
+        // 初始加载或会话切换后惰性触发 git 状态拉取（loadGitStatus 自带节流）。
+        if (isLoggedIn && state.selectedId && state.gitStatusSessionId !== state.selectedId) {
+          loadGitStatus(state.selectedId);
+        }
       }
 
       function renderShortcutKeys() {
@@ -1225,6 +1240,7 @@
                 '</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">' +
@@ -1313,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">' +
@@ -1389,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() {
@@ -3752,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) {
@@ -3939,7 +4284,9 @@
             location.reload();
             return;
           }
-          softRefreshCurrentView();
+          softResyncTerminal();
+          resetChatRenderCache();
+          scheduleChatRender(true);
         });
         var jumpBottomBtn = document.getElementById("terminal-jump-bottom");
         if (jumpBottomBtn) jumpBottomBtn.addEventListener("click", function() {
@@ -4335,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();
@@ -4927,48 +5291,41 @@
       stripWideFillerForCopy();
 
       function resetTerminal() {
-        if (!state.terminal || typeof state.terminal.write !== "function") return;
-        // @wterm/dom 的 WTerm 类没有暴露 reset() 方法（grep 全包零匹配），
-        // 所以早期的 state.terminal.reset() 调用是 no-op——softResyncTerminal
-        // 实际只做了"再写一份 terminalOutput 追加"，旧 grid 不会被清空，
-        // 这就是"点刷新按钮没用、只有窗口尺寸变化才修"的根因。
-        // 改用 ANSI RIS (Reset to Initial State, ESC c) 让 WASM 状态机自己
-        // 重置 grid / 光标 / 属性 / scrollback，所有 VT 实现都支持这个序列。
-        state.terminal.write("\x1bc");
+        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();
         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() {
@@ -4977,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 || "");
@@ -5020,6 +5399,7 @@
           var delta = normalizedOutput.slice(currentOutput.length);
           if (delta) {
             wandTerminalWrite(state.terminal, delta);
+            maybeScheduleResyncForChunk(delta);
             wrote = true;
           }
         } else if (currentOutput && currentOutput.startsWith(normalizedOutput)) {
@@ -5059,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);
@@ -5074,18 +5476,15 @@
           },
           onResize: function(cols, rows) {
             sendTerminalResize(cols, rows);
-            // wterm 自身 ResizeObserver 在容器尺寸变化时主动调 resize()，
-            // bridge.resize() 把 grid 按新 cols 重排，但 scrollback 仍是
-            // 按旧 cols 写入 WASM 的、新 grid 又被清空到干净状态。wand
-            // 这层缓存的 terminalOutput 才是完整原始字节流，必须按新
-            // cols 重放一次，grid + scrollback 才会和实际历史对齐。
-            // 同步立即重放——不要走 setTimeout(0)：移动端 WebView 在
-            // 前后台切换或键盘动画期间，macrotask 经常被推迟到 wterm
-            // 的下一帧 render 之后，结果用户先看到一帧空 grid 才看到
-            // replay 完的内容，体感上就是"刷新都没用、动一下窗口才好"。
+            // 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) {
-              state.suppressFitReplay = true;
-              softResyncTerminal();
+              softResyncTerminal({ skipFit: true });
             }
           }
         });
@@ -5152,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);
@@ -5812,6 +6211,9 @@
               }
             }
             updateShellChrome();
+            if (state.selectedId && state.gitStatusSessionId !== state.selectedId) {
+              loadGitStatus(state.selectedId);
+            }
 
             var reloadPromise = Promise.resolve();
             if (!opts.skipSelectedOutputReload && state.selectedId) {
@@ -5973,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; });
@@ -5991,6 +6408,9 @@
         if (!foundSession) {
           return;
         }
+        if (state.selectedId !== id) {
+          teardownTerminal();
+        }
         state.selectedId = id;
         persistSelectedId();
         state.toolContentCache = {};
@@ -6021,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() {
@@ -7914,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;
@@ -8352,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 });
       }
 
 
@@ -8413,7 +8980,8 @@
 
             return ensureSessionReadyForInput(selectedSession).then(function(readySession) {
               if (!readySession) {
-                showToast("会话未就绪，将稍后重试。", "info");
+                // ensureSessionReadyForInput / resumeClaudeSessionById 已经在失败路径里
+                // 自行 toast，这里不再重复提示，避免叠两条消息。
                 return null;
               }
               var submitView = state.currentView;
@@ -8646,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) {
@@ -8663,7 +9234,7 @@
           return Promise.resolve(null);
         }
 
-        showToast("正在恢复历史会话…", "info");
+        // 静默恢复：不再弹 "正在恢复历史会话…" 提示，让用户发送动作看起来无缝。
         return resumeClaudeSessionById(session.claudeSessionId, errorEl).then(function(data) {
           if (!data) return null;
           updateSessionSnapshot(data);
@@ -9016,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);
@@ -9462,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);
@@ -9652,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() {
@@ -9713,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);
@@ -10391,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');
           });
         }
 
@@ -10421,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;
@@ -10436,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);
           }
@@ -10445,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);
           }
@@ -10586,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); });
       }
@@ -10686,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;
@@ -10709,24 +11323,71 @@
         }
       }
 
-      // 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).
-      // Same as ensureTerminalFit, but if the container is currently 0×0
-      // (typical right after Android WebView.onResume — the page hasn't
-      // re-laid-out yet), keep retrying through requestAnimationFrame /
-      // setTimeout up to ~5 frames. Each attempt forces a layout read
-      // (offsetHeight) so the browser has to flush styles.
-      // Without this, the very first ensureTerminalFit silently fails,
-      // cols/rows stay at the pre-suspend values, and freshly arriving
-      // PTY chunks wrap against the wrong width — that's exactly the
-      // "content piles at the top after resuming the app" bug.
-      function ensureTerminalFitWithRetry(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) {
+          // 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);
+            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");
+            }
+          });
+        });
+        return true;
+      }
+
+      // 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 opts = options || {};
+        var forceReplay = opts.forceReplay !== false; // default true: retry path implies "may be stale"
         var attempts = 0;
         var maxAttempts = 8;
         function tryFit() {
@@ -10738,16 +11399,7 @@
             void el.offsetHeight;
           }
           if (el && el.offsetWidth > 0 && el.offsetHeight > 0) {
-            ensureTerminalFit(reason);
-            // After fit, force a buffer replay: even when cols didn't
-            // change, the WASM grid state may be inconsistent after a
-            // long suspend (DOM rows clipped, scroll position lost).
-            // softResyncTerminal is cheap because terminalOutput is
-            // already in memory.
-            if (state.terminalOutput) {
-              state.suppressFitReplay = true;
-              softResyncTerminal();
-            }
+            ensureTerminalFit(reason, { forceReplay: forceReplay });
             return;
           }
           if (++attempts >= maxAttempts) return;
@@ -10763,51 +11415,6 @@
         tryFit();
       }
 
-      function ensureTerminalFit(reason) {
-        if (!state.terminal) return false;
-        var el = document.getElementById("output");
-        if (!el || el.offsetWidth === 0 || el.offsetHeight === 0) {
-          // 容器暂时没有可见尺寸（hidden、动画过渡、键盘弹起前的 layout
-          // 中间帧、Android WebView resume 头几帧），不要静默放弃——
-          // 改成丢给 ensureTerminalFitWithRetry 兜底，等容器有了真实
-          // 尺寸再 fit + replay。否则一旦错过这一次，只能等下一次外部
-          // 触发（旋转屏幕、开关键盘等），中间的输出就会一直按错误
-          // 宽度堆在视图上方，看起来像"中间一大段都没有显示"。
-          ensureTerminalFitWithRetry(reason || "fit-retry");
-          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") {
-              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();
-            }
-            if (state.terminalAutoFollow || isTerminalNearBottom()) {
-              maybeScrollTerminalToBottom("resize");
-            }
-          });
-        });
-        return true;
-      }
-
       function scheduleTerminalResize(immediate) {
         if (state.resizeTimer) {
           clearTimeout(state.resizeTimer);
@@ -11046,6 +11653,7 @@
                 // 变化的视觉错位无法被自愈，直到用户手动改窗口才修。现在让
                 // 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);