@co0ontty/wand 1.20.4 → 1.21.5

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 {
@@ -235,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)) {
@@ -260,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
@@ -1038,6 +1123,12 @@
         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() {
@@ -1315,17 +1406,19 @@
                 '</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">' +
@@ -1350,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">' +
@@ -2033,6 +2126,14 @@
                   '</div>' +
                 '</div>' +
                 '<p class="field-hint" style="margin-top:-4px;">设置回复语言后，Claude 将尽量使用指定语言回复。</p>' +
+                '<div class="field">' +
+                  '<label class="field-label" for="cfg-structured-runner">结构化会话 Runner</label>' +
+                  '<select id="cfg-structured-runner" class="field-input">' +
+                    '<option value="cli">CLI（spawn claude -p，默认）</option>' +
+                    '<option value="sdk">SDK（@anthropic-ai/claude-agent-sdk）</option>' +
+                  '</select>' +
+                  '<p class="field-hint" style="margin-top:4px;">SDK 模式使用官方 Agent SDK 替代 CLI subprocess，接口更整洁，功能等价。重启后生效。</p>' +
+                '</div>' +
                 '<div class="field">' +
                   '<label class="field-label" for="cfg-default-model">默认模型</label>' +
                   '<div class="settings-row-with-action">' +
@@ -2672,10 +2773,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();
@@ -2994,11 +3101,14 @@
         // Code blocks with syntax highlighting
         escaped = escaped.replace(/```(\w*)\n([\s\S]*?)```/g, function(_, lang, code) {
           var highlighted = highlightCodePreview(code.trim(), lang);
-          return '<pre><code class="language-' + lang + '">' + highlighted + '</code></pre>';
+          var protectedHighlighted = highlighted.replace(/_/g, '&#95;').replace(/\*/g, '&#42;');
+          return '<pre><code class="language-' + lang + '">' + protectedHighlighted + '</code></pre>';
         });
 
         // Inline code
-        escaped = escaped.replace(/`([^`]+)`/g, '<code>$1</code>');
+        escaped = escaped.replace(/`([^`]+)`/g, function(_, code) {
+          return '<code>' + code.replace(/_/g, '&#95;').replace(/\*/g, '&#42;') + '</code>';
+        });
 
         // Headers
         escaped = escaped.replace(/^######\s+(.*)$/gm, '<h6>$1</h6>');
@@ -3012,9 +3122,9 @@
         escaped = escaped.replace(/\*\*\*(.+?)\*\*\*/g, '<strong><em>$1</em></strong>');
         escaped = escaped.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>');
         escaped = escaped.replace(/\*(.+?)\*/g, '<em>$1</em>');
-        escaped = escaped.replace(/___(.+?)___/g, '<strong><em>$1</em></strong>');
-        escaped = escaped.replace(/__(.+?)__/g, '<strong>$1</strong>');
-        escaped = escaped.replace(/_(.+?)_/g, '<em>$1</em>');
+        escaped = escaped.replace(/(^|[^\w])___(\S(?:[^\n]*?\S)?)___(?!\w)/g, '$1<strong><em>$2</em></strong>');
+        escaped = escaped.replace(/(^|[^\w])__(\S(?:[^\n]*?\S)?)__(?!\w)/g, '$1<strong>$2</strong>');
+        escaped = escaped.replace(/(^|[^\w])_(\S(?:[^\n_]*?\S)?)_(?!\w)/g, '$1<em>$2</em>');
 
         // Strikethrough
         escaped = escaped.replace(/~~(.+?)~~/g, '<del>$1</del>');
@@ -3135,7 +3245,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": "已退出",
@@ -3148,6 +3260,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 || "";
       }
 
@@ -3321,7 +3434,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" : "";
@@ -3339,7 +3452,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>' +
@@ -3357,10 +3470,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 终端会话，支持持续交互、终端视图和权限流。";
       }
@@ -3748,10 +3863,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();
           }
         });
@@ -4929,6 +5043,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();
@@ -4969,11 +5094,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();
       }
