@co0ontty/wand 1.30.3 → 1.31.1

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

@@ -129,6 +129,13 @@
           }
         })(), // 跨会话排队消息 [{ id, text, cwd, mode, tool }]
         structuredInputQueue: [], // 结构化会话同会话排队消息
+        // 排队条 UI 局部状态 ——
+        //   queueBarExpanded: 折叠条点击展开成下拉面板
+        //   queueBarItemExpanded: 展开面板里被点开看完整内容的 item 下标集合
+        //   queueBarDrag: 拖拽排序进行中时的临时状态（pointer 捕获、起始坐标、参考 rect）
+        queueBarExpanded: false,
+        queueBarItemExpanded: {},
+        queueBarDrag: null,
         drafts: {},
         isSyncingInputBox: false,
         loginPending: false,
@@ -149,6 +156,12 @@
         chatModel: (function() {
           try { return localStorage.getItem("wand-chat-model") || ""; } catch (e) { return ""; }
         })(),
+        chatThinking: (function() {
+          try {
+            var v = localStorage.getItem("wand-thinking-effort") || "off";
+            return (v === "off" || v === "standard" || v === "deep" || v === "max") ? v : "off";
+          } catch (e) { return "off"; }
+        })(),
         availableModels: [],
         availableCodexModels: [],
         modelsRefreshing: false,
@@ -1497,14 +1510,17 @@
         var preferredTool = getComposerTool();
         var composerMode = getSafeModeForTool(preferredTool, state.chatMode);
 
-        var isDesktopPinned = state.sidebarPinned && !isMobileLayout();
-        var isCollapsed = isDesktopPinned && state.sidebarCollapsed;
+        // 手机端不允许「pin 但不窄条」（300px 固定边栏太占地），只允许窄条形态。
+        // isAnchored = 边栏占据布局空间（推开主内容）。桌面 pin 或 任意端窄条都算 anchored。
+        var isMobile = isMobileLayout();
+        var isCollapsed = !!state.sidebarPinned && !!state.sidebarCollapsed;
+        var isAnchored = isCollapsed || (!!state.sidebarPinned && !isMobile);
         var collapsedCls = isCollapsed ? ' sidebar-collapsed' : '';
         var sidebarCollapsedCls = isCollapsed ? ' collapsed' : '';
         return '<div class="app-container">' +
           '<div id="sessions-drawer-backdrop" class="drawer-backdrop' + drawerClass + '"></div>' +
-          '<div class="main-layout' + (state.sessionsDrawerOpen ? ' sidebar-open' : '') + (isDesktopPinned ? ' sidebar-pinned' : '') + collapsedCls + '">' +
-            '<aside id="sessions-drawer" class="sidebar' + drawerClass + (isDesktopPinned ? ' pinned' : '') + sidebarCollapsedCls + '">' +
+          '<div class="main-layout' + (state.sessionsDrawerOpen ? ' sidebar-open' : '') + (isAnchored ? ' sidebar-pinned' : '') + collapsedCls + '">' +
+            '<aside id="sessions-drawer" class="sidebar' + drawerClass + (isAnchored ? ' pinned' : '') + sidebarCollapsedCls + '">' +
               '<div class="sidebar-header">' +
                 '<div class="sidebar-header-main">' +
                   '<div class="topbar-logo-icon">W</div>' +
@@ -1704,6 +1720,11 @@
                     '<ul class="todo-progress-list" id="todo-progress-list"></ul>' +
                   '</div>' +
                 '</div>' +
+                // 排队条宿主：默认 display:none，updateQueueBar() 在 queuedMessages 非空时
+                // 显形。结构上夹在 composer-top-row（todo 进度）和 input-composer（输入框 +
+                // 工具栏）之间，位置正好"在输入框上方、对话框右下角"。所有内容由 updater
+                // 注入；这里只保留稳定的外层骨架，便于 renderAppShell 全量重建后无缝复位。
+                '<div id="queue-bar-host" class="queue-bar-host" hidden></div>' +
                 '<div class="input-composer">' +
                   '<button id="prompt-optimize-btn" class="prompt-optimize-btn" type="button" title="提示词优化（AI）" aria-label="提示词优化">' +
                     '<svg class="prompt-optimize-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
@@ -1724,13 +1745,33 @@
                       // tabindex="-1": 把这些控件移出 iOS Safari 的表单导航链，
                       // 这样 textarea 聚焦时键盘上方就不会出现 ⌃ ⌄ ✓ 表单辅助栏。
                       '<input type="file" id="file-upload-input" multiple tabindex="-1" style="position:absolute;width:1px;height:1px;opacity:0;overflow:hidden;clip:rect(0,0,0,0);pointer-events:none">' +
-                      '<select id="chat-mode-select" class="chat-mode-select" tabindex="-1" title="仅对新建会话生效">' +
-                        renderModeOptions(preferredTool, composerMode) +
-                      '</select>' +
-                      '<select id="chat-model-select" class="chat-mode-select chat-model-select" tabindex="-1" title="切换模型（对运行中会话发送 /model，对新会话作为 --model 启动）">' +
-                        renderChatModelOptions(getEffectiveModel(selectedSession), selectedSession) +
-                      '</select>' +
-                      '<button id="terminal-interactive-toggle-top" class="composer-interactive-toggle' + (state.terminalInteractive ? " active" : "") + '" type="button" title="切换终端交互模式">⌨</button>' +
+                      // 三件套 (Mode / Model / Thinking) 同属"会话设置"层：扁平文字 + · 分隔。
+                      // 文字下叠一个透明 <select> 承载交互，桌面端弹原生下拉、移动端弹滚轮选择。
+                      // 显示文本用 raw id（如 default / claude-sonnet-4-5 / standard），不做翻译。
+                      '<span class="composer-text-group" role="group" aria-label="会话设置">' +
+                        '<span class="composer-text-pill" title="模式">' +
+                          '<span class="composer-text-label" id="chat-mode-label">' + escapeHtml(composerMode) + '</span>' +
+                          '<select id="chat-mode-select" class="composer-text-hidden-select" tabindex="-1" aria-label="模式">' +
+                            renderChatModeOptionsRaw(preferredTool, composerMode) +
+                          '</select>' +
+                        '</span>' +
+                        '<span class="composer-text-sep" aria-hidden="true">·</span>' +
+                        '<span class="composer-text-pill chat-model-text-pill" title="模型">' +
+                          '<span class="composer-text-label" id="chat-model-label">' + escapeHtml(getEffectiveModel(selectedSession) || "default") + '</span>' +
+                          '<select id="chat-model-select" class="composer-text-hidden-select" tabindex="-1" aria-label="模型">' +
+                            renderChatModelOptionsRaw(getEffectiveModel(selectedSession), selectedSession) +
+                          '</select>' +
+                        '</span>' +
+                        '<span class="composer-text-sep" aria-hidden="true">·</span>' +
+                        '<span class="composer-text-pill chat-thinking-text-pill" title="思考深度">' +
+                          '<span class="composer-text-label" id="chat-thinking-label">' + escapeHtml(getEffectiveThinking(selectedSession)) + '</span>' +
+                          '<select id="chat-thinking-select" class="composer-text-hidden-select" tabindex="-1" aria-label="思考深度">' +
+                            renderChatThinkingOptionsRaw(getEffectiveThinking(selectedSession)) +
+                          '</select>' +
+                        '</span>' +
+                      '</span>' +
+                      renderAutoApproveChip(selectedSession) +
+                      '<button id="terminal-interactive-toggle-top" class="composer-pill composer-pill-chip composer-interactive-toggle' + (state.terminalInteractive ? " active" : "") + '" type="button" title="切换终端交互模式">⌨</button>' +
                       '<span class="permission-actions hidden" id="permission-actions">' +
                         '<span class="permission-actions-divider"></span>' +
                         '<span class="permission-actions-label" id="permission-actions-label">等待授权</span>' +
@@ -1740,7 +1781,7 @@
                       renderApprovalStatsBadge() +
                     '</div>' +
                     '<div class="input-composer-right">' +
-                      '<span id="queue-counter" class="queue-counter hidden">队列: 0</span>' +
+                      // 排队提示从这里搬到 .queue-bar（输入框上方独立浮条），原 #queue-counter 已移除。
                       '<span class="input-hint' + (state.terminalInteractive ? ' terminal-interactive-hint' : state.currentView === "terminal" ? " hidden" : "") + '">' + (state.terminalInteractive ? '终端交互中 · Ctrl+C 中断 · Ctrl+L 清屏' : 'Enter 发送 · Shift+Enter 换行') + '</span>' +
                       renderInlineKeyboard() +
                       '<button id="stop-button" class="btn-circle btn-circle-stop' + (state.selectedId ? "" : " hidden") + '" title="停止">' +
