dsh-plugin-prompt-tool 0.6.2 → 0.7.0

package/lib/preset-core.d.mts

@@ -1,4 +1,4 @@
-import { a as mergePromptConfigs, i as loadPromptConfigFiles, n as PromptConfigFile, o as renderPromptConfigYaml, r as PromptConfigSpec, t as BuildCordisOptions } from "./prompt-configs-B4vH09wx.mjs";
+import { a as mergePromptConfigs, i as loadPromptConfigFiles, n as PromptConfigFile, o as renderPromptConfigYaml, r as PromptConfigSpec, t as BuildCordisOptions } from "./prompt-configs-CN0sJTUL.mjs";
 //#region src/preset-core.d.ts
 /**
  * 渲染 anchored 组合文件:

package/lib/preset-core.mjs

@@ -1,4 +1,4 @@
-import { n as mergePromptConfigs, o as assertCompositionArray, p as loadPresetSpec, r as renderPromptConfigYaml, t as loadPromptConfigFiles, y as renderComposition } from "./prompt-configs-BgFw_bFf.mjs";
+import { h as loadPresetSpec, n as mergePromptConfigs, r as renderPromptConfigYaml, s as assertCompositionArray, t as loadPromptConfigFiles, x as renderComposition } from "./prompt-configs-BnQKRHVb.mjs";
 import { fileURLToPath } from "node:url";
 //#region src/preset-core.ts
 /**
@@ -21,8 +21,9 @@ function buildCordis(prompt, options = {}) {
 		firstTurnText: typeof options.firstTurnText === "string" ? options.firstTurnText : "",
 		guideCustom: options.guideCustom === true,
 		guideText: typeof options.guideText === "string" ? options.guideText : "",
+		guideEnabled: typeof options.guideEnabled === "boolean" ? options.guideEnabled : void 0,
 		injectPrompt: options.injectPrompt !== false,
-		usePtcMode: options.usePtcMode !== false,
+		usePtcMode: typeof options.usePtcMode === "boolean" ? options.usePtcMode : void 0,
 		bootstrapMaxTokens: Number.isSafeInteger(options.bootstrapMaxTokens) && (options.bootstrapMaxTokens ?? 0) > 0 ? options.bootstrapMaxTokens : 0,
 		modelProvider: typeof options.modelProvider === "string" && options.modelProvider.length > 0 ? options.modelProvider : "",
 		modelName: typeof options.modelName === "string" && options.modelName.length > 0 ? options.modelName : "",
@@ -34,11 +35,36 @@ function buildCordis(prompt, options = {}) {
 		subagentReasoningEffort: typeof options.subagentReasoningEffort === "string" ? options.subagentReasoningEffort : "",
 		subagentTemperature: typeof options.subagentTemperature === "string" ? options.subagentTemperature : "",
 		subagentMaxTokens: typeof options.subagentMaxTokens === "string" ? options.subagentMaxTokens : "",
-		subagentPersona: typeof options.subagentPersona === "string" && options.subagentPersona.length > 0 ? options.subagentPersona : "",
 		toolFilterAllow: options.toolFilterAllow,
 		toolFilterDeny: options.toolFilterDeny,
 		maxDepth: options.maxDepth,
 		allowKinds: options.allowKinds,
+		promoteGate: options.promoteGate,
+		promoteAfterFirstResponse: options.promoteAfterFirstResponse,
+		maxPromoteSteps: options.maxPromoteSteps,
+		bootstrapTools: options.bootstrapTools,
+		compactionTools: options.compactionTools,
+		personaSectionsOnly: options.personaSectionsOnly,
+		workspaceLine: options.workspaceLine,
+		messageSources: options.messageSources,
+		deferredSources: options.deferredSources,
+		deferredGraceSteps: options.deferredGraceSteps,
+		instructionHint: options.instructionHint,
+		phase1FirstCallInstruction: options.phase1FirstCallInstruction,
+		stages: options.stages,
+		stagePreUnlock: options.stagePreUnlock,
+		stageAdvanceTool: options.stageAdvanceTool,
+		stageAdvanceDescription: options.stageAdvanceDescription,
+		stageSectionTemplate: options.stageSectionTemplate,
+		toolFilterSubagents: options.toolFilterSubagents,
+		anchorTurn: options.anchorTurn,
+		anchorTurnText: options.anchorTurnText,
+		deliberationGate: options.deliberationGate,
+		deliberationMinChars: options.deliberationMinChars,
+		deliberationMaxGatesPerTurn: options.deliberationMaxGatesPerTurn,
+		cotDrip: options.cotDrip,
+		cotDripEvery: options.cotDripEvery,
+		cotDripMaxPerTurn: options.cotDripMaxPerTurn,
 		firstTurnWord: typeof options.firstTurnWord === "string" && options.firstTurnWord.length > 0 ? options.firstTurnWord : void 0
 	};
 	const out = renderComposition(spec, runtime, ANCHORED_TEMPLATE_DIR);

package/lib/{prompt-configs-BgFw_bFf.mjs → prompt-configs-BnQKRHVb.mjs}

@@ -1,8 +1,8 @@
-import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { Pair, Scalar, YAMLMap, YAMLSeq, parse, parseDocument } from "yaml";
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve, sep } from "node:path";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
+import { Pair, Scalar, YAMLMap, YAMLSeq, parse, parseDocument } from "yaml";
 import { homedir } from "node:os";
 //#region src/host/paths.ts
 /** host 数据层的部署路径与序数常量（settings 层与运行时共用，避免 host→config 反向依赖）。 */