@@ -5262,6 +5389,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() {
@@ -5290,6 +5424,62 @@
       }
       stripWideFillerForCopy();
 
+      // PTY 链路节流不变式：
+      //   服务端 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），所以必须限长，否则长跑会话每次 resync 都喂几 MB 给 wterm。
+      // 裁切优先在行边界（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) return;
         // 优先走 wterm-entry.js 自定义 WTerm 子类暴露的 reset()：它会调用
@@ -5308,21 +5498,47 @@
         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).
-      // 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).
+      // Reset wterm WASM grid and replay the full output buffer to clear stale
+      // DOM rows left by CSI cursor-jump sequences (Claude permission menus etc.).
+      // Replays the *whole* buffer because alt-screen / scroll-region / charset
+      // mode switches must be consumed from the start; cutting the middle drops
+      // those state-machine instructions and corrupts the grid.
+      // Pass { skipFit: true } when the caller already sized the grid (e.g.
+      // wterm.onResize fired this resync) — otherwise ensureTerminalFit recurses.
+      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");
         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;
       }
 
@@ -5334,26 +5550,40 @@
         }, typeof delayMs === "number" ? delayMs : 150);
       }
 
-      // Claude CLI 的 permission 菜单 / 选择列表，在用户按方向键时会
-      // 发送光标定位 (CSI H/f)、光标移动 (CSI A-D)、擦除显示/行 (CSI
-      // J/K) 等序列在原地重绘整块区域。wterm 在这种高频原地重绘下，
-      // DOM 行经常残留或错位，导致新写入的内容被堆到 grid 顶部 ——
-      // 用户体感就是"明明在改菜单，结果跑到最上面去了"。
-      //
-      // 已有的 pendingEscalation/permissionBlocked 状态变化触发的
-      // scheduleSoftResyncTerminal 在这种场景下不会触发（这两个布尔
-      // 在菜单交互过程中不变），health check 的 30s 兜底也太慢，且
-      // 连续按键时 chunkPause 永远不成立（lastChunkAt 一直在刷新）。
+      // Claude CLI 的 permission 菜单 / 选择列表在方向键下会发原地重绘序列
+      // (CSI A-D / J / K / H / f)。wterm 在这种高频原地重绘下 DOM 行容易残留
+      // 或错位，必须用 softResyncTerminal 兜底。
       //
-      // 这里在写 chunk 时被动检测：含上述序列就 schedule 一次 350ms
-      // debounce 的 softResync。连续按键时 timer 反复被重置，仅在
-      // 停顿后真正重放一次 buffer，开销可控。
+      // 触发用 leading + tail 节流而非 debounce：用户持续按键时每次 chunk 都会
+      // reset debounce timer，永远等不到静默期。leading 立即 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;
-        scheduleSoftResyncTerminal(350);
+        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) {
@@ -5465,6 +5695,11 @@
         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,
@@ -5502,13 +5737,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();
@@ -5665,6 +5919,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 会话已结束，无法继续发送";
@@ -5686,7 +5945,7 @@
 
       function getToolModeHint(tool, mode) {
         if (tool === "codex") {
-          return "Codex 当前仅支持 PTY 透传，并固定以 full-access 启动。";
+          return "Codex 支持 PTY 终端与结构化（JSONL）两种会话，结构化模式按 full-access 启动。";
         }
         if (mode === "full-access") {
           return "自动确认权限请求与高权限操作，适合你确认环境安全后的连续修改。";
@@ -5790,15 +6049,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>';
         }
@@ -5809,7 +6073,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;
       }
 
@@ -5819,6 +6083,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);
             }
@@ -5837,6 +6102,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") {
@@ -5860,7 +6126,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) {
@@ -5882,7 +6148,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" },
@@ -5899,7 +6164,8 @@
             updateSessionSnapshot(data);
             if (typeof showToast === "function") {
               var display = normalized || "默认";
-              showToast("已切换模型 → " + display, "success");
+              var hint = session.provider === "codex" ? "（下次对话生效）" : "";
+              showToast("已切换模型 → " + display + hint, "success");
             }
           }
         })
