@oh-story/dsh 0.1.14 → 0.1.16

package/lib/index.js

@@ -134,7 +134,7 @@ var DSH_SKILL_BRIDGE = [
   // Upstream deploys these 「与作者协作」 rules only in its CLAUDE.md/AGENTS.md
   // templates, which DSH does not install.
   "Working with the author: reply and report in the author's writing terms (book, chapter, outline, settings), never in script, field, or state names; attach a raw error only when something failed. A template block marked <!-- author-report --> is only a format reference: output its text directly, without that marker and without a code fence.",
-  "Record a writing habit or preference the author asks to remember, forget, or confirm only through the story Skill's author memory, whose scripts/author_memory_commit.py writes .story/\u4F5C\u8005\u8BB0\u5FC6/; never keep it in a host or DSH memory. Simply follow a one-off request without recording it.",
+  "Manage a writing habit or preference only through story-long-write or story-short-write and that writing Skill's references/author-memory.md and scripts/author_memory_commit.py; never keep it in a host or DSH memory. The story entry only routes memory requests. story-deslop and story-review consume only preferences already supplied by their caller and never query or record author memory themselves. Simply follow a one-off request without recording it.",
   "Never edit the bundled Skill files (SKILL.md, references/, scripts/). When a Skill script fails, stop and show the author the command you ran and its error instead of patching or working around it.",
   "</oh-story-dsh-integration>"
 ].join("\n");
@@ -145,16 +145,17 @@ var DSH_ANALYSIS_BATCHES = [
   "Run manage_analysis_run.py and the other bundled Python 3 scripts through the current DSH execution world, trying python3, python, then py -3. If none is available, stop and tell the author in plain words that this step needs Python 3 on the machine running DSH; never simulate a script's output or hand-write the files it owns.",
   "Keep concurrent oh_story_role calls modest. The default is upstream's \u6709\u9650\u5E76\u884C tier: three batches per round, issued together, the next round only after all three are committed; an unasked, full, multi-book, or import run uses it. DSH runs calls from one step in parallel only up to the host's own limit and may run them one after another, so never promise more. Use \u4E32\u884C or \u4E0D\u9650\u6279\u6B21\u987A\u5E8F only when the author chooses it, and under \u4E0D\u9650\u6279\u6B21\u987A\u5E8F halve the count on any rate limit, timeout, or child error."
 ].join(" ");
