@co0ontty/wand 1.5.7 → 1.6.1

package/README.md

@@ -41,15 +41,16 @@ wand config:set port 9443
 | `port` | `8443` | 监听端口 |
 | `https` | `false` | 启用 HTTPS（自签证书自动生成） |
 | `password` | (随机生成) | 登录密码 |
-| `replyLanguage` | `""` | Claude 回复语言偏好 |
+| `language` | `""` | Claude 回复语言偏好 |
 
 ## 功能
 
 - **双视图模式** — 终端原始输出和结构化对话视图可随时切换
-- **会话管理** — 创建、归档、恢复会话；支持从 Claude 原生历史记录恢复
-- **权限控制** — 可视化权限提示，支持逐次确认、单次批准、本轮记忆等策略
-- **文件浏览器** — 内置路径浏览、搜索和收藏功能
+- **会话管理** — 创建、归档、恢复会话；支持从 Claude 原生历史记录恢复；会话列表显示摘要
+- **权限控制** — 可视化权限提示，支持逐次确认、单次批准、本轮记忆等策略；工具调用自动分组
+- **文件浏览器** — 内置路径浏览和搜索功能
 - **多种运行模式** — full-access / default / auto-edit 等 Claude 运行模式
+- **个性化** — 像素风猫咪头像、回复语言偏好设置
 - **PWA 支持** — 可添加到主屏幕作为独立应用使用
 - **HTTPS** — 可选自签证书，适合远程或移动端访问
 

package/dist/process-manager.js

@@ -397,6 +397,24 @@ function getLatestClaudeTaskId(excludeIds) {
         return null;
     }
 }