@@ -5907,11 +6173,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.config && state.config.structuredRunner === "sdk") ? "claude-sdk" : (state.structuredRunner || "claude-cli-print")),
           prompt: prompt || undefined,
           worktreeEnabled: worktreeEnabled === true,
           model: modelPref || undefined
@@ -5981,11 +6249,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");
 
@@ -6002,7 +6265,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);
           });
@@ -6083,19 +6346,28 @@
             return block && block.__processing;
           });
         })());
-        var preserveLocalStructuredProgress = (localSession.sessionKind === "structured")
-          && !!localStructuredState
-          && localStructuredState.inFlight === true
-          && (!serverStructuredState || serverStructuredState.inFlight !== true)
-          && localHasPendingAssistant
-          && !!localStructuredState.activeRequestId
-          && (!serverStructuredState || !serverStructuredState.activeRequestId || serverStructuredState.activeRequestId === localStructuredState.activeRequestId);
         var localMessages = Array.isArray(localSession.messages)
           ? (structuredSession ? stripRenderOnlyStructuredMessages(localSession.messages) : localSession.messages)
           : [];
         var serverMessages = Array.isArray(serverSession.messages)
           ? (structuredSession ? stripRenderOnlyStructuredMessages(serverSession.messages) : serverSession.messages)
           : [];
+        // 服务端已经返回了完整的 assistant 回复（非 __processing 占位）时，
+        // 不应再保留本地的 inFlight=true 状态，否则用户会看到"思考中"转圈永远不停。
+        var serverHasCompletedAssistant = serverMessages.length > 0 && (function() {
+          var last = serverMessages[serverMessages.length - 1];
+          return last && last.role === "assistant" && Array.isArray(last.content)
+            && !last.content.some(function(b) { return b && b.__processing; });
+        })();
+        var preserveLocalStructuredProgress = (localSession.sessionKind === "structured")
+          && !!localStructuredState
+          && localStructuredState.inFlight === true
+          && (!serverStructuredState || serverStructuredState.inFlight !== true)
+          && localHasPendingAssistant
+          && !!localStructuredState.activeRequestId
+          && !!serverStructuredState && !!serverStructuredState.activeRequestId
+          && serverStructuredState.activeRequestId === localStructuredState.activeRequestId
+          && !serverHasCompletedAssistant;
         var preserveLocalMessages = localMessages.length > serverMessages.length
           || (localMessages.length > 0 && serverMessages.length > 0
             && JSON.stringify(localMessages[localMessages.length - 1]) !== JSON.stringify(serverMessages[serverMessages.length - 1])
@@ -6384,12 +6656,22 @@
               // 设计原则：terminal 写入只走 ws init 与 chunk hot-path 两条
               // 权威路径——参见 case "init" 的 replace 写入与 onmessage
               // chunk 处理。这里只在 ws 离线兜底时才 append 写入。
-              if (!state.wsConnected) {
+              //
+              // 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 的
+                // ws 在线/连接中：仅校准列宽，不重 replay（init 的
                 // ensureTerminalFitWithRetry("init") 会负责按真实
                 // 宽度的全量基线写入）。
                 ensureTerminalFit("session-switch");
@@ -6545,7 +6827,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();
@@ -7181,6 +7463,9 @@
             var langEl = document.getElementById("cfg-language");
             if (langEl) langEl.value = cfg.language || "";
 
+            var srEl = document.getElementById("cfg-structured-runner");
+            if (srEl) srEl.value = cfg.structuredRunner || "cli";
+
             // Default model
             state.configDefaultModel = cfg.defaultModel || "";
             updateSettingsDefaultModelSelect();
@@ -7239,6 +7524,7 @@
           shell: (document.getElementById("cfg-shell") || {}).value,
           language: (document.getElementById("cfg-language") || {}).value || "",
           defaultModel: (document.getElementById("cfg-default-model") || {}).value || "",
+          structuredRunner: (document.getElementById("cfg-structured-runner") || {}).value || "cli",
         };
 
         var previousDefaultModel = (state.config && state.config.defaultModel) || "";
@@ -7752,6 +8038,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();
@@ -7762,7 +8071,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) {
@@ -7807,12 +8116,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)
@@ -7842,13 +8152,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) {
@@ -8339,47 +8649,6 @@
         }
       }
 
