@co0ontty/wand 1.18.1 → 1.18.12

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

@@ -167,6 +167,7 @@
             return false;
           }
         })(),
+        topbarMoreOpen: false,
         chatAutoFollow: (function() {
           try {
             var saved = localStorage.getItem(CHAT_AUTO_FOLLOW_STORAGE_KEY);
@@ -182,6 +183,8 @@
         chatScrollHandler: null,
         lastForegroundSyncAt: 0,
         foregroundSyncTimer: null,
+        wsReconnectAttempts: 0,
+        wsReconnectTimer: null,
         currentMessages: [],
         lastRenderedHash: 0,
         lastRenderedMsgCount: 0,
@@ -802,14 +805,11 @@
 
       function updateInstallPrompt() {
         // 显示或隐藏菜单栏中的安装按钮
+        var visible = !!(state.showInstallPrompt && state.deferredPrompt);
         var installBtn = document.getElementById('pwa-install-button');
-        if (installBtn) {
-          if (state.showInstallPrompt && state.deferredPrompt) {
-            installBtn.classList.remove('hidden');
-          } else {
-            installBtn.classList.add('hidden');
-          }
-        }
+        if (installBtn) installBtn.classList.toggle('hidden', !visible);
+        var topbarInstallItem = document.getElementById('topbar-install-item');
+        if (topbarInstallItem) topbarInstallItem.classList.toggle('hidden', !visible);
       }
 
       function renderBootLoading() {
@@ -824,36 +824,48 @@
           '</div>';
       }
 
-      function scheduleForegroundSync(reason) {
+      function scheduleForegroundSync(reason, opts) {
         if (!state.config) return;
         if (document.hidden) return;
+        var immediate = opts && opts.immediate === true;
         var now = Date.now();
-        if (now - state.lastForegroundSyncAt < 1500) return;
+        // 节流只是为了防止 visibilitychange/focus/pageshow 在前台切换时
+        // 连珠炮式触发同一份重连工作，不再借此延迟实际同步——之前用
+        // 80ms 兜延迟的版本会在前台事件后再去 loadOutput 全量重写
+        // terminal，但 wterm cols 那时还没被 ResizeObserver 自适应到，
+        // 写进去的全是按错列宽排版的内容，结果"切回前台/刷新页面 →
+        // 中间一大段都看不到"反而成了常态。
+        if (!immediate && now - state.lastForegroundSyncAt < 1500) return;
         state.lastForegroundSyncAt = now;
         if (state.foregroundSyncTimer) {
           clearTimeout(state.foregroundSyncTimer);
-        }
-        state.foregroundSyncTimer = setTimeout(function() {
           state.foregroundSyncTimer = null;
-          syncOnForeground(reason);
-        }, 80);
+        }
+        syncOnForeground(reason, immediate);
       }
 
-      function syncOnForeground(reason) {
+      function syncOnForeground(reason, force) {
         if (!state.config) return Promise.resolve();
         if (document.hidden) return Promise.resolve();
-        if (!state.ws || (state.ws.readyState !== WebSocket.OPEN && state.ws.readyState !== WebSocket.CONNECTING)) {
+        // On Android resume the previous WS may still report OPEN/CONNECTING
+        // for a few seconds because the close frame hasn't been delivered
+        // yet (TCP keepalive / Doze suspended the network stack). Force a
+        // fresh socket so we don't sit on a zombie connection.
+        if (force) {
+          forceReconnectWebSocket("resume-force");
+        } else if (!state.ws || (state.ws.readyState !== WebSocket.OPEN && state.ws.readyState !== WebSocket.CONNECTING)) {
           initWebSocket();
         }
         if (state.claudeHistoryLoaded) {
           loadClaudeHistory();
         }
-        return loadSessions({ skipSelectedOutputReload: true }).then(function() {
-          if (state.selectedId) {
-            return loadOutput(state.selectedId);
-          }
-          scheduleChatRender(true);
-        }).catch(function(e) {
+        // 不再 loadOutput 当前会话——WS 重连后服务端会主动推一条 init
+        // 消息，那条路径已经走 ensureTerminalFitWithRetry 强制按真实
+        // cols 重排 history，足够覆盖前台恢复时的同步需求。这里多加
+        // 一次 fetch + syncTerminalBuffer 反而会在 ws/http 两路的 output
+        // 之间来回 reset，导致 alt-screen 中正在绘制的 Claude TUI 被
+        // 中途清掉。只把会话列表刷一下，保证状态条/会话名等元数据是新的。
+        return loadSessions({ skipSelectedOutputReload: true }).catch(function(e) {
           console.error("[wand] foreground sync failed:", reason, e);
         });
       }
@@ -863,8 +875,15 @@
         window.__wandForegroundSyncBound = true;
 
         document.addEventListener("visibilitychange", function() {
-          if (!document.hidden) {
+          if (document.hidden) {
+            // Stop the reconnect backoff while hidden — the OS may freeze
+            // timers and then deliver them in a burst when we resume,
+            // creating a thundering-herd of connect attempts. The resume
+            // event will trigger one decisive reconnect instead.
+            cancelWsReconnect();
+          } else {
             scheduleForegroundSync("visibility");
+            ensureTerminalFitWithRetry("visibility");
           }
         });
 
@@ -879,6 +898,18 @@
         window.addEventListener("resume", function() {
           scheduleForegroundSync("resume");
         });
+
+        // Bridge from Android WebView host: MainActivity.onResume() calls
+        // evaluateJavascript to dispatch this event, which is the only
+        // reliable foreground signal once Doze/process-suspension has
+        // frozen page-level events (visibilitychange/focus/pageshow may
+        // fire late or not at all after a long suspend). Force-reconnect
+        // and force-refit immediately rather than waiting for the
+        // throttled scheduleForegroundSync path.
+        window.addEventListener("wand-android-resume", function() {
+          scheduleForegroundSync("android-resume", { immediate: true });
+          ensureTerminalFitWithRetry("android-resume");
+        });
       }
 
       function restoreLoginSession() {
@@ -1172,12 +1203,38 @@
             '</aside>' +
             '<main class="main-content">' +
               '<div class="main-header-row">' +
-                '<button id="sessions-toggle-button" class="floating-sidebar-toggle' + (state.sessionsDrawerOpen ? ' active' : '') + '" aria-label="切换会话侧栏" type="button">' +
-                  '<span class="hamburger-icon">' +
-                    '<span></span><span></span><span></span>' +
-                  '</span>' +
-                '</button>' +
-                '<span class="current-task hidden" id="current-task"></span>' +
+                '<div class="topbar-left">' +
+                  '<button id="sessions-toggle-button" class="floating-sidebar-toggle' + (state.sessionsDrawerOpen ? ' active' : '') + '" aria-label="切换会话侧栏" type="button">' +
+                    '<span class="hamburger-icon">' +
+                      '<span></span><span></span><span></span>' +
+                    '</span>' +
+                  '</button>' +
+                  '<span class="topbar-brand" aria-hidden="true">W</span>' +
+                '</div>' +
+                '<div class="topbar-center">' +
+                  (selectedSession
+                    ? (
+                        '<span class="topbar-session-title" title="' + escapeHtml(selectedSession.command || "") + '">' + escapeHtml(shortCommand(selectedSession.command)) + '</span>' +
+                        '<span class="session-status-pill ' + getSessionStatusClass(selectedSession) + '" title="' + escapeHtml(getSessionStatusLabel(selectedSession)) + '"><span class="session-status-dot"></span><span class="session-status-text">' + escapeHtml(getSessionStatusLabel(selectedSession)) + '</span></span>' +
+                        '<span class="current-task hidden" id="current-task"></span>' +
+                        (selectedSession.cwd ? '<span class="topbar-cwd" id="topbar-cwd" title="' + escapeHtml(selectedSession.cwd) + '" role="button" tabindex="0">' + escapeHtml(selectedSession.cwd) + '</span>' : '')
+                      )
+                    : '<span class="topbar-tagline">Wand 控制台</span>' +
+                      '<span class="current-task hidden" id="current-task"></span>'
+                  ) +
+                '</div>' +
+                '<div class="topbar-right">' +
+                  (selectedSession && selectedSession.cwd ? '<button id="topbar-file-button" class="topbar-btn square' + (state.filePanelOpen ? ' active' : '') + '" type="button" aria-label="文件" title="文件"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg></button>' : '') +
+                  '<div class="topbar-more-wrap">' +
+                    '<button id="topbar-more-button" class="topbar-btn square' + (state.topbarMoreOpen ? ' active' : '') + '" type="button" aria-label="更多" aria-haspopup="menu" aria-expanded="' + (state.topbarMoreOpen ? 'true' : 'false') + '" title="更多"><svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="1"/><circle cx="12" cy="5" r="1"/><circle cx="12" cy="19" r="1"/></svg></button>' +
+                    '<div id="topbar-more-menu" class="topbar-more-menu' + (state.topbarMoreOpen ? '' : ' hidden') + '" role="menu">' +
+                      '<button class="topbar-more-item" data-action="settings" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg><span>设置</span></button>' +
+                      '<button class="topbar-more-item" data-action="refresh" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/></svg><span>刷新</span></button>' +
+                      '<button class="topbar-more-item' + (state.showInstallPrompt && state.deferredPrompt ? '' : ' hidden') + '" id="topbar-install-item" data-action="install" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg><span>安装应用</span></button>' +
+                      '<button class="topbar-more-item topbar-more-item-danger" data-action="logout" type="button" role="menuitem"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"/><polyline points="16 17 21 12 16 7"/><line x1="21" y1="12" x2="9" y2="12"/></svg><span>退出</span></button>' +
+                    '</div>' +
+                  '</div>' +
+                '</div>' +
               '</div>' +
               // File panel backdrop (mobile)
               '<div id="file-panel-backdrop" class="file-panel-backdrop' + (state.filePanelOpen ? " open" : "") + '"></div>' +
@@ -1821,7 +1878,7 @@
       }
 
       function renderSessions() {
-        var activeSessions = state.sessions.filter(function(session) { return !session.archived && !session.resumedToSessionId; });
+        var activeSessions = state.sessions.filter(function(session) { return !session.archived; });
         var archivedSessions = state.sessions.filter(function(session) { return session.archived; });
         var groups = [];
         groups.push(renderSessionManageBar());
@@ -1994,9 +2051,7 @@
       }
 
       function getSelectableSessions() {
-        return state.sessions.filter(function(session) {
-          return session.archived || !session.resumedToSessionId;
-        });
+        return state.sessions.slice();
       }
 
       function countSelectableItems() {
@@ -2743,10 +2798,8 @@
         var statusMap = {
           "stopped": "已停止",
           "running": "运行中",
-          "idle": "空闲",
-          "thinking": "思考中",
-          "waiting-input": "等待输入",
-          "initializing": "启动中"
+          "exited": "已退出",
+          "failed": "已失败"
         };
         return statusMap[session.status] || session.status;
       }
@@ -3790,6 +3843,88 @@
         var filePanelBackdrop = document.getElementById("file-panel-backdrop");
         if (filePanelBackdrop) filePanelBackdrop.addEventListener("click", closeFilePanel);
 
+        // Topbar: file button (mirrors toggleFilePanel)
+        var topbarFileBtn = document.getElementById("topbar-file-button");
+        if (topbarFileBtn) topbarFileBtn.addEventListener("click", toggleFilePanel);
+
+        // Topbar: cwd click → open file panel
+        var topbarCwdEl = document.getElementById("topbar-cwd");
+        if (topbarCwdEl) {
+          topbarCwdEl.addEventListener("click", function() {
+            if (!state.filePanelOpen) toggleFilePanel();
+          });
+          topbarCwdEl.addEventListener("keydown", function(e) {
+            if (e.key === "Enter" || e.key === " ") {
+              e.preventDefault();
+              if (!state.filePanelOpen) toggleFilePanel();
+            }
+          });
+        }
+
+        // Topbar: more menu
+        var topbarMoreBtn = document.getElementById("topbar-more-button");
+        var topbarMoreMenu = document.getElementById("topbar-more-menu");
+        if (topbarMoreBtn && topbarMoreMenu) {
+          topbarMoreBtn.addEventListener("click", function(e) {
+            e.stopPropagation();
+            state.topbarMoreOpen = !state.topbarMoreOpen;
+            topbarMoreMenu.classList.toggle("hidden", !state.topbarMoreOpen);
+            topbarMoreBtn.classList.toggle("active", state.topbarMoreOpen);
+            topbarMoreBtn.setAttribute("aria-expanded", state.topbarMoreOpen ? "true" : "false");
+          });
+          topbarMoreMenu.addEventListener("click", function(e) {
+            var btn = e.target && e.target.closest ? e.target.closest(".topbar-more-item") : null;
+            if (!btn) return;
+            var action = btn.getAttribute("data-action");
+            // Close menu first regardless of action
+            state.topbarMoreOpen = false;
+            topbarMoreMenu.classList.add("hidden");
+            topbarMoreBtn.classList.remove("active");
+            topbarMoreBtn.setAttribute("aria-expanded", "false");
+            switch (action) {
+              case "settings":
+                openSettingsModal();
+                break;
+              case "refresh":
+                window.location.reload();
+                break;
+              case "install":
+                if (state.deferredPrompt) {
+                  state.deferredPrompt.prompt();
+                  state.deferredPrompt.userChoice.then(function() {
+                    state.deferredPrompt = null;
+                    state.showInstallPrompt = false;
+                    updateInstallPrompt();
+                  });
+                }
+                break;
+              case "logout":
+                logout();
+                break;
+            }
+          });
+          // Close on outside click
+          document.addEventListener("click", function(e) {
+            if (!state.topbarMoreOpen) return;
+            var wrap = topbarMoreMenu.parentElement;
+            if (wrap && !wrap.contains(e.target)) {
+              state.topbarMoreOpen = false;
+              topbarMoreMenu.classList.add("hidden");
+              topbarMoreBtn.classList.remove("active");
+              topbarMoreBtn.setAttribute("aria-expanded", "false");
+            }
+          });
+          // Close on ESC
+          document.addEventListener("keydown", function(e) {
+            if (e.key === "Escape" && state.topbarMoreOpen) {
+              state.topbarMoreOpen = false;
+              topbarMoreMenu.classList.add("hidden");
+              topbarMoreBtn.classList.remove("active");
+              topbarMoreBtn.setAttribute("aria-expanded", "false");
+            }
+          });
+        }
+
         // Terminal scale controls (topbar)
         var scaleDownBtn = document.getElementById("terminal-scale-down-top");
         var scaleUpBtn = document.getElementById("terminal-scale-up-top");
@@ -4659,9 +4794,148 @@
         requestSyncScrollbar();
       }
 
+      // ──────── East-Asian-Wide padding for wterm WASM ────────
+      //
+      // wterm's WASM grid (as of @wterm/core 0.1.8/0.1.9) treats every
+      // codepoint as occupying exactly 1 cell, while node-pty's backend
+      // and Claude Code's TUI emit cursor-positioning sequences that
+      // assume CJK / fullwidth / emoji codepoints occupy 2 columns
+      // (Unicode TR11 East-Asian-Width = W or F). The mismatch makes
+      // every CSI cursor move after CJK output drift by N/2 columns,
+      // causing in-place rewrites (thinking spinner, todo list,
+      // permission menus) to leave torn residue like "替替换换".
+      //
+      // Fix: insert U+2060 (Word Joiner — zero-width, unbreakable) after
+      // each wide codepoint before handing the byte stream to the WASM
+      // grid. The WJ takes one cell, so wide chars now occupy 2 cells —
+      // matching the backend's column accounting exactly. The browser
+      // renders WJ at zero width, so the visual layout stays correct.
+      //
+      // The scanner is ANSI-aware: it tracks ESC / CSI / OSC / DCS
+      // / PM / APC state across chunk boundaries so wide codepoints
+      // inside escape sequences (e.g. OSC window-title payloads) are
+      // not padded — that would break sequence parsing.
+      function isEastAsianWide(cp) {
+        if (cp < 0x1100) return false;
+        return (
+          (cp >= 0x1100 && cp <= 0x115f) ||
+          (cp >= 0x2329 && cp <= 0x232a) ||
+          (cp >= 0x2e80 && cp <= 0x303e) ||
+          (cp >= 0x3041 && cp <= 0x33ff) ||
+          (cp >= 0x3400 && cp <= 0x4dbf) ||
+          (cp >= 0x4e00 && cp <= 0x9fff) ||
+          (cp >= 0xa000 && cp <= 0xa4cf) ||
+          (cp >= 0xac00 && cp <= 0xd7a3) ||
+          (cp >= 0xf900 && cp <= 0xfaff) ||
+          (cp >= 0xfe30 && cp <= 0xfe4f) ||
+          (cp >= 0xff00 && cp <= 0xff60) ||
+          (cp >= 0xffe0 && cp <= 0xffe6) ||
+          (cp >= 0x1f000 && cp <= 0x1f9ff) ||
+          (cp >= 0x20000 && cp <= 0x2fffd) ||
+          (cp >= 0x30000 && cp <= 0x3fffd)
+        );
+      }
+
+      var WAND_WIDE_FILLER = "\u2060";
+
+      function createWideParserState() { return { mode: "normal" }; }
+
+      function widePadAnsi(data, st) {
+        if (!data) return "";
+        var s = String(data);
+        var out = "";
+        for (var i = 0; i < s.length; i++) {
+          var code = s.charCodeAt(i);
+          var cp = code;
+          var consumed = 1;
+          if (code >= 0xd800 && code <= 0xdbff && i + 1 < s.length) {
+            var lo = s.charCodeAt(i + 1);
+            if (lo >= 0xdc00 && lo <= 0xdfff) {
+              cp = (code - 0xd800) * 0x400 + (lo - 0xdc00) + 0x10000;
+              consumed = 2;
+            }
+          }
+          var ch = consumed === 2 ? s.substr(i, 2) : s.charAt(i);
+          switch (st.mode) {
+            case "normal":
+              if (cp === 0x1b) { st.mode = "esc"; out += ch; }
+              else if (cp === 0x9b) { st.mode = "csi"; out += ch; }
+              else if (cp === 0x9d || cp === 0x90 || cp === 0x9e || cp === 0x9f) {
+                st.mode = "string"; out += ch;
+              } else {
+                out += ch;
+                if (isEastAsianWide(cp)) out += WAND_WIDE_FILLER;
+              }
+              break;
+            case "esc":
+              out += ch;
+              if (cp === 0x5b) st.mode = "csi";
+              else if (cp === 0x5d || cp === 0x50 || cp === 0x58 ||
+                       cp === 0x5e || cp === 0x5f) st.mode = "string";
+              else st.mode = "normal";
+              break;
+            case "csi":
+              out += ch;
+              if (cp >= 0x40 && cp <= 0x7e) st.mode = "normal";
+              break;
+            case "string":
+              out += ch;
+              if (cp === 0x07 || cp === 0x9c) st.mode = "normal";
+              else if (cp === 0x1b) st.mode = "string-esc";
+              break;
+            case "string-esc":
+              out += ch;
+              if (cp === 0x5c) st.mode = "normal";
+              else st.mode = "string";
+              break;
+          }
+          i += consumed - 1;
+        }
+        return out;
+      }
+
+      function wandTerminalWrite(terminal, data) {
+        if (!terminal || data == null) return;
+        if (!state.wideParserState) state.wideParserState = createWideParserState();
+        terminal.write(widePadAnsi(data, state.wideParserState));
+      }
+
+      function resetWideParserState() {
+        state.wideParserState = createWideParserState();
+      }
+
+      // Strip the wide-pad filler from copied text so users pasting
+      // selected terminal output don't get hidden U+2060 sprinkled
+      // through every CJK string.
+      function stripWideFillerForCopy() {
+        if (typeof document === "undefined") return;
+        document.addEventListener("copy", function(e) {
+          var sel = window.getSelection && window.getSelection();
+          if (!sel || sel.isCollapsed) return;
+          var anchor = sel.anchorNode;
+          var node = anchor && anchor.nodeType === 3 ? anchor.parentNode : anchor;
+          var output = document.getElementById("output");
+          if (!output || !node || !output.contains(node)) return;
+          var text = sel.toString();
+          if (text.indexOf(WAND_WIDE_FILLER) === -1) return;
+          if (e.clipboardData) {
+            e.clipboardData.setData("text/plain", text.split(WAND_WIDE_FILLER).join(""));
+            e.preventDefault();
+          }
+        });
+      }
+      stripWideFillerForCopy();
+
       function resetTerminal() {
-        if (!state.terminal || typeof state.terminal.reset !== "function") return;
-        state.terminal.reset();
+        if (!state.terminal || 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");
+        resetWideParserState();
       }
 
       // Soft resync terminal: reset WASM grid and replay full output buffer.
@@ -4670,7 +4944,7 @@
       function softResyncTerminal() {
         if (!state.terminal || !state.terminalOutput) return false;
         resetTerminal();
-        state.terminal.write(state.terminalOutput);
+        wandTerminalWrite(state.terminal, state.terminalOutput);
         state.lastTerminalResyncAt = Date.now();
         maybeScrollTerminalToBottom("output");
         // Remeasure against real container: the refresh button used to only
@@ -4734,7 +5008,7 @@
           if (normalizedOutput !== currentOutput) {
             resetTerminal();
             if (normalizedOutput) {
-              state.terminal.write(normalizedOutput);
+              wandTerminalWrite(state.terminal, normalizedOutput);
             }
             wrote = true;
           }
@@ -4745,7 +5019,7 @@
         } else if (normalizedOutput.startsWith(currentOutput)) {
           var delta = normalizedOutput.slice(currentOutput.length);
           if (delta) {
-            state.terminal.write(delta);
+            wandTerminalWrite(state.terminal, delta);
             wrote = true;
           }
         } else if (currentOutput && currentOutput.startsWith(normalizedOutput)) {
@@ -4753,7 +5027,7 @@
         } else {
           resetTerminal();
           if (normalizedOutput) {
-            state.terminal.write(normalizedOutput);
+            wandTerminalWrite(state.terminal, normalizedOutput);
           }
           wrote = true;
         }
@@ -4800,6 +5074,19 @@
           },
           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 完的内容，体感上就是"刷新都没用、动一下窗口才好"。
+            if (state.terminal && state.terminalOutput) {
+              state.suppressFitReplay = true;
+              softResyncTerminal();
+            }
           }
         });
 
@@ -4853,7 +5140,7 @@
               syncTerminalBuffer(session.id, session.output || "", { mode: "append", scroll: false });
             }
           } else {
-            term.write("点击上方「新对话」开始你的第一次对话。\r\n");
+            wandTerminalWrite(term, "点击上方「新对话」开始你的第一次对话。\r\n");
           }
 
           state.terminalClickHandler = focusInputBox;
@@ -4994,7 +5281,7 @@
           return "会话已结束，无法继续发送";
         }
         return session && isStructuredSession(session) && session.structuredState && session.structuredState.inFlight
-          ? "思考中，可继续发送，消息会自动排队"
+          ? "思考中 · 发送新消息将中断当前回复"
           : "输入消息...";
       }
 
@@ -5623,12 +5910,17 @@
           initTerminal();
         }
 
-        if (selectedSession && state.terminal) {
-          syncTerminalBuffer(selectedSession.id, selectedSession.output || "", { mode: "append", scroll: false });
-        } else if (!selectedSession) {
+        if (!selectedSession) {
           state.terminalSessionId = null;
           state.terminalOutput = "";
         }
+        // 之前这里会用 selectedSession.output 再 syncTerminalBuffer 一次。
+        // 但 updateShellChrome 在 updateSessionsList、status 推送、init
+        // 等多个高频路径都会被调，每次都拿"可能不带 output 的 slim 快照"
+        // 兜回来 sync 一遍：要么早返回浪费判断，要么 prefix 不匹配触发
+        // reset+全量重写、把 alt-screen 中正在绘制的 Claude TUI 切走。
+        // terminal 写入应当只走 chunk hot-path 与 ws init 这两条权威路径，
+        // 这里不再插手，避免引入二次覆盖。
 
         if (state.terminal && selectedSession && state.currentView === "terminal") {
           maybeScrollTerminalToBottom("view");
@@ -8155,29 +8447,25 @@
           return Promise.resolve();
         }
 
-        var isQueueing = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
-        if (!isQueueing) {
-          // Immediately render user message with thinking indicator
-          var userTurn = { role: "user", content: [{ type: "text", text: input }] };
-          var userMsgs = stripRenderOnlyStructuredMessages(Array.isArray(session.messages) ? session.messages.slice() : []);
-          userMsgs.push(userTurn);
-          var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
-          // Write optimistic user turn into session.messages so WS updates
-          // that arrive before the HTTP response don't erase it.
-          updateSessionSnapshot({
-            id: session.id,
-            status: "running",
-            messages: userMsgs,
-            structuredState: optimisticStructuredState,
-          });
-          state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
-            status: "running",
-            messages: userMsgs,
-            structuredState: optimisticStructuredState,
-          }), userMsgs);
-          updateInputHint("思考中…");
-          renderChat(true);
-        }
+        var isInterrupting = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
+        // Immediately render user message with thinking indicator
+        var userTurn = { role: "user", content: [{ type: "text", text: input }] };
+        var userMsgs = stripRenderOnlyStructuredMessages(Array.isArray(session.messages) ? session.messages.slice() : []);
+        userMsgs.push(userTurn);
+        var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
+        updateSessionSnapshot({
+          id: session.id,
+          status: "running",
+          messages: userMsgs,
+          structuredState: optimisticStructuredState,
+        });
+        state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
+          status: "running",
+          messages: userMsgs,
+          structuredState: optimisticStructuredState,
+        }), userMsgs);
+        updateInputHint("思考中…");
+        renderChat(true);
 
         if (inputBox) {
           inputBox.value = "";
@@ -8194,17 +8482,21 @@
           method: "POST",
           headers: { "Content-Type": "application/json" },
           credentials: "same-origin",
-          body: JSON.stringify({ input: input })
+          body: JSON.stringify({ input: input, interrupt: isInterrupting || undefined })
+        })
+        .then(function(res) {
+          if (!res.ok) {
+            return res.json().catch(function() { return { error: "请求失败" }; }).then(function(payload) {
+              throw new Error((payload && payload.error) || "无法发送结构化消息。");
+            });
+          }
+          return res.json();
         })
