@co0ontty/wand 1.7.0 → 1.10.0

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

@@ -117,6 +117,11 @@
         sessionCreateKind: "structured",
         sessionCreateWorktree: false,
         sessionTool: "claude",
+        activeWorktreeMergeSessionId: null,
+        worktreeMergeCheckResult: null,
+        worktreeMergeLoading: false,
+        worktreeMergeSubmitting: false,
+        worktreeMergeError: "",
         preferredCommand: "claude",
         structuredRunner: "claude-cli-print",
         lastResize: { cols: 0, rows: 0 },
@@ -125,6 +130,13 @@
         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; }
+        })(),
         currentView: "terminal",
         terminalScale: (function() {
           try {
@@ -178,6 +190,8 @@
         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 {
@@ -322,6 +336,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) {
@@ -688,6 +704,7 @@
         state.lastRenderedMsgCount = 0;
         state.lastRenderedEmpty = null;
         state.renderPending = false;
+        state.askUserSelections = {};
         if (state.chatScrollElement && state.chatScrollHandler) {
           state.chatScrollElement.removeEventListener("scroll", state.chatScrollHandler);
         }
@@ -836,18 +853,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) {
@@ -1043,11 +1049,6 @@
         var composerMode = getSafeModeForTool(preferredTool, state.chatMode);
 
         return '<div class="app-container">' +
-          '<button id="sessions-toggle-button" class="floating-sidebar-toggle' + (state.sessionsDrawerOpen ? ' active' : '') + '" aria-label="Toggle sidebar">' +
-            '<span class="hamburger-icon">' +
-              '<span></span><span></span><span></span>' +
-            '</span>' +
-          '</button>' +
           '<div id="sessions-drawer-backdrop" class="drawer-backdrop' + drawerClass + '"></div>' +
           '<div class="main-layout' + (state.sessionsDrawerOpen ? ' sidebar-open' : '') + '">' +
             '<aside id="sessions-drawer" class="sidebar' + drawerClass + '">' +
@@ -1089,10 +1090,13 @@
               '</div>' +
             '</aside>' +
             '<main class="main-content">' +
-              '<span class="current-task hidden" id="current-task"></span>' +
-              '<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 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>' +
               // File panel backdrop (mobile)
               '<div id="file-panel-backdrop" class="file-panel-backdrop' + (state.filePanelOpen ? " open" : "") + '"></div>' +
@@ -1239,7 +1243,29 @@
               '</section>' +
             '</main>' +
           '</div>' +
-        '</div>' + renderSessionModal() + renderSettingsModal();
+        '</div>' + renderSessionModal() + renderWorktreeMergeModal() + renderSettingsModal();
+      }
+
+      function renderWorktreeMergeModal() {
+        return '<section id="worktree-merge-modal" class="modal-backdrop hidden">' +
+          '<div class="modal worktree-merge-modal">' +
+            '<div class="modal-header">' +
+              '<div>' +
+                '<h2 class="modal-title">合并 Worktree</h2>' +
+                '<p class="modal-subtitle">检查当前任务分支并快捷合并到主分支。</p>' +
+              '</div>' +
+              '<button id="close-worktree-merge-button" class="btn btn-ghost btn-icon">&times;</button>' +
+            '</div>' +
+            '<div class="modal-body">' +
+              '<div id="worktree-merge-content" class="worktree-merge-content"></div>' +
+              '<p id="worktree-merge-error" class="error-message hidden"></p>' +
+              '<div class="worktree-merge-actions">' +
+                '<button id="worktree-merge-cancel-button" class="btn btn-secondary">取消</button>' +
+                '<button id="worktree-merge-confirm-button" class="btn btn-primary">确认合并并清理</button>' +
+              '</div>' +
+            '</div>' +
+          '</div>' +
+        '</section>';
       }
 
       function renderSettingsModal() {
@@ -1252,10 +1278,11 @@
             '<div class="modal-body">' +
               // Tabs
               '<div class="settings-tabs">' +
-                '<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>' +
+                '<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>' +
               '</div>' +
 
               // About tab
@@ -1272,19 +1299,36 @@
                     '<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>' +
+
+              // 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>' +
@@ -2296,9 +2340,18 @@
           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";
+        var mergeTitle = needsCleanup ? "重试清理 worktree" : "合并到主分支";
+        var mergeButton = canOpenMerge && session.worktreeMergeStatus !== "merged"
+          ? '<button class="session-action-btn merge-btn" data-action="worktree-merge" data-session-id="' + session.id + '" type="button" aria-label="' + escapeHtml(mergeTitle) + '" title="' + escapeHtml(mergeTitle) + '"' + (mergeDisabled ? ' disabled' : '') + '><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="M7 7h10"/><path d="M7 12h10"/><path d="M7 17h10"/><path d="M5 7l-2 2 2 2"/><path d="M19 15l2 2-2 2"/></svg></button>'
+          : needsCleanup
+            ? '<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 + deleteButton + '</span>';
+        var actionsHtml = '<span class="session-actions">' + resumeButton + mergeButton + deleteButton + '</span>';
 
         return '<div class="session-item' + activeClass + selectedClass + '" data-session-id="' + session.id + '" role="button" tabindex="0">' +
           '<div class="session-item-content">' +
@@ -2322,12 +2375,35 @@
         '</div>';
       }
 
+      function getWorktreeMergeStatusLabel(session) {
+        if (!session || !session.worktreeMergeStatus) return "";
+        var labels = {
+          ready: "可合并",
+          checking: "检查中",
+          merging: "合并中",
+          merged: session.worktreeMergeInfo && session.worktreeMergeInfo.cleanupDone === false ? "已合并待清理" : "已合并",
+          failed: "合并失败"
+        };
+        return labels[session.worktreeMergeStatus] || "";
+      }
+
+      function renderWorktreeMergeBadge(session) {
+        var label = getWorktreeMergeStatusLabel(session);
+        if (!label) return "";
+        return '<span class="session-kind-badge worktree-merge ' + escapeHtml(session.worktreeMergeStatus || "") + '">' + escapeHtml(label) + '</span>';
+      }
+
       function renderWorktreeBadge(session) {
         if (!session || !session.worktreeEnabled) return "";
-        var title = session.worktree && session.worktree.branch
-          ? ' title="' + escapeHtml('Worktree: ' + session.worktree.branch) + '"'
-          : '';
-        return '<span class="session-kind-badge worktree"' + title + '>Worktree</span>';
+        var titleParts = [];
+        if (session.worktree && session.worktree.branch) {
+          titleParts.push('Worktree: ' + session.worktree.branch);
+        }
+        if (session.worktree && session.worktree.path) {
+          titleParts.push('Path: ' + session.worktree.path);
+        }
+        var title = titleParts.length > 0 ? ' title="' + escapeHtml(titleParts.join('\n')) + '"' : '';
+        return '<span class="session-kind-badge worktree"' + title + '>Worktree</span>' + renderWorktreeMergeBadge(session);
       }
 
       function renderSessionKindBadge(session) {
@@ -2531,33 +2607,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");
@@ -2738,13 +2866,36 @@
         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);
+        // 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") {
             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();
@@ -2754,6 +2905,12 @@
         if (drawerNewSessBtn) drawerNewSessBtn.addEventListener("click", openSessionModal);
         var closeModalBtn = document.getElementById("close-modal-button");
         if (closeModalBtn) closeModalBtn.addEventListener("click", closeSessionModal);
+        var closeWorktreeMergeBtn = document.getElementById("close-worktree-merge-button");
+        if (closeWorktreeMergeBtn) closeWorktreeMergeBtn.addEventListener("click", closeWorktreeMergeModal);
+        var worktreeMergeCancelBtn = document.getElementById("worktree-merge-cancel-button");
+        if (worktreeMergeCancelBtn) worktreeMergeCancelBtn.addEventListener("click", closeWorktreeMergeModal);
+        var worktreeMergeConfirmBtn = document.getElementById("worktree-merge-confirm-button");
+        if (worktreeMergeConfirmBtn) worktreeMergeConfirmBtn.addEventListener("click", confirmWorktreeMerge);
         var runBtn = document.getElementById("run-button");
         if (runBtn) runBtn.addEventListener("click", runCommand);
         var approvePermissionBtn = document.getElementById("approve-permission-btn");
@@ -2778,6 +2935,7 @@
         var sessionModal = document.getElementById("session-modal");
         if (sessionModal) sessionModal.addEventListener("click", function(e) {
           if (e.target.id === "session-modal") closeSessionModal();
+          if (e.target.id === "worktree-merge-modal") closeWorktreeMergeModal();
         });
 
         var inputBox = document.getElementById("input-box");
@@ -2800,11 +2958,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) {
@@ -3371,6 +3524,10 @@
             handleResumeAction(actionButton);
           } else if (actionButton.dataset.action === "resume-history" && actionButton.dataset.claudeSessionId) {
             handleResumeHistoryAction(actionButton);
+          } else if (actionButton.dataset.action === "worktree-merge" && actionButton.dataset.sessionId) {
+            openWorktreeMergeModal(actionButton.dataset.sessionId);
+          } else if (actionButton.dataset.action === "worktree-cleanup" && actionButton.dataset.sessionId) {
+            retryWorktreeCleanup(actionButton.dataset.sessionId);
           }
           return;
         }
@@ -3489,6 +3646,8 @@
         if (button) {
           button.classList.toggle("visible", shouldShow);
         }
+        var termContainer = document.getElementById("output");
+        if (termContainer) termContainer.classList.toggle("has-jump-btn", shouldShow);
       }
 
       function isTerminalNearBottom() {
@@ -4219,9 +4378,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; });
@@ -4234,17 +4390,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);
@@ -4795,6 +4940,162 @@
         document.addEventListener("keydown", focusTrapHandler);
       }
 