+/** Derive a short summary for a session from user messages or current task. */
+function deriveSessionSummary(messages, currentTaskTitle) {
+    // Prefer first user message as summary
+    for (const msg of messages) {
+        if (msg.role !== "user")
+            continue;
+        for (const block of msg.content) {
+            if (block.type === "text" && block.text.trim()) {
+                return block.text.trim().slice(0, 120);
+            }
+        }
+        break; // only check the first user turn
+    }
+    // Fallback to current task title
+    if (currentTaskTitle)
+        return currentTaskTitle.slice(0, 120);
+    return undefined;
+}
 export class ProcessManager extends EventEmitter {
     config;
     storage;
@@ -1102,7 +1120,8 @@ export class ProcessManager extends EventEmitter {
             resumedToSessionId: record.resumedToSessionId ?? undefined,
             autoRecovered: record.autoRecovered ?? false,
             autoApprovePermissions: record.autoApprovePermissions || undefined,
-            approvalStats: record.approvalStats.total > 0 ? record.approvalStats : undefined
+            approvalStats: record.approvalStats.total > 0 ? record.approvalStats : undefined,
+            summary: deriveSessionSummary(messages, record.currentTask?.title ?? null),
         };
     }
     isPermissionBlocked(record) {

package/dist/structured-session-manager.js

@@ -4,6 +4,23 @@ const STREAM_EMIT_DEBOUNCE_MS = 16;
 function isRunningAsRoot() {
     return process.getuid?.() === 0 || process.geteuid?.() === 0;
 }
+/** Enrich a snapshot with a derived summary from the first user message. */
+function withSummary(snapshot) {
+    if (snapshot.summary)
+        return snapshot;
+    const messages = snapshot.messages ?? [];
+    for (const msg of messages) {
+        if (msg.role !== "user")
+            continue;
+        for (const block of msg.content) {
+            if (block.type === "text" && block.text.trim()) {
+                return { ...snapshot, summary: block.text.trim().slice(0, 120) };
+            }
+        }
+        break;
+    }
+    return snapshot;
+}
 /** Should we auto-approve permissions for this mode? */
 function shouldAutoApproveForMode(mode) {
     return mode === "full-access" || mode === "managed" || mode === "auto-edit";
@@ -46,10 +63,13 @@ export class StructuredSessionManager {
         this.emitEvent = emitEvent;
     }
     list() {
-        return Array.from(this.sessions.values()).sort((a, b) => b.startedAt.localeCompare(a.startedAt));
+        return Array.from(this.sessions.values())
+            .map(withSummary)
+            .sort((a, b) => b.startedAt.localeCompare(a.startedAt));
     }
     get(id) {
-        return this.sessions.get(id) ?? null;
+        const s = this.sessions.get(id);
+        return s ? withSummary(s) : null;
     }
     createSession(options) {
         const id = randomUUID();

package/dist/types.d.ts

@@ -189,6 +189,8 @@ export interface SessionSnapshot {
         file: number;
         total: number;
     };
+    /** 会话摘要：从首条用户消息或当前任务提取 */
+    summary?: string;
 }
 export type SessionLifecycleState = "initializing" | "running" | "idle" | "thinking" | "waiting-input" | "archived";
 export interface SessionLifecycle {

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

@@ -90,6 +90,8 @@
         inputQueue: Promise.resolve(),
         pendingMessages: [], // WebSocket 断线期间的消息队列
         messageQueue: [], // 用户消息排队等待发送
+        crossSessionQueue: [], // 跨会话排队消息 [{ id, text, cwd, mode, tool }]
+        structuredInputQueue: [], // 结构化会话同会话排队消息
         drafts: {},
         isSyncingInputBox: false,
         loginPending: false,
@@ -678,7 +680,6 @@
                   '</div>' +
                   '<div class="todo-progress-body hidden" id="todo-progress-body">' +
                     '<ul class="todo-progress-list" id="todo-progress-list"></ul>' +
-                    '<div id="recent-actions" class="recent-actions"></div>' +
                   '</div>' +
                 '</div>' +
                 '<div class="input-composer">' +
@@ -1816,7 +1817,9 @@
             '<div class="session-item-row">' +
               checkbox +
               '<div class="session-main">' +
-                '<div class="session-command">' + escapeHtml(session.resumedFromSessionId ? session.command.replace(/\s+--resume\s+\S+/, '') : session.command) + '</div>' +
+                (session.summary
+                  ? '<div class="session-title">' + escapeHtml(session.summary) + '</div>'
+                  : '<div class="session-command">' + escapeHtml(session.resumedFromSessionId ? session.command.replace(/\s+--resume\s+\S+/, '') : session.command) + '</div>') +
                 '<div class="session-meta">' +
                   modeBadge +
                   '<span>' + escapeHtml(modeName) + '</span>' +
@@ -1995,23 +1998,23 @@
         var optionLabel = btnEl.dataset.optionLabel;
         if (optionLabel && state.selectedId) {
           btnEl.classList.add("selected");
-          var allOptions = document.querySelectorAll(".ask-user-option");
-          allOptions.forEach(function(opt) {
-            opt.classList.add("selected");
-            opt.style.pointerEvents = "none";
-          });
-          var cardBody = btnEl.closest(".tool-use-card.ask-user");
-          if (cardBody) {
+          // Only disable options within the same question group, not globally
+          var questionGroup = btnEl.closest(".ask-user-question-group");
+          if (questionGroup) {
+            questionGroup.querySelectorAll(".ask-user-option").forEach(function(opt) {
+              opt.classList.add("selected");
+              opt.style.pointerEvents = "none";
+            });
             var sentDiv = document.createElement("div");
             sentDiv.className = "ask-user-answer-sent";
-            sentDiv.innerHTML = "\\u2713 \\u5df2\\u53d1\\u9001: " + escapeHtml(optionLabel);
-            cardBody.appendChild(sentDiv);
+            sentDiv.innerHTML = "\u2713 \u5df2\u53d1\u9001: " + escapeHtml(optionLabel);
+            questionGroup.appendChild(sentDiv);
           }
           fetch("/api/sessions/" + state.selectedId + "/input", {
             method: "POST",
             headers: { "Content-Type": "application/json" },
             credentials: "same-origin",
-            body: JSON.stringify({ input: optionLabel + "\\n", view: state.currentView })
+            body: JSON.stringify({ input: optionLabel + "\n", view: state.currentView })
           }).catch(function(err) {
             console.error("[wand] Error sending answer:", err);
           });
@@ -3679,6 +3682,11 @@
           reconcileInteractiveState();
           updateTaskDisplay();
         }
+        // When a session transitions to a non-running state, try flushing cross-session queue
+        if (snapshot.status && snapshot.status !== "running" && state.crossSessionQueue.length > 0) {
+          // Use setTimeout(0) to let the current event processing complete first
+          setTimeout(flushCrossSessionQueue, 0);
+        }
       }
 
       function subscribeToSession(sessionId) {
@@ -3818,6 +3826,11 @@
                 loadOutput(state.selectedId);
               }
             }
+
+            // Try to flush cross-session queue on every session list refresh
+            if (state.crossSessionQueue.length > 0) {
+              flushCrossSessionQueue();
+            }
           })
           .catch(function(e) {
             console.error("[wand] loadSessions failed:", e);
@@ -3830,6 +3843,8 @@
         if (listEl) listEl.innerHTML = renderSessions();
         if (countEl) countEl.textContent = String(state.sessions.length);
         updateShellChrome();
+        // Re-render cross-session queue (container may have been destroyed by DOM rebuild)
+        if (state.crossSessionQueue.length > 0) renderCrossSessionQueue();
       }
 
       function updateShellChrome() {
@@ -3938,6 +3953,9 @@
 
             var selectedSession = state.sessions.find(function(s) { return s.id === id; });
             state.currentMessages = getPreferredMessages(selectedSession, data.output, false);
+            if (selectedSession && selectedSession.sessionKind === "structured") {
+              appendQueuedPlaceholders(state.currentMessages);
+            }
 
             if (state.terminal) {
               syncTerminalBuffer(id, data.output || "", { mode: "replace" });
@@ -3959,7 +3977,8 @@
         // Clear queued inputs from the previous session to prevent cross-session leaks
         state.messageQueue = [];
         state.pendingMessages = [];
-        updateQueueCounter();
+        state.structuredInputQueue = [];
+        updateStructuredQueueCounter();
         resetChatRenderCache();
         state.currentMessages = [];
         if (chatRenderTimer) { clearTimeout(chatRenderTimer); chatRenderTimer = null; }
@@ -5022,11 +5041,236 @@
         return !!selectedSession && selectedSession.status === "running";
       }
 
+      // ── 跨会话排队 ──
+
+      var _queueLaunching = false; // 防止并发 launch
+
+      function hasAnyBusySession() {
+        return state.sessions.some(function(s) {
+          return s.status === "running" && !s.archived;
+        });
+      }
+
+      function enqueueCrossSessionMessage(text) {
+        if (state.crossSessionQueue.length >= 10) {
+          showToast("排队消息已满（最多 10 条），请等待当前会话完成。", "warning");
+          return;
+        }
+        var id = "csq-" + Date.now() + "-" + Math.random().toString(36).slice(2, 8);
+        state.crossSessionQueue.push({
+          id: id,
+          text: text,
+          cwd: getEffectiveCwd(),
+          mode: state.chatMode || "managed",
+          tool: getPreferredTool(),
+          queuedAt: Date.now()
+        });
+        renderCrossSessionQueue();
+      }
+
+      function launchQueueItem(item) {
+        if (_queueLaunching) return;
+        _queueLaunching = true;
+        fetch("/api/commands", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify({
+            command: item.tool,
+            cwd: item.cwd,
+            mode: item.mode,
+            initialInput: item.text
+          })
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          _queueLaunching = false;
+          if (data.error) {
+            showToast(data.error, "error");
+            // 失败回填队首，不丢消息
+            state.crossSessionQueue.unshift(item);
+            renderCrossSessionQueue();
+            return null;
+          }
+          return activateSession(data);
+        })
+        .catch(function(error) {
+          _queueLaunching = false;
+          showToast((error && error.message) || "无法启动排队会话。", "error");
+          state.crossSessionQueue.unshift(item);
+          renderCrossSessionQueue();
+        });
+      }
+
+      function sendQueueItemNow(queueId) {
+        var idx = state.crossSessionQueue.findIndex(function(q) { return q.id === queueId; });
+        if (idx < 0) return;
+        var item = state.crossSessionQueue.splice(idx, 1)[0];
+        renderCrossSessionQueue();
+        // 立即发送不受 _queueLaunching 限制
+        fetch("/api/commands", {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          credentials: "same-origin",
+          body: JSON.stringify({
+            command: item.tool,
+            cwd: item.cwd,
+            mode: item.mode,
+            initialInput: item.text
+          })
+        })
+        .then(function(res) { return res.json(); })
+        .then(function(data) {
+          if (data.error) {
+            showToast(data.error, "error");
+            return null;
+          }
+          return activateSession(data);
+        })
+        .catch(function(error) {
+          showToast((error && error.message) || "无法启动排队会话。", "error");
+        });
+      }
+
+      function cancelQueueItem(queueId) {
+        var idx = state.crossSessionQueue.findIndex(function(q) { return q.id === queueId; });
+        if (idx < 0) return;
+        state.crossSessionQueue.splice(idx, 1);
+        renderCrossSessionQueue();
+        if (state.crossSessionQueue.length === 0) {
+          showToast("排队已清空。", "info");
+        }
+      }
+
+      function flushCrossSessionQueue() {
+        if (state.crossSessionQueue.length === 0) return;
+        if (hasAnyBusySession()) return;
+        if (_queueLaunching) return;
+        var item = state.crossSessionQueue.shift();
+        renderCrossSessionQueue();
+        launchQueueItem(item);
+      }
+
+      function formatQueueAge(queuedAt) {
+        var sec = Math.floor((Date.now() - queuedAt) / 1000);
+        if (sec < 60) return sec + "s";
+        var min = Math.floor(sec / 60);
+        if (min < 60) return min + "m";
+        return Math.floor(min / 60) + "h";
+      }
+
+      function renderCrossSessionQueue() {
+        var container = document.querySelector(".cross-session-queue");
+        var inputPanel = document.querySelector(".input-panel");
+        var statusBar = document.querySelector(".structured-status-bar");
+        var composer = document.querySelector(".input-composer");
+        var blankChat = document.getElementById("blank-chat");
+
+        if (state.crossSessionQueue.length === 0) {
+          if (container) container.remove();
+          return;
+        }
+
+        // Determine parent: input-panel (session view) or blank-chat (welcome view)
+        var isInputPanelVisible = inputPanel && !inputPanel.classList.contains("hidden");
+        var parent = isInputPanelVisible ? inputPanel : blankChat;
+        // Insert above status bar if present, otherwise above composer
+        var insertBefore = isInputPanelVisible ? (statusBar || composer) : null;
+
+        if (!parent) return;
+
+        // If container exists but is in the wrong parent, move it
+        if (container && container.parentNode !== parent) {
+          container.remove();
+          container = null;
+        }
+
+        if (!container) {
+          container = document.createElement("div");
+          container.className = "cross-session-queue";
+          if (insertBefore) {
+            parent.insertBefore(container, insertBefore);
+          } else {
+            parent.appendChild(container);
+          }
+        } else if (isInputPanelVisible && insertBefore && container.nextSibling !== insertBefore) {
+          // Ensure queue stays above status bar
+          parent.insertBefore(container, insertBefore);
+        }
+
+        var total = state.crossSessionQueue.length;
+        var items = state.crossSessionQueue.map(function(item, i) {
+          var preview = item.text.length > 60 ? item.text.slice(0, 60) + "…" : item.text;
+          var age = formatQueueAge(item.queuedAt);
+          return '<div class="queue-item" data-queue-id="' + escapeHtml(item.id) + '">' +
+            '<span class="queue-item-dot"></span>' +
+            '<span class="queue-item-text" title="' + escapeHtml(item.text) + '">' + escapeHtml(preview) + '</span>' +
+            '<span class="queue-item-age">' + age + '</span>' +
+            '<button class="queue-item-send-now" data-queue-id="' + escapeHtml(item.id) + '" title="立即发送" type="button">发送</button>' +
+            '<button class="queue-item-cancel" data-queue-id="' + escapeHtml(item.id) + '" title="取消" type="button">×</button>' +
+          '</div>';
+        }).join("");
+
+        var header = total > 1
+          ? '<div class="queue-header">' +
+              '<span class="queue-header-label">排队 ' + total + ' 条</span>' +
+              '<button class="queue-header-clear" id="queue-clear-all" type="button" title="清空排队">清空</button>' +
+            '</div>'
+          : '';
+
+        container.innerHTML = header + items;
+      }
+
+      // 定时刷新排队项的等待时间 + 尝试 flush
+      setInterval(function() {
+        if (state.crossSessionQueue.length > 0) {
+          // 只更新 age 文本，不重建整个 DOM
+          var ages = document.querySelectorAll(".queue-item-age");
+          state.crossSessionQueue.forEach(function(item, i) {
+            if (ages[i]) ages[i].textContent = formatQueueAge(item.queuedAt);
+          });
+          // 尝试 flush 作为保底（防止 ended 事件 flush 失败）
+          flushCrossSessionQueue();
+        }
+      }, 5000);
+
+      // Delegate click events for cross-session queue items
+      document.addEventListener("click", function(e) {
+        if (e.target.closest("#queue-clear-all")) {
+          e.preventDefault();
+          state.crossSessionQueue = [];
+          renderCrossSessionQueue();
+          showToast("排队已清空。", "info");
+          return;
+        }
+        var sendNow = e.target.closest(".queue-item-send-now");
+        if (sendNow) {
+          e.preventDefault();
+          sendQueueItemNow(sendNow.dataset.queueId);
+          return;
+        }
+        var cancel = e.target.closest(".queue-item-cancel");
+        if (cancel) {
+          e.preventDefault();
+          cancelQueueItem(cancel.dataset.queueId);
+          return;
+        }
+      });
+
       // Send message from the welcome screen input
       function welcomeInputSend() {
         var welcomeInput = document.getElementById("welcome-input");
         var value = welcomeInput ? welcomeInput.value.trim() : "";
         if (!value) return;
+
+        // Cross-session queue: if any session is busy, queue instead of creating
+        if (hasAnyBusySession()) {
+          welcomeInput.value = "";
+          enqueueCrossSessionMessage(value);
+          showToast("已排队，将在当前会话完成后自动发送。", "info");
+          return;
+        }
+
         // Clear todo progress bar at the start of a new session
         var todoEl = document.getElementById("todo-progress");
         if (todoEl) todoEl.classList.add("hidden");
@@ -5092,7 +5336,14 @@
           return;
         }
 
-        // No selected session, create a new one
+        // No selected session, create a new one (or queue if busy)
+        if (value && hasAnyBusySession()) {
+          if (inputBox) inputBox.value = "";
+          if (welcomeInput) welcomeInput.value = "";
+          enqueueCrossSessionMessage(value);
+          showToast("已排队，将在当前会话完成后自动发送。", "info");
+          return;
+        }
         var mode = state.chatMode || "managed";
         var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
@@ -5252,10 +5503,27 @@
           return Promise.resolve();
         }
         if (session.structuredState && session.structuredState.inFlight && session.status === "running") {
-          // Disable send button while processing, show subtle indicator
-          var sendBtn = document.getElementById("send-input-button");
-          if (sendBtn) sendBtn.disabled = true;
-          showToast("正在等待上一条消息处理完成…", "info");
+          // Queue the message for sending after current processing completes
+          if (state.structuredInputQueue.length >= 10) {
+            showToast("排队消息已满（最多 10 条），请等待当前消息处理完成。", "warning");
+            return Promise.resolve();
+          }
+          state.structuredInputQueue.push(input);
+          if (inputBox) {
+            inputBox.value = "";
+            autoResizeInput(inputBox);
+          }
+          setDraftValue("");
+          // Show the queued message in chat view with a "queued" marker
+          var queuedTurn = { role: "user", content: [{ type: "text", text: input, __queued: true }] };
+          var curMsgs = Array.isArray(state.currentMessages) ? state.currentMessages.slice() : [];
+          curMsgs.push(queuedTurn);
+          state.currentMessages = curMsgs;
+          // Also update session.messages so the queued turn survives WS updates
+          session.messages = curMsgs;
+          renderChat(true);
+          showToast("已排队（第 " + state.structuredInputQueue.length + " 条），将在当前消息处理完成后自动发送。", "info");
+          updateStructuredQueueCounter();
           return Promise.resolve();
         }
 