@@ -1748,8 +1789,10 @@
                       '</button>' +
                       // 结构化模式且正在出 token 时显示：中断当前回复、立刻发送新输入。
                       // 默认走 #send-input-button → 排队；想插队的人显式按这颗。
-                      '<button id="interrupt-send-button" class="btn-circle btn-circle-interrupt hidden" type="button" title="中断当前回复并立即发送" aria-label="立即发送">' +
-                        '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="13 17 18 12 13 7"/><polyline points="6 17 11 12 6 7"/></svg>' +
+                      // 用 pill 形态 + 文字 + 脉动，让用户一眼就看到「立即发送」这条快捷路径。
+                      '<button id="interrupt-send-button" class="btn-pill btn-pill-interrupt hidden" type="button" title="中断当前回复并立即发送新输入（Cmd/Ctrl+Enter）" aria-label="立即发送">' +
+                        '<svg class="btn-pill-icon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="13 17 18 12 13 7"/><polyline points="6 17 11 12 6 7"/></svg>' +
+                        '<span class="btn-pill-label">立即</span>' +
                       '</button>' +
                       '<button id="send-input-button" class="btn-circle btn-circle-send" title="发送">' +
                         '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><line x1="22" y1="2" x2="11" y2="13"/><polygon points="22 2 15 22 11 13 2 9 22 2"/></svg>' +
@@ -1757,14 +1800,20 @@
                     '</div>' +
                   '</div>' +
                   renderExpandedShortcutsRow() +
-                  // Session info bar at bottom — only keeps unique controls/info
-                  // (cwd / mode / status / kind are already shown in topbar or composer dropdown)
+                  // Session info bar at bottom — 仅保留信息类徽章（Claude session id / exit code）。
+                  // 自动批准已从这里移到主 pill 行（renderAutoApproveChip）。
                   (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>'
+                    ? (function() {
+                        var bits = "";
+                        if (selectedSession.provider === "claude" && selectedSession.claudeSessionId) {
+                          bits += '<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>';
+                        }
+                        if (!isStructuredSession(selectedSession) && selectedSession.exitCode !== undefined && selectedSession.exitCode !== null) {
+                          if (bits) bits += '<span class="session-info-separator">|</span>';
+                          bits += '<span id="session-exit-display" class="session-exit-display">退出码=' + selectedSession.exitCode + '</span>';
+                        }
+                        return bits ? '<div class="input-session-info-bar">' + bits + '</div>' : '';
+                      })()
                     : '') +
                 '</div>' +
                 '<p id="action-error" class="error-message hidden"></p>' +
@@ -3213,7 +3262,9 @@
       }
 
       function isSidebarNarrow() {
-        return !!state.sidebarPinned && !isMobileLayout() && !!state.sidebarCollapsed;
+        // 桌面: pinned + collapsed = 56px 窄条。
+        // 手机: pinned + collapsed 同样允许窄条（pin 单独不在手机生效，但 collapsed 是窄条形态的标志）。
+        return !!state.sidebarPinned && !!state.sidebarCollapsed;
       }
 
       function renderCollapsedSessionTiles() {
@@ -5291,7 +5342,8 @@
                 '</div>' +
                 '<div class="field-hint session-kind-hint-row">' +
                   '<span id="session-kind-description">' + escapeHtml(getSessionKindHint(sessionKind)) + '</span>' +
-                  renderWorktreeToggle(worktreeEnabled) +
+                  // Worktree 模式入口暂时隐藏，保留 renderWorktreeToggle/state.sessionCreateWorktree 以便后续恢复
+                  // renderWorktreeToggle(worktreeEnabled) +
                 '</div>' +
               '</div>' +
               '<div class="field">' +
@@ -5406,6 +5458,36 @@
         }
         persistElementExpandState(el, "thinking");
       };
