@co0ontty/wand 1.9.0 → 1.14.2

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

@@ -60,335 +60,6 @@
       var configPath = "${escapeHtml(configPath)}";
       var CHAT_EXPAND_STATE_STORAGE_KEY = "wand-chat-expand-state-v1";
       var CHAT_AUTO_FOLLOW_STORAGE_KEY = "wand-chat-auto-follow";
-      var DEFAULT_PANEL_STATE = {
-        sessionsDrawerOpen: false,
-        filePanelOpen: false,
-        shortcutsExpanded: false,
-        claudeHistoryExpanded: true,
-        chatMessageExpanded: true,
-        structuredThinkingExpanded: true,
-        structuredToolGroupExpanded: false,
-        structuredInlineToolExpanded: false,
-        structuredTerminalExpanded: false,
-        structuredToolCardExpanded: false,
-      };
-
-      function getConfiguredPanelDefaults(configOverride) {
-        var currentConfig = configOverride;
-        if (!currentConfig || typeof currentConfig !== "object") {
-          return {
-            sessionsDrawerOpen: DEFAULT_PANEL_STATE.sessionsDrawerOpen,
-            filePanelOpen: DEFAULT_PANEL_STATE.filePanelOpen,
-            shortcutsExpanded: DEFAULT_PANEL_STATE.shortcutsExpanded,
-            claudeHistoryExpanded: DEFAULT_PANEL_STATE.claudeHistoryExpanded,
-            chatMessageExpanded: DEFAULT_PANEL_STATE.chatMessageExpanded,
-            structuredThinkingExpanded: DEFAULT_PANEL_STATE.structuredThinkingExpanded,
-            structuredToolGroupExpanded: DEFAULT_PANEL_STATE.structuredToolGroupExpanded,
-            structuredInlineToolExpanded: DEFAULT_PANEL_STATE.structuredInlineToolExpanded,
-            structuredTerminalExpanded: DEFAULT_PANEL_STATE.structuredTerminalExpanded,
-            structuredToolCardExpanded: DEFAULT_PANEL_STATE.structuredToolCardExpanded,
-          };
-        }
-        var preferences = currentConfig.uiPreferences;
-        var configured = preferences && typeof preferences === "object" ? preferences.defaultPanelState : null;
-        return {
-          sessionsDrawerOpen: configured && typeof configured.sessionsDrawerOpen === "boolean" ? configured.sessionsDrawerOpen : DEFAULT_PANEL_STATE.sessionsDrawerOpen,
-          filePanelOpen: configured && typeof configured.filePanelOpen === "boolean" ? configured.filePanelOpen : DEFAULT_PANEL_STATE.filePanelOpen,
-          shortcutsExpanded: configured && typeof configured.shortcutsExpanded === "boolean" ? configured.shortcutsExpanded : DEFAULT_PANEL_STATE.shortcutsExpanded,
-          claudeHistoryExpanded: configured && typeof configured.claudeHistoryExpanded === "boolean" ? configured.claudeHistoryExpanded : DEFAULT_PANEL_STATE.claudeHistoryExpanded,
-          chatMessageExpanded: configured && typeof configured.chatMessageExpanded === "boolean" ? configured.chatMessageExpanded : DEFAULT_PANEL_STATE.chatMessageExpanded,
-          structuredThinkingExpanded: configured && typeof configured.structuredThinkingExpanded === "boolean" ? configured.structuredThinkingExpanded : DEFAULT_PANEL_STATE.structuredThinkingExpanded,
-          structuredToolGroupExpanded: configured && typeof configured.structuredToolGroupExpanded === "boolean" ? configured.structuredToolGroupExpanded : DEFAULT_PANEL_STATE.structuredToolGroupExpanded,
-          structuredInlineToolExpanded: configured && typeof configured.structuredInlineToolExpanded === "boolean" ? configured.structuredInlineToolExpanded : DEFAULT_PANEL_STATE.structuredInlineToolExpanded,
-          structuredTerminalExpanded: configured && typeof configured.structuredTerminalExpanded === "boolean" ? configured.structuredTerminalExpanded : DEFAULT_PANEL_STATE.structuredTerminalExpanded,
-          structuredToolCardExpanded: configured && typeof configured.structuredToolCardExpanded === "boolean" ? configured.structuredToolCardExpanded : DEFAULT_PANEL_STATE.structuredToolCardExpanded,
-        };
-      }
-
-      function getStoredBoolean(key) {
-        try {
-          var saved = localStorage.getItem(key);
-          if (saved === "true") return true;
-          if (saved === "false") return false;
-          return null;
-        } catch (e) {
-          return null;
-        }
-      }
-
-      function getInitialPanelBoolean(key, fieldName) {
-        var stored = getStoredBoolean(key);
-        if (stored !== null) return stored;
-        return DEFAULT_PANEL_STATE[fieldName];
-      }
-
-      function persistPanelBoolean(key, value) {
-        try {
-          localStorage.setItem(key, String(!!value));
-        } catch (e) {}
-      }
-
-      function applyConfiguredPanelDefaults() {
-        var defaults = getConfiguredPanelDefaults((typeof state !== "undefined" && state) ? state.config : null);
-        if (getStoredBoolean("wand-sessions-drawer-open") === null) {
-          state.sessionsDrawerOpen = defaults.sessionsDrawerOpen;
-        }
-        if (getStoredBoolean("wand-file-panel-open") === null) {
-          state.filePanelOpen = defaults.filePanelOpen;
-        }
-        if (getStoredBoolean("wand-shortcuts-expanded") === null) {
-          state.shortcutsExpanded = defaults.shortcutsExpanded;
-        }
-        if (getStoredBoolean("wand-claude-history-expanded") === null) {
-          state.claudeHistoryExpanded = defaults.claudeHistoryExpanded;
-        }
-      }
-
-      function getPanelStateSettingsFormValues() {
-        return {
-          sessionsDrawerOpen: !!((document.getElementById("cfg-panel-sessions-drawer") || {}).checked),
-          filePanelOpen: !!((document.getElementById("cfg-panel-file") || {}).checked),
-          shortcutsExpanded: !!((document.getElementById("cfg-panel-shortcuts") || {}).checked),
-          claudeHistoryExpanded: !!((document.getElementById("cfg-panel-history") || {}).checked),
-          chatMessageExpanded: !!((document.getElementById("cfg-panel-chat-message") || {}).checked),
-          structuredThinkingExpanded: !!((document.getElementById("cfg-panel-structured-thinking") || {}).checked),
-          structuredToolGroupExpanded: !!((document.getElementById("cfg-panel-structured-tool-group") || {}).checked),
-          structuredInlineToolExpanded: !!((document.getElementById("cfg-panel-structured-inline-tool") || {}).checked),
-          structuredTerminalExpanded: !!((document.getElementById("cfg-panel-structured-terminal") || {}).checked),
-          structuredToolCardExpanded: !!((document.getElementById("cfg-panel-structured-tool-card") || {}).checked),
-        };
-      }
-
-      function syncPanelStateSettingsForm(panelDefaults) {
-        var defaults = panelDefaults || getConfiguredPanelDefaults();
-        var sessionsDrawerEl = document.getElementById("cfg-panel-sessions-drawer");
-        var filePanelEl = document.getElementById("cfg-panel-file");
-        var shortcutsEl = document.getElementById("cfg-panel-shortcuts");
-        var historyEl = document.getElementById("cfg-panel-history");
-        var chatMessageEl = document.getElementById("cfg-panel-chat-message");
-        var structuredThinkingEl = document.getElementById("cfg-panel-structured-thinking");
-        var structuredToolGroupEl = document.getElementById("cfg-panel-structured-tool-group");
-        var structuredInlineToolEl = document.getElementById("cfg-panel-structured-inline-tool");
-        var structuredTerminalEl = document.getElementById("cfg-panel-structured-terminal");
-        var structuredToolCardEl = document.getElementById("cfg-panel-structured-tool-card");
-        if (sessionsDrawerEl) sessionsDrawerEl.checked = !!defaults.sessionsDrawerOpen;
-        if (filePanelEl) filePanelEl.checked = !!defaults.filePanelOpen;
-        if (shortcutsEl) shortcutsEl.checked = !!defaults.shortcutsExpanded;
-        if (historyEl) historyEl.checked = !!defaults.claudeHistoryExpanded;
-        if (chatMessageEl) chatMessageEl.checked = !!defaults.chatMessageExpanded;
-        if (structuredThinkingEl) structuredThinkingEl.checked = !!defaults.structuredThinkingExpanded;
-        if (structuredToolGroupEl) structuredToolGroupEl.checked = !!defaults.structuredToolGroupExpanded;
-        if (structuredInlineToolEl) structuredInlineToolEl.checked = !!defaults.structuredInlineToolExpanded;
-        if (structuredTerminalEl) structuredTerminalEl.checked = !!defaults.structuredTerminalExpanded;
-        if (structuredToolCardEl) structuredToolCardEl.checked = !!defaults.structuredToolCardExpanded;
-      }
-
-      function applySettingsConfig(config) {
-        state.config = config || null;
-        applyConfiguredPanelDefaults();
-        updatePanelDefaultControls();
-      }
-
-      function renderSettingsNav() {
-        return '<div class="settings-nav">' +
-          '<button class="settings-tab active" data-tab="about">关于</button>' +
-          '<button class="settings-tab" data-tab="general">基本配置</button>' +
-          '<button class="settings-tab" data-tab="security">安全</button>' +
-          '<button class="settings-tab" data-tab="presets">命令预设</button>' +
-        '</div>';
-      }
-
-      function renderAppearanceSettingsCard() {
-        return '<div class="settings-card settings-card-accent">' +
-          '<div class="settings-card-header">' +
-            '<div>' +
-              '<h3 class="settings-section-title">界面偏好</h3>' +
-              '<p class="settings-hint">这些选项决定新页面或未保存本地偏好的默认展开状态。</p>' +
-            '</div>' +
-          '</div>' +
-          '<div class="settings-toggle-list">' +
-            '<label class="settings-toggle-item" for="cfg-panel-sessions-drawer">' +
-              '<div><span class="settings-toggle-title">默认展开会话侧栏</span><span class="settings-toggle-desc">进入页面时左侧会话列表默认展开。</span></div>' +
-              '<input id="cfg-panel-sessions-drawer" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-file">' +
-              '<div><span class="settings-toggle-title">默认展开文件面板</span><span class="settings-toggle-desc">右侧文件浏览器在初始状态下打开。</span></div>' +
-              '<input id="cfg-panel-file" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-shortcuts">' +
-              '<div><span class="settings-toggle-title">默认展开快捷键栏</span><span class="settings-toggle-desc">移动端快捷键面板首次显示时展开完整行。</span></div>' +
-              '<input id="cfg-panel-shortcuts" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-history">' +
-              '<div><span class="settings-toggle-title">默认展开 Claude 历史</span><span class="settings-toggle-desc">侧栏里的 Claude 历史分组默认展开。</span></div>' +
-              '<input id="cfg-panel-history" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-chat-message">' +
-              '<div><span class="settings-toggle-title">默认展开聊天详情</span><span class="settings-toggle-desc">当某条消息没有本地展开记录时，采用这里的默认值。</span></div>' +
-              '<input id="cfg-panel-chat-message" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-structured-thinking">' +
-              '<div><span class="settings-toggle-title">默认展开思考卡片</span><span class="settings-toggle-desc">结构化模式中的 thinking 块默认展开。</span></div>' +
-              '<input id="cfg-panel-structured-thinking" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-structured-tool-group">' +
-              '<div><span class="settings-toggle-title">默认展开工具组</span><span class="settings-toggle-desc">连续工具调用合并后的工具组默认展开。</span></div>' +
-              '<input id="cfg-panel-structured-tool-group" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-structured-inline-tool">' +
-              '<div><span class="settings-toggle-title">默认展开内联工具</span><span class="settings-toggle-desc">Read、Grep、Glob 等内联工具结果默认展开。</span></div>' +
-              '<input id="cfg-panel-structured-inline-tool" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-structured-terminal">' +
-              '<div><span class="settings-toggle-title">默认展开终端卡片</span><span class="settings-toggle-desc">Bash 等终端输出卡片默认展开。</span></div>' +
-              '<input id="cfg-panel-structured-terminal" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-            '<label class="settings-toggle-item" for="cfg-panel-structured-tool-card">' +
-              '<div><span class="settings-toggle-title">默认展开通用工具卡</span><span class="settings-toggle-desc">工具调用、计划类卡片等通用卡片默认展开。</span></div>' +
-              '<input id="cfg-panel-structured-tool-card" type="checkbox" class="field-checkbox" />' +
-            '</label>' +
-          '</div>' +
-        '</div>';
-      }
-
-      function buildSettingsGeneralPanel() {
-        return '<div class="settings-panel" id="settings-tab-general">' +
-          '<div class="settings-card settings-card-accent">' +
-            '<div class="settings-card-header">' +
-              '<div>' +
-                '<h3 class="settings-section-title">基础运行配置</h3>' +
-                '<p class="settings-hint">影响服务器监听、默认模式和 CLI 行为。</p>' +
-              '</div>' +
-            '</div>' +
-            '<div class="field-row">' +
-              '<div class="field">' +
-                '<label class="field-label" for="cfg-host">监听地址 (host)</label>' +
-                '<input id="cfg-host" type="text" class="field-input" placeholder="127.0.0.1" />' +
-              '</div>' +
-              '<div class="field">' +
-                '<label class="field-label" for="cfg-port">端口 (port)</label>' +
-                '<input id="cfg-port" type="number" class="field-input" placeholder="8443" min="1" max="65535" />' +
-              '</div>' +
-            '</div>' +
-            '<div class="field field-inline">' +
-              '<input id="cfg-https" type="checkbox" class="field-checkbox" />' +
-              '<label class="field-label" for="cfg-https">启用 HTTPS</label>' +
-            '</div>' +
-            '<div class="field-row">' +
-              '<div class="field">' +
-                '<label class="field-label" for="cfg-mode">默认执行模式</label>' +
-                '<select id="cfg-mode" class="field-input">' +
-                  '<option value="default">default</option>' +
-                  '<option value="assist">assist</option>' +
-                  '<option value="agent">agent</option>' +
-                  '<option value="agent-max">agent-max</option>' +
-                  '<option value="auto-edit">auto-edit</option>' +
-                  '<option value="full-access">full-access</option>' +
-                  '<option value="native">native</option>' +
-                  '<option value="managed">managed</option>' +
-                '</select>' +
-              '</div>' +
-              '<div class="field">' +
-                '<label class="field-label" for="cfg-language">回复语言</label>' +
-                '<select id="cfg-language" class="field-input">' +
-                  '<option value="">自动（不指定）</option>' +
-                  '<option value="中文">中文</option>' +
-                  '<option value="English">English</option>' +
-                  '<option value="日本語">日本語</option>' +
-                  '<option value="한국어">한국어</option>' +
-                  '<option value="Español">Español</option>' +
-                  '<option value="Français">Français</option>' +
-                  '<option value="Deutsch">Deutsch</option>' +
-                  '<option value="Русский">Русский</option>' +
-                '</select>' +
-              '</div>' +
-            '</div>' +
-            '<p class="field-hint settings-inline-hint">设置回复语言后，Claude 将尽量使用指定语言回复。</p>' +
-            '<div class="field">' +
-              '<label class="field-label" for="cfg-cwd">默认工作目录</label>' +
-              '<input id="cfg-cwd" type="text" class="field-input" placeholder="/home/user" />' +
-            '</div>' +
-            '<div class="field">' +
-              '<label class="field-label" for="cfg-shell">Shell</label>' +
-              '<input id="cfg-shell" type="text" class="field-input" placeholder="/bin/bash" />' +
-            '</div>' +
-          '</div>' +
-          renderAppearanceSettingsCard() +
-          '<button id="save-config-button" class="btn btn-primary btn-block">保存配置</button>' +
-          '<p id="config-message" class="hint hidden"></p>' +
-        '</div>';
-      }
-
-      function persistSettingsBackedUiState() {
-        persistPanelBoolean("wand-sessions-drawer-open", state.sessionsDrawerOpen);
-        persistPanelBoolean("wand-file-panel-open", state.filePanelOpen);
-        persistPanelBoolean("wand-shortcuts-expanded", state.shortcutsExpanded);
-        persistPanelBoolean("wand-claude-history-expanded", state.claudeHistoryExpanded);
-      }
-
-      function resetSettingsBackedUiStateToDefaults() {
-        var defaults = getConfiguredPanelDefaults();
-        state.sessionsDrawerOpen = defaults.sessionsDrawerOpen;
-        state.filePanelOpen = defaults.filePanelOpen;
-        state.shortcutsExpanded = defaults.shortcutsExpanded;
-        state.claudeHistoryExpanded = defaults.claudeHistoryExpanded;
-        persistSettingsBackedUiState();
-      }
-
-      function handleSettingsConfigSaved(nextConfig) {
-        applySettingsConfig(nextConfig || state.config);
-        syncPanelStateSettingsForm();
-        resetSettingsBackedUiStateToDefaults();
-        updateLayoutState();
-        updateSessionsList();
-        updateCurrentSession();
-      }
-
-      function updateSettingsActiveNav() {
-        var activeTab = document.querySelector(".settings-tab.active");
-        var nav = document.querySelector(".settings-nav");
-        if (!nav) return;
-        if (activeTab) {
-          nav.setAttribute("data-active-tab", activeTab.getAttribute("data-tab") || "");
-        }
-      }
-
-      function updateCollapsedShortcutsUi() {
-        var wrap = document.querySelector(".inline-shortcuts-wrap");
-        var row = document.querySelector(".inline-shortcuts-expanded-row");
-        var toggle = document.querySelector(".shortcuts-toggle");
-        if (wrap) wrap.classList.toggle("expanded", state.shortcutsExpanded);
-        if (row) row.classList.toggle("visible", state.shortcutsExpanded);
-        if (toggle) {
-          toggle.classList.toggle("active", state.shortcutsExpanded);
-          toggle.textContent = state.shortcutsExpanded ? "\u203a" : "\u2039";
-        }
-      }
-
-      function updatePanelDefaultControls() {
-        syncPanelStateSettingsForm();
-      }
-
-      function persistDrawerState() {
-        persistPanelBoolean("wand-sessions-drawer-open", state.sessionsDrawerOpen);
-      }
-
-      function persistHistoryPanelState() {
-        persistPanelBoolean("wand-claude-history-expanded", state.claudeHistoryExpanded);
-      }
-
-      function persistShortcutsExpandedState() {
-        persistPanelBoolean("wand-shortcuts-expanded", state.shortcutsExpanded);
-      }
-
-      function persistFilePanelState() {
-        persistPanelBoolean("wand-file-panel-open", state.filePanelOpen);
-      }
-
-      function refreshUiAfterPanelStateChange() {
-        updateLayoutState();
-        updateSessionsList();
-      }
 
       var state = {
         selectedId: (function() {
@@ -437,7 +108,7 @@
         loginPending: false,
         loginChecked: false,
         bootstrapping: true,
-        sessionsDrawerOpen: getInitialPanelBoolean("wand-sessions-drawer-open", "sessionsDrawerOpen"),
+        sessionsDrawerOpen: false,
         modalOpen: false,
         presetValue: "",
         cwdValue: "",
@@ -459,6 +130,14 @@
         showInstallPrompt: false,
         ws: null,
         wsConnected: false,
+        _updateBubbleShown: false,
+        notifSound: (function() {
+          try { var v = localStorage.getItem("wand-notif-sound"); return v === null ? true : v === "true"; } catch (e) { return true; }
+        })(),
+        notifBubble: (function() {
+          try { var v = localStorage.getItem("wand-notif-bubble"); return v === null ? true : v === "true"; } catch (e) { return true; }
+        })(),
+        toolContentCache: {},
         currentView: "terminal",
         terminalScale: (function() {
           try {
@@ -470,7 +149,13 @@
         })(),
         terminalBaseFontSize: 13,
         keyboardPopupOpen: false,
-        filePanelOpen: getInitialPanelBoolean("wand-file-panel-open", "filePanelOpen"),
+        filePanelOpen: (function() {
+          try {
+            return localStorage.getItem("wand-file-panel-open") === "true";
+          } catch (e) {
+            return false;
+          }
+        })(),
         chatAutoFollow: (function() {
           try {
             var saved = localStorage.getItem(CHAT_AUTO_FOLLOW_STORAGE_KEY);
@@ -491,21 +176,25 @@
         lastRenderedMsgCount: 0,
         lastRenderedEmpty: null,
         renderPending: false,
+        chatPageSize: 20,
+        chatRenderedCount: 20,
         currentTask: null, // Current task title from Claude
         terminalInteractive: false,
         miniKeyboardVisible: false,
-        shortcutsExpanded: getInitialPanelBoolean("wand-shortcuts-expanded", "shortcutsExpanded"),
+        shortcutsExpanded: false,
         modifiers: { ctrl: false, alt: false, shift: false },
         fileSearchQuery: "",
         fileExplorerLoading: false,
         allFiles: [],
         claudeHistory: [],
         claudeHistoryLoaded: false,
-        claudeHistoryExpanded: getInitialPanelBoolean("wand-claude-history-expanded", "claudeHistoryExpanded"),
+        claudeHistoryExpanded: true,
         claudeHistoryExpandedDirs: {},
         sessionsManageMode: false,
         selectedSessionIds: {},
         selectedClaudeHistoryIds: {},
+        askUserSelections: {},  // { toolUseId: { 0: [optIdx...], submitted: false } }
+        queueEpoch: 0,  // Monotonic counter for queue state freshness
         // Load last used working directory from localStorage
         workingDir: (function() {
           try {
@@ -650,6 +339,8 @@
         if (button) {
           button.classList.toggle("visible", shouldShow);
         }
+        var chatContainer = document.getElementById("chat-output");
+        if (chatContainer) chatContainer.classList.toggle("has-jump-btn", shouldShow);
       }
 
       function scrollChatToBottom(smooth) {
@@ -714,6 +405,35 @@
         updateChatJumpToBottomButton();
       }
 
+      /** Load older messages by expanding the visible window */
+      function loadMoreChatMessages() {
+        if (state.chatRenderedCount >= state.currentMessages.length) return;
+        state.chatRenderedCount += state.chatPageSize;
+        renderChat(true);
+      }
+
+      // Observe the "load more" sentinel for auto-loading when scrolled into view
+      var _loadMoreObserver = null;
+      function observeLoadMoreSentinel() {
+        if (_loadMoreObserver) { _loadMoreObserver.disconnect(); _loadMoreObserver = null; }
+        var sentinel = document.getElementById("chat-load-more-sentinel");
+        if (!sentinel) return;
+        // Click handler for the button
+        var btn = sentinel.querySelector(".chat-load-more-btn");
+        if (btn) btn.onclick = function() { loadMoreChatMessages(); };
+        // IntersectionObserver for auto-load on scroll
+        if (typeof IntersectionObserver === "undefined") return;
+        _loadMoreObserver = new IntersectionObserver(function(entries) {
+          for (var i = 0; i < entries.length; i++) {
+            if (entries[i].isIntersecting) {
+              loadMoreChatMessages();
+              break;
+            }
+          }
+        }, { root: getChatScrollElement(), rootMargin: "200px" });
+        _loadMoreObserver.observe(sentinel);
+      }
+
       // Helper function to persist selected session ID to localStorage
       function persistSelectedId() {
         try {
@@ -863,56 +583,6 @@
         }
       }
 
-      function getDefaultChatMessageExpanded() {
-        return getConfiguredPanelDefaults().chatMessageExpanded;
-      }
-
-      function getDefaultStructuredCardExpanded(cardType, fallbackValue) {
-        var defaults = getConfiguredPanelDefaults();
-        if (cardType === "thinking") {
-          return defaults.structuredThinkingExpanded;
-        }
-        if (cardType === "tool-group") {
-          return defaults.structuredToolGroupExpanded;
-        }
-        if (cardType === "inline-tool") {
-          return defaults.structuredInlineToolExpanded;
-        }
-        if (cardType === "terminal") {
-          return defaults.structuredTerminalExpanded;
-        }
-        if (cardType === "tool-card") {
-          return defaults.structuredToolCardExpanded;
-        }
-        if (typeof fallbackValue === "boolean") {
-          return fallbackValue;
-        }
-        return defaults.chatMessageExpanded;
-      }
-
-      function hasPersistedExpandState(itemKey) {
-        if (!itemKey || !state.selectedId) return false;
-        var sessionState = getCurrentChatExpandState();
-        return typeof sessionState[itemKey] === "boolean";
-      }
-
-      function getExpandState(itemKey, cardType, fallbackValue) {
-        if (!itemKey || !state.selectedId) {
-          if (typeof fallbackValue === "boolean") return fallbackValue;
-          return getDefaultStructuredCardExpanded(cardType, fallbackValue);
-        }
-        var sessionState = getCurrentChatExpandState();
-        if (typeof sessionState[itemKey] === "boolean") return sessionState[itemKey];
-        return getDefaultStructuredCardExpanded(cardType, fallbackValue);
-      }
-
-      function getPersistedExpandState(itemKey) {
-        if (!itemKey || !state.selectedId) return null;
-        var sessionState = getCurrentChatExpandState();
-        if (typeof sessionState[itemKey] === "boolean") return sessionState[itemKey];
-        return null;
-      }
-
       function saveChatExpandStateMap(map) {
         try {
           if (!map || Object.keys(map).length === 0) {
@@ -933,6 +603,12 @@
         return sessionState && typeof sessionState === "object" ? sessionState : {};
       }
 
+      function getPersistedExpandState(itemKey) {
+        if (!itemKey || !state.selectedId) return null;
+        var sessionState = getCurrentChatExpandState();
+        return typeof sessionState[itemKey] === "boolean" ? sessionState[itemKey] : null;
+      }
+
       function setPersistedExpandState(itemKey, expanded) {
         if (!itemKey || !state.selectedId) return;
         var map = loadChatExpandStateMap();
@@ -1049,8 +725,9 @@
         container.querySelectorAll("[data-expand-key]").forEach(function(el) {
           var itemKey = getElementExpandKey(el);
           var kind = el.dataset.expandKind || "";
-          if (!kind || !hasPersistedExpandState(itemKey)) return;
-          applyExpandedState(el, kind, getPersistedExpandState(itemKey));
+          var persisted = getPersistedExpandState(itemKey);
+          if (persisted === null || !kind) return;
+          applyExpandedState(el, kind, persisted);
         });
       }
 
@@ -1059,6 +736,8 @@
         state.lastRenderedMsgCount = 0;
         state.lastRenderedEmpty = null;
         state.renderPending = false;
+        state.chatRenderedCount = state.chatPageSize;
+        state.askUserSelections = {};
         if (state.chatScrollElement && state.chatScrollHandler) {
           state.chatScrollElement.removeEventListener("scroll", state.chatScrollHandler);
         }
@@ -1193,7 +872,7 @@
           })
           .then(function(config) {
             if (!config) return;
-            applySettingsConfig(config);
+            state.config = config;
             state.loginChecked = true;
             requestAnimationFrame(function() {
               try {
@@ -1207,18 +886,7 @@
               refreshAll();
               requestNotificationPermission();
               if (config.updateAvailable && config.latestVersion) {
-                showNotificationBubble({
-                  title: "\u53d1\u73b0\u65b0\u7248\u672c",
-                  body: "\u5f53\u524d " + (config.currentVersion || "-") + " \u2192 \u6700\u65b0 " + config.latestVersion,
-                  type: "info",
-                  icon: "\u2191",
-                  duration: 10000,
-                  actionLabel: "\u53bb\u66f4\u65b0",
-                  action: function() {
-                    var settingsBtn = document.getElementById("open-settings-btn") || document.querySelector("[data-action='settings']");
-                    if (settingsBtn) settingsBtn.click();
-                  }
-                });
+                showUpdateBubble(config.currentVersion || "-", config.latestVersion);
                 sendBrowserNotification("Wand \u53d1\u73b0\u65b0\u7248\u672c", "\u5f53\u524d " + (config.currentVersion || "-") + " \u2192 \u6700\u65b0 " + config.latestVersion, { tag: "wand-update" });
               }
               if (state.claudeHistoryExpanded && !state.claudeHistoryLoaded) {
@@ -1413,8 +1081,6 @@
         var preferredTool = getComposerTool();
         var composerMode = getSafeModeForTool(preferredTool, state.chatMode);
 
-        var showTerminalHeaderControls = !!selectedSession && state.currentView === "terminal";
-        var showChatHeaderControls = !!selectedSession && state.currentView !== "terminal";
         return '<div class="app-container">' +
           '<div id="sessions-drawer-backdrop" class="drawer-backdrop' + drawerClass + '"></div>' +
           '<div class="main-layout' + (state.sessionsDrawerOpen ? ' sidebar-open' : '') + '">' +
@@ -1457,37 +1123,14 @@
               '</div>' +
             '</aside>' +
             '<main class="main-content">' +
-              '<div class="main-content-header">' +
-                '<div class="main-content-header-left">' +
-                  '<button id="sessions-toggle-button" class="main-header-btn menu-toggle-btn' + (state.sessionsDrawerOpen ? ' active' : '') + '" type="button" aria-label="打开菜单" title="菜单">' +
-                    '<span class="hamburger-icon">' +
-                      '<span></span><span></span><span></span>' +
-                    '</span>' +
-                  '</button>' +
-                  '<span class="current-task hidden" id="current-task"></span>' +
-                '</div>' +
-                '<div class="main-content-header-center">' +
-                  '<div class="view-toggle-bar' + (state.selectedId ? '' : ' hidden') + '" id="view-toggle-bar">' +
-                    '<button id="view-terminal-btn" class="topbar-btn' + (state.currentView === "terminal" ? ' active' : '') + '" type="button" title="查看原始终端输出">终端</button>' +
-                    '<button id="view-chat-btn" class="topbar-btn' + (state.currentView !== "terminal" ? ' active' : '') + '" type="button" title="查看聊天解析视图">聊天</button>' +
-                  '</div>' +
-                '</div>' +
-                '<div class="main-content-header-right">' +
-                  '<div class="main-header-controls' + (showTerminalHeaderControls ? '' : ' hidden') + '" id="terminal-header-controls">' +
-                    '<button id="terminal-scale-down-top" class="main-header-btn terminal-scale-btn" type="button" title="缩小">−</button>' +
-                    '<span class="main-header-label terminal-scale-label" id="terminal-scale-label-top">' + Math.round(state.terminalScale * 100) + '%</span>' +
-                    '<button id="terminal-scale-up-top" class="main-header-btn terminal-scale-btn" type="button" title="放大">+</button>' +
-                    '<button id="page-refresh-btn" class="main-header-btn" type="button" title="刷新页面">↻</button>' +
-                    '<button id="terminal-jump-bottom" class="main-header-btn jump-latest-btn' + (state.showTerminalJumpToBottom ? ' visible' : '') + '" type="button" title="回到底部">↓ 最新</button>' +
-                  '</div>' +
-                  '<div class="main-header-controls' + (showChatHeaderControls ? '' : ' hidden') + '" id="chat-header-controls">' +
-                    '<button id="chat-follow-toggle" class="chat-follow-toggle topbar-btn' + (state.chatAutoFollow ? ' active' : '') + '" type="button" aria-pressed="' + (state.chatAutoFollow ? 'true' : 'false') + '" title="' + (state.chatAutoFollow ? '追踪底部：开启' : '追踪底部：已暂停') + '">' + (state.chatAutoFollow ? '追底' : '暂停') + '</button>' +
-                    '<button id="chat-jump-bottom" class="main-header-btn jump-latest-btn' + (state.showChatJumpToBottom ? ' visible' : '') + '" type="button" title="回到底部并继续追底">↓ 最新</button>' +
-                  '</div>' +
-                  '<button id="topbar-new-session-button" class="main-header-btn main-header-new-session" type="button" title="新对话">＋ 新对话</button>' +
-                '</div>' +
+              '<div class="main-header-row">' +
+                '<button id="sessions-toggle-button" class="floating-sidebar-toggle' + (state.sessionsDrawerOpen ? ' active' : '') + '" aria-label="切换会话侧栏" type="button">' +
+                  '<span class="hamburger-icon">' +
+                    '<span></span><span></span><span></span>' +
+                  '</span>' +
+                '</button>' +
+                '<span class="current-task hidden" id="current-task"></span>' +
               '</div>' +
-              '<div class="main-content-body">' +
               // File panel backdrop (mobile)
               '<div id="file-panel-backdrop" class="file-panel-backdrop' + (state.filePanelOpen ? " open" : "") + '"></div>' +
               // File side panel
@@ -1508,8 +1151,22 @@
                   '<div class="file-explorer" id="file-explorer">' + renderFileExplorer(selectedSession && selectedSession.cwd ? selectedSession.cwd : getConfigCwd()) + '</div>' +
                 '</div>' +
               '</div>' +
-              '<div id="output" class="terminal-container' + (state.selectedId ? "" : " hidden") + ' active"></div>' +
-              '<div id="chat-output" class="chat-container hidden"></div>' +
+              '<div id="output" class="terminal-container' + (state.selectedId ? "" : " hidden") + ' active">' +
+                '<div class="terminal-scale-overlay" aria-label="终端缩放控件">' +
+                  '<button id="terminal-scale-down-top" class="terminal-scale-overlay-btn terminal-scale-btn" type="button" title="缩小">−</button>' +
+                  '<span class="terminal-scale-overlay-label terminal-scale-label" id="terminal-scale-label-top">' + Math.round(state.terminalScale * 100) + '%</span>' +
+                  '<button id="terminal-scale-up-top" class="terminal-scale-overlay-btn terminal-scale-btn" type="button" title="放大">+</button>' +
+                  '<span class="terminal-scale-overlay-divider"></span>' +
+                  '<button id="page-refresh-btn" class="terminal-scale-overlay-btn" type="button" title="刷新页面">↻</button>' +
+                '</div>' +
+                '<button id="terminal-jump-bottom" class="terminal-jump-bottom' + (state.showTerminalJumpToBottom ? ' visible' : '') + '" type="button" title="回到底部">↓ 最新</button>' +
+              '</div>' +
+              '<div id="chat-output" class="chat-container hidden">' +
+                '<div class="chat-overlay-controls">' +
+                  '<button id="chat-follow-toggle" class="chat-follow-toggle topbar-btn' + (state.chatAutoFollow ? ' active' : '') + '" type="button" aria-pressed="' + (state.chatAutoFollow ? 'true' : 'false') + '" title="' + (state.chatAutoFollow ? '追踪底部：开启' : '追踪底部：已暂停') + '">' + (state.chatAutoFollow ? '追底' : '暂停') + '</button>' +
+                '</div>' +
+                '<button id="chat-jump-bottom" class="chat-jump-bottom' + (state.showChatJumpToBottom ? ' visible' : '') + '" type="button" title="回到底部并继续追底">↓ 最新</button>' +
+              '</div>' +
               '<div id="blank-chat" class="blank-chat' + (state.selectedId ? " hidden" : "") + '">' +
                 '<div class="blank-chat-inner">' +
                   '<div class="blank-chat-logo">W</div>' +
@@ -1651,9 +1308,18 @@
               '<h2 class="modal-title">设置</h2>' +
               '<button id="close-settings-button" class="btn btn-ghost btn-icon">×</button>' +
             '</div>' +
-            '<div class="modal-body settings-layout">' +
-              renderSettingsNav() +
-              '<div class="settings-content">' +
+            '<div class="modal-body">' +
+              // Tabs
+              '<div class="settings-tabs">' +
+                '<button class="settings-tab active" data-tab="about">\u5173\u4e8e</button>' +
+                '<button class="settings-tab" data-tab="general">\u57fa\u672c\u914d\u7f6e</button>' +
+                '<button class="settings-tab" data-tab="notifications">\u901a\u77e5</button>' +
+                '<button class="settings-tab" data-tab="security">\u5b89\u5168</button>' +
+                '<button class="settings-tab" data-tab="presets">\u547d\u4ee4\u9884\u8bbe</button>' +
+                '<button class="settings-tab" data-tab="display">\u663e\u793a</button>' +
+              '</div>' +
+
+              // About tab
               '<div class="settings-panel active" id="settings-tab-about">' +
                 '<div class="settings-about-info">' +
                   '<div class="settings-about-row"><span class="settings-label">包名</span><span class="settings-value" id="settings-pkg-name">-</span></div>' +
@@ -1667,26 +1333,145 @@
                     '<span class="settings-value" id="settings-latest-version">-</span>' +
                   '</div>' +
                   '<div class="settings-update-actions">' +
-                    '<button id="check-update-button" class="btn btn-ghost btn-sm">检查更新</button>' +
-                    '<button id="do-update-button" class="btn btn-primary btn-sm hidden">更新到最新版</button>' +
+                    '<button id="check-update-button" class="btn btn-ghost btn-sm">\u68c0\u67e5\u66f4\u65b0</button>' +
+                    '<button id="do-update-button" class="btn btn-primary btn-sm hidden">\u66f4\u65b0\u5230\u6700\u65b0\u7248</button>' +
+                    '<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>' +
-                '<div class="settings-notification-section">' +
-                  '<div class="settings-section-title">\u901a\u77e5\u72b6\u6001</div>' +
+                '<div class="settings-update-section" id="android-apk-section">' +
+                  '<div id="android-apk-current-row" class="settings-about-row hidden">' +
+                    '<span class="settings-label">当前版本</span>' +
+                    '<span class="settings-value" id="settings-android-apk-current">-</span>' +
+                  '</div>' +
+                  '<div id="android-apk-github-row" class="settings-about-row hidden">' +
+                    '<span class="settings-label">线上版本</span>' +
+                    '<span class="settings-value" id="settings-android-apk-github" style="flex:1">-</span>' +
+                    '<button id="download-github-apk-btn" class="btn btn-ghost btn-sm hidden" type="button" style="margin-left:8px;flex-shrink:0">下载</button>' +
+                  '</div>' +
+                  '<div id="android-apk-local-row" class="settings-about-row hidden">' +
+                    '<span class="settings-label">本地版本</span>' +
+                    '<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>' +
+                  '<p id="android-apk-message" class="hint hidden"></p>' +
+                '</div>' +
+                '<div class="settings-update-section" id="android-connect-section">' +
+                  '<div class="settings-section-title" style="margin-bottom:8px">App 连接码</div>' +
+                  '<div class="settings-connect-url-box">' +
+                    '<code id="android-connect-code" class="settings-connect-url-text" style="font-size:12px;word-break:break-all">-</code>' +
+                    '<button id="copy-connect-code-button" class="btn btn-ghost btn-sm" type="button" title="复制连接码">复制</button>' +
+                  '</div>' +
+                  '<p class="hint">复制此连接码粘贴到 Android App 即可自动连接，无需输入密码。修改密码后连接码自动失效。</p>' +
+                '</div>' +
+              '</div>' +
+
+              // Notifications tab
+              '<div class="settings-panel" id="settings-tab-notifications">' +
+                '<div class="settings-section-title">\u901a\u77e5\u504f\u597d</div>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-notif-sound" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-notif-sound">\u64ad\u653e\u63d0\u793a\u97f3</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">\u91cd\u8981\u901a\u77e5\uff08\u7248\u672c\u66f4\u65b0\u3001\u6743\u9650\u7b49\u5f85\u7b49\uff09\u65f6\u64ad\u653e\u67d4\u548c\u7684\u63d0\u793a\u97f3</p>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-notif-bubble" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-notif-bubble">\u5e94\u7528\u5185\u901a\u77e5\u6c14\u6ce1</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">\u5728\u9875\u9762\u9876\u90e8\u5f39\u51fa\u6d6e\u52a8\u901a\u77e5\u6c14\u6ce1</p>' +
+                '<div class="settings-notification-section" style="margin-top:6px">' +
+                  '<div class="settings-section-title">\u6d4f\u89c8\u5668\u901a\u77e5</div>' +
                   '<div class="settings-about-row">' +
-                    '<span class="settings-label">\u6d4f\u89c8\u5668\u901a\u77e5</span>' +
+                    '<span class="settings-label">\u6388\u6743\u72b6\u6001</span>' +
                     '<span class="settings-value" id="notification-permission-status">-</span>' +
                   '</div>' +
                   '<div class="settings-update-actions">' +
                     '<button id="notification-request-btn" class="btn btn-ghost btn-sm hidden">\u6388\u6743\u901a\u77e5</button>' +
+                    '<button id="notification-reset-btn" class="btn btn-ghost btn-sm hidden">\u91cd\u65b0\u6388\u6743</button>' +
                     '<button id="notification-test-btn" class="btn btn-ghost btn-sm">\u53d1\u9001\u6d4b\u8bd5\u901a\u77e5</button>' +
                   '</div>' +
                   '<p id="notification-test-message" class="hint hidden"></p>' +
                 '</div>' +
               '</div>' +
 
-              buildSettingsGeneralPanel() +
+              // General config tab
+              '<div class="settings-panel" id="settings-tab-general">' +
+                '<div class="field-row">' +
+                  '<div class="field">' +
+                    '<label class="field-label" for="cfg-host">监听地址 (host)</label>' +
+                    '<input id="cfg-host" type="text" class="field-input" placeholder="127.0.0.1" />' +
+                  '</div>' +
+                  '<div class="field">' +
+                    '<label class="field-label" for="cfg-port">端口 (port)</label>' +
+                    '<input id="cfg-port" type="number" class="field-input" placeholder="8443" min="1" max="65535" />' +
+                  '</div>' +
+                '</div>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-https" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-https">启用 HTTPS</label>' +
+                '</div>' +
+                '<div class="field-row">' +
+                  '<div class="field">' +
+                    '<label class="field-label" for="cfg-mode">默认执行模式</label>' +
+                    '<select id="cfg-mode" class="field-input">' +
+                      '<option value="default">default</option>' +
+                      '<option value="assist">assist</option>' +
+                      '<option value="agent">agent</option>' +
+                      '<option value="agent-max">agent-max</option>' +
+                      '<option value="auto-edit">auto-edit</option>' +
+                      '<option value="full-access">full-access</option>' +
+                      '<option value="native">native</option>' +
+                      '<option value="managed">managed</option>' +
+                    '</select>' +
+                  '</div>' +
+                  '<div class="field">' +
+                    '<label class="field-label" for="cfg-language">回复语言</label>' +
+                    '<select id="cfg-language" class="field-input">' +
+                      '<option value="">自动（不指定）</option>' +
+                      '<option value="中文">中文</option>' +
+                      '<option value="English">English</option>' +
+                      '<option value="日本語">日本語</option>' +
+                      '<option value="한국어">한국어</option>' +
+                      '<option value="Español">Español</option>' +
+                      '<option value="Français">Français</option>' +
+                      '<option value="Deutsch">Deutsch</option>' +
+                      '<option value="Русский">Русский</option>' +
+                    '</select>' +
+                  '</div>' +
+                '</div>' +
+                '<p class="field-hint" style="margin-top:-4px;">设置回复语言后，Claude 将尽量使用指定语言回复。</p>' +
+                '<div class="field">' +
+                  '<label class="field-label" for="cfg-cwd">默认工作目录</label>' +
+                  '<input id="cfg-cwd" type="text" class="field-input" placeholder="/home/user" />' +
+                '</div>' +
+                '<div class="field">' +
+                  '<label class="field-label" for="cfg-shell">Shell</label>' +
+                  '<input id="cfg-shell" type="text" class="field-input" placeholder="/bin/bash" />' +
+                '</div>' +
+                (typeof WandNative !== "undefined" && typeof WandNative.getAppIcon === "function" ?
+                '<div style="margin-bottom:16px">' +
+                  '<div class="settings-section-title">应用图标</div>' +
+                  '<p class="hint" style="margin-top:-4px;margin-bottom:10px">选择 App 启动器图标，返回桌面后生效</p>' +
+                  '<div id="app-icon-picker" style="display:flex;gap:16px">' +
+                    '<div class="app-icon-option" data-icon="shorthair" style="cursor:pointer;text-align:center">' +
+                      '<div class="app-icon-preview" style="width:56px;height:56px;border-radius:12px;overflow:hidden;border:3px solid transparent;background:var(--bg-tertiary);display:flex;align-items:center;justify-content:center;margin-bottom:4px">' +
+                        PIXEL_AVATAR.user +
+                      '</div>' +
+                      '<span style="font-size:0.72rem;color:var(--text-secondary)">赛博虎妞</span>' +
+                    '</div>' +
+                    '<div class="app-icon-option" data-icon="garfield" style="cursor:pointer;text-align:center">' +
+                      '<div class="app-icon-preview" style="width:56px;height:56px;border-radius:12px;overflow:hidden;border:3px solid transparent;background:var(--bg-tertiary);display:flex;align-items:center;justify-content:center;margin-bottom:4px">' +
+                        PIXEL_AVATAR.assistant +
+                      '</div>' +
+                      '<span style="font-size:0.72rem;color:var(--text-secondary)">勤劳初二</span>' +
+                    '</div>' +
+                  '</div>' +
+                  '<p id="app-icon-message" class="hint hidden" style="margin-top:8px"></p>' +
+                '</div>'
+                : '') +
+                '<button id="save-config-button" class="btn btn-primary btn-block">保存配置</button>' +
+                '<p id="config-message" class="hint hidden"></p>' +
+              '</div>' +
 
               // Security tab
               '<div class="settings-panel" id="settings-tab-security">' +
@@ -1724,6 +1509,38 @@
               '<div class="settings-panel" id="settings-tab-presets">' +
                 '<div id="presets-list" class="presets-list"></div>' +
               '</div>' +
+
+              // Display settings tab
+              '<div class="settings-panel" id="settings-tab-display">' +
+                '<div class="settings-section-title">卡片默认展开状态</div>' +
+                '<p class="hint" style="margin-top:-4px;margin-bottom:12px">设置结构化聊天视图中各类卡片的默认展开/折叠状态。手动操作的展开状态优先于此默认设置。</p>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-card-edit" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-card-edit">编辑卡片 (Edit/Write)</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">文件编辑和写入操作的 diff 视图</p>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-card-inline" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-card-inline">内联工具 (Read/Glob/Grep)</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">文件读取、搜索等工具的结果</p>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-card-terminal" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-card-terminal">终端输出 (Bash)</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">命令行执行结果</p>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-card-thinking" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-card-thinking">思考过程 (Thinking)</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">Claude 的思考过程块</p>' +
+                '<div class="field field-inline">' +
+                  '<input id="cfg-card-toolgroup" type="checkbox" class="field-checkbox" />' +
+                  '<label class="field-label" for="cfg-card-toolgroup">工具组</label>' +
+                '</div>' +
+                '<p class="hint" style="margin-top:0;margin-bottom:10px">连续同类工具调用的折叠组</p>' +
+                '<button id="save-display-button" class="btn btn-primary btn-block">保存显示设置</button>' +
+                '<p id="display-message" class="hint hidden"></p>' +
               '</div>' +
             '</div>' +
           '</div>' +
@@ -2087,7 +1904,9 @@
 
       function setFilePanelOpen(nextOpen) {
         state.filePanelOpen = nextOpen;
-        persistFilePanelState();
+        try {
+          localStorage.setItem("wand-file-panel-open", String(state.filePanelOpen));
+        } catch (e) {}
         if (state.filePanelOpen && isMobileLayout()) {
           state.sessionsDrawerOpen = false;
         }
@@ -2150,7 +1969,10 @@
         } catch (e) {}
         applyTerminalScale();
         updateScaleLabel();
-        scheduleTerminalResize();
+        // 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() {
@@ -2589,6 +2411,35 @@
         '</div>';
       }
 
+      function timeAgo(isoString) {
+        if (!isoString) return "";
+        var now = Date.now();
+        var then = new Date(isoString).getTime();
+        var diff = Math.max(0, now - then);
+        var seconds = Math.floor(diff / 1000);
+        if (seconds < 60) return "刚刚";
+        var minutes = Math.floor(seconds / 60);
+        if (minutes < 60) return minutes + "分钟前";
+        var hours = Math.floor(minutes / 60);
+        if (hours < 24) return hours + "小时前";
+        var days = Math.floor(hours / 24);
+        if (days < 30) return days + "天前";
+        return Math.floor(days / 30) + "个月前";
+      }
+
+      function elapsedTime(isoString) {
+        if (!isoString) return "";
+        var now = Date.now();
+        var then = new Date(isoString).getTime();
+        var diff = Math.max(0, now - then);
+        var seconds = Math.floor(diff / 1000);
+        var minutes = Math.floor(seconds / 60);
+        var hours = Math.floor(minutes / 60);
+        if (hours > 0) return hours + "h" + (minutes % 60 > 0 ? (minutes % 60) + "m" : "");
+        if (minutes > 0) return minutes + "m";
+        return seconds + "s";
+      }
+
       function getSessionStatusLabel(session) {
         if (!session) return "";
         if (session.archived) return "已归档";
@@ -2611,29 +2462,55 @@
         return session.status || "";
       }
 
+      /** Get a human-readable activity description for a running session */
+      function getSessionActivityDesc(session) {
+        if (!session) return "";
+        if (session.permissionBlocked) return "等待你的授权";
+        if (session.status !== "running") return "";
+        // Check WebSocket-delivered currentTask first
+        if (session.id === state.selectedId && state.currentTask && state.currentTask.title) {
+          return state.currentTask.title;
+        }
+        // Fall back to snapshot-delivered currentTaskTitle
+        if (session.currentTaskTitle) return session.currentTaskTitle;
+        return "";
+      }
+
+      /** Get the last meaningful assistant text from messages for notification/display */
+      function getLastAssistantSummary(session) {
+        var msgs = session && session.messages;
+        if (!msgs || msgs.length === 0) return "";
+        for (var i = msgs.length - 1; i >= 0; i--) {
+          var msg = msgs[i];
+          if (msg.role !== "assistant") continue;
+          var blocks = msg.content || [];
+          for (var j = 0; j < blocks.length; j++) {
+            if (blocks[j].type === "text" && blocks[j].text && blocks[j].text.trim()) {
+              var text = blocks[j].text.trim();
+              // Strip markdown formatting for compact display
+              text = text.replace(/^#+\s+/gm, "").replace(/\*\*/g, "").replace(/`/g, "");
+              var firstLine = text.split("\n")[0].trim();
+              return firstLine.slice(0, 100);
+            }
+          }
+        }
+        return "";
+      }
+
       function renderSessionItem(session) {
         var activeClass = session.id === state.selectedId ? " active" : "";
         var selectedClass = state.sessionsManageMode && state.selectedSessionIds[session.id] ? " selected" : "";
         var metaStatus = getSessionStatusLabel(session);
         var metaStatusClass = getSessionStatusClass(session);
-        var modeName = session.mode === "full-access" ? "全权限" : session.mode === "default" ? "默认" : session.mode === "native" ? "原生" : session.mode === "auto-edit" ? "自动编辑" : session.mode;
         var resumeButton = "";
-        var sessionIdDisplay = "";
-        var recoveryHint = "";
         var checkbox = renderManageCheckbox("sessions", session.id, "选择会话 " + session.command);
 
         if (session.provider === "claude" && session.claudeSessionId) {
-          var shortId = session.claudeSessionId.slice(0, 8);
-          sessionIdDisplay = '<span class="session-id" title="' + escapeHtml(session.claudeSessionId) + '">' + escapeHtml(shortId) + '</span>';
           if (session.status !== "running" && !state.sessionsManageMode && !isStructuredSession(session)) {
             resumeButton = '<button class="session-action-btn" data-action="resume" data-session-id="' + session.id + '" type="button" aria-label="恢复会话" title="恢复 Claude 会话"><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="M1 4v6h6"/><path d="M3.51 15a9 9 0 105.64-11.36L3 10"/></svg></button>';
           }
         }
 
-        if (session.autoRecovered) {
-          recoveryHint = '<span class="session-id" title="自动恢复的会话">自动恢复</span>';
-        }
-
         var canOpenMerge = !state.sessionsManageMode && session.worktreeEnabled && session.worktree && session.worktree.branch && session.worktree.path;
         var needsCleanup = session.worktreeMergeStatus === "merged" && session.worktreeMergeInfo && session.worktreeMergeInfo.cleanupDone === false;
         var mergeDisabled = session.status === "running" || session.worktreeMergeStatus === "merging";
@@ -2644,23 +2521,50 @@
             ? '<button class="session-action-btn merge-btn" data-action="worktree-cleanup" data-session-id="' + session.id + '" type="button" aria-label="重试清理 worktree" title="重试清理 worktree"><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 6h18"/><path d="M8 6V4a2 2 0 012-2h4a2 2 0 012 2v2"/><path d="M19 6l-1 14a2 2 0 01-2 2H8a2 2 0 01-2-2L5 6"/></svg></button>'
             : "";
         var deleteButton = state.sessionsManageMode ? '' : '<button class="session-action-btn delete-btn" data-action="delete-session" data-session-id="' + session.id + '" type="button" aria-label="删除会话" 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 6h18"/><path d="M8 6V4a2 2 0 012-2h4a2 2 0 012 2v2"/><path d="M19 6l-1 14a2 2 0 01-2 2H8a2 2 0 01-2-2L5 6"/></svg></button>';
-        var modeBadge = renderSessionKindBadge(session);
         var actionsHtml = '<span class="session-actions">' + resumeButton + mergeButton + deleteButton + '</span>';
 
+        // Title: summary or command
+        var titleHtml = session.summary
+          ? '<div class="session-title">' + escapeHtml(session.summary) + '</div>'
+          : '<div class="session-command">' + escapeHtml(session.resumedFromSessionId ? session.command.replace(/\s+--resume\s+\S+/, '') : session.command) + '</div>';
+
+        // Activity description for running sessions
+        var activityDesc = getSessionActivityDesc(session);
+        var activityHtml = "";
+        if (session.status === "running" && activityDesc) {
+          activityHtml = '<div class="session-activity">' + escapeHtml(activityDesc) + '</div>';
+        }
+
+        // Time display
+        var timeDisplay = "";
+        if (session.status === "running") {
+          timeDisplay = '<span class="session-time" title="已运行 ' + escapeHtml(elapsedTime(session.startedAt)) + '">' + escapeHtml(elapsedTime(session.startedAt)) + '</span>';
+        } else if (session.endedAt) {
+          timeDisplay = '<span class="session-time" title="' + escapeHtml(new Date(session.endedAt).toLocaleString()) + '">' + escapeHtml(timeAgo(session.endedAt)) + '</span>';
+        } else if (session.startedAt) {
+          timeDisplay = '<span class="session-time" title="' + escapeHtml(new Date(session.startedAt).toLocaleString()) + '">' + escapeHtml(timeAgo(session.startedAt)) + '</span>';
+        }
+
+        // Badges: worktree only (removed PTY/Structured and mode badges for cleaner look)
+        var badgesHtml = renderWorktreeBadge(session);
+
+        // Recovery hint
+        var recoveryHtml = session.autoRecovered ? '<span class="session-recovery-hint">自动恢复</span>' : '';
+
         return '<div class="session-item' + activeClass + selectedClass + '" data-session-id="' + session.id + '" role="button" tabindex="0">' +
           '<div class="session-item-content">' +
             '<div class="session-item-row">' +
               checkbox +
               '<div class="session-main">' +
-                (session.summary
-                  ? '<div class="session-title">' + escapeHtml(session.summary) + '</div>'
-                  : '<div class="session-command">' + escapeHtml(session.resumedFromSessionId ? session.command.replace(/\s+--resume\s+\S+/, '') : session.command) + '</div>') +
+                '<div class="session-title-row">' +
+                  titleHtml +
+                  timeDisplay +
+                '</div>' +
+                activityHtml +
                 '<div class="session-meta">' +
-                  modeBadge +
-                  '<span>' + escapeHtml(modeName) + '</span>' +
                   '<span class="session-status ' + metaStatusClass + '">' + escapeHtml(metaStatus) + '</span>' +
-                  sessionIdDisplay +
-                  recoveryHint +
+                  badgesHtml +
+                  recoveryHtml +
                 '</div>' +
               '</div>' +
               actionsHtml +
@@ -2819,6 +2723,8 @@
                 '<p class="field-hint">留空则使用上方目录，支持路径自动补全。</p>' +
                 '<div id="recent-paths-bubbles" class="recent-paths-bubbles"></div>' +
               '</div>' +
+            '</div>' +
+            '<div class="modal-footer">' +
               '<button id="run-button" class="btn btn-primary btn-block">启动会话</button>' +
               '<p id="modal-error" class="error-message hidden"></p>' +
             '</div>' +
@@ -2827,11 +2733,53 @@
       }
 
       // Global toggle function for tool card headers — called via onclick attribute
+      // Lazy-load tool content for truncated results
+      function __fetchToolContent(toolUseId, callback) {
+        if (!state.selectedId || !toolUseId) return;
+        var cacheKey = state.selectedId + ":" + toolUseId;
+        if (state.toolContentCache[cacheKey]) {
+          callback(null, state.toolContentCache[cacheKey]);
+          return;
+        }
+        fetch("/api/sessions/" + encodeURIComponent(state.selectedId) + "/tool-content/" + encodeURIComponent(toolUseId), { credentials: "same-origin" })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data.error) {
+              callback(data.error, null);
+            } else {
+              state.toolContentCache[cacheKey] = data;
+              callback(null, data);
+            }
+          })
+          .catch(function() {
+            callback("加载失败", null);
+          });
+      }
+
       window.__tcToggle = function(e, headerEl) {
         var card = headerEl.closest(".tool-use-card");
         if (card) {
+          var wasCollapsed = card.classList.contains("collapsed");
           card.classList.toggle("collapsed");
           persistElementExpandState(card, "tool-card");
+          // Lazy-load truncated content on expand
+          if (wasCollapsed && card.dataset.truncated === "true" && card.dataset.loaded !== "true") {
+            var toolUseId = card.dataset.toolUseId;
+            var resultDiv = card.querySelector(".tool-use-result");
+            if (resultDiv) resultDiv.innerHTML = '<div class="tool-content-loading">加载中…</div>';
+            card.dataset.loaded = "loading";
+            __fetchToolContent(toolUseId, function(err, data) {
+              if (err) {
+                if (resultDiv) resultDiv.innerHTML = '<div class="tool-content-error" onclick="__tcToggle(null, card.querySelector(\'.tool-use-header\'))">加载失败，点击重试</div>';
+                card.dataset.loaded = "";
+              } else {
+                card.dataset.truncated = "false";
+                card.dataset.loaded = "true";
+                var content = typeof data.content === "string" ? data.content : JSON.stringify(data.content);
+                if (resultDiv) resultDiv.innerHTML = '<pre class="tool-use-result-content">' + escapeHtml(content) + '</pre>';
+              }
+            });
+          }
         }
         if (e) { e.preventDefault(); e.stopPropagation(); }
       };
@@ -2870,6 +2818,24 @@
             statusSpan.textContent = "✓";
           }
         }
+        // Lazy-load truncated content on expand
+        if (expanded && el.dataset.truncated === "true" && el.dataset.loaded !== "true") {
+          var toolUseId = el.dataset.toolUseId;
+          if (body) body.innerHTML = '<div class="tool-content-loading">加载中…</div>';
+          el.dataset.loaded = "loading";
+          __fetchToolContent(toolUseId, function(err, data) {
+            if (err) {
+              if (body) body.innerHTML = '<div class="tool-content-error">加载失败，点击重试</div>';
+              el.dataset.loaded = "";
+            } else {
+              el.dataset.truncated = "false";
+              el.dataset.loaded = "true";
+              var content = typeof data.content === "string" ? data.content : JSON.stringify(data.content);
+              el.dataset.result = content;
+              if (body) body.innerHTML = '<div class="inline-tool-result">' + formatInlineResult(content, "") + '</div>';
+            }
+          });
+        }
         persistElementExpandState(el, "inline-tool");
       };
       // Toggle function for terminal tool blocks
@@ -2884,7 +2850,32 @@
           var toggleIcon = el.querySelector(".term-toggle-icon");
           if (toggleIcon) toggleIcon.textContent = isHidden ? "▼" : "▶";
           persistElementExpandState(container, "terminal");
-        }
+          // Lazy-load truncated content on expand
+          if (isHidden && container.dataset.truncated === "true" && container.dataset.loaded !== "true") {
+            var toolUseId = container.dataset.toolUseId;
+            var termOutput = body.querySelector(".term-output");
+            if (termOutput) termOutput.innerHTML = '<div class="tool-content-loading">加载中…</div>';
+            container.dataset.loaded = "loading";
+            __fetchToolContent(toolUseId, function(err, data) {
+              if (err) {
+                if (termOutput) termOutput.innerHTML = '<div class="tool-content-error">加载失败，点击重试</div>';
+                container.dataset.loaded = "";
+              } else {
+                container.dataset.truncated = "false";
+                container.dataset.loaded = "true";
+                var content = typeof data.content === "string" ? data.content : JSON.stringify(data.content);
+                if (termOutput) {
+                  var lines = content.split("\n");
+                  var html = "";
+                  for (var i = 0; i < lines.length; i++) {
+                    if (!lines[i] && i === lines.length - 1) continue;
+                    html += '<div class="term-line">' + escapeHtml(lines[i]) + '</div>';
+                  }
+                  termOutput.innerHTML = html;
+                }
+              }
+            });
+          }
       };
       // Update streaming thinking content (called from WebSocket handler)
       function updateStreamingThinking(text) {
@@ -2901,33 +2892,85 @@
           }
         }
       }
-      // Global handler for ask-user option buttons — called via onclick
-      window.__askOption = function(btnEl) {
-        var optionLabel = btnEl.dataset.optionLabel;
-        if (optionLabel && state.selectedId) {
-          btnEl.classList.add("selected");
-          // Only disable options within the same question group, not globally
-          var questionGroup = btnEl.closest(".ask-user-question-group");
-          if (questionGroup) {
-            questionGroup.querySelectorAll(".ask-user-option").forEach(function(opt) {
-              opt.classList.add("selected");
-              opt.style.pointerEvents = "none";
-            });
-            var sentDiv = document.createElement("div");
-            sentDiv.className = "ask-user-answer-sent";
-            sentDiv.innerHTML = "\u2713 \u5df2\u53d1\u9001: " + escapeHtml(optionLabel);
-            questionGroup.appendChild(sentDiv);
-          }
-          fetch("/api/sessions/" + state.selectedId + "/input", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            credentials: "same-origin",
-            body: JSON.stringify({ input: optionLabel + "\n", view: state.currentView })
-          }).catch(function(err) {
-            console.error("[wand] Error sending answer:", err);
+      // ── AskUserQuestion handlers: select → render → submit ──
+      window.__askSelect = function(toolUseId, qIdx, optIdx, isMulti) {
+        var sel = state.askUserSelections[toolUseId];
+        if (!sel) {
+          sel = { submitted: false };
+          state.askUserSelections[toolUseId] = sel;
+        }
+        if (sel.submitted) return;
+        var current = sel[qIdx] || [];
+        if (isMulti) {
+          var pos = current.indexOf(optIdx);
+          if (pos === -1) { current.push(optIdx); } else { current.splice(pos, 1); }
+        } else {
+          current = current[0] === optIdx ? [] : [optIdx];
+        }
+        sel[qIdx] = current;
+        window.__askRender(toolUseId);
+      };
+
+      window.__askRender = function(toolUseId) {
+        var card = document.querySelector('[data-tool-use-id="' + toolUseId + '"]');
+        if (!card) return;
+        var sel = state.askUserSelections[toolUseId] || {};
+        // Update option selected states
+        card.querySelectorAll(".ask-user-option").forEach(function(btn) {
+          var qIdx = parseInt(btn.dataset.questionIndex, 10);
+          var oIdx = parseInt(btn.dataset.optionIndex, 10);
+          var chosen = (sel[qIdx] || []).indexOf(oIdx) !== -1;
+          btn.classList.toggle("selected", chosen);
+        });
+        // Update submit button: enabled only when every question has at least one selection
+        var submitBtn = card.querySelector(".ask-user-submit");
+        if (submitBtn) {
+          var groups = card.querySelectorAll(".ask-user-question-group");
+          var allAnswered = true;
+          groups.forEach(function(g, i) {
+            if (!sel[i] || sel[i].length === 0) allAnswered = false;
           });
+          submitBtn.disabled = !allAnswered || !!sel.submitted;
+          if (sel.submitted) {
+            submitBtn.textContent = "已提交...";
+            submitBtn.classList.add("ask-user-submitted");
+          }
         }
       };
+
+      window.__askSubmit = function(toolUseId) {
+        var sel = state.askUserSelections[toolUseId];
+        if (!sel || sel.submitted || !state.selectedId) return;
+        var card = document.querySelector('[data-tool-use-id="' + toolUseId + '"]');
+        if (!card) return;
+        var groups = card.querySelectorAll(".ask-user-question-group");
+        var lines = [];
+        var allAnswered = true;
+        groups.forEach(function(group, qIdx) {
+          var selected = sel[qIdx] || [];
+          if (selected.length === 0) { allAnswered = false; return; }
+          var labels = [];
+          selected.forEach(function(optIdx) {
+            var btn = group.querySelector('[data-option-index="' + optIdx + '"]');
+            if (btn) labels.push(btn.dataset.optionLabel);
+          });
+          lines.push(labels.join(", "));
+        });
+        if (!allAnswered) return;
+        sel.submitted = true;
+        window.__askRender(toolUseId);
+        var answerText = lines.join("\n");
+        fetch("/api/sessions/" + state.selectedId + "/input", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify({ input: answerText + "\n", view: state.currentView })
+        }).catch(function(err) {
+          console.error("[wand] Error sending answer:", err);
+          sel.submitted = false;
+          window.__askRender(toolUseId);
+        });
+      };
       function attachEventListeners() {
 
         var loginButton = document.getElementById("login-button");
@@ -3093,20 +3136,86 @@
         });
         var savePassBtn = document.getElementById("save-password-button");
         if (savePassBtn) savePassBtn.addEventListener("click", savePassword);
-        bindSettingsModalEvents();
+        // Settings tab clicks
+        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 saveConfigBtn = document.getElementById("save-config-button");
+        if (saveConfigBtn) saveConfigBtn.addEventListener("click", saveConfigSettings);
+        var saveDisplayBtn = document.getElementById("save-display-button");
+        if (saveDisplayBtn) saveDisplayBtn.addEventListener("click", saveDisplaySettings);
+        // App icon picker (APK only)
+        var appIconPicker = document.getElementById("app-icon-picker");
+        if (appIconPicker) {
+          var appIconOpts = appIconPicker.querySelectorAll(".app-icon-option");
+          for (var ai = 0; ai < appIconOpts.length; ai++) {
+            appIconOpts[ai].addEventListener("click", function() {
+              var iconName = this.getAttribute("data-icon");
+              if (!iconName || typeof WandNative === "undefined" || typeof WandNative.setAppIcon !== "function") return;
+              try {
+                WandNative.setAppIcon(iconName);
+                _updateAppIconSelection(iconName);
+                var msgEl = document.getElementById("app-icon-message");
+                if (msgEl) {
+                  msgEl.textContent = "图标已切换，返回桌面后生效";
+                  msgEl.style.color = "var(--success)";
+                  msgEl.classList.remove("hidden");
+                  setTimeout(function() { msgEl.classList.add("hidden"); }, 3000);
+                }
+              } catch (_e) {}
+            });
+          }
+        }
         var uploadCertBtn = document.getElementById("upload-cert-button");
         if (uploadCertBtn) uploadCertBtn.addEventListener("click", uploadCertificates);
         var checkUpdateBtn = document.getElementById("check-update-button");
         if (checkUpdateBtn) checkUpdateBtn.addEventListener("click", checkForUpdate);
         var doUpdateBtn = document.getElementById("do-update-button");
         if (doUpdateBtn) doUpdateBtn.addEventListener("click", performUpdate);
-        // Notification test section
+        var doRestartBtn = document.getElementById("do-restart-button");
+        if (doRestartBtn) doRestartBtn.addEventListener("click", performSettingsRestart);
+        var copyConnectCodeBtn = document.getElementById("copy-connect-code-button");
+        if (copyConnectCodeBtn) copyConnectCodeBtn.addEventListener("click", function() {
+          var text = document.getElementById("android-connect-code");
+          if (text) copyToClipboard(text.textContent, copyConnectCodeBtn);
+        });
+        // Notification preferences
+        var notifSoundEl = document.getElementById("cfg-notif-sound");
+        if (notifSoundEl) {
+          notifSoundEl.checked = state.notifSound;
+          notifSoundEl.addEventListener("change", function() {
+            state.notifSound = notifSoundEl.checked;
+            try { localStorage.setItem("wand-notif-sound", String(state.notifSound)); } catch (e) {}
+            // Preview sound when toggling on
+            if (state.notifSound) _doPlaySound();
+          });
+        }
+        var notifBubbleEl = document.getElementById("cfg-notif-bubble");
+        if (notifBubbleEl) {
+          notifBubbleEl.checked = state.notifBubble;
+          notifBubbleEl.addEventListener("change", function() {
+            state.notifBubble = notifBubbleEl.checked;
+            try { localStorage.setItem("wand-notif-bubble", String(state.notifBubble)); } catch (e) {}
+          });
+        }
+        // Browser notification section
         var notifRequestBtn = document.getElementById("notification-request-btn");
         if (notifRequestBtn) notifRequestBtn.addEventListener("click", function() {
-          if (typeof Notification !== "undefined") {
+          if (_hasNativeBridge) {
+            window._onNativePermissionResult = function() {
+              updateNotificationStatus();
+              delete window._onNativePermissionResult;
+            };
+            try { WandNative.requestPermission(); } catch (_e) {}
+          } else if (typeof Notification !== "undefined") {
             Notification.requestPermission().then(function() { updateNotificationStatus(); });
           }
         });
+        var notifResetBtn = document.getElementById("notification-reset-btn");
+        if (notifResetBtn) notifResetBtn.addEventListener("click", resetNotificationPermission);
         var notifTestBtn = document.getElementById("notification-test-btn");
         if (notifTestBtn) notifTestBtn.addEventListener("click", testNotification);
         updateNotificationStatus();
@@ -3169,11 +3278,6 @@
           inputBox.addEventListener("blur", handleInputBoxBlur);
         }
 
-        // View toggle handlers
-        var viewTermBtn = document.getElementById("view-terminal-btn");
-        if (viewTermBtn) viewTermBtn.addEventListener("click", function() { setView("terminal"); });
-        var viewChatBtn = document.getElementById("view-chat-btn");
-        if (viewChatBtn) viewChatBtn.addEventListener("click", function() { setView("chat"); });
         // Terminal interactive toggle (both topbar and terminal-header)
         var terminalInteractiveToggles = ["terminal-interactive-toggle-top"];
         terminalInteractiveToggles.forEach(function(id) {
@@ -3190,8 +3294,15 @@
         if (shortcutsToggleBtn) shortcutsToggleBtn.addEventListener("click", function(e) {
           e.stopPropagation();
           state.shortcutsExpanded = !state.shortcutsExpanded;
-          persistShortcutsExpandedState();
-          updateCollapsedShortcutsUi();
+          var wrap = document.querySelector(".inline-shortcuts-wrap");
+          var toggle = document.querySelector(".shortcuts-toggle");
+          var row = document.querySelector(".inline-shortcuts-expanded-row");
+          if (wrap) wrap.classList.toggle("expanded", state.shortcutsExpanded);
+          if (row) row.classList.toggle("visible", state.shortcutsExpanded);
+          if (toggle) {
+            toggle.classList.toggle("active", state.shortcutsExpanded);
+            toggle.textContent = state.shortcutsExpanded ? "\u203a" : "\u2039";
+          }
         });
         // Close shortcuts strip on outside click
         document.addEventListener("click", function(e) {
@@ -3201,8 +3312,13 @@
           var clickedInsideRow = expandedRow && expandedRow.contains(e.target);
           if (wrap && !wrap.contains(e.target) && !clickedInsideRow) {
             state.shortcutsExpanded = false;
-            persistShortcutsExpandedState();
-            updateCollapsedShortcutsUi();
+            wrap.classList.remove("expanded");
+            if (expandedRow) expandedRow.classList.remove("visible");
+            var toggle = document.querySelector(".shortcuts-toggle");
+            if (toggle) {
+              toggle.classList.remove("active");
+              toggle.textContent = "\u2039";
+            }
           }
         });
 
@@ -3681,7 +3797,6 @@
           event.preventDefault();
           event.stopPropagation();
           state.claudeHistoryExpanded = !state.claudeHistoryExpanded;
-          persistHistoryPanelState();
           if (state.claudeHistoryExpanded && !state.claudeHistoryLoaded) {
             loadClaudeHistory();
           }
@@ -3851,6 +3966,8 @@
         if (button) {
           button.classList.toggle("visible", shouldShow);
         }
+        var termContainer = document.getElementById("output");
+        if (termContainer) termContainer.classList.toggle("has-jump-btn", shouldShow);
       }
 
       function isTerminalNearBottom() {
@@ -4353,7 +4470,7 @@
         })
         .then(function(res) { return res.json(); })
         .then(function(config) {
-          applySettingsConfig(config);
+          state.config = config;
           var statusDot = document.getElementById("status-dot");
           var statusText = document.getElementById("status-text");
           if (statusDot) statusDot.classList.add("active");
@@ -4391,16 +4508,9 @@
         state.sessions = [];
         state.claudeHistory = [];
         state.claudeHistoryLoaded = false;
-        state.claudeHistoryExpanded = getConfiguredPanelDefaults().claudeHistoryExpanded;
-        persistHistoryPanelState();
+        state.claudeHistoryExpanded = true;
         state.claudeHistoryExpandedDirs = {};
-        state.sessionsDrawerOpen = getConfiguredPanelDefaults().sessionsDrawerOpen;
-        persistDrawerState();
-        state.filePanelOpen = getConfiguredPanelDefaults().filePanelOpen;
-        persistFilePanelState();
-        state.shortcutsExpanded = getConfiguredPanelDefaults().shortcutsExpanded;
-        persistShortcutsExpandedState();
-        updateCollapsedShortcutsUi();
+        state.sessionsDrawerOpen = false;
         render();
       }
 
@@ -4588,9 +4698,6 @@
 
       function applyCurrentView() {
         var hasSession = !!state.selectedId;
-        var terminalBtn = document.getElementById("view-terminal-btn");
-        var chatBtn = document.getElementById("view-chat-btn");
-        var toggleBar = document.getElementById("view-toggle-bar");
         var terminalContainer = document.getElementById("output");
         var chatContainer = document.getElementById("chat-output");
         var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
@@ -4603,17 +4710,6 @@
           state.currentView = "terminal";
         }
 
-        if (toggleBar) {
-          toggleBar.classList.toggle("hidden", !hasSession);
-        }
-        if (terminalBtn) {
-          terminalBtn.classList.toggle("hidden", structured || !hasSession);
-          terminalBtn.classList.toggle("active", showTerminal);
-        }
-        if (chatBtn) {
-          chatBtn.classList.toggle("hidden", !hasSession);
-          chatBtn.classList.toggle("active", showChat);
-        }
         if (terminalContainer) {
           terminalContainer.classList.toggle("active", showTerminal);
           terminalContainer.classList.toggle("hidden", !showTerminal);
@@ -4888,6 +4984,15 @@
           });
       }
 
+      var _sessionListUpdateTimer = null;
+      function scheduleSessionListUpdate() {
+        if (_sessionListUpdateTimer) return;
+        _sessionListUpdateTimer = setTimeout(function() {
+          _sessionListUpdateTimer = null;
+          updateSessionsList();
+        }, 200);
+      }
+
       function updateSessionsList() {
         var listEl = document.getElementById("sessions-list");
         var countEl = document.getElementById("session-count");
@@ -5016,6 +5121,8 @@
         }
         state.selectedId = id;
         persistSelectedId();
+        // Clear tool content cache on session switch
+        state.toolContentCache = {};
         // Clear queued inputs from the previous session to prevent cross-session leaks
         state.messageQueue = [];
         state.pendingMessages = [];
@@ -5066,10 +5173,11 @@
 
       function toggleSessionsDrawer() {
         state.sessionsDrawerOpen = !state.sessionsDrawerOpen;
-        persistDrawerState();
         if (state.sessionsDrawerOpen && isMobileLayout()) {
           state.filePanelOpen = false;
-          persistFilePanelState();
+          try {
+            localStorage.setItem("wand-file-panel-open", "false");
+          } catch (e) {}
         }
         updateLayoutState();
       }
@@ -5078,7 +5186,6 @@
         if (!state.sessionsDrawerOpen) return;
         closeSwipedItem();
         state.sessionsDrawerOpen = false;
-        persistDrawerState();
         updateLayoutState();
       }
 
@@ -5323,7 +5430,6 @@
       function openSettingsModal() {
         // Close session modal first if open (mutual exclusion)
         closeSessionModal();
-        refreshSettingsModalUi();
         var modal = document.getElementById("settings-modal");
         if (modal) {
           modal.classList.remove("hidden");
@@ -5334,9 +5440,20 @@
           if (confirmEl) confirmEl.value = "";
           hideSettingsMessages();
           setupFocusTrap(modal);
-          bindSettingsModalEvents();
+          // Activate first tab
           switchSettingsTab("about");
+          // Load settings data
           loadSettingsData();
+          // Sync notification preferences
+          var soundEl = document.getElementById("cfg-notif-sound");
+          var bubbleEl = document.getElementById("cfg-notif-bubble");
+          if (soundEl) soundEl.checked = state.notifSound;
+          if (bubbleEl) bubbleEl.checked = state.notifBubble;
+          updateNotificationStatus();
+          // Load current app icon selection (APK only)
+          if (typeof WandNative !== "undefined" && typeof WandNative.getAppIcon === "function") {
+            try { _updateAppIconSelection(WandNative.getAppIcon() || "shorthair"); } catch (_e) {}
+          }
         }
       }
 
@@ -5426,138 +5543,273 @@
             panels[j].classList.remove("active");
           }
         }
-        updateSettingsActiveNav();
       }
 
-      function refreshSettingsGeneralPanel() {
-        var existingPanel = document.getElementById("settings-tab-general");
-        if (!existingPanel) return;
-        var wrapper = document.createElement("div");
-        wrapper.innerHTML = buildSettingsGeneralPanel();
-        var nextPanel = wrapper.firstChild;
-        if (!nextPanel) return;
-        existingPanel.replaceWith(nextPanel);
-        var saveConfigBtn = document.getElementById("save-config-button");
-        if (saveConfigBtn) saveConfigBtn.addEventListener("click", saveConfigSettings);
-        syncPanelStateSettingsForm();
+      function copyToClipboard(text, triggerBtn) {
+        if (!text) return;
+        navigator.clipboard.writeText(text).then(function() {
+          if (triggerBtn) {
+            var orig = triggerBtn.textContent;
+            triggerBtn.textContent = "已复制";
+            setTimeout(function() { triggerBtn.textContent = orig; }, 1500);
+          }
+        }).catch(function() {
+          // Fallback for non-secure contexts
+          var ta = document.createElement("textarea");
+          ta.value = text;
+          ta.style.position = "fixed";
+          ta.style.opacity = "0";
+          document.body.appendChild(ta);
+          ta.select();
+          document.execCommand("copy");
+          document.body.removeChild(ta);
+          if (triggerBtn) {
+            var orig = triggerBtn.textContent;
+            triggerBtn.textContent = "已复制";
+            setTimeout(function() { triggerBtn.textContent = orig; }, 1500);
+          }
+        });
       }
 
-      function bindSettingsTabEvents() {
-        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"));
-          });
+      function formatBytes(value) {
+        if (typeof value !== "number" || !isFinite(value) || value < 0) return "-";
+        if (value < 1024) return value + " B";
+        var units = ["KB", "MB", "GB", "TB"];
+        var size = value / 1024;
+        var unitIndex = 0;
+        while (size >= 1024 && unitIndex < units.length - 1) {
+          size = size / 1024;
+          unitIndex += 1;
         }
+        var display = size >= 10 ? size.toFixed(0) : size.toFixed(1);
+        return display + " " + units[unitIndex];
       }
 
-      function bindSettingsConfigActions() {
-        var saveConfigBtn = document.getElementById("save-config-button");
-        if (saveConfigBtn) saveConfigBtn.addEventListener("click", saveConfigSettings);
-      }
+      function loadSettingsData() {
+        fetch("/api/settings", { credentials: "same-origin" })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            // About
+            var nameEl = document.getElementById("settings-pkg-name");
+            var verEl = document.getElementById("settings-version");
+            var nodeEl = document.getElementById("settings-node-req");
+            var repoEl = document.getElementById("settings-repo-url");
+            if (nameEl) nameEl.textContent = data.packageName || "-";
+            if (verEl) verEl.textContent = data.version || "-";
+            if (nodeEl) nodeEl.textContent = data.nodeVersion || "-";
+            if (repoEl && data.repoUrl) {
+              repoEl.innerHTML = '<a href="' + escapeHtml(data.repoUrl) + '" target="_blank" rel="noopener">' + escapeHtml(data.repoUrl) + '</a>';
+            }
+
+            // Prefill update info if available
+            var latestEl = document.getElementById("settings-latest-version");
+            var updateBtn = document.getElementById("do-update-button");
+            if (data.latestVersion && latestEl) {
+              latestEl.textContent = data.latestVersion;
+              if (data.updateAvailable && updateBtn) {
+                updateBtn.classList.remove("hidden");
+              }
+            }
 
-      function bindSettingsModalEvents() {
-        bindSettingsTabEvents();
-        bindSettingsConfigActions();
-      }
+            // ── Android APK version display ──
+            var apkSection = document.getElementById("android-apk-section");
+            var apkCurrentRow = document.getElementById("android-apk-current-row");
+            var apkCurrentEl = document.getElementById("settings-android-apk-current");
+            var apkGithubRow = document.getElementById("android-apk-github-row");
+            var apkGithubEl = document.getElementById("settings-android-apk-github");
+            var apkGithubBtn = document.getElementById("download-github-apk-btn");
+            var apkLocalRow = document.getElementById("android-apk-local-row");
+            var apkLocalEl = document.getElementById("settings-android-apk-local");
+            var apkLocalBtn = document.getElementById("download-local-apk-btn");
+            var apkMessageEl = document.getElementById("android-apk-message");
+            var androidApk = data.androidApk || {};
+            var isInApk = !!_apkVersion;
+
+            if (isInApk) {
+              // ── APK 内模式：显示当前版本 + 线上版本 + 本地版本 ──
+              if (apkCurrentRow && apkCurrentEl) {
+                apkCurrentEl.textContent = "v" + _apkVersion;
+                apkCurrentRow.classList.remove("hidden");
+              }
+              // 线上版本
+              if (androidApk.github && apkGithubRow && apkGithubEl) {
+                var ghLabel = androidApk.github.version ? ("v" + androidApk.github.version) : androidApk.github.fileName;
+                if (typeof androidApk.github.size === "number") ghLabel += " · " + formatBytes(androidApk.github.size);
+                apkGithubEl.textContent = ghLabel;
+                apkGithubRow.classList.remove("hidden");
+                if (apkGithubBtn) {
+                  apkGithubBtn.textContent = "下载安装";
+                  apkGithubBtn.classList.remove("hidden");
+                  apkGithubBtn.onclick = function() {
+                    try {
+                      WandNative.downloadUpdate(androidApk.github.downloadUrl, androidApk.github.fileName || "wand-update.apk", "github");
+                    } catch (e) {
+                      alert("调用下载失败: " + e.message);
+                    }
+                  };
+                }
+              }
+              // 本地版本
+              if (androidApk.local && apkLocalRow && apkLocalEl) {
+                var lcLabel = androidApk.local.version ? ("v" + androidApk.local.version) : androidApk.local.fileName;
+                if (typeof androidApk.local.size === "number") lcLabel += " · " + formatBytes(androidApk.local.size);
+                apkLocalEl.textContent = lcLabel;
+                apkLocalRow.classList.remove("hidden");
+                if (apkLocalBtn) {
+                  apkLocalBtn.textContent = "下载安装";
+                  apkLocalBtn.classList.remove("hidden");
+                  apkLocalBtn.onclick = function() {
+                    try {
+                      WandNative.downloadUpdate(androidApk.local.downloadUrl, androidApk.local.fileName || "wand-update.apk", "local");
+                    } catch (e) {
+                      alert("调用下载失败: " + e.message);
+                    }
+                  };
+                }
+              }
+              // 都没有时
+              if (!androidApk.github && !androidApk.local && apkMessageEl) {
+                apkMessageEl.textContent = "暂无可用更新";
+                apkMessageEl.classList.remove("hidden");
+              }
+            } else {
+              // ── 浏览器模式：只显示线上版本 + 下载按钮 ──
+              if (androidApk.github && apkGithubRow && apkGithubEl) {
+                var ghLabel2 = androidApk.github.version ? ("v" + androidApk.github.version) : androidApk.github.fileName;
+                if (typeof androidApk.github.size === "number") ghLabel2 += " · " + formatBytes(androidApk.github.size);
+                apkGithubEl.textContent = ghLabel2;
+                apkGithubRow.classList.remove("hidden");
+                if (apkGithubBtn) {
+                  apkGithubBtn.textContent = "下载";
+                  apkGithubBtn.classList.remove("hidden");
+                  apkGithubBtn.onclick = function() {
+                    window.open(androidApk.github.downloadUrl, "_blank");
+                  };
+                }
+              } else if (apkMessageEl) {
+                apkMessageEl.textContent = "暂未提供";
+                apkMessageEl.classList.remove("hidden");
+              }
+            }
 
-      function refreshSettingsModalUi() {
-        refreshSettingsGeneralPanel();
-        updateSettingsActiveNav();
+            // App connect code (encrypted)
+            var connectCodeEl = document.getElementById("android-connect-code");
+            if (connectCodeEl) {
+              connectCodeEl.textContent = "加载中...";
+              fetch("/api/app-connect-code").then(function(r) { return r.json(); }).then(function(d) {
+                if (d.code) connectCodeEl.textContent = d.code;
+                else connectCodeEl.textContent = "生成失败";
+              }).catch(function() { connectCodeEl.textContent = "获取失败"; });
+            }
+
+            // Config fields
+            var cfg = data.config || {};
+            var hostEl = document.getElementById("cfg-host");
+            var portEl = document.getElementById("cfg-port");
+            var httpsEl = document.getElementById("cfg-https");
+            var modeEl = document.getElementById("cfg-mode");
+            var cwdEl = document.getElementById("cfg-cwd");
+            var shellEl = document.getElementById("cfg-shell");
+            if (hostEl) hostEl.value = cfg.host || "";
+            if (portEl) portEl.value = cfg.port || "";
+            if (httpsEl) httpsEl.checked = cfg.https === true;
+            if (modeEl) modeEl.value = cfg.defaultMode || "default";
+            if (cwdEl) cwdEl.value = cfg.defaultCwd || "";
+            if (shellEl) shellEl.value = cfg.shell || "";
+            var langEl = document.getElementById("cfg-language");
+            if (langEl) langEl.value = cfg.language || "";
+
+            // Cert status
+            var certStatus = document.getElementById("cert-status");
+            if (certStatus) {
+              certStatus.textContent = data.hasCert ? "已安装 SSL 证书" : "未安装证书（使用自签名或 HTTP）";
+              certStatus.style.color = data.hasCert ? "var(--success)" : "var(--text-secondary)";
+            }
+
+            // Presets
+            var presetsList = document.getElementById("presets-list");
+            if (presetsList && cfg.commandPresets) {
+              var html = "";
+              for (var i = 0; i < cfg.commandPresets.length; i++) {
+                var p = cfg.commandPresets[i];
+                html += '<div class="preset-item">' +
+                  '<span class="preset-label">' + escapeHtml(p.label) + '</span>' +
+                  '<span class="preset-detail">' + escapeHtml(p.command) + (p.mode ? ' (' + escapeHtml(p.mode) + ')' : '') + '</span>' +
+                '</div>';
+              }
+              if (!html) html = '<div class="empty-state-compact"><span class="empty-icon">\u2699</span><span>\u6ca1\u6709\u547d\u4ee4\u9884\u8bbe</span><span class="hint">\u5728 config.json \u7684 commandPresets \u4e2d\u914d\u7f6e</span></div>';
+              presetsList.innerHTML = html;
+            }
+
+            // Card expand defaults
+            var cd = cfg.cardDefaults || {};
+            var cdEditEl = document.getElementById("cfg-card-edit");
+            var cdInlineEl = document.getElementById("cfg-card-inline");
+            var cdTerminalEl = document.getElementById("cfg-card-terminal");
+            var cdThinkingEl = document.getElementById("cfg-card-thinking");
+            var cdToolgroupEl = document.getElementById("cfg-card-toolgroup");
+            if (cdEditEl) cdEditEl.checked = cd.editCards === true;
+            if (cdInlineEl) cdInlineEl.checked = cd.inlineTools === true;
+            if (cdTerminalEl) cdTerminalEl.checked = cd.terminal === true;
+            if (cdThinkingEl) cdThinkingEl.checked = cd.thinking === true;
+            if (cdToolgroupEl) cdToolgroupEl.checked = cd.toolGroup === true;
+          })
+          .catch(function() {});
       }
 