+var DSH_AUTHOR_MEMORY_WORKSPACE = "For author memory in DSH's usual single-book layout, where \u6B63\u6587/ and \u8BBE\u5B9A/ sit directly in the workspace root, pass that same root as both --workspace and --book-root; the book store lives at .story/\u4F5C\u8005\u8BB0\u5FC6/\u4E66\u7EA7/. For a book in a subdirectory, --book-root names that book's directory. Keep --workspace explicit, pass --book-root on every command for a book, and include --kind on queries. Use this writing Skill's references/author-memory-maintenance.md for single-book layout recovery, organizing memories, or migrating old \u672C\u4E66\uFF1A entries.";
 var DSH_SKILL_OVERRIDES = {
   story: "The \u5C0F\u8BF4 workspace is an official DSH conversation view. Never start or open a second web application.",
   "story-setup": "Initialize or validate novel project data only. DSH already supplies Skills, Roles, hooks, tools, permissions, sessions, and UI; never deploy Claude/OpenCode/Codex/Antigravity/ZCode/OpenClaw/Reasonix files or a .story-deployed marker.",
   "story-long-analyze": `Use oh_story_role for chapter extraction or specialist analysis. Never inspect platform agent directories or require a deployed external Agent definition. ${DSH_ANALYSIS_BATCHES}`,
-  "story-long-write": "All named Roles are provided through oh_story_role. Do not check platform agent files. Keep the upstream writing, Tracking, lint, outline, revision, and quality workflows. Create and assemble \u6B63\u6587/ chapter files only with the write and edit tools, never through shell redirection, cp, mv, tee, or a script, so that DSH's outline guard, its Tracking reminder, and the \u5C0F\u8BF4 view observe the write; upstream's own in-place chapter fixes such as storyctl.py chapter check --fix-punctuation stay as upstream describes.",
+  "story-long-write": `All named Roles are provided through oh_story_role. Do not check platform agent files. Keep the upstream writing, Tracking, lint, outline, revision, and quality workflows. Create and assemble \u6B63\u6587/ chapter files only with the write and edit tools, never through shell redirection, cp, mv, tee, or a script, so that DSH's outline guard, its Tracking reminder, and the \u5C0F\u8BF4 view observe the write; upstream's own in-place chapter fixes such as storyctl.py chapter check --fix-punctuation stay as upstream describes. ${DSH_AUTHOR_MEMORY_WORKSPACE}`,
   "story-review": "All named reviewer Roles are provided through oh_story_role. Do not check platform agent files; full/lean review may use the bundled Roles directly. When a review falls back to solo in DSH, the reason is that oh_story_role or DSH's spawn runtime is unavailable in this Session (Fallback agent tool unavailable -> solo) or a Role run failed (Fallback spawn failed -> solo); say that in one plain sentence. Never tell the author that the reviewers are not installed, missing, or outdated, and never tell them to run /story-setup.",
   "story-import": `All named Roles are provided through oh_story_role. Do not require story-setup to deploy them, never inspect platform agent directories or .story-deployed, and never offer the author Step 4's choice to install a writing environment with /story-setup: in DSH record \u5199\u4F5C\u73AF\u5883 in .story/work/\u5BFC\u5165\u8BB0\u5F55.md as installed, with the analysis helper and story-architect both available. Phase 2 runs the story-long-analyze pipeline the DSH way below; an import counts as automatic continuation, so it uses the limited-parallel tier without asking. ${DSH_ANALYSIS_BATCHES} Run the scripts this Skill needs (build_outline_brief.py, tracking_commit.py init and check with Python 3; check-outline-contract.js with Node) the same way. Keep upstream's order: Phase 3-L Step 2 copies the manuscript into \u6B63\u6587/, Step 10 reverse-builds the \u7EC6\u7EB2 in batches, and Phase 4 initialises Tracking. DSH's prose guard mirrors the outline gate of upstream proseBlockReason for books with \u5927\u7EB2/ or \u8FFD\u8E2A/, so open an import window before Step 2 copies any chapter: create .story/work/\u5BFC\u5165\u4E2D.md in the book directory (the workspace root in DSH's usual single-book layout) with one line naming the book being imported, and delete it right after Phase 4's tracking_commit.py init and check both succeed. The window only holds while \u8FFD\u8E2A/_tracking-state.json is absent. \u5BFC\u5165\u4E2D.md is DSH's own marker; keep upstream's \u5BFC\u5165\u8BB0\u5F55.md exactly as the Skill describes.`,
   "story-deslop": "Use the bundled narrative-writer Role through oh_story_role when specialist review is useful. Never inspect platform agent directories.",
   "story-short-analyze": "Use oh_story_role for specialist analysis. Never inspect platform agent directories or require external Agent deployment.",
-  "story-short-write": "All named Roles are provided through oh_story_role. Do not inspect platform agent files; preserve the upstream short-fiction workflow and quality gates.",
+  "story-short-write": `All named Roles are provided through oh_story_role. Do not inspect platform agent files; preserve the upstream short-fiction workflow and quality gates. ${DSH_AUTHOR_MEMORY_WORKSPACE}`,
   "browser-cdp": "Use only browser or web capabilities visible in the current DSH preset. Do not start a parallel browser host; if no compatible capability is visible, explain the limitation.",
   "story-cover": "Use only image-generation or HTTP capabilities visible in the current DSH preset. Never assume a separate Codex or Claude runtime."
 };