-      function createOptimizeShimmer(inputBox, text) {
-        var composer = inputBox.closest(".input-composer");
-        if (!composer) return null;
-        // 用 mirror 元素同步 textarea 的文字 + 字体 + 排版参数，叠在
-        // textarea 之上。mirror 自身 color: transparent + background-clip:
-        // text，让动画渐变只在文字字符形状内显示——空白处完全透明，所以
-        // 视觉上只有"几个字"被光扫过，像魔法橡皮擦掠过文字本身，而不是
-        // 整个输入框背景在闪。
-        var rect = inputBox.getBoundingClientRect();
-        var composerRect = composer.getBoundingClientRect();
-        var style = window.getComputedStyle(inputBox);
-        var mirror = document.createElement("div");
-        mirror.className = "prompt-optimize-shimmer-overlay";
-        mirror.textContent = text;
-        // 与 textarea 同坐标同尺寸（composer 是 position:relative，所以
-        // 用相对 composer 的 offset；不直接用 inputBox.offsetTop 是因为
-        // textarea 可能有变换/包裹元素，getBoundingClientRect 更稳）。
-        mirror.style.top = (rect.top - composerRect.top) + "px";
-        mirror.style.left = (rect.left - composerRect.left) + "px";
-        mirror.style.width = rect.width + "px";
-        mirror.style.height = rect.height + "px";
-        // 复制 textarea 的字符排版，确保 mirror 上的字符与 textarea 渲染
-        // 的字符像素级对齐（错位会让"光从文字扫过"看起来糊掉）。
-        mirror.style.fontFamily = style.fontFamily;
-        mirror.style.fontSize = style.fontSize;
-        mirror.style.fontWeight = style.fontWeight;
-        mirror.style.fontStyle = style.fontStyle;
-        mirror.style.lineHeight = style.lineHeight;
-        mirror.style.letterSpacing = style.letterSpacing;
-        mirror.style.wordSpacing = style.wordSpacing;
-        mirror.style.textAlign = style.textAlign;
-        mirror.style.textIndent = style.textIndent;
-        mirror.style.paddingTop = style.paddingTop;
-        mirror.style.paddingRight = style.paddingRight;
-        mirror.style.paddingBottom = style.paddingBottom;
-        mirror.style.paddingLeft = style.paddingLeft;
-        mirror.style.boxSizing = style.boxSizing;
-        composer.appendChild(mirror);
-        return mirror;
-      }
-
       var promptOptimizeInFlight = false;
       function optimizePromptText() {
         if (promptOptimizeInFlight) return;
@@ -8400,7 +8669,6 @@
           btn.setAttribute("title", "正在优化…");
         }
         if (composer) composer.classList.add("is-optimizing");
-        var shimmerOverlay = createOptimizeShimmer(inputBox, raw);
         inputBox.setAttribute("aria-busy", "true");
         var prevReadOnly = inputBox.readOnly;
         inputBox.readOnly = true;
@@ -8439,9 +8707,6 @@
               btn.setAttribute("title", "提示词优化（AI）");
             }
             if (composer) composer.classList.remove("is-optimizing");
-            if (shimmerOverlay && shimmerOverlay.parentNode) {
-              shimmerOverlay.parentNode.removeChild(shimmerOverlay);
-            }
             inputBox.removeAttribute("aria-busy");
             inputBox.readOnly = prevReadOnly;
           });
@@ -8474,8 +8739,6 @@
           } else {
             setDraftValue(finalText, true);
             try { inputBox.setSelectionRange(finalText.length, finalText.length); } catch (e) { /* ignore */ }
-            inputBox.classList.add("optimize-flash");
-            setTimeout(function() { inputBox.classList.remove("optimize-flash"); }, 900);
           }
         }
         tick();
@@ -8515,6 +8778,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";
       }
 
@@ -8524,6 +8790,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;
         });
       }