@@ -56,9 +56,10 @@ const DEFAULT_SKILLS_DIR = SKILLS_DIR;
 * 一个预设 = 一个 preset.yml:
 *   - modules/params/content/meta 全部是直读参数,无模板语法;
 *   - 默认提示词配置由引擎按 params 生成(见 write-preset),promptConfigs 仅为可选覆盖;
-*   - 组合模块中的 __TOKEN__ 由引擎内部 renderEngineTokens 按 params 生成,
-*     不再暴露到参数文件。
-* 本模块负责参数归一化与引擎 token 渲染;所有 anchored 专属行为都在引擎内部。
+*   - 组合模块的行级 config 由参数桥 buildModuleConfigsFromParams 按 params
+*     构造对象合并（取代旧 __TOKEN__ 文本渲染，无占位符、无文本往返），
+*     params（UI/基础层）优先于 moduleConfigs 行级直写（旧作者锁定语义已移除）。
+* 本模块负责参数归一化与引擎模块配置装配;所有 anchored 专属行为都在引擎内部。
 */
 /** 包根 preset/ 目录(配置/模板文件夹):兼容源码运行(src/host)与打包运行(lib/)。 */
 function packagePresetDir() {
@@ -78,9 +79,23 @@ function packageEngineDir() {
 	}
 	throw new Error("prompt-tool: cannot locate package engine/ directory");
 }
+/**
+* preset.yml 读缓存：按 mtime+size 签名失效。load()/describe/param-overrides 等
+* 每次请求读盘解析，加缓存后同一文件只解析一次；写盘路径（savePresetParams /
+* withPresetDoc）与外部编辑（stat 签名变化）都会正确失效。
+*/
+const presetSpecCache = /* @__PURE__ */ new Map();
+/** 写盘后失效缓存（调用方在写完 preset.yml 后调用；不调用也安全——stat 签名兜底）。 */
+function invalidatePresetSpec(dir) {
+	presetSpecCache.delete(join(dir, "preset.yml"));
+}
 /** 加载某个预设模板的单一参数文件 preset/<name>/preset.yml。 */
 function loadPresetSpec(dir) {
-	const raw = readFileSync(join(dir, "preset.yml"), "utf8");
+	const file = join(dir, "preset.yml");
+	const stat = statSync(file);
+	const cached = presetSpecCache.get(file);
+	if (cached !== void 0 && cached.mtimeMs === stat.mtimeMs && cached.size === stat.size) return cached.spec;
+	const raw = readFileSync(file, "utf8");
 	const parsed = parse(raw, { logLevel: "silent" });
 	if (parsed === null || typeof parsed !== "object") throw new Error(`preset ${join(dir, "preset.yml")} is not a YAML map`);
 	if (typeof parsed.id !== "string" || parsed.id.length === 0) parsed.id = basename(dir);
@@ -92,19 +107,17 @@ function loadPresetSpec(dir) {
 			if (value !== void 0) parsed.params[flatKey] = value;
 		}
 	};