+      function getActiveWorktreeMergeSession() {
+        if (!state.activeWorktreeMergeSessionId) return null;
+        return state.sessions.find(function(session) { return session.id === state.activeWorktreeMergeSessionId; }) || null;
+      }
+
+      function renderWorktreeMergeContent() {
+        var container = document.getElementById("worktree-merge-content");
+        var confirmBtn = document.getElementById("worktree-merge-confirm-button");
+        var errorEl = document.getElementById("worktree-merge-error");
+        var session = getActiveWorktreeMergeSession();
+        var result = state.worktreeMergeCheckResult;
+        if (!container || !confirmBtn) return;
+        if (!session || !session.worktree) {
+          container.innerHTML = '<p class="field-hint">未找到可合并的 worktree 会话。</p>';
+          confirmBtn.disabled = true;
+          return;
+        }
+        if (errorEl) {
+          if (state.worktreeMergeError) {
+            showError(errorEl, state.worktreeMergeError);
+          } else {
+            hideError(errorEl);
+          }
+        }
+        var rows = [
+          '<div class="worktree-merge-row"><span>来源分支</span><strong>' + escapeHtml(session.worktree.branch || "-") + '</strong></div>',
+          '<div class="worktree-merge-row"><span>工作目录</span><strong>' + escapeHtml(session.worktree.path || "-") + '</strong></div>'
+        ];
+        if (result) {
+          rows.push('<div class="worktree-merge-row"><span>目标分支</span><strong>' + escapeHtml(result.targetBranch || "-") + '</strong></div>');
+          rows.push('<div class="worktree-merge-row"><span>待合并提交</span><strong>' + escapeHtml(String(result.aheadCount || 0)) + '</strong></div>');
+          rows.push('<div class="worktree-merge-row"><span>未提交改动</span><strong>' + escapeHtml(result.hasUncommittedChanges ? "有" : "无") + '</strong></div>');
+          rows.push('<div class="worktree-merge-row"><span>冲突风险</span><strong>' + escapeHtml(result.hasConflicts ? "有" : "无") + '</strong></div>');
+          if (result.reason) {
+            rows.push('<p class="field-hint">' + escapeHtml(result.reason) + '</p>');
+          }
+        } else if (state.worktreeMergeLoading) {
+          rows.push('<p class="field-hint">正在检查 worktree 合并状态…</p>');
+        }
+        container.innerHTML = rows.join("");
+        confirmBtn.disabled = state.worktreeMergeLoading || state.worktreeMergeSubmitting || !result || result.ok !== true;
+        confirmBtn.textContent = state.worktreeMergeSubmitting ? "合并中..." : "确认合并并清理";
+      }
+
+      function openWorktreeMergeModal(sessionId) {
+        state.activeWorktreeMergeSessionId = sessionId;
+        state.worktreeMergeCheckResult = null;
+        state.worktreeMergeLoading = true;
+        state.worktreeMergeSubmitting = false;
+        state.worktreeMergeError = "";
+        closeSessionModal();
+        closeSettingsModal();
+        var modal = document.getElementById("worktree-merge-modal");
+        if (modal) {
+          modal.classList.remove("hidden");
+          lastFocusedElement = document.activeElement;
+          setupFocusTrap(modal);
+        }
+        renderWorktreeMergeContent();
+        fetch("/api/sessions/" + encodeURIComponent(sessionId) + "/worktree/merge/check", {
+          method: "POST",
+          credentials: "same-origin"
+        })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data && data.error) {
+              throw new Error(data.error);
+            }
+            if (data && data.session) {
+              updateSessionSnapshot(data.session);
+            }
+            state.worktreeMergeCheckResult = data.result || null;
+            state.worktreeMergeError = "";
+          })
+          .catch(function(error) {
+            state.worktreeMergeError = (error && error.message) || "无法检查 worktree 合并状态。";
+          })
+          .finally(function() {
+            state.worktreeMergeLoading = false;
+            renderWorktreeMergeContent();
+          });
+      }
+
+      function closeWorktreeMergeModal() {
+        var modal = document.getElementById("worktree-merge-modal");
+        state.activeWorktreeMergeSessionId = null;
+        state.worktreeMergeCheckResult = null;
+        state.worktreeMergeLoading = false;
+        state.worktreeMergeSubmitting = false;
+        state.worktreeMergeError = "";
+        if (modal) {
+          modal.classList.add("hidden");
+        }
+        if (focusTrapHandler) {
+          document.removeEventListener("keydown", focusTrapHandler);
+          focusTrapHandler = null;
+        }
+        if (lastFocusedElement && typeof lastFocusedElement.focus === "function") {
+          lastFocusedElement.focus();
+        }
+      }
+
+      function confirmWorktreeMerge() {
+        if (!state.activeWorktreeMergeSessionId || state.worktreeMergeSubmitting) return;
+        state.worktreeMergeSubmitting = true;
+        state.worktreeMergeError = "";
+        renderWorktreeMergeContent();
+        fetch("/api/sessions/" + encodeURIComponent(state.activeWorktreeMergeSessionId) + "/worktree/merge", {
+          method: "POST",
+          credentials: "same-origin",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({})
+        })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data && data.error) {
+              throw new Error(data.error);
+            }
+            if (data && data.session) {
+              updateSessionSnapshot(data.session);
+            }
+            showToast("已合并到 " + escapeHtml((data.result && data.result.targetBranch) || "主分支") + ((data.result && data.result.cleanupDone === false) ? "，但工作树待清理。" : "。"), "info");
+            closeWorktreeMergeModal();
+            return refreshAll();
+          })
+          .catch(function(error) {
+            state.worktreeMergeError = (error && error.message) || "无法合并 worktree。";
+            renderWorktreeMergeContent();
+          })
+          .finally(function() {
+            state.worktreeMergeSubmitting = false;
+            renderWorktreeMergeContent();
+          });
+      }
+
+      function retryWorktreeCleanup(sessionId) {
+        fetch("/api/sessions/" + encodeURIComponent(sessionId) + "/worktree/cleanup", {
+          method: "POST",
+          credentials: "same-origin"
+        })
+          .then(function(res) { return res.json(); })
+          .then(function(data) {
+            if (data && data.error) {
+              throw new Error(data.error);
+            }
+            if (data && data.session) {
+              updateSessionSnapshot(data.session);
+            }
+            showToast("已完成 worktree 清理。", "info");
+            return refreshAll();
+          })
+          .catch(function(error) {
+            showToast((error && error.message) || "无法清理 worktree。", "error");
+          });
+      }
+
       function openSettingsModal() {
         // Close session modal first if open (mutual exclusion)
         closeSessionModal();
@@ -4812,6 +5113,12 @@
           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();
         }
       }
 