@@ -8553,12 +8822,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) {
@@ -8593,12 +8862,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) {
@@ -8774,13 +9043,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) {
@@ -8844,13 +9113,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) {
@@ -9007,6 +9276,9 @@
         return Promise.resolve();
       }
 
+      // 防止同一会话并发提交（快速双击 / 重复触发）
+      var _structuredSubmittingSessions = {};
+
       function postStructuredInput(input, inputBox, session) {
         console.log("[WAND] postStructuredInput selectedId:", state.selectedId, "input:", input && input.substring(0, 50), "session:", session && { id: session.id, sessionKind: session.sessionKind, runner: session.runner, status: session.status, inFlight: session.structuredState && session.structuredState.inFlight });
         if (!state.selectedId || !input) return Promise.resolve();
@@ -9014,6 +9286,11 @@
           showToast("会话不存在，请重新选择或新建会话。", "error");
           return Promise.resolve();
         }
+        // 同一会话的上一次提交尚未落地，直接忽略防止重复发送
+        if (_structuredSubmittingSessions[session.id]) {
+          console.log("[wand] postStructuredInput: duplicate submit ignored for session", session.id);
+          return Promise.resolve();
+        }
 
         var isInterrupting = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
         // Immediately render user message with thinking indicator
@@ -9046,21 +9323,36 @@
         // the HTTP response arrives.
         var epochBeforePost = state.queueEpoch;
 
-        return fetch("/api/structured-sessions/" + state.selectedId + "/messages", {
+        // 给每次发送生成唯一 idempotency key。Android WebView 进程被冻结再恢复
+        // 的边界场景下，底层网络栈偶尔会把上次未收到响应的 POST 重发一次（前端
+        // JS 拦不住），导致同一条消息被 backend 处理两遍。带上 key 让 backend
+        // 在窗口内识别重发并丢弃。
+        var idempotencyKey = (typeof crypto !== "undefined" && crypto.randomUUID)
+          ? crypto.randomUUID()
+          : (Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 10));
+
+        // 用 session.id（参数绑定，in-flight 期间不变）而不是 state.selectedId
+        // 拼 URL，避免用户切到别的会话后 fetch 落到错误 sessionId。
+        _structuredSubmittingSessions[session.id] = true;
+        return fetch("/api/structured-sessions/" + session.id + "/messages", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({ input: input, interrupt: isInterrupting || undefined })
+          body: JSON.stringify({ input: input, interrupt: isInterrupting || undefined, idempotencyKey: idempotencyKey })
         })
         .then(function(res) {
           if (!res.ok) {
             return res.json().catch(function() { return { error: "请求失败" }; }).then(function(payload) {
-              throw new Error((payload && payload.error) || "无法发送结构化消息。");
+              var err = new Error((payload && payload.error) || "无法发送结构化消息。");
+              err.errorCode = payload && payload.errorCode;
+              err.httpStatus = res.status;
+              throw err;
             });
           }
           return res.json();
         })
         .then(function(snapshot) {
+          _structuredSubmittingSessions[session.id] = false;
           if (snapshot && snapshot.error) {
             throw new Error(snapshot.error);
           }
@@ -9069,19 +9361,45 @@
               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");
+              }
             }
           }
         })
         .catch(function(error) {
+          _structuredSubmittingSessions[session.id] = false;
+
+          // duplicate_idempotency_key：服务端识别出 WebView 底层重发的副本，
+          // 直接拦截不处理。这里**不**回滚乐观更新——第一次的请求实际上已经
+          // 被服务端接收并处理（或正在处理），ws 推送会带回真实状态；如果在
+          // 这里把 user turn rollback 掉，第一次的 user 消息会从 UI 上消失。
+          if (error && error.errorCode === "duplicate_idempotency_key") {
+            showToast(error.message || "检测到重复发送，已拦截。", "warning");
+            updateInputHint("Enter 发送 · Shift+Enter 换行");
+            return;
+          }
+
+          // 回滚乐观更新：恢复发送前的 messages（去掉刚加的 userTurn）和 inFlight 状态
+          var rollbackMsgs = userMsgs.slice(0, -1);
           updateSessionSnapshot({
             id: session.id,
+            status: session.status,
+            messages: rollbackMsgs,
             structuredState: Object.assign({}, session.structuredState || {}, { inFlight: false }),
           });
+          if (session.id === state.selectedId) {
+            state.currentMessages = buildMessagesForRender(
+              Object.assign({}, session, { messages: rollbackMsgs, structuredState: Object.assign({}, session.structuredState || {}, { inFlight: false }) }),
+              rollbackMsgs
+            );
+            renderChat(true);
+          }
           var message = (error && error.message) || "";
           var isTransientAbort =
             message === "Failed to fetch" ||
@@ -9273,13 +9591,22 @@
         }, Promise.resolve());
       }
 
