@co0ontty/wand 1.18.12 → 1.21.4

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

@@ -119,6 +119,7 @@
           try { return localStorage.getItem("wand-chat-model") || ""; } catch (e) { return ""; }
         })(),
         availableModels: [],
+        availableCodexModels: [],
         modelsRefreshing: false,
         sessionCreateKind: "structured",
         sessionCreateWorktree: false,
@@ -149,6 +150,10 @@
           try { var v = localStorage.getItem("wand-notif-bubble"); return v === null ? true : v === "true"; } catch (e) { return true; }
         })(),
         toolContentCache: {},
+        // Per-session WS output sequence tracker. Reset on connect/reconnect.
+        // Used to detect gaps caused by server-side backpressure drops and
+        // request a fresh snapshot.
+        lastSeqBySession: {},
         currentView: "terminal",
         terminalScale: (function() {
           try {
@@ -168,6 +173,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);
@@ -225,10 +240,90 @@
       // ── Structured session status bar (in-flight timer) ──
       var _statusBarTimerId = null;
       var _statusBarStartTime = 0;
+      var _runningIndicatorsTimerId = null;
+      var _runningIndicatorsStartTime = 0;
+
+      // 计算会话整体的"在跑"信号，统一驱动顶部进度条/徽章计时/气泡呼吸条。
+      function computeRunningSignal(session) {
+        if (!session) return { active: false };
+        if (session.archived) return { active: false };
+        var permBlocked = !!session.permissionBlocked;
+        var inFlight = !!(isStructuredSession(session)
+          && session.structuredState && session.structuredState.inFlight);
+        var ptyRunning = !isStructuredSession(session) && session.status === "running";
+        return {
+          active: inFlight || ptyRunning || permBlocked,
+          inFlight: inFlight,
+          ptyRunning: ptyRunning,
+          permissionBlocked: permBlocked,
+        };
+      }
+
+      function formatElapsedShort(ms) {
+        var s = Math.max(0, Math.floor(ms / 1000));
+        if (s < 60) return s + "s";
+        var m = Math.floor(s / 60);
+        var rs = s % 60;
+        if (m < 60) return m + "m" + (rs ? " " + rs + "s" : "");
+        var h = Math.floor(m / 60);
+        var rm = m % 60;
+        return h + "h" + (rm ? " " + rm + "m" : "");
+      }
+
+      // 集中刷新：顶部进度条 + 顶部徽章计时 + 助手气泡左侧呼吸条。
+      function updateRunningIndicators(session) {
+        var sig = computeRunningSignal(session);
+        var headerRow = document.querySelector(".main-header-row");
+        var pill = headerRow ? headerRow.querySelector(".session-status-pill") : null;
+        var chatMessages = document.querySelector(".chat-messages");
+
+        // A. 顶部进度条
+        if (headerRow) {
+          headerRow.classList.toggle("is-running", sig.active);
+          headerRow.classList.toggle("is-permission-blocked", sig.permissionBlocked);
+        }
+
+        // B. 顶部徽章计时（仅 inFlight 显示，PTY running 不强制显示）
+        if (pill) {
+          var elapsedEl = pill.querySelector(".session-status-elapsed");
+          if (sig.inFlight) {
+            if (!_runningIndicatorsStartTime) {
+              // 优先复用 renderStructuredStatusBar 已记录的真实起点
+              _runningIndicatorsStartTime = _statusBarStartTime > 0 ? _statusBarStartTime : Date.now();
+            }
+            var label = formatElapsedShort(Date.now() - _runningIndicatorsStartTime);
+            if (!elapsedEl) {
+              elapsedEl = document.createElement("span");
+              elapsedEl.className = "session-status-elapsed";
+              pill.appendChild(elapsedEl);
+            }
+            elapsedEl.textContent = label;
+          } else {
+            _runningIndicatorsStartTime = 0;
+            if (elapsedEl) elapsedEl.remove();
+          }
+        }
+
+        // 维持每秒一次的刷新心跳，让 elapsed 数字持续滚动
+        if (sig.active) {
+          if (!_runningIndicatorsTimerId) {
+            _runningIndicatorsTimerId = setInterval(function() {
+              var sel = state.sessions.find(function(s) { return s.id === state.selectedId; });
+              updateRunningIndicators(sel);
+            }, 1000);
+          }
+        } else if (_runningIndicatorsTimerId) {
+          clearInterval(_runningIndicatorsTimerId);
+          _runningIndicatorsTimerId = null;
+        }
+      }
 
       function renderStructuredStatusBar(chatMessages, session) {
-        // Status bar now lives above the input-composer, inside .input-panel
-        var inputPanel = document.querySelector(".input-panel");
+        // 先驱动跨视图的运行指示器（顶部进度条/徽章计时/气泡呼吸条）
+        updateRunningIndicators(session);
+
+        // Status bar now lives in .composer-top-row alongside the todo-progress collapse bar
+        var topRow = document.querySelector(".composer-top-row");
         var existing = document.querySelector(".structured-status-bar");
         var composer = document.querySelector(".input-composer");
         if (!session || !isStructuredSession(session)) {
@@ -250,15 +345,15 @@
           // Add glow to input composer
           if (composer) composer.classList.add("in-flight");
 
-          if (!existing && inputPanel && composer) {
+          if (!existing && topRow) {
             var bar = document.createElement("div");
             bar.className = "structured-status-bar";
             bar.innerHTML =
               '<span class="status-bar-dot"></span>' +
               '<span class="status-bar-label">回复中</span>' +
               '<span class="status-bar-timer">0.0s</span>';
-            // Insert right before the input-composer element
-            inputPanel.insertBefore(bar, composer);
+            // Append as last child of the top row so it sits to the right of the todo bar
+            topRow.appendChild(bar);
             existing = bar;
           } else if (existing && existing.classList.contains("completed")) {
             // Was completed, now in-flight again — reset
@@ -1023,6 +1118,17 @@
             syncSessionModalUI();
           }
         }
+
+        // 初始加载或会话切换后惰性触发 git 状态拉取（loadGitStatus 自带节流）。
+        if (isLoggedIn && state.selectedId && state.gitStatusSessionId !== state.selectedId) {
+          loadGitStatus(state.selectedId);
+        }
+
+        // DOM 整体重渲后，重新挂上"运行中"指示器（顶部进度条/徽章计时/气泡呼吸条）
+        if (isLoggedIn) {
+          var __sel = state.sessions.find(function(s) { return s.id === state.selectedId; });
+          updateRunningIndicators(__sel);
+        }
       }
 
       function renderShortcutKeys() {
@@ -1225,6 +1331,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">' +
@@ -1299,20 +1406,31 @@
                 '</div>' +
               '</div>' +
               '<div class="input-panel' + (state.selectedId ? "" : " hidden") + '">' +
-                '<div id="todo-progress" class="todo-progress hidden">' +
-                  '<div class="todo-progress-header" id="todo-progress-toggle">' +
-                    '<div class="todo-progress-left">' +
-                      '<span class="todo-progress-spinner"></span>' +
-                      '<span class="todo-progress-counter" id="todo-progress-counter">0/0</span>' +
-                      '<span class="todo-progress-task" id="todo-progress-task"></span>' +
+                '<div class="composer-top-row">' +
+                  '<div id="todo-progress" class="todo-progress hidden">' +
+                    '<div class="todo-progress-header" id="todo-progress-toggle">' +
+                      '<div class="todo-progress-left">' +
+                        '<span class="todo-progress-spinner"></span>' +
+                        '<span class="todo-progress-counter" id="todo-progress-counter">0/0</span>' +
+                        '<span class="todo-progress-task" id="todo-progress-task"></span>' +
+                      '</div>' +
+                      '<svg class="todo-progress-chevron" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"/></svg>' +
+                    '</div>' +
+                    '<div class="todo-progress-body hidden" id="todo-progress-body">' +
+                      '<ul class="todo-progress-list" id="todo-progress-list"></ul>' +
                     '</div>' +
-                    '<svg class="todo-progress-chevron" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"/></svg>' +
-                  '</div>' +
-                  '<div class="todo-progress-body hidden" id="todo-progress-body">' +
-                    '<ul class="todo-progress-list" id="todo-progress-list"></ul>' +
                   '</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">' +
@@ -1325,7 +1443,7 @@
                         renderModeOptions(preferredTool, composerMode) +
                       '</select>' +
                       '<select id="chat-model-select" class="chat-mode-select chat-model-select" title="切换模型（对运行中会话发送 /model，对新会话作为 --model 启动）">' +
-                        renderChatModelOptions(getEffectiveModel(selectedSession)) +
+                        renderChatModelOptions(getEffectiveModel(selectedSession), selectedSession) +
                       '</select>' +
                       '<button id="terminal-interactive-toggle-top" class="composer-interactive-toggle' + (state.terminalInteractive ? " active" : "") + '" type="button" title="切换终端交互模式">⌨</button>' +
                       '<span class="permission-actions hidden" id="permission-actions">' +
@@ -1389,7 +1507,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() {
@@ -2332,10 +2765,16 @@
 
       function applyTerminalScale() {
         if (!state.terminal || !state.terminal.element) return;
-        var newSize = (state.terminalBaseFontSize * state.terminalScale) + "px";
-        var newRowHeight = (state.terminalBaseFontSize * state.terminalScale * 1.5) + "px";
-        state.terminal.element.style.setProperty("--term-font-size", newSize);
-        state.terminal.element.style.setProperty("--term-row-height", newRowHeight);
+        // 字号和行高都向上取整到整数像素：PC 端 1× DPR 下浏览器对亚像素
+        // 字号/行高的舍入策略不一致（fontSize 16.25 → 16 或 17，行高
+        // 19.5 → 19 或 20），相邻行/列的吸附方向不同就会让 wterm 网格
+        // 错位。强制整数 px 让 cell 高度、字符高度都稳定一致，等价于
+        // 之前桌面端必须按右上角缩放才能恢复的"整像素重排"路径。
+        var rawFontSize = state.terminalBaseFontSize * state.terminalScale;
+        var fontPx = Math.max(1, Math.round(rawFontSize));
+        var rowPx = Math.max(1, Math.round(rawFontSize * 1.5));
+        state.terminal.element.style.setProperty("--term-font-size", fontPx + "px");
+        state.terminal.element.style.setProperty("--term-row-height", rowPx + "px");
         if (typeof state.terminal.remeasure === "function") {
           requestAnimationFrame(function() {
             if (state.terminal) state.terminal.remeasure();
@@ -2795,7 +3234,9 @@
         if (!session) return "";
         if (session.archived) return "已归档";
         if (session.permissionBlocked) return "等待授权";
+        if (isStructuredSession(session) && session.structuredState && session.structuredState.inFlight) return "思考中";
         var statusMap = {
+          "idle": "空闲",
           "stopped": "已停止",
           "running": "运行中",
           "exited": "已退出",
@@ -2808,6 +3249,7 @@
         if (!session) return "";
         if (session.archived) return "archived";
         if (session.permissionBlocked) return "permission-blocked";
+        if (isStructuredSession(session) && session.structuredState && session.structuredState.inFlight) return "running";
         return session.status || "";
       }
 
@@ -2981,7 +3423,7 @@
       function renderProviderOptions(selectedTool) {
         var tools = [
           { id: "claude", label: "Claude", desc: "完整 Claude 会话能力" },
-          { id: "codex", label: "Codex", desc: "PTY 透传，全权限启动" }
+          { id: "codex", label: "Codex", desc: "结构化 JSONL 或 PTY 会话" }
         ];
         return tools.map(function(tool) {
           var active = tool.id === selectedTool ? " active" : "";
@@ -2999,7 +3441,7 @@
         ];
         return kinds.map(function(kind) {
           var active = kind.id === selectedKind ? " active" : "";
-          var disabled = (state.sessionTool === "codex" && kind.id === "structured") ? " disabled" : "";
+          var disabled = "";
           return '<button type="button" class="mode-card session-kind-card' + active + disabled + '" data-session-kind="' + kind.id + '">' +
             '<span class="mode-card-label">' + kind.label + '</span>' +
             '<span class="mode-card-desc">' + kind.desc + '</span>' +
@@ -3017,10 +3459,12 @@
       function getSessionKindHint(kind) {
         var tool = state.sessionTool || "claude";
         if (kind === "structured") {
-          return "结构化聊天界面，支持多轮对话、流式输出和工具调用展示。";
+          return tool === "codex"
+            ? "Codex JSONL 结构化聊天界面，支持多轮对话和工具调用展示。"
+            : "结构化聊天界面，支持多轮对话、流式输出和工具调用展示。";
         }
         if (tool === "codex") {
-          return "Codex 仅支持 PTY；terminal 是原始输出，chat 是解析后的阅读视图。";
+          return "Codex PTY 终端会话；terminal 是原始输出，chat 是解析后的阅读视图。";
         }
         return "原始 PTY 终端会话，支持持续交互、终端视图和权限流。";
       }
@@ -3408,10 +3852,9 @@
           if (provider) {
             state.sessionTool = provider;
             state.preferredCommand = provider;
-            if (provider === "codex") {
-              state.sessionCreateKind = "pty";
-              state.modeValue = "full-access";
-            }
+            // Codex 现在同时支持 PTY 与结构化 runner，不再强制把 kind 切成 pty。
+            // mode 由 syncSessionModalUI() 调用 getSafeModeForTool() 自动 clamp，
+            // 不在这里硬写。
             syncSessionModalUI();
           }
         });
@@ -3752,6 +4195,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 +4387,9 @@
             location.reload();
             return;
           }
-          softRefreshCurrentView();
+          softResyncTerminal();
+          resetChatRenderCache();
+          scheduleChatRender(true);
         });
         var jumpBottomBtn = document.getElementById("terminal-jump-bottom");
         if (jumpBottomBtn) jumpBottomBtn.addEventListener("click", function() {
@@ -4335,6 +4785,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();
@@ -4565,6 +5032,17 @@
         return distance <= state.terminalScrollThreshold;
       }
 
+      // 严格"真正到底"判定（仅亚像素 jitter 容忍）：用于把 autoFollow 从 false
+      // 翻回 true。不能用 isTerminalNearBottom 的 12px 阈值，否则用户在底部小幅
+      // 向上滚时，wheel handler 把 autoFollow 设 false 后紧接着触发的 scroll
+      // 事件会因为"还没滚出阈值"而把 autoFollow 反转回 true，丢失用户意图。
+      function isTerminalAtBottom() {
+        var viewport = getTerminalViewport();
+        if (!viewport) return true;
+        var distance = viewport.scrollHeight - viewport.clientHeight - viewport.scrollTop;
+        return distance <= 2;
+      }
+
       function scrollTerminalToBottom(smooth) {
         if (!state.terminal) return;
         var viewport = getTerminalViewport();
@@ -4605,11 +5083,13 @@
           updateTerminalJumpToBottomButton();
           return;
         }
-        if (!state.terminalAutoFollow && !isTerminalNearBottom()) {
+        // 只看 autoFollow 标志：用户主动 wheel/touch 后该标志被设为 false，
+        // 即使当前位置仍在底部 12px 阈值内也不再强行滚回，避免把用户刚滚上去
+        // 的几像素吞掉。autoFollow 由 scroll handler 在"真正到底"时恢复。
+        if (!state.terminalAutoFollow) {
           updateTerminalJumpToBottomButton();
           return;
         }
-        state.terminalAutoFollow = true;
         scrollTerminalToBottom(false);
         updateTerminalJumpToBottomButton();
       }
@@ -4898,6 +5378,13 @@
         if (!terminal || data == null) return;
         if (!state.wideParserState) state.wideParserState = createWideParserState();
         terminal.write(widePadAnsi(data, state.wideParserState));
+        // wterm.write 内部用 5px 阈值判定"在底部"，下一帧 _doRender 据此强制
+        // scrollTop = scrollHeight。这与 wand 的 autoFollow（"真正到底"才为
+        // true，2px 阈值）独立，会把用户主动向上滚的几像素吞掉。覆写为 wand
+        // 的 autoFollow 状态，让 autoFollow 成为唯一真相。
+        if ("_shouldScrollToBottom" in terminal) {
+          terminal._shouldScrollToBottom = state.terminalAutoFollow !== false;
+        }
       }
 
       function resetWideParserState() {
@@ -4926,49 +5413,151 @@
       }
       stripWideFillerForCopy();
 
+      // ── PTY 链路时序参数索引 ──────────────────────────────────────────
+      // 本文件中所有影响 PTY 输入/输出节流的常量集中说明（值仍在使用处定义，
+      // 方便阅读上下文，但请保持一致命名以便此索引可 grep 跳转）：
+      //
+      //   服务端（src/ws-broadcast.ts、src/process-manager.ts）：
+      //     OUTPUT_DEBOUNCE_MS = 16     PTY data → ws 推送 debounce
+      //     OUTPUT_MAX_SIZE = 200_000   record.output ring buffer 字节上限
+      //
+      //   客户端（本文件）：
+      //     CLIENT_OUTPUT_MAX / CLIENT_OUTPUT_TRIM_AT  state.terminalOutput 窗口
+      //     RESYNC_THROTTLE_MS = 400    chunk → softResync 节流最小间隔
+      //     RESYNC_TAIL_MS = 350        节流尾巴 timer 等待
+      //     RESYNC_BUDGET_*             5s 内 resync 频次告警阈值
+      //     CHAT_RENDER_LIVE_MS = 150   活跃流时 renderChat debounce
+      //     CHAT_RENDER_IDLE_MS = 30    空闲时 renderChat debounce
+      //     PENDING_INPUT_TTL_MS = 5000 ws 离线输入队列 TTL
+      //     PENDING_INPUT_MAX = 100     离线队列长度上限
+      //
+      // 调参时的关键不变式：
+      //   OUTPUT_DEBOUNCE_MS  <  CHAT_RENDER_IDLE_MS  ≤  CHAT_RENDER_LIVE_MS
+      //   RESYNC_TAIL_MS      ≤  RESYNC_THROTTLE_MS
+      // 否则会出现"上游推得比下游消化得快但下游 timer 还没到期"的堵塞。
+      var CHAT_RENDER_LIVE_MS = 150;
+      var CHAT_RENDER_IDLE_MS = 30;
+
+      // 客户端的 state.terminalOutput 仅用于 softResyncTerminal 时重放给
+      // wterm 作状态恢复，并不是用户能看到的 scrollback —— wterm 自己有
+      // 独立 scrollback。但如果不限长，长跑会话累加几 MB 后每次 resync
+      // 都会把整段重新喂给 wterm，CPU/内存随时间线性变差。
+      //
+      // 服务端 record.output 用 appendWindow(..., 200_000) 限了 200KB，这里
+      // 客户端给一个稍宽的上限做兜底；超过就按行边界裁掉头部，行边界处
+      // ANSI 状态机一定是 idle 状态，重放结果与未裁等价。找不到行边界时
+      // 退化到字节切，并避开 UTF-16 半截、ANSI 半截。
+      var CLIENT_OUTPUT_MAX = 256 * 1024;
+      var CLIENT_OUTPUT_TRIM_AT = 320 * 1024;
+      function clampClientTerminalOutput(buf) {
+        if (!buf || buf.length <= CLIENT_OUTPUT_TRIM_AT) return buf;
+        var start = buf.length - CLIENT_OUTPUT_MAX;
+        // UTF-16 low surrogate
+        if (start > 0 && start < buf.length) {
+          var c0 = buf.charCodeAt(start);
+          if (c0 >= 0xdc00 && c0 <= 0xdfff) start++;
+        }
+        // 优先在 lookahead 内找下一个换行符切割
+        var LOOKAHEAD = 4096;
+        var upper = Math.min(start + LOOKAHEAD, buf.length);
+        for (var i = start; i < upper; i++) {
+          if (buf.charCodeAt(i) === 0x0a) return buf.slice(i + 1);
+        }
+        // 没换行 → 检查 start 是否落在未结束的 ESC 序列里
+        var lookback = Math.max(0, start - 256);
+        var escAt = -1;
+        for (var j = start - 1; j >= lookback; j--) {
+          var c = buf.charCodeAt(j);
+          if (c === 0x1b) { escAt = j; break; }
+          if (c === 0x07) break;
+          if (c >= 0x40 && c <= 0x7e) break;
+        }
+        if (escAt !== -1) {
+          var terminated = false;
+          for (var k = escAt + 1; k < start; k++) {
+            var ck = buf.charCodeAt(k);
+            if (ck === 0x07) { terminated = true; break; }
+            if (ck >= 0x40 && ck <= 0x7e) { terminated = true; break; }
+          }
+          if (!terminated) {
+            var ahead = Math.min(start + 256, buf.length);
+            for (var m = start; m < ahead; m++) {
+              var cm = buf.charCodeAt(m);
+              if (cm === 0x07 || (cm >= 0x40 && cm <= 0x7e)) {
+                return buf.slice(m + 1);
+              }
+            }
+          }
+        }
+        return buf.slice(start);
+      }
+
       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).
+      //
+      // 重放整 buffer 而非截短：alt screen 切换 / 滚动区 / 字符集等模式开关
+      // 依赖从 buffer 开头开始消费。从中间切会丢失这些状态机指令，治标变
+      // 造反。H1 已经把 buffer 限到 256KB，对 wterm WASM 来说这是 ms 级开销。
+      var _resyncStatsWindowStart = 0;
+      var _resyncStatsCount = 0;
+      var _resyncLastWarnAt = 0;
+      var RESYNC_BUDGET_WINDOW_MS = 5000;
+      var RESYNC_BUDGET_MAX = 12;
+      var RESYNC_WARN_COOLDOWN_MS = 30000;
+      function softResyncTerminal(options) {
         if (!state.terminal || !state.terminalOutput) return false;
+        var opts = options || {};
+        var bufLen = state.terminalOutput.length;
+        var startedAt = (typeof performance !== "undefined" && performance.now) ? performance.now() : Date.now();
         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");
+        // 统计 5s 窗口内的 resync 次数，过密时打 warn 帮助诊断
+        // ——比如 wterm 状态机被反复弄脏、上游持续推原地重绘的菜单。
+        // 单次 warn 后冷却 30s，避免刷屏。
+        var now = Date.now();
+        if (now - _resyncStatsWindowStart > RESYNC_BUDGET_WINDOW_MS) {
+          _resyncStatsWindowStart = now;
+          _resyncStatsCount = 1;
+        } else {
+          _resyncStatsCount++;
+          if (_resyncStatsCount > RESYNC_BUDGET_MAX && now - _resyncLastWarnAt > RESYNC_WARN_COOLDOWN_MS) {
+            _resyncLastWarnAt = now;
+            var endedAt = (typeof performance !== "undefined" && performance.now) ? performance.now() : Date.now();
+            console.warn("[wand] softResyncTerminal high frequency",
+              "count=" + _resyncStatsCount + "/" + Math.round((now - _resyncStatsWindowStart) / 100) / 10 + "s",
+              "bufLen=" + bufLen,
+              "lastReplayMs=" + Math.round(endedAt - startedAt));
+          }
+        }
         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 +5566,51 @@
         }, typeof delayMs === "number" ? delayMs : 150);
       }
 
+      // Claude CLI 的 permission 菜单 / 选择列表，在用户按方向键时会
+      // 发送光标定位 (CSI H/f)、光标移动 (CSI A-D)、擦除显示/行 (CSI
+      // J/K) 等序列在原地重绘整块区域。wterm 在这种高频原地重绘下，
+      // DOM 行经常残留或错位，导致新写入的内容被堆到 grid 顶部 ——
+      // 用户体感就是"明明在改菜单，结果跑到最上面去了"。
+      //
+      // 兜底策略是"重置 wterm 状态机 + 重放整 buffer"（softResyncTerminal）。
+      // 这里的关键是触发时机：旧实现用 350ms debounce，但用户实际持续
+      // 按方向键时，每次按键都会让 PTY 回流一次原地重绘 chunk，timer
+      // 被反复 reset，永远等不到静默期，softResync 实际从不触发——
+      // 这是这个保护机制的根本逻辑错误。
+      //
+      // 改成 leading + tail 的节流：第一次进入立即 resync（leading），
+      // 节流窗口内的连续 chunk 只挂一个尾巴 timer 兜底，不重置。这样
+      // 持续按键期间每 RESYNC_THROTTLE_MS 强制 resync 一次，用户停手
+      // 时由尾巴 timer 收尾。不依赖按键停顿这种永远不发生的条件。
+      var IN_PLACE_REDRAW_RE = /\x1b\[\d*(?:;\d*)?[ABCDfHJK]/;
+      var RESYNC_THROTTLE_MS = 400;
+      var RESYNC_TAIL_MS = 350;
+      var _resyncChunkLastAt = 0;
+      var _resyncChunkTailTimer = null;
+      function maybeScheduleResyncForChunk(chunk) {
+        if (!chunk || typeof chunk !== "string") return;
+        if (chunk.indexOf("\x1b[") === -1) return;
+        if (!IN_PLACE_REDRAW_RE.test(chunk)) return;
+        var now = Date.now();
+        var sinceLast = now - _resyncChunkLastAt;
+        if (sinceLast >= RESYNC_THROTTLE_MS) {
+          if (_resyncChunkTailTimer) {
+            clearTimeout(_resyncChunkTailTimer);
+            _resyncChunkTailTimer = null;
+          }
+          _resyncChunkLastAt = now;
+          softResyncTerminal();
+          return;
+        }
+        if (_resyncChunkTailTimer) return;
+        var wait = Math.max(RESYNC_TAIL_MS, RESYNC_THROTTLE_MS - sinceLast);
+        _resyncChunkTailTimer = setTimeout(function() {
+          _resyncChunkTailTimer = null;
+          _resyncChunkLastAt = Date.now();
+          softResyncTerminal();
+        }, wait);
+      }
+
       function syncTerminalBuffer(sessionId, output, options) {
         if (!state.terminal) return false;
         var normalizedOutput = normalizeTerminalOutput(output || "");
@@ -5020,6 +5654,7 @@
           var delta = normalizedOutput.slice(currentOutput.length);
           if (delta) {
             wandTerminalWrite(state.terminal, delta);
+            maybeScheduleResyncForChunk(delta);
             wrote = true;
           }
         } else if (currentOutput && currentOutput.startsWith(normalizedOutput)) {
@@ -5059,10 +5694,37 @@
         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);
 
+        // cols/rows 给一个保守默认即可：wterm-entry.js 重写的 init()
+        // 会在 super.init() 之前按 termWrap 真实尺寸做一次预校准，
+        // 保证 super.init() 里 bridge.init / renderer.setup 一上来
+        // 就按真实 cols 初始化，从源头消除"先按 120 写一遍 → 异步
+        // remeasure 纠正"的时序窗口。
         var term = new WTermLib.WTerm(termWrap, {
           cols: 120,
           rows: 36,
@@ -5074,18 +5736,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 });
             }
           }
         });
@@ -5103,13 +5762,32 @@
           state.terminal = term;
           state.terminalInitializing = false;
           applyTerminalScale();
+
+          // wterm 构造时 cols/rows 是硬编码的 120/36，super.init() 内部
+          // 的 ResizeObserver 要等下一个 layout 阶段异步 fire 才纠正。
+          // 如果不在写入历史前就把 bridge reflow 到容器真实尺寸，
+          // syncTerminalBuffer 会按 120 cols 把整段历史写进 WASM grid，
+          // 用户首屏看到的就是错列宽折行——必须等 ResizeObserver 触发
+          // softResync 才恢复，中间会有几帧明显错位（"刚开终端布局错乱
+          // 一下、resize 一下才正常"）。这里先强制一次 layout flush，
+          // 再同步 remeasure 把 bridge 校准到真实 cols/rows，把"写入"
+          // 卡在正确尺寸之后，避免错位帧。
+          if (termWrap.isConnected) {
+            void termWrap.offsetHeight;
+            if (typeof term.remeasure === "function") {
+              try { term.remeasure(); } catch (e) { /* ignore: 非致命 */ }
+            }
+          }
+
           state.terminalAutoFollow = true;
           clearTerminalScrollIdleTimer();
 
           var viewport = getTerminalViewport();
           if (viewport) {
             state.terminalViewportScrollHandler = function() {
-              if (isTerminalNearBottom()) {
+              // 严格"真正到底"才恢复 autoFollow：避免 wheel 设 false 后被
+              // 紧接着的 scroll 事件因"接近底部 12px"而反转回 true。
+              if (isTerminalAtBottom()) {
                 state.terminalAutoFollow = true;
                 clearTerminalScrollIdleTimer();
                 updateTerminalJumpToBottomButton();
@@ -5152,7 +5830,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);
@@ -5266,6 +5944,11 @@
         if (terminalInteractive) {
           return "终端交互模式开启中，请直接在终端中输入";
         }
+        if (session && isStructuredSession(session)) {
+          return session.provider === "codex"
+            ? "向 Codex 发送消息；chat 为结构化对话视图"
+            : "向 Claude 发送消息；chat 为结构化对话视图";
+        }
         if (session && session.provider === "codex") {
           if (session.status !== "running") {
             return "Codex 会话已结束，无法继续发送";
@@ -5287,7 +5970,7 @@
 
       function getToolModeHint(tool, mode) {
         if (tool === "codex") {
-          return "Codex 当前仅支持 PTY 透传，并固定以 full-access 启动。";
+          return "Codex 支持 PTY 终端与结构化（JSONL）两种会话，结构化模式按 full-access 启动。";
         }
         if (mode === "full-access") {
           return "自动确认权限请求与高权限操作，适合你确认环境安全后的连续修改。";
@@ -5391,15 +6074,20 @@
         return "";
       }
 
-      function renderChatModelOptions(selected) {
-        var models = state.availableModels || [];
+      function getModelsForCurrentProvider(session) {
+        var provider = (session && session.provider) || state.sessionTool || "claude";
+        if (provider === "codex") return state.availableCodexModels || [];
+        return state.availableModels || [];
+      }
+
+      function renderChatModelOptions(selected, session) {
+        var models = getModelsForCurrentProvider(session);
         var html = '<option value="">默认（跟随设置）</option>';
         for (var i = 0; i < models.length; i++) {
           var m = models[i];
           var label = m.label || m.id;
           html += '<option value="' + escapeHtml(m.id) + '"' + (m.id === selected ? " selected" : "") + '>' + escapeHtml(label) + '</option>';
         }
-        // If selected is unknown (custom value), prepend it as a sticky option
         if (selected && !models.some(function(m) { return m.id === selected; })) {
           html += '<option value="' + escapeHtml(selected) + '" selected>' + escapeHtml(selected) + '（自定义）</option>';
         }
@@ -5410,7 +6098,7 @@
         var select = document.getElementById("chat-model-select");
         if (!select) return;
         var effective = getEffectiveModel(session);
-        select.innerHTML = renderChatModelOptions(effective);
+        select.innerHTML = renderChatModelOptions(effective, session);
         select.value = effective;
       }
 
@@ -5420,6 +6108,7 @@
           .then(function(data) {
             if (data && Array.isArray(data.models)) {
               state.availableModels = data.models;
+              state.availableCodexModels = Array.isArray(data.codexModels) ? data.codexModels : [];
               syncComposerModelSelect(getSelectedSession());
               updateSettingsDefaultModelSelect(data);
             }
@@ -5438,6 +6127,7 @@
           .then(function(data) {
             if (data && Array.isArray(data.models)) {
               state.availableModels = data.models;
+              state.availableCodexModels = Array.isArray(data.codexModels) ? data.codexModels : [];
               syncComposerModelSelect(getSelectedSession());
               updateSettingsDefaultModelSelect(data);
               if (typeof showToast === "function") {
@@ -5461,7 +6151,7 @@
         if (!select) return;
         var previous = select.value;
         var current = previous || state.configDefaultModel || (state.config && state.config.defaultModel) || "";
-        select.innerHTML = renderChatModelOptions(current);
+        select.innerHTML = renderChatModelOptions(current, { provider: "claude" });
         select.value = current;
         var versionEl = document.getElementById("cfg-default-model-version");
         if (versionEl && data) {
@@ -5483,7 +6173,6 @@
         try { localStorage.setItem("wand-chat-model", normalized); } catch (e) {}
         var session = getSelectedSession();
         if (!session) return;
-        if (session.provider && session.provider !== "claude") return;
         fetch("/api/sessions/" + encodeURIComponent(session.id) + "/model", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -5500,7 +6189,8 @@
             updateSessionSnapshot(data);
             if (typeof showToast === "function") {
               var display = normalized || "默认";
-              showToast("已切换模型 → " + display, "success");
+              var hint = session.provider === "codex" ? "（下次对话生效）" : "";
+              showToast("已切换模型 → " + display + hint, "success");
             }
           }
         })
@@ -5508,11 +6198,13 @@
       }
 
       function createStructuredSession(prompt, cwdOverride, modeOverride, worktreeEnabled) {
+        var provider = state.sessionTool === "codex" ? "codex" : "claude";
         var modelPref = state.chatModel || (state.config && state.config.defaultModel) || "";
         var payload = {
           cwd: cwdOverride || getEffectiveCwd(),
           mode: modeOverride || state.chatMode || (state.config && state.config.defaultMode) || "default",
-          runner: state.structuredRunner || "claude-cli-print",
+          provider: provider,
+          runner: provider === "codex" ? "codex-cli-exec" : (state.structuredRunner || "claude-cli-print"),
           prompt: prompt || undefined,
           worktreeEnabled: worktreeEnabled === true,
           model: modelPref || undefined
@@ -5582,11 +6274,6 @@
         var tool = state.sessionTool || "claude";
         var sessionKind = state.sessionCreateKind || "structured";
 
-        if (tool === "codex" && sessionKind === "structured") {
-          sessionKind = "pty";
-          state.sessionCreateKind = "pty";
-        }
-
         state.sessionTool = tool;
         state.modeValue = getSafeModeForTool(tool, state.modeValue || state.chatMode || "default");
 
@@ -5603,7 +6290,7 @@
         if (kindCards.length) {
           kindCards.forEach(function(card) {
             var kind = card.getAttribute("data-session-kind");
-            var disabled = tool === "codex" && kind === "structured";
+            var disabled = false;
             card.classList.toggle("active", kind === sessionKind);
             card.classList.toggle("disabled", disabled);
           });
@@ -5812,6 +6499,9 @@
               }
             }
             updateShellChrome();
+            if (state.selectedId && state.gitStatusSessionId !== state.selectedId) {
+              loadGitStatus(state.selectedId);
+            }
 
             var reloadPromise = Promise.resolve();
             if (!opts.skipSelectedOutputReload && state.selectedId) {
@@ -5973,10 +6663,35 @@
             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 写入。
+              //
+              // wsLikelyTakingOver: 即使 wsConnected=false（onopen 还没 fire），
+              // 只要 ws.readyState 是 CONNECTING 或 OPEN，就视为 ws 即将
+              // 接管。否则 selectSession → loadOutput resolve 比 ws onopen
+              // 早时（常见于刷新页面后的首次连接）会误走 fallback，写入
+              // terminal 后 ws init 又写一次，造成双路重叠。
+              var wsLikelyTakingOver = !!state.ws && (
+                state.ws.readyState === WebSocket.OPEN ||
+                state.ws.readyState === WebSocket.CONNECTING
+              );
+              if (!wsLikelyTakingOver) {
+                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 +6706,9 @@
         if (!foundSession) {
           return;
         }
+        if (state.selectedId !== id) {
+          teardownTerminal();
+        }
         state.selectedId = id;
         persistSelectedId();
         state.toolContentCache = {};
@@ -6021,6 +6739,11 @@
         }
         loadOutput(id).then(function() { focusInputBox(true); });
         subscribeToSession(id);
+        // 切换会话时清掉旧 git 状态，再异步刷新
+        state.gitStatus = null;
+        state.gitStatusSessionId = null;
+        updateTopbarGitBadge();
+        loadGitStatus(id, { force: true });
       }
 
       function updatePinState() {
@@ -6120,7 +6843,7 @@
           lastFocusedElement = document.activeElement;
           state.sessionTool = getPreferredTool();
           state.preferredCommand = state.sessionTool;
-          state.sessionCreateKind = state.sessionTool === "codex" ? "pty" : "structured";
+          state.sessionCreateKind = "structured";
           state.sessionCreateWorktree = false;
           state.modeValue = getSafeModeForTool(state.sessionTool, state.modeValue || state.chatMode);
           syncSessionModalUI();
@@ -7327,6 +8050,29 @@
         el.classList.remove("hidden");
       }
 
+      // 创建 PTY 会话时把当前终端的真实 cols/rows 注入 body，让后端 pty.spawn
+      // 直接落在正确尺寸下。否则 PTY 先按 cols=120 启动，Claude/Codex 会基于
+      // 120 列输出 \x1b[120G 这类绝对列定位序列；等前端 remeasure 触发 resize
+      // 时这些早期内容已经被以 80 等真实列数渲染，整条历史就错位。
+      function withTerminalDimensions(body) {
+        if (!body || typeof body !== "object") return body;
+        if (!state.terminal) return body;
+        try {
+          if (typeof state.terminal.remeasure === "function") {
+            state.terminal.remeasure();
+          }
+        } catch (e) {}
+        var cols = state.terminal.cols;
+        var rows = state.terminal.rows;
+        if (typeof cols === "number" && typeof rows === "number"
+            && Number.isFinite(cols) && Number.isFinite(rows)
+            && cols > 0 && rows > 0) {
+          body.cols = cols;
+          body.rows = rows;
+        }
+        return body;
+      }
+
       function quickStartSession() {
         var command = getPreferredTool();
         var defaultCwd = getEffectiveCwd();
@@ -7337,7 +8083,7 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({ command: command, provider: command, cwd: defaultCwd, mode: defaultMode })
+          body: JSON.stringify(withTerminalDimensions({ command: command, provider: command, cwd: defaultCwd, mode: defaultMode }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -7382,12 +8128,13 @@
       }
 
       function startStructuredSessionFromModal(cwd, mode, worktreeEnabled, errorEl) {
-        console.log("[WAND] startStructuredSessionFromModal cwd:", cwd, "mode:", mode, "worktreeEnabled:", worktreeEnabled);
+        var provider = state.sessionTool === "codex" ? "codex" : "claude";
+        console.log("[WAND] startStructuredSessionFromModal provider:", provider, "cwd:", cwd, "mode:", mode, "worktreeEnabled:", worktreeEnabled);
         _sessionCreating = true;
         state.modeValue = mode;
         state.chatMode = mode;
-        state.sessionTool = "claude";
-        state.preferredCommand = "claude";
+        state.sessionTool = provider;
+        state.preferredCommand = provider;
         syncComposerModeSelect();
         syncComposerModelSelect(getSelectedSession());
         return createStructuredSession(undefined, cwd, mode, worktreeEnabled)
@@ -7417,13 +8164,13 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: command,
             provider: command,
             cwd: cwd,
             mode: mode,
             worktreeEnabled: worktreeEnabled
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -7914,6 +8661,101 @@
         }
       }
 
+      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");
+        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");
+            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 */ }
+          }
+        }
+        tick();
+      }
+
       function autoResizeInput(el) {
         if (!el) return;
         var minHeight = 36;
@@ -7948,6 +8790,9 @@
       function isSelectedSessionRunning() {
         if (!state.selectedId) return false;
         var selectedSession = state.sessions.find(function(session) { return session.id === state.selectedId; });
+        if (isStructuredSession(selectedSession)) {
+          return !!(selectedSession.structuredState && selectedSession.structuredState.inFlight);
+        }
         return !!selectedSession && selectedSession.status === "running";
       }
 
@@ -7957,6 +8802,9 @@
 
       function hasAnyBusySession() {
         return state.sessions.some(function(s) {
+          if (isStructuredSession(s)) {
+            return !!(s.structuredState && s.structuredState.inFlight) && !s.archived;
+          }
           return s.status === "running" && !s.archived;
         });
       }
@@ -7986,12 +8834,12 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: item.tool,
             cwd: item.cwd,
             mode: item.mode,
             initialInput: item.text
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -8026,12 +8874,12 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: item.tool,
             cwd: item.cwd,
             mode: item.mode,
             initialInput: item.text
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -8207,13 +9055,13 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: preferredTool,
             provider: preferredTool,
             cwd: defaultCwd,
             mode: mode,
             initialInput: value
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -8277,13 +9125,13 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: preferredTool,
             provider: preferredTool,
             cwd: defaultCwd,
             mode: mode,
             initialInput: value || undefined
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -8352,7 +9200,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 +9261,8 @@
 
             return ensureSessionReadyForInput(selectedSession).then(function(readySession) {
               if (!readySession) {
-                showToast("会话未就绪，将稍后重试。", "info");
+                // ensureSessionReadyForInput / resumeClaudeSessionById 已经在失败路径里
+                // 自行 toast，这里不再重复提示，避免叠两条消息。
                 return null;
               }
               var submitView = state.currentView;
@@ -8478,7 +9327,9 @@
         // the HTTP response arrives.
         var epochBeforePost = state.queueEpoch;
 
-        return fetch("/api/structured-sessions/" + state.selectedId + "/messages", {
+        // 用 session.id（参数绑定，in-flight 期间不变）而不是 state.selectedId
+        // 拼 URL，避免用户切到别的会话后 fetch 落到错误 sessionId。
+        return fetch("/api/structured-sessions/" + session.id + "/messages", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
@@ -8501,11 +9352,14 @@
               delete snapshot.queuedMessages;
             }
             updateSessionSnapshot(snapshot);
-            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 (isInterrupting) {
-              showToast("已中断上一条回复，正在处理新消息…", "info");
+            // 仅当 snapshot 仍属当前选中会话时才覆盖视图状态，否则只更新底层数据。
+            if (snapshot.id === state.selectedId) {
+              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 (isInterrupting) {
+                showToast("已中断上一条回复，正在处理新消息…", "info");
+              }
             }
           }
         })
@@ -8646,7 +9500,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 +9520,7 @@
           return Promise.resolve(null);
         }
 
-        showToast("正在恢复历史会话…", "info");
+        // 静默恢复：不再弹 "正在恢复历史会话…" 提示，让用户发送动作看起来无缝。
         return resumeClaudeSessionById(session.claudeSessionId, errorEl).then(function(data) {
           if (!data) return null;
           updateSessionSnapshot(data);
@@ -8702,13 +9559,26 @@
         }, Promise.resolve());
       }
 
+      // pendingMessages 用于 ws 离线时缓存输入，重连后批量回放。
+      // 旧实现：按字符串入队，仅靠长度上限 100 控制；超出 shift 最早一条。
+      // 问题：用户连续按方向键时几秒就把队列填满；shift 把最早按下的丢
+      // 掉，剩下的反而是后期按的——重连后回放的"输入序列"和用户实际
+      // 按下的顺序矛盾。给每条消息打时间戳，flush 时直接丢弃过期项，
+      // 让"离线超过 N 秒后重连"恢复成一个干净状态而不是错位重放。
+      var PENDING_INPUT_TTL_MS = 5000;
+      var PENDING_INPUT_MAX = 100;
+      function enqueuePendingInput(input) {
+        if (!input) return;
+        if (state.pendingMessages.length >= PENDING_INPUT_MAX) {
+          state.pendingMessages.shift();
+        }
+        state.pendingMessages.push({ input: input, at: Date.now() });
+      }
+
       function queueOfflineTerminalChunks(chunks) {
         var sequence = Array.isArray(chunks) ? chunks.filter(function(chunk) { return !!chunk; }) : [];
         sequence.forEach(function(chunk) {
-          if (state.pendingMessages.length >= 100) {
-            state.pendingMessages.shift();
-          }
-          state.pendingMessages.push(chunk);
+          enqueuePendingInput(chunk);
         });
       }
 
@@ -8726,16 +9596,21 @@
 
       function postInput(input, shortcutKey, viewOverride) {
         if (!state.selectedId) return Promise.resolve();
+        // 锁定本次请求归属的 sessionId。fetch 发起后用户可能切到别的会话，
+        // 后续 then 回调里直接用 state.selectedId 会误把 A 的响应应用到 B：
+        //   - URL 上拼错会话（虽然 fetch 已经求值过 URL，但 markSessionStopped
+        //     等 in-flight 引用会读最新值 → 把 B 标为 stopped 但实际是 A 失败）
+        //   - response.snapshot 属于 A，被 setCurrentMessages 误覆盖到 B 视图
+        // 用 requestSessionId 锁住请求方，渲染相关动作再单独判断 snapshot.id
+        // === 当前 state.selectedId 才执行。
+        var requestSessionId = state.selectedId;
         var effectiveView = viewOverride || state.currentView;
 
         // Pre-check: don't send if session is not running
         if (!isSelectedSessionRunning()) {
           // If WebSocket is disconnected, queue for flush on reconnect
           if (!state.wsConnected) {
-            if (state.pendingMessages.length >= 100) {
-              state.pendingMessages.shift();
-            }
-            state.pendingMessages.push(input);
+            enqueuePendingInput(input);
             console.log("[wand] postInput: session not running, queued for reconnect", {
               sessionId: state.selectedId,
               inputLength: input.length
@@ -8751,10 +9626,7 @@
 
         // If WebSocket is disconnected, queue the message (no HTTP fetch while offline)
         if (!state.wsConnected) {
-          if (state.pendingMessages.length >= 100) {
-            state.pendingMessages.shift();
-          }
-          state.pendingMessages.push(input);
+          enqueuePendingInput(input);
           console.log("[wand] postInput: WebSocket disconnected, queued message", {
             sessionId: state.selectedId,
             inputLength: input.length
@@ -8769,7 +9641,7 @@
           wsConnected: state.wsConnected
         });
 
-        return fetch("/api/sessions/" + state.selectedId + "/input", {
+        return fetch("/api/sessions/" + requestSessionId + "/input", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
@@ -8784,11 +9656,11 @@
                 status: res.status,
                 errorCode: error.errorCode,
                 message: error.message,
-                sessionId: state.selectedId
+                sessionId: requestSessionId
               });
               // Mark session as stopped for unavailable errors
               if (isSessionUnavailableError(error)) {
-                markSessionStopped(state.selectedId, error.sessionStatus || "exited");
+                markSessionStopped(requestSessionId, error.sessionStatus || "exited");
               }
               throw error;
             });
@@ -8797,11 +9669,18 @@
         })
         .then(function(snapshot) {
           if (snapshot && snapshot.id) {
+            // 底层 sessions 数据按 id 索引，无论是否仍是当前选中都可以
+            // 安全更新（不会污染其他会话）。
             updateSessionSnapshot(snapshot);
-            if (snapshot.messages && snapshot.messages.length > 0) {
-              state.currentMessages = snapshot.messages;
+            // 但 currentMessages / renderChat 是当前视图状态，必须仅当
+            // snapshot 仍属当前选中会话时才执行；否则会把 A 的消息列表
+            // 渲染到 B 的 chat 视图。
+            if (snapshot.id === state.selectedId) {
+              if (snapshot.messages && snapshot.messages.length > 0) {
+                state.currentMessages = snapshot.messages;
+              }
+              renderChat(true);
             }
-            renderChat(true);
           }
           return snapshot;
         });
@@ -8823,6 +9702,18 @@
         return !!state.selectedId && state.currentView === "terminal";
       }
 
+      // 判断一条带 sessionId 的 ws 消息是否应该被当前 wterm 实例消费。
+      // 收敛多处散落的"selectedId 一致 + terminalSessionId 兼容"判断，避免
+      // 后续重构时漏改某一处导致旧会话的输出污染当前终端。
+      // terminalSessionId 为空（尚未首次 init/切换刚发生）视为可接受任何
+      // sessionId —— 这是首条 chunk 触发自我初始化的场景。
+      function isCurrentTerminalSession(sessionId) {
+        if (!state.terminal || !sessionId) return false;
+        if (sessionId !== state.selectedId) return false;
+        if (state.terminalSessionId && state.terminalSessionId !== sessionId) return false;
+        return true;
+      }
+
       function shouldCaptureTerminalEvent(event) {
         if (!state.terminalInteractive || !isTerminalInteractionAvailable()) return false;
         if (event.defaultPrevented || event.isComposing) return false;
@@ -8990,7 +9881,9 @@
         var selectedSession = state.sessions.find(function(session) { return session.id === state.selectedId; });
         var structured = isStructuredSession(selectedSession);
         var isCodex = selectedSession && selectedSession.provider === "codex";
-        var isRunning = !!selectedSession && selectedSession.status === "running";
+        var isRunning = structured
+          ? !!(selectedSession && selectedSession.structuredState && selectedSession.structuredState.inFlight)
+          : !!selectedSession && selectedSession.status === "running";
         var composer = document.getElementById("input-box");
         // Update both toggle buttons (topbar and terminal-header)
         var toggles = ["terminal-interactive-toggle-top"];
@@ -9015,18 +9908,28 @@
               : "Enter 发送 · Shift+Enter 换行";
           }
         }
-        var disableStructuredInput = !!selectedSession && structured && isCodex && !isRunning;
+        var disableStructuredInput = false;
+        // 历史会话只要可自动恢复（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");
+          // 终端交互模式下，按键由 document capture phase 直接透传到 PTY；
+          // 把 textarea 设为 readonly 避免浏览器同时把字符落进输入框
+          // （IME 组合输入、preventDefault 不彻底等边界场景下会出现"键
+          // 发到了 PTY、输入框里也留下了字"的双状态）。disabled 会让
+          // textarea 失去焦点能力影响一些场景，readOnly 更轻、保留焦点。
+          composer.readOnly = !!state.terminalInteractive;
+          composer.classList.toggle("is-terminal-passthrough", !!state.terminalInteractive);
         }
         var sendBtn = document.getElementById("send-input-button");
         if (sendBtn) {
-          sendBtn.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning);
-          sendBtn.setAttribute("title", isCodex
-            ? (isRunning ? "发送给 Codex" : "Codex 会话已结束")
-            : (structured ? "发送" : (!selectedSession || isRunning ? "发送" : "会话已结束")));
+          sendBtn.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning && !canResumeOnSend);
+          sendBtn.setAttribute("title", structured
+            ? "发送"
+            : (isCodex ? (isRunning ? "发送给 Codex" : "Codex 会话已结束") : (!selectedSession || isRunning || canResumeOnSend ? "发送" : "会话已结束")));
         }
         var container = document.getElementById("output");
         if (container) container.classList.toggle("interactive", !structured && state.terminalInteractive);
@@ -9057,6 +9960,7 @@
         var sequence = buildPtySequence(key, { ctrl: state.modifiers.ctrl, alt: state.modifiers.alt, shift: state.modifiers.shift });
         if (sequence) sendTerminalSequence(sequence, key);
         clearModifiers();
+        scheduleShortcutResync();
       }
 
       function handleInlineKeyboardClick(event) {
@@ -9073,12 +9977,28 @@
         if (key === "ctrl_enter") {
           var sequence = buildPtySequence("enter", { ctrl: true, alt: false, shift: false });
           if (sequence) sendTerminalSequence(sequence, "ctrl_enter");
+          scheduleShortcutResync();
           return;
         }
         var sequence = buildPtySequence(key, { ctrl: state.modifiers.ctrl, alt: state.modifiers.alt, shift: false });
         if (sequence) sendTerminalSequence(sequence, key);
         clearModifiers();
         updateKeyboardPopupUI();
+        scheduleShortcutResync();
+      }
+
+      // 用户点击下方快捷键栏（↑↓←→/Enter/Esc 等）后，PTY 通常会回流大量
+      // 原地重绘序列（CSI A-D / J / K / H / f）。maybeScheduleResyncForChunk
+      // 已经在收到这类 chunk 时做节流 resync，但 wterm 状态机偶尔会漏抓
+      // （比如 Codex 的菜单切换），导致 DOM 行残留 / 错位 —— 表现就是用户
+      // 反馈"按方向键之后画面错位，必须按一下右上角缩放才恢复"。
+      // 这里在每次快捷键点击之后安排一次延迟的 softResyncTerminal 兜底，
+      // 等价于自动按一次缩放按钮：reset 状态机 + 重放 buffer，把残留的
+      // 错位洗掉。延迟 ~500ms 是为了让服务端先把这次按键的回执完整推过来，
+      // 避免 resync 时只回放到 chunk 一半。
+      function scheduleShortcutResync() {
+        if (!state.terminal) return;
+        scheduleSoftResyncTerminal(500);
       }
 
       function updateKeyboardPopupUI() {
@@ -9197,8 +10117,20 @@
 
         // 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();
+        var now = Date.now();
+        var queue = [];
+        var dropped = 0;
+        state.pendingMessages.forEach(function(item) {
+          // Backward-compatible: 老逻辑里 entries 可能是裸字符串。
+          if (typeof item === "string") { queue.push(item); return; }
+          if (!item || typeof item.input !== "string") return;
+          if (now - (item.at || 0) > PENDING_INPUT_TTL_MS) { dropped++; return; }
+          queue.push(item.input);
+        });
         state.pendingMessages = [];
+        if (dropped > 0) {
+          console.log("[wand] flushPendingMessages: dropped " + dropped + " stale input(s)");
+        }
 
         var sendPromise = Promise.resolve();
         queue.forEach(function(input) {
@@ -9212,7 +10144,10 @@
 
       function sendInputDirect(input) {
         if (!input || !state.selectedId) return Promise.resolve();
-        return fetch("/api/sessions/" + state.selectedId + "/input", {
+        // 同 postInput：flushPendingMessages 重连后批量回放离线消息时，
+        // 用户可能已在切到别的会话，必须用本次请求的 sessionId 快照。
+        var requestSessionId = state.selectedId;
+        return fetch("/api/sessions/" + requestSessionId + "/input", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
@@ -9227,7 +10162,7 @@
               // on the user's next message, and stale queue items would cause duplicates
               if (isSessionUnavailableError(error)) {
                 console.log("[wand] sendInputDirect: session unavailable, dropping", {
-                  sessionId: state.selectedId,
+                  sessionId: requestSessionId,
                   errorCode: error.errorCode
                 });
                 return null;
@@ -9240,10 +10175,13 @@
         .then(function(snapshot) {
           if (snapshot && snapshot.id) {
             updateSessionSnapshot(snapshot);
-            if (snapshot.messages && snapshot.messages.length > 0) {
-              state.currentMessages = snapshot.messages;
+            // 仅当 snapshot 仍属当前选中会话时才覆盖视图，否则只更新底层数据。
+            if (snapshot.id === state.selectedId) {
+              if (snapshot.messages && snapshot.messages.length > 0) {
+                state.currentMessages = snapshot.messages;
+              }
+              renderChat(true);
             }
-            renderChat(true);
           }
           return snapshot;
         });
@@ -9372,12 +10310,12 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: command,
             cwd: cwd || "",
             mode: state.chatMode || state.config.defaultMode || "default",
             model: modelPref || undefined
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -9402,9 +10340,9 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             mode: state.chatMode || state.config.defaultMode || "default"
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -9433,9 +10371,9 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             mode: state.chatMode || state.config.defaultMode || "default"
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -9462,6 +10400,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);
@@ -9509,13 +10451,13 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: preferredTool,
             cwd: defaultCwd,
             mode: mode,
             initialInput: value,
             model: modelPref || undefined
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -9547,13 +10489,13 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             command: preferredTool,
             cwd: defaultCwd,
             mode: mode,
             initialInput: value || undefined,
             model: modelPref || undefined
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -9609,10 +10551,10 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({
+          body: JSON.stringify(withTerminalDimensions({
             mode: state.chatMode || (state.config && state.config.defaultMode) || "default",
             cwd: cwd
-          })
+          }))
         })
         .then(function(res) { return res.json(); })
         .then(function(data) {
@@ -9652,15 +10594,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 +10655,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 +11333,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 +11363,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 +11398,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 +11411,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 +11552,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,11 +11652,43 @@
           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);
+          }
+        }
+        // widePadAnsi 是模块级状态机，跨终端实例时若卡在 esc/csi/string 等
+        // 中间态，下一个 wterm 实例的首批字节会被错误归类（首字符被吃成
+        // ANSI 序列尾巴）。重建终端前显式复位，避免状态泄漏到新实例。
+        resetWideParserState();
         state.terminalSessionId = null;
         state.terminalOutput = "";
         state.terminalAutoFollow = true;
         state.showTerminalJumpToBottom = false;
         updateTerminalJumpToBottomButton();
+        // 清理本轮新增的、依赖当前 wterm 实例的模块级 timer 和频次统计。
+        // 不清掉的话，旧会话上挂起的 tail timer 在新 wterm 实例上触发会
+        // 用 state.terminalOutput 做一次无意义的 resync；resyncStats 计数
+        // 跨会话累加也会让告警阈值在新会话立即触发误报。
+        if (state.softResyncTimer) {
+          clearTimeout(state.softResyncTimer);
+          state.softResyncTimer = null;
+        }
+        if (_resyncChunkTailTimer) {
+          clearTimeout(_resyncChunkTailTimer);
+          _resyncChunkTailTimer = null;
+        }
+        _resyncChunkLastAt = 0;
+        _resyncStatsWindowStart = 0;
+        _resyncStatsCount = 0;
+        _resyncLastWarnAt = 0;
       }
 
       function sendTerminalResize(cols, rows) {
@@ -10709,24 +11707,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 +11783,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 +11799,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);
@@ -10916,6 +11907,9 @@
             // starts the ladder from 500ms again.
             state.wsReconnectAttempts = 0;
             cancelWsReconnect();
+            // Server's per-client output sequence counter restarts on every
+            // new socket; clear ours so the first init isn't treated as a gap.
+            state.lastSeqBySession = {};
             // Subscribe to current session if any
             subscribeToSession(state.selectedId);
             // Flush pending messages after reconnection
@@ -10932,6 +11926,43 @@
           ws.onmessage = function(event) {
             try {
               var msg = JSON.parse(event.data);
+              if (msg && msg.type === "resync_required" && msg.sessionId) {
+                // Server dropped some output events under backpressure and
+                // is asking us for a fresh snapshot. Send a resync so the
+                // server replies with a new init carrying the full output.
+                if (state.ws && state.ws.readyState === WebSocket.OPEN) {
+                  try {
+                    state.ws.send(JSON.stringify({ type: "resync", sessionId: msg.sessionId }));
+                  } catch (sendErr) { /* ignore */ }
+                }
+                if (!state.lastSeqBySession) state.lastSeqBySession = {};
+                state.lastSeqBySession[msg.sessionId] = 0;
+                return;
+              }
+              if (msg && (msg.type === "init" || msg.type === "output") && msg.sessionId && typeof msg.seq === "number") {
+                if (!state.lastSeqBySession) state.lastSeqBySession = {};
+                var prevSeq = state.lastSeqBySession[msg.sessionId] || 0;
+                if (msg.type === "init") {
+                  state.lastSeqBySession[msg.sessionId] = msg.seq;
+                } else if (msg.seq === prevSeq + 1) {
+                  state.lastSeqBySession[msg.sessionId] = msg.seq;
+                } else if (msg.seq > prevSeq + 1 && prevSeq > 0) {
+                  // We missed at least one event — request a resync and
+                  // skip this stale event so we don't apply a partial gap.
+                  if (state.ws && state.ws.readyState === WebSocket.OPEN) {
+                    try {
+                      state.ws.send(JSON.stringify({ type: "resync", sessionId: msg.sessionId }));
+                    } catch (sendErr) { /* ignore */ }
+                  }
+                  state.lastSeqBySession[msg.sessionId] = 0;
+                  return;
+                } else {
+                  // seq <= prevSeq: duplicate or out-of-order from a stale
+                  // queue; drop quietly.
+                  if (msg.seq < prevSeq) return;
+                  state.lastSeqBySession[msg.sessionId] = msg.seq;
+                }
+              }
               handleWebSocketMessage(msg);
             } catch (e) {
               // Ignore parse errors
@@ -10962,6 +11993,30 @@
           case 'output':
             // Update session output (for terminal display and local message parsing)
             // NOTE: For structured sessions, output may be "" during streaming — check messages too
+            // thinking → idle 边界自愈：桥接层在 output.chat 事件里把 isResponding
+            // 透传过来。当某会话由 true 变 false（assistant 完成一轮响应）时，
+            // 主动做一次 softResyncTerminal —— 等价于自动按一次右上角缩放按钮，
+            // 把 Claude/Codex 流式渲染中残留的错位光标定位序列洗掉。
+            // 用 120ms 微延迟 + 单 timer 防抖，避免连续 false→true→false 触发多次重放。
+            if (msg.data && msg.sessionId
+                && Object.prototype.hasOwnProperty.call(msg.data, 'isResponding')) {
+              if (!state._lastIsResponding) state._lastIsResponding = {};
+              var _prevResp = !!state._lastIsResponding[msg.sessionId];
+              var _nextResp = !!msg.data.isResponding;
+              state._lastIsResponding[msg.sessionId] = _nextResp;
+              if (_prevResp && !_nextResp
+                  && msg.sessionId === state.selectedId
+                  && state.terminal
+                  && state.terminalOutput) {
+                if (state._idleResyncTimer) clearTimeout(state._idleResyncTimer);
+                var _idleResyncSid = msg.sessionId;
+                state._idleResyncTimer = setTimeout(function() {
+                  state._idleResyncTimer = null;
+                  if (state.selectedId !== _idleResyncSid) return;
+                  try { softResyncTerminal({ skipFit: true }); } catch (e) {}
+                }, 120);
+              }
+            }
             if (msg.data && msg.sessionId) {
               var isIncremental = !!msg.data.incremental;
               var snapshot = { id: msg.sessionId };
@@ -11035,7 +12090,7 @@
             }
             // Real-time terminal output
             if (msg.sessionId === state.selectedId && state.terminal && msg.data) {
-              if (msg.data.chunk && (!state.terminalSessionId || state.terminalSessionId === msg.sessionId)) {
+              if (msg.data.chunk && isCurrentTerminalSession(msg.sessionId)) {
                 // Fast path: write chunk directly to avoid full-output comparison.
                 state.lastChunkAt = Date.now();
                 state.terminalLiveStreamSessions[msg.sessionId] = true;
@@ -11046,11 +12101,12 @@
                 // 变化的视觉错位无法被自愈，直到用户手动改窗口才修。现在让
                 // 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);
+                  state.terminalOutput = clampClientTerminalOutput(normalizeTerminalOutput(msg.data.output));
                 } else {
-                  state.terminalOutput = (state.terminalOutput || "") + normalizeTerminalOutput(msg.data.chunk);
+                  state.terminalOutput = clampClientTerminalOutput((state.terminalOutput || "") + normalizeTerminalOutput(msg.data.chunk));
                 }
                 maybeScrollTerminalToBottom("output");
                 updateTerminalJumpToBottomButton();
@@ -11575,7 +12631,9 @@
         var selectedForDelay = state.sessions.find(function(s) { return s.id === state.selectedId; });
         var isActiveStream = selectedForDelay && selectedForDelay.status === "running"
           && selectedForDelay.sessionKind !== "structured";
-        var delay = isActiveStream ? 150 : 30;
+        // 活跃流时拉到 CHAT_RENDER_LIVE_MS 减少高频重渲；空闲时用 IDLE 快速响应。
+        // 旧实现里这两档在 setTimeout 调用时被覆盖成固定 30ms，分档逻辑形同虚设。
+        var delay = isActiveStream ? CHAT_RENDER_LIVE_MS : CHAT_RENDER_IDLE_MS;
         chatRenderTimer = setTimeout(function() {
           chatRenderTimer = null;
           var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
@@ -11583,7 +12641,7 @@
               state.currentMessages = buildMessagesForRender(selectedSession, getPreferredMessages(selectedSession, selectedSession.output, true));
           }
           renderChat();
-        }, 30);
+        }, delay);
       }
 
       // Extract system info from PTY output that's not in structured messages
@@ -14421,6 +15479,21 @@
       var _progressSyncTimers = {};
       var _PROGRESS_SYNC_DEBOUNCE_MS = 300;
 
+      // Strip markdown formatting and clamp to a single short line so the
+      // native Live Activity / lock-screen card stays readable. 100 chars
+      // matches getLastAssistantSummary; OPPO truncates harder anyway.
+      function _compactNotificationText(text) {
+        if (!text) return "";
+        var t = String(text)
+          .replace(/^#+\s+/gm, "")
+          .replace(/\*\*/g, "")
+          .replace(/`/g, "")
+          .trim();
+        var firstLine = t.split("\n")[0].trim();
+        if (firstLine.length > 100) firstLine = firstLine.slice(0, 100) + "…";
+        return firstLine;
+      }
+
       function syncSessionProgressToNative(sessionId) {
         if (!_hasNativeBridge || typeof WandNative.updateSessionProgress !== "function") return;
         if (!sessionId) return;
@@ -14446,21 +15519,56 @@
           return;
         }
 
-        // Get latest todos from session messages
+        // Get latest todos from session messages, plus the most recent user
+        // prompt and assistant text in the same scan. sessionLabel is frozen
+        // to the first prompt (session.summary), so without these fields the
+        // OPPO Live Activity / lock-screen card stays stuck on round-1 text
+        // forever. We carry the latest round across so native can refresh.
         var todos = null;
+        var latestUserText = "";
+        var latestAssistantText = "";
         var messages = session.messages || [];
         for (var i = messages.length - 1; i >= 0; i--) {
           var msg = messages[i];
           if (!msg.content || !Array.isArray(msg.content)) continue;
-          for (var j = msg.content.length - 1; j >= 0; j--) {
-            var block = msg.content[j];
-            if (block.type === "tool_use" && block.name === "TodoWrite"
-                && block.input && block.input.todos) {
-              todos = block.input.todos;
-              break;
+
+          if (!latestAssistantText && msg.role === "assistant") {
+            for (var ai = msg.content.length - 1; ai >= 0; ai--) {
+              var ablock = msg.content[ai];
+              if (ablock && ablock.type === "text" && ablock.text && ablock.text.trim()) {
+                latestAssistantText = _compactNotificationText(ablock.text);
+                break;
+              }
             }
           }
-          if (todos) break;
+
+          if (!latestUserText && msg.role === "user") {
+            // Skip queued / synthetic placeholder turns — they don't represent
+            // user-visible "I just asked this" prompts.
+            var isPlaceholder = msg.content.some(function(b) { return b && b.__queued; });
+            if (!isPlaceholder) {
+              for (var ui = 0; ui < msg.content.length; ui++) {
+                var ublock = msg.content[ui];
+                if (ublock && ublock.type === "text" && ublock.text && ublock.text.trim()) {
+                  latestUserText = _compactNotificationText(ublock.text);
+                  break;
+                }
+              }
+            }
+          }
+
+          if (!todos) {
+            for (var j = msg.content.length - 1; j >= 0; j--) {
+              var block = msg.content[j];
+              if (block && block.type === "tool_use" && block.name === "TodoWrite"
+                  && block.input && block.input.todos) {
+                todos = block.input.todos;
+                break;
+              }
+            }
+          }
+
+          if (todos && latestUserText && latestAssistantText) break;
         }
 
         // Get current task
@@ -14473,6 +15581,8 @@
           sessionLabel: sessionLabel,
           status: sessionStatus,
           currentTask: currentTask,
+          latestUserText: latestUserText,
+          latestAssistantText: latestAssistantText,
           todos: todos || []
         };