+      // Toggle function for subagent reply bubbles — cycles preview → expanded → collapsed.
+      // 三态循环（preview 默认 ~5 行可滚 / expanded 大区可滚 / collapsed 完全收起）。
+      window.__subagentReplyCycle = function(e, btn) {
+        if (e) { e.preventDefault(); e.stopPropagation(); }
+        var bubble = btn.closest(".subagent-reply");
+        if (!bubble) return;
+        var modes = ["preview", "expanded", "collapsed"];
+        var current = bubble.getAttribute("data-collapse-mode") || "preview";
+        var idx = modes.indexOf(current);
+        if (idx < 0) idx = 0;
+        var next = modes[(idx + 1) % modes.length];
+        bubble.setAttribute("data-collapse-mode", next);
+        var label = btn.querySelector(".subagent-reply-cycle-label");
+        var icon = btn.querySelector(".subagent-reply-cycle-icon");
+        if (label) {
+          label.textContent = next === "preview" ? "展开"
+            : next === "expanded" ? "收起"
+            : "预览";
+        }
+        if (icon) {
+          icon.textContent = next === "collapsed" ? "▸"
+            : next === "expanded" ? "▴"
+            : "▾";
+        }
+        btn.setAttribute("aria-label",
+          next === "preview" ? "点击展开全部" :
+          next === "expanded" ? "点击完全收起" :
+          "点击切回预览"
+        );
+      };
       // Toggle function for inline tool rows (Read, Glob, Grep, etc.)
       window.__inlineToolToggle = function(el) {
         var expanded = el.classList.toggle("inline-tool-open");
@@ -5982,12 +6064,18 @@
         var modeSelect = document.getElementById("chat-mode-select");
         if (modeSelect) modeSelect.addEventListener("change", function() {
           state.chatMode = this.value;
-          showToast("新会话模式已切换为：" + getModeLabel(this.value), "info");
+          var label = document.getElementById("chat-mode-label");
+          if (label) label.textContent = this.value;
+          showToast("新会话模式：" + this.value, "info");
         });
         var modelSelect = document.getElementById("chat-model-select");
         if (modelSelect) modelSelect.addEventListener("change", function() {
           onChatModelChange(this.value);
         });
+        var thinkingSelect = document.getElementById("chat-thinking-select");
+        if (thinkingSelect) thinkingSelect.addEventListener("change", function() {
+          onChatThinkingChange(this.value);
+        });
 
         var sessionModal = document.getElementById("session-modal");
         if (sessionModal) sessionModal.addEventListener("click", function(e) {
@@ -6690,6 +6778,16 @@
         initTerminal();
         setupMobileKeyboardHandlers();
         setupVisualViewportHandlers();
+
+        // 排队条：每次 shell 重渲后，重新挂事件代理 + 刷新内容。
+        // document-level 的 ESC / 外点击 handler 只挂一次（state.__queueBarGlobalAttached 守门）。
+        attachQueueBarDelegates();
+        updateQueueBar();
+        if (!state.__queueBarGlobalAttached) {
+          state.__queueBarGlobalAttached = true;
+          document.addEventListener("pointerdown", handleQueueBarOutsideClick, true);
+          document.addEventListener("keydown", handleQueueBarKeydown, true);
+        }
       }
 
       function saveWorkingDir(path) {
@@ -7996,7 +8094,7 @@
         // 结构化会话在出 token 时，输入框仍然可用——告诉用户默认行为是排队，
         // 想插队请按右侧的 » 按钮。短语保持单行不换行。
         if (isStructuredSession(session) && session.structuredState && session.structuredState.inFlight) {
-          return "回复中…继续输入将排队（» 立即发送）";
+          return "回复中…Enter 排队 · 旁边的「» 立即」按钮中断并立即发送";
         }
         return "";
       }
@@ -8092,14 +8190,26 @@
 
       function syncComposerModeSelect() {
         var select = document.getElementById("chat-mode-select");
-        if (!select) return;
         state.chatMode = getSafeModeForTool("claude", state.chatMode);
-        select.innerHTML = renderModeOptions("claude", state.chatMode);
-        select.value = state.chatMode;
+        if (select) {
+          select.innerHTML = renderChatModeOptionsRaw("claude", state.chatMode);
+          select.value = state.chatMode;
+        }
+        var labelEl = document.getElementById("chat-mode-label");
+        if (labelEl) labelEl.textContent = state.chatMode;
         var modeHint = document.getElementById("mode-hint");
         if (modeHint) modeHint.textContent = getModeHint(state.chatMode);
       }
 
+      // 三件套 raw 选项渲染：option 文本直接是 id（不带括号注释 / 不本地化）。
+      function renderChatModeOptionsRaw(tool, selectedMode) {
+        return getSupportedModes(tool).map(function(mode) {
+          return '<option value="' + escapeHtml(mode) + '"' + (mode === selectedMode ? " selected" : "") + '>' +
+            escapeHtml(mode) +
+          '</option>';
+        }).join("");
+      }
+
       function getEffectiveModel(session) {
         if (session && session.selectedModel) return session.selectedModel;
         if (state.chatModel) return state.chatModel;
@@ -8127,12 +8237,139 @@
         return html;
       }
 
+      // model 选项 raw 版：空值显示 "default"，其它直接用 raw id（不带"（自定义）"等后缀）。
+      function renderChatModelOptionsRaw(selected, session) {
+        var models = getModelsForCurrentProvider(session);
+        var html = '<option value="">default</option>';
+        for (var i = 0; i < models.length; i++) {
+          var m = models[i];
+          html += '<option value="' + escapeHtml(m.id) + '"' + (m.id === selected ? " selected" : "") + '>' + escapeHtml(m.id) + '</option>';
+        }
+        if (selected && !models.some(function(m) { return m.id === selected; })) {
+          html += '<option value="' + escapeHtml(selected) + '" selected>' + escapeHtml(selected) + '</option>';
+        }
+        return html;
+      }
+
       function syncComposerModelSelect(session) {
         var select = document.getElementById("chat-model-select");
-        if (!select) return;
         var effective = getEffectiveModel(session);
-        select.innerHTML = renderChatModelOptions(effective, session);
-        select.value = effective;
+        if (select) {
+          select.innerHTML = renderChatModelOptionsRaw(effective, session);
+          select.value = effective;
+        }
+        var labelEl = document.getElementById("chat-model-label");
+        if (labelEl) labelEl.textContent = effective || "default";
+        // thinking 选择器与 model 选择器属于同一组"会话级设置"，
+        // 任何刷新 model 的时机也应该同步刷新 thinking，避免漂移。
+        syncComposerThinkingSelect(session);
+      }
+
+      // ── 思考深度 (thinkingEffort) —— 与 model 选择三件套对称 ──
+
+      // 标签直接用 Claude CLI 原生 magic word：think / think hard / ultrathink。
+      // 这样用户一眼能对上官方文档里的思考强度档位，PTY 模式下也是这几个词被注入到 prompt 前缀。
+      var THINKING_LEVELS = [
+        { id: "off",      label: "off",        hint: "不启用思考（CLI 无前缀；SDK 关闭 thinking；Codex --reasoning-effort minimal）" },
+        { id: "standard", label: "think",      hint: "Claude CLI: think · SDK budget 4096 · Codex low" },
+        { id: "deep",     label: "think hard", hint: "Claude CLI: think hard · SDK budget 16000 · Codex medium" },
+        { id: "max",      label: "ultrathink", hint: "Claude CLI: ultrathink · SDK budget 31999 · Codex high" }
+      ];
+
+      function getThinkingLabel(id) {
+        for (var i = 0; i < THINKING_LEVELS.length; i++) {
+          if (THINKING_LEVELS[i].id === id) return THINKING_LEVELS[i].label;
+        }
+        return THINKING_LEVELS[0].label;
+      }
+
+      function getEffectiveThinking(session) {
+        if (session && session.thinkingEffort) return session.thinkingEffort;
+        if (state.chatThinking) return state.chatThinking;
+        return "off";
+      }
+
+      function renderChatThinkingOptions(selected) {
+        var v = selected || "off";
+        var html = "";
+        for (var i = 0; i < THINKING_LEVELS.length; i++) {
+          var lvl = THINKING_LEVELS[i];
+          html += '<option value="' + escapeHtml(lvl.id) + '"' + (lvl.id === v ? ' selected' : '') + ' title="' + escapeHtml(lvl.hint) + '">' + escapeHtml(lvl.label) + '</option>';
+        }
+        return html;
+      }
+
+      // thinking 选项 raw 版：option 文本直接是 id（off / standard / deep / max）。
+      function renderChatThinkingOptionsRaw(selected) {
+        var v = selected || "off";
+        var html = "";
+        for (var i = 0; i < THINKING_LEVELS.length; i++) {
+          var lvl = THINKING_LEVELS[i];
+          html += '<option value="' + escapeHtml(lvl.id) + '"' + (lvl.id === v ? ' selected' : '') + '>' + escapeHtml(lvl.id) + '</option>';
+        }
+        return html;
+      }
+
+      function syncComposerThinkingSelect(session) {
+        var select = document.getElementById("chat-thinking-select");
+        var effective = getEffectiveThinking(session);
+        if (select) {
+          select.innerHTML = renderChatThinkingOptionsRaw(effective);
+          select.value = effective;
+        }
+        var labelEl = document.getElementById("chat-thinking-label");
+        if (labelEl) labelEl.textContent = effective;
+      }
+
+      function onChatThinkingChange(value) {
+        var normalized = (value || "off").trim();
+        if (normalized !== "off" && normalized !== "standard" && normalized !== "deep" && normalized !== "max") {
+          normalized = "off";
+        }
+        state.chatThinking = normalized;
+        try { localStorage.setItem("wand-thinking-effort", normalized); } catch (e) {}
+        var labelEl = document.getElementById("chat-thinking-label");
+        if (labelEl) labelEl.textContent = normalized;
+        var session = getSelectedSession();
+        if (!session) return;
+        fetch("/api/sessions/" + encodeURIComponent(session.id) + "/thinking-effort", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify({ thinkingEffort: normalized })
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          if (data && data.error) {
+            showToast(data.error, "error");
+            return;
+          }
+          if (data && data.id) {
+            updateSessionSnapshot(data);
+            if (typeof showToast === "function") {
+              showToast("已切换思考深度 → " + getThinkingLabel(normalized), "success");
+            }
+          }
+        })
+        .catch(function() { showToast("切换思考深度失败", "error"); });
+      }
+
+      // 自动批准 chip：与原 .auto-approve-indicator 等价，但用统一的 .composer-pill 风格放主行。
+      // Codex 会话固定全权限不可切；结构化 Claude 会话后端 toggle-auto-approve 路由会拒绝。
+      // 当会话已经处于 managed / full-access 模式时，"自动批准"语义已经由模式表达，
+      // 重复显示一个独立 chip 只会占用空间又制造歧义 —— 此时直接折叠掉。
+      function isAutoApproveImpliedByMode(session) {
+        if (!session) return false;
+        var m = session.mode;
+        return m === "managed" || m === "full-access";
+      }
+      function renderAutoApproveChip(session) {
+        if (!session) return "";
+        if (isAutoApproveImpliedByMode(session)) return "";
+        var enabled = !!session.autoApprovePermissions;
+        return enabled
+          ? '<span id="auto-approve-toggle" class="composer-pill composer-pill-chip auto-approve-indicator active" title="自动批准已启用 — 点击关闭">🛡 自动</span>'
+          : '<span id="auto-approve-toggle" class="composer-pill composer-pill-chip auto-approve-indicator" title="自动批准已关闭 — 点击开启">🛡 手动</span>';
       }
 
       function fetchAvailableModels() {
@@ -8341,6 +8578,8 @@
         var normalized = (value || "").trim();
         state.chatModel = normalized;
         try { localStorage.setItem("wand-chat-model", normalized); } catch (e) {}
+        var labelEl = document.getElementById("chat-model-label");
+        if (labelEl) labelEl.textContent = normalized || "default";
         var session = getSelectedSession();
         if (!session) return;
         fetch("/api/sessions/" + encodeURIComponent(session.id) + "/model", {
@@ -8370,6 +8609,7 @@
       function createStructuredSession(prompt, cwdOverride, modeOverride, worktreeEnabled) {
         var provider = state.sessionTool === "codex" ? "codex" : "claude";
         var modelPref = state.chatModel || (state.config && state.config.defaultModel) || "";
+        var thinkingPref = state.chatThinking || "off";
         var payload = {
           cwd: cwdOverride || getEffectiveCwd(),
           mode: modeOverride || state.chatMode || (state.config && state.config.defaultMode) || "default",
@@ -8377,7 +8617,8 @@
           runner: provider === "codex" ? "codex-cli-exec" : ((state.config && state.config.structuredRunner === "sdk") ? "claude-sdk" : (state.structuredRunner || "claude-cli-print")),
           prompt: prompt || undefined,
           worktreeEnabled: worktreeEnabled === true,
-          model: modelPref || undefined
+          model: modelPref || undefined,
+          thinkingEffort: thinkingPref
         };
         console.log("[WAND] createStructuredSession payload:", JSON.stringify(payload));
         return fetch("/api/structured-sessions", {
@@ -8954,14 +9195,16 @@
         var drawer = document.getElementById("sessions-drawer");
         var mainLayout = document.querySelector(".main-layout");
         var pinBtn = document.getElementById("sidebar-pin-btn");
-        var isDesktopPinned = state.sidebarPinned && !isMobileLayout();
-        var isCollapsed = isDesktopPinned && state.sidebarCollapsed;
+        // 与 renderAppShell 保持一致：手机端只允许窄条形态 anchored。
+        var isMobile = isMobileLayout();
+        var isCollapsed = !!state.sidebarPinned && !!state.sidebarCollapsed;
+        var isAnchored = isCollapsed || (!!state.sidebarPinned && !isMobile);
         if (drawer) {
-          drawer.classList.toggle("pinned", isDesktopPinned);
+          drawer.classList.toggle("pinned", isAnchored);
           drawer.classList.toggle("collapsed", isCollapsed);
         }
         if (mainLayout) {
-          mainLayout.classList.toggle("sidebar-pinned", isDesktopPinned);
+          mainLayout.classList.toggle("sidebar-pinned", isAnchored);
           mainLayout.classList.toggle("sidebar-collapsed", isCollapsed);
         }
         if (pinBtn) {
@@ -9074,12 +9317,11 @@
       }
 
       function toggleSidebarCollapsed() {
-        if (isMobileLayout()) return;
+        var isMobile = isMobileLayout();
         // 在 drawer 模式（未 pin）下点 collapse 视为「先固定、再收起为窄条」——
         // 用户直觉是「点了就该看到窄条」，过去这里 early return 让按钮看上去没反应。
         if (!state.sidebarPinned) {
           state.sidebarPinned = true;
-          state.sessionsDrawerOpen = true;
           try {
             localStorage.setItem("wand-sidebar-pinned", "true");
           } catch (e) {}
@@ -9088,6 +9330,22 @@
         try {
           localStorage.setItem("wand-sidebar-collapsed", String(state.sidebarCollapsed));
         } catch (e) {}
+        if (state.sidebarCollapsed) {
+          // 进入窄条形态：sessionsDrawerOpen 设 false，避免手机上 .drawer-backdrop
+          // 仍带 .open 类导致背景遮罩误显示（窄条已经常驻显示，不需要遮罩）。
+          state.sessionsDrawerOpen = false;
+        } else if (isMobile) {
+          // 手机端展开窄条：不允许「pin 但不窄条」的 300px 全栏（太占地），
+          // 改为回到 drawer 模式并自动打开抽屉，让用户看到完整会话列表。
+          state.sidebarPinned = false;
+          state.sessionsDrawerOpen = true;
+          try {
+            localStorage.setItem("wand-sidebar-pinned", "false");
+          } catch (e) {}
+        } else {
+          // 桌面端展开窄条 → 300px 全栏固定，自动打开。
+          state.sessionsDrawerOpen = true;
+        }
         render();
         var mainLayout = document.querySelector(".main-layout");
         if (mainLayout) {
@@ -11916,8 +12174,14 @@
         return Promise.resolve();
       }
 
-      // 防止同一会话并发提交（快速双击 / 重复触发）
-      var _structuredSubmittingSessions = {};
+      // 防止同一会话「快速双击 / 重复触发」。原来这是个布尔 flag，绑在 fetch 的
+      // promise 上 —— 但 structured-sessions/:id/messages 的 POST 对首条消息会 await
+      // 整段流式 streaming，flag 会被卡到回复完才释放。结果：用户点发送 → 服务端
+      // 流式 30s 不响应 → 这 30s 里再点发送全被这里静默 drop，看起来"排队 / 立即发送
+      // 都没效果"。改成时间戳 + 短窗口（350ms）只挡真正的连击。idempotencyKey 已经
+      // 在后端兜底防 webview 网络层重发，这里的 hot-path 守门只需要应付 UI 双触发。
+      var _structuredLastSubmitAt = {};
+      var DUPLICATE_SUBMIT_WINDOW_MS = 350;
 
       function postStructuredInput(input, inputBox, session, opts) {
         opts = opts || {};
@@ -11931,11 +12195,15 @@
           showToast("会话不存在，请重新选择或新建会话。", "error");
           return Promise.resolve();
         }
-        // 同一会话的上一次提交尚未落地，直接忽略防止重复发送
-        if (_structuredSubmittingSessions[session.id]) {
-          console.log("[wand] postStructuredInput: duplicate submit ignored for session", session.id);
+        // 短窗口内的连击当作重复点击丢掉；正常间隔的两次提交（哪怕第一次还在流式）
+        // 都放行，让 queue / interrupt 真正生效。
+        var nowTs = Date.now();
+        var lastTs = _structuredLastSubmitAt[session.id] || 0;
+        if (nowTs - lastTs < DUPLICATE_SUBMIT_WINDOW_MS) {
+          console.log("[wand] postStructuredInput: duplicate submit (within " + DUPLICATE_SUBMIT_WINDOW_MS + "ms) ignored for session", session.id);
           return Promise.resolve();
         }
+        _structuredLastSubmitAt[session.id] = nowTs;
 
         var sessionInFlight = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
         var isInterrupting = sessionInFlight && requestedInterrupt;
@@ -11960,6 +12228,9 @@
           updateInputHint("已加入排队，等待当前回复完成…");
           renderChat(true);
           updateStructuredQueueCounter();
+          // 乐观 toast：原本只在 POST 完成后才提示，Claude 流式拖太久时用户根本
+          // 看不到反馈，会误判"点了没反应"。点击瞬间就给一条短提示。
+          showToast(nextQueue.length > 1 ? ("已加入排队（共 " + nextQueue.length + " 条等待）") : "已加入排队，等当前回复完成会自动发送。", "info");
         } else {
           // 普通发送 / interrupt 发送：照旧乐观推 user turn + inFlight=true
           var userTurn = { role: "user", content: [{ type: "text", text: input }] };
@@ -11978,6 +12249,11 @@
           }), userMsgs);
           updateInputHint(isInterrupting ? "已中断，正在处理新消息…" : "思考中…");
           renderChat(true);
+          // 中断模式：乐观给一条提示，让用户立刻知道"中断成功了"，否则跟 queue 一样会
+          // 觉得"点了没反应"。原 toast 在 then() 里，等 SIGTERM/HTTP roundtrip 完才出。
+          if (isInterrupting) {
+            showToast("已中断上一条回复，正在处理新消息…", "info");
+          }
         }
 
         if (inputBox) {
@@ -12001,7 +12277,6 @@
 
         // 用 session.id（参数绑定，in-flight 期间不变）而不是 state.selectedId
         // 拼 URL，避免用户切到别的会话后 fetch 落到错误 sessionId。
-        _structuredSubmittingSessions[session.id] = true;
         return fetch("/api/structured-sessions/" + session.id + "/messages", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -12020,7 +12295,6 @@
           return res.json();
         })
         .then(function(snapshot) {
-          _structuredSubmittingSessions[session.id] = false;
           if (snapshot && snapshot.error) {
             throw new Error(snapshot.error);
           }
@@ -12035,18 +12309,12 @@
               state.currentMessages = buildMessagesForRender(refreshedSession, getPreferredMessages(refreshedSession, snapshot.output, false));
               renderChat(true);
               updateStructuredQueueCounter();
-              if (isInterrupting) {
-                showToast("已中断上一条回复，正在处理新消息…", "info");
-              } else if (isQueueing) {
-                var qLen = Array.isArray(refreshedSession.queuedMessages) ? refreshedSession.queuedMessages.length : 0;
-                showToast(qLen > 1 ? ("已加入排队（共 " + qLen + " 条等待）") : "已加入排队，等待当前回复完成。", "info");
-              }
+              // toast 已在 click 时乐观 fire（见 isQueueing / isInterrupting 分支），
+              // 这里不再重复推送，避免同一动作出两条一样的 toast。
             }
           }
         })
         .catch(function(error) {
-          _structuredSubmittingSessions[session.id] = false;
-
           // duplicate_idempotency_key：服务端识别出 WebView 底层重发的副本，
           // 直接拦截不处理。这里**不**回滚乐观更新——第一次的请求实际上已经
           // 被服务端接收并处理（或正在处理），ws 推送会带回真实状态；如果在
@@ -12107,16 +12375,507 @@
       }
 
       function updateStructuredQueueCounter() {
-        var counter = document.getElementById("queue-counter");
-        var count = getSelectedStructuredQueuedInputs().length;
-        if (counter) {
-          counter.textContent = "队列: " + count;
-          if (count > 0) {
-            counter.classList.remove("hidden");
-          } else {
-            counter.classList.add("hidden");
+        // 旧 #queue-counter 已下线，所有"排队"提示由 .queue-bar（输入框上方独立浮条）承担。
+        // 函数名先保留 —— 老的调用点（postStructuredInput / WS 事件等）都还在指向它。
+        updateQueueBar();
+      }
+
+      // ──────────────────────────────────────────────────────────────────────────
+      // 排队条（.queue-bar）—— 输入框上方独立浮条，承担三个事情：
+      //   1) 折叠态：● 排队 N + 队尾预览 + ⌃ chevron + ⚡ 立即 按钮
+      //   2) 展开面板：列出所有排队消息，支持拖拽换序 / 单条删除 / 一键清空
+      //   3) 立即按钮：中断当前回复，把队首作为新消息插队发出去（剩余队列保留）
+      // 数据源：session.queuedMessages（由后端 WS 推送 + postStructuredInput 乐观更新）。
+      // ──────────────────────────────────────────────────────────────────────────
+
+      var QUEUE_BAR_MAX = 10; // 后端硬上限
+
+      function queueBarTruncatePreview(text) {
+        if (typeof text !== "string") return "";
+        var s = text.replace(/\s+/g, " ").trim();
+        if (s.length <= 48) return s;
+        return s.slice(0, 46) + "…";
+      }
+
+      function renderQueueBarSkeleton(count, latestPreview, inFlight, atCapacity, immediateLabel) {
+        // 折叠条 + 展开面板的 HTML 一次性渲染好，靠 .queue-bar.expanded class 切换可见性。
+        // 这样展开/收起不需要拼字符串，纯 class toggle，动画也好做。
+        var dotClass = inFlight ? "queue-bar-dot queue-bar-dot-pulse" : "queue-bar-dot";
+        var barClass = "queue-bar";
+        if (state.queueBarExpanded) barClass += " expanded";
+        if (atCapacity) barClass += " queue-bar-capacity";
+        if (inFlight) barClass += " queue-bar-inflight";
+        var html =
+          '<div class="' + barClass + '" data-queue-bar="1">' +
+            '<button type="button" class="queue-bar-toggle" data-action="toggle"' +
+                   ' aria-expanded="' + (state.queueBarExpanded ? "true" : "false") + '"' +
+                   ' title="点击查看 / 收起排队消息">' +
+              '<span class="' + dotClass + '" aria-hidden="true"></span>' +
+              '<span class="queue-bar-count">' + (atCapacity ? "队列已满 " : "排队 ") + count + '</span>' +
+              '<span class="queue-bar-sep" aria-hidden="true">·</span>' +
+              '<span class="queue-bar-preview">' + escapeHtml(latestPreview) + '</span>' +
+              '<svg class="queue-bar-chevron" width="11" height="11" viewBox="0 0 24 24"' +
+                  ' fill="none" stroke="currentColor" stroke-width="2.6" stroke-linecap="round"' +
+                  ' stroke-linejoin="round" aria-hidden="true"><polyline points="6 15 12 9 18 15"/></svg>' +
+            '</button>' +
+            '<span class="queue-bar-divider" aria-hidden="true"></span>' +
+            '<button type="button" class="queue-bar-promote" data-action="promote"' +
+                   ' title="中断当前回复，立刻发送队首这条" aria-label="立即发送队首">' +
+              '<svg width="13" height="13" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">' +
+                '<path d="M13 2 L4 14 L11 14 L10 22 L20 9 L13 9 Z"/>' +
+              '</svg>' +
+              '<span class="queue-bar-promote-label">' + escapeHtml(immediateLabel) + '</span>' +
+            '</button>' +
+            '<div class="queue-bar-panel" data-queue-panel="1" role="region" aria-label="排队消息列表">' +
+              '<div class="queue-bar-panel-header">' +
+                '<span class="queue-bar-panel-title">📥 排队中 (' + count + ')</span>' +
+                '<button type="button" class="queue-bar-clear" data-action="clear"' +
+                       (count === 0 ? " disabled" : "") + '>清空</button>' +
+                '<button type="button" class="queue-bar-collapse" data-action="collapse" aria-label="收起">' +
+                  '收起' +
+                  '<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor"' +
+                      ' stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+                      '<polyline points="6 9 12 15 18 9"/></svg>' +
+                '</button>' +
+              '</div>' +
+              '<ol class="queue-bar-list" data-queue-list="1"></ol>' +
+            '</div>' +
+          '</div>';
+        return html;
+      }
+
+      function renderQueueBarItems(listEl, items) {
+        // ol 内容单独 render —— 拖拽 / 删除 / 展开会频繁动它，外层骨架不重建避免抖动。
+        var single = items.length <= 1;
+        var html = "";
+        for (var i = 0; i < items.length; i++) {
+          var raw = items[i] == null ? "" : String(items[i]);
+          var expanded = !!state.queueBarItemExpanded[i];
+          var itemClass = "queue-bar-item";
+          if (expanded) itemClass += " expanded";
+          if (single) itemClass += " queue-bar-item-single";
+          html +=
+            '<li class="' + itemClass + '" data-index="' + i + '">' +
+              '<button type="button" class="queue-bar-item-drag" data-action="drag" aria-label="拖动调整顺序"' +
+                     ' title="按住拖动调整顺序"' + (single ? " disabled" : "") + '>' +
+                '<svg width="10" height="14" viewBox="0 0 10 14" fill="currentColor" aria-hidden="true">' +
+                  '<circle cx="2.2" cy="2.2" r="1.2"/><circle cx="7.8" cy="2.2" r="1.2"/>' +
+                  '<circle cx="2.2" cy="7"   r="1.2"/><circle cx="7.8" cy="7"   r="1.2"/>' +
+                  '<circle cx="2.2" cy="11.8" r="1.2"/><circle cx="7.8" cy="11.8" r="1.2"/>' +
+                '</svg>' +
+              '</button>' +
+              '<span class="queue-bar-item-index">#' + (i + 1) + '</span>' +
+              '<button type="button" class="queue-bar-item-text" data-action="expand-text"' +
+                     ' aria-expanded="' + (expanded ? "true" : "false") + '"' +
+                     ' title="点击展开 / 收起完整内容">' +
+                escapeHtml(raw) +
+              '</button>' +
+              '<button type="button" class="queue-bar-item-delete" data-action="delete"' +
+                     ' aria-label="删除这条排队消息" title="删除">' +
+                '<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor"' +
+                    ' stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' +
+                    '<line x1="6" y1="6" x2="18" y2="18"/><line x1="6" y1="18" x2="18" y2="6"/></svg>' +
+              '</button>' +
+            '</li>';
+        }
+        listEl.innerHTML = html;
+      }
+
+      function updateQueueBar() {
+        var host = document.getElementById("queue-bar-host");
+        if (!host) return;
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        var isStructured = session && session.sessionKind === "structured";
+        var queue = isStructured ? getStructuredQueuedInputs(session) : [];
+        queue = Array.isArray(queue) ? queue : [];
+
+        if (!isStructured || queue.length === 0) {
+          // 队列空 / 非结构化会话：整条隐藏，并清掉展开/逐条展开的本地态。
+          host.hidden = true;
+          host.innerHTML = "";
+          state.queueBarExpanded = false;
+          state.queueBarItemExpanded = {};
+          return;
+        }
+
+        host.hidden = false;
+        var inFlight = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
+        var atCapacity = queue.length >= QUEUE_BAR_MAX;
+        var latest = queueBarTruncatePreview(queue[queue.length - 1]);
+        // inFlight=false 时按钮语义从"插队"退化为"立刻发"；文案一并切换让用户不疑惑。
+        var immediateLabel = inFlight ? "立即" : "发送";
+
+        // 拖拽进行中绝不重建骨架，否则 pointer capture 丢失、items 闪屏。
+        // 只更新列表内容（且如果数量不变也跳过整段重排）。
+        var existing = host.querySelector(".queue-bar");
+        if (state.queueBarDrag && existing) {
+          var listInDrag = existing.querySelector('[data-queue-list="1"]');
+          if (listInDrag && listInDrag.children.length !== queue.length) {
+            renderQueueBarItems(listInDrag, queue);
           }
+          return;
         }
+
+        host.innerHTML = renderQueueBarSkeleton(queue.length, latest, inFlight, atCapacity, immediateLabel);
+        var listEl = host.querySelector('[data-queue-list="1"]');
+        if (listEl) renderQueueBarItems(listEl, queue);
+      }
+
+      // ── 折叠 / 展开 ──
+      function setQueueBarExpanded(expanded) {
+        var next = !!expanded;
+        if (state.queueBarExpanded === next) return;
+        state.queueBarExpanded = next;
+        if (!next) state.queueBarItemExpanded = {};
+        updateQueueBar();
+      }
+      function toggleQueueBar() { setQueueBarExpanded(!state.queueBarExpanded); }
+
+      function handleQueueBarOutsideClick(ev) {
+        if (!state.queueBarExpanded) return;
+        var host = document.getElementById("queue-bar-host");
+        if (!host) return;
+        if (host.contains(ev.target)) return;
+        setQueueBarExpanded(false);
+      }
+      function handleQueueBarKeydown(ev) {
+        if (!state.queueBarExpanded) return;
+        if (ev.key === "Escape" || ev.key === "Esc") {
+          setQueueBarExpanded(false);
+          // 焦点回到 toggle 按钮，方便键盘党
+          var toggle = document.querySelector(".queue-bar-toggle");
+          if (toggle) toggle.focus();
+        }
+      }
+
+      // ── 单条删除 / 全部清空 / 队首插队 ──
+      function rollbackQueueOptimistic(session, prevQueue) {
+        updateSessionSnapshot({ id: session.id, queuedMessages: prevQueue });
+        var refreshed = state.sessions.find(function(s) { return s.id === session.id; }) || session;
+        state.currentMessages = buildMessagesForRender(refreshed, getPreferredMessages(refreshed, refreshed.output, false));
+        renderChat(true);
+        updateQueueBar();
+      }
+
+      function queueBarDeleteItem(index) {
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        if (!session) return;
+        var queue = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
+        if (index < 0 || index >= queue.length) return;
+        var prev = queue.slice();
+        var next = queue.slice(0, index).concat(queue.slice(index + 1));
+        // 调整 queueBarItemExpanded 的下标偏移
+        var nextExpanded = {};
+        Object.keys(state.queueBarItemExpanded).forEach(function(k) {
+          var i = Number(k);
+          if (i === index) return;
+          if (i > index) nextExpanded[i - 1] = state.queueBarItemExpanded[k];
+          else nextExpanded[i] = state.queueBarItemExpanded[k];
+        });
+        state.queueBarItemExpanded = nextExpanded;
+        updateSessionSnapshot({ id: session.id, queuedMessages: next });
+        var refreshed = state.sessions.find(function(s) { return s.id === session.id; }) || session;
+        state.currentMessages = buildMessagesForRender(refreshed, getPreferredMessages(refreshed, refreshed.output, false));
+        renderChat(true);
+        updateQueueBar();
+        fetch("/api/structured-sessions/" + session.id + "/queued/" + index, {
+          method: "DELETE",
+          credentials: "same-origin",
+        })
+        .then(function(res) {
+          if (!res.ok) {
+            return res.json().catch(function() { return {}; }).then(function(p) {
+              throw new Error((p && p.error) || "删除失败");
+            });
+          }
+        })
+        .catch(function(err) {
+          rollbackQueueOptimistic(session, prev);
+          showToast((err && err.message) || "删除排队消息失败。", "error");
+        });
+      }
+
+      function queueBarClearAll() {
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        if (!session) return;
+        var prev = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
+        if (prev.length === 0) return;
+        state.queueBarItemExpanded = {};
+        updateSessionSnapshot({ id: session.id, queuedMessages: [] });
+        var refreshed = state.sessions.find(function(s) { return s.id === session.id; }) || session;
+        state.currentMessages = buildMessagesForRender(refreshed, getPreferredMessages(refreshed, refreshed.output, false));
+        renderChat(true);
+        updateQueueBar();
+        fetch("/api/structured-sessions/" + session.id + "/queued", {
+          method: "DELETE",
+          credentials: "same-origin",
+        })
+        .then(function(res) {
+          if (!res.ok) {
+            return res.json().catch(function() { return {}; }).then(function(p) {
+              throw new Error((p && p.error) || "清空失败");
+            });
+          }
+          showToast("已清空 " + prev.length + " 条排队消息。", "info");
+        })
+        .catch(function(err) {
+          rollbackQueueOptimistic(session, prev);
+          showToast((err && err.message) || "清空排队消息失败。", "error");
+        });
+      }
+
+      function queueBarPromoteHead() {
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        if (!session) return;
+        var queue = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
+        if (queue.length === 0) return;
+        var head = queue[0];
+        var rest = queue.slice(1);
+        var prev = queue.slice();
+        var inFlight = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
+
+        // 乐观：剥掉队首
+        state.queueBarItemExpanded = (function() {
+          var out = {};
+          Object.keys(state.queueBarItemExpanded).forEach(function(k) {
+            var i = Number(k);
+            if (i === 0) return;
+            out[i - 1] = state.queueBarItemExpanded[k];
+          });
+          return out;
+        })();
+        updateSessionSnapshot({ id: session.id, queuedMessages: rest });
+
+        // 收起面板，让用户视线回到 chat（新消息马上要进 user turn）
+        setQueueBarExpanded(false);
+
+        var idempotencyKey = (typeof crypto !== "undefined" && crypto.randomUUID)
+          ? crypto.randomUUID()
+          : (Date.now().toString(36) + "-" + Math.random().toString(36).slice(2, 10));
+
+        var body = { input: head, idempotencyKey: idempotencyKey };
+        if (inFlight) {
+          // 中断 + 保留剩余队列
+          body.interrupt = true;
+          body.preserveQueue = true;
+        }
+        // 给一个乐观 toast，让用户瞬间知道点击生效了
+        showToast(inFlight ? "已请求中断当前回复，立即发送队首。" : "已立即发送队首消息。", "info");
+
+        fetch("/api/structured-sessions/" + session.id + "/messages", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify(body),
+        })
+        .then(function(res) {
+          if (!res.ok) {
+            return res.json().catch(function() { return {}; }).then(function(p) {
+              throw new Error((p && p.error) || "立即发送失败");
+            });
+          }
+          return res.json();
+        })
+        .then(function(snapshot) {
+          if (snapshot && snapshot.id) {
+            updateSessionSnapshot(snapshot);
+            if (snapshot.id === state.selectedId) {
+              var refreshed = state.sessions.find(function(s) { return s.id === snapshot.id; }) || snapshot;
+              state.currentMessages = buildMessagesForRender(refreshed, getPreferredMessages(refreshed, snapshot.output, false));
+              renderChat(true);
+              updateQueueBar();
+            }
+          }
+        })
+        .catch(function(err) {
+          rollbackQueueOptimistic(session, prev);
+          showToast((err && err.message) || "立即发送失败。", "error");
+        });
+      }
+
+      // ── 拖拽排序（Pointer Events + 简化版 sort/animate）──
+      function queueBarDragStart(ev, handleEl) {
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        if (!session) return;
+        var queue = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
+        if (queue.length <= 1) return;
+        var itemEl = handleEl.closest(".queue-bar-item");
+        if (!itemEl) return;
+        var listEl = itemEl.parentElement;
+        if (!listEl) return;
+        var origIndex = Number(itemEl.getAttribute("data-index"));
+        var siblings = Array.prototype.slice.call(listEl.children);
+        var rects = siblings.map(function(el) { return el.getBoundingClientRect(); });
+        var rect0 = rects[origIndex];
+        var itemHeight = rect0.height;
+        var gap = 6; // 与 CSS .queue-bar-list 的 gap 保持一致
+
+        ev.preventDefault();
+        try { handleEl.setPointerCapture(ev.pointerId); } catch (_e) {}
+        if (navigator && navigator.vibrate) { try { navigator.vibrate(8); } catch (_e2) {} }
+
+        state.queueBarDrag = {
+          pointerId: ev.pointerId,
+          handleEl: handleEl,
+          itemEl: itemEl,
+          listEl: listEl,
+          siblings: siblings,
+          rects: rects,
+          origIndex: origIndex,
+          targetIndex: origIndex,
+          startY: ev.clientY,
+          itemHeight: itemHeight,
+          gap: gap,
+          queueSnapshot: queue,
+        };
+
+        itemEl.classList.add("dragging");
+        // 把所有兄弟先标记为"参与平滑动画"
+        siblings.forEach(function(el) { if (el !== itemEl) el.classList.add("queue-bar-item-sliding"); });
+
+        var move = function(e) { queueBarDragMove(e); };
+        var up = function(e) { queueBarDragEnd(e); };
+        state.queueBarDrag.moveHandler = move;
+        state.queueBarDrag.upHandler = up;
+        handleEl.addEventListener("pointermove", move);
+        handleEl.addEventListener("pointerup", up);
+        handleEl.addEventListener("pointercancel", up);
+      }
+
+      function queueBarDragMove(ev) {
+        var d = state.queueBarDrag;
+        if (!d || ev.pointerId !== d.pointerId) return;
+        ev.preventDefault();
+        var deltaY = ev.clientY - d.startY;
+        d.itemEl.style.transform = "translateY(" + deltaY + "px)";
+
+        // 拖动中心 Y 决定目标插入位置
+        var centerY = d.rects[d.origIndex].top + d.rects[d.origIndex].height / 2 + deltaY;
+        var target = d.origIndex;
+        for (var i = 0; i < d.rects.length; i++) {
+          if (i === d.origIndex) continue;
+          var midY = d.rects[i].top + d.rects[i].height / 2;
+          if (i < d.origIndex && centerY < midY) { target = Math.min(target, i); }
+          else if (i > d.origIndex && centerY > midY) { target = Math.max(target, i); }
+        }
+        if (target !== d.targetIndex) {
+          d.targetIndex = target;
+          // 重排兄弟元素的 translateY
+          var shift = d.itemHeight + d.gap;
+          d.siblings.forEach(function(el, idx) {
+            if (idx === d.origIndex) return;
+            var move = 0;
+            if (d.origIndex < target && idx > d.origIndex && idx <= target) move = -shift;
+            else if (d.origIndex > target && idx < d.origIndex && idx >= target) move = shift;
+            el.style.transform = move ? "translateY(" + move + "px)" : "";
+          });
+        }
+      }
+
+      function queueBarDragEnd(ev) {
+        var d = state.queueBarDrag;
+        if (!d || (ev && ev.pointerId !== d.pointerId)) return;
+        try { d.handleEl.releasePointerCapture(d.pointerId); } catch (_e) {}
+        d.handleEl.removeEventListener("pointermove", d.moveHandler);
+        d.handleEl.removeEventListener("pointerup", d.upHandler);
+        d.handleEl.removeEventListener("pointercancel", d.upHandler);
+
+        var origIndex = d.origIndex;
+        var targetIndex = d.targetIndex;
+        var queueSnapshot = d.queueSnapshot;
+
+        // 清掉 inline transform 让 CSS 自然回位
+        d.siblings.forEach(function(el) {
+          el.style.transform = "";
+          el.classList.remove("queue-bar-item-sliding");
+        });
+        d.itemEl.classList.remove("dragging");
+
+        state.queueBarDrag = null;
+
+        if (origIndex === targetIndex) {
+          // 没动，光擦一下重渲就行
+          updateQueueBar();
+          return;
+        }
+
+        // 计算 order: 原下标的新排列
+        var order = [];
+        for (var i = 0; i < queueSnapshot.length; i++) order.push(i);
+        order.splice(origIndex, 1);
+        order.splice(targetIndex, 0, origIndex);
+        var nextQueue = order.map(function(i) { return queueSnapshot[i]; });
+
+        // 同步迁移 queueBarItemExpanded 下标
+        var nextExpanded = {};
+        Object.keys(state.queueBarItemExpanded).forEach(function(k) {
+          var oldI = Number(k);
+          var newI = order.indexOf(oldI);
+          if (newI >= 0) nextExpanded[newI] = state.queueBarItemExpanded[k];
+        });
+        state.queueBarItemExpanded = nextExpanded;
+
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        if (!session) { updateQueueBar(); return; }
+        updateSessionSnapshot({ id: session.id, queuedMessages: nextQueue });
+        updateQueueBar();
+
+        fetch("/api/structured-sessions/" + session.id + "/queued", {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify({ order: order }),
+        })
+        .then(function(res) {
+          if (!res.ok) {
+            return res.json().catch(function() { return {}; }).then(function(p) {
+              throw new Error((p && p.error) || "排序失败");
+            });
+          }
+        })
+        .catch(function(err) {
+          rollbackQueueOptimistic(session, queueSnapshot);
+          showToast((err && err.message) || "调整排队顺序失败。", "error");
+        });
+      }
+
+      // ── 事件代理：所有交互入口都从 #queue-bar-host 起手 ──
+      function attachQueueBarDelegates() {
+        var host = document.getElementById("queue-bar-host");
+        if (!host || host.__queueDelegated) return;
+        host.__queueDelegated = true;
+        host.addEventListener("click", function(ev) {
+          var actionEl = ev.target && ev.target.closest ? ev.target.closest("[data-action]") : null;
+          if (!actionEl || !host.contains(actionEl)) return;
+          var action = actionEl.getAttribute("data-action");
+          if (action === "drag") return; // 拖拽由 pointerdown 处理，吞掉点击避免误触发
+          ev.preventDefault();
+          ev.stopPropagation();
+          if (action === "toggle") { toggleQueueBar(); return; }
+          if (action === "collapse") { setQueueBarExpanded(false); return; }
+          if (action === "promote") { queueBarPromoteHead(); return; }
+          if (action === "clear") { queueBarClearAll(); return; }
+          if (action === "delete") {
+            var itemEl = actionEl.closest(".queue-bar-item");
+            if (itemEl) queueBarDeleteItem(Number(itemEl.getAttribute("data-index")));
+            return;
+          }
+          if (action === "expand-text") {
+            var item = actionEl.closest(".queue-bar-item");
+            if (!item) return;
+            var idx = Number(item.getAttribute("data-index"));
+            state.queueBarItemExpanded[idx] = !state.queueBarItemExpanded[idx];
+            item.classList.toggle("expanded", !!state.queueBarItemExpanded[idx]);
+            actionEl.setAttribute("aria-expanded", state.queueBarItemExpanded[idx] ? "true" : "false");
+            return;
+          }
+        });
+        host.addEventListener("pointerdown", function(ev) {
+          if (ev.button !== undefined && ev.button !== 0) return;
+          var handle = ev.target && ev.target.closest ? ev.target.closest('[data-action="drag"]') : null;
+          if (!handle || handle.disabled) return;
+          queueBarDragStart(ev, handle);
+        });
       }
 
       // 计算一条 ConversationTurn 里所有 content block 的"信息体积"——文字 / 思考 /
@@ -13087,7 +13846,8 @@
             command: command,
             cwd: cwd || "",
             mode: state.chatMode || state.config.defaultMode || "default",
-            model: modelPref || undefined
+            model: modelPref || undefined,
+            thinkingEffort: state.chatThinking || undefined
           }))
         })
         .then(function(res) { return res.json(); })
@@ -13229,7 +13989,8 @@
             cwd: defaultCwd,
             mode: mode,
             initialInput: value,
-            model: modelPref || undefined
+            model: modelPref || undefined,
+            thinkingEffort: state.chatThinking || undefined
           }))
         })
         .then(function(res) { return res.json(); })