@@ -5263,8 +5531,14 @@
         var userTurn = { role: "user", content: [{ type: "text", text: input }] };
         var thinkingTurn = { role: "assistant", content: [{ type: "text", text: "", __processing: true }] };
         var userMsgs = Array.isArray(session.messages) ? session.messages.slice() : [];
+        // Filter out __queued placeholders — they'll be re-appended after the new turns
+        userMsgs = userMsgs.filter(function(m) {
+          return !(m.role === "user" && m.content && m.content.some(function(b) { return b.__queued; }));
+        });
         userMsgs.push(userTurn);
         userMsgs.push(thinkingTurn);
+        // Re-append remaining queued messages after the current send
+        appendQueuedPlaceholders(userMsgs);
         session.messages = userMsgs;
         state.currentMessages = userMsgs;
         // Mark inFlight optimistically to prevent double-send via WS updates
@@ -5276,9 +5550,7 @@
           inputBox.value = "";
           autoResizeInput(inputBox);
         }
-        // Disable send button so user can't double-send
-        var sendBtnEl = document.getElementById("send-input-button");
-        if (sendBtnEl) sendBtnEl.disabled = true;
+        // Keep send button enabled so user can queue more messages
         updateInputHint("思考中…");
         setDraftValue("");
         renderChat(true);
