@co0ontty/wand 1.31.3 → 1.32.1

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

@@ -1,22 +1,28 @@
     // Register Service Worker for PWA
-    // For self-signed certificates, we need to handle certificate errors gracefully
+    // 自签证书场景下 SW 注册会被浏览器强拒（规范要求 secure context + 证书可信，
+    // 即便用户已"高级 → 继续访问"也不行）。这里只能优雅降级，并把解决路径打到 console。
     if ('serviceWorker' in navigator) {
-      // First, try to fetch the service worker script with a custom handler for certificate errors
       fetch('/sw.js', { cache: 'no-cache' })
         .then(function(response) {
           if (response.ok) {
             return navigator.serviceWorker.register('/sw.js');
           }
-          // If fetch fails (e.g., certificate error), skip service worker registration
           console.log('SW fetch failed, skipping service worker registration');
           return Promise.reject('Service worker script not available');
         })
         .catch(function(e) {
-          // Distinguish between certificate errors and other failures
-          if (e.name === 'TypeError' || e.message.includes('certificate')) {
-            console.log('SW registration skipped: likely self-signed certificate issue');
+          var msg = (e && e.message) || String(e || '');
+          var isCertIssue = (e && e.name === 'TypeError') || /certificate|SSL|ERR_CERT/i.test(msg);
+          if (isCertIssue && location.protocol === 'https:') {
+            console.warn(
+              '[wand] PWA / Service Worker 因 TLS 证书不可信而跳过。\n' +
+              '解决办法（任选一种）：\n' +
+              '  1) 从 ' + location.origin + '/cert/server.crt 下载本机自签证书，导入到系统/浏览器"受信任根证书颁发机构"\n' +
+              '  2) 在本机用 mkcert 签发受信任证书，并在 ~/.wand/config.json 配置 tls.certPath / tls.keyPath\n' +
+              '  3) 用内网 CA 或 Let\'s Encrypt 给域名签真证书（同上配置 tls）'
+            );
           } else {
-            console.log('SW registration failed:', e.message || e);
+            console.log('SW registration failed:', msg);
           }
         });
 
@@ -74,6 +80,33 @@
       var configPath = "${escapeHtml(configPath)}";
       var CHAT_EXPAND_STATE_STORAGE_KEY = "wand-chat-expand-state-v1";
 
+      // ===== 一次性 localStorage 迁移 =====
+      // 用 schema 版本号确保每个 migration 只跑一次。每加一项就 ++LS_SCHEMA_VERSION
+      // 并在 LS_MIGRATIONS append 一个函数。已升级用户的 wand-ls-schema 大于等于
+      // 当前长度时整段跳过；新用户首次加载会一口气把所有 migration 都跑完再写
+      // schema 号 —— 因此每个 migration 函数对「key 不存在」的输入也必须是无害的。
+      var LS_MIGRATIONS = [
+        // v1（2026-05）取消独立的「图钉」按钮，呼出侧栏即常驻。旧版残留的
+        // wand-sidebar-pinned=false 会让老用户继续走 drawer 模式看不到新行为，
+        // 这里直接清掉，让 state 初始化回退到默认 true。
+        function migrateSidebarPinDefault() {
+          try { localStorage.removeItem("wand-sidebar-pinned"); } catch (e) {}
+        }
+      ];
+      (function runLocalStorageMigrations() {
+        try {
+          var raw = localStorage.getItem("wand-ls-schema");
+          var applied = raw == null ? 0 : parseInt(raw, 10);
+          if (!(applied >= 0)) applied = 0;
+          for (var i = applied; i < LS_MIGRATIONS.length; i++) {
+            try { LS_MIGRATIONS[i](); } catch (e) {}
+          }
+          if (applied < LS_MIGRATIONS.length) {
+            localStorage.setItem("wand-ls-schema", String(LS_MIGRATIONS.length));
+          }
+        } catch (e) { /* localStorage 不可用就跳过，按默认行为运行 */ }
+      })();
+
       var state = {
         selectedId: (function() {
           try { return localStorage.getItem("wand-selected-session") || null; } catch (e) { return null; }
@@ -137,11 +170,9 @@
         })(), // 跨会话排队消息 [{ id, text, cwd, mode, tool }]
         structuredInputQueue: [], // 结构化会话同会话排队消息
         // 排队条 UI 局部状态 ——
-        //   queueBarExpanded: 折叠条点击展开成下拉面板
-        //   queueBarItemExpanded: 展开面板里被点开看完整内容的 item 下标集合
+        //   queueBarHoverIndex: 当前被鼠标悬停的气泡下标（null 时默认展开队首）
         //   queueBarDrag: 拖拽排序进行中时的临时状态（pointer 捕获、起始坐标、参考 rect）
-        queueBarExpanded: false,
-        queueBarItemExpanded: {},
+        queueBarHoverIndex: null,
         queueBarDrag: null,
         drafts: {},
         isSyncingInputBox: false,
@@ -150,7 +181,12 @@
         bootstrapping: true,
         sessionsDrawerOpen: false,
         sidebarPinned: (function() {
-          try { return localStorage.getItem("wand-sidebar-pinned") === "true"; } catch (e) { return false; }
+          // 新交互：桌面默认呼出即常驻；只有用户主动 X 关闭过才记 "false"。
+          // 老用户的旧值（"true"/"false"）继续生效，没存过 key 时回退到 true。
+          try {
+            var v = localStorage.getItem("wand-sidebar-pinned");
+            return v === null ? true : v !== "false";
+          } catch (e) { return true; }
         })(),
         sidebarCollapsed: (function() {
           try { return localStorage.getItem("wand-sidebar-collapsed") === "true"; } catch (e) { return false; }
@@ -293,9 +329,6 @@
         fileExplorerCwd: "",
         fileExplorerTruncated: false,
         fileExplorerTotal: 0,
-        fileExplorerShowHidden: (function() {
-          try { return localStorage.getItem("wand-file-show-hidden") === "1"; } catch (e) { return false; }
-        })(),
         claudeHistory: [],
         claudeHistoryLoaded: false,
         claudeHistoryExpanded: true,
@@ -1379,6 +1412,36 @@
           });
       }
 
+      // ===== 桌面：点 sidebar 外的空白处自动收起 =====
+      // 旧版 drawer 模式下点 backdrop 关闭的便利性，在「呼出即常驻」之后用
+      // document 级捕获 handler 续上。
+      // - 仅 desktop + 全尺寸（非窄条）+ 已打开 时生效
+      // - 窄条态不触发（窄条本来就是稳定常驻形态）
+      // - 手机端由 .drawer-backdrop 元素自己接住点击，不在这里重复处理
+      // - 各类弹层（modal / topbar-more / overflow 菜单 / 文件夹下拉等）不算
+      //   「sidebar 外的空白」，否则点弹层会顺带把 sidebar 关掉
+      // 用 capture 阶段是为了绕过下游按钮自己的 stopPropagation。
+      document.addEventListener("click", function(e) {
+        if (isMobileLayout()) return;
+        if (!state.sidebarPinned) return;
+        if (state.sidebarCollapsed) return;
+        if (!state.sessionsDrawerOpen) return;
+        var target = e.target;
+        if (!target || !(target instanceof Element)) return;
+        if (target.closest("#sessions-drawer")) return;
+        if (target.closest("#sessions-toggle-button")) return;
+        if (target.closest(".floating-sidebar-toggle")) return;
+        if (target.closest(".sidebar-tile-bubble")) return;
+        if (target.closest(
+          ".modal-backdrop, .modal-overlay, .modal-container, " +
+          "[role='dialog'], [role='menu'], " +
+          ".topbar-more-menu, .sidebar-header-overflow, " +
+          ".folder-picker-dropdown, .path-suggestions, " +
+          ".permission-prompt-overlay, .restart-overlay"
+        )) return;
+        closeSessionsDrawer();
+      }, true);
+
       renderBootLoading();
       restoreLoginSession();
 
@@ -1603,9 +1666,6 @@
                       '</button>' +
                     '</div>' +
                   '</div>' +
-                  '<button id="sidebar-pin-btn" class="btn btn-ghost btn-sm sidebar-pin-toggle' + (state.sidebarPinned ? ' pinned' : '') + '" type="button" title="' + (state.sidebarPinned ? '取消固定侧栏' : '固定侧栏') + '">' +
-                    '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="17" x2="12" y2="22"/><path d="M5 17h14v-1.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V6h1a2 2 0 0 0 0-4H8a2 2 0 0 0 0 4h1v4.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24z"/></svg>' +
-                  '</button>' +
                   '<button id="sidebar-collapse-btn" class="btn btn-ghost btn-sm sidebar-collapse-toggle' + (isCollapsed ? ' collapsed' : '') + '" type="button" title="' + (isCollapsed ? '展开侧栏' : '收起为窄条') + '" aria-label="' + (isCollapsed ? '展开侧栏' : '收起为窄条') + '">' +
                     (isCollapsed
                       ? '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><polyline points="10 6 16 12 10 18"/><line x1="20" y1="5" x2="20" y2="19"/></svg>'
@@ -1686,12 +1746,6 @@
                     '<span class="file-side-panel-title">文件</span>' +
                   '</div>' +
                   '<div class="file-side-panel-header-actions">' +
-                    '<button class="file-side-panel-iconbtn file-explorer-toggle-hidden' +
-                      (state.fileExplorerShowHidden ? ' active' : '') + '" id="file-explorer-toggle-hidden" type="button" title="' +
-                      (state.fileExplorerShowHidden ? "隐藏点开头文件" : "显示隐藏文件") + '" aria-pressed="' +
-                      (state.fileExplorerShowHidden ? "true" : "false") + '" aria-label="切换显示隐藏文件">' +
-                      wandFileIcon(state.fileExplorerShowHidden ? "eye" : "eye-off", { size: 15 }) +
-                    '</button>' +
                     '<button class="file-side-panel-iconbtn" id="file-explorer-refresh" type="button" title="刷新" aria-label="刷新文件列表">' +
                       wandFileIcon("refresh", { size: 15 }) +
                     '</button>' +
@@ -1760,6 +1814,10 @@
                 '</div>' +
               '</div>' +
               '<div class="input-panel' + (state.selectedId ? "" : " hidden") + '">' +
+                // 排队气泡宿主：默认 display:none，updateQueueBar() 在 queuedMessages 非空时
+                // 显形。位置在 composer-top-row（含 "回复中" 状态条）之上，对话框右下角，
+                // 不进入输入框内部。所有内容由 updater 注入；这里只保留稳定的外层骨架。
+                '<div id="queue-bar-host" class="queue-bar-host" hidden></div>' +
                 '<div class="composer-top-row">' +
                   '<div id="todo-progress" class="todo-progress hidden">' +
                     '<div class="todo-progress-header" id="todo-progress-toggle">' +
@@ -1780,11 +1838,6 @@
                     '<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">' +
@@ -1847,13 +1900,8 @@
                       '<button id="stop-button" class="btn-circle btn-circle-stop' + (state.selectedId ? "" : " hidden") + '" title="停止">' +
                         '<svg width="12" height="12" viewBox="0 0 16 16" fill="currentColor"><rect x="3" y="3" width="10" height="10" rx="2"/></svg>' +
                       '</button>' +
-                      // 结构化模式且正在出 token 时显示：中断当前回复、立刻发送新输入。
-                      // 默认走 #send-input-button → 排队；想插队的人显式按这颗。
-                      // 用 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>' +
+                      // 「立即发送」按钮已下线 —— 默认行为永远是排队（气泡），想插队
+                      // 请点输入框上方那条气泡（chip）。Cmd/Ctrl+Enter 快捷键仍保留。
                       '<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>' +
                       '</button>' +
@@ -3990,8 +4038,7 @@
           cwdEl.title = cwd;
         }
         var url = "/api/directory?q=" + encodeURIComponent(cwd) +
-          "&gitStatus=true" +
-          (state.fileExplorerShowHidden ? "&showHidden=true" : "");
+          "&gitStatus=true";
         fetch(url, { credentials: "same-origin" })
           .then(function(res) {
             if (!res.ok) throw new Error("Failed to load directory.");
@@ -4154,8 +4201,7 @@
         var iconEl2 = item.querySelector(".tree-icon");
         if (iconEl2) iconEl2.textContent = "📂";
         var url = "/api/directory?q=" + encodeURIComponent(p) +
-          "&gitStatus=true" +
-          (state.fileExplorerShowHidden ? "&showHidden=true" : "");
+          "&gitStatus=true";
         fetch(url, { credentials: "same-origin" })
           .then(function(res) { return res.json(); })
           .then(function(payload) {
@@ -4187,20 +4233,6 @@
         refreshFileExplorer({ cwd: parent });
       }
 
-      // Toggle the show-hidden flag and persist it.
-      function toggleExplorerHidden() {
-        state.fileExplorerShowHidden = !state.fileExplorerShowHidden;
-        try { localStorage.setItem("wand-file-show-hidden", state.fileExplorerShowHidden ? "1" : "0"); } catch (e) {}
-        var btn = document.getElementById("file-explorer-toggle-hidden");
-        if (btn) {
-          btn.classList.toggle("active", state.fileExplorerShowHidden);
-          btn.setAttribute("aria-pressed", state.fileExplorerShowHidden ? "true" : "false");
-          btn.innerHTML = wandFileIcon(state.fileExplorerShowHidden ? "eye" : "eye-off", { size: 15 });
-          btn.title = state.fileExplorerShowHidden ? "隐藏点开头文件" : "显示隐藏文件";
-        }
-        refreshFileExplorer();
-      }
-
       function appendToComposer(text) {
         var inputBox = document.getElementById("input-box");
         if (!inputBox) return false;
@@ -5845,8 +5877,6 @@
         if (drawerBackdrop) drawerBackdrop.addEventListener("click", closeSessionsDrawer);
         var closeDrawerBtn = document.getElementById("close-drawer-button");
         if (closeDrawerBtn) closeDrawerBtn.addEventListener("click", closeSessionsDrawer);
-        var pinBtn = document.getElementById("sidebar-pin-btn");
-        if (pinBtn) pinBtn.addEventListener("click", toggleSidebarPin);
         var collapseBtn = document.getElementById("sidebar-collapse-btn");
         if (collapseBtn) collapseBtn.addEventListener("click", toggleSidebarCollapsed);
         var sidebarMoreBtn = document.getElementById("sidebar-more-btn");
@@ -6114,11 +6144,6 @@
           closeSessionsDrawer();
           sendOrStart();
         });
-        var interruptSendBtn = document.getElementById("interrupt-send-button");
-        if (interruptSendBtn) interruptSendBtn.addEventListener("click", function() {
-          closeSessionsDrawer();
-          sendOrStart({ interrupt: true });
-        });
         var stopBtn = document.getElementById("stop-button");
         if (stopBtn) stopBtn.addEventListener("click", stopSession);
         var modeSelect = document.getElementById("chat-mode-select");
@@ -6390,8 +6415,6 @@
         if (fileRefresh) fileRefresh.addEventListener("click", function() { refreshFileExplorer(); });
         var fileUp = document.getElementById("file-explorer-up");
         if (fileUp) fileUp.addEventListener("click", navigateExplorerUp);
-        var fileToggleHidden = document.getElementById("file-explorer-toggle-hidden");
-        if (fileToggleHidden) fileToggleHidden.addEventListener("click", toggleExplorerHidden);
 
         // 路径输入框：支持点击修改路径，回车跳转，Esc 撤销。
         var fileCwdInput = document.getElementById("file-explorer-cwd");
@@ -6840,14 +6863,8 @@
         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) {
@@ -8189,14 +8206,17 @@
         // Keep placeholders short so they don't wrap on portrait mobile screens.
         // Only show informative state hints; drop the redundant "send to X" labels.
         if (terminalInteractive) return "终端交互中";
-        if (session && session.status !== "running") {
+        // 只有真正进入终止态（exited / failed / stopped）才提示"会话已结束"。
+        // 结构化会话刚创建或一次回复结束后会回到 "idle"——那是等待下一条输入的
+        // 正常状态，不应该被当成结束。
+        if (session && (session.status === "exited" || session.status === "failed" || session.status === "stopped")) {
           if (canAutoResumeSession(session)) return "";
           return "会话已结束";
         }
         // 结构化会话在出 token 时，输入框仍然可用——告诉用户默认行为是排队，
-        // 想插队请按右侧的 » 按钮。短语保持单行不换行。
+        // 想插队请直接点上面的气泡。短语尽量短，避免在窄屏手机上换行。
         if (isStructuredSession(session) && session.structuredState && session.structuredState.inFlight) {
-          return "回复中…Enter 排队 · 旁边的「» 立即」按钮中断并立即发送";
+          return "回复中…Enter 排队 · 点气泡插队";
         }
         return "";
       }
@@ -9296,7 +9316,6 @@
       function updatePinState() {
         var drawer = document.getElementById("sessions-drawer");
         var mainLayout = document.querySelector(".main-layout");
-        var pinBtn = document.getElementById("sidebar-pin-btn");
         // 与 renderAppShell 保持一致：手机端只允许窄条形态 anchored。
         var isMobile = isMobileLayout();
         var isCollapsed = !!state.sidebarPinned && !!state.sidebarCollapsed;
@@ -9309,10 +9328,6 @@
           mainLayout.classList.toggle("sidebar-pinned", isAnchored);
           mainLayout.classList.toggle("sidebar-collapsed", isCollapsed);
         }
-        if (pinBtn) {
-          pinBtn.classList.toggle("pinned", state.sidebarPinned);
-          pinBtn.title = state.sidebarPinned ? "取消固定侧栏" : "固定侧栏";
-        }
       }
 
       function updateDrawerState() {
@@ -9336,9 +9351,26 @@
       }
 
       function toggleSessionsDrawer() {
-        if (state.sidebarPinned && !isMobileLayout()) return;
+        var isMobile = isMobileLayout();
+        if (!isMobile) {
+          // 桌面：呼出 = 常驻全尺寸；再次点击 = 完全收起（floating-toggle 重新出现）。
+          // 取消了独立的「图钉」概念，sidebarPinned 现在由呼出/关闭自动管理。
+          var willOpen = !state.sidebarPinned;
+          state.sidebarPinned = willOpen;
+          state.sessionsDrawerOpen = willOpen;
+          if (willOpen) {
+            // 桌面重新呼出默认回到全尺寸；窄条形态需用户主动点 collapse 按钮切换。
+            state.sidebarCollapsed = false;
+            try { localStorage.setItem("wand-sidebar-collapsed", "false"); } catch (e) {}
+          }
+          try { localStorage.setItem("wand-sidebar-pinned", String(willOpen)); } catch (e) {}
+          updateLayoutState();
+          scheduleTerminalRefitAfterPaddingTransition();
+          return;
+        }
+        // 手机端：保持原 drawer 行为。
         state.sessionsDrawerOpen = !state.sessionsDrawerOpen;
-        if (state.sessionsDrawerOpen && isMobileLayout()) {
+        if (state.sessionsDrawerOpen) {
           state.filePanelOpen = false;
           try {
             localStorage.setItem("wand-file-panel-open", "false");
@@ -9348,13 +9380,42 @@
       }
 
       function closeSessionsDrawer() {
-        if (state.sidebarPinned && !isMobileLayout()) return;
+        var isMobile = isMobileLayout();
+        if (!isMobile) {
+          // 桌面：X 按钮 / backdrop 点击 = 完全收起，撤掉常驻状态，floating-toggle 重新出现。
+          // 窄条状态下没有 X 按钮（CSS 隐藏），不会走到这里，因此无需特判 collapsed。
+          if (!state.sidebarPinned && !state.sessionsDrawerOpen) return;
+          closeSwipedItem();
+          state.sidebarPinned = false;
+          state.sessionsDrawerOpen = false;
+          try { localStorage.setItem("wand-sidebar-pinned", "false"); } catch (e) {}
+          updateLayoutState();
+          scheduleTerminalRefitAfterPaddingTransition();
+          return;
+        }
+        // 手机端：保持原 drawer 关闭行为。
         if (!state.sessionsDrawerOpen) return;
         closeSwipedItem();
         state.sessionsDrawerOpen = false;
         updateLayoutState();
       }
 
+      // 桌面 padding-left transition 结束后重新拟合终端尺寸。
+      // 抽出来给 toggleSessionsDrawer / closeSessionsDrawer / toggleSidebarCollapsed 复用。
+      function scheduleTerminalRefitAfterPaddingTransition() {
+        var mainLayout = document.querySelector(".main-layout");
+        if (mainLayout) {
+          var onEnd = function(e) {
+            if (e.propertyName === "padding-left") {
+              mainLayout.removeEventListener("transitionend", onEnd);
+              scheduleTerminalResize(true);
+            }
+          };
+          mainLayout.addEventListener("transitionend", onEnd);
+        }
+        setTimeout(function() { scheduleTerminalResize(true); }, 350);
+      }
+
       var collapsedTileBubbleEl = null;
       function ensureCollapsedTileBubble() {
         if (collapsedTileBubbleEl && document.body.contains(collapsedTileBubbleEl)) {
@@ -9420,8 +9481,7 @@
 
       function toggleSidebarCollapsed() {
         var isMobile = isMobileLayout();
-        // 在 drawer 模式（未 pin）下点 collapse 视为「先固定、再收起为窄条」——
-        // 用户直觉是「点了就该看到窄条」，过去这里 early return 让按钮看上去没反应。
+        // 任何形态下点窄条按钮都意味着「我要常驻」，确保 pinned 写上。
         if (!state.sidebarPinned) {
           state.sidebarPinned = true;
           try {
@@ -9445,47 +9505,13 @@
             localStorage.setItem("wand-sidebar-pinned", "false");
           } catch (e) {}
         } else {
-          // 桌面端展开窄条 → 300px 全栏固定，自动打开。
+          // 桌面端展开窄条 → 300px 全栏常驻。
           state.sessionsDrawerOpen = true;
         }
         render();
-        var mainLayout = document.querySelector(".main-layout");
-        if (mainLayout) {
-          var onEnd = function(e) {
-            if (e.propertyName === "padding-left") {
-              mainLayout.removeEventListener("transitionend", onEnd);
-              scheduleTerminalResize(true);
-            }
-          };
-          mainLayout.addEventListener("transitionend", onEnd);
-        }
-        setTimeout(function() { scheduleTerminalResize(true); }, 350);
+        scheduleTerminalRefitAfterPaddingTransition();
       }
 
-      function toggleSidebarPin() {
-        if (isMobileLayout()) return;
-        state.sidebarPinned = !state.sidebarPinned;
-        try {
-          localStorage.setItem("wand-sidebar-pinned", String(state.sidebarPinned));
-        } catch (e) {}
-        if (state.sidebarPinned) {
-          state.sessionsDrawerOpen = true;
-        }
-        updateLayoutState();
-        // Refit terminal after padding-left transition completes
-        var mainLayout = document.querySelector(".main-layout");
-        if (mainLayout) {
-          var onEnd = function(e) {
-            if (e.propertyName === "padding-left") {
-              mainLayout.removeEventListener("transitionend", onEnd);
-              scheduleTerminalResize(true);
-            }
-          };
-          mainLayout.addEventListener("transitionend", onEnd);
-        }
-        // Fallback refit in case transition doesn't fire
-        setTimeout(function() { scheduleTerminalResize(true); }, 350);
-      }
 
       // Store last focused element for focus trap
       var lastFocusedElement = null;
@@ -12287,9 +12313,10 @@
 
       function postStructuredInput(input, inputBox, session, opts) {
         opts = opts || {};
-        // 用户显式点击"立即发送"才会传 interrupt:true。普通 Enter / 点发送
-        // 在上一条还在流式时默认走 queue —— 后端 sendMessage(...) 会把它
-        // 追加到 queuedMessages，等当前 turn 结束自动 flush。
+        // interrupt:true 现在只来自 Cmd/Ctrl+Enter 快捷键，或点队列气泡触发的
+        // queueBarPromoteIndex()。普通 Enter / 点发送在上一条还在流式时默认走
+        // queue —— 后端 sendMessage(...) 会把它追加到 queuedMessages，等当前 turn
+        // 结束自动 flush；想插队就点输入框上方那条气泡。
         var requestedInterrupt = !!opts.interrupt;
         console.log("[WAND] postStructuredInput selectedId:", state.selectedId, "input:", input && input.substring(0, 50), "requestedInterrupt:", requestedInterrupt, "session:", session && { id: session.id, sessionKind: session.sessionKind, runner: session.runner, status: session.status, inFlight: session.structuredState && session.structuredState.inFlight });
         if (!state.selectedId || !input) return Promise.resolve();
@@ -12327,7 +12354,7 @@
           updateSessionSnapshot(optimisticPatch);
           var queueRefreshed = state.sessions.find(function(s) { return s.id === session.id; }) || session;
           state.currentMessages = buildMessagesForRender(queueRefreshed, getPreferredMessages(queueRefreshed, queueRefreshed.output, false));
-          updateInputHint("已加入排队，等待当前回复完成…");
+          updateInputHint("已加入排队…");
           renderChat(true);
           updateStructuredQueueCounter();
           // 乐观 toast：原本只在 POST 完成后才提示，Claude 流式拖太久时用户根本
@@ -12483,104 +12510,80 @@
       }
 
       // ──────────────────────────────────────────────────────────────────────────
-      // 排队条（.queue-bar）—— 输入框上方独立浮条，承担三个事情：
-      //   1) 折叠态：● 排队 N + 队尾预览 + ⌃ chevron + ⚡ 立即 按钮
-      //   2) 展开面板：列出所有排队消息，支持拖拽换序 / 单条删除 / 一键清空
-      //   3) 立即按钮：中断当前回复，把队首作为新消息插队发出去（剩余队列保留）
-      // 数据源：session.queuedMessages（由后端 WS 推送 + postStructuredInput 乐观更新）。
+      // 排队气泡条（.queue-bar）—— 垂直堆叠，浮在 "回复中" 状态条上方。
+      // 交互参考 iOS 通讯录右侧的字母选择条：
+      //   · 默认只展开队首（即下一个要发的那条），显示编号 + 文本 + × 删除
+      //   · 其他消息收起成一根小横杠（指示存在但不占空间）
+      //   · 鼠标悬到任意小横杠 → 该条展开、原本展开的那条收回小横杠
+      //   · 点一下任意气泡 → 中断当前回复、把这条作为新输入插队发出去
+      //   · 按住任意气泡向上 / 向下拖拽 → 换序
+      // 末尾跟一个 ⚡ 按钮：等价于点队首气泡（保留作为快速插队的视觉提示）。
+      // 数据源：session.queuedMessages（后端 WS + postStructuredInput 乐观更新）。
       // ──────────────────────────────────────────────────────────────────────────
 
-      var QUEUE_BAR_MAX = 10; // 后端硬上限
+      var QUEUE_BAR_MAX = 10;            // 后端硬上限
+      var QUEUE_CHIP_MAX_TEXT = 24;      // 单个气泡展开时显示的字数上限
 
-      function queueBarTruncatePreview(text) {
+      function queueChipTruncate(text) {
         if (typeof text !== "string") return "";
         var s = text.replace(/\s+/g, " ").trim();
-        if (s.length <= 48) return s;
-        return s.slice(0, 46) + "…";
+        if (s.length <= QUEUE_CHIP_MAX_TEXT) return s;
+        return s.slice(0, QUEUE_CHIP_MAX_TEXT) + "…";
       }
 
-      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">' + iconSvg("inbox", { size: 13, strokeWidth: 1.7, cls: "queue-bar-panel-title-icon" }) + '<span>排队中 (' + count + ')</span></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;
+      // 当前应该展开的下标：拖拽中 → 被拖的那条（data-index 不变）；hover → 被 hover 的；否则 → 第 0 项
+      function queueBarExpandedIndex(itemsLength) {
+        if (state.queueBarDrag && typeof state.queueBarDrag.origIndex === "number") {
+          return state.queueBarDrag.origIndex;
+        }
+        if (typeof state.queueBarHoverIndex === "number"
+            && state.queueBarHoverIndex >= 0
+            && state.queueBarHoverIndex < itemsLength) {
+          return state.queueBarHoverIndex;
+        }
+        return 0;
       }
 
-      function renderQueueBarItems(listEl, items) {
-        // ol 内容单独 render —— 拖拽 / 删除 / 展开会频繁动它，外层骨架不重建避免抖动。
+      function renderQueueBarHtml(items, inFlight, atCapacity, immediateLabel) {
         var single = items.length <= 1;
-        var html = "";
+        var barClass = "queue-bar";
+        if (atCapacity) barClass += " queue-bar-capacity";
+        if (inFlight) barClass += " queue-bar-inflight";
+        var expandedIdx = queueBarExpandedIndex(items.length);
+        var chips = "";
         for (var i = 0; i < items.length; i++) {
           var raw = items[i] == null ? "" : String(items[i]);
-          var expanded = !!state.queueBarItemExpanded[i];
+          var isExpanded = i === expandedIdx;
           var itemClass = "queue-bar-item";
-          if (expanded) itemClass += " expanded";
+          if (isExpanded) 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>' +
+          // 整个 chip 既是拖拽起手区，也是"点一下立即发送"的触发点；delete 按钮单独占点击。
+          var titleAttr = isExpanded ? raw + "（点一下立即发送 · 按住可拖动调序）" : raw + "（点一下立即发送）";
+          chips +=
+            '<li class="' + itemClass + '" data-index="' + i + '" data-action="drag"' +
+                ' title="' + escapeHtml(titleAttr) + '">' +
+              '<span class="queue-bar-item-index" aria-hidden="true">' + (i + 1) + '</span>' +
+              '<span class="queue-bar-item-text">' + escapeHtml(queueChipTruncate(raw)) + '</span>' +
               '<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">' +
+                    ' aria-label="删除这条排队消息" title="删除" tabindex="' + (isExpanded ? "0" : "-1") + '">' +
+                '<svg width="9" height="9" viewBox="0 0 24 24" fill="none" stroke="currentColor"' +
+                    ' stroke-width="3" 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;
+        return (
+          '<div class="' + barClass + '" data-queue-bar="1">' +
+            '<ol class="queue-bar-list" data-queue-list="1">' + chips + '</ol>' +
+            '<button type="button" class="queue-bar-promote" data-action="promote"' +
+                  ' title="中断当前回复，立刻发送队首这条"' +
+                  ' aria-label="' + escapeHtml(immediateLabel) + '队首">' +
+              '<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>' +
+            '</button>' +
+          '</div>'
+        );
       }
 
       function updateQueueBar() {
@@ -12592,64 +12595,50 @@
         queue = Array.isArray(queue) ? queue : [];
 
         if (!isStructured || queue.length === 0) {
-          // 队列空 / 非结构化会话：整条隐藏，并清掉展开/逐条展开的本地态。
           host.hidden = true;
           host.innerHTML = "";
-          state.queueBarExpanded = false;
-          state.queueBarItemExpanded = {};
+          state.queueBarHoverIndex = null;
           return;
         }
 
+        // 拖拽进行中绝不重建 DOM，否则 pointer capture 丢失、气泡闪屏。
+        if (state.queueBarDrag) 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);
+        host.innerHTML = renderQueueBarHtml(queue, inFlight, atCapacity, immediateLabel);
       }
 
-      // ── 折叠 / 展开 ──
-      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;
+      // 只切换 .expanded class，不重建 DOM —— 避免鼠标移过去触发的重建
+      // 让拖拽/输入框焦点等丢失。所有同步状态（hoverIndex / drag）的改变都通过这里反映到 DOM。
+      function reflectQueueBarExpansion() {
         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();
+        if (!host || host.hidden) return;
+        var list = host.querySelector('[data-queue-list="1"]');
+        if (!list) return;
+        var children = list.children;
+        var expandedIdx = queueBarExpandedIndex(children.length);
+        for (var i = 0; i < children.length; i++) {
+          var el = children[i];
+          var should = i === expandedIdx;
+          if (el.classList.contains("expanded") !== should) {
+            el.classList.toggle("expanded", should);
+            var del = el.querySelector('.queue-bar-item-delete');
+            if (del) del.tabIndex = should ? 0 : -1;
+          }
         }
       }
 
+      function setQueueBarHoverIndex(idx) {
+        var next = (idx == null ? null : Number(idx));
+        if (state.queueBarHoverIndex === next) return;
+        state.queueBarHoverIndex = next;
+        reflectQueueBarExpansion();
+      }
+
       // ── 单条删除 / 全部清空 / 队首插队 ──
       function rollbackQueueOptimistic(session, prevQueue) {
         updateSessionSnapshot({ id: session.id, queuedMessages: prevQueue });
@@ -12666,15 +12655,11 @@
         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;
+        // hover 下标也要随之收缩，否则删完后展开的是错位的那条
+        if (typeof state.queueBarHoverIndex === "number") {
+          if (state.queueBarHoverIndex === index) state.queueBarHoverIndex = null;
+          else if (state.queueBarHoverIndex > index) state.queueBarHoverIndex -= 1;
+        }
         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));
@@ -12702,7 +12687,7 @@
         if (!session) return;
         var prev = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
         if (prev.length === 0) return;
-        state.queueBarItemExpanded = {};
+        state.queueBarHoverIndex = null;
         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));
@@ -12727,42 +12712,42 @@
       }
 
       function queueBarPromoteHead() {
+        queueBarPromoteIndex(0);
+      }
+
+      // 把队列里第 index 条剥下来，作为新的输入立刻发送出去。
+      // - inFlight：interrupt + preserveQueue（中断当前回复，保留其它排队）
+      // - 非 inFlight：当作普通新消息发出去
+      // 用户路径：点输入框上方的气泡（chip）→ 这里。
+      function queueBarPromoteIndex(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 (queue.length === 0) return;
-        var head = queue[0];
-        var rest = queue.slice(1);
+        if (index < 0 || index >= queue.length) return;
+        var picked = queue[index];
+        var rest = queue.slice(0, index).concat(queue.slice(index + 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;
-        })();
+        // 乐观：剥掉这一条；hover 下标随之收缩
+        if (typeof state.queueBarHoverIndex === "number") {
+          if (state.queueBarHoverIndex === index) state.queueBarHoverIndex = null;
+          else if (state.queueBarHoverIndex > index) state.queueBarHoverIndex -= 1;
+        }
         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 };
+        var body = { input: picked, idempotencyKey: idempotencyKey };
         if (inFlight) {
           // 中断 + 保留剩余队列
           body.interrupt = true;
           body.preserveQueue = true;
         }
         // 给一个乐观 toast，让用户瞬间知道点击生效了
-        showToast(inFlight ? "已请求中断当前回复，立即发送队首。" : "已立即发送队首消息。", "info");
+        showToast(inFlight ? "已请求中断当前回复，立即发送这条。" : "已立即发送这条消息。", "info");
 
         fetch("/api/structured-sessions/" + session.id + "/messages", {
           method: "POST",
@@ -12795,53 +12780,82 @@
         });
       }
 
-      // ── 拖拽排序（Pointer Events + 简化版 sort/animate）──
-      function queueBarDragStart(ev, handleEl) {
+      // ── 拖拽排序（Pointer Events + 真实高度的 sort/animate）──
+      // 单条气泡的 pointerdown 也会进这里，但 queue.length <= 1 时直接返回，让
+      // 系统 click 事件穿透到 #queue-bar-host 的 click delegate（那里再判断"点击
+      // 气泡 → 立即发送"）。
+      function queueBarDragStart(ev, chipEl) {
         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 (!chipEl) return;
+        var listEl = chipEl.parentElement;
         if (!listEl) return;
-        var origIndex = Number(itemEl.getAttribute("data-index"));
+        var origIndex = Number(chipEl.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 保持一致
+        // 真实间距：相邻两个 chip 的 top 差减去前一个高度（容错 hover 状态变化后的高度切换）
+        var gap = 3;
+        if (rects.length >= 2) gap = Math.max(0, rects[1].top - rects[0].top - rects[0].height);
 
         ev.preventDefault();
-        try { handleEl.setPointerCapture(ev.pointerId); } catch (_e) {}
+        try { chipEl.setPointerCapture(ev.pointerId); } catch (_e) {}
         if (navigator && navigator.vibrate) { try { navigator.vibrate(8); } catch (_e2) {} }
 
         state.queueBarDrag = {
           pointerId: ev.pointerId,
-          handleEl: handleEl,
-          itemEl: itemEl,
+          handleEl: chipEl,
+          itemEl: chipEl,
           listEl: listEl,
           siblings: siblings,
           rects: rects,
           origIndex: origIndex,
           targetIndex: origIndex,
           startY: ev.clientY,
-          itemHeight: itemHeight,
           gap: gap,
           queueSnapshot: queue,
+          moved: false, // 没真正拖动过 → 抬手时按 tap 处理：promote 这条
         };
 
-        itemEl.classList.add("dragging");
+        chipEl.classList.add("dragging");
+        // 让被拖元素保持 expanded（即便鼠标已经离开它）
+        reflectQueueBarExpansion();
         // 把所有兄弟先标记为"参与平滑动画"
-        siblings.forEach(function(el) { if (el !== itemEl) el.classList.add("queue-bar-item-sliding"); });
+        siblings.forEach(function(el) { if (el !== chipEl) 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);
+        chipEl.addEventListener("pointermove", move);
+        chipEl.addEventListener("pointerup", up);
+        chipEl.addEventListener("pointercancel", up);
+      }
+
+      // 给定 origIndex / target / 真实 rects，算出新排列下每个 sibling 的目标 top。
+      // 用真实高度而不是固定 shift，因为 expanded chip 比 collapsed 高很多。
+      function queueBarComputeNewTops(origIndex, target, rects, gap) {
+        var n = rects.length;
+        var order = [];
+        for (var i = 0; i < n; i++) order.push(i);
+        order.splice(origIndex, 1);
+        order.splice(target, 0, origIndex);
+        var top = rects[0].top;
+        // list 是右对齐 column flex，所有元素相对 list 左边对齐 — 我们只关心 top
+        // 用第一个 rect 的 top 作为锚点累加。
+        // 但 list 起始位置不一定是 rects[0].top（rects[0] 现在变到 order[0] 的位置）
+        // 这里需要找原本的 list top —— 取 rects 里最小 top 即可。
+        var listTop = rects[0].top;
+        for (var k = 1; k < n; k++) if (rects[k].top < listTop) listTop = rects[k].top;
+        var newTops = {};
+        var cursor = listTop;
+        for (var newPos = 0; newPos < n; newPos++) {
+          var oldIdx = order[newPos];
+          newTops[oldIdx] = cursor;
+          cursor += rects[oldIdx].height + gap;
+        }
+        return newTops;
       }
 
       function queueBarDragMove(ev) {
@@ -12849,6 +12863,8 @@
         if (!d || ev.pointerId !== d.pointerId) return;
         ev.preventDefault();
         var deltaY = ev.clientY - d.startY;
+        // 4px 阈值过滤抖动 / 触屏轻微滑动；超过才算"真的在拖"，否则抬手当 tap。
+        if (Math.abs(deltaY) > 4) d.moved = true;
         d.itemEl.style.transform = "translateY(" + deltaY + "px)";
 
         // 拖动中心 Y 决定目标插入位置
@@ -12862,13 +12878,11 @@
         }
         if (target !== d.targetIndex) {
           d.targetIndex = target;
-          // 重排兄弟元素的 translateY
-          var shift = d.itemHeight + d.gap;
+          // 按真实高度精确算每个 sibling 的新 top
+          var newTops = queueBarComputeNewTops(d.origIndex, target, d.rects, 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;
+            var move = newTops[idx] - d.rects[idx].top;
             el.style.transform = move ? "translateY(" + move + "px)" : "";
           });
         }
@@ -12885,6 +12899,7 @@
         var origIndex = d.origIndex;
         var targetIndex = d.targetIndex;
         var queueSnapshot = d.queueSnapshot;
+        var wasTap = !d.moved;
 
         // 清掉 inline transform 让 CSS 自然回位
         d.siblings.forEach(function(el) {
@@ -12896,8 +12911,9 @@
         state.queueBarDrag = null;
 
         if (origIndex === targetIndex) {
-          // 没动，光擦一下重渲就行
+          // 没真的移动过 → 按 tap 处理：把这条剥下来插队发送。
           updateQueueBar();
+          if (wasTap) queueBarPromoteIndex(origIndex);
           return;
         }
 
@@ -12908,14 +12924,8 @@
         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;
+        // hover 下标迁移到新位置（拖拽放手时鼠标停在 targetIndex 上）
+        state.queueBarHoverIndex = targetIndex;
 
         var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
         if (!session) { updateQueueBar(); return; }
@@ -12950,33 +12960,45 @@
           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 处理，吞掉点击避免误触发
+          if (action === "drag") {
+            // queue.length > 1 时 pointerdown 已经 preventDefault → click 不会到这；
+            // queue.length === 1 时 drag-start 早退、click 会落到这里：当成 tap，
+            // 把这条直接 promote 出去。
+            ev.preventDefault();
+            ev.stopPropagation();
+            var idx = Number(actionEl.getAttribute("data-index"));
+            queueBarPromoteIndex(idx);
+            return;
+          }
           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;
-          }
         });
+        // hover 跟随：鼠标移到哪一条，哪一条就展开（拖拽进行中不响应，免得抢拖拽）
+        host.addEventListener("mouseover", function(ev) {
+          if (state.queueBarDrag) return;
+          var chip = ev.target && ev.target.closest ? ev.target.closest(".queue-bar-item") : null;
+          if (!chip || !host.contains(chip)) return;
+          setQueueBarHoverIndex(Number(chip.getAttribute("data-index")));
+        });
+        host.addEventListener("mouseleave", function() {
+          if (state.queueBarDrag) return;
+          setQueueBarHoverIndex(null);
+        });
+        // 整个气泡都是拖拽起手区。delete / promote 按钮通过 closest 检查跳过
         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);
+          if (ev.target && ev.target.closest && ev.target.closest('[data-action="delete"], [data-action="promote"]')) return;
+          var chip = ev.target && ev.target.closest ? ev.target.closest('.queue-bar-item') : null;
+          if (!chip) return;
+          // 拖拽前先把这条切到 expanded（鼠标按下时通常已经 hovered，但触屏没 hover）
+          setQueueBarHoverIndex(Number(chip.getAttribute("data-index")));
+          queueBarDragStart(ev, chip);
         });
       }
 
@@ -13563,12 +13585,6 @@
             : (isCodex ? (isRunning ? "发送给 Codex" : "Codex 会话已结束") : (!selectedSession || isRunning || canResumeOnSend ? "发送" : "会话已结束")));
           sendBtn.classList.toggle("queue-mode", structuredInFlight);
         }