@@ -230,19 +231,11 @@ var DSH_NATIVE_SKILLS = {
 - \u5C01\u9762\uFF1Astory-cover
 - \u67E5\u672C\u4E66\u7684\u89D2\u8272\u3001\u4F0F\u7B14\u3001\u8FDB\u5EA6\u6216\u8BBE\u5B9A\uFF1A\u7528 oh_story_role \u8C03\u7528 story-explorer\uFF1B\u67E5\u5916\u90E8\u8D44\u6599\uFF1A
   story-researcher\u3002\u56DE\u7B54\u8BB2\u6545\u4E8B\u91CC\u7684\u4E8B\uFF0C\u7F16\u53F7\u53EA\u8DDF\u7740\u6545\u4E8B\u63CF\u8FF0\u51FA\u73B0
-- \u7BA1\u7406\u4F5C\u8005\u4E60\u60EF\uFF08\u8BB0\u4F4F/\u67E5\u770B/\u786E\u8BA4/\u66FF\u6362/\u5FD8\u6389\u5199\u4F5C\u504F\u597D\uFF09\uFF1A\u52A0\u8F7D\u672C skill \u7684
-  references/author-memory.md\uFF0C\u53EA\u7528\u672C skill \u7684 scripts/author_memory_commit.py \u7BA1\u7406
-  \u4E24\u7EA7\u4F5C\u8005\u8BB0\u5FC6\uFF1A\u5168\u5C40\u3001\u9898\u6750\u3001\u6D41\u7A0B\u6761\u76EE\u5728\u5DE5\u4F5C\u533A .story/\u4F5C\u8005\u8BB0\u5FC6/\uFF08AP \u7F16\u53F7\uFF09\uFF0C\u672C\u4E66\u6761\u76EE\u5728
-  \u4E66\u7EA7 store\uFF08BP \u7F16\u53F7\uFF09\u3002--workspace \u5FC5\u987B\u663E\u5F0F\u4F20\u3002DSH \u7684\u5C0F\u8BF4\u5DE5\u4F5C\u533A\u901A\u5E38\u5C31\u662F\u4E66\u6839
-  \uFF08\u6B63\u6587/\u3001\u8BBE\u5B9A/ \u76F4\u63A5\u5728\u5DE5\u4F5C\u533A\u6839\uFF09\uFF1A\u6B64\u65F6 --workspace \u4E0E --book-root \u90FD\u4F20\u5DE5\u4F5C\u533A\u672C\u8EAB\uFF0C
-  \u4E66\u7EA7 store \u5728 .story/\u4F5C\u8005\u8BB0\u5FC6/\u4E66\u7EA7/\uFF1B\u4E66\u5728\u5B50\u76EE\u5F55\u65F6 --book-root \u4F20\u90A3\u672C\u4E66\u7684\u76EE\u5F55\u3002
-  \u5904\u7406\u67D0\u672C\u4E66\u65F6\u6BCF\u6761\u547D\u4EE4\u90FD\u5E26 --book-root\uFF08\u4E66\u7EA7\u64CD\u4F5C\u7F3A\u5B83\u76F4\u63A5\u62A5\u9519\uFF09\uFF0Cquery \u5FC5\u987B\u5E26
-  --kind\uFF08\u53EF\u91CD\u590D\uFF09\u3002\u53EA\u8BB0\u4F5C\u8005\u660E\u786E\u8BF4\u51FA\u7684\u504F\u597D\uFF0C\u4E0D\u4ECE\u53CD\u590D\u4FEE\u6539\u6216\u6210\u7A3F\u63A8\u65AD\u3002\u5DE5\u5177\u672A\u8FD4\u56DE
-  Author Memory Receipt \u524D\u4E0D\u5F97\u58F0\u79F0\u5DF2\u8BB0\u4F4F\uFF1B\u544A\u8BC9\u4F5C\u8005\u65F6\u5148\u7528\u4E00\u53E5\u4EBA\u8BDD\u8BF4\u8BB0\u4F4F\u4E86\u4EC0\u4E48\uFF0C
-  \u56DE\u6267\u653E\u6700\u540E\u4E00\u884C\u3002\u4F5C\u8005\u8BF4\u300C\u6574\u7406\u4F5C\u8005\u8BB0\u5FC6\u300D\u3001\u56DE\u6267\u63D0\u793A\u4E60\u60EF\u6512\u5F97\u592A\u591A\u3001\u5DE5\u5177\u62A5\u5355\u4E66\u5E03\u5C40\u9519\u8BEF\uFF0C
-  \u6216\u5DE5\u4F5C\u533A\u753B\u50CF\u91CC\u8FD8\u6709\u300C\u672C\u4E66\uFF1A\u300D\u6761\u76EE\uFF08\u5347\u7EA7\u524D\u5199\u5165\u7684\u672C\u4E66\u504F\u597D\uFF0C\u5DF2\u4E0D\u53C2\u4E0E\u67E5\u8BE2\uFF09\u65F6\uFF0C\u518D\u52A0\u8F7D
-  references/author-memory-maintenance.md\uFF1B\u8FC1\u79FB\u300C\u672C\u4E66\uFF1A\u300D\u6761\u76EE\u5C31\u6309\u5B83\u8FD0\u884C\u4E00\u6B21
-  migrate --workspace {\u5DE5\u4F5C\u533A} --book-root {\u4E66\u76EE\u5F55} \u628A\u5B83\u4EEC\u642C\u8FDB\u4E66\u7EA7 store\u3002
+- \u7BA1\u7406\u4F5C\u8005\u4E60\u60EF\uFF08\u8BB0\u4F4F/\u67E5\u770B/\u786E\u8BA4/\u66FF\u6362/\u5FD8\u6389\u5199\u4F5C\u504F\u597D\uFF09\uFF1A\u6309\u4F5C\u8005\u6307\u5B9A\u7684\u957F\u7BC7/\u77ED\u7BC7\u7C7B\u578B\uFF0C
+  \u52A0\u8F7D story-long-write \u6216 story-short-write\uFF0C\u7531\u5BF9\u5E94\u5199\u4F5C skill \u7BA1\u7406\uFF1B\u672A\u6307\u5B9A\u65F6\u6309\u5F53\u524D
+  \u4E66\u7C7B\u578B\u9009\u62E9\uFF1A\u6B63\u6587/ \u4E3A\u957F\u7BC7\uFF0C\u6B63\u6587.md \u4E0E\u5C0F\u8282\u5927\u7EB2.md \u6216\u8BBE\u5B9A.md \u4E3A\u77ED\u7BC7\u3002\u65E0\u5F53\u524D\u4E66\u7684
+  \u901A\u7528\u4E60\u60EF\u9ED8\u8BA4\u4EA4 story-long-write\uFF1B\u53EA\u9650\u5B9A\u672C\u4E66\u5374\u65E0\u6CD5\u5B9A\u4F4D\u65F6\u95EE\u54EA\u672C\u4E66\uFF0C\u4E0D\u8981\u6C42\u5148\u5EFA\u4E66\u3002
+  \u8DEF\u7531\u5C42\u4E0D\u8BFB\u5199\u4F5C\u8005\u8BB0\u5FC6\u6587\u4EF6\u3002\u4EC5\u7BA1\u7406\u4E60\u60EF\u65F6\u5B8C\u6210\u5373\u505C\uFF0C\u4E0D\u5EFA\u4E66\u3001\u4E0D\u5199\u6B63\u6587\u3002
 
 \u53EA\u8BF4 /story\u3001\u770B\u4E0D\u51FA\u610F\u56FE\u65F6\uFF0C\u4E0D\u8D34\u8DEF\u7531\u8868\uFF0C\u7ED9\u56DB\u4E2A\u767D\u8BDD\u9009\u9879\uFF1A\u300C\u5F00\u4E00\u672C\u957F\u7BC7\u6216\u63A5\u7740\u5199\u300D\u2192
 story-long-write\uFF1B\u300C\u5199\u4E00\u7BC7\u77ED\u7BC7\u300D\u2192 story-short-write\uFF1B\u300C\u628A\u4E00\u7AE0\u6539\u5F97\u4E0D\u90A3\u4E48 AI\u300D\u2192
@@ -790,6 +783,7 @@ function registerOhStoryHooks(context) {
 }
 
 // src/role-tool.ts
+import { randomUUID } from "node:crypto";
 import { defineTool as defineTool2 } from "@deepseek-ai/dsh-tools";
 
 // src/reference-tool.ts
@@ -872,6 +866,59 @@ function bundledReferenceGuard(definition, tools) {
 
 // src/role-tool.ts
 var OH_STORY_ROLE_TOOL_NAME = "oh_story_role";
+var configuredRoleAgents = /* @__PURE__ */ new WeakSet();
+function configureRoleAgent(agent, role, persona, allow) {
+  if (configuredRoleAgents.has(agent)) return;
+  const systemPrompt = agent.ctx.get("systemPrompt");
+  const tools = agent.ctx.get("tools");
+  if (systemPrompt === void 0 || tools === void 0) throw new Error("Oh Story Role requires the DSH prompt and tool services.");
+  systemPrompt.section({
+    name: "deployment:persona-prefix",
+    order: systemPrompt.getSectionOrder("DEPLOYMENT_PERSONA_PREFIX"),
+    text: persona
+  });
+  tools.restrict({ allow });
+  markOhStoryRoleSession(agent.session, role);
+  configuredRoleAgents.add(agent);
+}
+async function startRole(runtime, role, request) {
+  if (!("startActivation" in runtime)) return runtime.start("spawn", request);
+  const childId = randomUUID();
+  let configured2 = false;
+  const unobserve = request.parent.ctx.on("agent/created", ({ agent }) => {
+    if (agent.id !== childId) return;
+    configureRoleAgent(agent, role, request.persona, request.toolFilter.allow);
+    configured2 = true;
+  }, { global: true });
+  try {
+    const activation = await runtime.startActivation({
+      provider: "spawn",
+      label: request.label,
+      childId,
+      request: { parent: request.parent, prompt: request.prompt, maxDepth: request.maxDepth },
+      signal: request.signal,
+      delivery: "caller"
+    });
+    if (!configured2) {
+      await activation.dispose();
+      throw new Error("DSH did not initialize the Oh Story Role child before publication.");
+    }
+    let disposal;
+    const dispose = () => {
+      request.signal.removeEventListener("abort", cancel);
+      return disposal ??= activation.dispose();
+    };
+    const cancel = () => {
+      void dispose().catch(() => {
+      });
+    };
+    request.signal.addEventListener("abort", cancel, { once: true });
+    if (request.signal.aborted) cancel();
+    return { id: activation.childId, result: activation.result, dispose };
+  } finally {
+    unobserve();
+  }
+}
 var roleTools = {
   // Oh Story 0.8.0 lets the extractor write its own batch input file (never
   // bash). native-hooks fences write/edit to {拆文目录}/_analysis_cache/输入-*.md.
@@ -931,7 +978,7 @@ async function createOhStoryRoleTool(subagents) {
       const allowed = roleToolFilter(args.role).allow.filter((name2) => exec.agent?.ctx.tools.get(name2, exec.agent) !== void 0);
       const runtime = subagents ?? exec.agent.ctx.get("subagents");
       if (runtime === void 0) throw new Error("oh_story_role requires the DSH subagent runtime.");
-      const run = await runtime.start("spawn", {
+      const run = await startRole(runtime, args.role, {
         // DSH persists this label in the child's subagent/descriptor; the
         // native hooks read the Role back from it before the child's first tool call.
         label: ohStoryRoleLabel(args.role),
@@ -966,6 +1013,22 @@ async function registerOhStoryRoleTool(context) {
   ]);
   context.tools.register(referenceDefinition);
   context.tools.guard(bundledReferenceGuard(referenceDefinition, context.tools));
+  if ("startActivation" in context.subagents) {
+    const personas = new Map(await Promise.all(OH_STORY_ROLE_NAMES.map(async (role) => [role, await loadBundledRole(role, void 0, "native-tools")])));
+    context.on("agent/created", ({ agent }) => {
+      const events = agent.session.ownEvents();
+      for (const event of events) observeOhStoryRoleDescriptor(agent.session, event);
+      const role = ohStoryRoleOfSession(agent.session);
+      if (role === void 0) return;
+      const descriptor = events.find((event) => event.type === "subagent/descriptor")?.data;
+      if (typeof descriptor?.persona === "string" && descriptor.toolFilter !== void 0) return;
+      const persona = personas.get(role);
+      if (persona === void 0) return;
+      const tools = agent.ctx.get("tools");
+      const allow = roleToolFilter(role).allow.filter((tool) => tools?.get(tool, agent) !== void 0);
+      configureRoleAgent(agent, role, persona, allow);
+    });
+  }
   let dispose;
   const mount = () => {
     dispose ??= context.tools.register(definition);