@co0ontty/wand 1.6.0 → 1.6.2

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/config.js

@@ -79,6 +79,28 @@ export async function saveConfig(configPath, config) {
     await mkdir(path.dirname(configPath), { recursive: true });
     await writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
 }
+function normalizeStructuredChatPersona(input) {
+    if (!input || typeof input !== "object")
+        return undefined;
+    const normalizeRole = (roleInput) => {
+        if (!roleInput || typeof roleInput !== "object")
+            return undefined;
+        const role = roleInput;
+        const normalized = {
+            name: typeof role.name === "string" ? role.name.trim() : undefined,
+            avatar: typeof role.avatar === "string" ? role.avatar.trim() : undefined,
+        };
+        if (!normalized.name && !normalized.avatar)
+            return undefined;
+        return normalized;
+    };
+    const personaInput = input;
+    const user = normalizeRole(personaInput.user);
+    const assistant = normalizeRole(personaInput.assistant);
+    if (!user && !assistant)
+        return undefined;
+    return { user, assistant };
+}
 function mergeWithDefaults(input) {
     const defaults = defaultConfig();
     return {
@@ -108,6 +130,7 @@ function mergeWithDefaults(input) {
                 mode: isExecutionMode(preset.mode) ? preset.mode : undefined
             }))
             : defaults.commandPresets,
+        structuredChatPersona: normalizeStructuredChatPersona(input.structuredChatPersona),
         language: typeof input.language === "string" ? input.language.trim() : defaults.language,
     };
 }

package/dist/server.js

@@ -8,6 +8,19 @@ import { promisify } from "node:util";
 import path from "node:path";
 import process from "node:process";
 import { WebSocketServer } from "ws";
+import { ensureAvatarSeed, getAvatarSvg } from "./avatar.js";
+import { createSession, revokeSession, setAuthStorage, validateSession } from "./auth.js";
+import { ensureCertificates } from "./cert.js";
+import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
+import { ProcessManager } from "./process-manager.js";
+import { StructuredSessionManager } from "./structured-session-manager.js";
+import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
+import { getErrorMessage, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
+import { resolveDatabasePath, WandStorage } from "./storage.js";
+import { renderApp } from "./web-ui/index.js";
+import { WsBroadcastManager } from "./ws-broadcast.js";
+import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
+import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
 const execAsync = promisify(exec);
 const SERVER_MODULE_DIR = path.dirname(new URL(import.meta.url).pathname);
 const RUNTIME_ROOT_DIR = path.resolve(SERVER_MODULE_DIR, "..");
@@ -52,19 +65,83 @@ function compareSemver(a, b) {
     }
     return 0;
 }