@@ -13267,7 +14028,8 @@
             cwd: defaultCwd,
             mode: mode,
             initialInput: value || undefined,
-            model: modelPref || undefined
+            model: modelPref || undefined,
+            thinkingEffort: state.chatThinking || undefined
           }))
         })
         .then(function(res) { return res.json(); })
@@ -14183,7 +14945,27 @@
           // Without an immediate refit, any chunk arriving while the keyboard
           // animates in renders against the old grid and tears the screen.
           if (!keyboardOpen && isKeyboardOpen) {
+            // Snapshot bottom-pinned intent BEFORE the layout starts shifting.
+            // visualViewport.resize fires while the keyboard is still mid-
+            // animation on iOS; if we wait until ensureTerminalFit's rAF
+            // body executes, clientHeight has already shrunk and the user
+            // who was visibly at the bottom registers as "scrolled up".
+            // We pass the snapshot through to a delayed catch-up so the
+            // final scroll lands AFTER the animation settles.
+            var wasStickToBottom = state.terminalAutoFollow || isTerminalNearBottom();
             ensureTerminalFit("keyboard-open", { forceReplay: true });
+            // Mirror the keyboard-close 200ms delay: by then the iOS / Android
+            // keyboard slide-in animation is done, vv.height is final, and
+            // scrollHeight reflects the post-replay grid. One more force
+            // scroll closes the gap between "we scrolled during animation
+            // when scrollHeight was still in flux" and "user expects to see
+            // the bottom now that the keyboard has fully settled".
+            if (wasStickToBottom) {
+              setTimeout(function() {
+                if (!state.terminal) return;
+                maybeScrollTerminalToBottom("force");
+              }, 220);
+            }
           }
 
           // Keyboard just closed — force terminal refit and scroll to bottom
