dsh-plugin-prompt-tool 0.1.4 → 0.2.0

package/lib/preset-core.d.mts

@@ -10,11 +10,22 @@ declare function parseFrontmatter(text: string): {
   body: string;
 };
 interface BuildCordisOptions {
-  /** 首轮独立锚定轮：首个用户消息先入 next-step inbox，首步只发 anchorText。 */
+  /** 首轮近距离锚定：首条真实用户消息后追加一次性首句锚点。 */
   anchorFirstTurn?: boolean;
+  /** 自定义锚点文本；anchorCustom=true 时固定使用。 */
   anchorText?: string;
+  /** 自定义锚点开关：true 固定使用 anchorText；false 按任务自动选择。 */
+  anchorCustom?: boolean;
   /** 锚定确认后注入 preset.md；关闭时仍保留工具引导，但不注册 prompt-injector 行。 */
   injectPrompt?: boolean;
+  /** 子代理固定 Flash 模型：true 时给 subagent/subagent_fork 行加 agentOptions。 */
+  subagentFlash?: boolean;
+  /** 子代理 Flash 路由 provider（默认 deepseek-official）。 */
+  subagentFlashProvider?: string;
+  /** 子代理 Flash 模型名（默认 deepseek-v4-flash）。 */
+  subagentFlashModel?: string;
+  /** Windows custom-bash 可执行名或路径；默认 bash.exe（PATH 查找）。 */
+  bashPath?: string;
 }
 declare function buildCordis(prompt: string, options?: BuildCordisOptions): string;
 //#endregion

package/lib/preset-core.mjs

@@ -6,26 +6,32 @@ import { parse } from "yaml";
 * prompt-tool preset 生成核心：与 dsh 插件上下文无关的纯函数，
 * 独立成文件以便单元测试与复用。失败一律抛出（fail loud）。
 */
