skill-creator 2.0.2 → 2.1.0

package/dist/daemon.js

@@ -1783,28 +1783,28 @@ var init_create_prompt_CIJV_96B = __esm({
         b = b > 0.04045 ? ((b + 0.055) / 1.055) ** 2.4 : b / 12.92;
         const x = r * 0.4124 + g * 0.3576 + b * 0.1805;
         const y = r * 0.2126 + g * 0.7152 + b * 0.0722;
-        const z25 = r * 0.0193 + g * 0.1192 + b * 0.9505;
+        const z27 = r * 0.0193 + g * 0.1192 + b * 0.9505;
         return [
           x * 100,
           y * 100,
-          z25 * 100
+          z27 * 100
         ];
       };
       convert$1.rgb.lab = function(rgb) {
         const xyz = convert$1.rgb.xyz(rgb);
         let x = xyz[0];
         let y = xyz[1];
-        let z25 = xyz[2];
+        let z27 = xyz[2];
         x /= 95.047;
         y /= 100;
-        z25 /= 108.883;
+        z27 /= 108.883;
         x = x > 8856e-6 ? x ** (1 / 3) : 7.787 * x + 16 / 116;
         y = y > 8856e-6 ? y ** (1 / 3) : 7.787 * y + 16 / 116;
-        z25 = z25 > 8856e-6 ? z25 ** (1 / 3) : 7.787 * z25 + 16 / 116;
+        z27 = z27 > 8856e-6 ? z27 ** (1 / 3) : 7.787 * z27 + 16 / 116;
         return [
           116 * y - 16,
           500 * (x - y),
-          200 * (y - z25)
+          200 * (y - z27)
         ];
       };
       convert$1.hsl.rgb = function(hsl) {
@@ -2001,13 +2001,13 @@ var init_create_prompt_CIJV_96B = __esm({
       convert$1.xyz.rgb = function(xyz) {
         const x = xyz[0] / 100;
         const y = xyz[1] / 100;
-        const z25 = xyz[2] / 100;
+        const z27 = xyz[2] / 100;
         let r;
         let g;
         let b;
-        r = x * 3.2406 + y * -1.5372 + z25 * -0.4986;
-        g = x * -0.9689 + y * 1.8758 + z25 * 0.0415;
-        b = x * 0.0557 + y * -0.204 + z25 * 1.057;
+        r = x * 3.2406 + y * -1.5372 + z27 * -0.4986;
+        g = x * -0.9689 + y * 1.8758 + z27 * 0.0415;
+        b = x * 0.0557 + y * -0.204 + z27 * 1.057;
         r = r > 31308e-7 ? 1.055 * r ** (1 / 2.4) - 0.055 : r * 12.92;
         g = g > 31308e-7 ? 1.055 * g ** (1 / 2.4) - 0.055 : g * 12.92;
         b = b > 31308e-7 ? 1.055 * b ** (1 / 2.4) - 0.055 : b * 12.92;
@@ -2023,17 +2023,17 @@ var init_create_prompt_CIJV_96B = __esm({
       convert$1.xyz.lab = function(xyz) {
         let x = xyz[0];
         let y = xyz[1];
-        let z25 = xyz[2];
+        let z27 = xyz[2];
         x /= 95.047;
         y /= 100;
-        z25 /= 108.883;
+        z27 /= 108.883;
         x = x > 8856e-6 ? x ** (1 / 3) : 7.787 * x + 16 / 116;
         y = y > 8856e-6 ? y ** (1 / 3) : 7.787 * y + 16 / 116;
-        z25 = z25 > 8856e-6 ? z25 ** (1 / 3) : 7.787 * z25 + 16 / 116;
+        z27 = z27 > 8856e-6 ? z27 ** (1 / 3) : 7.787 * z27 + 16 / 116;
         return [
           116 * y - 16,
           500 * (x - y),
-          200 * (y - z25)
+          200 * (y - z27)
         ];
       };
       convert$1.lab.xyz = function(lab) {
@@ -2042,23 +2042,23 @@ var init_create_prompt_CIJV_96B = __esm({
         const b = lab[2];
         let x;
         let y;
-        let z25;
+        let z27;
         y = (l + 16) / 116;
         x = a / 500 + y;
-        z25 = y - b / 200;
+        z27 = y - b / 200;
         const y2 = y ** 3;
         const x2 = x ** 3;
-        const z26 = z25 ** 3;
+        const z28 = z27 ** 3;
         y = y2 > 8856e-6 ? y2 : (y - 16 / 116) / 7.787;
         x = x2 > 8856e-6 ? x2 : (x - 16 / 116) / 7.787;
-        z25 = z26 > 8856e-6 ? z26 : (z25 - 16 / 116) / 7.787;
+        z27 = z28 > 8856e-6 ? z28 : (z27 - 16 / 116) / 7.787;
         x *= 95.047;
         y *= 100;
-        z25 *= 108.883;
+        z27 *= 108.883;
         return [
           x,
           y,
-          z25
+          z27
         ];
       };
       convert$1.lab.lch = function(lab) {
@@ -36840,6 +36840,154 @@ var init_dsh_profile_support = __esm({
   }
 });
 
+// src/shared/contracts/agent-roles.ts
+function agentRoleToolName(slug) {
+  return `${AGENT_ROLE_TOOL_PREFIX}${slug}`;
+}
+function mcpCapabilityToolName(capabilityBase, authority) {
+  return `mcp__skill-creator__${capabilityBase}${authority === "mutation" ? "_propose" : ""}`;
+}
+var AGENT_ROLE_PROMPT_VERSION, AGENT_ROLE_TOOL_PREFIX, AGENT_ROLES, AGENT_MODE_ROLES;
+var init_agent_roles = __esm({
+  "src/shared/contracts/agent-roles.ts"() {
+    "use strict";
+    AGENT_ROLE_PROMPT_VERSION = "1";
+    AGENT_ROLE_TOOL_PREFIX = "role_";
+    AGENT_ROLES = {
+      reviewer: {
+        name: "Reviewer",
+        description: "Reads local skills and reports concrete improvement findings (read-only).",
+        capabilities: [
+          { base: "workspace_list", authority: "readonly" },
+          { base: "skills_list", authority: "readonly" },
+          { base: "skills_info", authority: "readonly" },
+          { base: "skills_validate", authority: "readonly" },
+          { base: "creator_load", authority: "readonly" }
+        ]
+      },
+      researcher: {
+        name: "Researcher",
+        description: "Scans Git skill sources and analyzes fit against requirements (read-only).",
+        capabilities: [
+          { base: "workspace_list", authority: "readonly" },
+          { base: "skills_list", authority: "readonly" },
+          { base: "skills_info", authority: "readonly" },
+          { base: "skills_validate", authority: "readonly" },
+          { base: "repository_scan", authority: "readonly" },
+          { base: "repository_sources_list", authority: "readonly" }
+        ]
+      },
+      writer: {
+        name: "Writer",
+        description: "Drafts and edits SKILL.md content; every mutation lands as a proposal for human approval.",
+        capabilities: [
+          { base: "workspace_list", authority: "readonly" },
+          { base: "skills_list", authority: "readonly" },
+          { base: "skills_info", authority: "readonly" },
+          { base: "skills_validate", authority: "readonly" },
+          { base: "creator_load", authority: "readonly" },
+          { base: "creator_revisions", authority: "readonly" },
+          { base: "creator_save", authority: "mutation" },
+          { base: "creator_remove", authority: "mutation" }
+        ]
+      }
+    };
+    AGENT_MODE_ROLES = {
+      create: ["reviewer", "writer"],
+      manage: ["reviewer", "writer"],
+      explore: ["researcher", "reviewer"],
+      free: ["reviewer", "researcher", "writer"]
+    };
+  }
+});
+
+// src/daemon/kernel/agent-roles.ts
+function agentRoleRowsYaml() {
+  const lines = [];
+  for (const slug of Object.keys(AGENT_ROLES)) {
+    const role = AGENT_ROLES[slug];
+    lines.push(
+      `- id: tool-role-${slug}`,
+      "  name: '@deepseek-ai/dsh-tool-subagent'",
+      "  config:",
+      "    provider: spawn",
+      `    toolName: ${agentRoleToolName(slug)}`,
+      "    backgroundMode: continuable",
+      "    maxDepth: 1",
+      "    persona: |-"
+    );
+    for (const personaLine of AGENT_ROLE_PERSONAS[slug].split("\n")) {
+      lines.push(`      ${personaLine}`);
+    }
+    lines.push("    toolFilter:", "      deny:");
+    for (const denied2 of ROLE_TOOL_DENY) lines.push(`        - ${denied2}`);
+    lines.push("      allow:");
+    for (const capability of role.capabilities) {
+      lines.push(`        - ${mcpCapabilityToolName(capability.base, capability.authority)}`);
+    }
+    lines.push("");
+  }
+  return lines.join("\n");
+}
+var ROLE_TOOL_DENY, REVIEWER_PERSONA, RESEARCHER_PERSONA, WRITER_PERSONA, AGENT_ROLE_PERSONAS;
+var init_agent_roles2 = __esm({
+  "src/daemon/kernel/agent-roles.ts"() {
+    "use strict";
+    init_agent_roles();
+    ROLE_TOOL_DENY = ["ask_user_question"];
+    REVIEWER_PERSONA = `# Role: Reviewer (v${AGENT_ROLE_PROMPT_VERSION})
+
+You review local skills and report concrete, actionable findings. You read through
+the skill-creator capability face (skills_list, skills_info, skills_validate,
+creator_load) and judge trigger contracts, scope discipline, and structure.
+
+## Review law
+- Findings must cite the exact skill and the exact defect: vague advice is a failure.
+- Weigh the frontmatter description as the trigger contract: does it say what the
+  skill does and when to use it, in the third person, optimized for retrieval?
+- Flag progressive-disclosure violations (kitchen-sink SKILL.md), secrets, and
+  machine-specific absolute paths.
+- You propose nothing and write nothing: report findings; the parent decides.
+
+## Report shape
+Return a ranked findings list (severity, skill, defect, suggested fix). If the
+library is clean, say so explicitly instead of inventing issues.`;
+    RESEARCHER_PERSONA = `# Role: Researcher (v${AGENT_ROLE_PROMPT_VERSION})
+
+You scan Git skill sources (repository_scan, repository_sources_list) and analyze
+whether candidate skills fit the stated requirements. You compare against what is
+already installed (skills_list, skills_info) to avoid duplicates.
+
+## Research law
+- Turn the requirement into explicit criteria before scanning; state them back
+  in one line.
+- A skill that matches the letter but not the intent is a rejection; say which
+  criterion failed.
+- Red flags end a candidacy: secrets, machine-specific paths, vague triggers,
+  kitchen-sink scope.
+- You install nothing: shortlist with evidence and hand the decision back.`;
+    WRITER_PERSONA = `# Role: Writer (v${AGENT_ROLE_PROMPT_VERSION})
+
+You draft and edit SKILL.md content in imported workspaces. Reads go through
+skills_list / skills_info / creator_load; every mutation goes through the
+propose variants (creator_save / creator_remove) \u2014 a human approves each change
+in the Skill Creator UI before it touches disk.
+
+## Authoring law
+- The frontmatter description is the trigger contract: third person, what it does
+  and when to use it, optimized for retrieval.
+- Progressive disclosure: lean procedural SKILL.md; reference detail goes to
+  bundled files, not long prose.
+- Never claim a document is saved until its propose result says so.
+- Respect preferences the human states (language, style, structure).`;
+    AGENT_ROLE_PERSONAS = {
+      reviewer: REVIEWER_PERSONA,
+      researcher: RESEARCHER_PERSONA,
+      writer: WRITER_PERSONA
+    };
+  }
+});
+
 // src/daemon/kernel/dsh-kernel.ts
 var dsh_kernel_exports = {};
 __export(dsh_kernel_exports, {
@@ -36929,7 +37077,12 @@ async function bootDshKernel(options2) {
       "    includeShippedRoot: false\n",
       "- id: workspace\n",
       "  name: '@deepseek-ai/dsh-workspace'\n",
-      mcpRow
+      mcpRow,
+      // Roles（dsh-alpha-native-subagents task 2.3）：per-role 官方 tool-subagent
+      // 行。角色能力面全是 MCP capability 精确注册名——只在 MCP 桥在场时写入
+      // （无桥时 allow 名不存在，restrict 的实名校验会让 boot 失败；且角色无
+      // MCP 面本就无意义）。
+      ...options2.mcp ? [agentRoleRowsYaml()] : []
     ].join(""),
     "utf8"
   );
@@ -36943,13 +37096,7 @@ async function bootDshKernel(options2) {
       constructed.push(entry);
     });
   };
-  const ctx = await boot(
-    "skill-creator",
-    configPath,
-    patches,
-    prepare,
-    new URL(".", import.meta.url).href
-  );
+  const ctx = await boot("skill-creator", configPath, patches, prepare);
   const treeEntries = [];
   for (const entry of ctx.loader?.entries() ?? []) {
     treeEntries.push({ id: entry.id, name: entry.options.name });
@@ -37015,6 +37162,7 @@ var init_dsh_kernel = __esm({
   "src/daemon/kernel/dsh-kernel.ts"() {
     "use strict";
     init_dsh_profile_support();
+    init_agent_roles2();
     modulePath = fileURLToPath2(import.meta.url);
     sourceMode = path19.basename(modulePath) === "dsh-kernel.ts";
     repoRoot = sourceMode ? path19.resolve(path19.dirname(modulePath), "../../..") : path19.resolve(path19.dirname(modulePath), "..");
@@ -37721,7 +37869,7 @@ function providerCatalogEntry(id) {
 
 // src/shared/contracts/dsh-runtime.ts
 import { z as z7 } from "zod";
-var DSH_AUDITED_COMMIT = "d347e703908d0406b7a7ef80e3a0e594d86b2215";
+var DSH_AUDITED_COMMIT = "0a15e36e7f82b6ed45af6fa9759f29b40dcd965d";
 var DshCompositionRowSchema = z7.object({
   packageName: z7.string().min(1),
   lockedVersion: z7.string().min(1),
@@ -38014,7 +38162,10 @@ var DshSessionStreamFrameKindSchema = z7.enum([
   "todo-snapshot",
   /** 自动压缩标记（daemon 在 turn-end 后按 inputTokens + maxOutputTokens ≥
    * contextWindow 阈值自动执行 compact；text = 触发说明，UI 以居中注记渲染）。 */
-  "auto-compact"
+  "auto-compact",
+  /** 子代理目录（父会话 subagent/catalog 事件投影；payload = {childId, mode,
+   *  label}——角色 spawn 的可见性帧，settlement 经 user-text 回流）。 */
+  "subagent"
 ]);
 var DshSessionStreamFrameSchema = z7.object({
   /** 进程内单调序号（投影视角排序用，非持久协议）。 */
@@ -38137,11 +38288,38 @@ var AgentPromptFileSchema = z9.union([
     path: z9.string().min(1)
   })
 ]);
+var AgentPromptReferenceSchema = z9.discriminatedUnion("kind", [
+  z9.strictObject({
+    kind: z9.literal("file"),
+    /** daemon 可读的绝对路径（realpath + regular file + ≤512KiB + 文本扩展名）。 */
+    path: z9.string().min(1)
+  }),
+  z9.strictObject({
+    kind: z9.literal("session"),
+    /** 被引用的历史会话（排除语义由 UI 持有；daemon 不猜）。 */
+    sessionId: z9.string().min(1)
+  }),
+  z9.strictObject({
+    kind: z9.literal("skill"),
+    /** 技能引用的 server-owned 作用域三元组（`$` 触发；registry 解析 containment）。 */
+    workspaceId: WorkspaceIdSchema,
+    providerId: ProviderIdSchema,
+    skillId: SkillIdSchema
+  })
+]);
 var AgentSessionPromptInputSchema = z9.object({
   sessionId: z9.string().min(1),
   text: z9.string().max(2e4),
   images: z9.array(AgentPromptImageSchema).max(4).default([]),
-  files: z9.array(AgentPromptFileSchema).max(2).default([])
+  files: z9.array(AgentPromptFileSchema).max(2).default([]),
+  /**
+   * 提交模式（W4，官方 submission-policy 语义）：queue = next-turn（当前轮
+   * 完成后运行，内核 inbox 排队）；steer = next-step（在下一步骤边界转向
+   * 当前轮）。缺省 queue。
+   */
+  mode: z9.enum(["queue", "steer"]).default("queue"),
+  /** `@` 引用（C1）：daemon 展开为 [reference: …] 文本块；缺省无。 */
+  references: z9.array(AgentPromptReferenceSchema).max(4).default([])
 }).refine(
   // R17 codex P1：files-only 也是合法 prompt（后端文件选择器的主路径）。
   (input) => input.text.trim().length > 0 || input.images.length > 0 || input.files.length > 0,
@@ -38171,6 +38349,36 @@ var AgentSessionStreamResultSchema = z9.object({
   frames: z9.array(DshSessionStreamFrameSchema),
   status: AgentSessionStatusSchema
 });
+var AgentQueueItemSchema = z9.object({
+  /** 内核 UserMessage id（edit/remove/steer 的幂等寻址键）。 */
+  messageId: z9.string().min(1),
+  target: z9.enum(["next-turn", "next-step"]),
+  /** content 文本块拼接（引用/附件块不展开——chip 已在正文 token 中）。 */
+  text: z9.string(),
+  /** image/file 附件块计数（行尾 chip 展示）。 */
+  attachments: z9.number().int().nonnegative()
+});
+var AgentQueueListInputSchema = z9.object({ sessionId: z9.string().min(1) });
+var AgentQueueListResultSchema = z9.object({ items: z9.array(AgentQueueItemSchema) });
+var AgentQueueUpdateInputSchema = z9.discriminatedUnion("action", [
+  z9.strictObject({
+    sessionId: z9.string().min(1),
+    messageId: z9.string().min(1),
+    action: z9.literal("edit"),
+    text: z9.string().min(1).max(2e4)
+  }),
+  z9.strictObject({
+    sessionId: z9.string().min(1),
+    messageId: z9.string().min(1),
+    action: z9.literal("remove")
+  }),
+  z9.strictObject({
+    sessionId: z9.string().min(1),
+    messageId: z9.string().min(1),
+    action: z9.literal("steer")
+  })
+]);
+var AgentQueueUpdateResultSchema = z9.object({ updated: z9.literal(true) });
 var AgentSessionsStreamsInputSchema = z9.object({
   runId: z9.string().min(1).optional(),
   /** 返回最新 N 帧（默认 50，上限 500）。 */
@@ -39661,6 +39869,16 @@ var rpcContract = oc.errors(RpcErrorDefinitions).router({
        * 下一次 prompt 以新模式 setup 复活，历史由内核 session log 保留）。 */
       setMode: oc.input(AgentSessionSetModeInputSchema).output(AgentSessionSetModeResultSchema)
     },
+    /**
+     * 内核 inbox 队列面（C2）：queue 真相在 ReactLoopInbox；list 投影待处理项，
+     * update 执行行级 edit/remove/steer（官方 updateQueue 语义）。
+     */
+    queue: {
+      /** 待处理项（非 live 会话 = 空 items；live next-step + next-turn 有序）。 */
+      list: oc.input(AgentQueueListInputSchema).output(AgentQueueListResultSchema),
+      /** 行级操作；messageId 已消费 = typed NOT_FOUND（竞态可见）。 */
+      update: oc.input(AgentQueueUpdateInputSchema).output(AgentQueueUpdateResultSchema)
+    },
     /**
      * 后端文件选择器（R17-B）：真实路径浏览 + 单文件预览。用户本机自由浏览是
      * 功能目的（读面，无 Workspace containment）；prompt 附件 path 通道在
@@ -40445,6 +40663,11 @@ var PREVIEW_TEXT_MAX_BYTES = 2 * 1024 * 1024;
 var PREVIEW_TEXT_HEAD_BYTES = 4096;
 var PROMPT_IMAGE_MAX_BYTES = 4 * 1024 * 1024;
 var PROMPT_FILE_MAX_BYTES = 512 * 1024;
+function isTextualFileName(name) {
+  return /\.(txt|md|markdown|json|ya?ml|toml|csv|tsv|log|patch|diff|ts|tsx|js|jsx|py|rs|go|java|c|h|cpp|sh|css|html|xml|ini|env)$/i.test(
+    name
+  );
+}
 function toDomainError(error, what, target) {
   const code = error?.code;
   if (code === "ENOENT" || code === "ENOTDIR") {
@@ -40728,7 +40951,29 @@ function createAgentFilesService(deps = {}) {
     }
     return { images, files };
   }
-  return { pickFiles, list: list2, preview: preview2, resolvePromptAttachments };
+  async function resolvePromptReferences(input) {
+    const blocks = [];
+    for (const reference of input.references) {
+      const { real, size } = await canonicalRegularFile(reference.path, "reference");
+      if (size > PROMPT_FILE_MAX_BYTES) {
+        throw new DomainError(
+          "INVALID_OPERATION",
+          `"${path5.basename(real)}" exceeds the 512KiB limit.`
+        );
+      }
+      if (!isTextualFileName(path5.basename(real))) {
+        throw new DomainError(
+          "INVALID_OPERATION",
+          `"${path5.basename(real)}" is not a textual file; attach it instead.`
+        );
+      }
+      const text = await readFile2(real, "utf8");
+      blocks.push(`[reference: ${real}]
+${text.slice(0, 2e5)}`);
+    }
+    return blocks;
+  }
+  return { pickFiles, list: list2, preview: preview2, resolvePromptAttachments, resolvePromptReferences };
 }
 
 // src/daemon/creator-service.ts
@@ -41583,7 +41828,7 @@ function createSkillsCliProbe(options2 = {}) {
 }
 
 // src/daemon/domain.ts
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 
 // src/daemon/skills-update-service.ts
 import { createHash as createHash5 } from "node:crypto";
@@ -46629,10 +46874,11 @@ async function testDshRouteConnection(input, deps = {}) {
 }
 
 // src/daemon/dsh-host-lifecycle.ts
+import { join as join2 } from "node:path";
 function resolveDefaultDshHome() {
   const env2 = process.env.DSH_HOME;
   if (env2 && env2.trim() !== "") return env2;
-  return `${process.env.HOME ?? ""}/.dsh`;
+  return join2(homeDir(), ".skill-creator", "dsh-home");
 }
 async function bootForProduction(home, mcp) {
   const { bootDshKernel: bootDshKernel2 } = await Promise.resolve().then(() => (init_dsh_kernel(), dsh_kernel_exports));
@@ -47043,8 +47289,9 @@ function createDshSettingsService(options2 = {}) {
 
 // src/daemon/kernel/agent-sessions.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { z as z21 } from "zod";
+import { createUserMessage as createUserMessage2 } from "@deepseek-ai/dsh-llm";
+import { z as z22 } from "zod";
+init_agent_roles();
 init_dsh_kernel();
 
 // src/daemon/kernel/agent-modes.ts
@@ -47338,6 +47585,53 @@ async function runBootSessionCleanup(deps) {
   }
 }
 
+// src/daemon/kernel/agent-queue.ts
+import { createUserMessage } from "@deepseek-ai/dsh-llm";
+import { z as z21 } from "zod";
+var InboxMessageSchema = z21.object({
+  id: z21.string().min(1),
+  source: z21.unknown().optional(),
+  content: z21.array(z21.object({ type: z21.string().min(1), text: z21.string().optional() }).passthrough()).min(1)
+}).passthrough();
+function parseInboxMessage(raw) {
+  const checked = InboxMessageSchema.safeParse(raw);
+  return checked.success ? checked.data : null;
+}
+function queueItemOf(message, target) {
+  const texts = [];
+  let attachments = 0;
+  for (const block of message.content) {
+    if (block.type === "text" && typeof block.text === "string" && block.text.length > 0) {
+      texts.push(block.text);
+    }
+    if (block.type === "image" || block.type === "file") attachments += 1;
+  }
+  return { messageId: message.id, target, text: texts.join("\n"), attachments };
+}
+function projectInbox(inbox) {
+  const out = [];
+  for (const [target, list2] of [
+    ["next-step", inbox.nextStep],
+    ["next-turn", inbox.nextTurn]
+  ]) {
+    for (const original of list2) {
+      const parsed = parseInboxMessage(original);
+      if (parsed === null) continue;
+      out.push({ item: queueItemOf(parsed, target), parsed, original });
+    }
+  }
+  return out;
+}
+function rebuildEditedMessage(original, text) {
+  const nonText = original.content.filter((block) => block.type !== "text");
+  const maybeSource = original.source;
+  const source = typeof maybeSource === "object" && maybeSource !== null && maybeSource.kind === "user" ? maybeSource : { kind: "user" };
+  return createUserMessage({
+    source,
+    content: [{ type: "text", text }, ...nonText]
+  });
+}
+
 // src/daemon/kernel/session-transcripts.ts
 import fs18 from "node:fs";
 import path21 from "node:path";
@@ -47569,35 +47863,35 @@ function summaryOfMeta(meta) {
 }
 
 // src/daemon/kernel/agent-sessions.ts
-var AgentChunkEventSchema = z21.object({
-  chunk: z21.object({
-    type: z21.string().min(1),
-    text: z21.string().optional(),
-    id: z21.string().optional(),
-    name: z21.string().optional(),
-    argumentsDelta: z21.string().optional()
+var AgentChunkEventSchema = z22.object({
+  chunk: z22.object({
+    type: z22.string().min(1),
+    text: z22.string().optional(),
+    id: z22.string().optional(),
+    name: z22.string().optional(),
+    argumentsDelta: z22.string().optional()
   })
 });
-var TodoWriteEventSchema = z21.object({
-  todos: z21.array(
-    z21.object({
-      content: z21.string(),
-      status: z21.string().min(1)
+var TodoWriteEventSchema = z22.object({
+  todos: z22.array(
+    z22.object({
+      content: z22.string(),
+      status: z22.string().min(1)
     })
   )
 });
-var MessageSourceSchema = z21.object({
-  kind: z21.string().optional(),
-  callId: z21.string().optional()
+var MessageSourceSchema = z22.object({
+  kind: z22.string().optional(),
+  callId: z22.string().optional()
 }).passthrough();
-var MessageBlockSchema = z21.object({
-  type: z21.string().min(1),
-  text: z21.string().optional(),
-  name: z21.string().optional()
+var MessageBlockSchema = z22.object({
+  type: z22.string().min(1),
+  text: z22.string().optional(),
+  name: z22.string().optional()
 }).passthrough();
-var MessageShapeSchema = z21.object({
+var MessageShapeSchema = z22.object({
   source: MessageSourceSchema.optional(),
-  content: z21.array(MessageBlockSchema).min(1)
+  content: z22.array(MessageBlockSchema).min(1)
 }).passthrough();
 function messageEnvelopeOf(raw) {
   if (typeof raw === "object" && raw !== null && "message" in raw) {
@@ -47606,29 +47900,29 @@ function messageEnvelopeOf(raw) {
   }
   return raw;
 }
-var MessageEventSchema = z21.preprocess(messageEnvelopeOf, MessageShapeSchema);
-var TurnEndEventSchema = z21.object({
-  reason: z21.object({ kind: z21.string().optional() }).passthrough().optional()
+var MessageEventSchema = z22.preprocess(messageEnvelopeOf, MessageShapeSchema);
+var TurnEndEventSchema = z22.object({
+  reason: z22.object({ kind: z22.string().optional() }).passthrough().optional()
 }).passthrough();
-var SessionTitleEventSchema = z21.object({
-  title: z21.string().optional()
+var SessionTitleEventSchema = z22.object({
+  title: z22.string().optional()
 }).passthrough();
-var ToolCallEventSchema = z21.object({
-  callId: z21.string().min(1),
-  name: z21.string().min(1),
-  arguments: z21.string()
+var ToolCallEventSchema = z22.object({
+  callId: z22.string().min(1),
+  name: z22.string().min(1),
+  arguments: z22.string()
 }).passthrough();
-var ToolResultEventSchema = z21.object({
-  message: z21.object({
-    source: z21.object({ kind: z21.literal("tool"), callId: z21.string().min(1) }).passthrough(),
-    content: z21.tuple([
-      z21.object({
-        type: z21.literal("tool-result"),
-        toolCallId: z21.string().min(1),
-        content: z21.array(
-          z21.object({
-            type: z21.string().min(1),
-            text: z21.string().optional()
+var ToolResultEventSchema = z22.object({
+  message: z22.object({
+    source: z22.object({ kind: z22.literal("tool"), callId: z22.string().min(1) }).passthrough(),
+    content: z22.tuple([
+      z22.object({
+        type: z22.literal("tool-result"),
+        toolCallId: z22.string().min(1),
+        content: z22.array(
+          z22.object({
+            type: z22.string().min(1),
+            text: z22.string().optional()
           }).passthrough()
         ).min(1).refine(
           (parts) => parts.some(
@@ -47640,9 +47934,15 @@ var ToolResultEventSchema = z21.object({
     ])
   }).passthrough()
 });
-var TurnStartEventSchema = z21.record(z21.string(), z21.unknown());
-var AgentStatusEventSchema = z21.record(z21.string(), z21.unknown());
-var UsageEnvelopeSchema = z21.object({ usage: z21.record(z21.string(), z21.unknown()).optional() }).passthrough();
+var TurnStartEventSchema = z22.record(z22.string(), z22.unknown());
+var AgentStatusEventSchema = z22.record(z22.string(), z22.unknown());
+var SubagentCatalogEventSchema = z22.object({
+  childId: z22.string().min(1),
+  childCreatedAt: z22.number().optional(),
+  mode: z22.enum(["one-shot", "continuable"]),
+  label: z22.string().optional()
+});
+var UsageEnvelopeSchema = z22.object({ usage: z22.record(z22.string(), z22.unknown()).optional() }).passthrough();
 var DROPPED_EVENT_LOG_MAX = 200;
 function logDroppedEvent(sessionId, type, data) {
   let detail;
@@ -47912,6 +48212,26 @@ function createAgentSessionsService(deps) {
           }
         ];
       }
+      case "subagent/catalog": {
+        const checked = SubagentCatalogEventSchema.safeParse(data);
+        if (!checked.success) {
+          logDroppedEvent(entry.agent.session.id, event.type, data);
+          return [];
+        }
+        return [
+          {
+            ...base,
+            seq: entry.frameSeq++,
+            kind: "subagent",
+            text: checked.data.label ?? checked.data.childId,
+            payload: redactDshPayload({
+              childId: checked.data.childId,
+              mode: checked.data.mode,
+              ...checked.data.label !== void 0 ? { label: checked.data.label } : {}
+            })
+          }
+        ];
+      }
       case "user/message": {
         const checked = MessageEventSchema.safeParse(data);
         if (!checked.success) {
@@ -48115,6 +48435,54 @@ function createAgentSessionsService(deps) {
       return text;
     }
   }
+  const SESSION_DIGEST_MAX_FRAMES = 30;
+  const SESSION_DIGEST_MAX_CHARS = 24e3;
+  function sessionReferenceDigest(sessionId) {
+    const meta = deps.transcripts.listAll().find((item) => item.sessionId === sessionId);
+    const frames = deps.transcripts.readFrames(sessionId);
+    if (meta === void 0 && frames.length === 0) {
+      throw new DomainError("NOT_FOUND", `referenced session not found: ${sessionId}`);
+    }
+    const lines = [];
+    let total = 0;
+    for (let i = frames.length - 1; i >= 0 && lines.length < SESSION_DIGEST_MAX_FRAMES; i -= 1) {
+      const frame = frames[i];
+      const role = frame.kind === "user-text" ? "user" : frame.kind === "assistant-text" ? "assistant" : null;
+      if (role === null || typeof frame.text !== "string" || frame.text.length === 0) continue;
+      const line = `${role}: ${frame.text}`;
+      if (total + line.length > SESSION_DIGEST_MAX_CHARS && lines.length > 0) break;
+      lines.unshift(line.slice(0, SESSION_DIGEST_MAX_CHARS));
+      total += line.length;
+    }
+    const title = meta?.title !== void 0 && meta.title.length > 0 ? ` "${meta.title}"` : "";
+    return `[reference: earlier session${title} (${sessionId})]
+${lines.join("\n")}`;
+  }
+  async function expandReferences(references) {
+    const blocks = [];
+    for (const reference of references) {
+      if (reference.kind === "file") {
+        if (deps.expandFileReferences === void 0) {
+          throw new DomainError(
+            "UNAVAILABLE",
+            "file references require the agent-files service (not wired)"
+          );
+        }
+        blocks.push(...await deps.expandFileReferences([reference]));
+      } else if (reference.kind === "skill") {
+        if (deps.expandSkillReferences === void 0) {
+          throw new DomainError(
+            "UNAVAILABLE",
+            "skill references require the skills service (not wired)"
+          );
+        }
+        blocks.push(...await deps.expandSkillReferences([reference]));
+      } else {
+        blocks.push(sessionReferenceDigest(reference.sessionId));
+      }
+    }
+    return blocks;
+  }
   function textOf(message) {
     const content = message?.content;
     if (!Array.isArray(content)) return void 0;
@@ -48146,11 +48514,7 @@ function createAgentSessionsService(deps) {
     }
     return out;
   }
-  function isTextualFile(name) {
-    return /\.(txt|md|markdown|json|ya?ml|toml|csv|tsv|log|patch|diff|ts|tsx|js|jsx|py|rs|go|java|c|h|cpp|sh|css|html|xml|ini|env)$/i.test(
-      name
-    );
-  }
+  const isTextualFile = isTextualFileName;
   function usageSnapshotOf(data) {
     const checked = UsageEnvelopeSchema.safeParse(data);
     if (!checked.success) return void 0;
@@ -48284,6 +48648,7 @@ function createAgentSessionsService(deps) {
       }
       for (const session of sessions.list()) {
         if (known.has(session.id)) continue;
+        if (session.header.origin === "subagent") continue;
         const entry = live.get(session.id);
         if (entry) {
           summaries.push(summaryOf(entry));
@@ -48352,7 +48717,7 @@ function createAgentSessionsService(deps) {
       });
       if (input.prompt) {
         handle.agent.followup(
-          createUserMessage({
+          createUserMessage2({
             source: { kind: "user" },
             content: [{ type: "text", text: input.prompt }]
           })
@@ -48361,19 +48726,23 @@ function createAgentSessionsService(deps) {
       return summaryOf(entry);
     },
     /** 驱动一轮用户输入（长度硬上限与 RPC 契约一致——外部输入 runtime 收窄）。
-     * 非live但有转录的会话先经内核 agents.resume 复活（跨 daemon 重启续聊）。 */
-    async prompt(sessionId, text, images = [], files = []) {
+     * 非live但有转录的会话先经内核 agents.resume 复活（跨 daemon 重启续聊）。
+     * C1：references 由 daemon 展开（file 读盘 / session 转录摘要）为
+     * [reference: …] 文本块，注入内核 content——与文件附件内联同构；目标缺失
+     * typed NOT_FOUND 整体拒绝，不静默降级。 */
+    async prompt(sessionId, text, images = [], files = [], mode = "queue", references = []) {
       if (text.length > PROMPT_MAX_CHARS) {
         throw new DomainError(
           "INVALID_OPERATION",
           `prompt too long: ${text.length} chars (max ${PROMPT_MAX_CHARS})`
         );
       }
+      const referenceBlocks = references.length > 0 ? await expandReferences(references) : [];
       let entry = live.get(sessionId);
       if (!entry) {
         entry = await reviveSession(sessionId);
       }
-      if (text.startsWith("/") && images.length === 0 && files.length === 0) {
+      if (text.startsWith("/") && images.length === 0 && files.length === 0 && references.length === 0) {
         const commands = requireKernel().ctx.commands;
         if (commands) {
           const executed = await commands.execute(
@@ -48396,6 +48765,9 @@ ${decoded.slice(0, 2e5)}`
         });
         return false;
       });
+      for (const block of referenceBlocks) {
+        content.push({ type: "text", text: block });
+      }
       if (images.length > 0 || restFiles.length > 0) {
         const kernel = requireKernel();
         const attachments = kernel.ctx.attachments;
@@ -48426,18 +48798,22 @@ ${decoded.slice(0, 2e5)}`
           content.push({ type: "file", attachment: ref });
         }
       }
-      entry.agent.followup(
-        createUserMessage({
-          source: { kind: "user" },
-          content
-        })
-      );
+      const message = createUserMessage2({
+        source: { kind: "user" },
+        content
+      });
+      if (mode === "steer" && typeof entry.agent.steer === "function") {
+        entry.agent.steer(message);
+      } else {
+        entry.agent.followup(message);
+      }
     },
-    /** 取消当前活动（幂等；无活动为 no-op）。 */
+    /** 取消当前活动（幂等；无活动为 no-op）。W4：keepInbox——排队消息在停止后
+     *  存活并按 FIFO 续跑（官方 Stop 语义；内核缺省会清 inbox）。 */
     cancel(sessionId) {
       const entry = live.get(sessionId);
       if (!entry) throw new DomainError("NOT_FOUND", `agent session not found: ${sessionId}`);
-      entry.agent.cancel("user");
+      entry.agent.cancel("user", { keepInbox: true });
     },
     /**
      * 切换会话模式（add-agent-settings-modes）：meta 持久化 + live 句柄有界释放 +
@@ -48487,6 +48863,70 @@ ${decoded.slice(0, 2e5)}`
       deps.transcripts.append(sessionId, frame);
       return summary;
     },
+    /**
+     * C2 queue 面薄委托（逻辑在 agent-queue）：非 live 会话返回空 items——
+     * 重启后未复活的挂起队列不可操作（记录边界，不伪装）。live 会话无 inbox
+     * 面（内核面缺失）同样空 items。
+     */
+    queueList(sessionId) {
+      const entry = live.get(sessionId);
+      if (!entry || entry.agent.inbox === void 0) return { items: [] };
+      return { items: projectInbox(entry.agent.inbox).map(({ item }) => item) };
+    },
+    /**
+     * C2 queue 行级操作：edit=replace（新文本 + 原附件块）；remove=remove；
+     * steer=next-turn → next-step（仅 running）。messageId 已被消费（轮次已
+     * 开始）typed NOT_FOUND——竞态可见；目标不在 next-turn 时 steer 拒绝。
+     */
+    queueUpdate(sessionId, input) {
+      const entry = live.get(sessionId);
+      if (!entry) {
+        throw new DomainError("NOT_FOUND", `agent session not found: ${sessionId}`);
+      }
+      if (entry.agent.inbox === void 0) {
+        throw new DomainError("UNAVAILABLE", "agent kernel inbox surface missing");
+      }
+      const inbox = entry.agent.inbox;
+      if (input.action === "remove") {
+        if (!inbox.remove(input.messageId)) {
+          throw new DomainError(
+            "NOT_FOUND",
+            `queued message no longer pending: ${input.messageId}`
+          );
+        }
+        return;
+      }
+      if (input.action === "edit") {
+        const found = projectInbox(inbox).find(({ item }) => item.messageId === input.messageId);
+        if (found === void 0) {
+          throw new DomainError(
+            "NOT_FOUND",
+            `queued message no longer pending: ${input.messageId}`
+          );
+        }
+        inbox.replace(input.messageId, rebuildEditedMessage(found.parsed, input.text ?? ""));
+        return;
+      }
+      if (statusOf(entry) !== "running") {
+        throw new DomainError(
+          "INVALID_OPERATION",
+          "steer needs a running turn; the session is idle"
+        );
+      }
+      const queued = projectInbox(inbox).find(
+        ({ item }) => item.messageId === input.messageId && item.target === "next-turn"
+      );
+      if (queued === void 0) {
+        throw new DomainError(
+          "INVALID_OPERATION",
+          `message is not a queued next-turn item: ${input.messageId}`
+        );
+      }
+      if (!inbox.remove(input.messageId)) {
+        throw new DomainError("NOT_FOUND", `queued message no longer pending: ${input.messageId}`);
+      }
+      inbox.append("next-step", queued.original);
+    },
     /** 增量帧读取（afterSeq 游标 + limit 窗口）；非 live 会话由转录回放。 */
     stream(sessionId, afterSeq, limit) {
       const entry = live.get(sessionId);
@@ -48523,6 +48963,11 @@ ${decoded.slice(0, 2e5)}`
     },
     /** 有界销毁（daemon stop 时逐个回收 agent；待答请求以空答案释放）。 */
     async dispose() {
+      const kernel = deps.kernel();
+      const drain = kernel?.ctx?.subagents?.drainContinuableDescendants;
+      if (drain && live.size > 0) {
+        await Promise.resolve(drain([...live.keys()])).catch(() => void 0);
+      }
       for (const entry of live.values()) {
         for (const pending of entry.pending.values()) {
           pending.resolve({ answers: [] });
@@ -48543,8 +48988,10 @@ function applyProductToolSurface(agentCtx, mode) {
 }
 function productToolDenyList(globalNames, mode) {
   const nativeAllowed = mode === "free" ? [...KERNEL_AGENT_TOOL_ALLOWLIST, "bash"] : KERNEL_AGENT_TOOL_ALLOWLIST;
+  const modeRoles = AGENT_MODE_ROLES[mode];
+  const roleAllowed = modeRoles.map(agentRoleToolName);
   return globalNames.filter(
-    (name) => !nativeAllowed.includes(name) && !name.startsWith("mcp__skill-creator__")
+    (name) => !nativeAllowed.includes(name) && !roleAllowed.includes(name) && !name.startsWith("mcp__skill-creator__")
   );
 }
 
@@ -48726,7 +49173,7 @@ function createModelCatalogService() {
 }
 
 // src/daemon/capability/domain-capabilities.ts
-import { z as z22 } from "zod";
+import { z as z23 } from "zod";
 function toResult(error) {
   if (error instanceof DomainError) {
     return { kind: "failed", code: error.code, message: error.message };
@@ -48747,7 +49194,7 @@ async function invoke(action) {
     return toResult(error);
   }
 }
-var none = z22.object({});
+var none = z23.object({});
 function createDomainCapabilities(domain) {
   return [
     {
@@ -49758,16 +50205,16 @@ import path25 from "node:path";
 
 // src/daemon/workspace-registry/state.ts
 import path24 from "node:path";
-import { z as z23 } from "zod";
-var StoredWorkspaceSchema = z23.object({
+import { z as z24 } from "zod";
+var StoredWorkspaceSchema = z24.object({
   id: ImportedWorkspaceIdSchema,
-  label: z23.string().trim().min(1),
-  path: z23.string().min(1).refine(path24.isAbsolute, "Workspace path must be absolute.").refine((value) => path24.normalize(value) === value, "Workspace path must be normalized.")
+  label: z24.string().trim().min(1),
+  path: z24.string().min(1).refine(path24.isAbsolute, "Workspace path must be absolute.").refine((value) => path24.normalize(value) === value, "Workspace path must be normalized.")
 }).strict();
-var WorkspaceRegistryStateSchema = z23.object({
-  schemaVersion: z23.literal(2),
+var WorkspaceRegistryStateSchema = z24.object({
+  schemaVersion: z24.literal(2),
   activeId: WorkspaceIdSchema,
-  workspaces: z23.array(StoredWorkspaceSchema)
+  workspaces: z24.array(StoredWorkspaceSchema)
 }).strict().superRefine((state, context) => {
   const ids = /* @__PURE__ */ new Set();
   const paths = /* @__PURE__ */ new Set();
@@ -50141,8 +50588,11 @@ function defaultStewardAdapters() {
 function createDaemonDomain(workspaces = createWorkspaceRegistry(), options2 = {}) {
   const kernelHostRef = { handle: null };
   const dshSettings = createDshSettingsService();
-  const agentTranscripts = createSessionTranscripts(join2(appDir(), "sessions"));
+  const agentTranscripts = createSessionTranscripts(join3(appDir(), "sessions"));
   const modelCatalog = createModelCatalogService();
+  const agentFiles = createAgentFilesService();
+  const skillsCliProbe = options2.skillsCliProbe ?? createSkillsCliProbe();
+  const skills = createSkillService(workspaces, { skillsCliProbe });
   const agentSessions = createAgentSessionsService({
     kernel: () => kernelHostRef.handle,
     modelSelection: async () => (await dshSettings.getView()).settings.model,
@@ -50155,10 +50605,25 @@ function createDaemonDomain(workspaces = createWorkspaceRegistry(), options2 = {
       if (entry === void 0) return null;
       return { contextWindow: entry.contextWindow, maxOutputTokens: entry.maxOutputTokens };
     },
-    transcripts: agentTranscripts
+    transcripts: agentTranscripts,
+    expandFileReferences: (references) => agentFiles.resolvePromptReferences({ references }),
+    // skill-refs C1：`$` 引用展开——registry 作用域解析 + 文档读取在 skills 服务
+    //（NOT_FOUND 随 resolveSkill typed 抛出）；内容截断对齐 file 引用（200k chars）。
+    expandSkillReferences: async (references) => {
+      const blocks = [];
+      for (const reference of references) {
+        const info3 = await skills.info(
+          { workspaceId: reference.workspaceId, providerId: reference.providerId },
+          reference.skillId
+        );
+        blocks.push(
+          `[reference: skill ${info3.name} \xB7 ${info3.provider}]
+${info3.content.slice(0, 2e5)}`
+        );
+      }
+      return blocks;
+    }
   });
-  const skillsCliProbe = options2.skillsCliProbe ?? createSkillsCliProbe();
-  const skills = createSkillService(workspaces, { skillsCliProbe });
   const repository = createRepositoryService(workspaces, skills);
   const creator = createCreatorService(workspaces, skills);
   const skillIntelligence = createSkillIntelligenceService(skills, creator);
@@ -50178,7 +50643,7 @@ function createDaemonDomain(workspaces = createWorkspaceRegistry(), options2 = {
     skillSteward: createSkillStewardPipelineService({ workspaces, skills, creator }),
     dshSettings,
     agentSessions,
-    agentFiles: createAgentFilesService(),
+    agentFiles,
     modelCatalog,
     setKernelHost: (handle) => {
       kernelHostRef.handle = handle;
@@ -50585,7 +51050,9 @@ function createRpcRouter(deps) {
             input.sessionId,
             input.text,
             resolved.images,
-            resolved.files
+            resolved.files,
+            input.mode ?? "queue",
+            input.references ?? []
           );
           return { accepted: true };
         }),
@@ -50603,6 +51070,20 @@ function createRpcRouter(deps) {
           session: await domain.agentSessions.setMode(input.sessionId, input.mode)
         }))
       },
+      queue: {
+        // C2：内核 inbox 队列面（非 live = 空 items；update 竞态 typed NOT_FOUND）。
+        list: rpc.agent.queue.list.handler(
+          ({ input }) => domain.agentSessions.queueList(input.sessionId)
+        ),
+        update: rpc.agent.queue.update.handler(({ input }) => {
+          domain.agentSessions.queueUpdate(input.sessionId, {
+            messageId: input.messageId,
+            action: input.action,
+            ...input.action === "edit" ? { text: input.text } : {}
+          });
+          return { updated: true };
+        })
+      },
       files: {
         // R17-B 后端文件选择器：用户本机自由浏览（读面，无 containment）。
         list: rpc.agent.files.list.handler(async ({ input }) => domain.agentFiles.list(input)),
@@ -50747,17 +51228,22 @@ var WebServer = class {
   unsubscribeExited;
   /**
    * 挂载 skill-creator MCP 面（task 4.1 形态 A）。传 null 卸载（降级语义：
-   * MCP 面缺席 → 404）。stateless streamable HTTP：每请求从 factory 新建
-   * server + transport（SDK stateless 模式；capability 面无状态）。
+   * MCP 面缺席 → 404）。v2 双纪元（skill-refs-and-platform-fixes C3）：
+   * createMcpHandler 以 factory 每请求新建 server 实例——modern（2026-07-28
+   * server/discover，dsh-mcp-client v2 线）与 legacy（2025 initialize）都由
+   * 该入口服务；legacy 走 stateless（与 v1 逐请求 transport 语义同构）。
    */
   mountMcp(factory) {
     this.mcpFactory = factory;
+    this.mcpNodeHandler = null;
     log(
       factory ? "skill-creator mcp endpoint mounted: /mcp" : "skill-creator mcp endpoint unmounted"
     );
   }
   mcpFactory = null;
-  /** /mcp 请求处理：Bearer 鉴权 → stateless transport → 每请求新 server。 */
+  /** Node 适配处理器缓存（按 factory 身份失效；mountMcp 变更即置空）。 */
+  mcpNodeHandler = null;
+  /** /mcp 请求处理：Bearer 鉴权（daemon 侧前置）→ 双纪元 MCP handler。 */
   async handleMcp(request, response) {
     if (!this.mcpFactory) {
       response.writeHead(404, { "content-type": "application/json" });
@@ -50771,22 +51257,22 @@ var WebServer = class {
       response.end(JSON.stringify({ error: "unauthorized" }));
       return;
     }
-    const [{ StreamableHTTPServerTransport: StreamableHTTPServerTransport2 }, server] = await Promise.all([
-      import("@modelcontextprotocol/sdk/server/streamableHttp.js"),
-      Promise.resolve(this.mcpFactory())
-    ]);
-    const transport = new StreamableHTTPServerTransport2({
-      sessionIdGenerator: void 0,
-      enableJsonResponse: true
-    });
-    transport.onerror = (error) => {
-      log(`mcp transport error: ${error instanceof Error ? error.message : String(error)}`);
-    };
-    await server.connect(transport);
-    response.on("close", () => {
-      void transport.close().catch(() => void 0);
-    });
-    await transport.handleRequest(request, response);
+    if (this.mcpNodeHandler === null) {
+      const [{ createMcpHandler }, { toNodeHandler }] = await Promise.all([
+        import("@modelcontextprotocol/server"),
+        import("@modelcontextprotocol/node")
+      ]);
+      const factory = this.mcpFactory;
+      const handler = createMcpHandler(() => factory(), {
+        legacy: "stateless",
+        onerror: (error) => {
+          log(`mcp handler error: ${error instanceof Error ? error.message : String(error)}`);
+        }
+      });
+      if (this.mcpFactory !== factory) return;
+      this.mcpNodeHandler = toNodeHandler(handler);
+    }
+    await this.mcpNodeHandler(request, response);
   }
   /** 启动环回服务，并返回实际监听端口。 */
   start(port) {
@@ -50979,7 +51465,7 @@ import fs26 from "node:fs/promises";
 import {
   createAssistantMessage,
   createToolResultMessage,
-  createUserMessage as createUserMessage2
+  createUserMessage as createUserMessage3
 } from "@deepseek-ai/dsh-llm";
 function isRecord3(value) {
   return typeof value === "object" && value !== null;
@@ -51041,7 +51527,7 @@ function createDshSessionBinder(options2) {
     session.append("step/start", { turn: 1, step: 1 });
     session.append(
       "user/message",
-      createUserMessage2({
+      createUserMessage3({
         source: { kind: "user" },
         content: [{ type: "text", text: input.taskText }]
       }),
@@ -51156,7 +51642,8 @@ function summarizeToolResult(call) {
 }
 
 // src/daemon/mcp/skill-creator-mcp.ts
-import { McpServer, ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpServer, ResourceTemplate } from "@modelcontextprotocol/server";
+import { z as z25 } from "zod";
 function mcpToolName(capabilityName) {
   return capabilityName.replace(/\./g, "_");
 }
@@ -51217,16 +51704,20 @@ function createSkillCreatorMcpServer(deps) {
         ]
       });
       if (shape2) {
-        server.tool(
+        server.registerTool(
           proposeName,
-          `Propose: ${descriptor.description} A human approves it in the Skill Creator UI before execution.`,
-          shape2,
+          {
+            description: `Propose: ${descriptor.description} A human approves it in the Skill Creator UI before execution.`,
+            inputSchema: z25.object(shape2)
+          },
           async (args) => proposeResult(deps.proposals.create(descriptor.name, args))
         );
       } else {
-        server.tool(
+        server.registerTool(
           proposeName,
-          `Propose: ${descriptor.description} A human approves it in the Skill Creator UI before execution.`,
+          {
+            description: `Propose: ${descriptor.description} A human approves it in the Skill Creator UI before execution.`
+          },
           async () => proposeResult(deps.proposals.create(descriptor.name, void 0))
         );
       }
@@ -51237,10 +51728,9 @@ function createSkillCreatorMcpServer(deps) {
     const shape = input && typeof input.shape === "object" ? input.shape : null;
     const toolName = mcpToolName(descriptor.name);
     if (shape) {
-      server.tool(
+      server.registerTool(
         toolName,
-        descriptor.description,
-        shape,
+        { description: descriptor.description, inputSchema: z25.object(shape) },
         async (args) => withCard(
           descriptor.name,
           await deps.capabilities.call(descriptor.name, args, MCP_PRINCIPAL),
@@ -51248,9 +51738,9 @@ function createSkillCreatorMcpServer(deps) {
         )
       );
     } else {
-      server.tool(
+      server.registerTool(
         toolName,
-        descriptor.description,
+        { description: descriptor.description },
         async () => withCard(
           descriptor.name,
           await deps.capabilities.call(descriptor.name, void 0, MCP_PRINCIPAL),
@@ -52124,8 +52614,8 @@ async function bootDaemon(opts) {
 import fs30 from "node:fs";
 import path32 from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
-import { z as z24 } from "zod";
-var PackageVersionSchema = z24.object({ version: z24.string().min(1) });
+import { z as z26 } from "zod";
+var PackageVersionSchema = z26.object({ version: z26.string().min(1) });
 function readNearestPackageVersion(moduleUrl) {
   const here = path32.dirname(fileURLToPath6(moduleUrl));
   const candidates = [