@@ -14552,6 +15334,21 @@
           ensureTerminalFitWithRetry(reason || "fit-retry", { forceReplay: forceReplay });
           return false;
         }
+        // Snapshot stick-to-bottom intent NOW, before any layout work.
+        // Two concrete bugs this guards against:
+        //   1. Mobile keyboard opens → visualViewport shrinks → terminal
+        //      clientHeight drops while scrollTop stays put → by the time
+        //      the rAF body runs, isTerminalNearBottom() reads false even
+        //      though the user was visibly pinned to the bottom a frame ago.
+        //   2. Any softResyncTerminal triggered below does resetTerminal()
+        //      (scrollTop snaps to 0) then re-writes; the wterm element
+        //      can fire intermediate scroll events that flip
+        //      terminalAutoFollow to false before we get a chance to
+        //      scroll back.
+        // Both failure modes left users mid-buffer after a resize. We
+        // capture the intent up front and use "force" below to bypass
+        // the (now-poisoned) flag check inside maybeScrollTerminalToBottom.
+        var shouldStickToBottom = state.terminalAutoFollow || isTerminalNearBottom();
         var prevCols = state.terminal.cols;
         var prevRows = state.terminal.rows;
         requestAnimationFrame(function() {
@@ -14571,8 +15368,8 @@
             if (!didResize && forceReplay && state.terminalOutput) {
               softResyncTerminal({ skipFit: true });
             }
-            if (state.terminalAutoFollow || isTerminalNearBottom()) {
-              maybeScrollTerminalToBottom("resize");
+            if (shouldStickToBottom) {
+              maybeScrollTerminalToBottom("force");
             }
           });
         });