-const VENDOR_CORDIS = fileURLToPath(new URL("../vendor/dsh-anchored-standard/preset/agent.cordis.yml", import.meta.url));
-const LOCAL_INJECTOR_BLOCK = `# prompt-tool 附加件：锚定确认后注入 preset.md。注册在 tool-bootstrap 之后，
-# 不参与首轮剥离顺序；tools / 上下文剥离全部由原版 tool-bootstrap 负责
-# （首轮 = Minimal 真实 schema：持久 bash + str_replace_editor，无输出 cap），
-# 此插件只做一件事——锚定轮结束后（we 确认或兜底）注入一次提示词。
+const VENDOR_CORDIS = fileURLToPath(new URL("../upstream/dsh-anchored-standard/preset/agent.cordis.yml", import.meta.url));
+const ROUTER_FIRST_TURN_BLOCK = `# prompt-tool 本地附加件（最优组合）：首轮只保留计划段 + 训练原句，
+# 并清空自动注入 contexts；子代理直接放行。注册在 tool-bootstrap 之后，
+# 不参与首轮工具目录裁剪——tools 仍由原版 tool-bootstrap 负责。
+- id: router-first-turn
+  name: ./router-first-turn.mjs
+`;
+const NEAR_ANCHOR_BLOCK = `# prompt-tool 近距离首句锚定：在首条真实用户消息之后追加一次性锚点。
+# 不拆轮、不挪任务；useCustom=false 时按任务自动选择 we/let 首句，
+# useCustom=true 时固定使用 anchorText。
+- id: near-anchor
+  name: ./near-anchor.mjs
+  config:
+    anchorText: |-
+      __ANCHOR_TEXT__
+    useCustom: __USE_CUSTOM__
+`;
+const LOCAL_INJECTOR_BLOCK = `# prompt-tool 附加件：锚定确认后注入 preset.md。注册在工具引导之后，
+# 不参与首轮剥离顺序；tools / 上下文剥离由 tool-bootstrap 与
+# router-first-turn 负责（首轮 = Minimal 真实 schema + 训练原句）。
 - id: prompt-injector
   name: ./prompt-injector.mjs
   config:
     promptText: |-
       __PROMPT_TOOL_TEXT__
 `;
-const TURN_ANCHOR_BLOCK = `# prompt-tool 可选附加件：首轮独立锚定轮。启用后首个真实用户消息先入
-# next-step inbox，首步只发 anchorText；模型回应锚定句后，driver 在同轮
-# 内自动消费任务继续执行。关闭时不生成此行。
-- id: turn-anchor
-  name: ./turn-anchor.mjs
-  config:
-    anchorText: |-
-      __ANCHOR_TEXT__
-`;
 function parseFrontmatter(text) {
 	const match = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/.exec(text);
 	if (!match) return {
@@ -45,12 +51,76 @@ function parseFrontmatter(text) {
 		body: text.slice(match[0].length)
 	};
 }
+/** dsh-router-standard 的 Flash 弱路由 persona（子代理版）。 */
+const ROUTER_FLASH_PERSONA = [
+	"You are a helpful assistant.",
+	"Before acting, decide the task type (build or fix) and adopt the matching style: build → hands-on production; fix → inspect-and-plan.",
+	"Before acting, briefly review what you have already done in this session and continue from where you left off; do not repeat completed steps. Do not run environment checks (echo, whoami, uname, node --version, date) or exhaustive grep/glob scans.",
+	"Think deeply first, then produce."
+].join("\n");
+/** 适配上游 context-gate：保留 near-anchor 消息；子代理沿用全量放行策略。 */
+function normalizeContextGate(source) {
+	const block = `- id: context-gate
+  name: ./context-gate.mjs
+  config:
+    promoteOn: either
+    includeSubagents: true
+    allowKinds: [skill-invocation]`;
+	const replaced = `- id: context-gate
+  name: ./context-gate.mjs
+  config:
+    promoteOn: either
+    includeSubagents: false
+    allowKinds: [skill-invocation, near-anchor]`;
+	if (!source.includes(block)) throw new Error("vendor agent.cordis.yml missing context-gate row");
+	return source.replace(block, replaced);
+}
+/** 上游可能携带作者机器固定路径；生成时统一改写为可配置 bashPath。 */
+function normalizeBashPath(source, bashPath) {
+	const marker = /bashPath:\s*'[^']*'/.exec(source);
+	if (marker === null) throw new Error("vendor agent.cordis.yml missing bashPath row");
+	return source.replace(marker[0], `bashPath: '${bashPath}'`);
+}
+/** 给 subagent/subagent_fork 行加 dsh-router-standard 的 Flash 子代理方案；关闭时保持继承主会话路由。 */
+function applySubagentFlash(source, enabled, provider, model) {
+	if (!enabled) return source;
+	const agentOptions = `        agentOptions:
+          provider: ${provider}
+          model: ${model}`;
+	const persona = ROUTER_FLASH_PERSONA.split("\n").map((line) => `          ${line}`).join("\n");
+	const targets = [{
+		id: "tool-subagent",
+		toolName: "subagent",
+		provider: "spawn"
+	}, {
+		id: "tool-subagent-fork",
+		toolName: "subagent_fork",
+		provider: "fork"
+	}];
+	let out = source;
+	for (const target of targets) {
+		const block = `    - id: ${target.id}
+      name: '@deepseek-ai/dsh-tool-subagent'
+      config:
+        provider: ${target.provider}
+        toolName: ${target.toolName}
+        backgroundMode: continuable`;
+		const replaced = `${block}
+${agentOptions}
+        persona: |-
+${persona}`;
+		if (!out.includes(block)) throw new Error(`vendor agent.cordis.yml missing ${target.id} row`);
+		out = out.replace(block, replaced);
+	}
+	return out;
+}
 function buildCordis(prompt, options = {}) {
 	const anchorFirstTurn = options.anchorFirstTurn === true;
+	const anchorCustom = options.anchorCustom === true;
 	const injectPrompt = options.injectPrompt !== false;
-	const anchorText = typeof options.anchorText === "string" && options.anchorText.length > 0 ? options.anchorText : "You are a helpful software assistant.\n\nBegin every reasoning block with 'We need'.";
+	const anchorText = typeof options.anchorText === "string" && options.anchorText.length > 0 ? options.anchorText : "";
 	const indent = (s) => s.split(/\r?\n/).map((l) => l.length === 0 ? "" : "      " + l).join("\n");
-	const up = readFileSync(VENDOR_CORDIS, "utf8").replace(/\r\n/g, "\n");
+	const up = normalizeContextGate(normalizeBashPath(applySubagentFlash(readFileSync(VENDOR_CORDIS, "utf8").replace(/\r\n/g, "\n"), options.subagentFlash === true, typeof options.subagentFlashProvider === "string" && options.subagentFlashProvider.length > 0 ? options.subagentFlashProvider : "deepseek-official", typeof options.subagentFlashModel === "string" && options.subagentFlashModel.length > 0 ? options.subagentFlashModel : "deepseek-v4-flash"), typeof options.bashPath === "string" && options.bashPath.length > 0 ? options.bashPath : "bash.exe"));
 	const bootstrap = /^-\s+id:\s+tool-bootstrap\s*$/m.exec(up);
 	if (!bootstrap) throw new Error("vendor agent.cordis.yml missing tool-bootstrap row");
 	let cursor = up.indexOf("\n", bootstrap.index);
@@ -71,11 +141,12 @@ function buildCordis(prompt, options = {}) {
 	const head = up.slice(0, insertAt);
 	const tail = up.slice(insertAt);
 	const separator = head.endsWith("\n\n") ? "" : head.endsWith("\n") ? "\n" : "\n\n";
-	const parts = [];
+	const parts = [ROUTER_FIRST_TURN_BLOCK];
 	if (anchorFirstTurn) {
 		const anchorMarker = "    anchorText: |-\n      __ANCHOR_TEXT__";
-		if (!TURN_ANCHOR_BLOCK.includes(anchorMarker)) throw new Error("internal error: turn-anchor template lost its anchorText placeholder");
-		parts.push(TURN_ANCHOR_BLOCK.replace(anchorMarker, "    anchorText: |-\n" + indent(anchorText)));
+		if (!NEAR_ANCHOR_BLOCK.includes(anchorMarker)) throw new Error("internal error: near-anchor template lost its anchorText placeholder");
+		const anchorBlock = NEAR_ANCHOR_BLOCK.replace("    useCustom: __USE_CUSTOM__", `    useCustom: ${anchorCustom}`).replace(anchorMarker, "    anchorText: |-\n" + (anchorText.length > 0 ? indent(anchorText) : "      "));
+		parts.push(anchorBlock);
 	}
 	if (injectPrompt) {
 		const promptMarker = "    promptText: |-\n      __PROMPT_TOOL_TEXT__";
@@ -84,7 +155,7 @@ function buildCordis(prompt, options = {}) {
 	}
 	const extra = parts.join("\n");
 	const out = head + separator + extra + "\n" + tail;
-	if (injectPrompt && out.includes("__PROMPT_TOOL_TEXT__") || anchorFirstTurn && out.includes("__ANCHOR_TEXT__")) throw new Error("internal error: preset template placeholder was not replaced");
+	if (injectPrompt && out.includes("__PROMPT_TOOL_TEXT__") || anchorFirstTurn && (out.includes("__ANCHOR_TEXT__") || out.includes("__USE_CUSTOM__"))) throw new Error("internal error: preset template placeholder was not replaced");
 	let parsed;
 	try {
 		parsed = parse(out, { logLevel: "silent" });
@@ -93,9 +164,11 @@ function buildCordis(prompt, options = {}) {
 	}
 	if (!Array.isArray(parsed)) throw new Error("generated agent.cordis.yml is not a YAML array");
 	const ids = new Set(parsed.map((row) => row?.id));
+	if (!ids.has("router-first-turn")) throw new Error("generated agent.cordis.yml is missing the router-first-turn row");
 	if (injectPrompt && !ids.has("prompt-injector")) throw new Error("generated agent.cordis.yml is missing the prompt-injector row");
 	if (!injectPrompt && ids.has("prompt-injector")) throw new Error("generated agent.cordis.yml still contains the prompt-injector row");
-	if (anchorFirstTurn && !ids.has("turn-anchor")) throw new Error("generated agent.cordis.yml is missing the turn-anchor row");
+	if (anchorFirstTurn && !ids.has("near-anchor")) throw new Error("generated agent.cordis.yml is missing the near-anchor row");
+	if (!anchorFirstTurn && ids.has("near-anchor")) throw new Error("generated agent.cordis.yml still contains the near-anchor row");
 	return out;
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-prompt-tool",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "DSH 插件：提示词工具，规范模型的思维链与回答内容，提供 Web UI 编辑 preset.md 与 AGENTS.md，并按 skills 目录注册可开关技能。",
   "license": "MIT",
   "repository": {
@@ -74,21 +74,20 @@
     "cordis.patch.yml",
     "LICENSE",
     "preset",
-    "vendor/dsh-anchored-standard/preset",
-    "vendor/dsh-anchored-standard/LICENSE",
-    "vendor/dsh-anchored-standard/NOTICE",
     "skills",
     "preset.md",
     "AGENTS.md",
     "plan.md",
-    "README.md"
+    "README.md",
+    "upstream/dsh-anchored-standard"
   ],
   "scripts": {
     "build": "tsdown",
     "prepare": "tsdown",
     "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.client.json --noEmit",
     "lint": "oxlint src test tsdown.config.ts",
-    "test": "pnpm build && node --test \"test/*.test.mjs\""
+    "test": "pnpm build && node --test \"test/*.test.mjs\"",
+    "sync:anchored": "node scripts/sync-anchored.mjs"
   },
   "dependencies": {
     "yaml": "^2.9.0"