@@ -5298,17 +5570,28 @@
             updateSessionSnapshot(snapshot);
             if (snapshot.messages && snapshot.messages.length > 0) {
               state.currentMessages = snapshot.messages;
+              // Re-append queued user messages
+              appendQueuedPlaceholders(state.currentMessages);
             }
             renderChat(true);
             updateInputHint("Enter 发送 · Shift+Enter 换行");
           }
         })
         .catch(function(error) {
-          var errSendBtn = document.getElementById("send-input-button");
-          if (errSendBtn) errSendBtn.disabled = false;
+          // Reset inFlight so user can send again
+          if (session.structuredState) {
+            session.structuredState.inFlight = false;
+          }
+          // Clear remaining queued messages since the session is likely broken
+          if (state.structuredInputQueue.length > 0) {
+            var dropped = state.structuredInputQueue.length;
+            state.structuredInputQueue = [];
+            updateStructuredQueueCounter();
+            showToast("发送失败，已清空 " + dropped + " 条排队消息。", "error");
+          } else {
+            showToast((error && error.message) || "无法发送结构化消息。", "error");
+          }
           updateInputHint("Enter 发送 · Shift+Enter 换行");
-          showToast((error && error.message) || "无法发送结构化消息。", "error");
-          throw error;
         });
       }
 
@@ -5317,6 +5600,63 @@
         if (hint) hint.textContent = text;
       }
 
+      function updateStructuredQueueCounter() {
+        var counter = document.getElementById("queue-counter");
+        var count = state.structuredInputQueue.length;
+        if (counter) {
+          counter.textContent = "队列: " + count;
+          if (count > 0) {
+            counter.classList.remove("hidden");
+          } else {
+            counter.classList.add("hidden");
+          }
+        }
+      }
+
+      // Append queued user message placeholders to currentMessages so they
+      // remain visible across WS updates and re-renders.
+      function appendQueuedPlaceholders(messages) {
+        if (state.structuredInputQueue.length === 0) return messages;
+        for (var qi = 0; qi < state.structuredInputQueue.length; qi++) {
+          messages.push({ role: "user", content: [{ type: "text", text: state.structuredInputQueue[qi], __queued: true }] });
+        }
+        return messages;
+      }
+
+      function flushStructuredInputQueue() {
+        if (state.structuredInputQueue.length === 0) return;
+        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
+        if (!session || session.sessionKind !== "structured") {
+          state.structuredInputQueue = [];
+          updateStructuredQueueCounter();
+          return;
+        }
+        // Only flush if not inFlight
+        if (session.structuredState && session.structuredState.inFlight) return;
+        var nextInput = state.structuredInputQueue.shift();
+        updateStructuredQueueCounter();
+        if (nextInput) {
+          // Remove __queued marker from the matching user turn already in chat.
+          // postStructuredInput will find it's not inFlight now and do the
+          // normal send path, which re-adds the user turn + thinking turn.
+          // So we need to remove the queued placeholder first to avoid duplicates.
+          var msgs = Array.isArray(state.currentMessages) ? state.currentMessages : [];
+          for (var qi = msgs.length - 1; qi >= 0; qi--) {
+            var qm = msgs[qi];
+            if (qm.role === "user" && qm.content && qm.content.some(function(b) {
+              return b.__queued && b.text === nextInput;
+            })) {
+              msgs.splice(qi, 1);
+              break;
+            }
+          }
+          state.currentMessages = msgs;
+          if (session.messages) session.messages = msgs;
+          // Pass null for inputBox to avoid clearing user's current typing
+          postStructuredInput(nextInput, null, session);
+        }
+      }
+
       function getInputErrorMessage(error) {
         if (error && (error.errorCode === "SESSION_NOT_RUNNING" || error.errorCode === "SESSION_NO_PTY")) {
           return "会话已结束；若存在 Claude 历史会话，将在你下次发送消息时自动恢复。";
@@ -5398,12 +5738,10 @@
       function queueDirectInput(input, shortcutKey) {
         if (!input || !state.selectedId) return Promise.resolve();
         state.messageQueue.push(input);
-        updateQueueCounter();
         state.inputQueue = state.inputQueue.then(function() {
           return postInput(input, shortcutKey).finally(function() {
             var idx = state.messageQueue.indexOf(input);
             if (idx > -1) state.messageQueue.splice(idx, 1);
-            updateQueueCounter();
             scheduleMobileDomUpdate();
           });
         });
@@ -7412,6 +7750,10 @@
               updateSessionSnapshot(snapshot);
               if (msg.sessionId === state.selectedId) {
                 state.currentMessages = getPreferredMessages(snapshot, msg.data.output, false);
+                // Re-append queued user messages that haven't been sent yet
+                if (msg.data.sessionKind === 'structured') {
+                  appendQueuedPlaceholders(state.currentMessages);
+                }
                 // Structured session with inFlight: keep __processing placeholder
                 // so the loading indicator stays visible until assistant content arrives
                 if (msg.data.sessionKind === 'structured') {
@@ -7471,10 +7813,7 @@
             }
             updateSessionSnapshot(endedSnapshot);
 
-            // Re-enable send button when structured session finishes
             if (msg.sessionId === state.selectedId) {
-              var endedSendBtn = document.getElementById("send-input-button");
-              if (endedSendBtn) endedSendBtn.disabled = false;
               updateInputHint("Enter 发送 · Shift+Enter 换行");
               // Trigger status bar completion animation
               scheduleChatRender(true);
@@ -7506,16 +7845,32 @@
               });
             }
 
-            // Clear stale queued inputs so they cannot race with the ended session.
-            // Each queued item's postInput will hit the server and get an error, but
-            // clearing the queues here prevents them from growing unbounded.
+            // Clear stale queued inputs for PTY sessions.
+            // For structured sessions, each "ended" means one turn completed (not
+            // the session terminated), so we must NOT clear the structured queue —
+            // instead, flush the next queued message.
             state.messageQueue = [];
             state.pendingMessages = [];
 
+            var endedSessionObj = state.sessions.find(function(s) { return s.id === msg.sessionId; });
+            var isStructuredEnded = endedSessionObj && endedSessionObj.sessionKind === "structured";
+
+            if (isStructuredEnded && msg.sessionId === state.selectedId &&
+                state.structuredInputQueue.length > 0) {
+              // Structured session turn completed — flush next queued message
+              setTimeout(flushStructuredInputQueue, 50);
+            } else if (!isStructuredEnded) {
+              // PTY session ended — clear structured queue too
+              state.structuredInputQueue = [];
+              updateStructuredQueueCounter();
+            }
+
             // Disable terminal interactive mode immediately so the terminal stops
             // capturing keystrokes before loadSessions() completes.
             if (msg.sessionId === state.selectedId) {
-              setTerminalInteractive(false);
+              if (!isStructuredEnded) {
+                setTerminalInteractive(false);
+              }
               state.currentTask = null;
               updateTaskDisplay();
             }
@@ -7526,9 +7881,14 @@
               updateShellChrome();
             }
 
-            loadSessions();
+            loadSessions().then(function() {
+              // After sessions list is refreshed, try to flush cross-session queue
+              flushCrossSessionQueue();
+            });
             if (msg.sessionId === state.selectedId) {
-              loadOutput(msg.sessionId);
+              if (!isStructuredEnded) {
+                loadOutput(msg.sessionId);
+              }
             }
             break;
           }
@@ -7625,6 +7985,11 @@
                 // Re-render chat when structured session inFlight state changes
                 if (statusUpdate.structuredState) {
                   scheduleChatRender();
+                  // Flush queued structured messages when inFlight clears
+                  if (!statusUpdate.structuredState.inFlight) {
+                    updateInputHint("Enter 发送 · Shift+Enter 换行");
+                    setTimeout(flushStructuredInputQueue, 50);
+                  }
                 }
               }
             }
@@ -7896,6 +8261,9 @@
           var selectedSession = state.sessions.find(function(s) { return s.id === state.selectedId; });
           if (selectedSession) {
             state.currentMessages = getPreferredMessages(selectedSession, selectedSession.output, true);
+            if (selectedSession.sessionKind === "structured") {
+              appendQueuedPlaceholders(state.currentMessages);
+            }
           }
           renderChat();
         }, 30);
@@ -8375,53 +8743,8 @@
           list.innerHTML = html;
         }
 
-        // Extract recent important actions for key points summary
-        var recentActions = [];
-        var actionTools = ["Write", "Edit", "Bash", "WebFetch", "WebSearch"];
-        var msgCount = messages.length;
-        for (var ai = 0; ai < msgCount && recentActions.length < 5; ai++) {
-          var m = messages[ai];
-          if (!m.content || !Array.isArray(m.content)) continue;
-          for (var bi = 0; bi < m.content.length && recentActions.length < 5; bi++) {
-            var blk = m.content[bi];
-            if (blk.type !== "tool_use") continue;
-            var toolName = blk.name || "";
-            if (actionTools.indexOf(toolName) === -1) continue;
-            var desc = blk.description || generateInputSummary(toolName, blk.input) || toolName;
-            if (desc && desc.length > 50) desc = desc.slice(0, 47) + "...";
-            var icon = getToolIcon(toolName);
-            recentActions.push({ icon: icon, text: desc });
-          }
-        }
-
-        var actionsEl = document.getElementById("recent-actions");
-        if (actionsEl) {
-          if (recentActions.length > 0) {
-            var actionsHtml = '<div class="recent-actions-label">最近操作</div>';
-            actionsHtml += '<div class="recent-actions-list">';
-            for (var ri = 0; ri < recentActions.length; ri++) {
-              var a = recentActions[ri];
-              actionsHtml += '<span class="recent-action-pill">' + a.icon + ' ' + escapeHtml(a.text) + '</span>';
-            }
-            actionsHtml += '</div>';
-            actionsEl.innerHTML = actionsHtml;
-          } else {
-            actionsEl.innerHTML = '';
-          }
-        }
       }
 
