@co0ontty/wand 1.21.5 → 1.21.8

package/dist/structured-session-manager.js

@@ -1065,6 +1065,30 @@ export class StructuredSessionManager {
                 model: undefined,
                 usage: undefined,
             };
+            // claude -p --output-format stream-json 在同一条消息流式生成期间会重复
+            // emit 同一个 message.id 的 "assistant" 事件，每次 content 略多一些；子
+            // agent 流（Task 工具）则会插入若干 parent_tool_use_id 不同的 message.id。
+            // 朴素的 push(...content) 会让早期片段被反复合并复制，最终被 compact 出
+            // 怪异结果，导致 UI 上 tool_use / 子 agent 输出"显示一下就消失"。
+            // 这里按 (message.id) 去重，相同 id 视作同一消息的更新覆盖；tool_result
+            // 用单调递增的合成 key 顺序追加。每次事件后用插入顺序重建 turnState.blocks。
+            const blocksByKey = new Map();
+            const keyOrder = [];
+            let toolResultSeq = 0;
+            const upsertBlocks = (key, blocks) => {
+                if (!blocksByKey.has(key))
+                    keyOrder.push(key);
+                blocksByKey.set(key, blocks);
+            };
+            const rebuildTurnBlocks = () => {
+                const flat = [];
+                for (const key of keyOrder) {
+                    const entry = blocksByKey.get(key);
+                    if (entry && entry.length > 0)
+                        flat.push(...entry);
+                }
+                turnState.blocks = flat;
+            };
             // Line buffer for NDJSON: chunks from stdout may split mid-line.
             let lineBuf = "";
             // Debounce output events to avoid flooding the WebSocket.
@@ -1141,8 +1165,15 @@ export class StructuredSessionManager {
                 this.logger?.appendStreamEvent(sessionId, parsed);
                 if (parsed && parsed.type === "assistant" && parsed.message) {
                     const extracted = this.extractAssistantMessage(parsed.message);
+                    // 用 message.id 作为 key：claude -p 流式重发同一条消息时整段覆盖
+                    // （而不是与早期片段累加），子 agent 的不同消息 id 各占一格、保留
+                    // 父子完整顺序。没有 id 时退化为合成 key 走追加模式。
+                    const msgId = typeof parsed.message.id === "string" && parsed.message.id
+                        ? `assistant:${parsed.message.id}`
+                        : `assistant:anon:${keyOrder.length}`;
                     if (extracted.content.length > 0) {
-                        turnState.blocks.push(...extracted.content);
+                        upsertBlocks(msgId, extracted.content);
+                        rebuildTurnBlocks();
                     }
                     // NOTE: usage from streaming "assistant" events contains partial/incremental
                     // token counts (e.g. output_tokens=1 during streaming) and is NOT accurate.
@@ -1166,9 +1197,11 @@ export class StructuredSessionManager {
                     return;
                 }
                 if (parsed && parsed.type === "user" && parsed.message && Array.isArray(parsed.message.content)) {
+                    // tool_result 没有自身 id，按到达顺序用合成 key 追加（永远不被覆盖）。
+                    const collected = [];
                     for (const block of parsed.message.content) {
                         if (block && block.type === "tool_result") {
-                            turnState.blocks.push({
+                            collected.push({
                                 type: "tool_result",
                                 tool_use_id: typeof block.tool_use_id === "string" ? block.tool_use_id : "",
                                 content: this.normalizeToolResultContent(block.content),
@@ -1176,6 +1209,10 @@ export class StructuredSessionManager {
                             });
                         }
                     }
+                    if (collected.length > 0) {
+                        upsertBlocks(`tool_result:${toolResultSeq++}`, collected);
+                        rebuildTurnBlocks();
+                    }
                     syncSnapshot();
                     scheduleEmit();
                     return;
@@ -1476,8 +1513,16 @@ export class StructuredSessionManager {
             model: undefined,
             usage: undefined,
         };
-        // Tracks in-progress streaming blocks keyed by content_block index from stream_event
+        // Tracks in-progress streaming blocks keyed by content_block index from stream_event.
+        // The map is cleared whenever a complete `assistant` message arrives — its blocks
+        // are then promoted into `finalizedBlocks` below.
         const streamingBlockByIndex = new Map();
+        // Blocks from messages that have already completed within this turn — including
+        // the parent assistant's prior messages, every subagent assistant message, and
+        // every tool_result. Subagent (Task tool) flows produce many assistant messages
+        // back-to-back; without this list, each new streaming message would visually
+        // erase everything that came before it in the same turn.
+        const finalizedBlocks = [];
         let emitTimer = null;
         const flushEmit = () => {
             if (emitTimer) {
@@ -1493,16 +1538,18 @@ export class StructuredSessionManager {
             if (!emitTimer)
                 emitTimer = setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS);
         };
-        // Rebuild ContentBlock[] from the in-progress streaming blocks map
+        // Rebuild ContentBlock[] from finalized history + the in-progress streaming map.
+        // Returning only the streaming blocks would drop every prior parent/subagent
+        // message in this turn (the original disappearing-output bug).
         const rebuildStreamingBlocks = () => {
             const sorted = [...streamingBlockByIndex.entries()].sort((a, b) => a[0] - b[0]);
-            const blocks = [];
+            const streaming = [];
             for (const [, sb] of sorted) {
                 if (sb.type === "text") {
-                    blocks.push({ type: "text", text: sb.text });
+                    streaming.push({ type: "text", text: sb.text });
                 }
                 else if (sb.type === "thinking") {
-                    blocks.push({ type: "thinking", thinking: sb.thinking });
+                    streaming.push({ type: "thinking", thinking: sb.thinking });
                 }
                 else if (sb.type === "tool_use" && sb.id && sb.name) {
                     let input = {};
@@ -1512,10 +1559,10 @@ export class StructuredSessionManager {
                         }
                         catch { /* partial json */ }
                     }
-                    blocks.push({ type: "tool_use", id: sb.id, name: sb.name, input });
+                    streaming.push({ type: "tool_use", id: sb.id, name: sb.name, input });
                 }
             }
-            return blocks;
+            return [...finalizedBlocks, ...streaming];
         };
         const syncSnapshot = () => {
             const current = this.sessions.get(sessionId);
@@ -1611,14 +1658,15 @@ export class StructuredSessionManager {
                     }
                     continue;
                 }
-                // Complete assistant turn — authoritative content replaces streaming blocks
+                // Complete assistant turn — promote streaming content into the finalized
+                // history so subsequent messages (subagents, follow-up parent messages)
+                // append to it instead of erasing it.
                 if (msg.type === "assistant") {
                     const assistantMsg = msg;
                     const extracted = this.extractAssistantMessage(assistantMsg.message);
-                    // Keep tool_result blocks from previous user messages, replace streaming assistant content
-                    const toolResults = turnState.blocks.filter(b => b.type === "tool_result");
-                    turnState.blocks = [...extracted.content, ...toolResults];
+                    finalizedBlocks.push(...extracted.content);
                     streamingBlockByIndex.clear();
+                    turnState.blocks = rebuildStreamingBlocks();
                     if (assistantMsg.session_id)
                         turnState.sessionId = assistantMsg.session_id;
                     syncSnapshot();
@@ -1634,14 +1682,15 @@ export class StructuredSessionManager {
                     }
                     continue;
                 }
-                // Tool results fed back from the claude subprocess
+                // Tool results fed back from the claude subprocess (parent's view of a
+                // tool call, or a subagent's tool_result during Task execution).
                 if (msg.type === "user") {
                     const userMsg = msg;
                     const content = Array.isArray(userMsg.message?.content) ? userMsg.message.content : [];
                     for (const block of content) {
                         const b = block;
                         if (b?.type === "tool_result") {
-                            turnState.blocks.push({
+                            finalizedBlocks.push({
                                 type: "tool_result",
                                 tool_use_id: typeof b.tool_use_id === "string" ? b.tool_use_id : "",
                                 content: this.normalizeToolResultContent(b.content),
@@ -1649,6 +1698,7 @@ export class StructuredSessionManager {
                             });
                         }
                     }
+                    turnState.blocks = rebuildStreamingBlocks();
                     syncSnapshot();
                     scheduleEmit();
                     continue;
@@ -1821,7 +1871,10 @@ export class StructuredSessionManager {
             if (previous
                 && previous.type === "text"
                 && block.type === "text") {
-                previous.text = `${previous.text}${block.text}`;
+                // 用新对象替换 compacted 末尾，**不要**就地改 previous.text —— previous
+                // 通常和调用方持有的 turnState.blocks 共享引用，原地 mutate 会让下次
+                // syncSnapshot 把已合并的内容再合并一次，呈指数级复制。
+                compacted[compacted.length - 1] = { type: "text", text: `${previous.text}${block.text}` };
                 continue;
             }
             compacted.push(block);

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

@@ -1277,7 +1277,7 @@
                   '<button id="sidebar-pin-btn" class="btn btn-ghost btn-sm sidebar-pin-toggle' + (state.sidebarPinned ? ' pinned' : '') + '" type="button" title="' + (state.sidebarPinned ? '取消固定侧栏' : '固定侧栏') + '">' +
                     '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="17" x2="12" y2="22"/><path d="M5 17h14v-1.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V6h1a2 2 0 0 0 0-4H8a2 2 0 0 0 0 4h1v4.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24z"/></svg>' +
                   '</button>' +
-                  '<button id="close-drawer-button" class="btn btn-ghost btn-sm sidebar-close" type="button" aria-label="关闭菜单">×</button>' +
+                  '<button id="close-drawer-button" class="btn btn-ghost btn-icon sidebar-close drawer-close-btn" type="button" aria-label="关闭菜单"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
                 '</div>' +
               '</div>' +
               '<div class="sidebar-body">' +
@@ -1467,19 +1467,15 @@
                     '</div>' +
                   '</div>' +
                   renderExpandedShortcutsRow() +
-                  // Session info bar at bottom
-                  '<div class="input-session-info-bar">' +
-                    '<span id="session-cwd-display" class="session-cwd-display">' + (selectedSession && selectedSession.cwd ? escapeHtml(selectedSession.cwd) : '未设置目录') + '</span>' +
-                    '<span class="session-info-separator">|</span>' +
-                    '<span id="session-mode-display" class="session-mode-display">' + (selectedSession ? getModeLabel(selectedSession.mode) : '默认') + '</span>' +
-                    (selectedSession && selectedSession.autoApprovePermissions ? '<span class="session-info-separator">|</span><span id="auto-approve-toggle" class="auto-approve-indicator active" title="自动批准已启用 — 点击关闭">🛡 自动批准</span>' : '<span class="session-info-separator">|</span><span id="auto-approve-toggle" class="auto-approve-indicator" title="自动批准已关闭 — 点击开启">🛡 手动</span>') +
-                    '<span class="session-info-separator">|</span>' +
-                    '<span id="session-kind-display" class="session-kind-display">' + (selectedSession ? getSessionKindLabel(selectedSession) : '终端') + '</span>' +
-                    '<span class="session-info-separator">|</span>' +
-                    '<span id="session-status-display" class="session-status-display">' + (selectedSession ? getSessionStatusLabel(selectedSession) : '-') + '</span>' +
-                    (selectedSession && selectedSession.provider === "claude" && selectedSession.claudeSessionId ? '<span class="session-info-separator">|</span><span id="claude-session-id-badge" class="claude-session-id-badge" data-claude-id="' + escapeHtml(selectedSession.claudeSessionId) + '" title="点击复制 Claude 会话 ID">☁ ' + escapeHtml(selectedSession.claudeSessionId.slice(0, 8)) + '</span>' : '') +
-                    (selectedSession && !isStructuredSession(selectedSession) ? '<span class="session-info-separator">|</span><span id="session-exit-display" class="session-exit-display">退出码=' + (selectedSession.exitCode !== undefined ? selectedSession.exitCode : 'n/a') + '</span>' : '') +
-                  '</div>' +
+                  // Session info bar at bottom — only keeps unique controls/info
+                  // (cwd / mode / status / kind are already shown in topbar or composer dropdown)
+                  (selectedSession
+                    ? '<div class="input-session-info-bar">' +
+                        (selectedSession.autoApprovePermissions ? '<span id="auto-approve-toggle" class="auto-approve-indicator active" title="自动批准已启用 — 点击关闭">🛡 自动批准</span>' : '<span id="auto-approve-toggle" class="auto-approve-indicator" title="自动批准已关闭 — 点击开启">🛡 手动</span>') +
+                        (selectedSession.provider === "claude" && selectedSession.claudeSessionId ? '<span class="session-info-separator">|</span><span id="claude-session-id-badge" class="claude-session-id-badge" data-claude-id="' + escapeHtml(selectedSession.claudeSessionId) + '" title="点击复制 Claude 会话 ID">☁ ' + escapeHtml(selectedSession.claudeSessionId.slice(0, 8)) + '</span>' : '') +
+                        (!isStructuredSession(selectedSession) && selectedSession.exitCode !== undefined && selectedSession.exitCode !== null ? '<span class="session-info-separator">|</span><span id="session-exit-display" class="session-exit-display">退出码=' + selectedSession.exitCode + '</span>' : '') +
+                      '</div>'
+                    : '') +
                 '</div>' +
                 '<p id="action-error" class="error-message hidden"></p>' +
               '</div>' +
@@ -1488,7 +1484,7 @@
                 '<div class="modal folder-picker-modal">' +
                   '<div class="modal-header">' +
                     '<h2 class="modal-title">选择工作目录</h2>' +
-                    '<button id="close-folder-picker" class="btn btn-ghost btn-icon">×</button>' +
+                    '<button id="close-folder-picker" class="btn btn-ghost btn-icon modal-close-btn" type="button" aria-label="关闭"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
                   '</div>' +
                   '<div class="modal-body">' +
                     '<div class="folder-picker-quick-row">' +
@@ -1794,7 +1790,7 @@
                 '<h2 id="quick-commit-title" class="modal-title">快捷提交</h2>' +
                 '<p class="modal-subtitle">' + escapeHtml((s.branch || "(no branch)") + ' · ' + (s.modifiedCount || 0) + ' 个改动') + '</p>' +
               '</div>' +
-              '<button id="quick-commit-close-btn" class="btn btn-ghost btn-icon" type="button" aria-label="关闭">&times;</button>' +
+              '<button id="quick-commit-close-btn" class="btn btn-ghost btn-icon modal-close-btn" type="button" aria-label="关闭"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
             '</div>' +
             '<div class="modal-body">' +
               '<div class="qc-files-wrap">' + fileRows + '</div>' +
@@ -1804,17 +1800,23 @@
                 '</div>' +
                 '<textarea id="quick-commit-message" class="field-input" rows="2" placeholder="输入 commit message 或点击 AI 生成">' + escapeHtml(f.customMessage || "") + '</textarea>' +
               '</div>' +
-              '<label class="qc-checkbox-row">' +
-                '<input type="checkbox" id="quick-commit-make-tag"' + (f.makeTag ? ' checked' : '') + '>' +
-                '<span>提交后打 tag' + (s.latestTag ? '（当前：' + escapeHtml(s.latestTag) + '）' : '') + '</span>' +
-              '</label>' +
+              '<div class="qc-checkbox-row">' +
+                '<label class="qc-checkbox-label" for="quick-commit-make-tag">提交后打 tag' + (s.latestTag ? '（当前：' + escapeHtml(s.latestTag) + '）' : '') + '</label>' +
+                '<label class="qc-switch">' +
+                  '<input type="checkbox" id="quick-commit-make-tag" class="switch-toggle"' + (f.makeTag ? ' checked' : '') + '>' +
+                  '<span class="switch-slider"></span>' +
+                '</label>' +
+              '</div>' +
               '<div class="qc-tag-row' + (f.makeTag ? '' : ' hidden') + '" id="quick-commit-tag-row">' +
                 '<input type="text" id="quick-commit-tag" class="field-input" placeholder="留空自动 bump patch' + (s.suggestedNextTag ? '（如 ' + escapeHtml(s.suggestedNextTag) + '）' : '') + '" value="' + escapeHtml(f.tag || "") + '">' +
               '</div>' +
-              '<label class="qc-checkbox-row">' +
-                '<input type="checkbox" id="quick-commit-push"' + (f.push ? ' checked' : '') + '>' +
-                '<span>提交后 push 到远端</span>' +
-              '</label>' +
+              '<div class="qc-checkbox-row">' +
+                '<label class="qc-checkbox-label" for="quick-commit-push">提交后 push 到远端</label>' +
+                '<label class="qc-switch">' +
+                  '<input type="checkbox" id="quick-commit-push" class="switch-toggle"' + (f.push ? ' checked' : '') + '>' +
+                  '<span class="switch-slider"></span>' +
+                '</label>' +
+              '</div>' +
               '<p id="quick-commit-error" class="error-message' + (state.quickCommitError ? '' : ' hidden') + '">' + escapeHtml(state.quickCommitError || "") + '</p>' +
               '<div class="worktree-merge-actions">' +
                 '<button id="quick-commit-cancel-btn" class="btn btn-secondary" type="button">取消</button>' +
@@ -1833,7 +1835,7 @@
                 '<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>' +
+              '<button id="close-worktree-merge-button" class="btn btn-ghost btn-icon modal-close-btn" type="button" aria-label="关闭"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
             '</div>' +
             '<div class="modal-body">' +
               '<div id="worktree-merge-content" class="worktree-merge-content"></div>' +
@@ -1855,7 +1857,7 @@
                 '<h2 class="modal-title">设置</h2>' +
                 '<p class="settings-modal-subtitle">调整应用配置、通知、安全和显示偏好</p>' +
               '</div>' +
-              '<button id="close-settings-button" class="btn btn-ghost btn-icon">×</button>' +
+              '<button id="close-settings-button" class="btn btn-ghost btn-icon modal-close-btn" type="button" aria-label="关闭"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
             '</div>' +
             '<div class="modal-body settings-modal-body">' +
               '<div class="settings-layout">' +
@@ -2067,10 +2069,10 @@
                     '<span class="settings-value" id="notification-permission-status">-</span>' +
                   '</div>' +
                   '<div class="settings-update-actions">' +
-                    '<button id="notification-request-btn" class="btn btn-secondary btn-sm hidden" type="button">授权通知</button>' +
-                    '<button id="notification-reset-btn" class="btn btn-secondary btn-sm hidden" type="button">重新授权</button>' +
+                    '<button id="notification-request-btn" class="btn btn-primary btn-sm hidden" type="button">授权通知</button>' +
+                    '<button id="notification-reset-btn" class="btn btn-ghost btn-sm hidden" type="button">重新授权</button>' +
                     '<button id="notification-test-btn" class="btn btn-secondary btn-sm" type="button">发送测试通知</button>' +
-                    '<button id="notification-test-delay-btn" class="btn btn-secondary btn-sm" type="button">10 秒后发送</button>' +
+                    '<button id="notification-test-delay-btn" class="btn btn-ghost btn-sm" type="button">10 秒后发送</button>' +
                   '</div>' +
                   '<p id="notification-test-message" class="hint hidden"></p>' +
                 '</div>' +
@@ -2092,9 +2094,15 @@
                     '<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 class="settings-toggle-row">' +
+                  '<div class="settings-toggle-text">' +
+                    '<label class="settings-toggle-title" for="cfg-https">启用 HTTPS</label>' +
+                    '<span class="settings-toggle-desc">使用自签名证书加密浏览器到服务的连接，host 为非 127.0.0.1 时建议开启。</span>' +
+                  '</div>' +
+                  '<label class="settings-switch">' +
+                    '<input id="cfg-https" type="checkbox" class="switch-toggle" />' +
+                    '<span class="switch-slider"></span>' +
+                  '</label>' +
                 '</div>' +
                 '<div class="field-row">' +
                   '<div class="field">' +
@@ -2129,10 +2137,10 @@
                 '<div class="field">' +
                   '<label class="field-label" for="cfg-structured-runner">结构化会话 Runner</label>' +
                   '<select id="cfg-structured-runner" class="field-input">' +
-                    '<option value="cli">CLI（spawn claude -p，默认）</option>' +
-                    '<option value="sdk">SDK（@anthropic-ai/claude-agent-sdk）</option>' +
+                    '<option value="sdk">SDK（@anthropic-ai/claude-agent-sdk，默认）</option>' +
+                    '<option value="cli">CLI（spawn claude -p）</option>' +
                   '</select>' +
-                  '<p class="field-hint" style="margin-top:4px;">SDK 模式使用官方 Agent SDK 替代 CLI subprocess，接口更整洁，功能等价。重启后生效。</p>' +
+                  '<p class="field-hint" style="margin-top:4px;">SDK 模式使用官方 Agent SDK 替代 CLI subprocess，接口更整洁，功能等价。保存后对新建会话立即生效。</p>' +
                 '</div>' +
                 '<div class="field">' +
                   '<label class="field-label" for="cfg-default-model">默认模型</label>' +
@@ -2350,7 +2358,10 @@
         if (!state.sessionsManageMode) {
           return '<div class="session-manage-bar">' +
             '<span class="sidebar-intro">最近的会话记录</span>' +
-            '<button class="session-manage-toggle" data-action="toggle-manage-mode" type="button">管理</button>' +
+            '<button class="btn btn-ghost btn-xs session-manage-toggle" data-action="toggle-manage-mode" type="button">' +
+              '<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M9 11l3 3L22 4"/><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"/></svg>' +
+              '<span>管理</span>' +
+            '</button>' +
           '</div>';
         }
 
@@ -2364,13 +2375,19 @@
         var selectAllAction = allSelected ? "clear-selection" : "select-all-visible";
         var selectAllDisabled = selectable === 0 ? ' disabled' : '';
 
+        // Linear-style toolbar:
+        //   [N selected]  ─────────  [全选] [清空]  [delete (danger)] [完成 (primary)]
         return '<div class="session-manage-bar active">' +
-          '<div class="session-manage-summary">已选择 ' + totalCount + ' 项</div>' +
+          '<div class="session-manage-summary">' +
+            '<span class="session-manage-count">' + totalCount + '</span>' +
+            '<span class="session-manage-summary-label">已选择</span>' +
+          '</div>' +
           '<div class="session-manage-actions">' +
-            '<button class="session-manage-btn" data-action="' + selectAllAction + '" type="button"' + selectAllDisabled + '>' + selectAllLabel + '</button>' +
-            '<button class="session-manage-btn" data-action="clear-selection" type="button"' + (hasAny ? '' : ' disabled') + '>清空</button>' +
-            '<button class="session-manage-btn danger" data-action="delete-selected" type="button"' + (hasAny ? '' : ' disabled') + '>删除所选</button>' +
-            '<button class="session-manage-btn" data-action="toggle-manage-mode" type="button">完成</button>' +
+            '<button class="btn btn-ghost btn-xs" data-action="' + selectAllAction + '" type="button"' + selectAllDisabled + '>' + selectAllLabel + '</button>' +
+            '<button class="btn btn-ghost btn-xs" data-action="clear-selection" type="button"' + (hasAny ? '' : ' disabled') + '>清空</button>' +
+            '<span class="session-manage-divider"></span>' +
+            '<button class="btn btn-danger btn-xs" data-action="delete-selected" type="button"' + (hasAny ? '' : ' disabled') + '>删除</button>' +
+            '<button class="btn btn-primary btn-xs" data-action="toggle-manage-mode" type="button">完成</button>' +
           '</div>' +
         '</div>';
       }
@@ -2416,7 +2433,7 @@
           ? ' <span class="history-count">' + visibleHistory.length + '</span>'
           : '';
         var clearAllButton = state.claudeHistoryExpanded && state.claudeHistoryLoaded && visibleHistory.length > 0
-          ? '<button class="session-manage-btn danger compact" data-action="clear-all-history" type="button">清空历史</button>'
+          ? '<button class="btn btn-danger btn-xs session-history-clear" data-action="clear-all-history" type="button">清空</button>'
           : '';
         var header = '<div class="session-group-title claude-history-toggle" id="claude-history-toggle">' +
           '<span class="chevron">' + chevron + '</span> Claude 历史' + countBadge +
@@ -2626,7 +2643,7 @@
           '<div class="session-group-title claude-history-directory-title">' +
             '<span class="chevron">' + chevron + '</span>' +
             '<span class="claude-history-directory-label">' + escapeHtml(cwdShort) + ' (' + count + ')</span>' +
-            '<button class="session-manage-btn danger compact claude-history-directory-clear-btn" data-action="delete-history-directory" data-cwd="' +
+            '<button class="btn btn-danger btn-xs claude-history-directory-clear-btn" data-action="delete-history-directory" data-cwd="' +
             escapeHtml(cwd) + '" type="button" aria-label="清空此目录的历史会话" title="清空此目录的历史会话">清空此目录</button>' +
           '</div>' +
         '</div>';
@@ -3461,9 +3478,17 @@
       }
 
       function renderWorktreeToggle(enabled) {
-        return '<label class="session-inline-toggle" for="session-worktree-toggle">' +
-          '<input id="session-worktree-toggle" type="checkbox" class="field-checkbox"' + (enabled ? ' checked' : '') + ' />' +
+        return '<label class="session-inline-toggle" for="session-worktree-toggle" title="为该会话创建独立的 git worktree 分支">' +
+          '<svg class="session-inline-toggle-icon" viewBox="0 0 24 24" width="13" height="13" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+            '<circle cx="6" cy="6" r="2.2"/>' +
+            '<circle cx="18" cy="6" r="2.2"/>' +
+            '<circle cx="12" cy="18" r="2.2"/>' +
+            '<path d="M6 8.2v3.4a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V8.2"/>' +
+            '<path d="M12 13.6v2.2"/>' +
+          '</svg>' +
           '<span class="session-inline-toggle-label">Worktree 模式</span>' +
+          '<input id="session-worktree-toggle" type="checkbox" class="switch-toggle"' + (enabled ? ' checked' : '') + ' />' +
+          '<span class="switch-slider" aria-hidden="true"></span>' +
         '</label>';
       }
 
@@ -3492,7 +3517,7 @@
                 '<h2 class="modal-title">新对话</h2>' +
                 '<p class="modal-subtitle">启动 Claude 或 Codex 会话，选择 provider、会话类型、模式和工作目录。</p>' +
               '</div>' +
-              '<button id="close-modal-button" class="btn btn-ghost btn-icon">&times;</button>' +
+              '<button id="close-modal-button" class="btn btn-ghost btn-icon modal-close-btn" type="button" aria-label="关闭"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
             '</div>' +
             '<div class="modal-body">' +
               '<div class="field">' +
@@ -4039,9 +4064,21 @@
         // Volume slider
         var notifVolumeEl = document.getElementById("cfg-notif-volume");
         var notifVolumeVal = document.getElementById("cfg-notif-volume-val");
+        // Helper to keep the iOS-style range fill in sync with the input value
+        var _syncRangeFill = function(el) {
+          if (!el) return;
+          var minVal = Number(el.min || 0);
+          var maxVal = Number(el.max || 100);
+          var curVal = Number(el.value || 0);
+          var pct = maxVal > minVal
+            ? Math.max(0, Math.min(100, ((curVal - minVal) / (maxVal - minVal)) * 100))
+            : 0;
+          el.style.setProperty("--range-fill", pct + "%");
+        };
         if (notifVolumeEl) {
           notifVolumeEl.value = state.notifVolume;
           if (notifVolumeVal) notifVolumeVal.textContent = state.notifVolume + "%";
+          _syncRangeFill(notifVolumeEl);
           // Hide if sound is off
           var volField = document.getElementById("notif-volume-field");
           if (volField) volField.style.display = state.notifSound ? "" : "none";
@@ -4049,6 +4086,7 @@
           notifVolumeEl.addEventListener("input", function() {
             state.notifVolume = parseInt(notifVolumeEl.value, 10);
             if (notifVolumeVal) notifVolumeVal.textContent = state.notifVolume + "%";
+            _syncRangeFill(notifVolumeEl);
             try { localStorage.setItem("wand-notif-volume", String(state.notifVolume)); } catch (e) {}
             // Also sync to native bridge if available
             if (_hasNativeBridge && typeof WandNative.setNotificationVolume === "function") {
@@ -6823,6 +6861,8 @@
         updateDrawerState();
         var modal = document.getElementById("session-modal");
         if (modal) {
+          if (modal._wandCloseTimer) { clearTimeout(modal._wandCloseTimer); modal._wandCloseTimer = null; }
+          modal.classList.remove("closing");
           modal.classList.remove("hidden");
           lastFocusedElement = document.activeElement;
           state.sessionTool = getPreferredTool();
@@ -6844,8 +6884,7 @@
         state.modalOpen = false;
         var modal = document.getElementById("session-modal");
         if (modal) {
-          modal.classList.add("hidden");
-          // Remove focus trap
+          // Remove focus trap before kicking off the exit animation
           if (focusTrapHandler) {
             document.removeEventListener("keydown", focusTrapHandler);
             focusTrapHandler = null;
@@ -6854,10 +6893,38 @@
           if (lastFocusedElement && typeof lastFocusedElement.focus === "function") {
             lastFocusedElement.focus();
           }
+          animateModalClose(modal);
         }
         hidePathSuggestions();
       }
 
+      // Run the liquid-glass exit animation on a modal-backdrop, then mark it hidden.
+      // Falls back to instant hide when reduced-motion is requested or a tab is in the background.
+      function animateModalClose(modal) {
+        if (!modal) return;
+        if (modal.classList.contains("hidden")) return;
+        var prefersReducedMotion = false;
+        try {
+          prefersReducedMotion = window.matchMedia && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+        } catch (_e) {}
+        if (prefersReducedMotion || document.hidden) {
+          modal.classList.remove("closing");
+          modal.classList.add("hidden");
+          return;
+        }
+        // Cancel any outstanding pending hide on the same node
+        if (modal._wandCloseTimer) {
+          clearTimeout(modal._wandCloseTimer);
+          modal._wandCloseTimer = null;
+        }
+        modal.classList.add("closing");
+        modal._wandCloseTimer = setTimeout(function() {
+          modal.classList.remove("closing");
+          modal.classList.add("hidden");
+          modal._wandCloseTimer = null;
+        }, 170);
+      }
+
       function setupFocusTrap(modal) {
         if (focusTrapHandler) {
           document.removeEventListener("keydown", focusTrapHandler);
@@ -7054,6 +7121,8 @@
         closeSessionModal();
         var modal = document.getElementById("settings-modal");
         if (modal) {
+          if (modal._wandCloseTimer) { clearTimeout(modal._wandCloseTimer); modal._wandCloseTimer = null; }
+          modal.classList.remove("closing");
           modal.classList.remove("hidden");
           lastFocusedElement = document.activeElement;
           var passEl = document.getElementById("new-password");
@@ -7077,6 +7146,8 @@
           if (volEl) {
             volEl.value = state.notifVolume;
             if (volValEl) volValEl.textContent = state.notifVolume + "%";
+            // Sync the iOS-style fill via the input listener (calls _syncRangeFill)
+            try { volEl.dispatchEvent(new Event("input", { bubbles: true })); } catch (_e) {}
           }
           var volField = document.getElementById("notif-volume-field");
           if (volField) volField.style.display = state.notifSound ? "" : "none";
@@ -7098,6 +7169,8 @@
               state.notifVolume = nativeVol;
               if (volEl) volEl.value = nativeVol;
               if (volValEl) volValEl.textContent = nativeVol + "%";
+              // Sync the iOS-style fill so the orange track matches
+              if (volEl) { try { volEl.dispatchEvent(new Event("input", { bubbles: true })); } catch (_e) {} }
               try { localStorage.setItem("wand-notif-volume", String(nativeVol)); } catch (_e) {}
             } catch (_e) {}
           }
@@ -7113,8 +7186,7 @@
       function closeSettingsModal() {
         var modal = document.getElementById("settings-modal");
         if (modal) {
-          modal.classList.add("hidden");
-          // Remove focus trap
+          // Remove focus trap before kicking off the exit animation
           if (focusTrapHandler) {
             document.removeEventListener("keydown", focusTrapHandler);
             focusTrapHandler = null;
@@ -7123,6 +7195,7 @@
           if (lastFocusedElement && typeof lastFocusedElement.focus === "function") {
             lastFocusedElement.focus();
           }
+          animateModalClose(modal);
         }
       }
 
@@ -7543,7 +7616,9 @@
               msgEl.textContent = data.error;
               msgEl.style.color = "var(--error)";
             } else {
-              msgEl.textContent = "配置已保存，部分更改需要重启后生效。";
+              msgEl.textContent = data.restartRequired
+                ? "配置已保存，部分部署字段（host/port/https/shell）需要重启服务才生效。"
+                : "配置已保存。";
               msgEl.style.color = "var(--success)";
             }
             msgEl.classList.remove("hidden");