@co0ontty/wand 4.16.1 → 4.16.2-beta.gec15519

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "dad851eedfbbc47efb1c7e4589484402dd59271d",
-  "builtAt": "2026-07-18T10:24:17.669Z",
-  "version": "4.16.1",
-  "channel": "stable"
+  "commit": "ec1551937e1195d7d3a02f421e76660799daa6d6",
+  "builtAt": "2026-07-18T12:12:46.898Z",
+  "version": "4.16.2-beta.gec15519",
+  "channel": "beta"
 }

package/dist/claude-skills.d.ts

@@ -0,0 +1,6 @@
+export interface ClaudeSkillSummary {
+    name: string;
+    description: string;
+    source: "user" | "project";
+}
+export declare function listClaudeSkills(cwd: string): ClaudeSkillSummary[];

package/dist/claude-skills.js

@@ -0,0 +1,53 @@
+import { existsSync, readFileSync, readdirSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+function parseFrontmatter(source) {
+    if (!source.startsWith("---"))
+        return {};
+    const end = source.indexOf("\n---", 3);
+    if (end === -1)
+        return {};
+    const frontmatter = source.slice(3, end);
+    const name = frontmatter.match(/^name:\s*(.+?)\s*$/m)?.[1]?.trim().replace(/^['"]|['"]$/g, "");
+    const description = frontmatter.match(/^description:\s*(.+?)\s*$/m)?.[1]?.trim().replace(/^['"]|['"]$/g, "");
+    return { name, description };
+}
+function readSkills(directory, source) {
+    if (!existsSync(directory))
+        return [];
+    let entries;
+    try {
+        entries = readdirSync(directory, { withFileTypes: true, encoding: "utf8" });
+    }
+    catch {
+        return [];
+    }
+    return entries.flatMap((entry) => {
+        if (!entry.isDirectory())
+            return [];
+        const skillFile = path.join(directory, entry.name, "SKILL.md");
+        if (!existsSync(skillFile))
+            return [];
+        try {
+            const metadata = parseFrontmatter(readFileSync(skillFile, "utf8"));
+            return [{
+                    name: metadata.name || entry.name,
+                    description: metadata.description || "",
+                    source,
+                }];
+        }
+        catch {
+            return [];
+        }
+    });
+}
+export function listClaudeSkills(cwd) {
+    const byName = new Map();
+    for (const skill of [
+        ...readSkills(path.join(os.homedir(), ".claude", "skills"), "user"),
+        ...readSkills(path.join(cwd, ".claude", "skills"), "project"),
+    ]) {
+        byName.set(skill.name, skill);
+    }
+    return Array.from(byName.values()).sort((a, b) => a.name.localeCompare(b.name));
+}

package/dist/server-session-routes.js

@@ -73,6 +73,24 @@ function getInputErrorResponse(error, sessionId) {
         },
     };
 }
+function parseClaudeSdkSkills(value) {
+    if (!Array.isArray(value)) {
+        throw new Error("skills 必须是数组。");
+    }
+    if (value.length > 50) {
+        throw new Error("最多选择 50 个 skills。");
+    }
+    const names = new Set();
+    for (const item of value) {
+        if (typeof item !== "string")
+            throw new Error("skills 只能包含字符串。");
+        const name = item.trim();
+        if (!name || name.length > 128)
+            throw new Error("skill 名称无效。");
+        names.add(name);
+    }
+    return Array.from(names);
+}
 function getInputDebugMeta(error) {
     if (error instanceof Error) {
         return { name: error.name, message: error.message, stack: error.stack };
@@ -497,7 +515,23 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
         const preserveQueue = !!req.body?.preserveQueue;
         const idempotencyKey = typeof req.body?.idempotencyKey === "string" ? req.body.idempotencyKey : undefined;
         try {
-            const snapshot = await structured.sendMessage(req.params.id, input, { interrupt, preserveQueue, idempotencyKey });
+            const session = structured.get(req.params.id);
+            if (!session) {
+                res.status(404).json({ error: "未找到该结构化会话。" });
+                return;
+            }
+            const hasSkills = Object.prototype.hasOwnProperty.call(req.body ?? {}, "skills");
+            if (hasSkills && (session.provider !== "claude" || session.runner !== "claude-sdk")) {
+                res.status(400).json({ error: "skills 仅支持 Claude SDK 结构化会话。" });
+                return;
+            }
+            const skills = hasSkills ? parseClaudeSdkSkills(req.body.skills) : [];
+            const snapshot = await structured.sendMessage(req.params.id, input, {
+                interrupt,
+                preserveQueue,
+                idempotencyKey,
+                skills,
+            });
             res.json(sessionResponseDTO(snapshot));
         }
         catch (error) {

package/dist/server.js

@@ -12,6 +12,7 @@ import process from "node:process";
 import { WebSocketServer } from "ws";
 import { AuthService, BROWSER_ADMIN_PRINCIPAL, CONNECTED_APP_PRINCIPAL, principalHasScope, readSessionCookie, SESSION_COOKIE_HTTP, SESSION_COOKIE_HTTPS, SESSION_COOKIE_LEGACY, } from "./auth.js";
 import { ensureCertificates } from "./cert.js";
+import { listClaudeSkills } from "./claude-skills.js";
 import { getDefaultModelForProvider, getProviderDefaultModels, isExecutionMode, resolveConfigDir, } from "./config.js";
 import { refreshModels } from "./models.js";
 import { ProcessManager } from "./process-manager.js";
@@ -22,6 +23,7 @@ import { recordRecentPath, registerFileRoutes } from "./server-file-routes.js";
 import { registerSettingsRoutes } from "./server-settings-routes.js";
 import { refreshProviderCliUpdateState, registerAdminUpdateRoutes, registerPublicUpdateRoutes, ServerUpdateState, } from "./server-update-routes.js";
 import { parseSessionCreationOrigin, registerClaudeHistoryRoutes, registerSessionRoutes } from "./server-session-routes.js";
+import { resolveSessionCwd } from "./session-cwd.js";
 import { getErrorMessage } from "./error-utils.js";
 import { asyncRoute, jsonErrorHandler } from "./express-async.js";
 import { checkPackageUpdateAsync, installPackageGloballyAsync, normalizeUpdateChannel, resolveGlobalWandCli, } from "./npm-update-utils.js";
@@ -688,6 +690,7 @@ export async function startServer(config, configPath, options = {}) {
         "/api/sessions",
         "/api/structured-sessions",
         "/api/commands",
+        "/api/claude-skills",
         "/api/claude-history",
         "/api/codex-history",
         "/api/claude-sessions",
@@ -747,6 +750,15 @@ export async function startServer(config, configPath, options = {}) {
         });
     }));
     // ── Browser extension password vault endpoints ──
+    app.get("/api/claude-skills", (req, res) => {
+        try {
+            const cwd = resolveSessionCwd(typeof req.query.cwd === "string" ? req.query.cwd : undefined, config.defaultCwd);
+            res.json({ skills: listClaudeSkills(cwd) });
+        }
+        catch (error) {
+            res.status(400).json({ error: getErrorMessage(error, "无法读取 skills。") });
+        }
+    });
     app.get("/api/browser-extension/status", (_req, res) => {
         res.json({
             ok: true,

package/dist/storage.js

@@ -168,6 +168,17 @@ function parseQueuedMessages(raw) {
     const parsed = safeJsonParse(raw);
     return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : undefined;
 }
+function parseQueuedMessageSkills(raw, queueLength) {
+    const parsed = safeJsonParse(raw);
+    if (!Array.isArray(parsed))
+        return undefined;
+    return Array.from({ length: queueLength }, (_, index) => {
+        const skills = parsed[index];
+        return Array.isArray(skills)
+            ? skills.filter((skill) => typeof skill === "string")
+            : [];
+    });
+}
 function inferSessionProvider(row) {
     if (row.provider === "claude" || row.provider === "codex" || row.provider === "opencode" || row.provider === "grok" || row.provider === "qoder") {
         return row.provider;
@@ -227,12 +238,12 @@ function mapWorktreeMergeFields(row) {
     };
 }
 function sessionSelectFields() {
-    return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
+    return `id, session_source, automation_id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, queued_message_skills, structured_state
              , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options`;
 }
 function sessionPersistFields() {
     return `id, session_source, automation_id, command, cwd, mode, status, exit_code, started_at, ended_at, output
-             , archived, archived_at, claude_session_id, provider, session_kind, runner, messages, queued_messages, structured_state
+             , archived, archived_at, claude_session_id, provider, session_kind, runner, messages, queued_messages, queued_message_skills, structured_state
              , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info, title, description, session_options`;
 }
 function sessionPersistAssignments() {
@@ -254,6 +265,7 @@ function sessionPersistAssignments() {
              runner = excluded.runner,
              messages = excluded.messages,
              queued_messages = excluded.queued_messages,
+             queued_message_skills = excluded.queued_message_skills,
              structured_state = excluded.structured_state,
              resumed_from_session_id = excluded.resumed_from_session_id,
              auto_recovered = excluded.auto_recovered,
@@ -270,7 +282,7 @@ function sessionRuntimeMetadataAssignments() {
            command = ?, cwd = ?, mode = ?, status = ?, exit_code = ?,
            started_at = ?, ended_at = ?,
            archived = ?, archived_at = ?, claude_session_id = ?,
-           provider = ?, session_kind = ?, runner = ?, queued_messages = ?, structured_state = ?,
+           provider = ?, session_kind = ?, runner = ?, queued_messages = ?, queued_message_skills = ?, structured_state = ?,
            resumed_from_session_id = ?, auto_recovered = ?,
            worktree_enabled = ?, worktree_info = ?, worktree_merge_status = ?, worktree_merge_info = ?,
            title = ?, description = ?, session_options = ?`;
@@ -296,6 +308,7 @@ function sessionPersistValues(snapshot) {
         snapshot.runner ?? null,
         snapshot.messages ? JSON.stringify(snapshot.messages) : null,
         snapshot.queuedMessages ? JSON.stringify(snapshot.queuedMessages) : null,
+        snapshot.queuedMessageSkills ? JSON.stringify(snapshot.queuedMessageSkills) : null,
         snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null,
         snapshot.resumedFromSessionId ?? null,
         snapshot.autoRecovered ? 1 : 0,
@@ -326,6 +339,7 @@ function sessionRuntimeMetadataValues(snapshot) {
         snapshot.sessionKind ?? "pty",
         snapshot.runner ?? null,
         snapshot.queuedMessages ? JSON.stringify(snapshot.queuedMessages) : null,
+        snapshot.queuedMessageSkills ? JSON.stringify(snapshot.queuedMessageSkills) : null,
         snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null,
         snapshot.resumedFromSessionId ?? null,
         snapshot.autoRecovered ? 1 : 0,
@@ -342,6 +356,7 @@ function sessionRuntimeMetadataValues(snapshot) {
 function mapSessionCore(row) {
     const provider = inferSessionProvider(row);
     const sessionOptions = parseSessionOptions(row.session_options);
+    const queuedMessages = parseQueuedMessages(row.queued_messages);
     return {
         id: row.id,
         sessionSource: normalizeSessionSource(row.session_source),
@@ -361,7 +376,8 @@ function mapSessionCore(row) {
         archivedAt: row.archived_at,
         claudeSessionId: row.claude_session_id,
         messages: safeJsonParse(row.messages),
-        queuedMessages: parseQueuedMessages(row.queued_messages),
+        queuedMessages,
+        queuedMessageSkills: parseQueuedMessageSkills(row.queued_message_skills, queuedMessages?.length ?? 0),
         structuredState: safeJsonParse(row.structured_state),
         resumedFromSessionId: row.resumed_from_session_id ?? undefined,
         autoRecovered: Boolean(row.auto_recovered),
@@ -411,6 +427,7 @@ const INIT_SQL = `
     runner TEXT,
     messages TEXT,
     queued_messages TEXT,
+    queued_message_skills TEXT,
     structured_state TEXT,
     resumed_from_session_id TEXT,
     resumed_to_session_id TEXT,
@@ -730,7 +747,7 @@ export class WandStorage {
         this.db
             .prepare(`INSERT INTO command_sessions (
          ${sessionPersistFields()}
-         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
          ON CONFLICT(id) DO UPDATE SET
            ${sessionPersistAssignments()}`)
             .run(...sessionPersistValues(snapshot));
@@ -841,6 +858,7 @@ const SCHEMA_MIGRATIONS = [
     ["runner", "ALTER TABLE command_sessions ADD COLUMN runner TEXT"],
     ["messages", "ALTER TABLE command_sessions ADD COLUMN messages TEXT"],
     ["queued_messages", "ALTER TABLE command_sessions ADD COLUMN queued_messages TEXT"],
+    ["queued_message_skills", "ALTER TABLE command_sessions ADD COLUMN queued_message_skills TEXT"],
     ["structured_state", "ALTER TABLE command_sessions ADD COLUMN structured_state TEXT"],
     ["resumed_from_session_id", "ALTER TABLE command_sessions ADD COLUMN resumed_from_session_id TEXT"],
     ["resumed_to_session_id", "ALTER TABLE command_sessions ADD COLUMN resumed_to_session_id TEXT"],

package/dist/structured-session-manager.d.ts

@@ -56,6 +56,7 @@ export declare class StructuredSessionManager {
      */
     private readonly pendingSdkQueries;
     private readonly interruptedWith;
+    private readonly interruptedSkills;
     /**
      * Sessions where the current interrupt is a "queue promote" (用户从排队条点了「立即」
      * 把队首插队到 now)。退出处理三个分支默认会把 queuedMessages 清空——因为常规的
@@ -118,6 +119,7 @@ export declare class StructuredSessionManager {
         idempotencyKey?: string;
         preserveQueue?: boolean;
         queueAlreadyRemoved?: boolean;
+        skills?: string[];
     }): Promise<SessionSnapshot>;
     /**
      * Reorder the pending queued messages. `order` is a permutation of the current
@@ -200,6 +202,7 @@ export declare class StructuredSessionManager {
     private compactContentBlocks;
     private buildCompletedAssistantMessages;
     private resolveQueuedMessagesAfterInterrupt;
+    private resolveQueuedMessageSkillsAfterInterrupt;
     private normalizeToolResultContent;
     /**
      * 组装结构化 runner 退出失败时的可读错误字符串。

package/dist/structured-session-manager.js

@@ -97,6 +97,7 @@ function buildStructuredOutputPayload(snapshot) {
         output: snapshot.output,
         messages: snapshot.messages ? enrichStructuredMessages(snapshot.messages) : undefined,
         queuedMessages: snapshot.queuedMessages,
+        queuedMessageSkills: snapshot.queuedMessageSkills,
         sessionKind: "structured",
         structuredState: snapshot.structuredState,
         title: snapshot.title,
@@ -156,6 +157,7 @@ function buildIncrementalStructuredPayload(snapshot, cardDefaults) {
         wandProtocolVersion: WAND_PROTOCOL_VERSION,
         incremental: true,
         queuedMessages: snapshot.queuedMessages,
+        queuedMessageSkills: snapshot.queuedMessageSkills,
         sessionKind: "structured",
         structuredState: snapshot.structuredState,
         lastMessage,
@@ -177,6 +179,7 @@ export class StructuredSessionManager {
      */
     pendingSdkQueries = new Map();
     interruptedWith = new Map();
+    interruptedSkills = new Map();
     /**
      * Sessions where the current interrupt is a "queue promote" (用户从排队条点了「立即」
      * 把队首插队到 now)。退出处理三个分支默认会把 queuedMessages 清空——因为常规的
@@ -242,6 +245,7 @@ export class StructuredSessionManager {
                 autoApprovePermissions: snapshot.autoApprovePermissions ?? shouldAutoApproveForMode(snapshot.mode),
                 approvalStats: snapshot.approvalStats ?? { tool: 0, command: 0, file: 0, total: 0 },
                 queuedMessages: snapshot.queuedMessages ?? [],
+                queuedMessageSkills: (snapshot.queuedMessages ?? []).map((_, index) => snapshot.queuedMessageSkills?.[index] ?? []),
                 pendingEscalation: null,
                 permissionBlocked: false,
                 structuredState: {
@@ -343,6 +347,7 @@ export class StructuredSessionManager {
         this.pendingSdkQueries.clear();
         this.pendingSdkAbort.clear();
         this.interruptedWith.clear();
+        this.interruptedSkills.clear();
         this.preserveQueueOnInterrupt.clear();
         for (const timer of this.streamCheckpointTimers.values())
             clearTimeout(timer);
@@ -590,6 +595,7 @@ export class StructuredSessionManager {
         const prompt = input.trim();
         if (!prompt)
             return session;
+        const skills = opts?.skills ?? [];
         if (opts?.idempotencyKey) {
             const mapKey = `${id}:${opts.idempotencyKey}`;
             if (this.seenIdempotencyKeys.has(mapKey)) {
@@ -636,6 +642,7 @@ export class StructuredSessionManager {
             }
             else if (opts?.interrupt) {
                 this.interruptedWith.set(id, prompt);
+                this.interruptedSkills.set(id, skills);
                 if (opts.preserveQueue) {
                     this.preserveQueueOnInterrupt.add(id);
                     // 「立即发送」排队条某一条：interrupt 把它作为新输入重发，但该条仍留在
@@ -648,7 +655,12 @@ export class StructuredSessionManager {
                         const removeAt = queue.indexOf(prompt);
                         if (removeAt !== -1) {
                             const trimmedQueue = queue.slice(0, removeAt).concat(queue.slice(removeAt + 1));
-                            session = { ...session, queuedMessages: trimmedQueue };
+                            const queuedMessageSkills = session.queuedMessageSkills ?? [];
+                            session = {
+                                ...session,
+                                queuedMessages: trimmedQueue,
+                                queuedMessageSkills: queuedMessageSkills.slice(0, removeAt).concat(queuedMessageSkills.slice(removeAt + 1)),
+                            };
                             this.sessions.set(id, session);
                             this.storage.updateSessionRuntimeMetadata(session);
                             this.emitStructuredSnapshot(session);
@@ -679,6 +691,7 @@ export class StructuredSessionManager {
                 const queued = {
                     ...session,
                     queuedMessages: [...queue, prompt],
+                    queuedMessageSkills: [...queue.map((_, index) => session.queuedMessageSkills?.[index] ?? []), skills],
                 };
                 this.sessions.set(id, queued);
                 this.storage.updateSessionRuntimeMetadata(queued);
@@ -763,7 +776,7 @@ export class StructuredSessionManager {
                 });
             }
             else if (runner === "claude-sdk") {
-                await this.runClaudeSdkStreaming(id, updated, prompt, requestId);
+                await this.runClaudeSdkStreaming(id, updated, prompt, requestId, skills);
             }
             else {
                 await this.runClaudeStreaming(id, updated, cliClaudePrompt, requestId);
@@ -831,7 +844,11 @@ export class StructuredSessionManager {
             seen.add(idx);
         }
         const reordered = order.map((idx) => queue[idx]);
-        const updated = { ...session, queuedMessages: reordered };
+        const updated = {
+            ...session,
+            queuedMessages: reordered,
+            queuedMessageSkills: order.map((idx) => (session.queuedMessageSkills ?? [])[idx] ?? []),
+        };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
         this.emitStructuredSnapshot(updated);
@@ -845,7 +862,12 @@ export class StructuredSessionManager {
             throw new Error("队列中没有该条消息（可能已被处理）。");
         }
         const next = queue.slice(0, index).concat(queue.slice(index + 1));
-        const updated = { ...session, queuedMessages: next };
+        const skills = session.queuedMessageSkills ?? [];
+        const updated = {
+            ...session,
+            queuedMessages: next,
+            queuedMessageSkills: skills.slice(0, index).concat(skills.slice(index + 1)),
+        };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
         this.emitStructuredSnapshot(updated);
@@ -869,9 +891,16 @@ export class StructuredSessionManager {
             throw new Error("排队消息已变化，请按最新顺序重试。");
         }
         const prompt = queue[index];
+        const skills = (session.queuedMessageSkills ?? [])[index] ?? [];
         const remaining = queue.slice(0, index).concat(queue.slice(index + 1));
+        const remainingSkills = (session.queuedMessageSkills ?? []).slice(0, index)
+            .concat((session.queuedMessageSkills ?? []).slice(index + 1));
         const inFlight = session.status === "running" && session.structuredState?.inFlight === true;
-        const updated = { ...session, queuedMessages: remaining };
+        const updated = {
+            ...session,
+            queuedMessages: remaining,
+            queuedMessageSkills: remainingSkills,
+        };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
         this.emitStructuredSnapshot(updated);
@@ -881,6 +910,7 @@ export class StructuredSessionManager {
                 preserveQueue: inFlight,
                 queueAlreadyRemoved: true,
                 idempotencyKey,
+                skills,
             });
         }
         catch {
@@ -895,7 +925,7 @@ export class StructuredSessionManager {
         if (!session.queuedMessages || session.queuedMessages.length === 0) {
             return session;
         }
-        const updated = { ...session, queuedMessages: [] };
+        const updated = { ...session, queuedMessages: [], queuedMessageSkills: [] };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
         this.emitStructuredSnapshot(updated);
@@ -1015,6 +1045,7 @@ export class StructuredSessionManager {
     stop(id) {
         const session = this.requireSession(id);
         this.interruptedWith.delete(id);
+        this.interruptedSkills.delete(id);
         this.preserveQueueOnInterrupt.delete(id);
         // Clearing activeRequestId is the generation barrier: late data/close callbacks
         // from the cancelled runner can no longer mutate this session or a replacement turn.
@@ -1078,6 +1109,7 @@ export class StructuredSessionManager {
         }
         this.clearStreamingCheckpoint(id);
         this.interruptedWith.delete(id);
+        this.interruptedSkills.delete(id);
         this.preserveQueueOnInterrupt.delete(id);
         this.storage.deleteSession(id);
         this.logger?.deleteSession(id);
@@ -1150,15 +1182,17 @@ export class StructuredSessionManager {
         if (!nextInput) {
             return;
         }
+        const [nextSkills = [], ...restSkills] = current.queuedMessageSkills ?? [];
         const nextSession = {
             ...current,
             queuedMessages: restQueue,
+            queuedMessageSkills: restSkills,
         };
         this.sessions.set(sessionId, nextSession);
         this.storage.updateSessionRuntimeMetadata(nextSession);
         this.emitStructuredSnapshot(nextSession);
         try {
-            await this.sendMessage(sessionId, nextInput);
+            await this.sendMessage(sessionId, nextInput, { skills: nextSkills });
         }
         catch (error) {
             console.error("[WAND] flushNextQueuedMessage failed:", error);
@@ -1168,6 +1202,7 @@ export class StructuredSessionManager {
                 const rescued = {
                     ...afterFail,
                     queuedMessages: [nextInput, ...(afterFail.queuedMessages ?? [])],
+                    queuedMessageSkills: [nextSkills, ...(afterFail.queuedMessageSkills ?? [])],
                 };
                 this.sessions.set(sessionId, rescued);
                 this.storage.updateSessionRuntimeMetadata(rescued);
@@ -1327,6 +1362,7 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
+            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -1343,10 +1379,12 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
+            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
+            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
+                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
                     console.error("[WAND] codex interrupt-and-send failed:", error);
                 });
             });
@@ -1473,6 +1511,7 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
+            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -1489,9 +1528,11 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
+            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
+            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
-            setImmediate(() => this.sendMessage(sessionId, interruptPrompt).catch((error) => {
+            setImmediate(() => this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
                 console.error("[WAND] grok interrupt-and-send failed:", error);
             }));
             return;
@@ -1625,6 +1666,7 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
+            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -1641,10 +1683,12 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
+            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
+            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
+                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
                     console.error("[WAND] opencode interrupt-and-send failed:", error);
                 });
             });
@@ -1805,6 +1849,7 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
+            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -1821,10 +1866,12 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
+            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
+            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
+                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
                     console.error("[WAND] interrupt-and-send failed:", error);
                 });
             });
@@ -1860,7 +1907,7 @@ export class StructuredSessionManager {
      * payloads for incremental text/thinking/tool_use updates, followed by a final
      * SDKAssistantMessage with the authoritative complete content.
      */
-    async runClaudeSdkStreaming(sessionId, session, prompt, requestId) {
+    async runClaudeSdkStreaming(sessionId, session, prompt, requestId, skills) {
         const abortController = new AbortController();
         this.pendingSdkAbort.set(sessionId, abortController);
         const isManaged = session.mode === "managed";
@@ -1881,6 +1928,7 @@ export class StructuredSessionManager {
             ...(permPolicy.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}),
             ...(permPolicy.allowedTools ? { allowedTools: permPolicy.allowedTools } : {}),
             ...(isManaged ? { disallowedTools: ["AskUserQuestion"] } : {}),
+            skills,
             thinking: sdkThinking,
             includePartialMessages: true,
             // 把子 agent 的 text/thinking 也转发回来，UI 才能把"被 Task 召唤来的协作者"
@@ -2284,6 +2332,7 @@ export class StructuredSessionManager {
             claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
             messages: msgs,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
+            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -2300,11 +2349,13 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
+            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
+            this.interruptedSkills.delete(sessionId);
             // 与 codex/cli runner 对齐：清掉"保留队列"标记，避免 stale flag 影响下一次普通 interrupt。
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt).catch((err) => {
+                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((err) => {
                     console.error("[WAND] sdk interrupt-and-send failed:", err);
                 });
             });
@@ -2380,6 +2431,12 @@ export class StructuredSessionManager {
             return [];
         return current.queuedMessages;
     }
+    resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt) {
+        if (interruptPrompt && !this.preserveQueueOnInterrupt.has(sessionId))
+            return [];
+        const queue = current.queuedMessages ?? [];
+        return queue.map((_, index) => current.queuedMessageSkills?.[index] ?? []);
+    }
     normalizeToolResultContent(content) {
         return normalizeStructuredToolResultContent(content);
     }

package/dist/types.d.ts

@@ -514,6 +514,8 @@ export interface SessionSnapshot {
     messages?: ConversationTurn[];
     /** Pending structured user inputs queued while an assistant response is in flight. */
     queuedMessages?: string[];
+    /** Per-message Claude Agent SDK skill allowlists aligned with queuedMessages. */
+    queuedMessageSkills?: string[][];
     structuredState?: StructuredSessionState;
     /** 此会话是从哪个 Wand 会话恢复而来 */
     resumedFromSessionId?: string | null;