-        .then(function(res) { return res.json(); })
         .then(function(snapshot) {
           if (snapshot && snapshot.error) {
             throw new Error(snapshot.error);
           }
           if (snapshot && snapshot.id) {
-            // If a WS update has already bumped the queue epoch, the HTTP
-            // response's queuedMessages is stale — drop it to avoid
-            // re-introducing already-dequeued items.
             if (state.queueEpoch > epochBeforePost && snapshot.queuedMessages) {
               delete snapshot.queuedMessages;
             }
@@ -8212,13 +8504,8 @@
             var refreshedSession = state.sessions.find(function(s) { return s.id === snapshot.id; }) || snapshot;
             state.currentMessages = buildMessagesForRender(refreshedSession, getPreferredMessages(refreshedSession, snapshot.output, false));
             renderChat(true);
-            if (isQueueing) {
-              var queuedCount = getStructuredQueuedInputs(refreshedSession).length;
-              if (queuedCount > 0) {
-                showToast("已排队（第 " + queuedCount + " 条），将在当前消息处理完成后自动发送。", "info");
-              }
-            } else {
-              updateInputHint("Enter 发送 · Shift+Enter 换行");
+            if (isInterrupting) {
+              showToast("已中断上一条回复，正在处理新消息…", "info");
             }
           }
         })
@@ -8902,6 +9189,12 @@
       function flushPendingMessages() {
         if (state.pendingMessages.length === 0) return;
 
+        var selectedSession = getSelectedSession();
+        if (isStructuredSession(selectedSession)) {
+          state.pendingMessages = [];
+          return;
+        }
+
         // Send queued messages in order, bypassing the session-running check
         // since our local state may be stale right after reconnect
         var queue = state.pendingMessages.slice();
@@ -10423,10 +10716,66 @@
       // 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) {
+        if (!state.terminal) return;
+        var attempts = 0;
+        var maxAttempts = 8;
+        function tryFit() {
+          if (!state.terminal) return;
+          var el = document.getElementById("output");
+          if (el) {
+            // Force a layout flush so offsetWidth reflects the post-resume
+            // container size, not a stale 0 from the suspended frame.
+            void el.offsetHeight;
+          }
+          if (el && el.offsetWidth > 0 && el.offsetHeight > 0) {
+            ensureTerminalFit(reason);
+            // 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();
+            }
+            return;
+          }
+          if (++attempts >= maxAttempts) return;
+          // Mix rAF and timeout: some Android WebView versions skip rAF
+          // during the first frame after resume, so falling back to a
+          // 16ms timer guarantees forward progress.
+          if (attempts <= 4) {
+            requestAnimationFrame(tryFit);
+          } else {
+            setTimeout(tryFit, 32);
+          }
+        }
+        tryFit();
+      }
+
       function ensureTerminalFit(reason) {
         if (!state.terminal) return false;
         var el = document.getElementById("output");
-        if (!el || el.offsetWidth === 0 || el.offsetHeight === 0) return false;
+        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() {
@@ -10459,43 +10808,6 @@
         return true;
       }
 
-      // Cheap cols/rows drift check — call before writing a new PTY chunk so
-      // the chunk renders against the correct grid even if ResizeObserver
-      // hasn't fired yet (e.g. mobile keyboard mid-animation, iOS PWA address
-      // bar collapse, panel drag in progress). Only runs a real remeasure
-      // when the container width changed since the last fit; otherwise it is
-      // effectively a single offsetWidth read.
-      function maybeRefitTerminal() {
-        if (!state.terminal) return;
-        var el = document.getElementById("output");
-        if (!el) return;
-        var w = el.offsetWidth;
-        var h = el.offsetHeight;
-        if (w === 0 || h === 0) return;
-        // First call: just record the baseline and let ensureTerminalFit
-        // (called from initTerminal/mount) own the initial sync.
-        if (state.lastFitContainerWidth === undefined) {
-          state.lastFitContainerWidth = w;
-          state.lastFitContainerHeight = h;
-          return;
-        }
-        if (w === state.lastFitContainerWidth && h === state.lastFitContainerHeight) return;
-        state.lastFitContainerWidth = w;
-        state.lastFitContainerHeight = h;
-        var prevCols = state.terminal.cols;
-        var prevRows = state.terminal.rows;
-        if (typeof state.terminal.remeasure === "function") {
-          state.terminal.remeasure();
-        }
-        if (state.terminal.cols !== prevCols || state.terminal.rows !== prevRows) {
-          sendTerminalResize(state.terminal.cols, state.terminal.rows);
-          // Don't replay here: the caller is about to write a fresh chunk and
-          // a softResync would race with it. The chunk itself will reach the
-          // correct grid; older buffer drift is repaired by the next
-          // ensureTerminalFit / health check / manual refresh.
-        }
-      }
-
       function scheduleTerminalResize(immediate) {
         if (state.resizeTimer) {
           clearTimeout(state.resizeTimer);
@@ -10535,7 +10847,54 @@
         if (timeEls.length > 0) scheduleSessionListUpdate();
       }, 30000);
 
-      function initWebSocket() {
+      function cancelWsReconnect() {
+        if (state.wsReconnectTimer) {
+          clearTimeout(state.wsReconnectTimer);
+          state.wsReconnectTimer = null;
+        }
+      }
+
+      // Drop any in-flight socket and start a new one *now* — used by the
+      // Android resume bridge to recover from zombie connections (socket
+      // still says OPEN, but the TCP path was torn down by Doze). Skips
+      // the backoff timer; the caller has already decided this is urgent.
+      function forceReconnectWebSocket(reason) {
+        cancelWsReconnect();
+        if (state.ws) {
+          var stale = state.ws;
+          // Detach handlers so the imminent close doesn't trigger another
+          // reconnect path while we're already starting a fresh one.
+          try { stale.onclose = null; } catch (e) { /* ignore */ }
+          try { stale.onerror = null; } catch (e) { /* ignore */ }
+          try { stale.close(); } catch (e) { /* ignore */ }
+          state.ws = null;
+        }
+        state.wsConnected = false;
+        state.wsReconnectAttempts = 0;
+        initWebSocket(reason);
+      }
+
+      function scheduleWsReconnect() {
+        if (state.wsReconnectTimer) return;
+        // Don't burn battery reconnecting while hidden — the resume
+        // listener will kick a fresh connect when we're foreground.
+        if (document.hidden) return;
+        var attempt = state.wsReconnectAttempts || 0;
+        // 0.5s, 1s, 2s, 4s, then capped at 8s. Faster than the old
+        // fixed 2s on the first retry (matters for transient blips)
+        // and bounded so a flapping server doesn't get hammered.
+        var delays = [500, 1000, 2000, 4000, 8000];
+        var delay = delays[attempt < delays.length ? attempt : delays.length - 1];
+        state.wsReconnectAttempts = attempt + 1;
+        state.wsReconnectTimer = setTimeout(function() {
+          state.wsReconnectTimer = null;
+          if (state.config && !state.ws && !document.hidden) {
+            initWebSocket("backoff");
+          }
+        }, delay);
+      }
+
+      function initWebSocket(reason) {
         if (!window.WebSocket) return false;
 
         // Prevent duplicate connections
@@ -10553,6 +10912,10 @@
           ws.onopen = function() {
             state.ws = ws;
             state.wsConnected = true;
+            // Reset backoff on a successful connect so the next disconnect
+            // starts the ladder from 500ms again.
+            state.wsReconnectAttempts = 0;
+            cancelWsReconnect();
             // Subscribe to current session if any
             subscribeToSession(state.selectedId);
             // Flush pending messages after reconnection
@@ -10560,7 +10923,10 @@
             // Re-fit terminal on reconnect — the viewport may have changed
             // while disconnected, so remeasure against real container size
             // rather than sending stale cols/rows from before the disconnect.
-            ensureTerminalFit("ws-reconnect");
+            // Use the retry variant: when the reconnect is triggered by
+            // Android resume, the WebView container may still be 0×0 for
+            // the first 1–2 frames while layout settles.
+            ensureTerminalFitWithRetry("ws-reconnect");
           };
 
           ws.onmessage = function(event) {
@@ -10575,12 +10941,7 @@
           ws.onclose = function() {
             state.ws = null;
             state.wsConnected = false;
-            // Reconnect after 2 seconds
-            setTimeout(function() {
-              if (state.config && !state.ws) {
-                initWebSocket();
-              }
-            }, 2000);
+            scheduleWsReconnect();
           };
 
           ws.onerror = function() {
@@ -10589,6 +10950,9 @@
 
           return true;
         } catch (e) {
+          // Constructor threw (rare — bad URL, blocked scheme). Try again
+          // through the backoff path so we don't get stuck.
+          scheduleWsReconnect();
           return false;
         }
       }
@@ -10675,11 +11039,13 @@
                 // Fast path: write chunk directly to avoid full-output comparison.
                 state.lastChunkAt = Date.now();
                 state.terminalLiveStreamSessions[msg.sessionId] = true;
-                // Detect cheap container-width drift before applying the chunk
-                // so absolute-cursor CSI sequences in the chunk land on the
-                // right grid (otherwise content tears or stacks at the top).
-                maybeRefitTerminal();
-                state.terminal.write(msg.data.chunk);
+                // 不再在 hot-path 调 maybeRefitTerminal/remeasure。它会偷偷把
+                // wterm 的 this.cols 改成新值，让 wterm 自己的 ResizeObserver
+                // 误判 newCols === this.cols 而跳过 wterm.resize() —— 那条路径
+                // 才会真正调 Renderer.setup() 重建 DOM 行。绕过它就让容器尺寸
+                // 变化的视觉错位无法被自愈，直到用户手动改窗口才修。现在让
+                // wterm 内部 ResizeObserver 独占 cols 跟踪职责。
+                wandTerminalWrite(state.terminal, msg.data.chunk);
                 state.terminalSessionId = msg.sessionId;
                 if (msg.data.output) {
                   state.terminalOutput = normalizeTerminalOutput(msg.data.output);
@@ -10813,14 +11179,19 @@
               renderChat(true);
               updateTaskDisplay();
               updateApprovalStats();
-              updateTerminalOutput(msg.data.output || "", msg.sessionId, "append");
-              // Ensure terminal is properly fitted after receiving initial data
-              scheduleTerminalResize(true);
-              if (state.terminal && state.terminal.remeasure) {
-                requestAnimationFrame(function() {
-                  if (state.terminal) state.terminal.remeasure();
-                });
-              }
+              // ws 重新订阅时拿到的是服务端 ring buffer 的最新窗口（最多
+              // 120KB）；客户端缓存的 terminalOutput 可能早于服务端窗口
+              // 的起点。append 模式有 prefix 检查，prefix 不匹配就 reset+
+              // 全量重写、全等就直接 return false——前者会把 alt-screen
+              // 中的 Claude TUI 切走，后者会把"应该按真实 cols 重写"的
+              // 机会跳过。改用 replace 强制 reset+按当前 cols 重写一次，
+              // 这是订阅时唯一可信的全量基线。
+              updateTerminalOutput(msg.data.output || "", msg.sessionId, "replace");
+              // 紧接着等容器有真实尺寸再 fit + softResync：wterm 启动
+              // 硬编码 cols=120，replace 写入也可能落在错的列宽上，
+              // ResizeObserver 的回调是异步的，得用 fit-with-retry 兜
+              // 一次，确保最终一定按真实宽度重排。
+              ensureTerminalFitWithRetry("init");
             }
             break;
           case 'usage':