-	flattenModelGroup(parsed.model, {
-		provider: "modelProvider",
-		name: "modelName",
-		reasoningEffort: "modelReasoningEffort",
-		temperature: "modelTemperature",
-		maxTokens: "modelMaxTokens"
-	});
-	flattenModelGroup(parsed.subagentModel, {
-		provider: "subagentModelProvider",
-		name: "subagentModelName",
-		reasoningEffort: "subagentReasoningEffort",
-		temperature: "subagentTemperature",
-		maxTokens: "subagentMaxTokens"
+	const flattenMapping = (segmentName) => {
+		const mapping = {};
+		for (const [flatKey, [segment, segmentKey]] of Object.entries(MODEL_SEGMENT_MAP)) if (segment === segmentName) mapping[segmentKey] = flatKey;
+		return mapping;
+	};
+	flattenModelGroup(parsed.model, flattenMapping("model"));
+	flattenModelGroup(parsed.subagentModel, flattenMapping("subagentModel"));
+	presetSpecCache.set(file, {
+		mtimeMs: stat.mtimeMs,
+		size: stat.size,
+		spec: parsed
 	});
 	return parsed;
 }
@@ -129,6 +142,23 @@ const asString = (value, fallback = "") => {
 	if (value === void 0 || value === null) return fallback;
 	return String(value);
 };
+/**
+* 顶层模型段 ↔ 扁平参数键双向映射（单一来源）。
+* loadPresetSpec 展平（段 → 扁平键）与 savePresetParams 迁移（扁平键 → 段）
+* 共用本常量，杜绝两处字面量漂移。段结构 = 官方 agent-default-model 同构。
+*/
+const MODEL_SEGMENT_MAP = {
+	modelProvider: ["model", "provider"],
+	modelName: ["model", "name"],
+	modelReasoningEffort: ["model", "reasoningEffort"],
+	modelTemperature: ["model", "temperature"],
+	modelMaxTokens: ["model", "maxTokens"],
+	subagentModelProvider: ["subagentModel", "provider"],
+	subagentModelName: ["subagentModel", "name"],
+	subagentReasoningEffort: ["subagentModel", "reasoningEffort"],
+	subagentTemperature: ["subagentModel", "temperature"],
+	subagentMaxTokens: ["subagentModel", "maxTokens"]
+};
 /** 预设根：官方 USER_PRESET_DIR（~/.dsh/.agent-presets），导入/新建/种子化的预设都放这里。 */
 function userPresetsDir() {
 	return DEFAULT_PRESET_DIR;
@@ -159,7 +189,7 @@ function resolvePresetDir(template) {
 function listPresets() {
 	const scan = (dir) => {
 		try {
-			return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).flatMap((entry) => {
+			return readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).filter((entry) => entry.name !== "prompt-tool").flatMap((entry) => {
 				try {
 					const spec = loadPresetSpec(join(dir, entry.name));
 					if (typeof spec.id !== "string" || spec.id.length === 0) return [];
@@ -228,16 +258,13 @@ function ensurePresetSeed() {
 	const root = userPresetsDir();
 	const legacyMark = join(root, ".pt-seeded");
 	const state = readPluginState();
-	if (state.seeded === true || existsSync(legacyMark)) {
-		if (existsSync(legacyMark)) try {
-			writePluginState({
-				...state,
-				seeded: true
-			});
-			rmSync(legacyMark, { force: true });
-		} catch {}
-		return { created: [] };
-	}
+	if (existsSync(legacyMark)) try {
+		writePluginState({
+			...state,
+			seeded: true
+		});
+		rmSync(legacyMark, { force: true });
+	} catch {}
 	const created = [];
 	try {
 		mkdirSync(root, { recursive: true });
@@ -378,35 +405,34 @@ function openPresetLocation(id, presetRoot = userPresetsDir()) {
 		};
 	}
 }
+/** 删除 yaml 两级键；父集合缺失时不触发 deleteIn 对不存在集合的异常。 */
+function deleteYamlPath(doc, path) {
+	if (doc.hasIn(path)) doc.deleteIn(path);
+}
+/** 删除扁平 params 键。 */
+function deleteFlatParam(doc, key) {
+	deleteYamlPath(doc, ["params", key]);
+}
 /**
 * 保存预设参数：写激活预设目录 preset.yml 的 params（merge）/ promptConfigs（整体替换）。
-* parseDocument 保留注释与未知键（preset.yml 模板含大量注释）；空值键跳过
-* （保留 preset.yml 模板默认）。写入后删除 prompt-tool.overrides.yml（旧参数覆盖
+* parseDocument 保留注释与未知键（preset.yml 模板含大量注释）；空值键删除（'' / []，
+* 回落模板/引擎默认；0 与 false 照常写入--语义与函数内注释、docs §3 一致）。写入后删除 prompt-tool.overrides.yml（旧参数覆盖
 * 通道残留——参数已并入 preset.yml，避免旧值覆盖新值）。
 */
 function savePresetParams(presetRoot, templateName, params, promptConfigs, variables, variablesEnabled) {
-	const MODEL_KEY_MAP = {
-		modelProvider: ["model", "provider"],
-		modelName: ["model", "name"],
-		modelReasoningEffort: ["model", "reasoningEffort"],
-		modelTemperature: ["model", "temperature"],
-		modelMaxTokens: ["model", "maxTokens"],
-		subagentModelProvider: ["subagentModel", "provider"],
-		subagentModelName: ["subagentModel", "name"],
-		subagentReasoningEffort: ["subagentModel", "reasoningEffort"],
-		subagentTemperature: ["subagentModel", "temperature"],
-		subagentMaxTokens: ["subagentModel", "maxTokens"]
-	};
 	const file = join(presetRoot, templateName, "preset.yml");
 	if (!existsSync(file)) throw new Error(`preset ${templateName} 无 preset.yml`);
 	const doc = parseDocument(readFileSync(file, "utf8"), { logLevel: "silent" });
 	if (params !== void 0) for (const [key, value] of Object.entries(params)) {
 		if (value === void 0 || value === null || key.trim().length === 0) continue;
-		const segment = MODEL_KEY_MAP[key];
+		const isEmpty = value === "" || Array.isArray(value) && value.length === 0;
+		const segment = MODEL_SEGMENT_MAP[key];
 		if (segment !== void 0) {
-			doc.setIn([segment[0], segment[1]], value);
-			doc.deleteIn(["params", key]);
-		} else doc.setIn(["params", key], value);
+			if (isEmpty) deleteYamlPath(doc, [segment[0], segment[1]]);
+			else doc.setIn([segment[0], segment[1]], value);
+			deleteFlatParam(doc, key);
+		} else if (isEmpty) deleteFlatParam(doc, key);
+		else doc.setIn(["params", key], value);
 	}
 	if (promptConfigs !== void 0) {
 		const cleaned = promptConfigs.map((config) => {
@@ -427,7 +453,7 @@ function savePresetParams(presetRoot, templateName, params, promptConfigs, varia
 		else doc.deleteIn(["variables"]);
 		for (const [key, value] of Object.entries(variables)) {
 			if (typeof value !== "string") continue;
-			doc.deleteIn(["params", key]);
+			deleteFlatParam(doc, key);
 		}
 	}
 	if (variablesEnabled !== void 0) {
@@ -435,8 +461,20 @@ function savePresetParams(presetRoot, templateName, params, promptConfigs, varia
 		else doc.setIn(["variablesEnabled"], false);
 	}
 	writeFileSync(file, doc.toString(), "utf8");
+	invalidatePresetSpec(join(presetRoot, templateName));
 	rmSync(join(presetRoot, templateName, "prompt-tool.overrides.yml"), { force: true });
 }
+/** 预设文件读-改-写（parseDocument 保留注释与未知键；mutate 内 setIn/deleteIn）。
+*  角色卡库（characters）与世界书工具（world-book-tools）共用此入口，避免
+*  各自实现 parseDocument 往返。 */
+function withPresetDoc(presetDir, mutate) {
+	const file = join(presetDir, "preset.yml");
+	if (!existsSync(file)) throw new Error(`${presetDir} 无 preset.yml`);
+	const doc = parseDocument(readFileSync(file, "utf8"), { logLevel: "silent" });
+	mutate(doc);
+	writeFileSync(file, doc.toString(), "utf8");
+	invalidatePresetSpec(presetDir);
+}
 /** 删除预设目录（预设根/<id>；含同名导入的 .bak-* 备份目录）。
 *  仅作用于预设根（官方 USER_PRESET_DIR），包内置模板天然不受影响；路径越界与非法 id 拒绝。
 *  删除后宿主 agent-presets 目录列表自然不再出现该预设（官方 roster 即目录列表）。 */
@@ -492,17 +530,6 @@ function resolvePresetParams(spec, runtime) {
 	if (typeof params.promptText !== "string" || params.promptText.length === 0) params.promptText = typeof runtime.promptText === "string" ? runtime.promptText : "";
 	return params;
 }
-/** {{key}} 嵌套插值(块模板内引用 params)；键正则与引擎插值及 processStText 中文变量支持一致。 */
-function interpolateNested(text, scope) {
-	return text.replace(/\{\{([A-Za-z0-9_.\u4e00-\u9fff-]+)\}\}/g, (whole, key, offset) => {
-		if (!Object.prototype.hasOwnProperty.call(scope, key)) return whole;
-		const value = asString(scope[key]);
-		if (!value.includes("\n")) return value;
-		const lineStart = text.lastIndexOf("\n", offset) + 1;
-		const prefix = text.slice(lineStart, offset);
-		return value.split("\n").map((line, at) => at === 0 ? line : line.length > 0 ? prefix + line : "").join("\n");
-	});
-}
 /** 逗号分隔 / YAML flow 数组 / 空格分隔的字符串列表 → 字符串数组。 */
 function parseListParam(value) {
 	if (Array.isArray(value)) return value.map((item) => String(item)).filter((item) => item.length > 0);
@@ -512,51 +539,95 @@ function parseListParam(value) {
 	return (trimmed.startsWith("[") && trimmed.endsWith("]") ? trimmed.slice(1, -1) : trimmed).split(",").map((item) => item.trim()).filter((item) => item.length > 0);
 }
 /**
-* 引擎内部 token 渲染:把直读参数变成组合模块里的 __TOKEN__ 值。
-* anchored 的全部组合行为(usePtcMode/bootstrapMaxTokens/模型路由与委派完整自定义)
-* 在这里完成参数化,用户参数文件不需要任何模板语法。
+* 参数桥：params 扁平键 → 引擎模块行 config 对象（取代旧 __TOKEN__ 文本渲染）。
+*
+* 原则：
+*  - 未声明的键不合并（composition 行默认 / 引擎默认生效），与旧"空值删行"语义等价；
+*  - 值类型直达（布尔/数字/数组不再字符串化再解析）；
+*  - 合并优先级：参数桥（UI/基础层）> moduleConfigs（模板/ST 行级直写）> 行默认。
 * 模型路由/委派参数统一扁平键（modelProvider/subagentModelProvider/toolFilterAllow/maxDepth 等），
 * 与官方 AgentOptions{provider,model} / toolFilter{allow,deny} / maxDepth 对齐。
 */
-function renderEngineTokens(params) {
+function buildModuleConfigsFromParams(params) {
+	const out = {};
+	const merge = (module, cfg) => {
+		if (Object.keys(cfg).length === 0) return;
+		out[module] = {
+			...out[module],
+			...cfg
+		};
+	};
+	const bootstrap = {};
+	if (typeof params.bootstrapMaxTokens === "number" && params.bootstrapMaxTokens > 0) bootstrap.bootstrapMaxTokens = params.bootstrapMaxTokens;
+	if (params.bootstrapTools !== void 0) bootstrap.bootstrapTools = parseListParam(params.bootstrapTools);
+	if (params.promoteGate !== void 0) bootstrap.promoteGate = params.promoteGate === true;
+	if (params.promoteAfterFirstResponse !== void 0) bootstrap.promoteAfterFirstResponse = params.promoteAfterFirstResponse === true;
+	if (params.maxPromoteSteps !== void 0 && Number.isSafeInteger(params.maxPromoteSteps)) bootstrap.maxPromoteSteps = params.maxPromoteSteps;
+	if (params.compactionTools !== void 0) bootstrap.compactionTools = parseListParam(params.compactionTools);
+	if (params.personaSectionsOnly !== void 0) bootstrap.personaSectionsOnly = params.personaSectionsOnly === true;
+	if (params.workspaceLine !== void 0) bootstrap.workspaceLine = params.workspaceLine === true;
+	if (typeof params.phase1FirstCallInstruction === "string" && params.phase1FirstCallInstruction.length > 0) bootstrap.phase1FirstCallInstruction = params.phase1FirstCallInstruction;
+	if (params.stages !== void 0) bootstrap.stages = params.stages;
+	if (params.stagePreUnlock !== void 0 && Number.isSafeInteger(params.stagePreUnlock)) bootstrap.stagePreUnlock = params.stagePreUnlock;
+	if (typeof params.stageAdvanceTool === "string" && params.stageAdvanceTool.length > 0) bootstrap.stageAdvanceTool = params.stageAdvanceTool;
+	if (typeof params.stageAdvanceDescription === "string" && params.stageAdvanceDescription.length > 0) bootstrap.stageAdvanceDescription = params.stageAdvanceDescription;
+	if (typeof params.stageSectionTemplate === "string" && params.stageSectionTemplate.length > 0) bootstrap.stageSectionTemplate = params.stageSectionTemplate;
+	merge("tool-bootstrap", bootstrap);
+	const gate = {};
+	if (params.allowKinds !== void 0) gate.allowKinds = parseListParam(params.allowKinds);
+	if (params.messageSources !== void 0) gate.messageSources = parseListParam(params.messageSources);
+	if (params.deferredSources !== void 0) gate.deferredSources = parseListParam(params.deferredSources);
+	if (params.deferredGraceSteps !== void 0 && Number.isSafeInteger(params.deferredGraceSteps)) gate.deferredGraceSteps = params.deferredGraceSteps;
+	if (params.instructionHint !== void 0) gate.instructionHint = params.instructionHint === true;
+	merge("context-gate", gate);
+	const presentation = {};
+	if (params.usePtcMode !== void 0) presentation.usePtcMode = params.usePtcMode === true;
+	merge("code-presentation", presentation);
+	const anchorTurn = {};
+	if (params.anchorTurn !== void 0) anchorTurn.enabled = params.anchorTurn === true;
+	if (typeof params.anchorTurnText === "string" && params.anchorTurnText.length > 0) anchorTurn.text = params.anchorTurnText;
+	merge("anchor-turn", anchorTurn);
+	const gate2 = {};
+	if (params.deliberationGate !== void 0) gate2.enabled = params.deliberationGate === true;
+	if (typeof params.deliberationMinChars === "number" && params.deliberationMinChars > 0) gate2.minChars = params.deliberationMinChars;
+	if (typeof params.deliberationMaxGatesPerTurn === "number" && params.deliberationMaxGatesPerTurn > 0) gate2.maxGatesPerTurn = params.deliberationMaxGatesPerTurn;
+	merge("deliberation-gate", gate2);
+	const drip = {};
+	if (params.cotDrip !== void 0) drip.enabled = params.cotDrip === true;
+	if (typeof params.cotDripEvery === "number" && params.cotDripEvery > 0) drip.every = params.cotDripEvery;
+	if (typeof params.cotDripMaxPerTurn === "number" && params.cotDripMaxPerTurn > 0) drip.maxPerTurn = params.cotDripMaxPerTurn;
+	merge("cot-drip", drip);
+	const editor = {};
+	editor.maxOutputChars = typeof params.strReplaceEditorMaxOutputChars === "number" && Number.isSafeInteger(params.strReplaceEditorMaxOutputChars) && params.strReplaceEditorMaxOutputChars > 0 ? params.strReplaceEditorMaxOutputChars : 16e3;
+	merge("str-replace-editor", editor);
+	const filter = {};
+	const mainAllow = parseListParam(params.toolFilterAllow);
+	const mainDeny = parseListParam(params.toolFilterDeny);
+	if (mainAllow.length > 0) filter.allow = mainAllow;
+	if (mainDeny.length > 0) filter.deny = mainDeny;
+	if (params.toolFilterSubagents === true) filter.includeSubagents = true;
+	merge("tool-filter", filter);
+	const subagent = {};
 	const provider = asString(params.subagentModelProvider, "");
 	const model = asString(params.subagentModelName, "");
-	const subagentPersona = asString(params.subagentPersona);
-	const toolFilterAllow = parseListParam(params.toolFilterAllow);
-	const toolFilterDeny = parseListParam(params.toolFilterDeny);
-	const mainFilterAllow = parseListParam(params.toolFilterAllow);
-	const mainFilterDeny = parseListParam(params.toolFilterDeny);
-	const mainFilterSubagents = params.toolFilterSubagents === true;
-	const mainFilterAllowLine = mainFilterAllow.length > 0 ? `[${mainFilterAllow.join(", ")}]` : "";
-	const mainFilterDenyLine = mainFilterDeny.length > 0 ? `[${mainFilterDeny.join(", ")}]` : "";
+	if (provider.length > 0 && model.length > 0) subagent.agentOptions = {
+		provider,
+		model
+	};
+	const subAllow = parseListParam(params.toolFilterAllow);
+	const subDeny = parseListParam(params.toolFilterDeny);
+	if (subAllow.length > 0 || subDeny.length > 0) subagent.toolFilter = {
+		...subAllow.length > 0 ? { allow: subAllow } : {},
+		...subDeny.length > 0 ? { deny: subDeny } : {}
+	};
 	const rawMaxDepth = params.maxDepth;
-	const subagentMaxDepth = rawMaxDepth === "provider-managed" ? "provider-managed" : Number.isSafeInteger(rawMaxDepth) && rawMaxDepth >= 0 ? String(rawMaxDepth) : "";
-	const subagentLines = [];
-	if (provider.length > 0 && model.length > 0) subagentLines.push("agentOptions:", `  provider: ${provider}`, `  model: ${model}`);
-	if (subagentPersona.length > 0) subagentLines.push(interpolateNested("persona: |-\n  {{subagentPersona}}", { subagentPersona }));
-	if (toolFilterAllow.length > 0 || toolFilterDeny.length > 0) {
-		subagentLines.push("toolFilter:");
-		if (toolFilterAllow.length > 0) subagentLines.push(`  allow: [${toolFilterAllow.join(", ")}]`);
-		if (toolFilterDeny.length > 0) subagentLines.push(`  deny: [${toolFilterDeny.join(", ")}]`);
+	if (rawMaxDepth === "provider-managed") subagent.maxDepth = "provider-managed";
+	else if (Number.isSafeInteger(rawMaxDepth) && rawMaxDepth >= 0) subagent.maxDepth = rawMaxDepth;
+	if (Object.keys(subagent).length > 0) {
+		out["tool-subagent"] = subagent;
+		out["tool-subagent-fork"] = subagent;
 	}
-	if (subagentMaxDepth.length > 0) subagentLines.push(`maxDepth: ${subagentMaxDepth}`);
-	const subagentConfigBlock = subagentLines.join("\n");
-	const bootstrap = typeof params.bootstrapMaxTokens === "number" && params.bootstrapMaxTokens > 0 ? `bootstrapMaxTokens: ${params.bootstrapMaxTokens}` : "";
-	const editorMaxOutputChars = typeof params.strReplaceEditorMaxOutputChars === "number" && Number.isSafeInteger(params.strReplaceEditorMaxOutputChars) && params.strReplaceEditorMaxOutputChars > 0 ? String(params.strReplaceEditorMaxOutputChars) : "16000";
-	return {
-		usePtcMode: params.usePtcMode === void 0 ? "" : params.usePtcMode === true ? "true" : "false",
-		bootstrapMaxTokens: bootstrap,
-		subagentConfig: subagentConfigBlock,
-		allowKinds: params.allowKinds === void 0 ? "" : Array.isArray(params.allowKinds) ? `[${params.allowKinds.map((item) => String(item)).join(", ")}]` : asString(params.allowKinds),
-		strReplaceEditorMaxOutputChars: editorMaxOutputChars,
-		mainToolFilterAllow: mainFilterAllowLine,
-		mainToolFilterDeny: mainFilterDenyLine,
-		mainToolFilterSubagents: String(mainFilterSubagents)
-	};
-}
-/** 预设 params + runtime → 组合 token 渲染(便捷入口)。 */
-function resolvePresetTokens(spec, runtime) {
-	return renderEngineTokens(resolvePresetParams(spec, runtime));
+	return out;
 }
 /** 按参数文件的 modules 清单从引擎模块库装配组合文本。 */
 /** 空模块清单兜底骨架（自定义预设空白起点：模块集与 minimal 一致，参数/配置全空）。 */
@@ -565,6 +636,7 @@ const FALLBACK_MODULES = [
 	"bootstrap-filesystem",
 	"context-gate",
 	"tool-bootstrap",
+	"code-presentation",
 	"prompt-config-engine",
 	"run-code-env",
 	"custom-bash",
@@ -588,9 +660,10 @@ function assembleModules(spec, library) {
 *   2. 兼容 `composition:` 内联文本或组合清单名。
 */
 /**
-* 行级 config 合并(moduleConfigs):仅支持 map 型 config 浅合并;
-* 数组型 config(如 compaction)与未声明模块原样保留。
-* 未声明 moduleConfigs 时返回原文(零开销);parseDocument 往返保留注释与 __TOKEN__。
+* 行级 config 合并:仅支持 map 型 config 浅合并;
+* 数组型 config(如 delegation 组)按子行 id 嵌套合并;未声明模块原样保留。
+* 未声明 configs 时返回原文(零开销);parseDocument 往返保留注释。
+* 本函数是参数桥产物落位组合行的唯一机制(含 delegation 组子行嵌套),不是预设覆盖通道。
 */
 function applyModuleConfigs(raw, configs) {
 	if (configs === void 0 || Object.keys(configs).length === 0) return raw;
@@ -598,21 +671,38 @@ function applyModuleConfigs(raw, configs) {
 	if (!(doc.contents instanceof YAMLSeq)) return raw;
 	const rows = doc.contents;
 	let changed = false;
-	for (const item of rows.items) {
-		if (!(item instanceof YAMLMap)) continue;
-		const idNode = item.get("id", true);
-		const id = idNode !== null && typeof idNode === "object" && "value" in idNode ? String(idNode.value) : void 0;
-		if (id === void 0 || !Object.prototype.hasOwnProperty.call(configs, id)) continue;
+	/** 把 cfg 的键写入一个 config 节点（无 config 时创建）。 */
+	const mergeInto = (item, cfg) => {
 		const existingConfig = item.get("config", true);
 		let configNode;
 		if (existingConfig instanceof YAMLMap) configNode = existingConfig;
 		else if (existingConfig === null || existingConfig === void 0) {
 			configNode = new YAMLMap();
 			item.items.push(new Pair(new Scalar("config"), configNode));
-			changed = true;
-		} else continue;
-		for (const [key, value] of Object.entries(configs[id])) configNode.set(key, value);
-		changed = true;
+		} else return false;
+		for (const [key, value] of Object.entries(cfg)) configNode.set(key, value);
+		return true;
+	};
+	/** 从行节点读 id（ParsedNode 值包装兼容）。 */
+	const rowId = (item) => {
+		const idNode = item.get("id", true);
+		return idNode !== null && typeof idNode === "object" && "value" in idNode ? String(idNode.value) : void 0;
+	};
+	for (const item of rows.items) {
+		if (!(item instanceof YAMLMap)) continue;
+		const id = rowId(item);
+		const existingConfig = item.get("config", true);
+		if (existingConfig instanceof YAMLSeq && id !== void 0 && !Object.prototype.hasOwnProperty.call(configs, id)) {
+			for (const child of existingConfig.items) {
+				if (!(child instanceof YAMLMap)) continue;
+				const childId = rowId(child);
+				if (childId === void 0 || !Object.prototype.hasOwnProperty.call(configs, childId)) continue;
+				if (mergeInto(child, configs[childId])) changed = true;
+			}
+			continue;
+		}
+		if (id === void 0 || !Object.prototype.hasOwnProperty.call(configs, id)) continue;
+		if (mergeInto(item, configs[id])) changed = true;
 	}
 	return changed ? doc.toString() : raw;
 }
@@ -657,13 +747,18 @@ function loadCompositionText(spec, templateDir) {
 	return raw;
 }
 /**
-* 预设组合渲染完整链路:token 渲染 → moduleConfigs 行级合并。
-* 合并必须发生在 token 渲染之后(独立行 token 在渲染前是非法 YAML,
-* 如 __SUBAGENT_CONFIG__ / __BOOTSTRAP_MAX_TOKENS__)。
+* 预设组合渲染完整链路:模块装配 → 参数桥(moduleConfigs + params)行级合并。
+* 合并优先级:参数桥(params/UI 基础层) > moduleConfigs(模板/ST 行级直写) > 行默认。
+* moduleConfigs 仅补充参数桥未覆盖的行级 config(如 ST 导入的 tool-web.fetch),
+* 不再锁定覆盖 UI 可管理参数(旧作者锁定语义已移除)。
 */
 function renderComposition(spec, runtime, templateDir) {
-	const tokens = resolvePresetTokens(spec, runtime);
-	return applyModuleConfigs(renderTemplateVariables(loadCompositionText(spec, templateDir), tokens), spec.moduleConfigs);
+	const merged = buildModuleConfigsFromParams(resolvePresetParams(spec, runtime));
+	for (const [id, cfg] of Object.entries(spec.moduleConfigs ?? {})) merged[id] = {
+		...cfg,
+		...merged[id]
+	};
+	return applyModuleConfigs(loadCompositionText(spec, templateDir), merged);
 }
 /** 组合文本基础校验（模板无关）：无未解析 token，且必须是 YAML 数组。 */
 function assertCompositionArray(raw, spec) {
@@ -673,26 +768,6 @@ function assertCompositionArray(raw, spec) {
 	if (!Array.isArray(parsed)) throw new Error(`generated agent.cordis.yml is not a YAML array (preset ${spec.id})`);
 	return parsed;
 }
-/**
-* 文本 token 替换:
-*   - token 独立成行时,替换块按该行缩进前缀(用于 line/block);
-*   - token 内联时直接替换(用于布尔/字符串标量)。
-*/
-function renderTemplateVariables(raw, variables) {
-	let text = raw.replace(/^[ \t]*(?:[A-Za-z0-9_.-]+:[ \t]*)?__([A-Za-z0-9_]+)__[ \t]*\r?\n/gm, (whole, key) => Object.prototype.hasOwnProperty.call(variables, key) && variables[key] === "" ? "" : whole);
-	return text.replace(/__([A-Za-z0-9_]+)__/g, (whole, key, offset) => {
-		if (!Object.prototype.hasOwnProperty.call(variables, key)) return whole;
-		const value = variables[key];
-		if (value === "") return "";
-		const lineStart = text.lastIndexOf("\n", offset) + 1;
-		const lineEndRaw = text.indexOf("\n", offset);
-		const lineEnd = lineEndRaw < 0 ? text.length : lineEndRaw;
-		const prefix = text.slice(lineStart, offset);
-		const rest = text.slice(offset + whole.length, lineEnd);
-		if (prefix.trim() === "" && rest.trim() === "") return value.split("\n").map((line, at) => at === 0 ? line : line.length > 0 ? prefix + line : "").join("\n");
-		return value;
-	});
-}
 //#endregion
 //#region src/host/prompt-configs.ts
 /**
@@ -806,4 +881,4 @@ function loadPromptConfigFiles(dir) {
 	return specs;
 }
 //#endregion
-export { userPresetsDir as C, DEFAULT_SKILLS_DIR as D, DEFAULT_RESIDENT_AGENTS_PATH as E, LEGACY_CONTAINER_DIR as O, savePresetParams as S, DEFAULT_PRESET_DIR as T, readPluginState as _, asString as a, resolvePresetDir as b, duplicateUserPreset as c, listPresets as d, loadPresetContent as f, parseImportedPresetId as g, packageEngineDir as h, applyModuleConfigs as i, LEGACY_USER_PRESETS_DIR as k, ensurePresetSeed as l, openPresetLocation as m, mergePromptConfigs as n, assertCompositionArray as o, loadPresetSpec as p, renderPromptConfigYaml as r, cloneBuiltinPreset as s, loadPromptConfigFiles as t, listBuiltinTemplates as u, removeUserPreset as v, writePluginState as w, resolvePresetParams as x, renderComposition as y };
+export { DEFAULT_SKILLS_DIR as A, resolvePresetParams as C, writePluginState as D, withPresetDoc as E, LEGACY_USER_PRESETS_DIR as M, DEFAULT_PRESET_DIR as O, resolvePresetDir as S, userPresetsDir as T, packageEngineDir as _, applyModuleConfigs as a, removeUserPreset as b, buildModuleConfigsFromParams as c, ensurePresetSeed as d, listBuiltinTemplates as f, openPresetLocation as g, loadPresetSpec as h, MODEL_SEGMENT_MAP as i, LEGACY_CONTAINER_DIR as j, DEFAULT_RESIDENT_AGENTS_PATH as k, cloneBuiltinPreset as l, loadPresetContent as m, mergePromptConfigs as n, asString as o, listPresets as p, renderPromptConfigYaml as r, assertCompositionArray as s, loadPromptConfigFiles as t, duplicateUserPreset as u, parseImportedPresetId as v, savePresetParams as w, renderComposition as x, readPluginState as y };