-import { ensureAvatarSeed, getAvatarSvg } from "./avatar.js";
-import { createSession, revokeSession, setAuthStorage, validateSession } from "./auth.js";
-import { ensureCertificates } from "./cert.js";
-import { isExecutionMode, resolveConfigDir, saveConfig } from "./config.js";
-import { ProcessManager } from "./process-manager.js";
-import { StructuredSessionManager } from "./structured-session-manager.js";
-import { generatePwaManifest, generateServiceWorker } from "./pwa.js";
-import { getErrorMessage, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
-import { resolveDatabasePath, WandStorage } from "./storage.js";
-import { renderApp } from "./web-ui/index.js";
-import { WsBroadcastManager } from "./ws-broadcast.js";
-import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
-import { isPathWithinBase, isBlockedFolderPath, normalizeFolderPath } from "./middleware/path-safety.js";
+function isExternalAvatarSource(value) {
+    return /^(https?:|data:)/i.test(value);
+}
+function normalizePersonaName(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function normalizePersonaAvatar(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed || undefined;
+}
+function resolveStructuredChatPersona(config) {
+    const persona = config.structuredChatPersona;
+    if (!persona)
+        return undefined;
+    const userName = normalizePersonaName(persona.user?.name);
+    const userAvatar = normalizePersonaAvatar(persona.user?.avatar);
+    const assistantName = normalizePersonaName(persona.assistant?.name);
+    const assistantAvatar = normalizePersonaAvatar(persona.assistant?.avatar);
+    if (!userName && !userAvatar && !assistantName && !assistantAvatar) {
+        return undefined;
+    }
+    return {
+        user: userName || userAvatar ? { name: userName, avatar: userAvatar } : undefined,
+        assistant: assistantName || assistantAvatar ? { name: assistantName, avatar: assistantAvatar } : undefined,
+    };
+}
+function resolveStructuredChatAvatarPath(configPath, config, role) {
+    const avatar = role === "user"
+        ? config.structuredChatPersona?.user?.avatar
+        : config.structuredChatPersona?.assistant?.avatar;
+    if (!avatar || isExternalAvatarSource(avatar)) {
+        return null;
+    }
+    const configDir = resolveConfigDir(configPath);
+    return path.isAbsolute(avatar) ? avatar : path.resolve(configDir, avatar);
+}
+async function buildStructuredChatPersonaPayload(configPath, config) {
+    const persona = resolveStructuredChatPersona(config);
+    if (!persona)
+        return undefined;
+    const buildRole = async (role) => {
+        const roleConfig = role === "user" ? persona.user : persona.assistant;
+        if (!roleConfig)
+            return undefined;
+        let avatar = roleConfig.avatar;
+        if (avatar && !isExternalAvatarSource(avatar)) {
+            const resolvedPath = resolveStructuredChatAvatarPath(configPath, config, role);
+            if (!resolvedPath) {
+                avatar = undefined;
+            }
+            else {
+                try {
+                    const fileStat = await stat(resolvedPath);
+                    avatar = fileStat.isFile() ? `/api/structured-chat-avatar/${role}` : undefined;
+                }
+                catch {
+                    avatar = undefined;
+                }
+            }
+        }
+        if (!roleConfig.name && !avatar)
+            return undefined;
+        return {
+            name: roleConfig.name,
+            avatar,
+        };
+    };
+    const [user, assistant] = await Promise.all([buildRole("user"), buildRole("assistant")]);
+    if (!user && !assistant)
+        return undefined;
+    return { user, assistant };
+}
 // ── Git helpers ──
 async function isGitRepo(dirPath) {
     try {
@@ -266,6 +343,50 @@ export async function startServer(config, configPath) {
         res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
         res.type("html").send(renderApp(configPath));
     });
+    app.get("/api/structured-chat-avatar/:role", async (req, res) => {
+        const role = req.params.role === "user" || req.params.role === "assistant"
+            ? req.params.role
+            : null;
+        if (!role) {
+            res.status(404).end();
+            return;
+        }
+        const resolvedPath = resolveStructuredChatAvatarPath(configPath, config, role);
+        if (!resolvedPath) {
+            res.status(404).end();
+            return;
+        }
+        try {
+            const fileStat = await stat(resolvedPath);
+            if (!fileStat.isFile()) {
+                res.status(404).end();
+                return;
+            }
+            const ext = path.extname(resolvedPath).toLowerCase();
+            const contentType = ext === ".svg"
+                ? "image/svg+xml"
+                : ext === ".png"
+                    ? "image/png"
+                    : ext === ".jpg" || ext === ".jpeg"
+                        ? "image/jpeg"
+                        : ext === ".webp"
+                            ? "image/webp"
+                            : ext === ".gif"
+                                ? "image/gif"
+                                : ext === ".avif"
+                                    ? "image/avif"
+                                    : null;
+            if (!contentType) {
+                res.status(415).json({ error: "不支持的头像格式。" });
+                return;
+            }
+            res.setHeader("X-Content-Type-Options", "nosniff");
+            res.type(contentType).sendFile(resolvedPath);
+        }
+        catch {
+            res.status(404).end();
+        }
+    });
     app.get("/manifest.json", (_req, res) => {
         res.setHeader("Content-Type", "application/manifest+json");
         res.send(generatePwaManifest());
@@ -328,7 +449,8 @@ export async function startServer(config, configPath) {
     });
     app.use("/api", requireAuth);
     // ── Config & Session info ──
-    app.get("/api/config", (_req, res) => {
+    app.get("/api/config", async (_req, res) => {
+        const structuredChatPersona = await buildStructuredChatPersonaPayload(configPath, config);
         res.json({
             host: config.host,
             port: config.port,
@@ -336,6 +458,7 @@ export async function startServer(config, configPath) {
             defaultCwd: config.defaultCwd,
             commandPresets: config.commandPresets,
             structuredRunners: [{ label: "Claude Structured", runner: "claude-cli-print" }],
+            structuredChatPersona,
             updateAvailable: cachedUpdateInfo?.updateAvailable ?? false,
             latestVersion: cachedUpdateInfo?.latest ?? null,
             currentVersion: PKG_VERSION,

package/dist/structured-session-manager.js

@@ -345,19 +345,21 @@ export class StructuredSessionManager {
     // ---------------------------------------------------------------------------
     // CLI argument construction
     // ---------------------------------------------------------------------------
-    buildPermissionArgs(mode) {
+    buildPermissionArgs(mode, autoApprove) {
+        const shouldBypass = autoApprove || mode === "full-access" || mode === "managed";
+        const shouldAcceptEdits = mode === "auto-edit";
         if (!isRunningAsRoot()) {
-            if (mode === "full-access" || mode === "managed") {
+            if (shouldBypass) {
                 return ["--permission-mode", "bypassPermissions"];
             }
-            if (mode === "auto-edit") {
+            if (shouldAcceptEdits) {
                 return ["--permission-mode", "acceptEdits"];
             }
             return [];
         }
         // Root: Claude CLI refuses bypassPermissions.
         // acceptEdits auto-approves within CWD; --allowedTools extends to all paths.
-        if (shouldAutoApproveForMode(mode)) {
+        if (shouldBypass || shouldAcceptEdits) {
             return [
                 "--permission-mode", "acceptEdits",
                 "--allowedTools", "Bash", "Edit", "Write", "Read", "Glob", "Grep",
@@ -384,8 +386,8 @@ export class StructuredSessionManager {
         return new Promise((resolve, reject) => {
             const args = ["-p", "--verbose", "--output-format", "stream-json"];
             console.log("[WAND] runClaudeStreaming sessionId:", sessionId, "mode:", session.mode, "claudeSessionId:", session.claudeSessionId);
-            // Add permission args based on mode
-            const permArgs = this.buildPermissionArgs(session.mode);
+            // Add permission args based on mode + autoApprovePermissions toggle
+            const permArgs = this.buildPermissionArgs(session.mode, session.autoApprovePermissions ?? false);
             args.push(...permArgs);
             // In managed mode, append autonomous system prompt
             if (session.mode === "managed") {

package/dist/types.d.ts

@@ -38,6 +38,14 @@ export interface CommandPreset {
     command: string;
     mode?: ExecutionMode;
 }
+export interface StructuredChatPersonaRoleConfig {
+    name?: string;
+    avatar?: string;
+}
+export interface StructuredChatPersonaConfig {
+    user?: StructuredChatPersonaRoleConfig;
+    assistant?: StructuredChatPersonaRoleConfig;
+}
 export interface WandConfig {
     host: string;
     port: number;
@@ -50,6 +58,7 @@ export interface WandConfig {
     startupCommands: string[];
     allowedCommandPrefixes: string[];
     commandPresets: CommandPreset[];
+    structuredChatPersona?: StructuredChatPersonaConfig;
     /** Max total size (bytes) for shortcut interaction logs per session (default: 10 MB). Set 0 to disable logging. */
     shortcutLogMaxBytes?: number;
     /** Preferred response language for Claude (e.g. "中文", "English"). Empty string means no override. */

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,
@@ -1996,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);
           });
@@ -3680,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) {
@@ -3819,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);
@@ -3831,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() {
@@ -3939,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" });
@@ -3960,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; }
@@ -5023,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");
@@ -5093,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();
@@ -5253,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();
         }
 
@@ -5264,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
@@ -5277,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);
@@ -5299,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;
         });
       }
 
@@ -5318,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 历史会话，将在你下次发送消息时自动恢复。";
@@ -5399,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();
           });
         });
@@ -7413,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') {
@@ -7472,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);
@@ -7507,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();
             }
@@ -7527,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;
           }
@@ -7626,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);
+                  }
                 }
               }
             }
@@ -7897,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);
@@ -8378,17 +8745,6 @@
 
       }
 
-      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) {
@@ -8962,13 +9318,51 @@
         };
       })();
 