-      function updateQueueCounter() {
-        var counter = document.getElementById("queue-counter");
-        if (!counter) return;
-        var count = state.messageQueue.length;
-        if (count > 0) {
-          counter.textContent = "队列: " + count;
-          counter.classList.remove("hidden");
-        } else {
-          counter.classList.add("hidden");
-        }
-      }
 
       function attachCopyHandler(el) {
         el.querySelectorAll(".code-copy").forEach(function(btn) {
@@ -8944,6 +9267,67 @@
         return messages;
       }
 
+      // ── 像素风猫咪头像 ──
+      var PIXEL_AVATAR = (function() {
+        var _ = "transparent";
+        function buildSvg(grid, size) {
+          var s = size || 3;
+          var w = grid[0].length * s;
+          var h = grid.length * s;
+          var rects = "";
+          for (var y = 0; y < grid.length; y++) {
+            for (var x = 0; x < grid[y].length; x++) {
+              if (grid[y][x] !== _) {
+                rects += '<rect x="' + (x * s) + '" y="' + (y * s) + '" width="' + s + '" height="' + s + '" fill="' + grid[y][x] + '"/>';
+              }
+            }
+          }
+          return '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ' + w + ' ' + h + '" class="pixel-avatar-svg">' + rects + '</svg>';
+        }
+        // 加菲猫 (勤劳初二 / AI) — 橙色系
+        var o = "#F0923A", d = "#C46A1A", w = "#FFFFFF", k = "#2D2D2D", p = "#F28B9A", n = "#E87D5A";
+        var garfield = [
+          [_,d,_,_,_,_,_,_,d,_],
+          [d,o,d,_,_,_,_,d,o,d],
+          [d,o,o,o,o,o,o,o,o,d],
+          [o,o,w,k,o,o,w,k,o,o],
+          [o,o,w,w,o,o,w,w,o,o],
+          [o,o,o,o,p,p,o,o,o,o],
+          [o,d,o,n,o,o,n,o,d,o],
+          [_,o,o,o,o,o,o,o,o,_],
+          [_,_,o,d,o,o,d,o,_,_],
+          [_,_,_,o,_,_,o,_,_,_],
+        ];
+        // 美短 (赛博虎妞 / 用户) — 灰色系
+        var g = "#9EAAB8", dg = "#6B7B8D", lg = "#C5CED8", gn = "#7EC88B";
+        var shorthair = [
+          [_,dg,_,_,_,_,_,_,dg,_],
+          [dg,g,dg,_,_,_,_,dg,g,dg],
+          [dg,g,g,g,g,g,g,g,g,dg],
+          [g,g,w,gn,g,g,w,gn,g,g],
+          [g,g,w,w,g,g,w,w,g,g],
+          [g,g,g,g,p,p,g,g,g,g],
+          [g,dg,g,lg,g,g,lg,g,dg,g],
+          [_,g,g,g,g,g,g,g,g,_],
+          [_,_,g,dg,g,g,dg,g,_,_],
+          [_,_,_,g,_,_,g,_,_,_],
+        ];
+        return {
+          assistant: buildSvg(garfield),
+          user: buildSvg(shorthair)
+        };
+      })();
+
+      function chatAvatar(role) {
+        var isUser = role === "user";
+        var svg = isUser ? PIXEL_AVATAR.user : PIXEL_AVATAR.assistant;
+        var name = isUser ? "赛博虎妞" : "勤劳初二";
+        return '<div class="chat-message-avatar ' + role + '">' +
+          '<div class="pixel-avatar">' + svg + '</div>' +
+          '<span class="avatar-name">' + name + '</span>' +
+        '</div>';
+      }
+
       function renderChatMessage(msg, roundUsage) {
         // Thinking card (deep thought) — from PTY parsing
         if (msg.role === "thinking") {
@@ -8972,7 +9356,7 @@
         }
 
         // Legacy string content (from PTY parsing)
-        var avatar = msg.role === "assistant" ? '<div class="chat-message-avatar">赛博虎妞</div>' : "";
+        var avatar = chatAvatar(msg.role);
         var bubbleContent = msg.role === "assistant" ? renderMarkdown(msg.content) : escapeHtml(msg.content);
         return '<div class="chat-message ' + msg.role + '">' +
           avatar +
@@ -9117,7 +9501,10 @@
 
       function renderStructuredMessage(msg, roundUsage) {
         var role = msg.role;
-        var avatar = role === "assistant" ? '<div class="chat-message-avatar">赛博虎妞</div>' : "";
+        var avatar = chatAvatar(role);
+
+        // Check if this is a queued user message
+        var isQueued = role === "user" && msg.content && msg.content.some(function(b) { return b.__queued; });
 
         if (!msg.content || msg.content.length === 0) {
           if (role === "assistant") {
@@ -9154,10 +9541,12 @@
         }
 
         var usageHtml = "";
+        var queuedClass = isQueued ? " queued" : "";
+        var queuedBadge = isQueued ? '<span class="queued-badge">排队中</span>' : "";
 
-        return '<div class="chat-message ' + role + '">' +
+        return '<div class="chat-message ' + role + queuedClass + '">' +
           avatar +
-          '<div class="chat-message-content">' + blocksHtml + '</div>' +
+          '<div class="chat-message-content">' + blocksHtml + queuedBadge + '</div>' +
           usageHtml +
         '</div>';
       }
@@ -9481,27 +9870,29 @@
         if (toolName === "AskUserQuestion" && block.input && block.input.questions) {
           var questions = block.input.questions;
           if (questions && questions.length > 0) {
-            var question = questions[0];
-            var questionText = question.question ? '<div class="ask-user-title">' + escapeHtml(question.question) + '</div>' : "";
-            var optionsHtml = "";
-            if (question.options && question.options.length > 0) {
-              optionsHtml = '<div class="ask-user-options">';
-              question.options.forEach(function(opt, idx) {
-                var label = opt.label ? escapeHtml(opt.label) : "选项 " + (idx + 1);
-                optionsHtml += '<button class="ask-user-option" data-option-index="' + idx + '" data-option-label="' + escapeHtml(label) + '" onclick="__askOption(this)">' +
-                  '<div class="ask-user-option-label">' + label + '</div>' +
-                '</button>';
-              });
-              optionsHtml += '</div>';
-            }
+            var questionsHtml = "";
+            questions.forEach(function(question, qIdx) {
+              var questionText = question.question ? '<div class="ask-user-title">' + escapeHtml(question.question) + '</div>' : "";
+              var optionsHtml = "";
+              if (question.options && question.options.length > 0) {
+                optionsHtml = '<div class="ask-user-options">';
+                question.options.forEach(function(opt, idx) {
+                  var label = opt.label ? escapeHtml(opt.label) : "选项 " + (idx + 1);
+                  optionsHtml += '<button class="ask-user-option" data-option-index="' + idx + '" data-question-index="' + qIdx + '" data-option-label="' + escapeHtml(label) + '" onclick="__askOption(this)">' +
+                    '<div class="ask-user-option-label">' + label + '</div>' +
+                  '</button>';
+                });
+                optionsHtml += '</div>';
+              }
+              questionsHtml += '<div class="ask-user-question-group">' + questionText + optionsHtml + '</div>';
+            });
             return '<div class="tool-use-card ask-user" data-tool-use-id="' + escapeHtml(toolId) + '">' +
               '<div class="tool-use-header" data-tool-toggle onclick="__tcToggle(event,this)">' +
                 '<span class="tool-use-icon">?</span>' +
                 '<span class="tool-use-name">提问</span>' +
               '</div>' +
               '<div class="tool-use-body ask-user-body">' +
-                questionText +
-                optionsHtml +
+                questionsHtml +
               '</div>' +
             '</div>';
           }

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

@@ -1162,6 +1162,17 @@
       letter-spacing: -0.01em;
     }
 
+    .session-title {
+      font-weight: 600;
+      font-size: 0.8125rem;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      color: var(--text-primary);
+      letter-spacing: -0.01em;
+      line-height: 1.3;
+    }
+
     /* ===== 会话元信息 ===== */
     .session-meta {
       display: flex;
@@ -2292,16 +2303,51 @@
     }
 
     /* ===== 消息头像 ===== */
-    .chat-message.user .chat-message-avatar {
-      display: none;
+    .chat-message-avatar {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      padding: 0 2px 4px 2px;
     }
 
-    .chat-message.assistant .chat-message-avatar {
-      font-size: 0.75rem;
+    .chat-message-avatar.assistant {
+      flex-direction: row;
+    }
+
+    .chat-message-avatar.user {
+      flex-direction: row-reverse;
+    }
+
+    .pixel-avatar {
+      width: 24px;
+      height: 24px;
+      flex-shrink: 0;
+      border-radius: 6px;
+      overflow: hidden;
+      background: var(--bg-tertiary);
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
+    }
+
+    .pixel-avatar-svg {
+      display: block;
+      width: 100%;
+      height: 100%;
+      image-rendering: pixelated;
+    }
+
+    .avatar-name {
+      font-size: 0.7rem;
       font-weight: 600;
-      color: var(--accent);
-      padding: 0 2px 4px 2px;
       letter-spacing: 0.03em;
+      line-height: 1;
+    }
+
+    .chat-message.assistant .avatar-name {
+      color: var(--accent);
+    }
+
+    .chat-message.user .avatar-name {
+      color: var(--text-tertiary);
     }
 
     /* ===== 消息气泡 ===== */
@@ -2720,6 +2766,12 @@
     .ask-user-body {
       padding: 10px 12px;
     }
+    .ask-user-question-group {
+      margin-bottom: 10px;
+    }
+    .ask-user-question-group:last-child {
+      margin-bottom: 0;
+    }
     .ask-user-title {
       font-size: 0.875rem;
       font-weight: 500;
@@ -3724,6 +3776,22 @@
       50% { opacity: 0.7; }
     }
 
+    /* Queued message in chat view */
+    .chat-message.user.queued {
+      opacity: 0.6;
+    }
+    .queued-badge {
+      display: inline-block;
+      font-size: 0.625rem;
+      color: var(--accent);
+      background: var(--accent-muted);
+      padding: 1px 6px;
+      border-radius: 8px;
+      font-weight: 600;
+      margin-top: 4px;
+      animation: queuePulse 1.5s ease-in-out infinite;
+    }
+
     .input-hint {
       font-size: 0.5625rem;
       color: var(--text-muted);
@@ -3904,39 +3972,6 @@
     .todo-item-icon.active { color: var(--accent); }
     .todo-item-icon.done { color: #4a7a4f; }
 
-    /* Recent actions key points section */
-    .recent-actions {
-      margin-top: 8px;
-      padding-top: 8px;
-      border-top: 1px solid var(--border-subtle);
-    }
-    .recent-actions-label {
-      font-size: 0.6875rem;
-      font-weight: 600;
-      color: var(--text-muted);
-      text-transform: uppercase;
-      letter-spacing: 0.03em;
-      margin-bottom: 6px;
-    }
-    .recent-actions-list {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 4px;
-    }
-    .recent-action-pill {
-      display: inline-flex;
-      align-items: center;
-      gap: 3px;
-      padding: 3px 8px;
-      font-size: 0.6875rem;
-      color: var(--text-secondary);
-      background: rgba(79, 122, 88, 0.08);
-      border-radius: 10px;
-      white-space: nowrap;
-      max-width: 220px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
 
     @keyframes spin {
       to { transform: rotate(360deg); }
@@ -7737,4 +7772,125 @@
       100% { opacity: 0; max-height: 0; margin: 0; }
     }
 
+    /* ── 跨会话排队消息 ── */
+    .cross-session-queue {
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+      margin: 0 8px 4px 8px;
+    }
+
+    .queue-header {
+      display: flex;
+      align-items: center;
+      gap: 5px;
+      padding: 0 4px;
+      font-size: 0.6rem;
+      color: var(--text-muted);
+    }
+
+    .queue-header-label {
+      flex: 1;
+      opacity: 0.6;
+    }
+
+    .queue-header-clear {
+      border: none;
+      background: transparent;
+      color: var(--text-muted);
+      cursor: pointer;
+      font-size: 0.5625rem;
+      padding: 1px 4px;
+      border-radius: 3px;
+      opacity: 0.5;
+      transition: color 0.15s, background 0.15s, opacity 0.15s;
+    }
+
+    .queue-header-clear:hover {
+      color: var(--error, #e55);
+      background: rgba(229, 85, 85, 0.12);
+      opacity: 1;
+    }
+
+    .queue-item {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      padding: 4px 8px;
+      font-size: 0.6875rem;
+      color: var(--text-muted);
+      opacity: 0.7;
+      transition: opacity 0.15s ease;
+    }
+
+    .queue-item:hover {
+      opacity: 1;
+    }
+
+    .queue-item-dot {
+      flex-shrink: 0;
+      width: 4px;
+      height: 4px;
+      border-radius: 50%;
+      background: rgba(var(--accent-rgb, 197, 101, 61), 0.6);
+      animation: statusDotPulse 1.2s ease-in-out infinite;
+    }
+
+    .queue-item-text {
+      flex: 1;
+      min-width: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      font-size: 0.6875rem;
+      color: var(--text-muted);
+    }
+
+    .queue-item-age {
+      flex-shrink: 0;
+      font-size: 0.5625rem;
+      color: var(--text-muted);
+      font-variant-numeric: tabular-nums;
+      opacity: 0.5;
+    }
+
+    .queue-item-send-now {
+      flex-shrink: 0;
+      border: 1px solid rgba(var(--accent-rgb, 197, 101, 61), 0.3);
+      background: transparent;
+      color: var(--accent, #c5653d);
+      cursor: pointer;
+      padding: 1px 8px;
+      border-radius: 4px;
+      font-size: 0.6rem;
+      line-height: 1.4;
+      transition: color 0.15s, background 0.15s, border-color 0.15s;
+    }
+
+    .queue-item-send-now:hover {
+      color: var(--accent, #c5653d);
+      background: rgba(var(--accent-rgb, 197, 101, 61), 0.12);
+      border-color: rgba(var(--accent-rgb, 197, 101, 61), 0.5);
+    }
+
+    .queue-item-cancel {
+      flex-shrink: 0;
+      border: none;
+      background: transparent;
+      color: var(--text-muted);
+      cursor: pointer;
+      padding: 1px 4px;
+      border-radius: 3px;
+      font-size: 0.6875rem;
+      line-height: 1;
+      opacity: 0.4;
+      transition: color 0.15s, background 0.15s, opacity 0.15s;
+    }
+
+    .queue-item-cancel:hover {
+      color: var(--error, #e55);
+      background: rgba(229, 85, 85, 0.12);
+      opacity: 1;
+    }
+
     /* 结束标记 */

package/package.json

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