@@ -4919,6 +5226,16 @@
               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");
+              }
+            }
+
             // Config fields
             var cfg = data.config || {};
             var hostEl = document.getElementById("cfg-host");
@@ -5111,7 +5428,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");
           }
@@ -5119,11 +5436,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");
           }
@@ -5131,11 +5451,18 @@
         });
       }
 
+      function performSettingsRestart() {
+        var restartBtn = document.getElementById("do-restart-button");
+        var msgEl = document.getElementById("update-message");
+        performRestart(restartBtn, msgEl);
+      }
+
       // ── Notification Settings Helpers ──
 
       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;
 
@@ -5143,6 +5470,7 @@
           statusEl.textContent = "\u4e0d\u652f\u6301";
           statusEl.style.color = "var(--fg-muted)";
           if (requestBtn) requestBtn.classList.add("hidden");
+          if (resetBtn) resetBtn.classList.add("hidden");
           return;
         }
 
@@ -5151,45 +5479,86 @@
           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");
+        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 = [];
+
+        // 1. Test sound playback
+        var soundOk = tryPlayNotificationSound();
+        results.push(soundOk ? "\u2713 \u63d0\u793a\u97f3" : "\u2717 \u63d0\u793a\u97f3\uff08\u65e0\u6cd5\u64ad\u653e\uff09");
 
-        // Always show in-app bubble
+        // 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
+        // 3. 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");
-          }
+          results.push("\u2013 \u6d4f\u89c8\u5668\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",
@@ -5197,35 +5566,37 @@
               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 \u6d4f\u89c8\u5668\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 \u6d4f\u89c8\u5668\u901a\u77e5\uff08\u53d1\u9001\u5931\u8d25\uff0c\u53ef\u80fd\u9700\u8981 HTTPS\uff09");
           }
+          showTestResults(testMsgEl, results);
+        } else if (perm === "denied") {
+          results.push("\u2717 \u6d4f\u89c8\u5668\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 \u6d4f\u89c8\u5668\u901a\u77e5\uff08\u5df2\u6388\u6743\uff09");
+            } else {
+              results.push("\u2717 \u6d4f\u89c8\u5668\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();
@@ -6225,13 +6596,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("思考中…");
@@ -6244,6 +6619,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" },
@@ -6256,13 +6636,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 换行");
             }
@@ -6314,7 +6702,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 }] });
           }
         }
@@ -7429,24 +7835,7 @@
 
       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);
         }, 100);
       }
@@ -8169,20 +8558,6 @@
           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);
           }
@@ -8507,8 +8882,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;
@@ -8696,6 +9072,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;
               }
@@ -8749,12 +9129,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();
                 }
               }
             }
@@ -8762,23 +9143,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;
@@ -9455,7 +9827,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;
@@ -11068,33 +11440,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>';
           }
@@ -11565,8 +12020,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.
@@ -11581,6 +12036,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");
@@ -11691,6 +12152,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;")