-        var interruptBtn = document.getElementById("interrupt-send-button");
-        if (interruptBtn) {
-          // 仅结构化 + inFlight 时显示。pty 会话有自己的 Ctrl+C / stop 按钮，
-          // 用不上这套语义。
-          interruptBtn.classList.toggle("hidden", !structuredInFlight);
-        }
         var container = document.getElementById("output");
         if (container) container.classList.toggle("interactive", !structured && state.terminalInteractive);
       }
@@ -17054,24 +17070,13 @@
           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;
-        }
-
+        // 之前这里在 turn 结束（结构化 inFlight=false 或 PTY 非 running）时
+        // 把进度条收起来，理由是「模型经常忘了发最后一条全 completed 的
+        // TodoWrite，让用户对着 5/6 干瞪眼很别扭」。但反馈是：在结构化模式下
+        // inFlight 在流间隙会短暂置假，进度条因此跟着闪没；而且 turn 刚结束
+        // 时用户其实想再看一眼最终进度。改回「只要当前 turn 里有 todos 就显
+        // 示，allDone 时再隐藏」，跨 turn 残留交给开头那段「最后一条 user
+        // 消息后才扫 TodoWrite」的 scoping 兜住。
         container.classList.remove("hidden");
         if (bodyEl) bodyEl.classList.remove("hidden");