-      function normalizePanelStateSettings(cfg) {
-        var panelState = cfg && cfg.uiPreferences && cfg.uiPreferences.defaultPanelState;
-        var defaults = getConfiguredPanelDefaults(cfg);
-        return {
-          sessionsDrawerOpen: panelState && typeof panelState.sessionsDrawerOpen === "boolean" ? panelState.sessionsDrawerOpen : defaults.sessionsDrawerOpen,
-          filePanelOpen: panelState && typeof panelState.filePanelOpen === "boolean" ? panelState.filePanelOpen : defaults.filePanelOpen,
-          shortcutsExpanded: panelState && typeof panelState.shortcutsExpanded === "boolean" ? panelState.shortcutsExpanded : defaults.shortcutsExpanded,
-          claudeHistoryExpanded: panelState && typeof panelState.claudeHistoryExpanded === "boolean" ? panelState.claudeHistoryExpanded : defaults.claudeHistoryExpanded,
-          chatMessageExpanded: panelState && typeof panelState.chatMessageExpanded === "boolean" ? panelState.chatMessageExpanded : defaults.chatMessageExpanded,
-          structuredThinkingExpanded: panelState && typeof panelState.structuredThinkingExpanded === "boolean" ? panelState.structuredThinkingExpanded : defaults.structuredThinkingExpanded,
-          structuredToolGroupExpanded: panelState && typeof panelState.structuredToolGroupExpanded === "boolean" ? panelState.structuredToolGroupExpanded : defaults.structuredToolGroupExpanded,
-          structuredInlineToolExpanded: panelState && typeof panelState.structuredInlineToolExpanded === "boolean" ? panelState.structuredInlineToolExpanded : defaults.structuredInlineToolExpanded,
-          structuredTerminalExpanded: panelState && typeof panelState.structuredTerminalExpanded === "boolean" ? panelState.structuredTerminalExpanded : defaults.structuredTerminalExpanded,
-          structuredToolCardExpanded: panelState && typeof panelState.structuredToolCardExpanded === "boolean" ? panelState.structuredToolCardExpanded : defaults.structuredToolCardExpanded,
+      function saveConfigSettings() {
+        var msgEl = document.getElementById("config-message");
+        if (msgEl) { msgEl.classList.add("hidden"); msgEl.textContent = ""; }
+
+        var body = {
+          host: (document.getElementById("cfg-host") || {}).value,
+          port: Number((document.getElementById("cfg-port") || {}).value),
+          https: (document.getElementById("cfg-https") || {}).checked,
+          defaultMode: (document.getElementById("cfg-mode") || {}).value,
+          defaultCwd: (document.getElementById("cfg-cwd") || {}).value,
+          shell: (document.getElementById("cfg-shell") || {}).value,
+          language: (document.getElementById("cfg-language") || {}).value || "",
         };
-      }
 
-      function applyLoadedSettingsData(data) {
-        var cfg = data.config || {};
-        applySettingsConfig(cfg);
-
-        var nameEl = document.getElementById("settings-pkg-name");
-        var verEl = document.getElementById("settings-version");
-        var nodeEl = document.getElementById("settings-node-req");
-        var repoEl = document.getElementById("settings-repo-url");
-        if (nameEl) nameEl.textContent = data.packageName || "-";
-        if (verEl) verEl.textContent = data.version || "-";
-        if (nodeEl) nodeEl.textContent = data.nodeVersion || "-";
-        if (repoEl && data.repoUrl) {
-          repoEl.innerHTML = '<a href="' + escapeHtml(data.repoUrl) + '" target="_blank" rel="noopener">' + escapeHtml(data.repoUrl) + '</a>';
-        }
-
-        var hostEl = document.getElementById("cfg-host");
-        var portEl = document.getElementById("cfg-port");
-        var httpsEl = document.getElementById("cfg-https");
-        var modeEl = document.getElementById("cfg-mode");
-        var cwdEl = document.getElementById("cfg-cwd");
-        var shellEl = document.getElementById("cfg-shell");
-        if (hostEl) hostEl.value = cfg.host || "";
-        if (portEl) portEl.value = cfg.port || "";
-        if (httpsEl) httpsEl.checked = cfg.https === true;
-        if (modeEl) modeEl.value = cfg.defaultMode || "default";
-        if (cwdEl) cwdEl.value = cfg.defaultCwd || "";
-        if (shellEl) shellEl.value = cfg.shell || "";
-        var langEl = document.getElementById("cfg-language");
-        if (langEl) langEl.value = cfg.language || "";
-        syncPanelStateSettingsForm(normalizePanelStateSettings(cfg));
-
-        var certStatus = document.getElementById("cert-status");
-        if (certStatus) {
-          certStatus.textContent = data.hasCert ? "已安装 SSL 证书" : "未安装证书（使用自签名或 HTTP）";
-          certStatus.style.color = data.hasCert ? "var(--success)" : "var(--text-secondary)";
-        }
-
-        var presetsList = document.getElementById("presets-list");
-        if (presetsList && cfg.commandPresets) {
-          var html = "";
-          for (var i = 0; i < cfg.commandPresets.length; i++) {
-            var p = cfg.commandPresets[i];
-            html += '<div class="preset-item">' +
-              '<span class="preset-label">' + escapeHtml(p.label) + '</span>' +
-              '<span class="preset-detail">' + escapeHtml(p.command) + (p.mode ? ' (' + escapeHtml(p.mode) + ')' : '') + '</span>' +
-            '</div>';
+        fetch("/api/settings/config", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify(body)
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          if (msgEl) {
+            if (data.error) {
+              msgEl.textContent = data.error;
+              msgEl.style.color = "var(--error)";
+            } else {
+              msgEl.textContent = "配置已保存，部分更改需要重启后生效。";
+              msgEl.style.color = "var(--success)";
+            }
+            msgEl.classList.remove("hidden");
+          }
+        })
+        .catch(function() {
+          if (msgEl) {
+            msgEl.textContent = "保存失败。";
+            msgEl.style.color = "var(--error)";
+            msgEl.classList.remove("hidden");
           }
-          if (!html) html = '<div class="empty-state-compact"><span class="empty-icon">\u2699</span><span>没有命令预设</span><span class="hint">在 config.json 的 commandPresets 中配置</span></div>';
-          presetsList.innerHTML = html;
-        }
-      }
-
-      function loadSettingsData() {
-        fetch("/api/settings", { credentials: "same-origin" })
-          .then(function(res) { return res.json(); })
-          .then(function(data) {
-            applyLoadedSettingsData(data);
-          })
-          .catch(function() {});
+        });
       }
 
-      function saveConfigSettings() {
-        var msgEl = document.getElementById("config-message");
+      function saveDisplaySettings() {
+        var msgEl = document.getElementById("display-message");
         if (msgEl) { msgEl.classList.add("hidden"); msgEl.textContent = ""; }
 
         var body = {
-          host: (document.getElementById("cfg-host") || {}).value,
-          port: Number((document.getElementById("cfg-port") || {}).value),
-          https: (document.getElementById("cfg-https") || {}).checked,
-          defaultMode: (document.getElementById("cfg-mode") || {}).value,
-          defaultCwd: (document.getElementById("cfg-cwd") || {}).value,
-          shell: (document.getElementById("cfg-shell") || {}).value,
-          language: (document.getElementById("cfg-language") || {}).value || "",
-          uiPreferences: {
-            defaultPanelState: getPanelStateSettingsFormValues(),
+          cardDefaults: {
+            editCards: !!(document.getElementById("cfg-card-edit") || {}).checked,
+            inlineTools: !!(document.getElementById("cfg-card-inline") || {}).checked,
+            terminal: !!(document.getElementById("cfg-card-terminal") || {}).checked,
+            thinking: !!(document.getElementById("cfg-card-thinking") || {}).checked,
+            toolGroup: !!(document.getElementById("cfg-card-toolgroup") || {}).checked,
           }
         };
 
@@ -5574,12 +5826,15 @@
               msgEl.textContent = data.error;
               msgEl.style.color = "var(--error)";
             } else {
-              msgEl.textContent = "配置已保存，部分更改需要重启后生效。";
+              msgEl.textContent = "显示设置已保存";
               msgEl.style.color = "var(--success)";
-              handleSettingsConfigSaved(data.config);
             }
             msgEl.classList.remove("hidden");
           }
+          // Update local config so card defaults take effect immediately
+          if (!data.error && state.config) {
+            state.config.cardDefaults = body.cardDefaults;
+          }
         })
         .catch(function() {
           if (msgEl) {
@@ -5590,7 +5845,6 @@
         });
       }
 
-
       function uploadCertificates() {
         var keyFile = document.getElementById("cert-key-file");
         var certFile = document.getElementById("cert-cert-file");
@@ -5699,7 +5953,7 @@
         .then(function(res) { return res.json(); })
         .then(function(data) {
           if (msgEl) {
-            msgEl.textContent = data.message || data.error || "更新完成。";
+            msgEl.textContent = data.message || data.error || "\u66f4\u65b0\u5b8c\u6210\u3002";
             msgEl.style.color = data.error ? "var(--error)" : "var(--success)";
             msgEl.classList.remove("hidden");
           }
@@ -5707,11 +5961,14 @@
             updateBtn.disabled = false;
           } else {
             updateBtn.classList.add("hidden");
+            // Show restart button
+            var restartBtn = document.getElementById("do-restart-button");
+            if (restartBtn) restartBtn.classList.remove("hidden");
           }
         })
         .catch(function() {
           if (msgEl) {
-            msgEl.textContent = "更新失败。";
+            msgEl.textContent = "\u66f4\u65b0\u5931\u8d25\u3002";
             msgEl.style.color = "var(--error)";
             msgEl.classList.remove("hidden");
           }
@@ -5719,101 +5976,224 @@
         });
       }
 
+      function performSettingsRestart() {
+        var restartBtn = document.getElementById("do-restart-button");
+        var msgEl = document.getElementById("update-message");
+        performRestart(restartBtn, msgEl);
+      }
+
       // ── Notification Settings Helpers ──
 
+      function _updateAppIconSelection(activeIcon) {
+        var opts = document.querySelectorAll(".app-icon-option");
+        for (var i = 0; i < opts.length; i++) {
+          var preview = opts[i].querySelector(".app-icon-preview");
+          if (preview) {
+            preview.style.borderColor = opts[i].getAttribute("data-icon") === activeIcon ? "var(--accent)" : "transparent";
+          }
+        }
+      }
+
       function updateNotificationStatus() {
         var statusEl = document.getElementById("notification-permission-status");
         var requestBtn = document.getElementById("notification-request-btn");
+        var resetBtn = document.getElementById("notification-reset-btn");
         var testMsgEl = document.getElementById("notification-test-message");
         if (!statusEl) return;
 
-        if (typeof Notification === "undefined") {
-          statusEl.textContent = "\u4e0d\u652f\u6301";
-          statusEl.style.color = "var(--fg-muted)";
-          if (requestBtn) requestBtn.classList.add("hidden");
-          return;
+        // Determine permission state: native bridge or browser API
+        var perm = _getNativePermission();
+        if (perm === null) {
+          // No native bridge — fall back to browser Notification API
+          if (typeof Notification === "undefined") {
+            statusEl.textContent = "\u4e0d\u652f\u6301";
+            statusEl.style.color = "var(--fg-muted)";
+            if (requestBtn) requestBtn.classList.add("hidden");
+            if (resetBtn) resetBtn.classList.add("hidden");
+            return;
+          }
+          perm = Notification.permission;
         }
 
-        var perm = Notification.permission;
         if (perm === "granted") {
           statusEl.textContent = "\u5df2\u6388\u6743 \u2713";
           statusEl.style.color = "var(--success)";
           if (requestBtn) requestBtn.classList.add("hidden");
+          if (resetBtn) resetBtn.classList.add("hidden");
         } else if (perm === "denied") {
           statusEl.textContent = "\u5df2\u62d2\u7edd";
           statusEl.style.color = "var(--danger)";
           if (requestBtn) requestBtn.classList.add("hidden");
-          if (testMsgEl) {
-            testMsgEl.textContent = "\u6d4f\u89c8\u5668\u5df2\u62d2\u7edd\u901a\u77e5\u6743\u9650\uff0c\u8bf7\u5728\u6d4f\u89c8\u5668\u8bbe\u7f6e\u4e2d\u624b\u52a8\u5f00\u542f";
-            testMsgEl.style.color = "var(--fg-muted)";
-            testMsgEl.classList.remove("hidden");
-          }
+          if (resetBtn) resetBtn.classList.remove("hidden");
         } else {
           statusEl.textContent = "\u672a\u6388\u6743";
           statusEl.style.color = "var(--warning)";
           if (requestBtn) requestBtn.classList.remove("hidden");
+          if (resetBtn) resetBtn.classList.remove("hidden");
+        }
+      }
+
+      function resetNotificationPermission() {
+        var testMsgEl = document.getElementById("notification-test-message");
+
+        // Native bridge path — trigger Android system permission dialog
+        if (_hasNativeBridge) {
+          // Listen for permission result callback from native
+          window._onNativePermissionResult = function(result) {
+            updateNotificationStatus();
+            if (testMsgEl) {
+              if (result === "granted") {
+                testMsgEl.textContent = "\u2713 \u5df2\u6388\u6743";
+                testMsgEl.style.color = "var(--success)";
+              } else {
+                testMsgEl.textContent = "\u2717 \u672a\u6388\u6743\uff0c\u8bf7\u5728\u7cfb\u7edf\u8bbe\u7f6e\u4e2d\u5f00\u542f Wand \u7684\u901a\u77e5\u6743\u9650";
+                testMsgEl.style.color = "var(--danger)";
+              }
+              testMsgEl.classList.remove("hidden");
+            }
+            delete window._onNativePermissionResult;
+          };
+          try { WandNative.requestPermission(); } catch (_e) {}
+          return;
         }
+
+        if (typeof Notification === "undefined") return;
+
+        // Always call requestPermission — this triggers the browser's native
+        // permission dialog when allowed. In "default" state it always works.
+        // In "denied" state, some browsers (newer Chrome) re-prompt, others don't.
+        Notification.requestPermission().then(function(result) {
+          updateNotificationStatus();
+          if (result === "granted") {
+            if (testMsgEl) {
+              testMsgEl.textContent = "\u2713 \u5df2\u6388\u6743";
+              testMsgEl.style.color = "var(--success)";
+              testMsgEl.classList.remove("hidden");
+            }
+          } else if (result === "denied") {
+            // Browser blocked re-prompting — show inline guide with site-settings shortcut
+            if (testMsgEl) {
+              var origin = location.origin;
+              testMsgEl.innerHTML =
+                "\u6d4f\u89c8\u5668\u5df2\u62e6\u622a\u6388\u6743\u5f39\u7a97\uff0c\u8bf7\u624b\u52a8\u91cd\u7f6e\uff1a<br>" +
+                '<span style="display:inline-flex;align-items:center;gap:4px;margin:4px 0">' +
+                  "\u2460 \u70b9\u51fb\u5730\u5740\u680f\u5de6\u4fa7\u7684 " +
+                  '<span style="display:inline-flex;align-items:center;justify-content:center;' +
+                    "width:16px;height:16px;border-radius:50%;border:1px solid var(--border);" +
+                    'font-size:11px;vertical-align:middle">i</span>' +
+                  " \u6216\u9501\u56fe\u6807" +
+                "</span><br>" +
+                "\u2461 \u627e\u5230\u300c\u901a\u77e5\u300d\u2192 \u6539\u4e3a\u300c\u5141\u8bb8\u300d<br>" +
+                "\u2462 \u5237\u65b0\u9875\u9762\u5373\u53ef";
+              testMsgEl.style.color = "var(--fg-muted)";
+              testMsgEl.classList.remove("hidden");
+            }
+          }
+        });
       }
 
       function testNotification() {
         var testMsgEl = document.getElementById("notification-test-message");
+        var results = [];
 
-        // Always show in-app bubble
+        // 1. Test sound playback
+        var soundOk = tryPlayNotificationSound();
+        results.push(soundOk ? "\u2713 \u63d0\u793a\u97f3" : "\u2717 \u63d0\u793a\u97f3\uff08\u65e0\u6cd5\u64ad\u653e\uff09");
+
+        // 2. Test in-app bubble
+        var bubbleEnabled = state.notifBubble;
         showNotificationBubble({
           title: "\u6d4b\u8bd5\u901a\u77e5",
-          body: "\u8fd9\u662f\u4e00\u6761\u6d4b\u8bd5\u901a\u77e5\uff0c\u5e94\u7528\u5185\u6c14\u6ce1\u5df2\u6b63\u5e38\u5de5\u4f5c\u3002",
+          body: "\u8fd9\u662f\u4e00\u6761\u6d4b\u8bd5\u901a\u77e5\u3002",
           type: "info",
           icon: "\u266a",
           duration: 5000,
+          playSound: false, // sound already played above
         });
+        results.push(bubbleEnabled ? "\u2713 \u5e94\u7528\u5185\u6c14\u6ce1" : "\u2013 \u5e94\u7528\u5185\u6c14\u6ce1\uff08\u5df2\u5173\u95ed\uff09");
 
-        // Test browser notification
-        if (typeof Notification === "undefined") {
-          if (testMsgEl) {
-            testMsgEl.textContent = "\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u901a\u77e5 API\uff0c\u4ec5\u53ef\u4f7f\u7528\u5e94\u7528\u5185\u6c14\u6ce1\u901a\u77e5\u3002";
-            testMsgEl.style.color = "var(--fg-muted)";
-            testMsgEl.classList.remove("hidden");
+        // 3. Test system notification (native bridge or browser API)
+        if (_hasNativeBridge) {
+          var nativePerm = _getNativePermission();
+          if (nativePerm === "granted") {
+            try {
+              WandNative.sendNotification("Wand \u6d4b\u8bd5\u901a\u77e5", "\u7cfb\u7edf\u901a\u77e5\u5df2\u6b63\u5e38\u5de5\u4f5c\u3002", "wand-test");
+              results.push("\u2713 \u7cfb\u7edf\u901a\u77e5");
+            } catch (_e) {
+              results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u53d1\u9001\u5931\u8d25\uff09");
+            }
+          } else if (nativePerm === "denied") {
+            results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u5df2\u62d2\u7edd\uff0c\u8bf7\u5728\u7cfb\u7edf\u8bbe\u7f6e\u4e2d\u5f00\u542f\uff09");
+          } else {
+            // "default" — request permission, then report
+            window._onNativePermissionResult = function(result) {
+              updateNotificationStatus();
+              if (result === "granted") {
+                try {
+                  WandNative.sendNotification("Wand \u6d4b\u8bd5\u901a\u77e5", "\u7cfb\u7edf\u901a\u77e5\u5df2\u6b63\u5e38\u5de5\u4f5c\u3002", "wand-test");
+                  results.push("\u2713 \u7cfb\u7edf\u901a\u77e5\uff08\u5df2\u6388\u6743\uff09");
+                } catch (_e2) {
+                  results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u53d1\u9001\u5931\u8d25\uff09");
+                }
+              } else {
+                results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u672a\u6388\u6743\uff09");
+              }
+              showTestResults(testMsgEl, results);
+              delete window._onNativePermissionResult;
+            };
+            try { WandNative.requestPermission(); } catch (_e) {}
+            return; // async — results shown in callback
           }
+          showTestResults(testMsgEl, results);
+          return;
+        }
+
+        if (typeof Notification === "undefined") {
+          results.push("\u2013 \u7cfb\u7edf\u901a\u77e5\uff08\u4e0d\u652f\u6301\uff09");
+          showTestResults(testMsgEl, results);
           return;
         }
 
-        if (Notification.permission === "granted") {
+        var perm = Notification.permission;
+        if (perm === "granted") {
           try {
             var n = new Notification("Wand \u6d4b\u8bd5\u901a\u77e5", {
-              body: "\u6d4f\u89c8\u5668\u901a\u77e5\u5df2\u6b63\u5e38\u5de5\u4f5c\u3002",
+              body: "\u7cfb\u7edf\u901a\u77e5\u5df2\u6b63\u5e38\u5de5\u4f5c\u3002",
               icon: "/favicon.ico",
               tag: "wand-test",
             });
             setTimeout(function() { n.close(); }, 5000);
-            if (testMsgEl) {
-              testMsgEl.textContent = "\u2713 \u6d4f\u89c8\u5668\u901a\u77e5 + \u5e94\u7528\u5185\u6c14\u6ce1\u5747\u5df2\u53d1\u9001";
-              testMsgEl.style.color = "var(--success)";
-              testMsgEl.classList.remove("hidden");
-            }
+            results.push("\u2713 \u7cfb\u7edf\u901a\u77e5");
           } catch (_e) {
-            if (testMsgEl) {
-              testMsgEl.textContent = "\u6d4f\u89c8\u5668\u901a\u77e5\u53d1\u9001\u5931\u8d25\uff0c\u53ef\u80fd\u9700\u8981 HTTPS";
-              testMsgEl.style.color = "var(--warning)";
-              testMsgEl.classList.remove("hidden");
-            }
+            results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u53d1\u9001\u5931\u8d25\uff0c\u53ef\u80fd\u9700\u8981 HTTPS\uff09");
           }
+          showTestResults(testMsgEl, results);
+        } else if (perm === "denied") {
+          results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u5df2\u62d2\u7edd\uff09");
+          showTestResults(testMsgEl, results);
         } else {
-          // permission is "default" or "denied" — always try requesting
+          // "default" — try requesting
           Notification.requestPermission().then(function(result) {
             updateNotificationStatus();
             if (result === "granted") {
-              testNotification();
-            } else if (result === "denied") {
-              if (testMsgEl) {
-                testMsgEl.textContent = "\u6d4f\u89c8\u5668\u5df2\u62d2\u7edd\u901a\u77e5\u6743\u9650\uff0c\u8bf7\u70b9\u51fb\u5730\u5740\u680f\u5de6\u4fa7\u9501\u56fe\u6807\u6216\u5728\u6d4f\u89c8\u5668\u8bbe\u7f6e\u4e2d\u624b\u52a8\u5f00\u542f";
-                testMsgEl.style.color = "var(--fg-muted)";
-                testMsgEl.classList.remove("hidden");
-              }
+              results.push("\u2713 \u7cfb\u7edf\u901a\u77e5\uff08\u5df2\u6388\u6743\uff09");
+            } else {
+              results.push("\u2717 \u7cfb\u7edf\u901a\u77e5\uff08\u672a\u6388\u6743\uff09");
             }
+            showTestResults(testMsgEl, results);
           });
         }
       }
 
+      function showTestResults(el, results) {
+        if (!el) return;
+        el.innerHTML = results.map(function(r) { return escapeHtml(r); }).join("<br>");
+        // color based on whether all passed
+        var allOk = results.every(function(r) { return r.indexOf("\u2713") === 0 || r.indexOf("\u2013") === 0; });
+        el.style.color = allOk ? "var(--success)" : "var(--warning)";
+        el.classList.remove("hidden");
+      }
+
       function quickStartSession() {
         var command = getPreferredTool();
         var defaultCwd = getEffectiveCwd();
@@ -6813,13 +7193,17 @@
           var userMsgs = stripRenderOnlyStructuredMessages(Array.isArray(session.messages) ? session.messages.slice() : []);
           userMsgs.push(userTurn);
           var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
+          // Write optimistic user turn into session.messages so WS updates
+          // that arrive before the HTTP response don't erase it.
           updateSessionSnapshot({
             id: session.id,
             status: "running",
+            messages: userMsgs,
             structuredState: optimisticStructuredState,
           });
           state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
             status: "running",
+            messages: userMsgs,
             structuredState: optimisticStructuredState,
           }), userMsgs);
           updateInputHint("思考中…");
@@ -6832,6 +7216,11 @@
         }
         setDraftValue("");
 
+        // Capture queue epoch before the POST so we can detect whether
+        // a newer WS update has already refreshed the queue by the time
+        // the HTTP response arrives.
+        var epochBeforePost = state.queueEpoch;
+
         return fetch("/api/structured-sessions/" + state.selectedId + "/messages", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -6844,13 +7233,21 @@
             throw new Error(snapshot.error);
           }
           if (snapshot && snapshot.id) {
+            // If a WS update has already bumped the queue epoch, the HTTP
+            // response's queuedMessages is stale — drop it to avoid
+            // re-introducing already-dequeued items.
+            if (state.queueEpoch > epochBeforePost && snapshot.queuedMessages) {
+              delete snapshot.queuedMessages;
+            }
             updateSessionSnapshot(snapshot);
             var refreshedSession = state.sessions.find(function(s) { return s.id === snapshot.id; }) || snapshot;
             state.currentMessages = buildMessagesForRender(refreshedSession, getPreferredMessages(refreshedSession, snapshot.output, false));
             renderChat(true);
             if (isQueueing) {
               var queuedCount = getStructuredQueuedInputs(refreshedSession).length;
-              showToast("已排队（第 " + queuedCount + " 条），将在当前消息处理完成后自动发送。", "info");
+              if (queuedCount > 0) {
+                showToast("已排队（第 " + queuedCount + " 条），将在当前消息处理完成后自动发送。", "info");
+              }
             } else {
               updateInputHint("Enter 发送 · Shift+Enter 换行");
             }
@@ -6902,7 +7299,25 @@
         }
         var queued = getStructuredQueuedInputs(session);
         if (queued && queued.length > 0) {
+          // Collect recent user message texts to deduplicate against queued items.
+          // A queued message that already appears as a real user turn should not
+          // be rendered a second time with the "排队中" badge.
+          var existingUserTexts = {};
+          for (var ei = base.length - 1; ei >= 0 && Object.keys(existingUserTexts).length < queued.length + 5; ei--) {
+            var em = base[ei];
+            if (em && em.role === "user" && Array.isArray(em.content)) {
+              for (var ej = 0; ej < em.content.length; ej++) {
+                if (em.content[ej] && em.content[ej].type === "text" && em.content[ej].text) {
+                  existingUserTexts[em.content[ej].text] = (existingUserTexts[em.content[ej].text] || 0) + 1;
+                }
+              }
+            }
+          }
           for (var qi = 0; qi < queued.length; qi++) {
+            if (existingUserTexts[queued[qi]]) {
+              existingUserTexts[queued[qi]]--;
+              continue; // Skip — this queued text is already shown as a real message
+            }
             base.push({ role: "user", content: [{ type: "text", text: queued[qi], __queued: true }] });
           }
         }
@@ -8017,25 +8432,15 @@
 
       function handleInputBoxBlur() {
         resetInputPanelViewportSpacing();
-        // Restore app container height when keyboard closes.
-        // Use a short delay because on iOS the visualViewport may not
-        // have updated yet at the moment blur fires.
         setTimeout(function() {
-          var appContainer = document.querySelector('.app-container');
-          if (appContainer) {
-            // Only clear if keyboard is actually closed now
-            var vv = window.visualViewport;
-            if (vv) {
-              var offsetBottom = window.innerHeight - vv.height - vv.offsetTop;
-              if (offsetBottom <= 50) {
-                appContainer.style.height = '';
-              }
-            } else {
-              appContainer.style.height = '';
-            }
-          }
-          // Scroll the window back to top to fix any residual offset
           window.scrollTo(0, 0);
+          // On mobile, force terminal refit + scroll after keyboard dismissal.
+          // The container height restores but xterm needs an explicit refit to
+          // fill the expanded space, and the scroll position needs resetting.
+          if (isTouchDevice()) {
+            ensureTerminalFit();
+            maybeScrollTerminalToBottom("force");
+          }
         }, 100);
       }
 
@@ -8757,24 +9162,19 @@
           var isKeyboardOpen = offsetBottom > 50;
           var heightChanged = Math.abs(vv.height - lastHeight) > 8;
 
-          // Dynamically resize the app container to match visible viewport.
-          // This is needed because 100dvh does NOT shrink when the keyboard
-          // appears in PWA standalone mode, and on some browsers the layout
-          // viewport doesn't update on keyboard dismiss without this.
-          var appContainer = document.querySelector('.app-container');
-          if (appContainer) {
-            if (isKeyboardOpen) {
-              appContainer.style.height = vv.height + 'px';
-            } else if (keyboardOpen) {
-              // Keyboard just closed — clear forced height
-              appContainer.style.height = '';
-            }
-          }
-
           if (isKeyboardOpen && (!keyboardOpen || heightChanged) && shouldAdjustForKeyboard(vv, inputBox)) {
             syncInputBoxScroll(inputBox);
           }
 
+          // Keyboard just closed — force terminal refit and scroll to bottom
+          // after a delay so the keyboard dismiss animation and layout settle.
+          if (keyboardOpen && !isKeyboardOpen) {
+            setTimeout(function() {
+              ensureTerminalFit();
+              maybeScrollTerminalToBottom("force");
+            }, 200);
+          }
+
           keyboardOpen = isKeyboardOpen;
           lastHeight = vv.height;
         }