+      // pendingMessages 缓存 ws 离线时的输入，重连后回放。每条带时间戳，
+      // flush 时丢弃过期项——离线 >TTL 后回放老按键序列只会让 PTY 错位。
+      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);
         });
       }
 
@@ -9297,16 +9624,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
@@ -9322,10 +9654,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
@@ -9333,14 +9662,7 @@
           return Promise.resolve();
         }
 
-        console.log("[wand] postInput: sending", {
-          sessionId: state.selectedId,
-          inputLength: input.length,
-          view: effectiveView,
-          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",
@@ -9355,11 +9677,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;
             });
@@ -9368,11 +9690,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;
         });
@@ -9394,6 +9723,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;
@@ -9561,7 +9902,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"];
@@ -9586,21 +9929,25 @@
               : "Enter 发送 · Shift+Enter 换行";
           }
         }
-        var disableStructuredInput = !!selectedSession && structured && isCodex && !isRunning;
-        // 历史会话只要可自动恢复（Claude provider + 有 claudeSessionId），
-        // 输入框/发送按钮就保持可用——发送时由 ensureSessionReadyForInput 透明完成恢复。
+        // 历史会话只要可自动恢复（Claude provider + 有 claudeSessionId），输入框/发送按钮
+        // 就保持可用——发送时由 ensureSessionReadyForInput 透明完成恢复。
         var canResumeOnSend = !structured && !isRunning && canAutoResumeSession(selectedSession);
         if (composer) {
           composer.placeholder = getComposerPlaceholder(selectedSession, state.terminalInteractive);
-          composer.disabled = structured ? disableStructuredInput : (!!selectedSession && !isRunning && !canResumeOnSend);
+          composer.disabled = !structured && !!selectedSession && !isRunning && !canResumeOnSend;
           composer.setAttribute("aria-disabled", composer.disabled ? "true" : "false");
+          // 终端交互模式下按键由 document capture phase 透传到 PTY；用
+          // readOnly 而非 disabled 防止 IME 组合输入等边界场景下字符同时
+          // 落到 textarea，又保留 focus 能力。
+          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 && !canResumeOnSend);
-          sendBtn.setAttribute("title", isCodex
-            ? (isRunning ? "发送给 Codex" : "Codex 会话已结束")
-            : (structured ? "发送" : (!selectedSession || isRunning || canResumeOnSend ? "发送" : "会话已结束")));
+          sendBtn.disabled = !structured && !!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);
@@ -9631,6 +9978,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) {
@@ -9647,12 +9995,22 @@
         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();
+      }
+
+      // 快捷键点击后做一次延迟 resync 兜底：maybeScheduleResyncForChunk 偶尔会漏
+      // 抓 Codex 菜单切换之类的原地重绘，导致 DOM 行残留。500ms 是为了等服务端把
+      // 本次按键的回执完整推过来，避免 resync 只回放到 chunk 一半。
+      function scheduleShortcutResync() {
+        if (!state.terminal) return;
+        scheduleSoftResyncTerminal(500);
       }
 
       function updateKeyboardPopupUI() {
@@ -9771,8 +10129,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) {
@@ -9786,7 +10156,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",
@@ -9801,7 +10174,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;
@@ -9814,10 +10187,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;
         });
