@co0ontty/wand 1.15.1 → 1.17.4

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

@@ -70,16 +70,13 @@
         sessions: [],
         suggestionTimer: null,
         terminal: null,
-        fitAddon: null,
         terminalFitInProgress: false,
-        serializeAddon: null,
-        terminalDomView: null,
-        terminalDomUpdateTimer: null,
-        _lastDomHtml: "",
         terminalSessionId: null,
         terminalOutput: "",
         terminalLiveStreamSessions: {},
-        terminalViewportSize: { width: 0, height: 0 },
+        lastChunkAt: 0,
+        terminalHealthTimer: null,
+        lastTerminalResyncAt: 0,
         terminalAutoFollow: true,
         terminalScrollIdleTimer: null,
         terminalScrollIdleMs: 1800,
@@ -118,6 +115,11 @@
         cwdValue: "",
         modeValue: "managed",
         chatMode: "managed",
+        chatModel: (function() {
+          try { return localStorage.getItem("wand-chat-model") || ""; } catch (e) { return ""; }
+        })(),
+        availableModels: [],
+        modelsRefreshing: false,
         sessionCreateKind: "structured",
         sessionCreateWorktree: false,
         sessionTool: "claude",
@@ -199,11 +201,13 @@
         claudeHistoryLoaded: false,
         claudeHistoryExpanded: true,
         claudeHistoryExpandedDirs: {},
+        archivedExpanded: false,
         sessionsManageMode: false,
         selectedSessionIds: {},
         selectedClaudeHistoryIds: {},
         askUserSelections: {},  // { toolUseId: { 0: [optIdx...], submitted: false } }
         queueEpoch: 0,  // Monotonic counter for queue state freshness