@@ -8879,6 +9279,11 @@
         }
         state.resizeHandler = function() { scheduleTerminalResize(true); };
         window.addEventListener("resize", state.resizeHandler);
+        // Also listen to visualViewport resize for pinch-zoom / browser zoom
+        if (window.visualViewport) {
+          state.visualViewportHandler = function() { scheduleTerminalResize(true); };
+          window.visualViewport.addEventListener("resize", state.visualViewportHandler);
+        }
         requestAnimationFrame(function() { scheduleTerminalResize(true); });
       }
 
@@ -8895,6 +9300,10 @@
           window.removeEventListener("resize", state.resizeHandler);
           state.resizeHandler = null;
         }
+        if (state.visualViewportHandler && window.visualViewport) {
+          window.visualViewport.removeEventListener("resize", state.visualViewportHandler);
+          state.visualViewportHandler = null;
+        }
         [["mousemove", "resizeMouseMove"], ["mouseup", "resizeMouseUp"],
          ["touchmove", "resizeTouchMove"], ["touchend", "resizeTouchEnd"]
         ].forEach(function(pair) {
@@ -9027,6 +9436,12 @@
         state.pollTimer = setInterval(refreshAll, 1600);
       }
 
+      // Periodically refresh session time displays (30s)
+      setInterval(function() {
+        var timeEls = document.querySelectorAll(".session-time");
+        if (timeEls.length > 0) scheduleSessionListUpdate();
+      }, 30000);
+
       function initWebSocket() {
         if (!window.WebSocket) return false;
 
@@ -9095,8 +9510,9 @@
               if (msg.data.messages) {
                 snapshot.messages = msg.data.messages;
               }
-              if (msg.data.queuedMessages) {
-                snapshot.queuedMessages = msg.data.queuedMessages;
+              if (Object.prototype.hasOwnProperty.call(msg.data, 'queuedMessages')) {
+                snapshot.queuedMessages = msg.data.queuedMessages || [];
+                state.queueEpoch++;
               }
               if (msg.data.structuredState) {
                 snapshot.structuredState = msg.data.structuredState;
@@ -9164,14 +9580,26 @@
               // Trigger status bar completion animation
               scheduleChatRender(true);
             }
-            // Notify user when a session completes (browser + in-app if backgrounded or not viewing)
+            // Notify user when a session completes — show what was accomplished
             var endedSession = state.sessions.find(function(s) { return s.id === msg.sessionId; });
-            var endedName = endedSession ? (endedSession.label || endedSession.command || msg.sessionId) : msg.sessionId;
             var endedExitCode = msg.data && msg.data.exitCode;
             var endedIsError = endedExitCode !== null && endedExitCode !== undefined && endedExitCode !== 0;
+            // Build meaningful notification body
+            var endedTaskSummary = endedSession ? (endedSession.summary || "") : "";
+            var endedLastReply = endedSession ? getLastAssistantSummary(endedSession) : "";
+            var endedNotifTitle = endedIsError ? "任务异常结束" : "任务已完成";
+            var endedNotifBody = "";
+            if (endedTaskSummary) {
+              endedNotifBody = endedTaskSummary;
+              if (endedLastReply && !endedIsError) {
+                endedNotifBody += "\n" + endedLastReply;
+              }
+            } else {
+              endedNotifBody = endedSession ? (endedSession.command || msg.sessionId) : msg.sessionId;
+            }
             sendBrowserNotification(
-              endedIsError ? "\u4f1a\u8bdd\u5f02\u5e38\u7ed3\u675f" : "\u4f1a\u8bdd\u5df2\u5b8c\u6210",
-              endedName,
+              endedNotifTitle,
+              endedNotifBody,
               {
                 tag: "wand-ended-" + msg.sessionId,
                 onClick: function() {
@@ -9181,8 +9609,8 @@
             );
             if (msg.sessionId !== state.selectedId || document.hidden) {
               showNotificationBubble({
-                title: endedIsError ? "\u4f1a\u8bdd\u5f02\u5e38\u7ed3\u675f" : "\u4f1a\u8bdd\u5df2\u5b8c\u6210",
-                body: endedName,
+                title: endedNotifTitle,
+                body: endedNotifBody,
                 type: endedIsError ? "warning" : "success",
                 icon: endedIsError ? "!" : "\u2713",
                 duration: 6000,
@@ -9264,6 +9692,8 @@
               state.currentTask = msg.data || null;
               updateTaskDisplay();
             }
+            // Update session list to reflect current activity (debounced)
+            scheduleSessionListUpdate();
             break;
           case 'status':
             if (msg.sessionId && msg.data) {
@@ -9284,6 +9714,10 @@
                   });
                 }
               }
+              if (Object.prototype.hasOwnProperty.call(msg.data, 'queuedMessages')) {
+                statusUpdate.queuedMessages = msg.data.queuedMessages || [];
+                state.queueEpoch++;
+              }
               if (Object.prototype.hasOwnProperty.call(msg.data, 'permissionBlocked')) {
                 statusUpdate.permissionBlocked = !!msg.data.permissionBlocked;
               }
@@ -9295,10 +9729,18 @@
                 };
                 // Browser notification for permission waiting (background tab)
                 var permSession = state.sessions.find(function(s) { return s.id === msg.sessionId; });
-                var permSessionName = permSession ? (permSession.label || permSession.command || msg.sessionId) : msg.sessionId;
+                var permTaskName = permSession ? (permSession.summary || permSession.command || msg.sessionId) : msg.sessionId;
+                var permDetail = msg.data.permissionRequest.prompt || "需要权限审批";
+                var permTarget = msg.data.permissionRequest.target;
+                var permBody = permTaskName;
+                if (permTarget) {
+                  permBody += "\n" + permDetail + " · " + permTarget;
+                } else {
+                  permBody += "\n" + permDetail;
+                }
                 sendBrowserNotification(
-                  "\u4f1a\u8bdd\u7b49\u5f85\u6388\u6743",
-                  permSessionName + " \u2014 " + (msg.data.permissionRequest.prompt || "\u9700\u8981\u6743\u9650\u5ba1\u6279"),
+                  "需要你的授权",
+                  permBody,
                   {
                     tag: "wand-perm-" + msg.sessionId,
                     onClick: function() {
@@ -9311,12 +9753,12 @@
                 // In-app bubble if not currently viewing this session
                 if (msg.sessionId !== state.selectedId) {
                   showNotificationBubble({
-                    title: "\u4f1a\u8bdd\u7b49\u5f85\u6388\u6743",
-                    body: permSessionName + " \u2014 " + (msg.data.permissionRequest.prompt || "\u9700\u8981\u6743\u9650\u5ba1\u6279"),
+                    title: "需要你的授权",
+                    body: permBody,
                     type: "warning",
                     icon: "!",
                     duration: 0,
-                    actionLabel: "\u67e5\u770b",
+                    actionLabel: "去处理",
                     action: function() {
                       selectSession(msg.sessionId);
                     }
@@ -9337,12 +9779,13 @@
                 }
                 // Re-render chat when structured session inFlight state changes
                 if (statusUpdate.structuredState) {
-                  scheduleChatRender();
-                  // Flush queued structured messages when inFlight clears
+                  // Flush queued structured messages synchronously before render
+                  // so the chat view uses up-to-date queue state.
                   if (!statusUpdate.structuredState.inFlight) {
                     updateInputHint("Enter 发送 · Shift+Enter 换行");
-                    setTimeout(flushStructuredInputQueue, 50);
+                    flushStructuredInputQueue();
                   }
+                  scheduleChatRender();
                 }
               }
             }
@@ -9350,23 +9793,14 @@
           case 'notification':
             if (msg.data) {
               if (msg.data.kind === "update") {
-                showNotificationBubble({
-                  title: "\u53d1\u73b0\u65b0\u7248\u672c",
-                  body: "\u5f53\u524d " + (msg.data.current || "-") + " \u2192 \u6700\u65b0 " + (msg.data.latest || "-"),
-                  type: "info",
-                  icon: "\u2191",
-                  duration: 0,
-                  actionLabel: "\u53bb\u66f4\u65b0",
-                  action: function() {
-                    var settingsBtn = document.getElementById("open-settings-btn") || document.querySelector("[data-action='settings']");
-                    if (settingsBtn) settingsBtn.click();
-                  }
-                });
+                showUpdateBubble(msg.data.current || "-", msg.data.latest || "-");
                 sendBrowserNotification(
                   "Wand \u53d1\u73b0\u65b0\u7248\u672c",
                   "\u5f53\u524d " + (msg.data.current || "-") + " \u2192 \u6700\u65b0 " + (msg.data.latest || "-"),
                   { tag: "wand-update" }
                 );
+              } else if (msg.data.kind === "restart") {
+                showRestartOverlay();
               }
             }
             break;
@@ -9758,9 +10192,9 @@
           return;
         }
 
-        var messages = state.currentMessages;
+        var allMessages = state.currentMessages;
 
-        if (messages.length === 0) {
+        if (allMessages.length === 0) {
           if (state.lastRenderedEmpty !== "empty") {
             renderChatEmptyState(chatOutput, '<div class="empty-state"><strong>对话已开始</strong><br>在下方输入框发送消息，Claude 会自动回复。</div>');
             state.lastRenderedEmpty = "empty";
@@ -9769,6 +10203,16 @@
           return;
         }
 
+        // Lazy loading: only render the most recent chatRenderedCount messages.
+        // Auto-expand when new messages arrive during active streaming to avoid hiding them.
+        var totalMsgCount = allMessages.length;
+        if (totalMsgCount > state.chatRenderedCount && state.chatAutoFollow) {
+          state.chatRenderedCount = totalMsgCount;
+        }
+        var visibleOffset = Math.max(0, totalMsgCount - state.chatRenderedCount);
+        var messages = visibleOffset > 0 ? allMessages.slice(visibleOffset) : allMessages;
+        var hasOlderMessages = visibleOffset > 0;
+
         // Check if messages actually changed
         var msgCount = messages.length;
         var outputHash = selectedSession.output ? selectedSession.output.length : 0;
@@ -9829,16 +10273,17 @@
           // Build HTML with system info cards interleaved
           var html = '';
           var reversedMessages = messages.slice().reverse();
-          var msgCount = messages.length;
+          var visibleCount = messages.length;
 
           for (var i = 0; i < reversedMessages.length; i++) {
             var msg = reversedMessages[i];
-            var originalIndex = msgCount - 1 - i; // Original index in messages array
+            var localIndex = visibleCount - 1 - i; // Index within visible slice
+            var originalIndex = localIndex + visibleOffset; // Index in full messages array
 
             // Find system info for this message position
             var sysInfo = null;
             for (var j = 0; j < systemInfo.length; j++) {
-              if (systemInfo[j].beforeMessage === originalIndex) {
+              if (systemInfo[j].beforeMessage === localIndex) {
                 sysInfo = systemInfo[j];
                 break;
               }
@@ -9858,6 +10303,13 @@
             html += renderChatMessage(msg, roundUsageByIndex[originalIndex] || null, originalIndex);
           }
 
+          // Add sentinel for loading older messages (DOM end = visual top in column-reverse)
+          if (hasOlderMessages) {
+            html += '<div class="chat-load-more" id="chat-load-more-sentinel">' +
+              '<button class="chat-load-more-btn" type="button">加载更早的 ' + Math.min(state.chatPageSize, visibleOffset) + ' 条消息</button>' +
+            '</div>';
+          }
+
           chatMessages.innerHTML = html;
           attachAllCopyHandlers(chatMessages);
           bindChatScrollListener();
@@ -9869,12 +10321,12 @@
             if (cards.length > 0) {
               var firstCard = cards[0];
               var firstCardKey = getElementExpandKey(firstCard);
-              if (!hasPersistedExpandState(firstCardKey) && !getConfiguredPanelDefaults().structuredToolCardExpanded) {
+              if (getPersistedExpandState(firstCardKey) === null) {
                 firstCard.classList.remove("collapsed");
               }
               for (var ci = 1; ci < cards.length; ci++) {
                 var cardKey = getElementExpandKey(cards[ci]);
-                if (!hasPersistedExpandState(cardKey) && !getConfiguredPanelDefaults().structuredToolCardExpanded) {
+                if (getPersistedExpandState(cardKey) === null) {
                   cards[ci].classList.add("collapsed");
                 }
               }
@@ -9883,6 +10335,7 @@
           // Scroll to bottom (newest message) - column-reverse: scrollTop=0 is visual bottom
           requestAnimationFrame(function() {
             smartScrollToBottom(chatMessages);
+            observeLoadMoreSentinel();
           });
         }
 
@@ -9892,7 +10345,7 @@
           var allCards = container.querySelectorAll(".tool-use-card");
           allCards.forEach(function(c) {
             var cardKey = getElementExpandKey(c);
-            if (hasPersistedExpandState(cardKey) || getConfiguredPanelDefaults().structuredToolCardExpanded) return;
+            if (getPersistedExpandState(cardKey) !== null) return;
             // Keep expanded if this card is inside a newly added message
             if (newEls) {
               for (var i = 0; i < newEls.length; i++) {
@@ -9903,15 +10356,15 @@
           });
         }
 
-        // Pre-compute per-round cumulative usage.
+        // Pre-compute per-round cumulative usage using original (full array) indices.
         // A "round" starts at a user message and includes all subsequent assistant turns
         // until the next user message. Only the last assistant in each round shows the total.
         var roundUsageByIndex = {};
         (function() {
           var acc = { inputTokens: 0, outputTokens: 0, cacheReadInputTokens: 0, totalCostUsd: 0 };
           var lastAssistantIdx = -1;
-          for (var mi = 0; mi < messages.length; mi++) {
-            var m = messages[mi];
+          for (var mi = 0; mi < allMessages.length; mi++) {
+            var m = allMessages[mi];
             if (m.role === "user") {
               if (lastAssistantIdx >= 0 && (acc.inputTokens > 0 || acc.outputTokens > 0 || acc.totalCostUsd > 0)) {
                 roundUsageByIndex[lastAssistantIdx] = {
@@ -9955,7 +10408,7 @@
           var insertedEls = [];
           for (var i = 0; i < newMessages.length; i++) {
             var div = document.createElement("div");
-            var nmOrigIdx = existingCount + (newMessages.length - 1 - i);
+            var nmOrigIdx = visibleOffset + existingCount + (newMessages.length - 1 - i);
             div.innerHTML = renderChatMessage(newMessages[i], roundUsageByIndex[nmOrigIdx] || null, nmOrigIdx);
             var el = div.firstElementChild;
             if (el) {
@@ -9987,7 +10440,7 @@
           for (var mi = 0; mi < MAX_STREAMING_SCAN; mi++) {
             var currentEl = existingEls[mi];
             var tmpWrap = document.createElement("div");
-            var srOrigIdx = reversedMessages.length - 1 - mi;
+            var srOrigIdx = visibleOffset + reversedMessages.length - 1 - mi;
             tmpWrap.innerHTML = renderChatMessage(reversedMessages[mi], roundUsageByIndex[srOrigIdx] || null, srOrigIdx);
             var replacementEl = tmpWrap.firstElementChild;
             if (!replacementEl) continue;
@@ -10016,7 +10469,7 @@
             var newestCard = null;
             allCards.forEach(function(c) {
               var cardKey = getElementExpandKey(c);
-              if (hasPersistedExpandState(cardKey) || getConfiguredPanelDefaults().structuredToolCardExpanded) return;
+              if (getPersistedExpandState(cardKey) !== null) return;
               if (newestMsgEl && newestMsgEl.contains(c)) {
                 if (!newestCard) newestCard = c;
                 else c.classList.add("collapsed");
@@ -10033,7 +10486,7 @@
         renderStructuredStatusBar(chatMessages, selectedSession);
 
         // Update todo progress bar from latest messages
-        updateTodoProgress(messages);
+        updateTodoProgress(allMessages);
       }
 
       // Smart scroll: only auto-scroll if user is near bottom
@@ -10043,7 +10496,7 @@
           updateChatJumpToBottomButton();
           return;
         }
-        var chatMsgs = container && container.classList && container.classList.contains("chat-messages")
+        var chatMsgs = (container && container.classList && container.classList.contains("chat-messages"))
           ? container
           : getChatScrollElement();
         if (!chatMsgs || !chatMsgs.isConnected) return;
@@ -11106,7 +11559,8 @@
         // Thinking card (deep thought) — from PTY parsing
         if (msg.role === "thinking") {
           var thinkingKey = buildExpandKey("thinking", [getMessageKey(msg, messageIndex), "pty"]);
-          var thinkingExpanded = getExpandState(thinkingKey, "thinking");
+          var thinkingPersisted = getPersistedExpandState(thinkingKey);
+          var thinkingExpanded = thinkingPersisted === null ? !!(state.config && state.config.cardDefaults && state.config.cardDefaults.thinking) : thinkingPersisted;
           return '<div class="chat-message thinking">' +
             '<div class="thinking-inline thinking-pty ' + (thinkingExpanded ? 'expanded' : 'collapsed') + '" data-expand-kind="thinking" data-expand-key="' + escapeHtml(thinkingKey) + '" data-thinking="" onclick="__thinkingToggle(this)">' +
               '<span class="thinking-inline-icon">⦿</span>' +
@@ -11243,7 +11697,8 @@
         }
         var summaryText = parts.join(" · ");
         var groupKey = buildExpandKey("tool-group", [messageKey, items[0] && items[0].index, items.length]);
-        var shouldExpand = getExpandState(groupKey, "tool-group");
+        var persistedExpanded = getPersistedExpandState(groupKey);
+        var shouldExpand = persistedExpanded === null ? !!(state.config && state.config.cardDefaults && state.config.cardDefaults.toolGroup) : persistedExpanded;
 
         // Render each item's inline-tool card
         var innerHtml = "";
@@ -11354,7 +11809,8 @@
               '</div>';
             }
             var thinkingKey = buildExpandKey("thinking", [messageKey, index]);
-            var thinkingExpanded = getExpandState(thinkingKey, "thinking");
+            var thinkingPersisted = getPersistedExpandState(thinkingKey);
+          var thinkingExpanded = thinkingPersisted === null ? !!(state.config && state.config.cardDefaults && state.config.cardDefaults.thinking) : thinkingPersisted;
             return '<div class="thinking-inline ' + (thinkingExpanded ? 'expanded' : 'collapsed') + '" data-expand-kind="thinking" data-expand-key="' + escapeHtml(thinkingKey) + '" data-thinking="' + escapeHtml(thinkingText) + '" onclick="__thinkingToggle(this)">' +
               '<span class="thinking-inline-icon">⦿</span>' +
               '<span class="thinking-inline-preview">' + escapeHtml(thinkingExpanded ? thinkingText : preview) + '</span>' +
@@ -11380,6 +11836,7 @@
       function renderInlineTool(block, toolResult, toolName, fileInfo, extraInfo, messageKey, index) {
         var toolId = block.id || "tool-" + toolName;
         var expandKey = buildExpandKey("inline-tool", [messageKey, toolId || index, index]);
+        var persistedExpanded = getPersistedExpandState(expandKey);
         var inputData = block.input || {};
         var resultContent = extractToolResultText(toolResult && toolResult.content);
 
@@ -11450,7 +11907,7 @@
         var fullResult = resultContent;
 
         var expandedHtml = "";
-        var shouldExpand = getExpandState(expandKey, "inline-tool");
+        var shouldExpand = persistedExpanded === null ? !!(state.config && state.config.cardDefaults && state.config.cardDefaults.inlineTools) : persistedExpanded;
         if (hasResult) {
           expandedHtml = '<div class="inline-tool-expanded" style="display: ' + (shouldExpand ? 'block' : 'none') + ';">' +
             '<div class="inline-tool-result">' + formatInlineResult(resultContent, toolName) + '</div>' +
@@ -11462,16 +11919,23 @@
           expandedHtml = '<div class="inline-tool-expanded" style="display: ' + (shouldExpand ? 'block' : 'none') + ';"><div class="inline-tool-loading">等待响应…</div></div>';
         }
 
+        var isTruncated = toolResult && toolResult._truncated === true;
+
         var extraInfoHtml = meta ? '<span class="inline-tool-meta">' + escapeHtml(meta) + '</span>' : '';
         var extraClass = isError ? 'inline-tool-error-inline' : '';
         if (shouldExpand) extraClass += ' inline-tool-open';
 
+        var truncatedAttrs = isTruncated
+          ? 'data-truncated="true" data-tool-use-id="' + escapeHtml(block.id || "") + '" '
+          : '';
+
         return '<div class="inline-tool ' + extraClass + '" ' +
           'data-expand-kind="inline-tool" ' +
           'data-expand-key="' + escapeHtml(expandKey) + '" ' +
           'data-result="' + escapeHtml(fullResult) + '" ' +
           'data-preview="' + previewDataAttr + '" ' +
           'data-status="' + (isError ? 'error' : (hasResult ? 'done' : 'pending')) + '" ' +
+          truncatedAttrs +
           'onclick="__inlineToolToggle(this)">' +
           '<div class="inline-tool-row">' +
             '<span class="inline-tool-status">' + statusIcon + '</span>' +
@@ -11490,6 +11954,7 @@
         var resultContent = extractToolResultText(toolResult && toolResult.content);
         var toolId = block.id || "tool-" + toolName;
         var expandKey = buildExpandKey("terminal", [messageKey, toolId || index, index]);
+        var persistedExpanded = getPersistedExpandState(expandKey);
 
         var isError = toolResult && toolResult.is_error;
         var exitCode = inputData.exitCode;
@@ -11527,9 +11992,14 @@
 
         // Show command preview in header (truncate long commands)
         var cmdPreview = command.length > 80 ? command.slice(0, 77) + "…" : command;
-        var shouldExpand = getExpandState(expandKey, "terminal");
+        var shouldExpand = persistedExpanded === null ? !!(state.config && state.config.cardDefaults && state.config.cardDefaults.terminal) : persistedExpanded;
+
+        var termTruncated = toolResult && toolResult._truncated === true;
+        var termTruncAttrs = termTruncated
+          ? ' data-truncated="true" data-tool-use-id="' + escapeHtml(block.id || "") + '"'
+          : '';
 
-        return '<div class="inline-terminal" data-expand-kind="terminal" data-expand-key="' + escapeHtml(expandKey) + '" data-expanded="' + (shouldExpand ? 'true' : 'false') + '">' +
+        return '<div class="inline-terminal" data-expand-kind="terminal" data-expand-key="' + escapeHtml(expandKey) + '" data-expanded="' + (shouldExpand ? 'true' : 'false') + '"' + termTruncAttrs + '>' +
           '<div class="term-header" onclick="__terminalExpand(this)">' +
             statusDot +
             '<span class="term-cmd-preview"><span class="term-prompt">$</span> ' + escapeHtml(cmdPreview) + '</span>' +
@@ -11653,33 +12123,116 @@
           return renderDiffTool(block, toolResult, toolName);
         }
 
-        // ── AskUserQuestion tool — special card
+        // ── AskUserQuestion tool — special card with batch submit
         if (toolName === "AskUserQuestion" && block.input && block.input.questions) {
           var questions = block.input.questions;
           if (questions && questions.length > 0) {
+            var isAnswered = !!toolResult;
+            var sel = state.askUserSelections[toolId] || {};
+            var isSubmitted = !!sel.submitted;
+            var answerText = isAnswered ? extractToolResultText(toolResult.content) : "";
+            var answerLines = answerText ? answerText.trim().split("\n") : [];
+
+            // Build header summary
+            var headerLabel = "";
+            for (var hi = 0; hi < questions.length; hi++) {
+              if (questions[hi].header) { headerLabel = questions[hi].header; break; }
+            }
+            var headerSummary = headerLabel ? '<span class="tool-use-summary">' + escapeHtml(headerLabel) + '</span>' : "";
+
             var questionsHtml = "";
             questions.forEach(function(question, qIdx) {
+              var isMulti = !!question.multiSelect;
               var questionText = question.question ? '<div class="ask-user-title">' + escapeHtml(question.question) + '</div>' : "";
               var optionsHtml = "";
               if (question.options && question.options.length > 0) {
-                optionsHtml = '<div class="ask-user-options">';
+                optionsHtml = '<div class="ask-user-options" data-multi-select="' + isMulti + '">';
                 question.options.forEach(function(opt, idx) {
                   var label = opt.label ? escapeHtml(opt.label) : "选项 " + (idx + 1);
-                  optionsHtml += '<button class="ask-user-option" data-option-index="' + idx + '" data-question-index="' + qIdx + '" data-option-label="' + escapeHtml(label) + '" onclick="__askOption(this)">' +
-                    '<div class="ask-user-option-label">' + label + '</div>' +
-                  '</button>';
+                  var descHtml = opt.description ? '<div class="ask-user-option-desc">' + escapeHtml(opt.description) + '</div>' : "";
+
+                  if (isAnswered) {
+                    // Read-only: check if this option was the chosen answer
+                    var answerLine = answerLines[qIdx] || answerLines[0] || "";
+                    var chosenLabels = answerLine.split(",").map(function(s) { return s.trim(); });
+                    var isChosen = chosenLabels.indexOf(opt.label || "") !== -1;
+                    optionsHtml += '<div class="ask-user-option ask-user-option-readonly' + (isChosen ? ' ask-user-option-chosen' : '') + '">' +
+                      '<span class="ask-user-indicator"></span>' +
+                      '<div class="ask-user-option-content">' +
+                        '<div class="ask-user-option-label">' + label + '</div>' +
+                        descHtml +
+                      '</div>' +
+                    '</div>';
+                  } else {
+                    // Interactive: selection state from askUserSelections
+                    var isSelected = (sel[qIdx] || []).indexOf(idx) !== -1;
+                    var disabledAttr = isSubmitted ? ' disabled' : '';
+                    optionsHtml += '<button class="ask-user-option' + (isSelected ? ' selected' : '') + '"' +
+                      ' data-option-index="' + idx + '"' +
+                      ' data-question-index="' + qIdx + '"' +
+                      ' data-option-label="' + escapeHtml(opt.label || "选项 " + (idx + 1)) + '"' +
+                      ' onclick="__askSelect(\'' + escapeHtml(toolId) + '\',' + qIdx + ',' + idx + ',' + isMulti + ')"' +
+                      disabledAttr + '>' +
+                      '<span class="ask-user-indicator"></span>' +
+                      '<div class="ask-user-option-content">' +
+                        '<div class="ask-user-option-label">' + label + '</div>' +
+                        descHtml +
+                      '</div>' +
+                    '</button>';
+                  }
                 });
                 optionsHtml += '</div>';
               }
-              questionsHtml += '<div class="ask-user-question-group">' + questionText + optionsHtml + '</div>';
+              questionsHtml += '<div class="ask-user-question-group" data-question-index="' + qIdx + '">' + questionText + optionsHtml + '</div>';
             });
-            return '<div class="tool-use-card ask-user" data-tool-use-id="' + escapeHtml(toolId) + '">' +
+
+            // Submit button (only for interactive state)
+            var actionsHtml = "";
+            if (!isAnswered) {
+              var allAnsweredCheck = true;
+              for (var qi = 0; qi < questions.length; qi++) {
+                if (!sel[qi] || sel[qi].length === 0) { allAnsweredCheck = false; break; }
+              }
+              var submitDisabled = (!allAnsweredCheck || isSubmitted) ? " disabled" : "";
+              var submitClass = isSubmitted ? " ask-user-submitted" : "";
+              var submitText = isSubmitted ? "已提交..." : "确认提交";
+              actionsHtml = '<div class="ask-user-actions">' +
+                '<button class="ask-user-submit' + submitClass + '" data-tool-use-id="' + escapeHtml(toolId) + '"' +
+                  ' onclick="__askSubmit(\'' + escapeHtml(toolId) + '\')"' + submitDisabled + '>' +
+                  submitText +
+                '</button>' +
+              '</div>';
+            }
+
+            // Answered summary for header
+            var answeredSummary = "";
+            if (isAnswered && answerText) {
+              var shortAnswer = answerText.trim().replace(/\n/g, ", ");
+              if (shortAnswer.length > 40) shortAnswer = shortAnswer.slice(0, 37) + "...";
+              answeredSummary = '<span class="tool-use-file">' + escapeHtml(shortAnswer) + '</span>';
+            }
+
+            // Expand state: default expanded when unanswered, collapsed when answered
+            var askExpandKey = buildExpandKey("tool-card", [messageKey, toolId]);
+            var askPersisted = getPersistedExpandState(askExpandKey);
+            var askShouldExpand = askPersisted === null ? !isAnswered : askPersisted;
+            var askCollapsed = askShouldExpand ? "" : " collapsed";
+            var answeredClass = isAnswered ? " ask-user-answered" : "";
+
+            return '<div class="tool-use-card ask-user' + answeredClass + askCollapsed + '"' +
+              ' data-tool-use-id="' + escapeHtml(toolId) + '"' +
+              ' data-expand-kind="tool-card"' +
+              ' data-expand-key="' + escapeHtml(askExpandKey) + '">' +
               '<div class="tool-use-header" data-tool-toggle onclick="__tcToggle(event,this)">' +
-                '<span class="tool-use-icon">?</span>' +
+                '<span class="tool-use-icon">' + (isAnswered ? '✓' : '?') + '</span>' +
                 '<span class="tool-use-name">提问</span>' +
+                headerSummary +
+                answeredSummary +
+                '<span class="tool-use-toggle">▼</span>' +
               '</div>' +
               '<div class="tool-use-body ask-user-body">' +
                 questionsHtml +
+                actionsHtml +
               '</div>' +
             '</div>';
           }
@@ -11725,10 +12278,13 @@
         }
 
         var expandKey = buildExpandKey("tool-card", [messageKey, toolId]);
-        var shouldExpand = getExpandState(expandKey, "tool-card", statusClass === "loading");
+        var persistedExpanded = getPersistedExpandState(expandKey);
+        var cardDefaultExpand = !!(state.config && state.config.cardDefaults && state.config.cardDefaults.editCards);
+        var shouldExpand = persistedExpanded === null ? (statusClass === "loading" || cardDefaultExpand) : persistedExpanded;
+        var tcTruncated = toolResult && toolResult._truncated === true;
         var collapsedClass = shouldExpand ? "" : " collapsed";
         var toggleHtml = '<span class="tool-use-toggle">▼</span>';
-        return '<div class="tool-use-card ' + statusClass + collapsedClass + '" data-expand-kind="tool-card" data-expand-key="' + escapeHtml(expandKey) + '" data-tool-use-id="' + escapeHtml(toolId) + '">' +
+        return '<div class="tool-use-card ' + statusClass + collapsedClass + '" data-expand-kind="tool-card" data-expand-key="' + escapeHtml(expandKey) + '" data-tool-use-id="' + escapeHtml(toolId) + '"' + (tcTruncated ? ' data-truncated="true"' : '') + '>' +
           '<div class="tool-use-header" data-tool-toggle onclick="__tcToggle(event,this)">' +
             '<span class="tool-use-icon">' + headerIcon + '</span>' +
             '<span class="tool-use-name">' + escapeHtml(titleText) + '</span>' +
@@ -12149,8 +12705,8 @@
 
       var notificationStack = [];
       var notificationIdCounter = 0;
-      var NOTIFICATION_GAP = 8;
-      var NOTIFICATION_TOP = 24;
+      var NOTIFICATION_GAP = 6;
+      var NOTIFICATION_TOP = 16;
 
       /**
        * Show an in-app notification bubble at bottom-right.
@@ -12165,6 +12721,12 @@
        * @returns {{ dismiss: function }} handle
        */
       function showNotificationBubble(opts) {
+        // Play sound for important notifications — independent of bubble setting
+        if (opts.actionLabel || opts.playSound) playNotificationSound();
+
+        // Respect user preference (skip if bubbles disabled)
+        if (!state.notifBubble) return { dismiss: function() {} };
+
         var id = ++notificationIdCounter;
         var type = opts.type || "info";
         var icon = opts.icon || (type === "warning" ? "!" : type === "success" ? "\u2713" : "i");
@@ -12182,7 +12744,7 @@
           '</div>';
 
         var bodyHtml = opts.body
-          ? '<div class="notification-bubble-body">' + escapeHtml(opts.body) + '</div>'
+          ? '<div class="notification-bubble-body">' + escapeHtml(opts.body).replace(/\n/g, '<br>') + '</div>'
           : '';
 
         var actionsHtml = opts.actionLabel
@@ -12248,13 +12810,43 @@
 
       // ── Browser Notification API ──
 
+      // Detect Android APK native bridge
+      var _hasNativeBridge = typeof WandNative !== "undefined" && typeof WandNative.sendNotification === "function";
+      // Detect if running inside APK and extract installed version from User-Agent
+      var _apkVersionMatch = navigator.userAgent.match(/WandApp\/([^\s]+)/);
+      var _apkVersion = _apkVersionMatch ? _apkVersionMatch[1] : null;
+
+      function _getNativePermission() {
+        if (_hasNativeBridge && typeof WandNative.getPermission === "function") {
+          try { return WandNative.getPermission(); } catch (_e) {}
+        }
+        return null;
+      }
+
       function requestNotificationPermission() {
+        if (_hasNativeBridge) {
+          var perm = _getNativePermission();
+          if (perm === "default" || perm === "denied") {
+            try { WandNative.requestPermission(); } catch (_e) {}
+          }
+          return;
+        }
         if (typeof Notification !== "undefined" && Notification.permission === "default") {
           Notification.requestPermission();
         }
       }
 
       function sendBrowserNotification(title, body, opts) {
+        // Native Android bridge path
+        if (_hasNativeBridge) {
+          var perm = _getNativePermission();
+          if (perm !== "granted") return;
+          try {
+            WandNative.sendNotification(title || "Wand", body || "", (opts && opts.tag) || "");
+          } catch (_e) {}
+          return;
+        }
+        // Browser Notification API path
         if (typeof Notification === "undefined" || Notification.permission !== "granted") return;
         if (!document.hidden) return; // Only notify when tab is in background
         try {
@@ -12275,6 +12867,221 @@
         }
       }
 
+      /**
+       * Play a soft, rounded notification chime using Web Audio API.
+       * Two ascending sine tones with smooth gain envelope — gentle on the ears.
+       */
+      function playNotificationSound() {
+        if (!state.notifSound) return;
+        _doPlaySound();
+      }
+
+      /**
+       * Try to play the notification sound regardless of user preference.
+       * Returns true if playback was initiated successfully.
+       * Used by the test function to always attempt playback.
+       */
+      function tryPlayNotificationSound() {
+        return _doPlaySound();
+      }
+
+      function _doPlaySound() {
+        try {
+          var AudioCtx = window.AudioContext || window.webkitAudioContext;
+          if (!AudioCtx) return false;
+          var ctx = new AudioCtx();
+
+          // Some browsers suspend AudioContext until user gesture — resume it
+          if (ctx.state === "suspended") ctx.resume();
+
+          function tone(freq, start, dur) {
+            var osc = ctx.createOscillator();
+            var gain = ctx.createGain();
+            osc.type = "sine";
+            osc.frequency.value = freq;
+            gain.gain.setValueAtTime(0, ctx.currentTime + start);
+            gain.gain.linearRampToValueAtTime(0.18, ctx.currentTime + start + 0.04);
+            gain.gain.exponentialRampToValueAtTime(0.001, ctx.currentTime + start + dur);
+            osc.connect(gain);
+            gain.connect(ctx.destination);
+            osc.start(ctx.currentTime + start);
+            osc.stop(ctx.currentTime + start + dur);
+          }
+
+          // Two-tone ascending chime: C5 → E5, soft and brief
+          tone(523, 0, 0.25);
+          tone(659, 0.12, 0.3);
+
+          // Clean up context after playback
+          setTimeout(function() { ctx.close(); }, 600);
+          return true;
+        } catch (_e) {
+          // Web Audio not available or blocked
+          return false;
+        }
+      }
+
+      /**
+       * Show an interactive update bubble that allows updating and restarting
+       * directly from the notification, without navigating to settings.
+       */
+      function showUpdateBubble(currentVer, latestVer) {
+        // Prevent duplicate bubbles
+        if (state._updateBubbleShown) return;
+        state._updateBubbleShown = true;
+
+        playNotificationSound();
+
+        var id = ++notificationIdCounter;
+        var bubble = document.createElement("div");
+        bubble.className = "notification-bubble";
+        bubble.setAttribute("data-nid", id);
+
+        bubble.innerHTML =
+          '<div class="notification-bubble-header">' +
+            '<span class="notification-bubble-icon info">\u2191</span>' +
+            '<span class="notification-bubble-title">\u53d1\u73b0\u65b0\u7248\u672c</span>' +
+            '<button class="notification-bubble-close" title="\u5173\u95ed">\u00d7</button>' +
+          '</div>' +
+          '<div class="notification-bubble-body">' +
+            escapeHtml(currentVer) + ' \u2192 ' + escapeHtml(latestVer) +
+          '</div>' +
+          '<div class="notification-bubble-actions">' +
+            '<button class="primary" id="update-bubble-action">\u7acb\u5373\u66f4\u65b0</button>' +
+          '</div>';
+
+        document.body.appendChild(bubble);
+
+        var entry = { id: id, el: bubble };
+        notificationStack.push(entry);
+        repositionNotifications();
+
+        var closeBtn = bubble.querySelector(".notification-bubble-close");
+        if (closeBtn) closeBtn.onclick = function() {
+          dismissNotification(id);
+          state._updateBubbleShown = false;
+        };
+
+        var actionBtn = bubble.querySelector("#update-bubble-action");
+        var bodyEl = bubble.querySelector(".notification-bubble-body");
+
+        if (actionBtn) actionBtn.onclick = function() {
+          // Phase 1: Performing update
+          actionBtn.disabled = true;
+          actionBtn.textContent = "\u66f4\u65b0\u4e2d\u2026";
+          if (bodyEl) bodyEl.textContent = "\u6b63\u5728\u4e0b\u8f7d\u5e76\u5b89\u88c5\u65b0\u7248\u672c\u2026";
+
+          fetch("/api/update", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            credentials: "same-origin"
+          })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data.error) {
+              // Update failed
+              if (bodyEl) {
+                bodyEl.textContent = data.error;
+                bodyEl.style.color = "var(--error)";
+              }
+              actionBtn.disabled = false;
+              actionBtn.textContent = "\u91cd\u8bd5";
+              return;
+            }
+            // Phase 2: Update succeeded, show restart button
+            if (bodyEl) {
+              bodyEl.textContent = data.message || "\u66f4\u65b0\u5b8c\u6210";
+              bodyEl.style.color = "var(--success)";
+            }
+            actionBtn.textContent = "\u91cd\u542f\u751f\u6548";
+            actionBtn.disabled = false;
+            actionBtn.className = "primary success";
+            actionBtn.onclick = function() {
+              performRestart(actionBtn, bodyEl);
+            };
+          })
+          .catch(function() {
+            if (bodyEl) {
+              bodyEl.textContent = "\u66f4\u65b0\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5\u7f51\u7edc\u8fde\u63a5\u3002";
+              bodyEl.style.color = "var(--error)";
+            }
+            actionBtn.disabled = false;
+            actionBtn.textContent = "\u91cd\u8bd5";
+          });
+        };
+      }
+
+      /**
+       * Call POST /api/restart and show the restart overlay.
+       */
+      function performRestart(btn, msgEl) {
+        if (btn) {
+          btn.disabled = true;
+          btn.textContent = "\u6b63\u5728\u91cd\u542f\u2026";
+        }
+        if (msgEl) {
+          msgEl.textContent = "\u670d\u52a1\u6b63\u5728\u91cd\u542f\u2026";
+          msgEl.style.color = "var(--text-secondary)";
+        }
+
+        fetch("/api/restart", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin"
+        })
+        .then(function(res) { return res.json(); })
+        .then(function() {
+          showRestartOverlay();
+        })
+        .catch(function() {
+          // Network error likely means server already shut down — show overlay anyway
+          showRestartOverlay();
+        });
+      }
+
+      /**
+       * Full-screen overlay shown during server restart.
+       * Polls /api/config until the server comes back, then reloads the page.
+       */
+      function showRestartOverlay() {
+        // Avoid duplicates
+        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">\u670d\u52a1\u6b63\u5728\u91cd\u542f</div>' +
+            '<div class="restart-subtitle">\u7a0d\u540e\u5c06\u81ea\u52a8\u5237\u65b0\u9875\u9762\u2026</div>' +
+          '</div>';
+        document.body.appendChild(overlay);
+
+        var attempts = 0;
+        var maxAttempts = 20; // 20 * 2s = 40s
+        var timer = setInterval(function() {
+          attempts++;
+          fetch("/api/config", { credentials: "same-origin" })
+            .then(function(res) {
+              if (res.ok) {
+                clearInterval(timer);
+                location.reload();
+              }
+            })
+            .catch(function() {
+              // Server not ready yet
+            });
+          if (attempts >= maxAttempts) {
+            clearInterval(timer);
+            var subtitle = overlay.querySelector(".restart-subtitle");
+            if (subtitle) {
+              subtitle.innerHTML = '\u91cd\u542f\u8d85\u65f6\uff0c\u8bf7 <a href="javascript:location.reload()" style="color:var(--accent);text-decoration:underline">\u624b\u52a8\u5237\u65b0</a> \u9875\u9762\u3002';
+            }
+          }
+        }, 2000);
+      }
+
       function escapeHtml(value) {
         return String(value)
           .replace(/&/g, "&amp;")