@@ -9946,12 +10322,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) {
@@ -9976,9 +10352,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) {
@@ -10007,9 +10383,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) {
@@ -10087,13 +10463,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) {
@@ -10125,13 +10501,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) {
@@ -10187,10 +10563,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) {
@@ -10230,12 +10606,8 @@
       }
 
       function updateInputPanelViewportSpacing() {
-        // 旧实现给 input-panel 加底部 padding = 键盘高度，意图是腾出键盘
-        // 空间。但 input-panel 本身位置由 flex 决定，padding 增大只是把
-        // panel 自身撑高、内部底部多出空白，textarea（panel 顶部）反而
-        // 被往上推、离键盘更远。新方案改为让 body 高度跟随 visualViewport
-        // 收缩（见 syncAppViewportHeight），input-panel 自然贴键盘上沿。
-        // 这里清掉旧 keyboard-offset，避免新旧双重补偿。
+        // 键盘空间通过 syncAppViewportHeight 让 body 跟随 visualViewport 收缩处理；
+        // 这里清掉历史遗留的 --keyboard-offset 避免双重补偿。
         var inputPanel = document.querySelector('.input-panel');
         if (!inputPanel) return;
         inputPanel.style.removeProperty('--keyboard-offset');
@@ -11300,11 +11672,31 @@
             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) {
@@ -11523,6 +11915,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
@@ -11539,6 +11934,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
@@ -11567,8 +11999,29 @@
       function handleWebSocketMessage(msg) {
         switch (msg.type) {
           case 'output':
-            // Update session output (for terminal display and local message parsing)
-            // NOTE: For structured sessions, output may be "" during streaming — check messages too
+            // For structured sessions, output may be "" during streaming — check messages too.
+            // thinking → idle 边界自愈：bridge 把 isResponding 透传过来，true→false 时
+            // 主动 softResyncTerminal，洗掉流式渲染残留的错位光标定位序列。
+            // 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 };
@@ -11642,7 +12095,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;
@@ -11656,9 +12109,9 @@
                 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();
@@ -11744,6 +12197,8 @@
 
             if (isStructuredEnded && msg.sessionId === state.selectedId) {
               flushStructuredInputQueue();
+              // 结构化会话结束时也清 localStorage，防止下次加载恢复僵尸队列
+              clearStructuredQueuePersistence(msg.sessionId);
             } else if (!isStructuredEnded) {
               state.structuredInputQueue = [];
               clearStructuredQueuePersistence(state.selectedId);
@@ -11787,18 +12242,12 @@
               renderChat(true);
               updateTaskDisplay();
               updateApprovalStats();
-              // ws 重新订阅时拿到的是服务端 ring buffer 的最新窗口（最多
-              // 120KB）；客户端缓存的 terminalOutput 可能早于服务端窗口
-              // 的起点。append 模式有 prefix 检查，prefix 不匹配就 reset+
-              // 全量重写、全等就直接 return false——前者会把 alt-screen
-              // 中的 Claude TUI 切走，后者会把"应该按真实 cols 重写"的
-              // 机会跳过。改用 replace 强制 reset+按当前 cols 重写一次，
-              // 这是订阅时唯一可信的全量基线。
+              // 订阅返回的是服务端 ring buffer 最新窗口，与客户端 terminalOutput
+              // 可能不连续。强制 replace（reset + 按当前 cols 重写）是订阅时唯一
+              // 可信的全量基线，避免 append 的 prefix 检查走错分支。
               updateTerminalOutput(msg.data.output || "", msg.sessionId, "replace");
-              // 紧接着等容器有真实尺寸再 fit + softResync：wterm 启动
-              // 硬编码 cols=120，replace 写入也可能落在错的列宽上，
-              // ResizeObserver 的回调是异步的，得用 fit-with-retry 兜
-              // 一次，确保最终一定按真实宽度重排。
+              // wterm 启动 cols=120，replace 写入可能落在错的列宽上；ResizeObserver
+              // 回调异步，用 fit-with-retry 兜一次确保按真实宽度重排。
               ensureTerminalFitWithRetry("init");
             }
             break;
@@ -12183,7 +12632,8 @@
         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;
+        // 活跃流时拉到 LIVE 减少高频重渲；空闲时用 IDLE 快速响应。
+        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; });
@@ -12191,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
@@ -14555,6 +15005,49 @@
           return source;
         }
 