+        pendingAttachments: [],  // [{ file, previewUrl, name, size }]
         // Load last used working directory from localStorage
         workingDir: (function() {
           try {
@@ -889,16 +893,21 @@
               try {
                 render({ skipShellChrome: true });
               } catch (_e) {
-                // render() may fail if external scripts (xterm.js) failed to load;
+                // render() may fail if external scripts (wterm) failed to load;
                 // continue with polling and session loading so the app remains functional
               }
               bindForegroundSyncListeners();
               startPolling();
               refreshAll();
+              fetchAvailableModels();
               requestNotificationPermission();
               if (config.updateAvailable && config.latestVersion) {
                 notifyUpdateAvailable(config.currentVersion || "-", config.latestVersion);
               }
+              // APK auto-update check on startup
+              if (_apkVersion) {
+                checkApkAutoUpdate();
+              }
               if (state.claudeHistoryExpanded && !state.claudeHistoryLoaded) {
                 loadClaudeHistory();
               }
@@ -952,6 +961,7 @@
         attachEventListeners();
         updateDrawerState();
         syncComposerModeSelect();
+        syncComposerModelSelect(getSelectedSession());
         applyCurrentView();
         if (!skipShellChrome) {
           updateShellChrome();
@@ -1106,12 +1116,21 @@
                   '<span class="session-count" id="session-count">' + String(state.sessions.length) + '</span>' +
                 '</div>' +
                 '<div class="sidebar-header-actions">' +
-                  '<button id="sidebar-home-btn" class="btn btn-ghost btn-sm" type="button" title="回到首页">' +
-                    '<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="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg>' +
-                  '</button>' +
-                  '<button id="sidebar-refresh-btn" class="btn btn-ghost btn-sm" type="button" title="刷新页面">' +
-                    '<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"/><path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10"/></svg>' +
-                  '</button>' +
+                  '<div class="sidebar-header-more">' +
+                    '<button id="sidebar-more-btn" class="btn btn-ghost btn-sm" type="button" title="更多操作">' +
+                      '<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="5" r="1.5"/><circle cx="12" cy="12" r="1.5"/><circle cx="12" cy="19" r="1.5"/></svg>' +
+                    '</button>' +
+                    '<div class="sidebar-header-overflow" id="sidebar-overflow-menu">' +
+                      '<button class="overflow-item" id="sidebar-home-btn" type="button">' +
+                        '<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg>' +
+                        '<span>回到首页</span>' +
+                      '</button>' +
+                      '<button class="overflow-item" id="sidebar-refresh-btn" type="button">' +
+                        '<svg width="15" height="15" 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"/><path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10"/></svg>' +
+                        '<span>刷新页面</span>' +
+                      '</button>' +
+                    '</div>' +
+                  '</div>' +
                   '<button id="sidebar-pin-btn" class="btn btn-ghost btn-sm sidebar-pin-toggle' + (state.sidebarPinned ? ' pinned' : '') + '" type="button" title="' + (state.sidebarPinned ? '取消固定侧栏' : '固定侧栏') + '">' +
                     '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="17" x2="12" y2="22"/><path d="M5 17h14v-1.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V6h1a2 2 0 0 0 0-4H8a2 2 0 0 0 0 4h1v4.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24z"/></svg>' +
                   '</button>' +
@@ -1126,15 +1145,21 @@
               '<div class="sidebar-footer">' +
                 '<button id="drawer-new-session-button" class="btn btn-primary btn-block"><span>+</span> 新会话</button>' +
                 '<div class="sidebar-footer-actions">' +
-                  '<button id="file-panel-toggle-btn" class="btn btn-ghost btn-sm' + (state.filePanelOpen ? " active" : "") + '" type="button" title="查看文件">📁 文件</button>' +
+                  '<button id="file-panel-toggle-btn" class="btn btn-ghost btn-sm' + (state.filePanelOpen ? " active" : "") + '" type="button" 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>' +
+                    '<span>文件</span>' +
+                  '</button>' +
                   '<button id="settings-button" class="btn btn-ghost btn-sm" type="button" title="设置">' +
-                    '<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-2.83 2.83l-.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-4 0v-.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-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.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 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.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 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg> 设置' +
+                    '<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="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.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-4 0v-.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-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.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 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.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 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg>' +
+                    '<span>设置</span>' +
                   '</button>' +
                   '<button id="pwa-install-button" class="btn btn-ghost btn-sm hidden" title="安装应用">' +
-                    '<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> 安装' +
+                    '<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="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 id="logout-button" class="btn btn-ghost btn-sm sidebar-logout" type="button" title="退出登录">' +
-                    '<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> 退出' +
+                    '<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="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>' +
@@ -1226,11 +1251,19 @@
                 '</div>' +
                 '<div class="input-composer">' +
                   '<textarea id="input-box" class="input-textarea" placeholder="' + getComposerPlaceholder(selectedSession, state.terminalInteractive) + '" rows="1">' + escapeHtml(currentDraft) + '</textarea>' +
+                  '<div id="attachment-preview" class="attachment-preview hidden"></div>' +
                   '<div class="input-composer-bar">' +
                     '<div class="input-composer-left">' +
+                      '<button id="attach-btn" class="btn-circle btn-circle-attach" type="button" title="附加文件">' +
+                        '<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.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48"/></svg>' +
+                      '</button>' +
+                      '<input type="file" id="file-upload-input" multiple style="display:none">' +
                       '<select id="chat-mode-select" class="chat-mode-select" title="仅对新建会话生效">' +
                         renderModeOptions(preferredTool, composerMode) +
                       '</select>' +
+                      '<select id="chat-model-select" class="chat-mode-select chat-model-select" title="切换模型（对运行中会话发送 /model，对新会话作为 --model 启动）">' +
+                        renderChatModelOptions(getEffectiveModel(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">' +
                         '<span class="permission-actions-divider"></span>' +
@@ -1387,6 +1420,14 @@
                     '<button id="do-restart-button" class="btn btn-success btn-sm hidden">\u91cd\u542f\u751f\u6548</button>' +
                   '</div>' +
                   '<p id="update-message" class="hint hidden"></p>' +
+                  '<div class="settings-auto-update-row" style="display:flex;align-items:center;justify-content:space-between;margin-top:10px">' +
+                    '<span class="settings-label">自动更新</span>' +
+                    '<label style="position:relative;cursor:pointer">' +
+                      '<input type="checkbox" id="auto-update-web-toggle" class="switch-toggle">' +
+                      '<span class="switch-slider"></span>' +
+                    '</label>' +
+                  '</div>' +
+                  '<p class="hint" style="margin-top:2px">开启后，检测到新版本将自动下载安装并重启服务。</p>' +
                 '</div>' +
                 '<div class="settings-update-section" id="android-apk-section">' +
                   '<div id="android-apk-current-row" class="settings-about-row hidden">' +
@@ -1403,6 +1444,14 @@
                     '<span class="settings-value" id="settings-android-apk-local" style="flex:1">-</span>' +
                     '<button id="download-local-apk-btn" class="btn btn-ghost btn-sm hidden" type="button" style="margin-left:8px;flex-shrink:0">下载</button>' +
                   '</div>' +
+                  '<div id="android-auto-update-row" class="hidden" style="display:flex;align-items:center;justify-content:space-between;margin-top:10px">' +
+                    '<span class="settings-label">自动更新</span>' +
+                    '<label style="position:relative;cursor:pointer">' +
+                      '<input type="checkbox" id="auto-update-apk-toggle" class="switch-toggle">' +
+                      '<span class="switch-slider"></span>' +
+                    '</label>' +
+                  '</div>' +
+                  '<p id="android-auto-update-hint" class="hint hidden" style="margin-top:2px">开启后，检测到新版 APK 将自动下载安装。</p>' +
                   '<p id="android-apk-message" class="hint hidden"></p>' +
                 '</div>' +
                 '<div class="settings-update-section" id="android-connect-section">' +
@@ -1516,6 +1565,16 @@
                   '</div>' +
                 '</div>' +
                 '<p class="field-hint" style="margin-top:-4px;">设置回复语言后，Claude 将尽量使用指定语言回复。</p>' +
+                '<div class="field">' +
+                  '<label class="field-label" for="cfg-default-model">默认模型</label>' +
+                  '<div style="display:flex;gap:8px;align-items:center;">' +
+                    '<select id="cfg-default-model" class="field-input" style="flex:1;">' +
+                      '<option value="">跟随 Claude Code 默认</option>' +
+                    '</select>' +
+                    '<button type="button" id="cfg-default-model-refresh" class="btn btn-ghost btn-sm" title="刷新模型列表">刷新</button>' +
+                  '</div>' +
+                  '<p class="field-hint" id="cfg-default-model-version" style="margin-top:4px;">新建会话时默认使用该模型；运行中的会话可在输入框切换。</p>' +
+                '</div>' +
                 '<div class="field">' +
                   '<label class="field-label" for="cfg-cwd">默认工作目录</label>' +
                   '<input id="cfg-cwd" type="text" class="field-input" placeholder="/home/user" />' +
@@ -1675,7 +1734,7 @@
           groups.push(renderRecentGroup(activeSessions, recentHistorySessions));
         }
         if (archivedSessions.length > 0) {
-          groups.push(renderSessionGroup("已归档", archivedSessions, "sessions"));
+          groups.push(renderArchivedGroup(archivedSessions));
         }
         groups.push(renderClaudeHistorySection());
         if (activeSessions.length === 0 && archivedSessions.length === 0 && recentHistorySessions.length === 0) {
@@ -1696,12 +1755,17 @@
         var historyCount = getSelectedClaudeHistoryIds().length;
         var totalCount = sessionCount + historyCount;
         var hasAny = totalCount > 0;
+        var selectable = countSelectableItems();
+        var allSelected = selectable > 0 && totalCount >= selectable;
+        var selectAllLabel = allSelected ? "取消全选" : "全选";
+        var selectAllAction = allSelected ? "clear-selection" : "select-all-visible";
+        var selectAllDisabled = selectable === 0 ? ' disabled' : '';
 
         return '<div class="session-manage-bar active">' +
           '<div class="session-manage-summary">已选择 ' + totalCount + ' 项</div>' +
           '<div class="session-manage-actions">' +
-            '<button class="session-manage-btn" data-action="select-all-visible" type="button">全选</button>' +
-            '<button class="session-manage-btn" data-action="clear-selection" type="button">清空</button>' +
+            '<button class="session-manage-btn" data-action="' + selectAllAction + '" type="button"' + selectAllDisabled + '>' + selectAllLabel + '</button>' +
+            '<button class="session-manage-btn" data-action="clear-selection" type="button"' + (hasAny ? '' : ' disabled') + '>清空</button>' +
             '<button class="session-manage-btn danger" data-action="delete-selected" type="button"' + (hasAny ? '' : ' disabled') + '>删除所选</button>' +
             '<button class="session-manage-btn" data-action="toggle-manage-mode" type="button">完成</button>' +
           '</div>' +
@@ -1715,6 +1779,20 @@
         '</section>';
       }
 
+      function renderArchivedGroup(archivedSessions) {
+        var expanded = !!state.archivedExpanded;
+        var chevron = expanded ? "&#9662;" : "&#9656;";
+        var header = '<div class="session-group-title claude-history-toggle" data-action="toggle-archived-group">' +
+          '<span class="chevron">' + chevron + '</span> 已归档 ' +
+          '<span class="history-count">' + archivedSessions.length + '</span>' +
+          '</div>';
+        if (!expanded) {
+          return '<section class="session-group">' + header + '</section>';
+        }
+        var items = archivedSessions.map(function(session) { return renderSessionItem(session, "sessions"); }).join("");
+        return '<section class="session-group">' + header + items + '</section>';
+      }
+
       function renderRecentGroup(activeSessions, recentHistorySessions) {
         var html = '<section class="session-group">' +
           '<div class="session-group-title">最近</div>';
@@ -1806,11 +1884,19 @@
         updateSessionsList();
       }
 
+      function getSelectableSessions() {
+        return state.sessions.filter(function(session) {
+          return session.archived || !session.resumedToSessionId;
+        });
+      }
+
+      function countSelectableItems() {
+        return getSelectableSessions().length + getVisibleClaudeHistorySessions().length;
+      }
+
       function selectAllVisibleItems() {
         var nextSessionIds = {};
-        state.sessions.filter(function(session) {
-          return !session.resumedToSessionId;
-        }).forEach(function(session) {
+        getSelectableSessions().forEach(function(session) {
           nextSessionIds[session.id] = true;
         });
         var nextHistoryIds = {};
@@ -2078,19 +2164,18 @@
         } catch (e) {}
         applyTerminalScale();
         updateScaleLabel();
-        // Force refit: font size changed but container dimensions didn't,
-        // so ensureTerminalFit (which resets viewport tracking) is needed
-        // instead of scheduleTerminalResize (which skips when size unchanged).
-        ensureTerminalFit();
       }
 
       function applyTerminalScale() {
-        if (!state.terminal) return;
-        state.terminal.options.fontSize = state.terminalBaseFontSize * state.terminalScale;
-        state.terminal.refresh(0, state.terminal.rows - 1);
-        // Apply to DOM terminal view as well
-        if (state.terminalDomView) {
-          state.terminalDomView.style.fontSize = (state.terminalBaseFontSize * state.terminalScale) + "px";
+        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);
+        if (typeof state.terminal.remeasure === "function") {
+          requestAnimationFrame(function() {
+            if (state.terminal) state.terminal.remeasure();
+          });
         }
       }
 
@@ -2450,15 +2535,8 @@
         // Ordered lists
         escaped = escaped.replace(/^\d+\.\s+(.*)$/gm, '<li>$1</li>');
 
-        // Tables
-        escaped = escaped.replace(/\|(.+)\|/g, function(match) {
-          var cells = match.split("|").slice(1, -1);
-          if (cells.every(function(c) { return /^[\-:]+$/.test(c.trim()); })) {
-            return "";
-          }
-          return '<tr>' + cells.map(function(c) { return '<td>' + c.trim() + '</td>'; }).join("") + '</tr>';
-        });
-        escaped = escaped.replace(/(<tr>.*<\/tr>\n?)+/g, '<table>$&</table>');
+        // Tables (GFM)
+        escaped = parseMarkdownTables(escaped);
 
         // Paragraphs
         var paragraphs = escaped.split(/\n{2,}/);
@@ -3217,6 +3295,17 @@
         if (closeDrawerBtn) closeDrawerBtn.addEventListener("click", closeSessionsDrawer);
         var pinBtn = document.getElementById("sidebar-pin-btn");
         if (pinBtn) pinBtn.addEventListener("click", toggleSidebarPin);
+        var sidebarMoreBtn = document.getElementById("sidebar-more-btn");
+        var sidebarOverflow = document.getElementById("sidebar-overflow-menu");
+        if (sidebarMoreBtn && sidebarOverflow) {
+          sidebarMoreBtn.addEventListener("click", function(e) {
+            e.stopPropagation();
+            sidebarOverflow.classList.toggle("open");
+          });
+          document.addEventListener("click", function() {
+            sidebarOverflow.classList.remove("open");
+          });
+        }
         var homeBtn = document.getElementById("sidebar-home-btn");
         if (homeBtn) homeBtn.addEventListener("click", function() {
           state.selectedId = null;
@@ -3245,11 +3334,15 @@
         var settingsTabs = document.querySelectorAll(".settings-tab");
         for (var ti = 0; ti < settingsTabs.length; ti++) {
           settingsTabs[ti].addEventListener("click", function(e) {
-            switchSettingsTab(e.target.getAttribute("data-tab"));
+            var btn = e.currentTarget || this;
+            var tabName = btn && btn.getAttribute ? btn.getAttribute("data-tab") : null;
+            if (tabName) switchSettingsTab(tabName);
           });
         }
         var saveConfigBtn = document.getElementById("save-config-button");
         if (saveConfigBtn) saveConfigBtn.addEventListener("click", saveConfigSettings);
+        var defaultModelRefreshBtn = document.getElementById("cfg-default-model-refresh");
+        if (defaultModelRefreshBtn) defaultModelRefreshBtn.addEventListener("click", refreshAvailableModels);
         var saveDisplayBtn = document.getElementById("save-display-button");
         if (saveDisplayBtn) saveDisplayBtn.addEventListener("click", saveDisplaySettings);
         // App icon picker (APK only)
@@ -3282,6 +3375,14 @@
         if (doUpdateBtn) doUpdateBtn.addEventListener("click", performUpdate);
         var doRestartBtn = document.getElementById("do-restart-button");
         if (doRestartBtn) doRestartBtn.addEventListener("click", performSettingsRestart);
+        var autoUpdateWebToggle = document.getElementById("auto-update-web-toggle");
+        if (autoUpdateWebToggle) autoUpdateWebToggle.addEventListener("change", function() {
+          toggleAutoUpdate("web", autoUpdateWebToggle.checked);
+        });
+        var autoUpdateApkToggle = document.getElementById("auto-update-apk-toggle");
+        if (autoUpdateApkToggle) autoUpdateApkToggle.addEventListener("change", function() {
+          toggleAutoUpdate("apk", autoUpdateApkToggle.checked);
+        });
         var copyConnectCodeBtn = document.getElementById("copy-connect-code-button");
         if (copyConnectCodeBtn) copyConnectCodeBtn.addEventListener("click", function() {
           var text = document.getElementById("android-connect-code");
@@ -3414,6 +3515,10 @@
           state.chatMode = this.value;
           showToast("新会话模式已切换为：" + getModeLabel(this.value), "info");
         });
+        var modelSelect = document.getElementById("chat-model-select");
+        if (modelSelect) modelSelect.addEventListener("change", function() {
+          onChatModelChange(this.value);
+        });
 
         var sessionModal = document.getElementById("session-modal");
         if (sessionModal) sessionModal.addEventListener("click", function(e) {
@@ -3441,6 +3546,42 @@
           inputBox.addEventListener("blur", handleInputBoxBlur);
         }
 
+        // Attach button & drag-drop
+        var attachBtn = document.getElementById("attach-btn");
+        var fileInput = document.getElementById("file-upload-input");
+        if (attachBtn && fileInput) {
+          attachBtn.addEventListener("click", function() { fileInput.click(); });
+          fileInput.addEventListener("change", function() {
+            var files = fileInput.files;
+            if (files) {
+              for (var i = 0; i < files.length; i++) addPendingAttachment(files[i]);
+            }
+            fileInput.value = "";
+          });
+        }
+        var composer = document.querySelector(".input-composer");
+        if (composer) {
+          composer.addEventListener("dragover", function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            composer.classList.add("drag-over");
+          });
+          composer.addEventListener("dragleave", function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            composer.classList.remove("drag-over");
+          });
+          composer.addEventListener("drop", function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            composer.classList.remove("drag-over");
+            var files = e.dataTransfer && e.dataTransfer.files;
+            if (files) {
+              for (var i = 0; i < files.length; i++) addPendingAttachment(files[i]);
+            }
+          });
+        }
+
         // Terminal interactive toggle (both topbar and terminal-header)
         var terminalInteractiveToggles = ["terminal-interactive-toggle-top"];
         terminalInteractiveToggles.forEach(function(id) {
@@ -3515,7 +3656,16 @@
         if (scaleDownBtn) scaleDownBtn.addEventListener("click", function() { adjustTerminalScale(-0.25); });
         if (scaleUpBtn) scaleUpBtn.addEventListener("click", function() { adjustTerminalScale(0.25); });
         var pageRefreshBtn = document.getElementById("page-refresh-btn");
-        if (pageRefreshBtn) pageRefreshBtn.addEventListener("click", function() { location.reload(); });
+        if (pageRefreshBtn) pageRefreshBtn.addEventListener("click", function(ev) {
+          // Soft refresh: replay terminal buffer + rebuild chat view.
+          // Fixes residual DOM from CSI cursor-jump sequences without losing page state.
+          // Hold Shift to force a full page reload as an escape hatch.
+          if (ev && ev.shiftKey) {
+            location.reload();
+            return;
+          }
+          softRefreshCurrentView();
+        });
         var jumpBottomBtn = document.getElementById("terminal-jump-bottom");
         if (jumpBottomBtn) jumpBottomBtn.addEventListener("click", function() {
           maybeScrollTerminalToBottom("force");
@@ -4005,6 +4155,9 @@
             }
           } else if (actionButton.dataset.action === "clear-all-history") {
             clearAllClaudeHistory();
+          } else if (actionButton.dataset.action === "toggle-archived-group") {
+            state.archivedExpanded = !state.archivedExpanded;
+            updateSessionsList();
           } else if (actionButton.dataset.action === "resume" && actionButton.dataset.sessionId) {
             handleResumeAction(actionButton);
           } else if (actionButton.dataset.action === "resume-history" && actionButton.dataset.claudeSessionId) {
@@ -4107,10 +4260,7 @@
 
       function getTerminalViewport() {
         if (!state.terminal || !state.terminal.element) return null;
-        if (state.terminalViewportEl && state.terminal.element.contains(state.terminalViewportEl)) {
-          return state.terminalViewportEl;
-        }
-        state.terminalViewportEl = state.terminal.element.querySelector(".xterm-viewport");
+        state.terminalViewportEl = state.terminal.element;
         return state.terminalViewportEl;
       }
 
@@ -4136,11 +4286,6 @@
       }
 
       function isTerminalNearBottom() {
-        // On mobile, check DOM view scroll position
-        if (state.terminalDomView) {
-          var d = state.terminalDomView.scrollHeight - state.terminalDomView.clientHeight - state.terminalDomView.scrollTop;
-          return d <= state.terminalScrollThreshold;
-        }
         var viewport = getTerminalViewport();
         if (!viewport) return true;
         var distance = viewport.scrollHeight - viewport.clientHeight - viewport.scrollTop;
@@ -4149,25 +4294,13 @@
 
       function scrollTerminalToBottom(smooth) {
         if (!state.terminal) return;
-        // Also scroll mobile DOM view
-        if (state.terminalDomView) {
-          if (smooth) {
-            state.terminalDomView.scrollTo({ top: state.terminalDomView.scrollHeight, behavior: "smooth" });
-          } else {
-            state.terminalDomView.scrollTop = state.terminalDomView.scrollHeight;
-          }
-        }
+        var viewport = getTerminalViewport();
+        if (!viewport) return;
         if (smooth) {
-          var viewport = getTerminalViewport();
-          if (viewport) {
-            viewport.scrollTo({ top: viewport.scrollHeight, behavior: "smooth" });
-            setTimeout(function() {
-              if (state.terminal) state.terminal.scrollToBottom();
-            }, 160);
-            return;
-          }
+          viewport.scrollTo({ top: viewport.scrollHeight, behavior: "smooth" });
+        } else {
+          viewport.scrollTop = viewport.scrollHeight;
         }
-        state.terminal.scrollToBottom();
       }
 
       function scheduleTerminalResumeFollow() {
@@ -4388,6 +4521,43 @@
         requestSyncScrollbar();
       }
 
+      function resetTerminal() {
+        if (!state.terminal || typeof state.terminal.reset !== "function") return;
+        state.terminal.reset();
+      }
+
+      // Soft resync terminal: reset WASM grid and replay full output buffer.
+      // Clears any stale DOM rows left over from CSI cursor-jump sequences
+      // (e.g. Claude permission menus redrawing in place while user holds arrow keys).
+      function softResyncTerminal() {
+        if (!state.terminal || !state.terminalOutput) return false;
+        resetTerminal();
+        state.terminal.write(state.terminalOutput);
+        state.lastTerminalResyncAt = Date.now();
+        maybeScrollTerminalToBottom("output");
+        return true;
+      }
+
+      // Soft refresh the whole current view without losing page state:
+      // - Replays terminal buffer to clear residue
+      // - Clears chat render cache and forces a full rebuild
+      // Used by the refresh button and by automatic triggers
+      // (e.g. permission escalation appearing/disappearing).
+      function softRefreshCurrentView() {
+        softResyncTerminal();
+        if (typeof resetChatRenderCache === "function") resetChatRenderCache();
+        if (typeof scheduleChatRender === "function") scheduleChatRender(true);
+        else if (typeof render === "function") render();
+      }
+
+      function scheduleSoftResyncTerminal(delayMs) {
+        if (state.softResyncTimer) clearTimeout(state.softResyncTimer);
+        state.softResyncTimer = setTimeout(function() {
+          state.softResyncTimer = null;
+          softResyncTerminal();
+        }, typeof delayMs === "number" ? delayMs : 150);
+      }
+
       function syncTerminalBuffer(sessionId, output, options) {
         if (!state.terminal) return false;
         var normalizedOutput = normalizeTerminalOutput(output || "");
@@ -4407,7 +4577,7 @@
         }
 
         if (sessionChanged) {
-          state.terminal.reset();
+          resetTerminal();
           currentOutput = "";
           state.terminalOutput = "";
           state.terminalAutoFollow = true;
@@ -4417,18 +4587,15 @@
 
         if (mode === "replace") {
           if (normalizedOutput !== currentOutput) {
-            state.terminal.reset();
+            resetTerminal();
             if (normalizedOutput) {
               state.terminal.write(normalizedOutput);
             }
             wrote = true;
           }
         } else if (normalizedOutput.length < currentOutput.length && !sessionChanged) {
-          // Ignore regressive snapshots for the active session; wait for an explicit replace.
           return false;
         } else if (liveChunkStream && !sessionChanged && mode !== "replace" && currentOutput && !normalizedOutput.startsWith(currentOutput)) {
-          // When a session is already streaming live chunks, do not let polled snapshots
-          // rewrite the terminal unless they are strict appends of what we've rendered.
           return false;
         } else if (normalizedOutput.startsWith(currentOutput)) {
           var delta = normalizedOutput.slice(currentOutput.length);
@@ -4437,10 +4604,9 @@
             wrote = true;
           }
         } else if (currentOutput && currentOutput.startsWith(normalizedOutput)) {
-          // Ignore shorter/stale snapshots from polling or reconnect races.
           return false;
         } else {
-          state.terminal.reset();
+          resetTerminal();
           if (normalizedOutput) {
             state.terminal.write(normalizedOutput);
           }
@@ -4449,40 +4615,21 @@
 
         state.terminalSessionId = nextSessionId;
         state.terminalOutput = normalizedOutput;
-        scheduleMobileDomUpdate();
         if (shouldScroll && (wrote || sessionChanged || mode === "replace")) {
           maybeScrollTerminalToBottom(sessionChanged || mode === "replace" ? "force" : "output");
         } else {
           updateTerminalJumpToBottomButton();
         }
-        // When switching sessions, re-fit the terminal so the PTY receives
-        // the correct dimensions for this client's viewport.
-        if (sessionChanged && state.fitAddon) {
-          state.terminalViewportSize = { width: 0, height: 0 };
-          scheduleTerminalResize(true);
+        if (sessionChanged) {
+          sendTerminalResize(state.terminal.cols, state.terminal.rows);
         }
         return wrote || sessionChanged;
       }
 
-      function shouldResizeTerminalViewport() {
-        var output = document.getElementById("output");
-        if (!output) return false;
-        var rect = output.getBoundingClientRect();
-        var width = Math.round(rect.width);
-        var height = Math.round(rect.height);
-        if (!width || !height) return false;
-        if (state.terminalViewportSize.width === width && state.terminalViewportSize.height === height) {
-          return false;
-        }
-        state.terminalViewportSize = { width: width, height: height };
-        return true;
-      }
-
       function initTerminal() {
         var container = document.getElementById("output");
-        if (!container || state.terminal) return;
-        if (typeof Terminal === "undefined") {
-          // xterm.js not yet loaded — retry after a short delay
+        if (!container || state.terminal || state.terminalInitializing) return;
+        if (typeof WTermLib === "undefined" || !WTermLib.WTerm) {
           if (!state.terminalInitRetries) state.terminalInitRetries = 0;
           if (state.terminalInitRetries < 10) {
             state.terminalInitRetries++;
@@ -4491,160 +4638,80 @@
           return;
         }
         state.terminalInitRetries = 0;
+        state.terminalInitializing = true;
+
+        var termWrap = document.createElement("div");
+        termWrap.className = "terminal-scroll-wrap";
+        container.appendChild(termWrap);
 
-        state.terminal = new Terminal({
+        var term = new WTermLib.WTerm(termWrap, {
           cols: 120,
           rows: 36,
-          convertEol: true,
-          disableStdin: false,
+          autoResize: true,
           cursorBlink: false,
-          fontFamily: '"Geist Mono", "SF Mono", monospace',
-          fontSize: 13,
-          lineHeight: 1.5,
-          allowProposedApi: true,
-          scrollback: 10000,
-          wheelScrollMargin: 0,
-          theme: {
-            background: "#1f1b17",
-            foreground: "#f5eadc",
-            cursor: "#d67b52",
-            selectionBackground: "rgba(214, 123, 82, 0.28)",
-            black: "#1f1b17",
-            red: "#d27766",
-            green: "#7fa36f",
-            yellow: "#d5a35b",
-            blue: "#87a9d9",
-            magenta: "#c595c7",
-            cyan: "#7fb3b1",
-            white: "#f5eadc",
-            brightBlack: "#625347",
-            brightRed: "#e39a89",
-            brightGreen: "#9cc08a",
-            brightYellow: "#ebbb6e",
-            brightBlue: "#a8c1ea",
-            brightMagenta: "#dbb1dc",
-            brightCyan: "#9acbca",
-            brightWhite: "#fff7ef"
+          onData: function(data) {
+            if (state.terminalInteractive) return;
+            queueDirectInput(data);
+          },
+          onResize: function(cols, rows) {
+            sendTerminalResize(cols, rows);
           }
         });
 
-        var fitAddonConstructor =
-          typeof FitAddon !== "undefined" && FitAddon && typeof FitAddon.FitAddon === "function"
-            ? FitAddon.FitAddon
-            : null;
-        state.fitAddon = fitAddonConstructor ? new fitAddonConstructor() : null;
-        if (state.fitAddon) {
-          state.terminal.loadAddon(state.fitAddon);
-          // Patch: FitAddon subtracts 14px for a scrollbar that CSS hides;
-          // recalculate cols without the scrollbar deduction.
-          var _origPropose = state.fitAddon.proposeDimensions;
-          state.fitAddon.proposeDimensions = function() {
-            var result = _origPropose.call(state.fitAddon);
-            if (result && state.terminal) {
-              try {
-                var core = state.terminal._core;
-                var cellW = core._renderService.dimensions.css.cell.width;
-                var el = state.terminal.element;
-                if (cellW > 0 && el && el.parentElement) {
-                  var pw = Math.max(0, parseInt(window.getComputedStyle(el.parentElement).getPropertyValue("width")));
-                  var es = window.getComputedStyle(el);
-                  var ePad = parseInt(es.getPropertyValue("padding-left")) + parseInt(es.getPropertyValue("padding-right"));
-                  result.cols = Math.max(2, Math.floor((pw - ePad) / cellW));
-                }
-              } catch(e) {}
-            }
-            return result;
-          };
-        } else {
-          console.error("[wand] xterm fit addon failed to load; continuing without fit support.");
-        }
-
-        // Load serialize addon for mobile DOM rendering
-        if (typeof SerializeAddon !== "undefined" && SerializeAddon && typeof SerializeAddon.SerializeAddon === "function") {
-          state.serializeAddon = new SerializeAddon.SerializeAddon();
-          state.terminal.loadAddon(state.serializeAddon);
-        }
+        term.init().then(function() {
+          state.terminal = term;
+          state.terminalInitializing = false;
+          applyTerminalScale();
+          state.terminalAutoFollow = true;
+          clearTerminalScrollIdleTimer();
 
-        state.terminal.open(container);
-        applyTerminalScale();
-        state.terminalViewportSize = { width: 0, height: 0 };
-        state.terminalAutoFollow = true;
-        clearTerminalScrollIdleTimer();
-        // Retry-based fit: wait for browser to complete layout before measuring and fitting
-        if (state.fitAddon) {
-          ensureTerminalFit();
-          // Secondary fit after fonts are loaded — FitAddon measures character
-          // dimensions from the rendered font; if a custom web font (e.g. Geist
-          // Mono) hasn't loaded yet the initial fit() uses fallback metrics and
-          // computes too few columns.
-          if (document.fonts && document.fonts.ready) {
-            document.fonts.ready.then(function() {
-              state.terminalViewportSize = { width: 0, height: 0 };
-              ensureTerminalFit();
-            });
+          var viewport = getTerminalViewport();
+          if (viewport) {
+            state.terminalViewportScrollHandler = function() {
+              if (isTerminalNearBottom()) {
+                state.terminalAutoFollow = true;
+                clearTerminalScrollIdleTimer();
+                updateTerminalJumpToBottomButton();
+                return;
+              }
+              setTerminalManualScrollActive();
+            };
+            state.terminalViewportTouchHandler = function() {
+              setTerminalManualScrollActive();
+            };
+            viewport.addEventListener("scroll", state.terminalViewportScrollHandler, { passive: true });
+            viewport.addEventListener("touchmove", state.terminalViewportTouchHandler, { passive: true });
           }
-          // Safety-net fit after layout has fully stabilised (CSS transitions,
-          // deferred reflows, late font loads, etc.)
-          setTimeout(function() {
-            if (state.terminal && state.fitAddon) {
-              state.terminalViewportSize = { width: 0, height: 0 };
-              ensureTerminalFit();
-            }
-          }, 500);
-        }
 
-        var viewport = getTerminalViewport();
-        if (viewport) {
-          state.terminalViewportScrollHandler = function() {
-            if (isTerminalNearBottom()) {
-              state.terminalAutoFollow = true;
-              clearTerminalScrollIdleTimer();
-              updateTerminalJumpToBottomButton();
-              return;
+          state.terminalWheelHandler = function(e) {
+            if (!isTerminalNearBottom() || e.deltaY < 0) {
+              setTerminalManualScrollActive();
             }
-            setTerminalManualScrollActive();
-          };
-          state.terminalViewportTouchHandler = function() {
-            setTerminalManualScrollActive();
+            e.stopPropagation();
           };
-          viewport.addEventListener("scroll", state.terminalViewportScrollHandler, { passive: true });
-          viewport.addEventListener("touchmove", state.terminalViewportTouchHandler, { passive: true });
-        }
-
-        container.addEventListener('wheel', function(e) {
-          if (!isTerminalNearBottom() || e.deltaY < 0) {
-            setTerminalManualScrollActive();
-          }
-          e.stopPropagation();
-        }, { passive: true });
+          container.addEventListener("wheel", state.terminalWheelHandler, { passive: true });
 
-        // Create custom scrollbar overlay
-        initTerminalScrollbar(container);
+          initTerminalScrollbar(container);
 
-        // Terminal copy button for mobile
-        initMobileDomTerminal(container);
-
-        if (state.selectedId) {
-          var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
-          if (session) {
-            syncTerminalBuffer(session.id, session.output || "", { mode: "append", scroll: false });
+          if (state.selectedId) {
+            var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+            if (session) {
+              syncTerminalBuffer(session.id, session.output || "", { mode: "append", scroll: false });
+            }
+          } else {
+            term.write("点击上方「新对话」开始你的第一次对话。\r\n");
           }
-        } else {
-          state.terminal.writeln("点击上方「新对话」开始你的第一次对话。");
-        }
 
-        state.terminal.onData(function(data) {
-          if (state.terminalInteractive) return;
-          queueDirectInput(data);
+          state.terminalClickHandler = focusInputBox;
+          container.addEventListener("click", state.terminalClickHandler);
+          updateTerminalJumpToBottomButton();
+          initTerminalResizeHandle();
+          observeTerminalResize();
+          startTerminalHealthCheck();
+        }).catch(function(err) {
+          state.terminalInitializing = false;
+          console.error("[wand] wterm init failed:", err);
         });
-
-        container.addEventListener("click", focusInputBox);
-        updateTerminalJumpToBottomButton();
-
-        // 初始化拖动调整大小
-        initTerminalResizeHandle();
-
-        observeTerminalResize();
       }
 
       function login() {
@@ -4869,13 +4936,138 @@
         if (modeHint) modeHint.textContent = getModeHint(state.chatMode);
       }
 
+      function getEffectiveModel(session) {
+        if (session && session.selectedModel) return session.selectedModel;
+        if (state.chatModel) return state.chatModel;
+        if (state.config && state.config.defaultModel) return state.config.defaultModel;
+        return "";
+      }
+
+      function renderChatModelOptions(selected) {
+        var models = state.availableModels || [];
+        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>';
+        }
+        return html;
+      }
+
+      function syncComposerModelSelect(session) {
+        var select = document.getElementById("chat-model-select");
+        if (!select) return;
+        var effective = getEffectiveModel(session);
+        select.innerHTML = renderChatModelOptions(effective);
+        select.value = effective;
+      }
+
+      function fetchAvailableModels() {
+        return fetch("/api/models", { credentials: "same-origin" })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data && Array.isArray(data.models)) {
+              state.availableModels = data.models;
+              syncComposerModelSelect(getSelectedSession());
+              updateSettingsDefaultModelSelect(data);
+            }
+            return data;
+          })
+          .catch(function() { return null; });
+      }
+
+      function refreshAvailableModels() {
+        if (state.modelsRefreshing) return Promise.resolve(null);
+        state.modelsRefreshing = true;
+        var btn = document.getElementById("cfg-default-model-refresh");
+        if (btn) { btn.disabled = true; btn.textContent = "刷新中..."; }
+        return fetch("/api/models/refresh", { method: "POST", credentials: "same-origin" })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data && Array.isArray(data.models)) {
+              state.availableModels = data.models;
+              syncComposerModelSelect(getSelectedSession());
+              updateSettingsDefaultModelSelect(data);
+              if (typeof showToast === "function") {
+                showToast("模型列表已刷新" + (data.claudeVersion ? "（claude " + data.claudeVersion + "）" : ""), "success");
+              }
+            }
+            return data;
+          })
+          .catch(function() {
+            if (typeof showToast === "function") showToast("刷新模型列表失败", "error");
+            return null;
+          })
+          .finally(function() {
+            state.modelsRefreshing = false;
+            if (btn) { btn.disabled = false; btn.textContent = "刷新"; }
+          });
+      }
+
+      function updateSettingsDefaultModelSelect(data) {
+        var select = document.getElementById("cfg-default-model");
+        if (!select) return;
+        var previous = select.value;
+        var current = previous || state.configDefaultModel || (state.config && state.config.defaultModel) || "";
+        select.innerHTML = renderChatModelOptions(current);
+        select.value = current;
+        var versionEl = document.getElementById("cfg-default-model-version");
+        if (versionEl && data) {
+          versionEl.textContent = data.claudeVersion ? "已检测到 claude " + data.claudeVersion : "新建会话时默认使用该模型。";
+        }
+      }
+
+      function getSelectedSession() {
+        if (!state.selectedId) return null;
+        for (var i = 0; i < state.sessions.length; i++) {
+          if (state.sessions[i].id === state.selectedId) return state.sessions[i];
+        }
+        return null;
+      }
+
+      function onChatModelChange(value) {
+        var normalized = (value || "").trim();
+        state.chatModel = normalized;
+        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" },
+          credentials: "same-origin",
+          body: JSON.stringify({ model: normalized || null })
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          if (data && data.error) {
+            showToast(data.error, "error");
+            return;
+          }
+          if (data && data.id) {
+            updateSessionSnapshot(data);
+            if (typeof showToast === "function") {
+              var display = normalized || "默认";
+              showToast("已切换模型 → " + display, "success");
+            }
+          }
+        })
+        .catch(function() { showToast("切换模型失败", "error"); });
+      }
+
       function createStructuredSession(prompt, cwdOverride, modeOverride, worktreeEnabled) {
+        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",
           prompt: prompt || undefined,
-          worktreeEnabled: worktreeEnabled === true
+          worktreeEnabled: worktreeEnabled === true,
+          model: modelPref || undefined
         };
         console.log("[WAND] createStructuredSession payload:", JSON.stringify(payload));
         return fetch("/api/structured-sessions", {
@@ -5004,6 +5196,17 @@
         if (normalizedSnapshot.id === state.selectedId) {
           reconcileInteractiveState();
           updateTaskDisplay();
+          // Escalation/permission toggles are the common trigger for CSI cursor-jump
+          // redraw sequences from Claude CLI. When they appear or dismiss, schedule a
+          // debounced terminal resync so residual DOM rows get cleaned up automatically
+          // — same fix the user used to have to reach for via the refresh button.
+          var prevEsc = prevSession && prevSession.pendingEscalation ? 1 : 0;
+          var nextEsc = updatedSession && updatedSession.pendingEscalation ? 1 : 0;
+          var prevBlocked = prevSession && prevSession.permissionBlocked ? 1 : 0;
+          var nextBlocked = updatedSession && updatedSession.permissionBlocked ? 1 : 0;
+          if (prevEsc !== nextEsc || prevBlocked !== nextBlocked) {
+            scheduleSoftResyncTerminal(200);
+          }
         }
         // When a session transitions to a non-running state, try flushing cross-session queue
         if (normalizedSnapshot.status && normalizedSnapshot.status !== "running" && state.crossSessionQueue.length > 0) {
@@ -5254,10 +5457,8 @@
           initTerminal();
         }
         if (state.terminal && terminalContainer && !terminalContainer.contains(state.terminal.element)) {
-          state.terminal.open(terminalContainer);
-          applyTerminalScale();
-          state.terminalViewportSize = { width: 0, height: 0 };
-          scheduleTerminalResize();
+          teardownTerminal();
+          initTerminal();
         }
 
         if (selectedSession && state.terminal) {
@@ -5286,6 +5487,7 @@
           if (inputPanel) inputPanel.classList.add("hidden");
         }
         syncComposerModeSelect();
+        syncComposerModelSelect(getSelectedSession());
         applyCurrentView();
         reconcileInteractiveState();
       }
@@ -5316,6 +5518,15 @@
             updateSessionSnapshot(data);
             updateShellChrome();
 
+            if (state.terminal && id === state.selectedId && data.output !== undefined) {
+              syncTerminalBuffer(id, data.output, { mode: "append" });
+              if (state.terminal.remeasure) {
+                requestAnimationFrame(function() {
+                  if (state.terminal) state.terminal.remeasure();
+                });
+              }
+            }
+
             var selectedSession = state.sessions.find(function(s) { return s.id === id; });
               state.currentMessages = buildMessagesForRender(selectedSession, getPreferredMessages(selectedSession, data.output, false));
 
@@ -5944,6 +6155,13 @@
               }
             }
 
+            // Auto-update toggles
+            var autoUpdate = data.autoUpdate || {};
+            var autoUpdateWebToggle = document.getElementById("auto-update-web-toggle");
+            if (autoUpdateWebToggle) autoUpdateWebToggle.checked = !!autoUpdate.web;
+            var autoUpdateApkToggle = document.getElementById("auto-update-apk-toggle");
+            if (autoUpdateApkToggle) autoUpdateApkToggle.checked = !!autoUpdate.apk;
+
             // ── Android APK version display ──
             var apkSection = document.getElementById("android-apk-section");
             var apkCurrentRow = document.getElementById("android-apk-current-row");
@@ -6005,6 +6223,11 @@
                 apkMessageEl.textContent = "暂无可用更新";
                 apkMessageEl.classList.remove("hidden");
               }
+              // Show APK auto-update toggle in APK mode
+              var apkAutoRow = document.getElementById("android-auto-update-row");
+              var apkAutoHint = document.getElementById("android-auto-update-hint");
+              if (apkAutoRow) apkAutoRow.classList.remove("hidden");
+              if (apkAutoHint) apkAutoHint.classList.remove("hidden");
             } else {
               // ── 浏览器模式：显示线上版本 + 本地版本 + 下载按钮 ──
               if (androidApk.github && apkGithubRow && apkGithubEl) {
@@ -6067,6 +6290,13 @@
             var langEl = document.getElementById("cfg-language");
             if (langEl) langEl.value = cfg.language || "";
 
+            // Default model
+            state.configDefaultModel = cfg.defaultModel || "";
+            updateSettingsDefaultModelSelect();
+            fetchAvailableModels().then(function() {
+              updateSettingsDefaultModelSelect();
+            }).catch(function() {});
+
             // Cert status
             var certStatus = document.getElementById("cert-status");
             if (certStatus) {
@@ -6117,8 +6347,12 @@
           defaultCwd: (document.getElementById("cfg-cwd") || {}).value,
           shell: (document.getElementById("cfg-shell") || {}).value,
           language: (document.getElementById("cfg-language") || {}).value || "",
+          defaultModel: (document.getElementById("cfg-default-model") || {}).value || "",
         };
 
+        var previousDefaultModel = (state.config && state.config.defaultModel) || "";
+        var nextDefaultModel = body.defaultModel || "";
+
         fetch("/api/settings/config", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -6137,6 +6371,15 @@
             }
             msgEl.classList.remove("hidden");
           }
+          if (!data || !data.error) {
+            if (state.config) state.config.defaultModel = nextDefaultModel;
+            state.configDefaultModel = nextDefaultModel;
+            if (nextDefaultModel !== previousDefaultModel) {
+              state.chatModel = "";
+              try { localStorage.removeItem("wand-chat-model"); } catch (e) {}
+              syncComposerModelSelect(getSelectedSession());
+            }
+          }
         })
         .catch(function() {
           if (msgEl) {
@@ -6330,6 +6573,48 @@
         performRestart(restartBtn, msgEl);
       }
 
+      function checkApkAutoUpdate() {
+        fetch("/api/auto-update", { credentials: "same-origin" })
+          .then(function(res) { return res.json(); })
+          .then(function(autoData) {
+            if (!autoData.apk) return;
+            // Auto-update is enabled, check for APK update
+            return fetch("/api/android-apk-update?currentVersion=" + encodeURIComponent(_apkVersion), { credentials: "same-origin" })
+              .then(function(res) { return res.json(); })
+              .then(function(data) {
+                if (!data.updateAvailable || !data.downloadUrl) return;
+                try {
+                  WandNative.downloadUpdate(data.downloadUrl, data.fileName || "wand-update.apk", data.source || "local");
+                } catch (_e) {}
+              });
+          })
+          .catch(function() {});
+      }
+
+      function toggleAutoUpdate(type, enabled) {
+        var body = {};
+        body[type] = enabled;
+        fetch("/api/auto-update", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify(body),
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          // Sync toggle state with server response
+          var webToggle = document.getElementById("auto-update-web-toggle");
+          var apkToggle = document.getElementById("auto-update-apk-toggle");
+          if (webToggle) webToggle.checked = !!data.web;
+          if (apkToggle) apkToggle.checked = !!data.apk;
+        })
+        .catch(function() {
+          // Revert toggle on failure
+          var toggle = document.getElementById("auto-update-" + type + "-toggle");
+          if (toggle) toggle.checked = !enabled;
+        });
+      }
+
       // ── Notification Settings Helpers ──
 
       function _updateAppIconSelection(activeIcon) {
@@ -6639,6 +6924,7 @@
         state.sessionTool = "claude";
         state.preferredCommand = "claude";
         syncComposerModeSelect();
+        syncComposerModelSelect(getSelectedSession());
         return createStructuredSession(undefined, cwd, mode, worktreeEnabled)
           .then(function(data) {
             saveWorkingDir(cwd);
@@ -6989,6 +7275,107 @@
         }
       }
 
+      // ── Attachment helpers ──
+
+      var ATTACH_MAX_SIZE = 10 * 1024 * 1024;
+
+      function formatFileSize(bytes) {
+        if (bytes < 1024) return bytes + " B";
+        if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + " KB";
+        return (bytes / (1024 * 1024)).toFixed(1) + " MB";
+      }
+
+      function isImageType(type) {
+        return /^image\/(png|jpe?g|gif|webp|bmp|svg\+xml)/.test(type);
+      }
+
+      function addPendingAttachment(file) {
+        if (!file) return;
+        if (file.size > ATTACH_MAX_SIZE) {
+          showToast("文件过大（上限 10 MB）: " + file.name, "error");
+          return;
+        }
+        var entry = { file: file, name: file.name, size: file.size, previewUrl: null };
+        if (isImageType(file.type)) {
+          entry.previewUrl = URL.createObjectURL(file);
+        }
+        state.pendingAttachments.push(entry);
+        renderAttachmentPreview();
+      }
+
+      function removePendingAttachment(index) {
+        var removed = state.pendingAttachments.splice(index, 1);
+        if (removed.length && removed[0].previewUrl) {
+          URL.revokeObjectURL(removed[0].previewUrl);
+        }
+        renderAttachmentPreview();
+      }
+
+      function clearAttachments() {
+        state.pendingAttachments.forEach(function(a) {
+          if (a.previewUrl) URL.revokeObjectURL(a.previewUrl);
+        });
+        state.pendingAttachments = [];
+        renderAttachmentPreview();
+      }
+
+      function renderAttachmentPreview() {
+        var bar = document.getElementById("attachment-preview");
+        if (!bar) return;
+        var items = state.pendingAttachments;
+        if (items.length === 0) {
+          bar.classList.add("hidden");
+          bar.innerHTML = "";
+          return;
+        }
+        bar.classList.remove("hidden");
+        var html = "";
+        for (var i = 0; i < items.length; i++) {
+          var a = items[i];
+          var thumb = a.previewUrl
+            ? '<img src="' + escapeHtml(a.previewUrl) + '" alt="">'
+            : '<span class="att-icon">📄</span>';
+          html += '<span class="attachment-pill" data-index="' + i + '">' +
+            thumb +
+            '<span class="att-name" title="' + escapeHtml(a.name) + '">' + escapeHtml(a.name) + '</span>' +
+            '<span class="att-size">' + formatFileSize(a.size) + '</span>' +
+            '<button class="att-remove" data-index="' + i + '" title="移除">×</button>' +
+            '</span>';
+        }
+        bar.innerHTML = html;
+        bar.querySelectorAll(".att-remove").forEach(function(btn) {
+          btn.addEventListener("click", function(e) {
+            e.preventDefault();
+            e.stopPropagation();
+            removePendingAttachment(parseInt(btn.getAttribute("data-index"), 10));
+          });
+        });
+      }
+
+      function uploadAttachments(sessionId) {
+        if (!state.pendingAttachments.length) return Promise.resolve([]);
+        var formData = new FormData();
+        state.pendingAttachments.forEach(function(a) {
+          formData.append("files", a.file, a.name);
+        });
+        return fetch("/api/sessions/" + encodeURIComponent(sessionId) + "/upload", {
+          method: "POST",
+          body: formData,
+          credentials: "same-origin"
+        }).then(function(resp) {
+          if (!resp.ok) return resp.json().then(function(e) { throw new Error(e.error || "上传失败"); });
+          return resp.json();
+        }).then(function(data) {
+          return data.files || [];
+        });
+      }
+
+      function buildAttachmentPrefix(uploadedFiles) {
+        if (!uploadedFiles || !uploadedFiles.length) return "";
+        var paths = uploadedFiles.map(function(f) { return f.savedPath; });
+        return "[附件已上传，请查看以下文件:\n" + paths.join("\n") + "]\n\n";
+      }
+
       function handleInteractiveTextInput(inputBox) {
         if (!state.terminalInteractive || !inputBox) return false;
         var value = inputBox.value || "";
@@ -7001,6 +7388,17 @@
       }
 
       function handleInputPaste(event) {
+        var items = event.clipboardData && event.clipboardData.items;
+        if (items && !state.terminalInteractive) {
+          for (var i = 0; i < items.length; i++) {
+            if (items[i].type.indexOf("image/") === 0) {
+              event.preventDefault();
+              var file = items[i].getAsFile();
+              if (file) addPendingAttachment(file);
+              return;
+            }
+          }
+        }
         var pasted = event.clipboardData && event.clipboardData.getData("text");
         if (!pasted) return;
         event.preventDefault();
@@ -7483,12 +7881,9 @@
 
         if (!structured) {
           if (!state.terminal) initTerminal();
-          if (state.terminal && state.fitAddon) {
-            ensureTerminalFit();
-          }
         }
         applyCurrentView();
-        focusInputBox();
+        focusInputBox(true);
       }
 
 
@@ -7501,7 +7896,9 @@
         var inputBox = document.getElementById("input-box");
         var value = inputBox ? inputBox.value : "";
         var selectedSession = getSelectedSession();
-        if (value) {
+        var hasAttachments = state.pendingAttachments.length > 0;
+
+        if (value || hasAttachments) {
           console.log("[WAND] sendInputFromBox", {
             sessionId: state.selectedId,
             sessionStatus: selectedSession ? selectedSession.status : null,
@@ -7511,50 +7908,62 @@
             view: state.currentView,
             wsConnected: state.wsConnected,
             terminalInteractive: state.terminalInteractive,
-            inputLength: value.length
+            inputLength: value.length,
+            attachments: state.pendingAttachments.length
           });
-          // Clear todo progress bar at the start of a new user turn
-          var todoEl = document.getElementById("todo-progress");
-          if (todoEl) todoEl.classList.add("hidden");
 
-          if (isStructuredSession(selectedSession)) {
-            return postStructuredInput(value, inputBox, selectedSession);
-          }
+          var attachUpload = hasAttachments && state.selectedId
+            ? uploadAttachments(state.selectedId)
+            : Promise.resolve([]);
 
-          var submitChunks = getTerminalSubmitChunks(selectedSession, value);
-          var isOffline = !state.wsConnected;
+          return attachUpload.then(function(uploadedFiles) {
+            var prefix = buildAttachmentPrefix(uploadedFiles);
+            var finalValue = prefix + (value || (uploadedFiles.length ? "请查看附件。" : ""));
+            if (uploadedFiles.length) clearAttachments();
 
-          if (isOffline) {
-            // Offline: queue for flush on reconnect, clear input immediately
-            queueOfflineTerminalChunks(submitChunks);
-            if (inputBox) {
-              inputBox.value = "";
-              autoResizeInput(inputBox);
-            }
-            setDraftValue("");
-            return Promise.resolve();
-          }
+            // Clear todo progress bar at the start of a new user turn
+            var todoEl = document.getElementById("todo-progress");
+            if (todoEl) todoEl.classList.add("hidden");
 
-          // Online: send via queue, only clear on success
-          return ensureSessionReadyForInput(selectedSession).then(function(readySession) {
-            if (!readySession) {
-              showToast("会话未就绪，将稍后重试。", "info");
-              return null;
+            if (isStructuredSession(selectedSession)) {
+              return postStructuredInput(finalValue, inputBox, selectedSession);
             }
-            var submitView = state.currentView;
-            if (readySession && readySession.provider === "codex" && state.selectedId !== readySession.id) {
-              throw new Error("Codex session changed before input send.");
-            }
-            return sendTerminalChunks(submitChunks, "enter_text", 0, submitView).then(function() {
-              // Clear input only after the send succeeds
-              if (inputBox && inputBox.value === value) {
+
+            var submitChunks = getTerminalSubmitChunks(selectedSession, finalValue);
+            var isOffline = !state.wsConnected;
+
+            if (isOffline) {
+              queueOfflineTerminalChunks(submitChunks);
+              if (inputBox) {
                 inputBox.value = "";
                 autoResizeInput(inputBox);
               }
               setDraftValue("");
+              return Promise.resolve();
+            }
+
+            return ensureSessionReadyForInput(selectedSession).then(function(readySession) {
+              if (!readySession) {
+                showToast("会话未就绪，将稍后重试。", "info");
+                return null;
+              }
+              var submitView = state.currentView;
+              if (readySession && readySession.provider === "codex" && state.selectedId !== readySession.id) {
+                throw new Error("Codex session changed before input send.");
+              }
+              return sendTerminalChunks(submitChunks, "enter_text", 30, submitView).then(function() {
+                if (inputBox && inputBox.value === value) {
+                  inputBox.value = "";
+                  autoResizeInput(inputBox);
+                }
+                setDraftValue("");
+              });
+            }).catch(function(err) {
+              showToast(getInputErrorMessage(err), "error");
+              throw err;
             });
           }).catch(function(err) {
-            showToast(getInputErrorMessage(err), "error");
+            showToast("附件上传失败: " + (err.message || err), "error");
             throw err;
           });
         }
@@ -7805,10 +8214,9 @@
       }
 
       function getTerminalSubmitChunks(session, text) {
-        if (session && session.provider === "codex") {
-          return [text, String.fromCharCode(13)];
-        }
-        return [text + String.fromCharCode(13)];
+        // 文本与回车分两个 chunk 发，避免 CLI 的 bracketed paste 检测把末尾
+        // \r 并入粘贴内容导致只换行不提交。
+        return [text, String.fromCharCode(13)];
       }
 
       function sendTerminalChunks(chunks, shortcutKey, delayMs, viewOverride) {
@@ -7848,7 +8256,6 @@
           return postInput(input, shortcutKey, viewOverride).finally(function() {
             var idx = state.messageQueue.indexOf(input);
             if (idx > -1) state.messageQueue.splice(idx, 1);
-            scheduleMobileDomUpdate();
           });
         });
         return state.inputQueue;
@@ -8491,6 +8898,7 @@
           state.preferredCommand = command;
           state.chatMode = getSafeModeForTool(command, state.chatMode);
         }
+        var modelPref = state.chatModel || (state.config && state.config.defaultModel) || "";
         return fetch("/api/commands", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -8498,7 +8906,8 @@
           body: JSON.stringify({
             command: command,
             cwd: cwd || "",
-            mode: state.chatMode || state.config.defaultMode || "default"
+            mode: state.chatMode || state.config.defaultMode || "default",
+            model: modelPref || undefined
           })
         })
         .then(function(res) { return res.json(); })
@@ -8618,6 +9027,7 @@
         var mode = state.chatMode || "managed";
         var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
+        var modelPref = state.chatModel || (state.config && state.config.defaultModel) || "";
         fetch("/api/commands", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -8626,7 +9036,8 @@
             command: preferredTool,
             cwd: defaultCwd,
             mode: mode,
-            initialInput: value
+            initialInput: value,
+            model: modelPref || undefined
           })
         })
         .then(function(res) { return res.json(); })
@@ -8654,6 +9065,7 @@
         var mode = state.chatMode || "managed";
         var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
+        var modelPref = state.chatModel || (state.config && state.config.defaultModel) || "";
         fetch("/api/commands", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -8662,7 +9074,8 @@
             command: preferredTool,
             cwd: defaultCwd,
             mode: mode,
-            initialInput: value || undefined
+            initialInput: value || undefined,
+            model: modelPref || undefined
           })
         })
         .then(function(res) { return res.json(); })
@@ -8818,7 +9231,7 @@
         setTimeout(function() {
           window.scrollTo(0, 0);
           // On mobile, force terminal refit + scroll after keyboard dismissal.
-          // The container height restores but xterm needs an explicit refit to
+          // The container height restores but terminal needs time to
           // fill the expanded space, and the scroll position needs resetting.
           if (isTouchDevice()) {
             ensureTerminalFit();
@@ -9487,9 +9900,8 @@
         if (!output) return;
         output.setAttribute("tabindex", "0");
         output.focus();
-        var terminalTextarea = output.querySelector(".xterm-helper-textarea");
-        if (terminalTextarea && typeof terminalTextarea.focus === "function") {
-          terminalTextarea.focus();
+        if (state.terminal && state.terminal.focus) {
+          state.terminal.focus();
         }
       }
 
@@ -9655,11 +10067,6 @@
       function observeTerminalResize() {
         var output = document.getElementById("output");
         if (!output) return;
-
-        if (typeof ResizeObserver === "function") {
-          state.resizeObserver = new ResizeObserver(function() { scheduleTerminalResize(true); });
-          state.resizeObserver.observe(output);
-        }
         var lastKnownDesktop = !isMobileLayout();
         state.resizeHandler = function() {
           scheduleTerminalResize(true);
@@ -9685,7 +10092,36 @@
         requestAnimationFrame(function() { scheduleTerminalResize(true); });
       }
 
+      function startTerminalHealthCheck() {
+        if (state.terminalHealthTimer) return;
+        state.terminalHealthTimer = setInterval(function() {
+          if (!state.terminal || state.currentView !== "terminal" || document.hidden) return;
+          var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
+          if (!selectedSession || selectedSession.sessionKind === "structured") return;
+          // Lightweight remeasure every 5s
+          if (state.terminal.remeasure) state.terminal.remeasure();
+          // Full re-sync every 30s during output pauses
+          var now = Date.now();
+          var chunkPause = state.lastChunkAt > 0 && (now - state.lastChunkAt > 300);
+          var resyncDue = (now - state.lastTerminalResyncAt) > 30000;
+          if (resyncDue && (chunkPause || selectedSession.status !== "running") && state.terminalOutput) {
+            state.lastTerminalResyncAt = now;
+            state.terminal.reset();
+            state.terminal.write(state.terminalOutput);
+            maybeScrollTerminalToBottom("output");
+          }
+        }, 5000);
+      }
+
+      function stopTerminalHealthCheck() {
+        if (state.terminalHealthTimer) {
+          clearInterval(state.terminalHealthTimer);
+          state.terminalHealthTimer = null;
+        }
+      }
+
       function teardownTerminal() {
+        stopTerminalHealthCheck();
         if (state.resizeTimer) {
           clearTimeout(state.resizeTimer);
           state.resizeTimer = null;
@@ -9711,6 +10147,7 @@
           }
         });
         clearTerminalScrollIdleTimer();
+        var output = document.getElementById("output");
         if (state.terminalViewportEl) {
           if (state.terminalViewportScrollHandler) {
             state.terminalViewportEl.removeEventListener("scroll", state.terminalViewportScrollHandler);
@@ -9719,27 +10156,30 @@
             state.terminalViewportEl.removeEventListener("touchmove", state.terminalViewportTouchHandler);
           }
         }
+        if (output) {
+          if (state.terminalWheelHandler) {
+            output.removeEventListener("wheel", state.terminalWheelHandler);
+          }
+          if (state.terminalClickHandler) {
+            output.removeEventListener("click", state.terminalClickHandler);
+          }
+        }
         state.terminalViewportEl = null;
         state.terminalViewportScrollHandler = null;
         state.terminalViewportTouchHandler = null;
+        state.terminalWheelHandler = null;
+        state.terminalClickHandler = null;
+        if (state.terminalScrollbarEl && state.terminalScrollbarEl.parentNode) {
+          state.terminalScrollbarEl.parentNode.removeChild(state.terminalScrollbarEl);
+        }
+        state.terminalScrollbarEl = null;
+        state.terminalScrollbarThumbEl = null;
         if (state.terminal) {
-          state.terminal.dispose();
+          state.terminal.destroy();
           state.terminal = null;
         }
-        state.fitAddon = null;
-        state.serializeAddon = null;
-        if (state.terminalDomView && state.terminalDomView.parentNode) {
-          state.terminalDomView.parentNode.removeChild(state.terminalDomView);
-        }
-        state.terminalDomView = null;
-        state._lastDomHtml = "";
-        if (state.terminalDomUpdateTimer) {
-          clearTimeout(state.terminalDomUpdateTimer);
-          state.terminalDomUpdateTimer = null;
-        }
         state.terminalSessionId = null;
         state.terminalOutput = "";
-        state.terminalViewportSize = { width: 0, height: 0 };
         state.terminalAutoFollow = true;
         state.showTerminalJumpToBottom = false;
         updateTerminalJumpToBottomButton();
@@ -9762,39 +10202,9 @@
       }
 
       function ensureTerminalFit() {
-        if (state.terminalFitInProgress) return;
-        state.terminalFitInProgress = true;
-        var maxAttempts = 20;
-        var attempt = 0;
-        function finishFit() {
-          state.terminalFitInProgress = false;
-        }
-        function tryFit() {
-          attempt++;
-          state.terminalViewportSize = { width: 0, height: 0 };
-          if (shouldResizeTerminalViewport() && state.fitAddon) {
-            state.fitAddon.fit();
-            maybeScrollTerminalToBottom("resize");
-            if (state.terminal) {
-              sendTerminalResize(state.terminal.cols, state.terminal.rows);
-            }
-            var output = document.getElementById("output");
-            if (output && state.terminal) {
-              var containerW = output.getBoundingClientRect().width;
-              var expectedMinCols = Math.floor(containerW / 20);
-              if (state.terminal.cols < expectedMinCols && attempt < maxAttempts) {
-                requestAnimationFrame(tryFit);
-                return;
-              }
-            }
-            finishFit();
-          } else if (attempt < maxAttempts) {
-            requestAnimationFrame(tryFit);
-          } else {
-            finishFit();
-          }
-        }
-        requestAnimationFrame(tryFit);
+        if (!state.terminal) return;
+        maybeScrollTerminalToBottom("resize");
+        sendTerminalResize(state.terminal.cols, state.terminal.rows);
       }
 
       function scheduleTerminalResize(immediate) {
@@ -9810,16 +10220,11 @@
       }
 
       function syncTerminalSize() {
-        var output = document.getElementById("output");
-        if (!state.terminal || !state.fitAddon || !output) return;
-        if (!shouldResizeTerminalViewport()) return;
-
+        if (!state.terminal) return;
         var shouldFollow = state.terminalAutoFollow || isTerminalNearBottom();
-        state.fitAddon.fit();
         if (shouldFollow) {
           maybeScrollTerminalToBottom("resize");
         }
-
         sendTerminalResize(state.terminal.cols, state.terminal.rows);
       }
 
@@ -9865,9 +10270,8 @@
             flushPendingMessages();
             // Re-fit terminal on reconnect — the viewport may have changed
             // while disconnected, and the PTY needs up-to-date dimensions.
-            if (state.terminal && state.fitAddon) {
-              state.terminalViewportSize = { width: 0, height: 0 };
-              ensureTerminalFit();
+            if (state.terminal) {
+              sendTerminalResize(state.terminal.cols, state.terminal.rows);
             }
           };
 
@@ -9947,8 +10351,22 @@
                 snapshot.messages = msg.data.messages;
               }
 
-              // Only update if we have meaningful data
-              if (snapshot.output !== undefined || snapshot.messages || isIncremental || msg.data.permissionBlocked !== undefined) {
+              // Fast path: chunk-only incremental events skip expensive chat update
+              var isChunkOnly = isIncremental && msg.data.chunk
+                && !msg.data.lastMessage && !snapshot.messages
+                && snapshot.output === undefined
+                && !msg.data.structuredState && !msg.data.sessionKind;
+
+              if (isChunkOnly) {
+                // Only update permissionBlocked if it actually changed
+                if (msg.data.permissionBlocked !== undefined) {
+                  var existingPB = state.sessions.find(function(s) { return s.id === msg.sessionId; });
+                  if (existingPB && !!existingPB.permissionBlocked !== !!msg.data.permissionBlocked) {
+                    updateSessionSnapshot(snapshot);
+                    if (msg.sessionId === state.selectedId) updateTaskDisplay();
+                  }
+                }
+              } else if (snapshot.output !== undefined || snapshot.messages || isIncremental || msg.data.permissionBlocked !== undefined) {
                 updateSessionSnapshot(snapshot);
                 if (msg.sessionId === state.selectedId) {
                   var updatedSession = state.sessions.find(function(s) { return s.id === msg.sessionId; }) || snapshot;
@@ -9966,21 +10384,20 @@
             // Real-time terminal output
             if (msg.sessionId === state.selectedId && state.terminal && msg.data) {
               if (msg.data.chunk && (!state.terminalSessionId || state.terminalSessionId === msg.sessionId)) {
-                // Fast path: write chunk directly to avoid full-output comparison
-                // which can trigger terminal.reset() and cause screen flicker.
+                // Fast path: write chunk directly to avoid full-output comparison.
+                state.lastChunkAt = Date.now();
                 state.terminalLiveStreamSessions[msg.sessionId] = true;
                 state.terminal.write(msg.data.chunk);
                 state.terminalSessionId = msg.sessionId;
                 if (msg.data.output) {
                   state.terminalOutput = normalizeTerminalOutput(msg.data.output);
                 } else {
-                  state.terminalOutput = normalizeTerminalOutput((state.terminalOutput || "") + msg.data.chunk);
+                  state.terminalOutput = (state.terminalOutput || "") + normalizeTerminalOutput(msg.data.chunk);
                 }
                 maybeScrollTerminalToBottom("output");
                 updateTerminalJumpToBottomButton();
-                scheduleMobileDomUpdate();
               } else if (!msg.data.incremental && Object.prototype.hasOwnProperty.call(msg.data, "output")) {
-                // Fallback: no chunk available, use full-output comparison (only in full mode)
+                // Fallback: no chunk available, use full-output comparison.
                 syncTerminalBuffer(msg.sessionId, msg.data.output || "", { mode: "append" });
               }
             }
@@ -10030,6 +10447,7 @@
               endedNotifBody = endedSession ? (endedSession.command || msg.sessionId) : msg.sessionId;
             }
             notifyTaskEnded(msg.sessionId, endedNotifTitle, endedNotifBody);
+            clearSessionProgressNative(msg.sessionId);
             if (msg.sessionId !== state.selectedId || document.hidden) {
               showNotificationBubble({
                 title: endedNotifTitle,
@@ -10104,6 +10522,11 @@
               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();
+                });
+              }
             }
             break;
           case 'usage':
@@ -10116,6 +10539,7 @@
               updateTaskDisplay();
             }
             notifyTaskProgress(msg.sessionId, msg.data || null);
+            syncSessionProgressToNative(msg.sessionId);
             // Update session list to reflect current activity (debounced)
             scheduleSessionListUpdate();
             break;
@@ -10185,6 +10609,7 @@
                 statusUpdate.approvalStats = msg.data.approvalStats;
               }
               updateSessionSnapshot(statusUpdate);
+              syncSessionProgressToNative(msg.sessionId);
               if (msg.sessionId === state.selectedId) {
                 updateTaskDisplay();
                 if (msg.data.approvalStats) {
@@ -10207,6 +10632,10 @@
             if (msg.data) {
               if (msg.data.kind === "update") {
                 notifyUpdateAvailable(msg.data.current || "-", msg.data.latest || "-");
+              } else if (msg.data.kind === "auto-update-start") {
+                showAutoUpdateOverlay(msg.data.current || "-", msg.data.latest || "-");
+              } else if (msg.data.kind === "auto-update-restart") {
+                showRestartOverlay();
               } else if (msg.data.kind === "restart") {
                 showRestartOverlay();
               }
@@ -10440,8 +10869,12 @@
         }
         updateTerminalJumpToBottomButton();
         if (state.currentView === "terminal") {
-          state.terminalViewportSize = { width: 0, height: 0 };
           scheduleTerminalResize(true);
+          if (state.terminal && state.terminal.remeasure) {
+            requestAnimationFrame(function() {
+              if (state.terminal) state.terminal.remeasure();
+            });
+          }
         }
       }
 
@@ -10467,13 +10900,15 @@
         if (chatRenderTimer) clearTimeout(chatRenderTimer);
         if (immediate) {
           chatRenderTimer = null;
-          // Messages already updated in handleWebSocketMessage, just render
           renderChat();
           return;
         }
+        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;
         chatRenderTimer = setTimeout(function() {
           chatRenderTimer = null;
-          // Re-parse messages from the latest session output (fallback for edge cases)
           var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
           if (selectedSession) {
               state.currentMessages = buildMessagesForRender(selectedSession, getPreferredMessages(selectedSession, selectedSession.output, true));
@@ -11016,6 +11451,10 @@
           list.innerHTML = html;
         }
 
+        // Sync todo progress to native notification
+        if (state.selectedId) {
+          syncSessionProgressToNative(state.selectedId);
+        }
       }
 
 
@@ -11143,161 +11582,6 @@
       })();
 
       // ===== Terminal copy button for mobile =====
-      // ===== Mobile DOM terminal view =====
-      function initMobileDomTerminal(container) {
-        // DOM terminal feature removed — always return
-        return;
-
-        // Create DOM view container
-        var domView = document.createElement("div");
-        domView.className = "terminal-dom-view active";
-        container.appendChild(domView);
-
-        // Always set font-size explicitly to match xterm
-        domView.style.fontSize = (state.terminalBaseFontSize * state.terminalScale) + "px";
-
-        // Hide xterm canvas but keep it in layout for FitAddon sizing.
-        // Use opacity:0 + pointer-events:none so the element still occupies
-        // space in the flex container and fit() can compute cols/rows correctly.
-        setTimeout(function() {
-          var xtermEl = container.querySelector(".xterm");
-          if (xtermEl) {
-            xtermEl.style.opacity = "0";
-            xtermEl.style.pointerEvents = "none";
-          }
-        }, 100);
-
-        // Save reference
-        state.terminalDomView = domView;
-        state.terminalDomUpdateTimer = null;
-
-        // Scroll events for auto-follow
-        domView.addEventListener("scroll", function() {
-          var distance = domView.scrollHeight - domView.clientHeight - domView.scrollTop;
-          if (distance <= state.terminalScrollThreshold) {
-            state.terminalAutoFollow = true;
-            clearTerminalScrollIdleTimer();
-            updateTerminalJumpToBottomButton();
-          } else {
-            setTerminalManualScrollActive();
-          }
-        }, { passive: true });
-
-        domView.addEventListener("touchmove", function() {
-          setTerminalManualScrollActive();
-        }, { passive: true });
-
-        // Trigger initial render
-        scheduleMobileDomUpdate();
-      }
-
-      function updateMobileDomView() {
-        if (!state.terminalDomView || !state.serializeAddon) return;
-
-        try {
-          // Serialize the entire buffer including scrollback history
-          var buf = state.terminal.buffer.active;
-          var totalRows = buf.length;
-          var html = state.serializeAddon.serializeAsHTML({
-            includeGlobalBackground: true,
-            range: { start: 0, end: totalRows }
-          });
-
-          // Extract the <pre>...</pre> portion
-          var match = html.match(/<pre[\s\S]*<\/pre>/);
-          var preHtml = match ? match[0] : "";
-
-          // Strip inline font-size/font-family from the serialized HTML
-          // so our CSS controls sizing and font consistently
-          preHtml = preHtml.replace(/font-size:\s*[^;"']+;?/g, "");
-          preHtml = preHtml.replace(/font-family:\s*[^;"']+;?/g, "");
-
-          // Fix colors for dark background
-          preHtml = fixDarkTerminalColors(preHtml);
-
-          // Skip update if content unchanged
-          if (preHtml === state._lastDomHtml) return;
-          state._lastDomHtml = preHtml;
-
-          // Preserve scroll position for non-auto-follow mode
-          var wasAtBottom = state.terminalAutoFollow;
-          var scrollTop = state.terminalDomView.scrollTop;
-
-          state.terminalDomView.innerHTML = preHtml;
-
-          if (wasAtBottom) {
-            state.terminalDomView.scrollTop = state.terminalDomView.scrollHeight;
-          } else {
-            state.terminalDomView.scrollTop = scrollTop;
-          }
-        } catch (e) {
-          // Fallback: plain text if serialize fails
-          if (state.terminal && state.terminal.buffer) {
-            var buf = state.terminal.buffer.active;
-            var lines = [];
-            for (var i = 0; i < buf.length; i++) {
-              var line = buf.getLine(i);
-              if (line) lines.push(line.translateToString(true));
-            }
-            var text = lines.join("\n").replace(/\n+$/, "");
-            state.terminalDomView.innerHTML = '<pre><div style="padding:8px 12px">' + escapeHtml(text) + '</div></pre>';
-            if (state.terminalAutoFollow) {
-              state.terminalDomView.scrollTop = state.terminalDomView.scrollHeight;
-            }
-          }
-        }
-      }
-
-      // Fix serialize addon's color issues on dark terminal background
-      function fixDarkTerminalColors(html) {
-        // Theme reference: bg=#1f1b17, fg=#f5eadc, black=#1f1b17, brightBlack=#625347
-        // 1. Hardcoded inverse: black text on gray → theme fg on theme brightBlack bg
-        html = html.replace(
-          /color:\s*#000000;\s*background-color:\s*#BFBFBF/g,
-          "color: #f5eadc; background-color: #625347"
-        );
-        // 2. Fix foreground colors that are too dark to read on #1f1b17 background.
-        //    Process each style attribute: split into declarations, fix only "color:" (not "background-color:").
-        html = html.replace(/style='([^']*)'/g, function(_match, styles) {
-          var parts = styles.split(";");
-          for (var i = 0; i < parts.length; i++) {
-            var decl = parts[i].trim();
-            // Skip background-color declarations
-            if (/^background-color\s*:/.test(decl)) continue;
-            // Match standalone color declaration
-            if (/^color\s*:/.test(decl)) {
-              var hexMatch = decl.match(/#([0-9a-fA-F]{6})\b/);
-              if (hexMatch && isColorTooDark("#" + hexMatch[1])) {
-                parts[i] = parts[i].replace(/#[0-9a-fA-F]{6}/, "#625347");
-              }
-            }
-          }
-          return "style='" + parts.join(";") + "'";
-        });
-        return html;
-      }
-
-      function isColorTooDark(hex) {
-        // Parse hex color and check relative luminance
-        var r = parseInt(hex.substring(1, 3), 16);
-        var g = parseInt(hex.substring(3, 5), 16);
-        var b = parseInt(hex.substring(5, 7), 16);
-        // Simple perceived brightness: if below threshold, it's too dark for #1f1b17 bg
-        var brightness = (r * 299 + g * 587 + b * 114) / 1000;
-        return brightness < 45; // #1f1b17 has brightness ~22, threshold catches colors close to it
-      }
-
-      function scheduleMobileDomUpdate() {
-        if (!state.terminalDomView) return;
-        // Trailing-edge debounce: reset timer on each call to batch rapid updates
-        if (state.terminalDomUpdateTimer) {
-          clearTimeout(state.terminalDomUpdateTimer);
-        }
-        state.terminalDomUpdateTimer = setTimeout(function() {
-          state.terminalDomUpdateTimer = null;
-          updateMobileDomView();
-        }, 150);
-      }
 
       function isNoiseLine(line) {
         if (!line) return false;
@@ -12917,6 +13201,65 @@
         return deduped.join(newline);
       }
 
+      function parseMarkdownTables(source) {
+        var NL = "\n";
+        var lines = source.split(NL);
+        var out = [];
+        var i = 0;
+
+        function splitRow(line) {
+          var s = line.trim();
+          if (s.charAt(0) === "|") s = s.slice(1);
+          if (s.charAt(s.length - 1) === "|") s = s.slice(0, -1);
+          return s.split("|");
+        }
+        function styleAttr(a) { return a ? ' style="text-align:' + a + '"' : ""; }
+        function buildTable(headers, aligns, rows) {
+          var thead = "<thead><tr>" + headers.map(function(c, idx) {
+            return "<th" + styleAttr(aligns[idx]) + ">" + c.trim() + "</th>";
+          }).join("") + "</tr></thead>";
+          var tbody = rows.length ? ("<tbody>" + rows.map(function(r) {
+            return "<tr>" + r.map(function(c, idx) {
+              return "<td" + styleAttr(aligns[idx]) + ">" + c.trim() + "</td>";
+            }).join("") + "</tr>";
+          }).join("") + "</tbody>") : "";
+          return '<div class="md-table-wrap"><table class="md-table">' + thead + tbody + "</table></div>";
+        }
+
+        while (i < lines.length) {
+          var header = lines[i];
+          if (header.indexOf("|") !== -1 && i + 1 < lines.length) {
+            var sep = lines[i + 1].trim();
+            if (/^\|?\s*:?-+:?(\s*\|\s*:?-+:?)+\s*\|?$/.test(sep)) {
+              var headers = splitRow(header);
+              var aligns = splitRow(sep).map(function(c) {
+                var t = c.trim();
+                var L = t.charAt(0) === ":";
+                var R = t.charAt(t.length - 1) === ":";
+                if (L && R) return "center";
+                if (R) return "right";
+                if (L) return "left";
+                return "";
+              });
+              var rows = [];
+              var j = i + 2;
+              while (j < lines.length) {
+                var trimmed = lines[j].trim();
+                if (!trimmed || trimmed.indexOf("|") === -1) break;
+                rows.push(splitRow(lines[j]));
+                j += 1;
+              }
+              out.push("", buildTable(headers, aligns, rows), "");
+              i = j;
+              continue;
+            }
+          }
+          out.push(header);
+          i += 1;
+        }
+        return out.join(NL);
+      }
+
       function renderMarkdown(text) {
         if (!text) return "";
 
@@ -13041,6 +13384,7 @@
         result = replaceLinePrefix(result, "- ", '<li>', '</li>');
         result = replaceLinePrefix(result, "* ", '<li>', '</li>');
         result = replaceOrderedList(result);
+        result = parseMarkdownTables(result);
 
         var lines = result.split(newline);
         var grouped = [];
@@ -13387,7 +13731,79 @@
         );
       }
 
-      /**
+      // ── Native Live Progress Sync ──
+
+      var _progressSyncTimers = {};
+      var _PROGRESS_SYNC_DEBOUNCE_MS = 300;
+
+      function syncSessionProgressToNative(sessionId) {
+        if (!_hasNativeBridge || typeof WandNative.updateSessionProgress !== "function") return;
+        if (!sessionId) return;
+        if (_progressSyncTimers[sessionId]) {
+          clearTimeout(_progressSyncTimers[sessionId]);
+        }
+        _progressSyncTimers[sessionId] = setTimeout(function() {
+          delete _progressSyncTimers[sessionId];
+          _doSyncSessionProgress(sessionId);
+        }, _PROGRESS_SYNC_DEBOUNCE_MS);
+      }
+
+      function _doSyncSessionProgress(sessionId) {
+        var session = state.sessions.find(function(s) { return s.id === sessionId; });
+        if (!session) return;
+
+        var sessionLabel = session.summary || session.command || sessionId;
+        var sessionStatus = session.status || "running";
+
+        // Clear notification for inactive sessions
+        if (sessionStatus === "idle" || sessionStatus === "archived" || sessionStatus === "exited") {
+          clearSessionProgressNative(sessionId);
+          return;
+        }
+
+        // Get latest todos from session messages
+        var todos = null;
+        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 (todos) break;
+        }
+
+        // Get current task
+        var currentTask = "";
+        if (sessionId === state.selectedId && state.currentTask && state.currentTask.title) {
+          currentTask = state.currentTask.title;
+        }
+
+        var data = {
+          sessionLabel: sessionLabel,
+          status: sessionStatus,
+          currentTask: currentTask,
+          todos: todos || []
+        };
+
+        try {
+          WandNative.updateSessionProgress(sessionId, JSON.stringify(data));
+        } catch (_e) {}
+      }
+
+      function clearSessionProgressNative(sessionId) {
+        if (!_hasNativeBridge || typeof WandNative.clearSessionProgress !== "function") return;
+        if (_progressSyncTimers[sessionId]) {
+          clearTimeout(_progressSyncTimers[sessionId]);
+          delete _progressSyncTimers[sessionId];
+        }
+        try { WandNative.clearSessionProgress(sessionId); } catch (_e) {}
+      }
 
       /**
        * Play a soft, rounded notification chime using Web Audio API.
@@ -13606,6 +14022,23 @@
         }, 2000);
       }
 
+      function showAutoUpdateOverlay(currentVer, latestVer) {
+        if (document.getElementById("restart-overlay")) return;
+        var overlay = document.createElement("div");
+        overlay.id = "restart-overlay";
+        overlay.className = "restart-overlay";
+        overlay.innerHTML =
+          '<div class="restart-overlay-content">' +
+            '<div class="restart-spinner"></div>' +
+            '<div class="restart-title">\u81ea\u52a8\u66f4\u65b0\u4e2d</div>' +
+            '<div class="restart-subtitle">' +
+              escapeHtml(currentVer) + ' \u2192 ' + escapeHtml(latestVer) +
+              '<br>\u6b63\u5728\u4e0b\u8f7d\u5e76\u5b89\u88c5\u65b0\u7248\u672c\uff0c\u7a0d\u540e\u5c06\u81ea\u52a8\u91cd\u542f\u2026' +
+            '</div>' +
+          '</div>';
+        document.body.appendChild(overlay);
+      }
+
       function escapeHtml(value) {
         return String(value)
           .replace(/&/g, "&amp;")