dsh-plugin-prompt-tool 0.3.1 → 0.4.1

package/lib/index.mjs

@@ -1,15 +1,239 @@
 import { buildCordis, parseFrontmatter } from "./preset-core.mjs";
 import z from "@deepseek-ai/schemastery";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
-import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 import { homedir } from "node:os";
+//#region src/web-surface.ts
+/**
+* prompt-tool 自愈层：补 profile manifest 与本插件相关的装配项。
+*
+* 官方 profile 组合规则：`dsh plugin add` 只把声明了 `dsh.bundle` 的
+* **直接依赖**追加进 `dsh.profile.bundles`，而 `@deepseek-ai/dsh-web-app`
+* 是随 dsh 安装自带的 in-box bundle。自定义 profile（如 prompt-tool）
+* 首次初始化只含 `@deepseek-ai/dsh-base`，单独执行
+* `dsh plugin --profile prompt-tool add link:<本仓库>` 后，本插件等待的
+* `webServer` 服务不存在。
+*
+* 因此：
+*  1. 当前 profile 缺 webServer 时，把 web-app 补进当前 profile 的
+*     bundles（base 之后、本插件之前），重启一次后生效；
+*  2. 同级 `web` / `dsh-tui` profile 存在时，只把
+*     `dsh-plugin-prompt-tool` 写进它们的 dependencies + bundles。
+*     node_modules 的物化交给官方 `dsh plugin --profile <name> install`
+*     （本质是 pnpm）完成，本插件不手工创建链接。
+*     `dsh-tui` 只有在确实装有 `@deepseek-harness-tui/dsh-tui` 时才处理，
+*     否则整体跳过——不写入本插件。dsh-tui **不需要** web-app。
+*
+* 官方 Loader 只会在进程启动时读取 profile 的 bundles 列表，因此本层只
+* 持久化 manifest 并提示重启，不做运行中热挂载。所有写入都是幂等的。
+* 当前 profile 首次补上 web-app 后会自动退出（exit 0），完成初始化。
+*
+* 失败只降级为日志告警，绝不阻断启动。
+*/
+const FALLBACK_WEB_APP_BUNDLE = "@deepseek-ai/dsh-web-app";
+const BASE_BUNDLE = "@deepseek-ai/dsh-base";
+const PLUGIN_BUNDLE = "dsh-plugin-prompt-tool";
+const TUI_BUNDLE = "@deepseek-harness-tui/dsh-tui";
+const SIBLING_PROFILES = ["web", "dsh-tui"];
+/** 首次初始化完成后的自动退出延迟，给日志落盘与终端刷新留时间。 */
+const AUTO_EXIT_DELAY_MS = 500;
+/**
+* 从本插件自己的 package.json 读取 `dsh.bundle.requires` 中声明的
+* Web surface bundle（缺失时回退到 @deepseek-ai/dsh-web-app）。
+* 这样“把 web-app 补进本插件 package.json”就是装配事实，而不是散落的魔法字符串。
+*/
+function readWebAppBundle() {
+	try {
+		const manifestPath = new URL("../package.json", import.meta.url);
+		const requires = JSON.parse(readFileSync(manifestPath, "utf8")).dsh?.bundle?.requires;
+		if (Array.isArray(requires)) {
+			const first = requires.find((entry) => typeof entry === "string");
+			if (first !== void 0 && first.length > 0) return first;
+		}
+	} catch {}
+	return FALLBACK_WEB_APP_BUNDLE;
+}
+const WEB_APP_BUNDLE = readWebAppBundle();
+/** 从 loader 根 Include 的 baseUrl 推导 profile 目录。 */
+function resolveProfileDir(ctx) {
+	const baseUrl = ctx.baseUrl;
+	if (typeof baseUrl !== "string" || baseUrl.length === 0) return void 0;
+	try {
+		return fileURLToPath(new URL(".", baseUrl));
+	} catch {
+		return;
+	}
+}
+function readManifest(packagePath, warn) {
+	try {
+		return JSON.parse(readFileSync(packagePath, "utf8"));
+	} catch (error) {
+		warn(`prompt-tool: cannot read profile manifest ${packagePath}: ${error instanceof Error ? error.message : String(error)}`);
+		return;
+	}
+}
+function writeManifest(packagePath, manifest, warn) {
+	try {
+		writeFileSync(packagePath, JSON.stringify(manifest, null, 2) + "\n", "utf8");
+		return true;
+	} catch (error) {
+		warn(`prompt-tool: cannot update profile manifest ${packagePath}: ${error instanceof Error ? error.message : String(error)}`);
+		return false;
+	}
+}
+/** dsh-tui profile 是否真的装着 dsh-tui（依赖声明或 bundle 层都算）。 */
+function hasDshTui(manifest) {
+	return manifest.dependencies?.[TUI_BUNDLE] !== void 0 || manifest.dsh?.profile?.bundles?.includes(TUI_BUNDLE) === true;
+}
+/**
+* 把 web-app 补进当前 profile 的 bundles（base 之后、本插件之前）。
+* 只用于当前 prompt-tool profile；dsh-tui 不需要 web-app。
+*/
+function ensureCurrentWebAppBundle(manifest) {
+	const bundles = manifest.dsh?.profile?.bundles;
+	if (!Array.isArray(bundles)) return "invalid";
+	if (bundles.includes(WEB_APP_BUNDLE)) return "already";
+	const pluginIndex = bundles.indexOf(PLUGIN_BUNDLE);
+	const baseIndex = bundles.indexOf(BASE_BUNDLE);
+	const insertAt = pluginIndex >= 0 ? pluginIndex : baseIndex >= 0 ? baseIndex + 1 : bundles.length;
+	bundles.splice(insertAt, 0, WEB_APP_BUNDLE);
+	return "added";
+}
+/**
+* 把本插件补进同级 profile 的 dependencies + bundles。
+* @returns 实际写入的条目描述；返回 undefined 表示跳过/失败。
+*/
+function ensurePluginInSiblingProfile(packagePath, manifest, pluginSpec, warn) {
+	const bundles = manifest.dsh?.profile?.bundles;
+	if (!Array.isArray(bundles)) {
+		warn(`prompt-tool: sibling profile manifest has no dsh.profile.bundles: ${packagePath}`);
+		return;
+	}
+	const hasDependency = manifest.dependencies?.[PLUGIN_BUNDLE] !== void 0;
+	const added = [];
+	if (!hasDependency) {
+		if (typeof pluginSpec !== "string" || pluginSpec.length === 0) {
+			warn(`prompt-tool: skip sibling profile ${packagePath} — current profile declares no install spec for ${PLUGIN_BUNDLE}`);
+			return;
+		}
+		manifest.dependencies = {
+			...manifest.dependencies,
+			[PLUGIN_BUNDLE]: pluginSpec
+		};
+		added.push(`dependency ${PLUGIN_BUNDLE}=${pluginSpec}`);
+	}
+	if (!bundles.includes(PLUGIN_BUNDLE)) {
+		bundles.push(PLUGIN_BUNDLE);
+		added.push(`bundle ${PLUGIN_BUNDLE}`);
+	}
+	if (added.length === 0) return void 0;
+	if (!writeManifest(packagePath, manifest, warn)) return void 0;
+	return added.join(", ");
+}
+/** 自愈同级 web / dsh-tui profile；只写 package.json，不创建 node_modules 链接。 */
+function healSiblingProfiles(profileDir, pluginSpec, warn) {
+	const profilesDir = join(profileDir, "..");
+	for (const profileName of SIBLING_PROFILES) {
+		const packagePath = join(profilesDir, profileName, "package.json");
+		if (!existsSync(packagePath)) {
+			warn(`prompt-tool: skip sibling heal for "${profileName}" — profile package.json not found`);
+			continue;
+		}
+		const manifest = readManifest(packagePath, warn);
+		if (manifest === void 0) continue;
+		if (profileName === "dsh-tui" && !hasDshTui(manifest)) {
+			warn(`prompt-tool: skip sibling heal for "dsh-tui" — ${TUI_BUNDLE} is not installed; dsh-plugin-prompt-tool will not be written into it`);
+			continue;
+		}
+		const changes = ensurePluginInSiblingProfile(packagePath, manifest, pluginSpec, warn);
+		if (changes !== void 0) warn(`prompt-tool: healed sibling profile "${profileName}": added ${changes}`);
+	}
+}
+/**
+* 每次启动：
+*  1. 同级 web / dsh-tui 补本插件（dsh-tui 未安装则跳过）；
+*  2. 当前 profile 缺 webServer 时补 web-app 并提示重启。
+* webServer 已存在时当前 profile 无需处理，但同级自愈仍会执行（幂等）。
+*/
+function ensureWebSurface(ctx, warn) {
+	const notify = (message) => {
+		process.stderr.write(message + "\n");
+		warn(message);
+	};
+	const profileDir = resolveProfileDir(ctx);
+	if (profileDir === void 0) {
+		notify("prompt-tool: cannot locate profile directory to repair bundles; add @deepseek-ai/dsh-web-app to dsh.profile.bundles manually");
+		return;
+	}
+	const packagePath = join(profileDir, "package.json");
+	const manifest = readManifest(packagePath, notify);
+	if (manifest === void 0) return;
+	healSiblingProfiles(profileDir, typeof manifest.dependencies?.[PLUGIN_BUNDLE] === "string" ? manifest.dependencies[PLUGIN_BUNDLE] : void 0, notify);
+	const profileName = basename(profileDir);
+	if (profileName === "dsh-tui" || hasDshTui(manifest)) return;
+	if (ctx.get("webServer") !== void 0) return;
+	const result = ensureCurrentWebAppBundle(manifest);
+	if (result === "invalid") {
+		notify(`prompt-tool: profile manifest has no dsh.profile.bundles: ${packagePath}`);
+		return;
+	}
+	if (result === "added" && !writeManifest(packagePath, manifest, notify)) return;
+	if (result === "added") {
+		notify(`prompt-tool: auto-added ${WEB_APP_BUNDLE} to dsh.profile.bundles for profile "${profileName}"; next launch will mount the Web surface (dsh web / dsh-tui / dsh --profile ${profileName})`);
+		notify("prompt-tool: initialization complete — exiting so the repaired profile can be launched");
+		setTimeout(() => process.exit(0), AUTO_EXIT_DELAY_MS);
+	}
+}
+//#endregion
+//#region src/profile-skills.ts
+/**
+* prompt-tool skills 的 profile 副本。
+*
+* 安装命令 `dsh plugin add` 是官方的 pnpm 转发器，插件代码不会在该命令中
+* 执行（本项目也不修改官方源码）。因此复制动作放在插件首次 apply 时：
+* 把包内 `skills/` 增量复制到当前 profile 目录下的 `skills/`
+* （`$DSH_HOME/profiles/<profile>/skills`），并且后续启动优先使用这份副本。
+*
+* 合并规则：
+*  - 只补缺失项，绝不覆盖已存在文件——用户在 profile 副本里的修改会保留；
+*  - 包内新增的技能目录/文件会在下次启动补进副本；
+*  - 副本目录不可写或 profile 定位失败时回退到包内目录，只告警不阻断。
+*/
+/** 递归把 src 中缺失的目录/文件补到 dst，已有项保持不动。 */
+function mergeMissing(src, dst) {
+	mkdirSync(dst, { recursive: true });
+	for (const entry of readdirSync(src, { withFileTypes: true })) {
+		const srcEntry = join(src, entry.name);
+		const dstEntry = join(dst, entry.name);
+		if (!existsSync(dstEntry)) cpSync(srcEntry, dstEntry, { recursive: true });
+		else if (entry.isDirectory()) mergeMissing(srcEntry, dstEntry);
+	}
+}
+/**
+* 返回本插件应使用的 skills 目录：
+* 优先当前 profile 下的 `skills/` 副本；无法确定 profile 或复制失败时
+* 回退到 sourceDir（默认包内 `skills/`）。
+*/
+function resolveProfileSkillsDir(ctx, sourceDir, warn) {
+	const profileDir = resolveProfileDir(ctx);
+	if (profileDir === void 0) return sourceDir;
+	const targetDir = join(profileDir, "skills");
+	try {
+		if (!existsSync(sourceDir)) return targetDir;
+		mergeMissing(sourceDir, targetDir);
+		return targetDir;
+	} catch (error) {
+		warn(`prompt-tool: failed to copy skills into profile directory ${targetDir}: ${error instanceof Error ? error.message : String(error)}`);
+		return sourceDir;
+	}
+}
+//#endregion
 //#region src/index.ts
 const name = "prompt-tool";
 const inject = [
 	"skills",
-	"webServer",
 	"commands",
 	"llm",
 	"subagents"
@@ -33,7 +257,16 @@ const PRESET_TEMPLATE_INJECTOR = fileURLToPath(new URL("../preset/prompt-injecto
 const PRESET_TEMPLATE_ANCHOR = fileURLToPath(new URL("../preset/near-anchor.mjs", import.meta.url));
 const PRESET_TEMPLATE_ROUTER = fileURLToPath(new URL("../preset/router-first-turn.mjs", import.meta.url));
 const PRESET_TEMPLATE_GUIDE = fileURLToPath(new URL("../preset/router-guide.mjs", import.meta.url));
-const VENDOR_PRESET_DIR = fileURLToPath(new URL("../upstream/dsh-anchored-standard/preset", import.meta.url));
+const LOCAL_PRESET_DIR = fileURLToPath(new URL("../preset", import.meta.url));
+const LOCAL_PRESET_SCRIPTS = [
+	"shared.mjs",
+	"context-gate.mjs",
+	"compaction-epoch.mjs",
+	"custom-bash.mjs",
+	"instruction-hint.mjs",
+	"skill-search.mjs",
+	"tool-bootstrap.mjs"
+];
 const Config = z.object({
 	text: z.string().default(""),
 	agentsText: z.string().default(""),
@@ -51,6 +284,7 @@ const Config = z.object({
 	subagentFlashProvider: z.string().default("deepseek-official"),
 	subagentFlashModel: z.string().default("deepseek-v4-flash"),
 	bootstrapMaxTokens: z.natural().default(0),
+	usePtcMode: z.boolean().default(true),
 	skillsDir: z.string().default(DEFAULT_SKILLS_DIR),
 	skillRankBase: z.natural().default(DEFAULT_SKILL_RANK_BASE),
 	residentAgentsPath: z.string().default(DEFAULT_RESIDENT_AGENTS_PATH),
@@ -71,6 +305,7 @@ const PromptSettingsSchema = z.object({
 	guideCustom: z.boolean().default(false),
 	subagentFlash: z.boolean().default(false),
 	bootstrapMaxTokens: z.natural().default(0),
+	usePtcMode: z.boolean().default(true),
 	deepseekAvailable: z.boolean().default(true),
 	injectPrompt: z.boolean().default(true),
 	skillSwitches: z.dict(z.boolean()).default({}),
@@ -79,6 +314,8 @@ const PromptSettingsSchema = z.object({
 		name: z.string(),
 		description: z.string().default("")
 	})).default([]),
+	skillsDir: z.string().default(""),
+	activeSkillsDir: z.string().default(""),
 	writeAgents: z.boolean().default(true),
 	writePreset: z.boolean().default(true)
 });
@@ -228,28 +465,6 @@ function warn(ctx, message) {
 		ctx.logger?.warn(message);
 	} catch {}
 }
-/** 把上游 instruction-hint.mjs 的提示文本替换为读同目录 agents-instruction.txt。 */
-function patchInstructionHint(source) {
-	source = source.replace(/\r\n/g, "\n");
-	const original = [
-		"      const text = [",
-		"        ...sections,",
-		"        'Do NOT assume their content. When a task touches this workspace, read the relevant instruction files first and follow them.',",
-		"      ].join(' ')"
-	].join("\n");
-	const replacement = [
-		"  const agentsInstructionText = readFileSync(new URL('./agents-instruction.txt', import.meta.url), 'utf8').trim()",
-		"  const text = agentsInstructionText.length > 0",
-		"    ? agentsInstructionText",
-		"    : [",
-		"        ...sections,",
-		"        'Do NOT assume their content. When a task touches this workspace, read the relevant instruction files first and follow them.',",
-		"      ].join(' ')"
-	].join("\n");
-	if (!source.includes("import { createEpochPromotion }")) throw new Error("instruction-hint.mjs import marker missing");
-	if (!source.includes(original)) throw new Error("instruction-hint.mjs text marker missing");
-	return source.replace("import { createEpochPromotion } from './compaction-epoch.mjs'", "import { readFileSync } from 'node:fs'\nimport { createEpochPromotion } from './compaction-epoch.mjs'").replace(original, replacement);
-}
 const MAX_SETTINGS_BRIDGE_BODY = 65536;
 /** 仅允许本机回环请求，镜像官方 settings bridge 的边界。 */
 function isLoopbackRequest(req) {
@@ -296,7 +511,8 @@ const TUI_BOOLEAN_SWITCHES = [
 	["anchorFirstTurn", "追加任务引导"],
 	["anchorCustom", "使用自定义引导（首句）"],
 	["guideCustom", "使用自定义引导（每轮）"],
-	["subagentFlash", "子代理固定 Flash 模型"]
+	["subagentFlash", "子代理固定 Flash 模型"],
+	["usePtcMode", "使用 PTC 模式"]
 ];
 /** 把布尔开关渲染成 dsh-tui 命令输出。 */
 function renderTuiStatus(source) {
@@ -311,6 +527,7 @@ function renderTuiStatus(source) {
 		`  anchorText               ${source.anchorText.length > 0 ? source.anchorText : "（空 = 按任务自动选择）"}`,
 		`  deepseekAvailable       ${source.deepseekAvailable ? "是" : "否（未检测到 DeepSeek 模型，subagentFlash 不可用）"}`,
 		`  bootstrapMaxTokens      ${source.bootstrapMaxTokens > 0 ? source.bootstrapMaxTokens : "0（关闭，不设封顶）"}`,
+		`  activeSkillsDir         ${source.activeSkillsDir || "（未解析到技能目录）"}`,
 		"技能开关:"
 	];
 	for (const skill of source.skillCatalog) {
@@ -335,7 +552,7 @@ function registerTuiCommand(ctx, getSource, getDeepseekAvailable, getDeepseekSta
 			handler: async (invocation) => {
 				const usage = () => ({
 					kind: "error",
-					text: "用法：/prompt-tool status\n      /prompt-tool on|off|toggle <writeAgents|writePreset|injectPrompt|injectAgentsPrompt|anchorFirstTurn|anchorCustom|guideCustom|subagentFlash>\n      /prompt-tool skill <技能目录名> on|off|toggle\n      /prompt-tool bootstrapMaxTokens <正整数|0（关闭）>"
+					text: "用法：/prompt-tool status\n      /prompt-tool on|off|toggle <writeAgents|writePreset|injectPrompt|injectAgentsPrompt|anchorFirstTurn|anchorCustom|guideCustom|subagentFlash|usePtcMode>\n      /prompt-tool skill <技能目录名> on|off|toggle\n      /prompt-tool bootstrapMaxTokens <正整数|0（关闭）>"
 				});
 				const tokens = invocation.rawInput.trim().split(/\s+/).filter((token) => token.length > 0);
 				const source = getSource();
@@ -418,8 +635,8 @@ ${renderTuiStatus(getSource())}`
 	});
 }
 /** 自建 loopback settings bridge：替代 registerConfigurableProviders，避免模型设置区出现插件条目。 */
-function registerSettingsBridge(ctx, getDeepseekAvailable, getDeepseekState) {
-	ctx.inject(["settings"], (sctx) => {
+function registerSettingsBridge(ctx, getDeepseekAvailable, getDeepseekState, getSkillsState) {
+	ctx.inject(["settings", "webServer"], (sctx) => {
 		sctx.effect(() => {
 			const findDescriptor = () => sctx.settings.describe({ redactSecrets: true }).find((entry) => String(entry.ns) === String(NS));
 			const guard = (req, res) => {
@@ -457,12 +674,15 @@ function registerSettingsBridge(ctx, getDeepseekAvailable, getDeepseekState) {
 							return;
 						}
 						const detection = getDeepseekState();
+						const skillsState = getSkillsState();
 						writeBridgeJson(res, 200, {
 							ok: true,
 							value: descriptor,
 							deepseekAvailable: detection.available,
 							deepseekProviders: detection.providers,
-							deepseekError: detection.error
+							deepseekError: detection.error,
+							activeSkillsDir: skillsState.activeSkillsDir,
+							skillCatalog: skillsState.skillCatalog
 						});
 					}
 				}),
@@ -656,26 +876,6 @@ function installSubagentFlashRoute(ctx, isEnabled, provider, model) {
 		};
 	});
 }
-/** prompt-tool 补丁：子代理直接全量放行（assembled.tools 本身已是动态白名单）。 */
-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 {",
-		"      // prompt-tool 补丁：子代理跳过目录裁剪，直接使用组装结果；",
-		"      // 调用方（如 dsh-mnemon）的工具白名单已先行过滤 assembled.tools，",
-		"      // 因此任意前缀的新插件工具都会自动出现在子代理第一次会话。",
-		"      if ((context.agent?.session?.header?.delegationDepth ?? 0) > 0) return assembled",
-		"      const status = promotion.status(context.agent)"
-	].join("\n");
-	if (!source.includes(original)) throw new Error("tool-bootstrap.mjs assembled marker missing");
-	return source.replace(original, replacement);
-}
 function writePreset(prompt, options) {
 	const presetDir = options.presetDir;
 	mkdirSync(presetDir, { recursive: true });
@@ -689,21 +889,16 @@ function writePreset(prompt, options) {
 		subagentFlash: options.subagentFlash,
 		subagentFlashProvider: options.subagentFlashProvider,
 		subagentFlashModel: options.subagentFlashModel,
-		bootstrapMaxTokens: options.bootstrapMaxTokens
+		bootstrapMaxTokens: options.bootstrapMaxTokens,
+		usePtcMode: options.usePtcMode
 	}), "utf8");
 	const meta = readFileSync(PRESET_TEMPLATE_META, "utf8").replace(/^order:.*$/m, `order: ${options.presetOrder}`);
 	writeFileSync(join(presetDir, "preset.yml"), meta, "utf8");
-	for (const file of readdirSync(VENDOR_PRESET_DIR)) {
-		if (!file.endsWith(".mjs")) continue;
-		const vendorSource = readFileSync(join(VENDOR_PRESET_DIR, file), "utf8");
-		writeFileSync(join(presetDir, file), file === "tool-bootstrap.mjs" ? patchToolBootstrap(vendorSource) : vendorSource, "utf8");
-	}
+	for (const file of LOCAL_PRESET_SCRIPTS) writeFileSync(join(presetDir, file), readFileSync(join(LOCAL_PRESET_DIR, file), "utf8"), "utf8");
+	rmSync(join(presetDir, "dev-tool-search.mjs"), { force: true });
 	const agentsInstructionPath = join(presetDir, "agents-instruction.txt");
-	if (options.agentsInstructionText !== void 0) {
-		writeFileSync(agentsInstructionPath, options.agentsInstructionText, "utf8");
-		const hintPath = join(presetDir, "instruction-hint.mjs");
-		writeFileSync(hintPath, patchInstructionHint(readFileSync(hintPath, "utf8")), "utf8");
-	} else rmSync(agentsInstructionPath, { force: true });
+	if (options.agentsInstructionText !== void 0) writeFileSync(agentsInstructionPath, options.agentsInstructionText, "utf8");
+	else rmSync(agentsInstructionPath, { force: true });
 	const injectorPath = join(presetDir, "prompt-injector.mjs");
 	if (options.injectPrompt) writeFileSync(injectorPath, readFileSync(PRESET_TEMPLATE_INJECTOR, "utf8"), "utf8");
 	else rmSync(injectorPath, { force: true });
@@ -720,11 +915,24 @@ function apply(ctx, config) {
 	const getDeepseekState = () => deepseekState();
 	let current = config.text || readPromptFile(config.fallbackText);
 	let currentAgents = config.agentsText || readAgents();
-	const skillCatalog = readSkills(config.skillsDir).map((skill) => ({
+	const configuredSkillsDir = config.skillsDir !== DEFAULT_SKILLS_DIR && config.skillsDir.length > 0 ? config.skillsDir : "";
+	let activeSkillsDir = configuredSkillsDir.length > 0 ? configuredSkillsDir : resolveProfileSkillsDir(ctx, DEFAULT_SKILLS_DIR, (message) => warn(ctx, message));
+	let skillCatalog = readSkills(activeSkillsDir).map((skill) => ({
 		folder: skill.folder,
 		name: skill.name,
 		description: skill.description
 	}));
+	/** 切换生效技能目录并刷新目录快照（供 describe / TUI 显示）。 */
+	const applyActiveSkillsDir = (dir) => {
+		activeSkillsDir = dir;
+		skillCatalog = readSkills(dir).map((skill) => ({
+			folder: skill.folder,
+			name: skill.name,
+			description: skill.description
+		}));
+	};
+	/** 用户 skillsDir 设置 → 实际生效目录。 */
+	const resolveActiveSkillsDir = (userDir) => userDir.length > 0 ? userDir : resolveProfileSkillsDir(ctx, DEFAULT_SKILLS_DIR, (message) => warn(ctx, message));
 	let skillSwitches = { ...config.skillSwitches };
 	let invalidateSkills;
 	ctx.skills.registerProvider((control) => {
@@ -733,7 +941,7 @@ function apply(ctx, config) {
 			name: "prompt-tool",
 			list: async (options) => {
 				if (options.signal?.aborted) return [];
-				return readSkills(config.skillsDir).filter((skill) => skillSwitches[skill.folder] !== false).map((skill, index) => ({
+				return readSkills(activeSkillsDir).filter((skill) => skillSwitches[skill.folder] !== false).map((skill, index) => ({
 					name: skill.name,
 					description: skill.description || skill.folder,
 					...skill.whenToUse !== void 0 ? { whenToUse: skill.whenToUse } : {},
@@ -745,7 +953,7 @@ function apply(ctx, config) {
 					provider: "prompt-tool",
 					resourceBase: {
 						kind: "directory",
-						path: join(config.skillsDir, skill.folder)
+						path: join(activeSkillsDir, skill.folder)
 					},
 					rank: config.skillRankBase + index,
 					locator: skill.folder,
@@ -755,7 +963,7 @@ function apply(ctx, config) {
 			},
 			get: async (candidate, options) => {
 				if (options.signal?.aborted) return void 0;
-				const skill = readSkills(config.skillsDir).find((entry) => entry.folder === candidate.locator || entry.name === candidate.name);
+				const skill = readSkills(activeSkillsDir).find((entry) => entry.folder === candidate.locator || entry.name === candidate.name);
 				if (skill === void 0 || skillSwitches[skill.folder] === false) return void 0;
 				return {
 					name: candidate.name,
@@ -772,20 +980,28 @@ function apply(ctx, config) {
 			}
 		};
 	});
-	registerSettingsBridge(ctx, getDeepseekAvailable, getDeepseekState);
+	registerSettingsBridge(ctx, getDeepseekAvailable, getDeepseekState, () => ({
+		activeSkillsDir,
+		skillCatalog
+	}));
+	setImmediate(() => {
+		ensureWebSurface(ctx, (message) => warn(ctx, message));
+	});
 	const runtime = {
 		writeAgents: config.writeAgents,
 		writePreset: config.writePreset,
 		injectAgentsPrompt: config.injectAgentsPrompt,
 		injectPrompt: config.injectPrompt,
 		skillSwitches: { ...config.skillSwitches },
+		skillsDir: configuredSkillsDir,
 		anchorFirstTurn: config.anchorFirstTurn,
 		anchorText: config.anchorText,
 		anchorCustom: config.anchorCustom,
 		guideText: config.guideText,
 		guideCustom: config.guideCustom,
 		subagentFlash: config.subagentFlash && getDeepseekAvailable(),
-		bootstrapMaxTokens: config.bootstrapMaxTokens
+		bootstrapMaxTokens: config.bootstrapMaxTokens,
+		usePtcMode: config.usePtcMode
 	};
 	installSubagentFlashRoute(ctx, () => runtime.subagentFlash, config.subagentFlashProvider, config.subagentFlashModel);
 	let currentSource = () => ({
@@ -801,10 +1017,13 @@ function apply(ctx, config) {
 		guideCustom: runtime.guideCustom,
 		subagentFlash: runtime.subagentFlash,
 		bootstrapMaxTokens: runtime.bootstrapMaxTokens,
+		usePtcMode: runtime.usePtcMode,
 		deepseekAvailable: getDeepseekAvailable(),
 		injectPrompt: runtime.injectPrompt,
 		skillSwitches: runtime.skillSwitches,
 		skillCatalog,
+		skillsDir: runtime.skillsDir,
+		activeSkillsDir,
 		writeAgents: runtime.writeAgents,
 		writePreset: runtime.writePreset
 	});
@@ -818,18 +1037,21 @@ function apply(ctx, config) {
 			injectAgentsPrompt: typeof next.injectAgentsPrompt === "boolean" ? next.injectAgentsPrompt : config.injectAgentsPrompt,
 			injectPrompt: typeof next.injectPrompt === "boolean" ? next.injectPrompt : config.injectPrompt,
 			skillSwitches: next.skillSwitches !== void 0 ? next.skillSwitches : config.skillSwitches,
+			skillsDir: typeof next.skillsDir === "string" ? next.skillsDir : configuredSkillsDir,
 			anchorFirstTurn: typeof next.anchorFirstTurn === "boolean" ? next.anchorFirstTurn : config.anchorFirstTurn,
 			anchorText: normalizeAnchorText(typeof next.anchorText === "string" ? next.anchorText : config.anchorText),
 			anchorCustom: typeof next.anchorCustom === "boolean" ? next.anchorCustom : config.anchorCustom,
 			guideText: typeof next.guideText === "string" ? next.guideText : config.guideText,
 			guideCustom: typeof next.guideCustom === "boolean" ? next.guideCustom : config.guideCustom,
 			subagentFlash: (typeof next.subagentFlash === "boolean" ? next.subagentFlash : config.subagentFlash) && getDeepseekAvailable(),
-			bootstrapMaxTokens: Number.isSafeInteger(next.bootstrapMaxTokens) && next.bootstrapMaxTokens >= 0 ? next.bootstrapMaxTokens : config.bootstrapMaxTokens
+			bootstrapMaxTokens: Number.isSafeInteger(next.bootstrapMaxTokens) && next.bootstrapMaxTokens >= 0 ? next.bootstrapMaxTokens : config.bootstrapMaxTokens,
+			usePtcMode: typeof next.usePtcMode === "boolean" ? next.usePtcMode : config.usePtcMode
 		};
 		const promptChanged = next.promptText !== current;
 		const agentsChanged = next.agentsText !== currentAgents;
 		const skillSwitchesChanged = JSON.stringify(runtime.skillSwitches) !== JSON.stringify(nextRuntime.skillSwitches);
-		const settingsChanged = runtime.writeAgents !== nextRuntime.writeAgents || runtime.writePreset !== nextRuntime.writePreset || runtime.injectAgentsPrompt !== nextRuntime.injectAgentsPrompt || runtime.injectPrompt !== nextRuntime.injectPrompt || skillSwitchesChanged || runtime.anchorFirstTurn !== nextRuntime.anchorFirstTurn || runtime.anchorText !== nextRuntime.anchorText || runtime.anchorCustom !== nextRuntime.anchorCustom || runtime.guideText !== nextRuntime.guideText || runtime.guideCustom !== nextRuntime.guideCustom || runtime.subagentFlash !== nextRuntime.subagentFlash || runtime.bootstrapMaxTokens !== nextRuntime.bootstrapMaxTokens;
+		const skillsDirChanged = runtime.skillsDir !== nextRuntime.skillsDir;
+		const settingsChanged = runtime.writeAgents !== nextRuntime.writeAgents || runtime.writePreset !== nextRuntime.writePreset || runtime.injectAgentsPrompt !== nextRuntime.injectAgentsPrompt || runtime.injectPrompt !== nextRuntime.injectPrompt || skillSwitchesChanged || skillsDirChanged || runtime.anchorFirstTurn !== nextRuntime.anchorFirstTurn || runtime.anchorText !== nextRuntime.anchorText || runtime.anchorCustom !== nextRuntime.anchorCustom || runtime.guideText !== nextRuntime.guideText || runtime.guideCustom !== nextRuntime.guideCustom || runtime.subagentFlash !== nextRuntime.subagentFlash || runtime.bootstrapMaxTokens !== nextRuntime.bootstrapMaxTokens || runtime.usePtcMode !== nextRuntime.usePtcMode;
 		if (!needsInitialApply && !promptChanged && !agentsChanged && !settingsChanged) return;
 		needsInitialApply = false;
 		if (promptChanged) current = next.promptText;
@@ -839,6 +1061,7 @@ function apply(ctx, config) {
 		runtime.injectAgentsPrompt = nextRuntime.injectAgentsPrompt;
 		runtime.injectPrompt = nextRuntime.injectPrompt;
 		runtime.skillSwitches = nextRuntime.skillSwitches;
+		runtime.skillsDir = nextRuntime.skillsDir;
 		runtime.anchorFirstTurn = nextRuntime.anchorFirstTurn;
 		runtime.anchorText = nextRuntime.anchorText;
 		runtime.anchorCustom = nextRuntime.anchorCustom;
@@ -846,8 +1069,12 @@ function apply(ctx, config) {
 		runtime.guideCustom = nextRuntime.guideCustom;
 		runtime.subagentFlash = nextRuntime.subagentFlash;
 		runtime.bootstrapMaxTokens = nextRuntime.bootstrapMaxTokens;
+		runtime.usePtcMode = nextRuntime.usePtcMode;
 		skillSwitches = runtime.skillSwitches;
-		if (skillSwitchesChanged) invalidateSkills?.();
+		if (skillsDirChanged) {
+			applyActiveSkillsDir(resolveActiveSkillsDir(runtime.skillsDir));
+			invalidateSkills?.();
+		} else if (skillSwitchesChanged) invalidateSkills?.();
 		let residentAgentsWritten = false;
 		if (runtime.writeAgents) {
 			residentAgentsWritten = writeAgents(currentAgents, config.residentAgentsPath);
@@ -867,6 +1094,7 @@ function apply(ctx, config) {
 			subagentFlashProvider: config.subagentFlashProvider,
 			subagentFlashModel: config.subagentFlashModel,
 			bootstrapMaxTokens: runtime.bootstrapMaxTokens,
+			usePtcMode: runtime.usePtcMode,
 			agentsInstructionText: runtime.injectAgentsPrompt && currentAgents.length > 0 ? currentAgents : void 0,
 			presetDir: config.presetDir,
 			presetOrder: config.presetOrder
@@ -893,10 +1121,13 @@ function apply(ctx, config) {
 		guideCustom: config.guideCustom,
 		subagentFlash: config.subagentFlash && getDeepseekAvailable(),
 		bootstrapMaxTokens: config.bootstrapMaxTokens,
+		usePtcMode: config.usePtcMode,
 		deepseekAvailable: getDeepseekAvailable(),
 		injectPrompt: config.injectPrompt,
 		skillSwitches: { ...config.skillSwitches },
 		skillCatalog,
+		skillsDir: configuredSkillsDir,
+		activeSkillsDir,
 		writeAgents: config.writeAgents,
 		writePreset: config.writePreset
 	};

package/lib/preset-core.d.mts

@@ -30,7 +30,11 @@ interface BuildCordisOptions {
   subagentFlashModel?: string;
   /** 首轮输出封顶（bootstrapMaxTokens）；0 或未设置 = 本项目默认无封顶。 */
   bootstrapMaxTokens?: number;
+  /** 使用 PTC 模式：默认 true——晋升后把 wire 切换为 Code Mode（单一 run_code，完整插件工具经生成 SDK 调用）；显式 false 时晋升后恢复原生完整工具目录。 */
+  usePtcMode?: boolean;
 }
+/** 给生成的 tool-bootstrap.mjs 打补丁：子代理全量放行 + 可选的 PTC 呈现切换。 */
+declare function patchToolBootstrap(source: string): string;
 declare function buildCordis(prompt: string, options?: BuildCordisOptions): string;
 //#endregion
-export { BuildCordisOptions, SkillFrontmatter, buildCordis, parseFrontmatter };
+export { BuildCordisOptions, SkillFrontmatter, buildCordis, parseFrontmatter, patchToolBootstrap };