+        function isWordChar(code) {
+          return (code >= 48 && code <= 57) ||
+            (code >= 65 && code <= 90) ||
+            (code >= 97 && code <= 122) ||
+            code === 95;
+        }
+
+        function replaceUnderscoreEmphasis(source, openTag, closeTag) {
+          var cursor = 0;
+          while (cursor < source.length) {
+            var start = source.indexOf("_", cursor);
+            if (start === -1) break;
+            var leftCode = start > 0 ? source.charCodeAt(start - 1) : 0;
+            if (isWordChar(leftCode)) {
+              cursor = start + 1;
+              continue;
+            }
+            var searchFrom = start + 1;
+            var end = -1;
+            while (searchFrom < source.length) {
+              var candidate = source.indexOf("_", searchFrom);
+              if (candidate === -1) break;
+              var rightIdx = candidate + 1;
+              var rightCode = rightIdx < source.length ? source.charCodeAt(rightIdx) : 0;
+              if (!isWordChar(rightCode)) {
+                end = candidate;
+                break;
+              }
+              searchFrom = candidate + 1;
+            }
+            if (end === -1) break;
+            var inner = source.slice(start + 1, end);
+            if (!inner) {
+              cursor = end + 1;
+              continue;
+            }
+            var replacement = openTag + inner + closeTag;
+            source = source.slice(0, start) + replacement + source.slice(end + 1);
+            cursor = start + replacement.length;
+          }
+          return source;
+        }
+
         function replaceLinePrefix(source, marker, openTag, closeTag) {
           return source.split(newline).map(function(line) {
             if (line.indexOf(marker) !== 0) return line;
@@ -14616,12 +15109,13 @@
           }
 
           var highlighted = highlightCode(code.trim(), lang);
+          var protectedHighlighted = highlighted.replace(/_/g, '&#95;').replace(/\*/g, '&#42;');
           var replacement = '<div class="code-block">' +
             '<div class="code-block-header">' +
               '<span class="code-lang">' + (lang || "code") + '</span>' +
               '<button class="code-copy">Copy</button>' +
             '</div>' +
-            '<pre><code>' + highlighted + '</code></pre>' +
+            '<pre><code>' + protectedHighlighted + '</code></pre>' +
           '</div>';
           result = result.slice(0, start) + replacement + result.slice(endTag + 3);
           pos = start + replacement.length;
@@ -14638,14 +15132,15 @@
             continue;
           }
           var inlineCode = result.slice(inlineStart + 1, inlineEnd);
-          var inlineReplacement = '<code class="code-inline">' + inlineCode + '</code>';
+          var protectedInlineCode = inlineCode.replace(/_/g, '&#95;').replace(/\*/g, '&#42;');
+          var inlineReplacement = '<code class="code-inline">' + protectedInlineCode + '</code>';
           result = result.slice(0, inlineStart) + inlineReplacement + result.slice(inlineEnd + 1);
           pos = inlineStart + inlineReplacement.length;
         }
 
         result = replacePair(result, "**", '<strong>', '</strong>');
         result = replacePair(result, "*", '<em>', '</em>');
-        result = replacePair(result, "_", '<em>', '</em>');
+        result = replaceUnderscoreEmphasis(result, '<em>', '</em>');
         result = replaceLinePrefix(result, "### ", '<h3>', '</h3>');
         result = replaceLinePrefix(result, "## ", '<h2>', '</h2>');
         result = replaceLinePrefix(result, "# ", '<h1>', '</h1>');
@@ -15029,6 +15524,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;
@@ -15054,21 +15564,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
@@ -15081,6 +15626,8 @@
           sessionLabel: sessionLabel,
           status: sessionStatus,
           currentTask: currentTask,
+          latestUserText: latestUserText,
+          latestAssistantText: latestAssistantText,
           todos: todos || []
         };