@@ -14629,9 +15426,15 @@
 
       function syncTerminalSize() {
         if (!state.terminal) return;
-        var shouldFollow = state.terminalAutoFollow || isTerminalNearBottom();
-        if (shouldFollow) {
-          maybeScrollTerminalToBottom("resize");
+        // Force-scroll (vs the weaker maybeScrollTerminalToBottom("resize"))
+        // for the same reason ensureTerminalFit does: between this entry
+        // and the actual scroll, the wterm DOM may fire scroll events that
+        // poison terminalAutoFollow. Capturing intent now + force-scrolling
+        // keeps a user who was visibly at the bottom pinned there across
+        // window/orientation/viewport resizes.
+        var shouldStickToBottom = state.terminalAutoFollow || isTerminalNearBottom();
+        if (shouldStickToBottom) {
+          maybeScrollTerminalToBottom("force");
         }
         sendTerminalResize(state.terminal.cols, state.terminal.rows);
       }
@@ -15427,21 +16230,22 @@
 
       function updateAutoApproveIndicator() {
         var toggle = document.getElementById("auto-approve-toggle");
-        if (!toggle) return;
         var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
-        if (selectedSession && selectedSession.provider === "codex") {
-          toggle.className = "auto-approve-indicator active";
-          toggle.title = "Codex 固定以 full-access PTY 启动，不支持切换自动批准";
-          toggle.textContent = "🛡 Codex 固定全权限";
+        // 当模式（managed / full-access）已隐含自动批准，chip 应该不存在；如果上一次渲染留下来了，
+        // 在这里清理掉，避免视觉上还有冗余 chip。
+        if (isAutoApproveImpliedByMode(selectedSession)) {
+          if (toggle && toggle.parentNode) toggle.parentNode.removeChild(toggle);
           return;
         }
+        if (!toggle) return;
+        var base = "composer-pill composer-pill-chip auto-approve-indicator";
         var enabled = selectedSession && selectedSession.autoApprovePermissions;
         if (enabled) {
-          toggle.className = "auto-approve-indicator active";
+          toggle.className = base + " active";
           toggle.title = "自动批准已启用 — 点击关闭";
-          toggle.textContent = "🛡 自动批准";
+          toggle.textContent = "🛡 自动";
         } else {
-          toggle.className = "auto-approve-indicator";
+          toggle.className = base;
           toggle.title = "自动批准已关闭 — 点击开启";
           toggle.textContent = "🛡 手动";
         }
@@ -15707,6 +16511,9 @@
           // (inFlight state may have changed without new message content)
           var chatMessages = chatOutput.querySelector(".chat-messages");
           if (chatMessages) renderStructuredStatusBar(chatMessages, selectedSession);
+          // 同步刷一次进度条：inFlight 从 true→false 时（turn 结束）没有新消息，
+          // updateTodoProgress 不被调到就会让"5/6"卡在底部一直不消失。
+          updateTodoProgress(allMessages);
           return;
         }
         var prevHash = state.lastRenderedHash;
@@ -16110,9 +16917,19 @@
       });
 
       function updateTodoProgress(messages) {
+        // 只看"当前 turn"里的 TodoWrite——即最后一条 user 消息之后的那段。
+        // 不限制范围的话，上一轮留下的进度条会在新一轮（哪怕新一轮根本没用
+        // TodoWrite）里阴魂不散地重现。
+        var startIdx = 0;
+        for (var ui = messages.length - 1; ui >= 0; ui--) {
+          if (messages[ui] && messages[ui].role === "user") {
+            startIdx = ui + 1;
+            break;
+          }
+        }
+
         var todos = null;
-        // Scan all messages for latest TodoWrite tool_use
-        for (var i = messages.length - 1; i >= 0; i--) {
+        for (var i = messages.length - 1; i >= startIdx; i--) {
           var msg = messages[i];
           if (!msg.content || !Array.isArray(msg.content)) continue;
           for (var j = msg.content.length - 1; j >= 0; j--) {
@@ -16135,6 +16952,24 @@
           return;
         }
 
+        // 当前 turn 已结束（结构化 inFlight=false 或 PTY 非 running）就把进度条
+        // 收起来——模型经常忘了发最后一条"全 completed"的 TodoWrite，让用户
+        // 对着 "5/6" 干瞪眼很别扭。allDone 那条分支保留，提前命中更快返回。
+        var sel = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        var turnDone = false;
+        if (sel) {
+          if (isStructuredSession(sel)) {
+            turnDone = !(sel.structuredState && sel.structuredState.inFlight);
+          } else {
+            turnDone = sel.status !== "running";
+          }
+        }
+        if (turnDone) {
+          container.classList.add("hidden");
+          if (bodyEl) bodyEl.classList.add("hidden");
+          return;
+        }
+
         container.classList.remove("hidden");
         if (bodyEl) bodyEl.classList.remove("hidden");
 
@@ -17019,7 +17854,16 @@
           return '<div class="subagent-reply pending"><span class="typing-indicator"><span></span><span></span><span></span></span></div>';
         }
 
-        return '<div class="subagent-reply">' + renderMarkdown(text) + '</div>';
+        // 三态折叠：preview（默认 ~5 行预览，内部可滚）→ expanded（高一些上限，可滚）→
+        // collapsed（完全收起，只剩工具条）→ preview。按钮一直可见在右下，状态写在
+        // data-collapse-mode 上，配套 CSS 控制 max-height。
+        return '<div class="subagent-reply collapsible" data-collapse-mode="preview">' +
+          '<div class="subagent-reply-scroll">' + renderMarkdown(text) + '</div>' +
+          '<button type="button" class="subagent-reply-cycle" onclick="__subagentReplyCycle(event, this)" title="展开 / 收起">' +
+            '<span class="subagent-reply-cycle-label">展开</span>' +
+            '<span class="subagent-reply-cycle-icon" aria-hidden="true">▾</span>' +
+          '</button>' +
+        '</div>';
       }
       var PIXEL_AVATAR = {
         assistant: buildPixelSvg(buildCatGrid(GARFIELD_PALETTE)),
@@ -17377,7 +18221,9 @@
                 : '';
               html += '<div class="chat-handoff" style="--agent-color:' + subPalette.primary + '">' +
                 '<span class="chat-handoff-arrow">↳</span> ' +
-                escapeHtml(parentPersonaName) + ' 让 <strong>' + escapeHtml(subName) + '</strong> 帮忙' + desc +
+                escapeHtml(parentPersonaName) + ' 让 <strong>' + escapeHtml(subName) + '</strong>' +
+                '<span class="chat-handoff-tag" title="子代理 / subagent">subagent</span>' +
+                '帮忙' + desc +
               '</div>';
             }
             html += '<div class="chat-message-segment subagent" data-agent-id="' + escapeHtml(seg.subagent.taskId) + '" style="--agent-color:' + subPalette.primary + '">' +