@co0ontty/wand 1.30.0 → 1.30.3

package/dist/structured-session-manager.js

@@ -117,6 +117,50 @@ function tagSubagentBlocks(blocks, parentToolUseId, registry) {
     };
     return blocks.map((block) => ({ ...block, __subagent: stamp }));
 }
+/**
+ * 给已被 captureTaskMeta 识别为 Task/Agent 的 tool_use block 本身也盖 __subagent 章。
+ * taskId 用自己的 block.id —— 与子消息的 parent_tool_use_id（也等于这个 id）保持一致，
+ * 前端 splitTurnBySubagent 按 taskId 分组时父 Task tool_use 和 SDK 转发的子消息能合并到同一段。
+ */
+function stampSelfTask(blocks, registry) {
+    return blocks.map((b) => {
+        if (b.type !== "tool_use")
+            return b;
+        if (b.__subagent)
+            return b; // 已盖章不重复（防止幂等问题）
+        const meta = registry.get(b.id);
+        if (!meta && b.name !== "Task" && b.name !== "Agent")
+            return b;
+        const stamp = {
+            taskId: b.id,
+            ...(meta?.agentType ? { agentType: meta.agentType } : {}),
+            ...(meta?.description ? { taskDescription: meta.description } : {}),
+        };
+        return { ...b, __subagent: stamp };
+    });
+}
+/**
+ * 当父 assistant 在 parentToolUseId === null 的 user turn 里收到 Task 工具的 tool_result 时，
+ * tagSubagentBlocks 不会被调用（它只在 parentToolUseId 非空时盖章）。这里按 tool_use_id
+ * 反查 registry，给这条 tool_result 单独盖章，让前端能把它归到同一个 subagent 段。
+ */
+function stampParentTaskResults(blocks, registry) {
+    return blocks.map((b) => {
+        if (b.type !== "tool_result")
+            return b;
+        if (b.__subagent)
+            return b;
+        const meta = registry.get(b.tool_use_id);
+        if (!meta)
+            return b;
+        const stamp = {
+            taskId: b.tool_use_id,
+            ...(meta.agentType ? { agentType: meta.agentType } : {}),
+            ...(meta.description ? { taskDescription: meta.description } : {}),
+        };
+        return { ...b, __subagent: stamp };
+    });
+}
 const STREAM_EMIT_DEBOUNCE_MS = 16;
 /** Min interval between full saveSession() calls for an in-progress streaming turn.
  *  saveSession serializes the entire messages array, so doing it on every NDJSON
@@ -1555,7 +1599,7 @@ export class StructuredSessionManager {
                         captureTaskMeta(extracted.content, taskMetaRegistry);
                     }
                     const stamped = parentToolUseId === null
-                        ? extracted.content
+                        ? stampSelfTask(extracted.content, taskMetaRegistry)
                         : tagSubagentBlocks(extracted.content, parentToolUseId, taskMetaRegistry);
                     if (stamped.length > 0) {
                         upsertBlocks(msgId, stamped);
@@ -1599,7 +1643,7 @@ export class StructuredSessionManager {
                         ? parsed.parent_tool_use_id
                         : null;
                     const stamped = parentToolUseId === null
-                        ? collected
+                        ? stampParentTaskResults(collected, taskMetaRegistry)
                         : tagSubagentBlocks(collected, parentToolUseId, taskMetaRegistry);
                     if (stamped.length > 0) {
                         upsertBlocks(`tool_result:${toolResultSeq++}`, stamped);
@@ -1983,7 +2027,13 @@ export class StructuredSessionManager {
                     streaming.push(block);
                 }
             }
-            return [...finalizedBlocks, ...streaming];
+            // 流式阶段就给 Task/Agent tool_use 本身盖章，防止"先显示工具卡片几秒再跳为
+            // handoff 行"的闪烁。content_block_start 阶段就有 name=Task/Agent，
+            // stampSelfTask 据此即可命中；agentType 字段藏在 input 里，delta 累计后再由
+            // 后续 captureTaskMeta 回填 registry，下次 rebuild 自动补上更完整的 stamp。
+            captureTaskMeta(streaming, taskMetaRegistry);
+            const stampedStreaming = stampSelfTask(streaming, taskMetaRegistry);
+            return [...finalizedBlocks, ...stampedStreaming];
         };
         const syncSnapshot = () => {
             const current = this.sessions.get(sessionId);
@@ -2095,7 +2145,7 @@ export class StructuredSessionManager {
                     const parentToolUseId = assistantMsg.parent_tool_use_id ?? null;
                     if (parentToolUseId === null) {
                         captureTaskMeta(extracted.content, taskMetaRegistry);
-                        finalizedBlocks.push(...extracted.content);
+                        finalizedBlocks.push(...stampSelfTask(extracted.content, taskMetaRegistry));
                     }
                     else {
                         finalizedBlocks.push(...tagSubagentBlocks(extracted.content, parentToolUseId, taskMetaRegistry));
@@ -2150,7 +2200,7 @@ export class StructuredSessionManager {
                         }
                     }
                     if (parentToolUseId === null) {
-                        finalizedBlocks.push(...collected);
+                        finalizedBlocks.push(...stampParentTaskResults(collected, taskMetaRegistry));
                     }
                     else {
                         finalizedBlocks.push(...tagSubagentBlocks(collected, parentToolUseId, taskMetaRegistry));

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

@@ -238,10 +238,19 @@
         chatUnreadCount: 0,
         // state.currentMessages 中第一条未读消息的 index，-1 表示没有未读。
         chatUnreadStartIndex: -1,
-        chatScrollThreshold: 120,
+        // 业界共识 150-180px：120px 在触控板/移动端惯性下边界来回弹。
+        chatScrollThreshold: 160,
         chatIsProgrammaticScroll: false,
         chatScrollElement: null,
         chatScrollHandler: null,
+        chatScrollWheelHandler: null,
+        chatScrollTouchStartHandler: null,
+        chatScrollTouchMoveHandler: null,
+        chatTouchStartY: 0,
+        // 仅在"首次渲染当前会话视图"时才允许 fullRenderChat 强制贴底。
+        // resetChatRenderCache 会把它设回 false；fullRenderChat 第一次跑完就置 true。
+        // page-refresh / ws 重连不重置此标记，避免把用户拽到底部。
+        chatInitialRenderDone: false,
         lastForegroundSyncAt: 0,
         foregroundSyncTimer: null,
         wsReconnectAttempts: 0,
@@ -597,8 +606,19 @@
           updateChatUnreadBubble();
           return;
         }
-        if (state.chatScrollElement && state.chatScrollHandler) {
-          state.chatScrollElement.removeEventListener("scroll", state.chatScrollHandler);
+        if (state.chatScrollElement) {
+          if (state.chatScrollHandler) {
+            state.chatScrollElement.removeEventListener("scroll", state.chatScrollHandler);
+          }
+          if (state.chatScrollWheelHandler) {
+            state.chatScrollElement.removeEventListener("wheel", state.chatScrollWheelHandler);
+          }
+          if (state.chatScrollTouchStartHandler) {
+            state.chatScrollElement.removeEventListener("touchstart", state.chatScrollTouchStartHandler);
+          }
+          if (state.chatScrollTouchMoveHandler) {
+            state.chatScrollElement.removeEventListener("touchmove", state.chatScrollTouchMoveHandler);
+          }
         }
         state.chatScrollElement = chatMsgs;
         state.chatScrollHandler = function() {
@@ -619,7 +639,35 @@
           }
           updateChatUnreadBubble();
         };
+        // wheel/touch 提前下台：浏览器要等惯性产生位移才触发 scroll 事件，
+        // 这一帧空窗里如果有 streaming chunk 进来，会在 sticky=true 状态下
+        // 被强制贴底。监听用户开始上滚的瞬间立刻把 sticky 翻成 false，
+        // 避免那一帧的拽回。column-reverse 下 deltaY<0（滚轮上推）= 看历史。
+        state.chatScrollWheelHandler = function(e) {
+          if (state.chatIsProgrammaticScroll) return;
+          if (e.deltaY < 0) {
+            state.chatStickToBottom = false;
+            updateChatUnreadBubble();
+          }
+        };
+        state.chatScrollTouchStartHandler = function(e) {
+          if (!e.touches || e.touches.length === 0) return;
+          state.chatTouchStartY = e.touches[0].clientY;
+        };
+        state.chatScrollTouchMoveHandler = function(e) {
+          if (state.chatIsProgrammaticScroll) return;
+          if (!e.touches || e.touches.length === 0) return;
+          // column-reverse 下：手指向下拖（clientY 变大）= 内容向下走 = 看历史。
+          var deltaY = e.touches[0].clientY - state.chatTouchStartY;
+          if (deltaY > 4) {
+            state.chatStickToBottom = false;
+            updateChatUnreadBubble();
+          }
+        };
         chatMsgs.addEventListener("scroll", state.chatScrollHandler, { passive: true });
+        chatMsgs.addEventListener("wheel", state.chatScrollWheelHandler, { passive: true });
+        chatMsgs.addEventListener("touchstart", state.chatScrollTouchStartHandler, { passive: true });
+        chatMsgs.addEventListener("touchmove", state.chatScrollTouchMoveHandler, { passive: true });
         updateChatUnreadBubble();
       }
 
@@ -951,23 +999,46 @@
         });
       }
 
-      function resetChatRenderCache() {
+      // options.preserveStickState=true：仅清渲染缓存，不动 sticky/未读
+      // 状态。用于 page-refresh、ws 重连等"用户停留在当前会话，只是想刷新
+      // DOM"的场景——不能把用户从历史位置拽回底部。
+      // 默认（false）：切会话 / 新建 / home 等真正"换上下文"路径用，全清。
+      function resetChatRenderCache(options) {
+        var opts = options || {};
         state.lastRenderedHash = 0;
         state.lastRenderedMsgCount = 0;
         state.lastRenderedEmpty = null;
         state.renderPending = false;
         state.chatRenderedCount = state.chatPageSize;
         state.askUserSelections = {};
-        if (state.chatScrollElement && state.chatScrollHandler) {
-          state.chatScrollElement.removeEventListener("scroll", state.chatScrollHandler);
+        if (state.chatScrollElement) {
+          if (state.chatScrollHandler) {
+            state.chatScrollElement.removeEventListener("scroll", state.chatScrollHandler);
+          }
+          if (state.chatScrollWheelHandler) {
+            state.chatScrollElement.removeEventListener("wheel", state.chatScrollWheelHandler);
+          }
+          if (state.chatScrollTouchStartHandler) {
+            state.chatScrollElement.removeEventListener("touchstart", state.chatScrollTouchStartHandler);
+          }
+          if (state.chatScrollTouchMoveHandler) {
+            state.chatScrollElement.removeEventListener("touchmove", state.chatScrollTouchMoveHandler);
+          }
         }
         state.chatScrollElement = null;
         state.chatScrollHandler = null;
+        state.chatScrollWheelHandler = null;
+        state.chatScrollTouchStartHandler = null;
+        state.chatScrollTouchMoveHandler = null;
         state.chatIsProgrammaticScroll = false;
-        // 切会话时未读状态归零、贴底重置——避免上一个会话残留的"未读气泡"。
-        state.chatStickToBottom = true;
-        state.chatUnreadCount = 0;
-        state.chatUnreadStartIndex = -1;
+        if (!opts.preserveStickState) {
+          // 切会话时未读状态归零、贴底重置——避免上一个会话残留的"未读气泡"。
+          state.chatStickToBottom = true;
+          state.chatUnreadCount = 0;
+          state.chatUnreadStartIndex = -1;
+          // 真正换会话时才允许首帧贴底；preserve 路径下保留旧 initial 状态。
+          state.chatInitialRenderDone = false;
+        }
       }
 
       function getEffectiveCwd() {
@@ -1464,7 +1535,6 @@
                       ? '<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>'
                       : '<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="14 6 8 12 14 18"/><line x1="4" y1="5" x2="4" y2="19"/></svg>') +
                   '</button>' +
-                  '<button id="sidebar-close-fully-btn" class="btn btn-ghost btn-sm sidebar-close-fully" type="button" title="完全关闭侧栏" aria-label="完全关闭侧栏"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
                   '<button id="close-drawer-button" class="btn btn-ghost btn-icon sidebar-close drawer-close-btn" type="button" aria-label="关闭菜单"><svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" aria-hidden="true"><line x1="6" y1="6" x2="18" y2="18"/><line x1="18" y1="6" x2="6" y2="18"/></svg></button>' +
                 '</div>' +
               '</div>' +
@@ -1676,6 +1746,11 @@
                       '<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 → 排队；想插队的人显式按这颗。
+                      '<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>' +
+                      '</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>' +
                       '</button>' +
@@ -3094,29 +3169,44 @@
         '</section>';
       }
 
+      // 「最近」分组的统一数据源：未归档 active sessions + 24h 内 Claude 历史，
+      // 一起按"创建时间"倒序排（session 用 startedAt，history 用 timestamp）。
+      // 展开侧栏的「最近」和折叠侧栏的窄条都基于这份列表渲染，序号严格对应。
+      function getRecentEntries() {
+        var cutoff = Date.now() - 24 * 60 * 60 * 1000;
+        var entries = [];
+        state.sessions.forEach(function(s) {
+          if (s.archived) return;
+          var t = s.startedAt ? new Date(s.startedAt).getTime() : 0;
+          entries.push({ kind: "session", ref: s, t: isFinite(t) ? t : 0 });
+        });
+        if (state.claudeHistoryLoaded) {
+          getVisibleClaudeHistorySessions().forEach(function(h) {
+            if (!h.timestamp) return;
+            var t = new Date(h.timestamp).getTime();
+            if (!isFinite(t) || t <= cutoff) return;
+            entries.push({ kind: "history", ref: h, t: t });
+          });
+        }
+        entries.sort(function(a, b) { return b.t - a.t; });
+        return entries;
+      }
+
       function renderSessions() {
-        var activeSessions = state.sessions.filter(function(session) { return !session.archived; });
         var archivedSessions = state.sessions.filter(function(session) { return session.archived; });
         var groups = [];
         groups.push(renderSessionManageBar());
 
-        // Split claude history into recent (24h) and older
-        var recentHistorySessions = [];
-        if (state.claudeHistoryLoaded) {
-          var cutoff = Date.now() - 24 * 60 * 60 * 1000;
-          recentHistorySessions = getVisibleClaudeHistorySessions().filter(function(s) {
-            return s.timestamp && new Date(s.timestamp).getTime() > cutoff;
-          });
-        }
+        var recentEntries = getRecentEntries();
 
-        if (activeSessions.length > 0 || recentHistorySessions.length > 0) {
-          groups.push(renderRecentGroup(activeSessions, recentHistorySessions));
+        if (recentEntries.length > 0) {
+          groups.push(renderRecentGroup(recentEntries));
         }
         if (archivedSessions.length > 0) {
           groups.push(renderArchivedGroup(archivedSessions));
         }
         groups.push(renderClaudeHistorySection());
-        if (activeSessions.length === 0 && archivedSessions.length === 0 && recentHistorySessions.length === 0) {
+        if (recentEntries.length === 0 && archivedSessions.length === 0) {
           return renderSessionManageBar() + '<div class="empty-state"><strong>还没有会话记录</strong><br>点击上方「新对话」开始你的第一次对话。</div>' + renderClaudeHistorySection();
         }
         return groups.join("");
@@ -3127,36 +3217,23 @@
       }
 
       function renderCollapsedSessionTiles() {
-        var activeSessions = state.sessions.filter(function(s) { return !s.archived; });
-        activeSessions.sort(function(a, b) {
-          var ta = a.startedAt ? new Date(a.startedAt).getTime() : 0;
-          var tb = b.startedAt ? new Date(b.startedAt).getTime() : 0;
-          return ta - tb;
-        });
-        var recentHistorySessions = [];
-        if (state.claudeHistoryLoaded) {
-          var cutoff = Date.now() - 24 * 60 * 60 * 1000;
-          recentHistorySessions = getVisibleClaudeHistorySessions().filter(function(s) {
-            return s.timestamp && new Date(s.timestamp).getTime() > cutoff;
-          });
-        }
-        if (activeSessions.length === 0 && recentHistorySessions.length === 0) {
+        var entries = getRecentEntries();
+        if (entries.length === 0) {
           return '<div class="sidebar-collapsed-empty" title="无会话">—</div>';
         }
-        var tiles = "";
-        var idx = 0;
-        activeSessions.forEach(function(s) {
-          idx += 1;
-          var activeCls = s.id === state.selectedId ? " active" : "";
-          var title = s.summary || s.command || ("会话 " + idx);
-          tiles += '<button class="sidebar-collapsed-tile' + activeCls + '" type="button" data-collapsed-session-id="' + escapeHtml(s.id) + '" title="' + escapeHtml(title) + '">' + idx + '</button>';
-        });
-        recentHistorySessions.forEach(function(s) {
-          idx += 1;
-          var preview = s.firstUserMessage || "(空会话)";
-          var title = preview + " · " + formatHistoryTime(s.timestamp);
-          tiles += '<button class="sidebar-collapsed-tile history" type="button" data-collapsed-history-id="' + escapeHtml(s.claudeSessionId) + '" data-cwd="' + escapeHtml(s.cwd || "") + '" title="' + escapeHtml(title) + '">' + idx + '</button>';
-        });
+        var tiles = entries.map(function(e, i) {
+          var idx = i + 1;
+          if (e.kind === "session") {
+            var s = e.ref;
+            var activeCls = s.id === state.selectedId ? " active" : "";
+            var title = s.summary || s.command || ("会话 " + idx);
+            return '<button class="sidebar-collapsed-tile' + activeCls + '" type="button" data-collapsed-session-id="' + escapeHtml(s.id) + '" title="' + escapeHtml(title) + '">' + idx + '</button>';
+          }
+          var h = e.ref;
+          var preview = h.firstUserMessage || "(空会话)";
+          var hTitle = preview + " · " + formatHistoryTime(h.timestamp);
+          return '<button class="sidebar-collapsed-tile history" type="button" data-collapsed-history-id="' + escapeHtml(h.claudeSessionId) + '" data-cwd="' + escapeHtml(h.cwd || "") + '" title="' + escapeHtml(hTitle) + '">' + idx + '</button>';
+        }).join("");
         return '<div class="sidebar-collapsed-tiles">' + tiles + '</div>';
       }
 
@@ -3223,11 +3300,14 @@
         return '<section class="session-group">' + header + items + '</section>';
       }
 
-      function renderRecentGroup(activeSessions, recentHistorySessions) {
+      function renderRecentGroup(entries) {
         var html = '<section class="session-group">' +
           '<div class="session-group-title">最近</div>';
-        html += activeSessions.map(function(session) { return renderSessionItem(session, "sessions"); }).join("");
-        html += recentHistorySessions.map(function(session) { return renderClaudeHistoryItem(session, "history"); }).join("");
+        html += entries.map(function(e) {
+          return e.kind === "session"
+            ? renderSessionItem(e.ref, "sessions")
+            : renderClaudeHistoryItem(e.ref, "history");
+        }).join("");
         html += '</section>';
         return html;
       }
@@ -5627,8 +5707,6 @@
         if (pinBtn) pinBtn.addEventListener("click", toggleSidebarPin);
         var collapseBtn = document.getElementById("sidebar-collapse-btn");
         if (collapseBtn) collapseBtn.addEventListener("click", toggleSidebarCollapsed);
-        var closeFullyBtn = document.getElementById("sidebar-close-fully-btn");
-        if (closeFullyBtn) closeFullyBtn.addEventListener("click", closeSidebarCompletely);
         var sidebarMoreBtn = document.getElementById("sidebar-more-btn");
         var sidebarOverflow = document.getElementById("sidebar-overflow-menu");
         if (sidebarMoreBtn && sidebarOverflow) {
@@ -5894,6 +5972,11 @@
           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");
@@ -6142,7 +6225,8 @@
             return;
           }
           softResyncTerminal();
-          resetChatRenderCache();
+          // 用户停留在当前会话，只是想刷一下 DOM——保留其阅读位置和 sticky 状态。
+          resetChatRenderCache({ preserveStickState: true });
           scheduleChatRender(true);
         });
         var jumpBottomBtn = document.getElementById("terminal-jump-bottom");
@@ -7909,6 +7993,11 @@
           if (canAutoResumeSession(session)) return "";
           return "会话已结束";
         }
+        // 结构化会话在出 token 时，输入框仍然可用——告诉用户默认行为是排队，
+        // 想插队请按右侧的 » 按钮。短语保持单行不换行。
+        if (isStructuredSession(session) && session.structuredState && session.structuredState.inFlight) {
+          return "回复中…继续输入将排队（» 立即发送）";
+        }
         return "";
       }
 
@@ -8322,6 +8411,7 @@
         var hasSession = !!state.selectedId;
         var terminalContainer = document.getElementById("output");
         var chatContainer = document.getElementById("chat-output");
+        var blankChat = document.getElementById("blank-chat");
         var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
         var structured = isStructuredSession(selectedSession);
         var showTerminal = hasSession && !structured && state.currentView === "terminal";
@@ -8340,6 +8430,14 @@
           chatContainer.classList.toggle("active", showChat);
           chatContainer.classList.toggle("hidden", !showChat);
         }
+        // blank-chat 的可见性由 applyCurrentView 收口：updateShellChrome 在
+        // selectedSession 缺失（启动期 selectedId 已恢复但 /api/sessions 未回 /
+        // activateSession 在 updateSessionSnapshot 之前调 switchToSessionView 等
+        // 瞬态）时会走 else 分支把 blank-chat 显示出来，但紧接着调到这里，应
+        // 以 hasSession 为准重新隐藏，避免与 terminal/chat 同屏并存。
+        if (blankChat) {
+          blankChat.classList.toggle("hidden", hasSession);
+        }
         if (chatContainer && showChat) {
           ensureChatMessagesContainer(chatContainer);
         }
@@ -8604,7 +8702,8 @@
             } else if (state.selectedId) {
               var sel = state.sessions.find(function(s) { return s.id === state.selectedId; });
               if (isStructuredSession(sel)) {
-                resetChatRenderCache();
+                // ws 重连后的同会话刷新——保留用户阅读位置。
+                resetChatRenderCache({ preserveStickState: true });
                 scheduleChatRender(true);
               }
             }
@@ -8974,29 +9073,6 @@
         hideCollapsedTileBubble();
       }
 
-      function closeSidebarCompletely() {
-        if (isMobileLayout()) return;
-        state.sidebarPinned = false;
-        state.sidebarCollapsed = false;
-        state.sessionsDrawerOpen = false;
-        try {
-          localStorage.setItem("wand-sidebar-pinned", "false");
-          localStorage.setItem("wand-sidebar-collapsed", "false");
-        } catch (e) {}
-        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);
-      }
-
       function toggleSidebarCollapsed() {
         if (isMobileLayout()) return;
         // 在 drawer 模式（未 pin）下点 collapse 视为「先固定、再收起为窄条」——
@@ -10931,7 +11007,10 @@
             return;
           }
           event.preventDefault();
-          sendInputFromBox();
+          // Cmd/Ctrl+Enter → 立即发送（中断当前回复）。仅对正在 inFlight 的
+          // 结构化会话生效；其它情况下退化为普通发送，避免无谓的中断信号。
+          var interruptShortcut = !!(event.metaKey || event.ctrlKey);
+          sendInputFromBox(interruptShortcut ? { interrupt: true } : undefined);
           return;
         }
 
@@ -11640,7 +11719,8 @@
         });
       }
 
-      function sendOrStart() {
+      function sendOrStart(opts) {
+        opts = opts || {};
         // Support welcome input as well as the main input box
         var welcomeInput = document.getElementById("welcome-input");
         var inputBox = document.getElementById("input-box");
@@ -11651,7 +11731,7 @@
         // If we have a selected ID, try to send input to it
         if (state.selectedId) {
           if (value) {
-            sendInputFromBox();
+            sendInputFromBox(opts);
           }
           return;
         }
@@ -11750,7 +11830,9 @@
       }
 
 
-      function sendInputFromBox() {
+      function sendInputFromBox(opts) {
+        opts = opts || {};
+        var interruptFlag = !!opts.interrupt;
         if (state.terminalInteractive) {
           showToast("终端交互模式开启时，请直接在终端中输入。", "info");
           return Promise.resolve();
@@ -11789,7 +11871,7 @@
             if (todoEl) todoEl.classList.add("hidden");
 
             if (isStructuredSession(selectedSession)) {
-              return postStructuredInput(finalValue, inputBox, selectedSession);
+              return postStructuredInput(finalValue, inputBox, selectedSession, { interrupt: interruptFlag });
             }
 
             var submitChunks = getTerminalSubmitChunks(selectedSession, finalValue);
@@ -11837,8 +11919,13 @@
       // 防止同一会话并发提交（快速双击 / 重复触发）
       var _structuredSubmittingSessions = {};
 
-      function postStructuredInput(input, inputBox, session) {
-        console.log("[WAND] postStructuredInput selectedId:", state.selectedId, "input:", input && input.substring(0, 50), "session:", session && { id: session.id, sessionKind: session.sessionKind, runner: session.runner, status: session.status, inFlight: session.structuredState && session.structuredState.inFlight });
+      function postStructuredInput(input, inputBox, session, opts) {
+        opts = opts || {};
+        // 用户显式点击"立即发送"才会传 interrupt:true。普通 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();
         if (!session) {
           showToast("会话不存在，请重新选择或新建会话。", "error");
@@ -11850,25 +11937,48 @@
           return Promise.resolve();
         }
 
-        var isInterrupting = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
-        // Immediately render user message with thinking indicator
-        var userTurn = { role: "user", content: [{ type: "text", text: input }] };
+        var sessionInFlight = !!(session.structuredState && session.structuredState.inFlight && session.status === "running");
+        var isInterrupting = sessionInFlight && requestedInterrupt;
+        var isQueueing = sessionInFlight && !requestedInterrupt;
+
         var userMsgs = stripRenderOnlyStructuredMessages(Array.isArray(session.messages) ? session.messages.slice() : []);
-        userMsgs.push(userTurn);
-        var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
-        updateSessionSnapshot({
-          id: session.id,
-          status: "running",
-          messages: userMsgs,
-          structuredState: optimisticStructuredState,
-        });
-        state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
-          status: "running",
-          messages: userMsgs,
-          structuredState: optimisticStructuredState,
-        }), userMsgs);
-        updateInputHint("思考中…");
-        renderChat(true);
+        var optimisticPatch;
+
+        if (isQueueing) {
+          // Queue 模式：不要乐观 push user turn —— buildMessagesForRender 会把
+          // queuedMessages 渲成 __queued 占位（带"排队中"徽章），再 push 一份
+          // 真 user turn 会被去重逻辑遮蔽掉，徽章就丢了。inFlight / status 维持。
+          var nextQueue = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
+          nextQueue.push(input);
+          optimisticPatch = {
+            id: session.id,
+            queuedMessages: nextQueue,
+          };
+          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("已加入排队，等待当前回复完成…");
+          renderChat(true);
+          updateStructuredQueueCounter();
+        } else {
+          // 普通发送 / interrupt 发送：照旧乐观推 user turn + inFlight=true
+          var userTurn = { role: "user", content: [{ type: "text", text: input }] };
+          userMsgs.push(userTurn);
+          var optimisticStructuredState = Object.assign({}, session.structuredState || {}, { inFlight: true });
+          updateSessionSnapshot({
+            id: session.id,
+            status: "running",
+            messages: userMsgs,
+            structuredState: optimisticStructuredState,
+          });
+          state.currentMessages = buildMessagesForRender(Object.assign({}, session, {
+            status: "running",
+            messages: userMsgs,
+            structuredState: optimisticStructuredState,
+          }), userMsgs);
+          updateInputHint(isInterrupting ? "已中断，正在处理新消息…" : "思考中…");
+          renderChat(true);
+        }
 
         if (inputBox) {
           inputBox.value = "";
@@ -11924,8 +12034,12 @@
               var refreshedSession = state.sessions.find(function(s) { return s.id === snapshot.id; }) || snapshot;
               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");
               }
             }
           }
@@ -11943,20 +12057,36 @@
             return;
           }
 
-          // 回滚乐观更新：恢复发送前的 messages（去掉刚加的 userTurn）和 inFlight 状态
-          var rollbackMsgs = userMsgs.slice(0, -1);
-          updateSessionSnapshot({
-            id: session.id,
-            status: session.status,
-            messages: rollbackMsgs,
-            structuredState: Object.assign({}, session.structuredState || {}, { inFlight: false }),
-          });
-          if (session.id === state.selectedId) {
-            state.currentMessages = buildMessagesForRender(
-              Object.assign({}, session, { messages: rollbackMsgs, structuredState: Object.assign({}, session.structuredState || {}, { inFlight: false }) }),
-              rollbackMsgs
-            );
-            renderChat(true);
+          if (isQueueing) {
+            // Queue 模式回滚：把刚 push 的那条 queuedMessages 撤掉。inFlight / messages
+            // 都没动过，不必复位，否则会把后端真实的 inFlight=true 误改成 false。
+            var prevQueue = Array.isArray(session.queuedMessages) ? session.queuedMessages.slice() : [];
+            updateSessionSnapshot({
+              id: session.id,
+              queuedMessages: prevQueue,
+            });
+            if (session.id === state.selectedId) {
+              var rolledQueueSession = state.sessions.find(function(s) { return s.id === session.id; }) || session;
+              state.currentMessages = buildMessagesForRender(rolledQueueSession, getPreferredMessages(rolledQueueSession, rolledQueueSession.output, false));
+              renderChat(true);
+              updateStructuredQueueCounter();
+            }
+          } else {
+            // 回滚乐观更新：恢复发送前的 messages（去掉刚加的 userTurn）和 inFlight 状态
+            var rollbackMsgs = userMsgs.slice(0, -1);
+            updateSessionSnapshot({
+              id: session.id,
+              status: session.status,
+              messages: rollbackMsgs,
+              structuredState: Object.assign({}, session.structuredState || {}, { inFlight: false }),
+            });
+            if (session.id === state.selectedId) {
+              state.currentMessages = buildMessagesForRender(
+                Object.assign({}, session, { messages: rollbackMsgs, structuredState: Object.assign({}, session.structuredState || {}, { inFlight: false }) }),
+                rollbackMsgs
+              );
+              renderChat(true);
+            }
           }
           var message = (error && error.message) || "";
           var isTransientAbort =
@@ -12564,11 +12694,19 @@
           composer.classList.toggle("is-terminal-passthrough", !!state.terminalInteractive);
         }
         var sendBtn = document.getElementById("send-input-button");
+        var structuredInFlight = structured && isRunning;
         if (sendBtn) {
           sendBtn.disabled = !structured && !!selectedSession && !isRunning && !canResumeOnSend;
           sendBtn.setAttribute("title", structured
-            ? "发送"
+            ? (structuredInFlight ? "排队发送（当前回复结束后处理）" : "发送")
             : (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);
@@ -13287,7 +13425,10 @@
           // fill the expanded space, and the scroll position needs resetting.
           if (isTouchDevice()) {
             ensureTerminalFit("keyboard-blur", { forceReplay: true });
-            maybeScrollTerminalToBottom("force");
+            // "keyboard" 而非 "force"：用户原本在终端历史里翻看时，键盘
+            // 收起不该把视图拽走。maybeScrollTerminalToBottom 会按
+            // terminalAutoFollow 决定——贴底者继续贴底，离底者保位。
+            maybeScrollTerminalToBottom("keyboard");
           }
         }, 100);
       }
@@ -14081,7 +14222,9 @@
                 syncAppViewportHeight();
               }
               ensureTerminalFit("keyboard-close", { forceReplay: true });
-              maybeScrollTerminalToBottom("force");
+              // 同 handleInputBoxBlur：尊重 terminalAutoFollow，避免把上滚
+              // 阅读历史的用户在键盘关闭瞬间拽回底部。
+              maybeScrollTerminalToBottom("keyboard");
             }, 200);
           }
 
@@ -15497,6 +15640,9 @@
         }
 
         var allMessages = state.currentMessages;
+        // 预扫一遍全量 messages，构建 task id → subagent meta 的 map，
+        // 供老消息 tool_result（没有 __subagent 盖章）按 tool_use_id 反查兜底。
+        var legacyTaskMap = collectLegacyTaskIdMap(allMessages);
 
         if (allMessages.length === 0) {
           if (state.lastRenderedEmpty !== "empty") {
@@ -15573,10 +15719,11 @@
 
         // 在动 DOM 之前先看用户是不是贴在底部——这决定后面我们要不要让视图
         // "继续粘在底部"。column-reverse 下 scrollTop 接近 0 = 视觉底部。
-        // 同时把 state.chatStickToBottom 同步到当前真实状态，避免长时间不滚动后
-        // 的状态漂移（比如新会话 init 的瞬间）。
+        // 注意：state.chatStickToBottom 的维护**完全交给 scroll handler**
+        // （bindChatScrollListener + wheel/touch 提前下台），这里不再做
+        // "近底即锁回 true"的自愈，避免 resize / 键盘动画 / 锚点回填瞬间
+        // 把已经上滚阅读的用户误判回贴底状态。
         var renderWasAtBottom = isChatNearBottom(chatMessages);
-        if (renderWasAtBottom) state.chatStickToBottom = true;
 
         // 把 .system-info 卡片从计数里剔除——它由 extractPtySystemInfo 在
         // fullRenderChat 里穿插注入，不存在于 messages 数组中，混进 existingCount
@@ -15620,7 +15767,7 @@
             }
 
             // Render message
-            html += renderChatMessage(msg, roundUsageByIndex[originalIndex] || null, originalIndex);
+            html += renderChatMessage(msg, roundUsageByIndex[originalIndex] || null, originalIndex, legacyTaskMap);
           }
 
           // Add sentinel for loading older messages (DOM end = visual top in column-reverse)
@@ -15634,9 +15781,12 @@
           // 的 data-msg-index 和它到容器顶部的偏移。重写完成后找到同一 data-msg-index
           // 的新节点，把它放回原来的偏移——这是 column-reverse 下保住用户视线的
           // 标准锚点法。没有锚点时（首次渲染、空 → 非空）才走 scrollTop=0 兜底。
+          // 改用 existingCount 而非 prevMsgCount：page-refresh 等 preserveStickState
+          // 路径下 prevMsgCount 被重置为 0，但 DOM 里仍有节点可作锚点，必须保住
+          // 用户的阅读位置。
           var anchorMsgIndex = -1;
           var anchorOffset = 0;
-          if (prevMsgCount > 0 && !renderWasAtBottom) {
+          if (existingCount > 0 && !renderWasAtBottom) {
             var containerTop = chatMessages.getBoundingClientRect().top;
             var preEls = chatMessages.querySelectorAll(".chat-message:not(.system-info)");
             for (var pi = 0; pi < preEls.length; pi++) {
@@ -15666,13 +15816,19 @@
           })();
           // 会话切换 / 首次渲染后，浏览器会把旧的 scrollTop 钳制到新内容
           // 的最大值——column-reverse 下这意味着视觉上跳到最上面（最旧消息），
-          // 也就是用户反馈的"退出再回来时被重定向到最上面"。这里在
-          // prevMsgCount === 0（resetChatRenderCache 后或刚从空状态进入）
-          // 强制 scrollTop=0（视觉底部 = 最新消息），避免错位。
-          if (prevMsgCount === 0) {
+          // 也就是用户反馈的"退出再回来时被重定向到最上面"。
+          // 关键：只在该会话视图的**首次**渲染（chatInitialRenderDone=false）
+          // 才执行这个强制贴底；之后即便 prevMsgCount===0（page-refresh /
+          // ws 重连等保留 sticky 的 reset 路径），也尊重 chatStickToBottom，
+          // 不再把上滚的用户拽回去。
+          if (prevMsgCount === 0 && !state.chatInitialRenderDone) {
             chatMessages.scrollTop = 0;
             state.chatStickToBottom = true;
             clearChatUnread({ removeDivider: true });
+            state.chatInitialRenderDone = true;
+          } else if (prevMsgCount === 0 && state.chatStickToBottom) {
+            // 非首次但缓存重置后的 re-render——仅在用户原本贴底时回贴。
+            chatMessages.scrollTop = 0;
           } else if (renderWasAtBottom) {
             // 同一会话内的全量重渲染：用户原本贴底就保持贴底，浏览器在 innerHTML
             // 重置后可能把 scrollTop 钳到一个奇怪的值，这里显式拉回 0。
@@ -15805,7 +15961,7 @@
           for (var i = 0; i < newMessages.length; i++) {
             var div = document.createElement("div");
             var nmOrigIdx = visibleOffset + existingCount + (newMessages.length - 1 - i);
-            div.innerHTML = renderChatMessage(newMessages[i], roundUsageByIndex[nmOrigIdx] || null, nmOrigIdx);
+            div.innerHTML = renderChatMessage(newMessages[i], roundUsageByIndex[nmOrigIdx] || null, nmOrigIdx, legacyTaskMap);
             var el = div.firstElementChild;
             if (el) {
               el.classList.add("animate-in");
@@ -15863,7 +16019,7 @@
             var currentEl = existingEls[mi];
             var tmpWrap = document.createElement("div");
             var srOrigIdx = visibleOffset + reversedMessages.length - 1 - mi;
-            tmpWrap.innerHTML = renderChatMessage(reversedMessages[mi], roundUsageByIndex[srOrigIdx] || null, srOrigIdx);
+            tmpWrap.innerHTML = renderChatMessage(reversedMessages[mi], roundUsageByIndex[srOrigIdx] || null, srOrigIdx, legacyTaskMap);
             var replacementEl = tmpWrap.firstElementChild;
             if (!replacementEl) continue;
             if (currentEl.innerHTML !== replacementEl.innerHTML || currentEl.className !== replacementEl.className) {
@@ -16844,6 +17000,27 @@
           '<span class="avatar-name">' + escapeHtml(name) + '</span>' +
         '</div>';
       }
+
+      // subagent tool_result → 独立 reply 气泡（markdown 渲染）。出错时显示红色错误体，
+      // 没文本时显示打字指示器（subagent 还在跑）。
+      function renderSubagentReplyBubble(block, role) {
+        if (!block || block.type !== "tool_result") return "";
+        var text = extractToolResultText(block.content);
+        var isError = block.is_error === true;
+
+        if (isError) {
+          return '<div class="subagent-reply error">' +
+            '<span class="subagent-reply-icon">✗</span>' +
+            '<div class="subagent-reply-body">' + (text ? renderMarkdown(text) : escapeHtml("（无输出）")) + '</div>' +
+          '</div>';
+        }
+
+        if (!text || !String(text).trim()) {
+          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>';
+      }
       var PIXEL_AVATAR = {
         assistant: buildPixelSvg(buildCatGrid(GARFIELD_PALETTE)),
         user: buildPixelSvg(buildCatGrid(SHORTHAIR_PALETTE)),
@@ -16897,16 +17074,20 @@
         '</div>';
       }
 
-      function renderChatMessage(msg, roundUsage, messageIndex) {
+      function renderChatMessage(msg, roundUsage, messageIndex, legacyTaskMap) {
         // Thinking card (deep thought) — from PTY parsing
         if (msg.role === "thinking") {
+          // 空 / 全空白的 thinking 没有任何信息量，渲染出来只是一条带"展开"的紫色窄条，
+          // 展开了也看不到内容——直接跳过。
+          var ptyThinkingText = typeof msg.content === "string" ? msg.content : "";
+          if (!ptyThinkingText.trim()) return "";
           var thinkingKey = buildExpandKey("thinking", [getMessageKey(msg, messageIndex), "pty"]);
           var thinkingPersisted = getPersistedExpandState(thinkingKey);
           var thinkingExpanded = thinkingPersisted === null ? getCardDefault("thinking") : thinkingPersisted;
           return '<div class="chat-message thinking">' +
-            '<div class="thinking-inline thinking-pty ' + (thinkingExpanded ? 'expanded' : 'collapsed') + '" data-expand-kind="thinking" data-expand-key="' + escapeHtml(thinkingKey) + '" data-thinking="" onclick="__thinkingToggle(this)">' +
+            '<div class="thinking-inline thinking-pty ' + (thinkingExpanded ? 'expanded' : 'collapsed') + '" data-expand-kind="thinking" data-expand-key="' + escapeHtml(thinkingKey) + '" data-thinking="' + escapeHtml(ptyThinkingText) + '" onclick="__thinkingToggle(this)">' +
               '<span class="thinking-inline-icon">⦿</span>' +
-              '<span class="thinking-inline-preview">' + escapeHtml(msg.content) + '</span>' +
+              '<span class="thinking-inline-preview">' + escapeHtml(ptyThinkingText) + '</span>' +
               '<span class="thinking-inline-action">' + (thinkingExpanded ? '收起' : '展开') + '</span>' +
             '</div>' +
           '</div>';
@@ -16924,7 +17105,7 @@
 
         // Structured content blocks (from JSON chat mode)
         if (Array.isArray(msg.content)) {
-          return renderStructuredMessage(msg, roundUsage, messageIndex);
+          return renderStructuredMessage(msg, roundUsage, messageIndex, legacyTaskMap);
         }
 
         // Legacy string content (from PTY parsing)
@@ -16980,6 +17161,8 @@
       }
 
       // ── 连续同类工具调用分组 ──
+      // 注意：禁止把 Task/Agent 加入 GROUPABLE_TOOLS——它们由 renderContentBlock 入口屏蔽返空，
+      // 加入分组会导致空 group 包裹一堆空字符串，留下视觉空盒子。
       var GROUPABLE_TOOLS = { Read: 1, Glob: 1, Grep: 1, WebFetch: 1, WebSearch: 1, TodoRead: 1 };
 
       function groupConsecutiveTools(content) {
@@ -17076,16 +17259,61 @@
         persistElementExpandState(el, "tool-group");
       };
 
+      // 老消息（SQLite 历史 turn）后端还没盖章。前端给 name === "Task"/"Agent"
+      // 或 input.subagent_type 非空的 tool_use 虚拟盖章，让现有 multi-agent 渲染路径吃到。
+      function deriveLegacySubagent(block) {
+        if (!block || block.type !== "tool_use") return null;
+        var input = block.input || {};
+        var agentType = typeof input.subagent_type === "string" ? input.subagent_type : null;
+        if (!agentType && block.name !== "Task" && block.name !== "Agent") return null;
+        return {
+          taskId: block.id,
+          agentType: agentType || undefined,
+          taskDescription: typeof input.description === "string" ? input.description : undefined,
+        };
+      }
+
+      // tool_result 老消息靠 tool_use_id 关联 task。由外层预扫一遍 messages，构建 task id → meta 的 map。
+      function collectLegacyTaskIdMap(allMessages) {
+        var map = new Map();
+        if (!Array.isArray(allMessages)) return map;
+        for (var i = 0; i < allMessages.length; i++) {
+          var m = allMessages[i];
+          if (!m || m.role !== "assistant" || !Array.isArray(m.content)) continue;
+          for (var j = 0; j < m.content.length; j++) {
+            var b = m.content[j];
+            if (!b || b.type !== "tool_use") continue;
+            var derived = b.__subagent || deriveLegacySubagent(b);
+            if (derived) map.set(b.id, derived);
+          }
+        }
+        return map;
+      }
+
       // 把一条 assistant turn 按相邻 block 的 __subagent.taskId 切成段。
       // 输出每段附带原数组中的 firstIndex，方便渲染时 expand key 用全局 index
       // 避免不同段冲突。
-      function splitTurnBySubagent(blocks) {
+      // legacyTaskMap：老消息没有 __subagent 盖章时，按 tool_use_id 反查兜底。
+      function splitTurnBySubagent(blocks, legacyTaskMap) {
         var segs = [];
         if (!Array.isArray(blocks) || !blocks.length) return segs;
         var current = null;
         for (var i = 0; i < blocks.length; i++) {
           var b = blocks[i];
+          // __processing 占位 block（流式中的 typing indicator）没有 __subagent 盖章，
+          // 强制延续上一段（若已有），避免"父-Task-占位-子内容"反复切段导致 DOM 抖动。
+          // 边界：若占位是第一个 block（current 仍为 null），走正常路径开 parent 段。
+          var isPlaceholder = b && b.type === "text" && b.__processing === true;
+          if (isPlaceholder && current) {
+            current.blocks.push(b);
+            continue;
+          }
           var sub = b && b.__subagent ? b.__subagent : null;
+          if (!sub) sub = deriveLegacySubagent(b);
+          // 老消息 tool_result 兜底：用 tool_use_id 反查 map
+          if (!sub && b && b.type === "tool_result" && legacyTaskMap && legacyTaskMap.has(b.tool_use_id)) {
+            sub = legacyTaskMap.get(b.tool_use_id);
+          }
           var key = sub ? sub.taskId : null;
           if (!current || current.key !== key) {
             current = { key: key, subagent: sub, blocks: [], firstIndex: i };
@@ -17124,11 +17352,55 @@
         return html;
       }
 
-      function renderStructuredMessage(msg, roundUsage, messageIndex) {
+      // 抽出 multi-agent 渲染共用块。assistant turn 与 user turn 都可能含 subagent 段
+      // （user turn 的 Task tool_result 由后端反查盖章），但 user turn 不再输出 handoff
+      // 行，避免与 assistant turn 的 handoff 重复。
+      // TODO：嵌套 subagent（子 subagent 在外层 subagent 段内再切）时，
+      // parentPersonaName 应是外层 subagent.name 而不是固定父 persona；目前先不处理。
+      function buildMultiAgentHtml(segments, role, parentPersonaName, toolResults, messageKey, options) {
+        var opts = options || {};
+        var showHandoff = opts.showHandoff !== false; // 默认 true；user turn 传 false
+        var html = "";
+        var lastSubId = null;
+        for (var si = 0; si < segments.length; si++) {
+          var seg = segments[si];
+          var segHtml = buildSegmentBlocksHtml(seg.blocks, seg.firstIndex, role, toolResults, messageKey);
+          // 段内所有 block 都被短路返空（典型场景：父段只剩一个空 thinking）时，
+          // 跳过整段。否则会渲染出"只有头像没内容"的空气泡。
+          if (!segHtml || !segHtml.trim()) continue;
+          if (seg.subagent) {
+            var subPalette = getSubagentPalette(seg.subagent);
+            if (showHandoff && lastSubId !== seg.subagent.taskId) {
+              var subName = getSubagentDisplayName(seg.subagent);
+              var desc = seg.subagent.taskDescription
+                ? '：<span class="chat-handoff-desc">' + escapeHtml(seg.subagent.taskDescription) + '</span>'
+                : '';
+              html += '<div class="chat-handoff" style="--agent-color:' + subPalette.primary + '">' +
+                '<span class="chat-handoff-arrow">↳</span> ' +
+                escapeHtml(parentPersonaName) + ' 让 <strong>' + escapeHtml(subName) + '</strong> 帮忙' + desc +
+              '</div>';
+            }
+            html += '<div class="chat-message-segment subagent" data-agent-id="' + escapeHtml(seg.subagent.taskId) + '" style="--agent-color:' + subPalette.primary + '">' +
+              subagentAvatarHtml(seg.subagent) +
+              '<div class="chat-message-content">' + segHtml + '</div>' +
+            '</div>';
+            lastSubId = seg.subagent.taskId;
+          } else {
+            html += '<div class="chat-message-segment parent">' +
+              chatAvatar(role) +
+              '<div class="chat-message-content">' + segHtml + '</div>' +
+            '</div>';
+            lastSubId = null;
+          }
+        }
+        return html;
+      }
+
+      function renderStructuredMessage(msg, roundUsage, messageIndex, legacyTaskMap) {
         var role = msg.role;
         var messageKey = getMessageKey(msg, messageIndex);
 
-        // 排队中的用户消息标记（subagent 不会出现在 user role）
+        // 排队中的用户消息标记（subagent 不会出现在 user role 的 user input 中）
         var isQueued = role === "user" && msg.content && msg.content.some(function(b) { return b.__queued; });
 
         if (!msg.content || msg.content.length === 0) {
@@ -17147,12 +17419,22 @@
         }
 
         var toolResults = buildToolResultMap(msg.content);
+        var parentPersona = getStructuredChatPersona("assistant");
 
-        // user role 不会有 subagent，保持旧路径
+        // user role：可能含 Task tool_result（subagent 反查盖章过的）。检测一下，
+        // 有 subagent 段就走 multi-agent 渲染（不输出 handoff，避免重复）。
         if (role !== "assistant") {
-          var userHtml = buildSegmentBlocksHtml(msg.content, 0, role, toolResults, messageKey);
+          var userSegments = splitTurnBySubagent(msg.content, legacyTaskMap);
+          var userHasSub = userSegments.some(function(s) { return s.subagent; });
           var queuedClass = isQueued ? " queued" : "";
           var queuedBadge = isQueued ? '<span class="queued-badge">排队中</span>' : "";
+          if (userHasSub) {
+            var userMultiHtml = buildMultiAgentHtml(userSegments, role, parentPersona.name, toolResults, messageKey, { showHandoff: false });
+            return '<div class="chat-message ' + role + queuedClass + ' multi-agent" data-message-key="' + escapeHtml(messageKey) + '">' +
+              userMultiHtml + queuedBadge +
+            '</div>';
+          }
+          var userHtml = buildSegmentBlocksHtml(msg.content, 0, role, toolResults, messageKey);
           return '<div class="chat-message ' + role + queuedClass + '" data-message-key="' + escapeHtml(messageKey) + '">' +
             chatAvatar(role) +
             '<div class="chat-message-content">' + userHtml + queuedBadge + '</div>' +
@@ -17160,7 +17442,7 @@
         }
 
         // assistant：检测是否有 subagent 段，没有就走单段渲染（兼容老消息 / 无 subagent 的 turn）
-        var segments = splitTurnBySubagent(msg.content);
+        var segments = splitTurnBySubagent(msg.content, legacyTaskMap);
         var hasSubagent = segments.some(function(s) { return s.subagent; });
 
         if (!hasSubagent) {
@@ -17174,43 +17456,26 @@
         // 多段：父 assistant 段 + 各 subagent 段。同一根 .chat-message 容器，
         // 内部多个 .chat-message-segment 子段，每段自带头像；切到新 subagent 时
         // 插入一行 handoff 提示（"勤劳初二 ↳ 让 侦探猫 帮忙"）。
-        var parentPersona = getStructuredChatPersona("assistant");
         var multiHtml = '<div class="chat-message ' + role + ' multi-agent" data-message-key="' + escapeHtml(messageKey) + '">';
-        var lastSubId = null;
-        for (var si = 0; si < segments.length; si++) {
-          var seg = segments[si];
-          var segHtml = buildSegmentBlocksHtml(seg.blocks, seg.firstIndex, role, toolResults, messageKey);
-          if (seg.subagent) {
-            var subPalette = getSubagentPalette(seg.subagent);
-            if (lastSubId !== seg.subagent.taskId) {
-              var subName = getSubagentDisplayName(seg.subagent);
-              var desc = seg.subagent.taskDescription
-                ? '：<span class="chat-handoff-desc">' + escapeHtml(seg.subagent.taskDescription) + '</span>'
-                : '';
-              multiHtml += '<div class="chat-handoff" style="--agent-color:' + subPalette.primary + '">' +
-                '<span class="chat-handoff-arrow">↳</span> ' +
-                escapeHtml(parentPersona.name) + ' 让 <strong>' + escapeHtml(subName) + '</strong> 帮忙' + desc +
-              '</div>';
-            }
-            multiHtml += '<div class="chat-message-segment subagent" data-agent-id="' + escapeHtml(seg.subagent.taskId) + '" style="--agent-color:' + subPalette.primary + '">' +
-              subagentAvatarHtml(seg.subagent) +
-              '<div class="chat-message-content">' + segHtml + '</div>' +
-            '</div>';
-            lastSubId = seg.subagent.taskId;
-          } else {
-            multiHtml += '<div class="chat-message-segment parent">' +
-              chatAvatar("assistant") +
-              '<div class="chat-message-content">' + segHtml + '</div>' +
-            '</div>';
-            lastSubId = null;
-          }
-        }
+        multiHtml += buildMultiAgentHtml(segments, role, parentPersona.name, toolResults, messageKey, { showHandoff: true });
         multiHtml += '</div>';
         return multiHtml;
       }
       function renderContentBlock(block, role, toolResults, index, messageKey) {
         if (!block || !block.type) return "";
 
+        // Task/Agent tool_use 自带 __subagent.taskId === block.id（后端自盖章）：
+        // 不画工具卡片，由 handoff 行表达"派遣"语义。
+        if (block.type === "tool_use" && block.__subagent && block.__subagent.taskId === block.id) {
+          return "";
+        }
+        // 只有父 Task 的 tool_result（taskId === tool_use_id）走 reply bubble；
+        // 子 agent 内部工具的 tool_result（taskId === parent_tool_use_id ≠ tool_use_id）
+        // 走普通工具卡片，不能误判为 reply bubble。
+        if (block.type === "tool_result" && block.__subagent && block.__subagent.taskId === block.tool_use_id) {
+          return renderSubagentReplyBubble(block, role);
+        }
+
         switch (block.type) {
           case "text":
             if (role === "assistant" && block.__processing) {
@@ -17220,7 +17485,6 @@
 
           case "thinking":
             var thinkingText = block.thinking || "";
-            var preview = thinkingText.length > 60 ? thinkingText.slice(0, 57) + "…" : thinkingText;
             var isStreaming = block.thinking === undefined && block.type === "thinking";
             if (isStreaming) {
               return '<div class="thinking-inline thinking-streaming" data-thinking="">' +
@@ -17230,6 +17494,10 @@
                 '</div>' +
               '</div>';
             }
+            // 非流式分支：thinking 字段是空字符串时，UI 上只会出现一条带"展开"
+            // 的紫色窄条，展开了也是空——直接不渲染，避免视觉噪音。
+            if (!thinkingText.trim()) return "";
+            var preview = thinkingText.length > 60 ? thinkingText.slice(0, 57) + "…" : thinkingText;
             var thinkingKey = buildExpandKey("thinking", [messageKey, index]);
             var thinkingPersisted = getPersistedExpandState(thinkingKey);
           var thinkingExpanded = thinkingPersisted === null ? getCardDefault("thinking") : thinkingPersisted;

package/dist/web-ui/content/styles.css

@@ -515,7 +515,30 @@
       transition: width 0.3s var(--ease-out-expo), transform 0.35s var(--ease-out-expo), box-shadow 0.35s ease, opacity 0.25s ease;
     }
 
-    .sidebar.pinned .sidebar-close {
+    /* 多塞一层 .sidebar-header-actions 把 specificity 抬到 0,4,0，
+       压过文件后段 .sidebar-header-actions .btn-ghost.btn-sm
+       与 .drawer-close-btn 的 display: inline-flex 重置规则。 */
+    .sidebar.pinned .sidebar-header-actions .sidebar-close {
+      display: none;
+    }
+
+    /* 窄条（collapsed）状态：明确不显示 X 关闭按钮。
+       虽然 collapsed 当前必然蕴含 pinned（见 isSidebarNarrow），
+       上一条 .sidebar.pinned 规则已经能把它藏住，但单独写一条更直观，
+       也防止以后允许 drawer 模式下 collapse 时漏掉。
+       展开（drawer 模式）下才显示关闭按钮供用户收起侧栏。 */
+    .sidebar.collapsed .sidebar-header-actions .sidebar-close {
+      display: none;
+    }
+
+    /* 与上方对称：drawer 模式（未 pin）下，X 关闭按钮已能把侧栏关掉，
+       再放一个「收起为窄条」按钮会和 X 视觉上重复，且它的行为
+       （自动 pin + collapse）也容易让人误以为是关闭。
+       只在 pinned 模式保留这颗，drawer 模式下隐藏。
+       注意：必须用 .sidebar-header-actions 多嵌一层把 specificity 提到 0,4,0，
+       否则会和文件后段 .sidebar-header-actions .btn-ghost.btn-sm (0,3,0) 打平
+       而因后定义胜出，导致 drawer 模式下窄条按钮和 X 同时显示。 */
+    .sidebar:not(.pinned) .sidebar-header-actions .sidebar-collapse-toggle {
       display: none;
     }
 
@@ -677,15 +700,6 @@
     .sidebar-collapse-toggle.collapsed {
       color: var(--primary);
     }
-    /* 完全关闭侧栏 — 仅在 pinned 展开态可见（drawer 自带 X；窄条态保持极简） */
-    .sidebar .sidebar-header-actions .btn.sidebar-close-fully {
-      display: none;
-      flex-shrink: 0;
-    }
-    .sidebar.pinned:not(.collapsed) .sidebar-header-actions .btn.sidebar-close-fully {
-      display: inline-flex;
-    }
-
     /* ===== 图钉按钮 ===== */
     .sidebar-pin-toggle {
       flex-shrink: 0;
@@ -4117,12 +4131,19 @@
       gap: 6px;
       max-width: 95%;
     }
+    /* user turn 默认 align-self: flex-end（右对齐）；多段渲染时强制
+       容器内左对齐，否则 subagent 段会被推到右边，border-left 色条断裂。 */
+    .chat-message.user.multi-agent {
+      align-self: flex-start;
+      align-items: flex-start;
+    }
     .chat-message.multi-agent .chat-message-segment {
       display: flex;
       flex-direction: column;
+      align-self: flex-start;
     }
     .chat-message.multi-agent .chat-message-segment.subagent {
-      padding-left: 14px;
+      padding-left: 10px;
       margin-left: 6px;
       border-left: 2px solid var(--agent-color, var(--border-subtle));
       border-radius: 0 4px 4px 0;
@@ -4165,6 +4186,56 @@
       font-style: italic;
     }
 
+    /* subagent 回复气泡（群聊角色完成任务后的发言） */
+    .subagent-reply {
+      background: color-mix(in srgb, var(--agent-color, var(--accent)) 6%, var(--bg-surface));
+      border: 1px solid color-mix(in srgb, var(--agent-color, var(--accent)) 20%, transparent);
+      border-radius: 10px;
+      padding: 10px 14px;
+      margin: 4px 0;
+      line-height: 1.55;
+      font-size: 0.875rem;
+      color: var(--text-primary);
+      word-break: break-word;
+    }
+
+    .subagent-reply > :first-child { margin-top: 0; }
+    .subagent-reply > :last-child { margin-bottom: 0; }
+
+    .subagent-reply.error {
+      background: color-mix(in srgb, var(--danger, #e2574c) 8%, var(--bg-surface));
+      border-color: color-mix(in srgb, var(--danger, #e2574c) 35%, transparent);
+    }
+
+    .subagent-reply.pending {
+      opacity: 0.7;
+      padding: 14px 16px;
+    }
+
+    .subagent-reply-icon {
+      display: inline-block;
+      color: var(--danger, #e2574c);
+      margin-right: 6px;
+      font-weight: 700;
+    }
+
+    .subagent-reply-body {
+      display: inline;
+    }
+
+    .subagent-reply pre,
+    .subagent-reply code {
+      font-size: 0.82rem;
+    }
+
+    .subagent-reply pre {
+      background: rgba(0, 0, 0, 0.04);
+      padding: 10px 12px;
+      border-radius: 6px;
+      overflow-x: auto;
+      margin: 8px 0;
+    }
+
     /* ===== 消息使用量信息 ===== */
     .message-usage {
       margin-top: 8px;
@@ -6845,6 +6916,38 @@
       transform: scale(0.95);
     }
 
+    /* "立即发送"：结构化会话流式输出时显示，按下会中断当前回复立即处理新输入。
+       视觉上比 send 弱、比 stop 弱，避免被误点；和 send 之间留一点空气。 */
+    .btn-circle-interrupt {
+      background: rgba(160, 110, 60, 0.10);
+      color: var(--accent);
+      margin-right: 2px;
+      border: 1px dashed rgba(197, 101, 61, 0.35);
+    }
+    .btn-circle-interrupt:hover {
+      background: var(--accent);
+      color: white;
+      border-style: solid;
+      transform: scale(1.08);
+    }
+    .btn-circle-interrupt:active {
+      transform: scale(0.95);
+    }
+    .btn-circle-interrupt.hidden {
+      display: none;
+    }
+
+    /* send 按钮在「排队模式」下退到次要色，让相邻的"立即发送"成为视觉重点。
+       不动尺寸 / 圆形，避免 layout shift。 */
+    .btn-circle-send.queue-mode {
+      background: linear-gradient(180deg, rgba(197, 101, 61, 0.55) 0%, rgba(168, 82, 47, 0.55) 100%);
+      box-shadow: 0 1px 4px rgba(197, 101, 61, 0.15);
+    }
+    .btn-circle-send.queue-mode:hover {
+      background: linear-gradient(180deg, var(--accent) 0%, #a8522f 100%);
+      box-shadow: 0 3px 10px rgba(197, 101, 61, 0.35);
+    }
+
     /* Prompt optimize button — top-right of the input composer */
     .prompt-optimize-btn {
       position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.30.0",
+  "version": "1.30.3",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {