dsh-plugin-prompt-tool 0.3.0 → 0.4.0

package/lib/preset-core.mjs

@@ -6,7 +6,7 @@ import { parse } from "yaml";
 * prompt-tool preset 生成核心：与 dsh 插件上下文无关的纯函数，
 * 独立成文件以便单元测试与复用。失败一律抛出（fail loud）。
 */
-const VENDOR_CORDIS = fileURLToPath(new URL("../upstream/dsh-anchored-standard/preset/agent.cordis.yml", import.meta.url));
+const CORDIS_TEMPLATE = fileURLToPath(new URL("../preset/agent.cordis.yml", import.meta.url));
 const ROUTER_FIRST_TURN_BLOCK = `# prompt-tool 本地附加件（最优组合）：首轮只保留计划段 + 训练原句，
 # 并清空自动注入 contexts；子代理直接放行。注册在 tool-bootstrap 之后，
 # 不参与首轮工具目录裁剪——tools 仍由原版 tool-bootstrap 负责。
@@ -69,28 +69,16 @@ const ROUTER_FLASH_PERSONA = [
 	"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, router-guide]`;
-	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}'`);
+/** 按开关向本地 tool-bootstrap 行注入 usePtcMode / bootstrapMaxTokens。 */
+function applyToolBootstrapOptions(source, usePtcMode, bootstrapMaxTokens) {
+	const rowStart = source.indexOf("- id: tool-bootstrap\n  name: ./tool-bootstrap.mjs\n  config:\n");
+	if (rowStart < 0) throw new Error("preset/agent.cordis.yml missing tool-bootstrap config block");
+	const include = source.indexOf("    includeSubagents: true\n", rowStart);
+	if (include < 0) throw new Error("preset/agent.cordis.yml tool-bootstrap row missing includeSubagents");
+	const at = include + 26 + 1;
+	const lines = [`    usePtcMode: ${usePtcMode}`];
+	if (bootstrapMaxTokens !== void 0 && Number.isSafeInteger(bootstrapMaxTokens) && bootstrapMaxTokens > 0) lines.push(`    bootstrapMaxTokens: ${bootstrapMaxTokens}`);
+	return source.slice(0, at) + lines.join("\n") + "\n" + source.slice(at);
 }
 /** 给 subagent/subagent_fork 行加 dsh-router-standard 的 Flash 子代理方案；关闭时保持继承主会话路由。 */
 function applySubagentFlash(source, enabled, provider, model) {
@@ -120,24 +108,140 @@ function applySubagentFlash(source, enabled, provider, model) {
 ${agentOptions}
         persona: |-
 ${persona}`;
-		if (!out.includes(block)) throw new Error(`vendor agent.cordis.yml missing ${target.id} row`);
+		if (!out.includes(block)) throw new Error(`preset/agent.cordis.yml missing ${target.id} row`);
 		out = out.replace(block, replaced);
 	}
 	return out;
 }
+/** 给生成的 tool-bootstrap.mjs 打补丁：子代理全量放行 + 可选的 PTC 呈现切换。 */
+function patchToolBootstrap(source) {
+	source = source.replace(/\r\n/g, "\n");
+	const original = [
+		"    const assembled = await next()",
+		"    try {",
+		"      const status = promotion.status(context.agent)"
+	].join("\n");
+	const replacement = [
+		"    const assembled = await next()",
+		"    try {",
+		"      const agent = context.agent",
+		"      if (agent === undefined) return assembled",
+		"      // prompt-tool patch: subagents skip catalog narrowing and use assembled tools directly.",
+		"      // Callers (such as dsh-mnemon) already filter assembled.tools through their own whitelists.",
+		"      // New plugin tools with any prefix therefore appear in the subagent first session automatically.",
+		"      agentBySession.set(agent.session, agent)",
+		"      if ((agent.session?.header?.delegationDepth ?? 0) > 0) {",
+		"        if (usePtcMode) applyCodePresentation(agent)",
+		"        return assembled",
+		"      }",
+		"      const status = promotion.status(agent)"
+	].join("\n");
+	if (!source.includes(original)) throw new Error("tool-bootstrap.mjs assembled marker missing");
+	source = source.replace(original, replacement);
+	const allowedOriginal = "const ALLOWED_KEYS = new Set(['bootstrapTools', 'promoteOn', 'bootstrapMaxTokens', 'compactionTools', 'includeSubagents'])";
+	const allowedReplacement = "const ALLOWED_KEYS = new Set(['bootstrapTools', 'promoteOn', 'bootstrapMaxTokens', 'compactionTools', 'includeSubagents', 'usePtcMode'])";
+	if (!source.includes(allowedOriginal)) throw new Error("tool-bootstrap.mjs ALLOWED_KEYS marker missing");
+	source = source.replace(allowedOriginal, allowedReplacement);
+	const parseOriginal = "  const includeSubagents = booleanOption(source.includeSubagents, 'includeSubagents', false)";
+	const parseReplacement = "  const includeSubagents = booleanOption(source.includeSubagents, 'includeSubagents', false)\n  const usePtcMode = booleanOption(source.usePtcMode, 'usePtcMode', true)";
+	if (!source.includes(parseOriginal)) throw new Error("tool-bootstrap.mjs includeSubagents parse marker missing");
+	source = source.replace(parseOriginal, parseReplacement);
+	const trackerOriginal = ["  const promotion = createEpochPromotion(promoteEvents, { includeSubagents })", "  ctx.on('session/event', (session, event) => promotion.observe(session, event))"].join("\n");
+	const trackerReplacement = [
+		"  const promotion = createEpochPromotion(promoteEvents, { includeSubagents })",
+		"",
+		"  // prompt-tool patch: optional Code Mode (PTC) wire presentation after promotion.",
+		"  const presentationBySession = new WeakMap()",
+		"  const agentBySession = new WeakMap()",
+		"  const presentationState = (session) => {",
+		"    let state = presentationBySession.get(session)",
+		"    if (state === undefined) {",
+		"      state = { applied: false, disposer: undefined }",
+		"      presentationBySession.set(session, state)",
+		"    }",
+		"    return state",
+		"  }",
+		"  const applyCodePresentation = (agent) => {",
+		"    const session = agent?.session",
+		"    if (session === undefined) return",
+		"    const state = presentationState(session)",
+		"    if (state.applied) return",
+		"    const tools = agent.ctx?.tools",
+		"    if (tools === undefined || typeof tools.presentAs !== 'function') return",
+		"    state.disposer = tools.presentAs('code')",
+		"    state.applied = true",
+		"  }",
+		"  const releaseCodePresentation = (session) => {",
+		"    const state = presentationBySession.get(session)",
+		"    if (state === undefined) return",
+		"    if (typeof state.disposer === 'function') {",
+		"      try { state.disposer() } catch { /* never brick the session */ }",
+		"    }",
+		"    state.disposer = undefined",
+		"    state.applied = false",
+		"  }",
+		"  ctx.on('session/event', (session, event) => promotion.observe(session, event))",
+		"",
+		"  ctx.on('session/event', (session, event) => {",
+		"    if (!usePtcMode) return",
+		"    if (event.type === 'compaction/end') {",
+		"      releaseCodePresentation(session)",
+		"      return",
+		"    }",
+		"    if (event.type !== 'step/end' && event.type !== 'turn/end') return",
+		"    const agent = agentBySession.get(session)",
+		"    if (agent !== undefined && promotion.status(agent).promoted) applyCodePresentation(agent)",
+		"  })"
+	].join("\n");
+	if (!source.includes(trackerOriginal)) throw new Error("tool-bootstrap.mjs promotion tracker marker missing");
+	source = source.replace(trackerOriginal, trackerReplacement);
+	const promotedStart = source.indexOf("      if (status.promoted) {\n        // PROMOTED:");
+	const promotedEnd = source.indexOf("      // Controlled phase:", promotedStart);
+	if (promotedStart < 0 || promotedEnd < 0) throw new Error("tool-bootstrap.mjs promoted/controlled marker missing");
+	const promotedReplacement = [
+		"      if (status.promoted) {",
+		"        // prompt-tool patch: both modes keep the assembled catalog after promotion.",
+		"        // usePtcMode switches the wire presentation instead of narrowing resident tools.",
+		"        if (usePtcMode) applyCodePresentation(agent)",
+		"        return assembled",
+		"      }",
+		""
+	].join("\n");
+	source = source.slice(0, promotedStart) + promotedReplacement + source.slice(promotedEnd);
+	const residentOriginal = "const RESIDENT_DISCOVERY_TOOLS = ['dev_tool_search', 'skill_search', 'skill_load']\n\n";
+	if (source.includes(residentOriginal)) source = source.replace(residentOriginal, "");
+	const unlockedStart = source.indexOf("/**\n   * Tool names the model explicitly unlocked via `dev_tool_search`");
+	const unlockedEnd = source.indexOf("  /** Narrow the assembled catalog", unlockedStart);
+	if (unlockedStart >= 0 && unlockedEnd > unlockedStart) source = source.slice(0, unlockedStart) + source.slice(unlockedEnd);
+	const headerStart = source.indexOf(" * POST-PROMOTION RESIDENT SET");
+	const headerEnd = source.indexOf(" * COMPACTION (local addition)", headerStart);
+	if (headerStart >= 0 && headerEnd > headerStart) {
+		const headerReplacement = [
+			" * POST-PROMOTION CATALOG (prompt-tool patch): after promotion both modes",
+			" * keep the assembled catalog. `usePtcMode` switches the wire presentation",
+			" * to Code Mode (PTC, single run_code) instead of narrowing the resident set.",
+			" * The controlled phase below still narrows the catalog before promotion and",
+			" * after compaction.",
+			""
+		].join(String.fromCharCode(10));
+		source = source.slice(0, headerStart) + headerReplacement + source.slice(headerEnd);
+	}
+	return source;
+}
 function buildCordis(prompt, options = {}) {
 	const anchorFirstTurn = options.anchorFirstTurn === true;
 	const anchorCustom = options.anchorCustom === true;
 	const guideCustom = options.guideCustom === true;
 	const guideText = typeof options.guideText === "string" && options.guideText.length > 0 ? options.guideText : "";
 	const injectPrompt = options.injectPrompt !== false;
+	const usePtcMode = options.usePtcMode !== false;
 	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 = 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 up = applyToolBootstrapOptions(applySubagentFlash(readFileSync(CORDIS_TEMPLATE, "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"), usePtcMode, options.bootstrapMaxTokens);
 	const bootstrap = /^-\s+id:\s+tool-bootstrap\s*$/m.exec(up);
-	if (!bootstrap) throw new Error("vendor agent.cordis.yml missing tool-bootstrap row");
+	if (!bootstrap) throw new Error("preset/agent.cordis.yml missing tool-bootstrap row");
 	let cursor = up.indexOf("\n", bootstrap.index);
-	if (cursor < 0) throw new Error("vendor agent.cordis.yml has no top-level row after tool-bootstrap");
+	if (cursor < 0) throw new Error("preset/agent.cordis.yml has no top-level row after tool-bootstrap");
 	cursor += 1;
 	let insertAt = -1;
 	while (cursor <= up.length) {
@@ -150,7 +254,7 @@ function buildCordis(prompt, options = {}) {
 		if (lineEnd < 0) break;
 		cursor = lineEnd + 1;
 	}
-	if (insertAt < 0) throw new Error("vendor agent.cordis.yml has no top-level row after tool-bootstrap");
+	if (insertAt < 0) throw new Error("preset/agent.cordis.yml has no top-level row after tool-bootstrap");
 	const head = up.slice(0, insertAt);
 	const tail = up.slice(insertAt);
 	const separator = head.endsWith("\n\n") ? "" : head.endsWith("\n") ? "\n" : "\n\n";
@@ -186,4 +290,4 @@ function buildCordis(prompt, options = {}) {
 	return out;
 }
 //#endregion
-export { buildCordis, parseFrontmatter };
+export { buildCordis, parseFrontmatter, patchToolBootstrap };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-prompt-tool",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "DSH 插件：提示词工具，规范模型的思维链与回答内容，提供 Web UI 编辑 preset.md 与 AGENTS.md，并按 skills 目录注册可开关技能。",
   "license": "MIT",
   "repository": {
@@ -36,30 +36,30 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-skill": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-skill": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.7",
     "@deepseek-ai/schemastery": "^3.18.1",
     "react": "^18.2.0",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.7"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-commands": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-skill": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-skill": "^0.1.0-rc.7",
     "@types/node": "^26.2.0",
     "@types/react": "~18.3.1",
     "clsx": "^2.1.1",

package/plan.md

@@ -1,4 +1,24 @@
 # dsh-plugin-prompt-tool 重新设计计划（v2）
+> **v2.19 preset 脚本审查清理（当前实现）**：抽取 `shared.mjs` 公共工具；
+> router-first-turn 不再重复清 contexts（交给 context-gate）；router-first-turn /
+> router-guide / prompt-injector 统一使用 epoch-aware 晋升状态；修正 stale 注释与未用变量。
+
+> **v2.18 全部预设脚本自有化**：`preset/` 新增 shared / context-gate /
+> compaction-epoch / custom-bash / instruction-hint / skill-search / tool-bootstrap 最终快照；
+> 公共配置校验、晋升解析、消息工具合并进 `shared.mjs`；运行时不再直读 `upstream/` 任何文件，
+> `upstream/` 仅作溯源与 sync 对照。
+
+> **v2.17 agent.cordis.yml 脱离上游**：新增自有模板 `preset/agent.cordis.yml`；
+> 运行时不再直读 `upstream/.../agent.cordis.yml`，动态项仅由 `buildCordis` 注入。
+
+> **v2.16 使用 PTC 模式开关**：新增 `usePtcMode`（默认开启）。
+> 开启=晋升后把 wire 切换为 Code Mode（PTC，单一 run_code），完整插件工具经生成 SDK 调用；
+> 关闭=晋升后恢复原生完整工具目录；两种模式都不再依赖 `dev_tool_search`，生成 preset 时直接移除该行且不复制 `dev-tool-search.mjs`。
+
+> **v2.15 上游同步**：同步上游到 `25f21ae`；移除
+> `customBashPath` 生成时改写，直接沿用上游 custom-bash 运行时探测。
+> 新增 `bootstrapMaxTokens` 开关（0=关闭；正整数写入上游 tool-bootstrap）。
+
 > **v2.14 上游同步与路径校对（当前实现）**：已从上游 main 同步到
 > `ba7a27c`；新增 context-gate.mjs；custom-bash 的固定路径在生成时归一化为
 > `customBashPath`（默认 bash.exe，PATH 查找）。
@@ -57,8 +77,8 @@ artifacts/（本地调试残留）。
 | 首轮输出预算 | `bootstrapMaxTokens: 1024` 固定 | **opt-in，默认无 cap**（adapter 默认 256000 流过） | 实测（issue #11）：Minimal schema 在 256000 下锚定 5/5（`We need` 首行、`we` 1.4、`let me` 0.0），而 pwsh/read 等标准家族 schema 在 256000 下 11/11 全失败——**工具 schema 是决定性变量，不是 cap** |
 | agent.cordis.yml 结构 | 无 Minimal 组 | 新增 `persistent-shell` 组（dsh-terminal + dsh-terminal-bash + dsh-tool-bash-persistent）与 `bootstrap-filesystem` 组（dsh-fs-local + dsh-tool-str-replace-editor），与官方 minimal 字节一致；`tool-bash` 行全平台禁用（避免 `bash` 名重复注册） | 完全复制；prompt-injector 仍插在 tool-bootstrap 行后 |
 | tool-bootstrap 参数 | `shellTools`+`commonTools` | `bootstrapTools: [bash, str_replace_editor]`；cap 监听器仅在显式设置 cap 时注册 | prompt-injector 逻辑不变（we 检测 + promoted 检测与参数无关） |
-| 验证工具 | 无 | `verify/run-verify.mjs` + `verify-runner.mjs`：preset-roster compose + CLI driver，`--stop-after-first-assistant` 只测首请求（秒级） | 本地 harness 源码未构建（`apps/cli/lib/bin.js` 不存在），暂继续用 prebuilt rc.6 的 dsh web HTTP API；将来构建 harness 后可切换 |
-| cap 行为差异 | — | rc.5 源码 checkout 上 cap 能到达首请求；rc.6 prebuilt 包会覆盖为 adapterDefaults | 与我们无关（默认不设 cap） |
+| 验证工具 | 无 | `verify/run-verify.mjs` + `verify-runner.mjs`：preset-roster compose + CLI driver，`--stop-after-first-assistant` 只测首请求（秒级） | 本地 harness 源码未构建（`apps/cli/lib/bin.js` 不存在），暂继续用 prebuilt rc.7 的 dsh web HTTP API；将来构建 harness 后可切换 |
+| cap 行为差异 | — | rc.5 源码 checkout 上 cap 能到达首请求；rc.6 prebuilt 包会覆盖为 adapterDefaults；rc.7 修复 max-tokens 截断后的 replay 续跑 | 默认不设 cap；开启 bootstrapMaxTokens 时 rc.7 更稳 |
 
 结论：**设计骨架不变**（完全复制原版 + prompt-injector 附加件），只是复制源更新为
 新版文件，测试断言从 `pwsh/read + 1024` 改为 `bash/str_replace_editor + 无 cap`。