+      var DEFAULT_CHAT_PERSONA = {
+        user: {
+          name: "赛博虎妞",
+          avatarSvg: PIXEL_AVATAR.user
+        },
+        assistant: {
+          name: "勤劳初二",
+          avatarSvg: PIXEL_AVATAR.assistant
+        }
+      };
+
+      function getStructuredChatPersona(role) {
+        var configPersona = state.config && state.config.structuredChatPersona;
+        var roleConfig = configPersona && configPersona[role] ? configPersona[role] : null;
+        var defaults = DEFAULT_CHAT_PERSONA[role] || DEFAULT_CHAT_PERSONA.assistant;
+        return {
+          name: roleConfig && typeof roleConfig.name === "string" && roleConfig.name.trim()
+            ? roleConfig.name.trim()
+            : defaults.name,
+          avatar: roleConfig && typeof roleConfig.avatar === "string" && roleConfig.avatar.trim()
+            ? roleConfig.avatar.trim()
+            : null,
+          avatarSvg: defaults.avatarSvg
+        };
+      }
+
+      function renderAvatarFallback(svg) {
+        return '<div class="pixel-avatar">' + svg + '</div>';
+      }
+
+      function handleChatAvatarImageError(img, role) {
+        if (!img || !img.parentNode) return;
+        var persona = getStructuredChatPersona(role === "user" ? "user" : "assistant");
+        img.outerHTML = renderAvatarFallback(persona.avatarSvg);
+      }
+
       function chatAvatar(role) {
-        var isUser = role === "user";
-        var svg = isUser ? PIXEL_AVATAR.user : PIXEL_AVATAR.assistant;
-        var name = isUser ? "赛博虎妞" : "勤劳初二";
+        var personaRole = role === "user" ? "user" : "assistant";
+        var persona = getStructuredChatPersona(personaRole);
+        var avatarInner = persona.avatar
+          ? '<img class="pixel-avatar-image" src="' + escapeHtml(persona.avatar) + '" alt="' + escapeHtml(persona.name) + '" onerror="handleChatAvatarImageError(this, ' + JSON.stringify(personaRole) + ')" />'
+          : renderAvatarFallback(persona.avatarSvg);
         return '<div class="chat-message-avatar ' + role + '">' +
-          '<div class="pixel-avatar">' + svg + '</div>' +
-          '<span class="avatar-name">' + name + '</span>' +
+          avatarInner +
+          '<span class="avatar-name">' + escapeHtml(persona.name) + '</span>' +
         '</div>';
       }
 
@@ -9147,6 +9541,9 @@
         var role = msg.role;
         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") {
             return '<div class="chat-message ' + role + '">' +
@@ -9182,10 +9579,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>';
       }
@@ -9509,27 +9908,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

@@ -2328,6 +2328,13 @@
       box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
     }
 
+    .pixel-avatar-image {
+      display: block;
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
     .pixel-avatar-svg {
       display: block;
       width: 100%;
@@ -2766,6 +2773,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;
@@ -3770,6 +3783,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);
@@ -7750,4 +7779,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.6.0",
+  "version": "1.6.2",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {