dsh-plugin-prompt-tool 3.1.0 → 3.1.2

package/lib/index.mjs

@@ -10475,7 +10475,7 @@ function officialAliasOf(name) {
 * 非法官方名（中文/大写/连字符）改写成确定性别名并改写文本引用；注册失败的名字退回静态解析。
 * @returns 各配置独立的引用白名单与别名；同一作用域内等价绑定只注册一次。
 */
-function registerOfficialVariables(ctx, configs, warnOnce, keep) {
+function registerOfficialVariables(ctx, configs, warnOnce, keep, shared) {
 	const registries = new Map(configs.map((config) => [config, {
 		protect: /* @__PURE__ */ new Set(),
 		alias: /* @__PURE__ */ new Map(),
@@ -10497,8 +10497,9 @@ function registerOfficialVariables(ctx, configs, warnOnce, keep) {
 		}
 	}
 	for (const fact of facts) reserved.add(fact);
-	const bindings = /* @__PURE__ */ new Map();
-	const usedNames = /* @__PURE__ */ new Set();
+	const bindings = shared?.bindings ?? /* @__PURE__ */ new Map();
+	const usedNames = shared?.usedNames ?? /* @__PURE__ */ new Set();
+	const retained = /* @__PURE__ */ new Set();
 	for (const [config, referenced] of references) {
 		const registry = registries.get(config);
 		for (const name of referenced) {
@@ -10522,20 +10523,34 @@ function registerOfficialVariables(ctx, configs, warnOnce, keep) {
 					usedNames.add(official);
 					const source = isFact ? name.toLowerCase() : name;
 					const variablesDisabled = config[SESSION_VARIABLES_DISABLED] === true;
-					keep(systemPrompt.variable(official, (context) => {
+					const release = systemPrompt.variable(official, (context) => {
 						const session = context?.agent?.session;
 						const variables = variablesDisabled ? {} : config.variableStore?.read(config.sourceModuleId).effective ?? config.variables;
 						return officialChannelText(interpolateVariables(Object.hasOwn(variables, source) ? String(variables[source]) : runtimeFactValue(source, session) ?? "", variables, session, void 0, `variable:${config.sourceModuleId}:${config.id}:${name}`), `variable ${official}`, {
 							alias: /* @__PURE__ */ new Map(),
 							registered: /* @__PURE__ */ new Set()
 						}, warnOnce);
-					}), `${name}: official prompt variable ${official}`);
-					binding = official;
+					});
+					binding = {
+						name: official,
+						release,
+						refs: 0
+					};
 					bindings.set(signature, binding);
 				}
-				registry.registered.add(binding);
+				if (!retained.has(signature)) {
+					retained.add(signature);
+					binding.refs++;
+					keep(() => {
+						if (--binding.refs > 0) return;
+						bindings.delete(signature);
+						usedNames.delete(binding.name);
+						binding.release?.();
+					}, `${name}: official prompt variable ${binding.name}`);
+				}
+				registry.registered.add(binding.name);
 				registry.protect.add(name);
-				if (binding !== name) registry.alias.set(name, binding);
+				if (binding.name !== name) registry.alias.set(name, binding.name);
 			} catch (error) {
 				warnOnce(`${name}: 官方 prompt 变量 ${official} 注册失败，该引用退回静态解析：${String(error?.message ?? error)}`);
 			}
@@ -10575,7 +10590,7 @@ function textLayerGroups(configs) {
 	for (const config of sorted) {
 		const previous = groups.at(-1);
 		const base = previous?.[0];
-		if (config.mergeMode === "merged" && base?.mergeMode === "merged" && config.sourceModuleId === base.sourceModuleId && config.params?.complete === true === (base.params?.complete === true) && config.params?.suppressRuntimeContext === true === (base.params?.suppressRuntimeContext === true) && config.position === base.position && config.order === base.order) previous.push(config);
+		if (config.mergeMode === "merged" && base?.mergeMode === "merged" && config.sourceModuleId === base.sourceModuleId && config.params?.complete === true === (base.params?.complete === true) && config.params?.suppressRuntimeContext === true === (base.params?.suppressRuntimeContext === true) && config.runtimePoint?.waterfallPosition === base.runtimePoint?.waterfallPosition && config.position === base.position && config.order === base.order) previous.push(config);
 		else groups.push([config]);
 	}
 	return groups;
@@ -11059,9 +11074,9 @@ function orderedNamesOf(entries) {
 * 回填到它们原来的槽位。只换本插件段之间的位置：平台段与其他插件段占住的槽位不动。
 */
 function registerDeliveryOrder(ctx, keep, collection, names) {
-	if (names.length < 2) return;
-	const rank = new Map(names.map((entryName, index) => [entryName, index]));
+	if (typeof names !== "function" && names.length < 2) return;
 	keep(ctx.on("system-prompt/assemble", async (assembly, context, next) => {
+		const rank = new Map((typeof names === "function" ? names() : names).map((entryName, index) => [entryName, index]));
 		const result = await next();
 		const list = result?.[collection];
 		if (!Array.isArray(list)) return result;
@@ -11117,11 +11132,11 @@ function wireLayers(ctx, configs, warnOnce, options = {}) {
 	};
 	try {
 		/** 实际注册名与序号：重排器只认这里，不从 configs 反推。 */
-		const ordered = {
+		const ordered = options.ordered ?? {
 			sections: [],
 			contexts: []
 		};
-		const registry = registerOfficialVariables(ctx, configs.filter((config) => config.layer === "system-section" || config.layer === "runtime-context"), warnOnce, keep);
+		const registry = registerOfficialVariables(ctx, configs.filter((config) => config.layer === "system-section" || config.layer === "runtime-context"), warnOnce, keep, options.sharedVariables);
 		const conditional = configs.filter((config) => ["system-section", "runtime-context"].includes(config.layer) && (typeof config.rule?.when === "function" || typeof config.actionWhen === "function" || (config.rule !== void 0 || config.params?.templateEvaluation === true) && config.params?.complete !== true && config.params?.suppressRuntimeContext !== true));
 		const regular = configs.filter((config) => !conditional.includes(config));
 		wireSystemSections(ctx, regular.filter((config) => config.layer === "system-section"), registry, warnOnce, keep, ordered, options.sourceError);
@@ -11129,13 +11144,113 @@ function wireLayers(ctx, configs, warnOnce, options = {}) {
 		wireRuleTextContributions(ctx, conditional, registry, warnOnce, keep, on, ordered, options.sourceError);
 		wireTurnStops(ctx, configs.filter((config) => config.layer === "turn-stop"), warnOnce, on, options.turnStopBudgets);
 		wireSubagentEvents(ctx, configs.filter((config) => config.layer === "subagent-start" || config.layer === "subagent-end"), warnOnce, on);
-		for (const collection of ["sections", "contexts"]) registerDeliveryOrder(ctx, keep, collection, orderedNamesOf(ordered[collection]));
+		for (const collection of options.deliveryOrder === false ? [] : ["sections", "contexts"]) registerDeliveryOrder(ctx, keep, collection, orderedNamesOf(ordered[collection]));
 		return dispose;
 	} catch (error) {
 		dispose();
 		throw error;
 	}
 }
+/** 按实际文本组保留注册；共享排序投影变化不撤销未变化组的 provider。 */
+function createLayerRuntime(ctx, warnOnce, options = {}) {
+	let records = [];
+	let active = true;
+	const listeners = [];
+	const sharedVariables = {
+		bindings: /* @__PURE__ */ new Map(),
+		usedNames: /* @__PURE__ */ new Set()
+	};
+	const keep = (release) => {
+		listeners.push(release);
+	};
+	try {
+		for (const collection of ["sections", "contexts"]) registerDeliveryOrder(ctx, keep, collection, () => orderedNamesOf(records.flatMap((record) => record.ordered[collection])));
+	} catch (error) {
+		for (const release of listeners.reverse()) release();
+		throw error;
+	}
+	const groupsOf = (configs) => {
+		const groups = [];
+		for (const layer of ["system-section", "runtime-context"]) {
+			const selected = configs.filter((config) => config.layer === layer);
+			const conditional = selected.filter((config) => typeof config.rule?.when === "function" || typeof config.actionWhen === "function" || (config.rule !== void 0 || config.params?.templateEvaluation === true) && config.params?.complete !== true && config.params?.suppressRuntimeContext !== true);
+			const conditionalSet = new Set(conditional);
+			const regular = selected.filter((config) => !conditionalSet.has(config));
+			groups.push(...textLayerGroups(conditional));
+			if (layer === "system-section") groups.push(...textLayerGroups(regular));
+			else {
+				const resolver = regular.filter((config) => config.strategy === "placeholder" || !KNOWN_STRATEGIES.has(config.strategy));
+				const resolverSet = new Set(resolver);
+				groups.push(...textLayerGroups(regular.filter((config) => !resolverSet.has(config))), ...resolver.map((config) => [config]));
+			}
+		}
+		const other = configs.filter((config) => !["system-section", "runtime-context"].includes(config.layer));
+		return [...groups, ...other.map((config) => [config])];
+	};
+	const mount = (configs) => {
+		const ordered = {
+			sections: [],
+			contexts: []
+		};
+		const handlers = [];
+		return {
+			configs,
+			ordered,
+			handlers,
+			dispose: wireLayers(ctx, configs, warnOnce, {
+				...options,
+				sharedVariables,
+				ordered,
+				deliveryOrder: false,
+				on(channel, handler) {
+					handlers.push({
+						channel,
+						handler,
+						config: configs[0]
+					});
+					return () => {};
+				}
+			})
+		};
+	};
+	return {
+		replace(configs) {
+			if (!active) throw new Error("rule text runtime disposed");
+			const groups = groupsOf(configs);
+			const byFirst = new Map(records.map((record) => [record.configs[0], record]));
+			const retained = groups.map((group) => {
+				const record = byFirst.get(group[0]);
+				return record?.configs.length === group.length && group.every((config, index) => record.configs[index] === config) ? record : void 0;
+			});
+			const retainedSet = new Set(retained);
+			const removed = records.filter((record) => !retainedSet.has(record));
+			for (const record of removed) record.dispose();
+			const created = [];
+			try {
+				records = groups.map((group, index) => {
+					if (retained[index] !== void 0) return retained[index];
+					const record = mount(group);
+					created.push(record);
+					return record;
+				});
+				const owners = new Set(configs.map((config) => config.sourceModuleId ?? ""));
+				for (const owner of options.turnStopBudgets?.keys() ?? []) if (!owners.has(owner)) options.turnStopBudgets.delete(owner);
+			} catch (error) {
+				for (const record of created.reverse()) record.dispose();
+				records = records.filter((record) => !removed.includes(record));
+				for (const record of removed) records.push(mount(record.configs));
+				throw error;
+			}
+		},
+		entries: () => records.flatMap((record) => record.handlers),
+		dispose() {
+			if (!active) return;
+			active = false;
+			for (const record of records.splice(0).reverse()) record.dispose();
+			for (const release of listeners.splice(0).reverse()) release();
+		}
+	};
+}
 //#endregion
 //#region engine/anchor-match.mjs
 /**
@@ -20017,6 +20132,14 @@ function createBridgeRuntime(options) {
 	};
 	const runOverridesChange = (moduleId) => finishModuleChange(() => deps.overridesChanged?.(moduleId));
 	const refreshModuleList = () => finishModuleChange(() => deps.moduleListChanged?.());
+	const schedulePublication = async (moduleId, reason) => {
+		const schedule = deps.schedulePublication;
+		if (schedule !== void 0) {
+			const result = await finishModuleChange(() => schedule(moduleId, reason));
+			return result.publicationPending ? result : { persisted: true };
+		}
+		return reason === "installed" ? finishModuleChange(() => deps.moduleInstalled?.(moduleId)) : reason === "capability" ? finishModuleChange(() => deps.capabilityChanged?.(moduleId)) : reason === "list" ? refreshModuleList() : runOverridesChange(moduleId);
+	};
 	const writeModuleOrderError = (write, error) => {
 		write(error instanceof ModuleConfigOrderError ? error.status : 500, {
 			ok: false,
@@ -20121,6 +20244,8 @@ function createBridgeRuntime(options) {
 		const globalLayerError = readGlobalLayerSettingsSafe(userModulesDir()).error;
 		if (globalLayerError !== void 0) warnings.push(`全局层 layerSettings 解析失败，已按「无全局层」继续（指令卡的全局开关暂不可用）：${globalLayerError}`);
 		if (warnings.length > 0) meta.moduleWarnings = warnings;
+		const publicationFailures = deps.publicationFailures?.();
+		if (publicationFailures !== void 0 && publicationFailures.length > 0) meta.publicationFailures = publicationFailures;
 		meta.editorGroups = ENGINE_EDITOR_GROUP_MAP.map(({ id, displayLayer, relatedLayers, hook }) => ({
 			id,
 			displayLayer,
@@ -20258,7 +20383,7 @@ function createBridgeRuntime(options) {
 		...pendingVariableSettings.has(dir) ? { publicationError: pendingVariableSettings.get(dir) } : {}
 	});
 	const refreshVariableSettings = async (dir) => {
-		if (!pendingVariableSettings.has(dir)) return;
+		if (!pendingVariableSettings.has(dir) && deps.schedulePublication === void 0) return;
 		try {
 			await deps.overridesChanged?.(basename(dir));
 			pendingVariableSettings.delete(dir);
@@ -20274,6 +20399,15 @@ function createBridgeRuntime(options) {
 			...committed,
 			...published(committed.publicationError ?? "变量已保存，等待运行发布")
 		};
+		if (settingsChanged && deps.schedulePublication !== void 0) {
+			const publication = await schedulePublication(basename(dir));
+			if (publication.publicationPending) pendingVariableSettings.set(dir, publication.publicationError ?? "变量开关已保存，等待运行发布");
+			else pendingVariableSettings.delete(dir);
+			return {
+				...committed,
+				...publication
+			};
+		}
 		if (settingsChanged) await refreshVariableSettings(dir);
 		return {
 			...committed,
@@ -20314,6 +20448,7 @@ function createBridgeRuntime(options) {
 		finishModuleChange,
 		runOverridesChange,
 		refreshModuleList,
+		schedulePublication,
 		writeModuleOrderError,
 		loadEngineMeta,
 		collectSkills,
@@ -20727,7 +20862,7 @@ function registerDefinitions(runtime) {
 						appendModuleCapabilities(doc, customToolModules(customTools));
 					}
 				}, { owns: ["customTools", "modules"] });
-				const publication = await runtime.runOverridesChange(basename(dir));
+				const publication = await runtime.schedulePublication(basename(dir));
 				tx.write(200, {
 					ok: true,
 					value: {
@@ -20787,7 +20922,7 @@ function registerDefinitions(runtime) {
 					if (!creating && (typeof record.expectedRevision !== "string" || !SHA256_HEX_RE.test(record.expectedRevision))) throw new TypeError("保存人设必须提供读取时的 expectedRevision");
 					saved = saveModulePersona(root, id, persona, creating ? readModulePersona(dir).revision : record.expectedRevision);
 				}
-				const publication = await runtime.runOverridesChange(basename(dir));
+				const publication = record.refreshOnly === true ? await runtime.runOverridesChange(basename(dir)) : await runtime.schedulePublication(basename(dir));
 				tx.write(200, {
 					ok: true,
 					value: {
@@ -20836,7 +20971,7 @@ function registerDefinitions(runtime) {
 				}
 				if (record.refreshOnly !== true && record.expectedRevision !== null && (typeof record.expectedRevision !== "string" || !SHA256_HEX_RE.test(record.expectedRevision))) throw new TypeError("保存人设来源必须提供读取时的 expectedRevision");
 				const saved = record.refreshOnly === true ? readPersonaSources(root) : writePersonaSources(root, record.sources, record.expectedRevision);
-				const publication = await runtime.runOverridesChange();
+				const publication = record.refreshOnly === true ? await runtime.runOverridesChange() : await runtime.schedulePublication();
 				tx.write(200, {
 					ok: true,
 					value: {
@@ -20921,7 +21056,7 @@ function registerDefinitions(runtime) {
 						action: "create-recipe",
 						recipeId: id.trim()
 					});
-					const publication = result.changed ? await runtime.finishModuleChange(() => runtime.deps.capabilityChanged?.(basename(dir))) : published();
+					const publication = result.changed ? await runtime.schedulePublication(basename(dir), "capability") : published();
 					tx.write(200, {
 						ok: true,
 						value: {
@@ -22013,9 +22148,8 @@ function registerInstructions(runtime) {
 					...record.activateRuleId === void 0 ? {} : { activateRuleId: record.activateRuleId },
 					...record.validateOnly === void 0 ? {} : { validateOnly: record.validateOnly }
 				}) : isEditableModuleDir(dir) ? readModuleRules(dir) : ensureModuleSlices(dir, { writable: false });
-				if (writing) try {
-					await runtime.deps.overridesChanged?.(basename(dir));
-				} catch (error) {
+				const publication = writing ? await runtime.schedulePublication(basename(dir)) : void 0;
+				if (publication?.publicationPending) {
 					tx.write(200, {
 						ok: true,
 						value: {
@@ -22023,7 +22157,7 @@ function registerInstructions(runtime) {
 							revisions: candidate.revisions,
 							meta: await ruleEditorMeta(),
 							...createdRuleId === void 0 ? {} : { createdRuleId },
-							...published(`规则已保存，但运行刷新失败：${String(error)}`)
+							...publication
 						}
 					});
 					return;
@@ -22044,7 +22178,7 @@ function registerInstructions(runtime) {
 						revisions: result.revisions,
 						meta: await ruleEditorMeta(),
 						...createdRuleId === void 0 ? {} : { createdRuleId },
-						...writing ? published() : {}
+						...publication
 					}
 				});
 			} catch (error) {
@@ -22167,7 +22301,7 @@ function registerLifecycle(runtime) {
 				});
 				return;
 			}
-			const publication = await runtime.refreshModuleList();
+			const publication = await runtime.schedulePublication(void 0, "list");
 			if (publication.publicationPending) runtime.deps.warn?.(`删除模块 ${id} 后刷新运行实例失败：${publication.publicationError}`);
 			tx.write(200, {
 				ok: true,
@@ -22217,7 +22351,7 @@ function registerLifecycle(runtime) {
 				});
 				return;
 			}
-			const publication = await runtime.refreshModuleList();
+			const publication = await runtime.schedulePublication(void 0, "list");
 			tx.write(200, {
 				ok: true,
 				value: {
@@ -22257,7 +22391,7 @@ function registerLifecycle(runtime) {
 				});
 				return;
 			}
-			const publication = await runtime.refreshModuleList();
+			const publication = await runtime.schedulePublication(void 0, "list");
 			tx.write(200, {
 				ok: true,
 				value: {
@@ -22320,7 +22454,7 @@ function registerLifecycle(runtime) {
 				}
 				if (record.expectedRevision === void 0 || record.expectedModuleId === void 0) throw new ModuleNameError("保存名称必须提供 expectedRevision 和 expectedModuleId");
 				const value = writeModuleName(dir, record);
-				const publication = await runtime.runOverridesChange(basename(dir));
+				const publication = await runtime.schedulePublication(basename(dir));
 				tx.write(200, {
 					ok: true,
 					value: {
@@ -22398,26 +22532,9 @@ function registerLifecycle(runtime) {
 			const enabled = record.enabled;
 			await runtime.moduleOrderQueue.run(async () => {
 				try {
-					let publication = published();
-					if (enabled) {
-						const changed = appendModuleConfigOrder(userModulesDir(), id);
-						if (!changed.includes(id) && !enabledModuleIds(userModulesDir()).includes(id) && readModuleConfigOrder(userModulesDir(), id).entries.length > 0) changed.push(id);
-						for (const changedId of changed) {
-							publication = await runtime.runOverridesChange(changedId);
-							if (publication.publicationPending) {
-								tx.write(200, {
-									ok: true,
-									value: {
-										enabled: enabledModuleIds(userModulesDir()),
-										...publication
-									}
-								});
-								return;
-							}
-						}
-					}
+					if (enabled) appendModuleConfigOrder(userModulesDir(), id);
 					setModuleEnabled(userModulesDir(), id, enabled);
-					publication = await runtime.runOverridesChange();
+					const publication = await runtime.schedulePublication();
 					tx.write(200, {
 						ok: true,
 						value: {
@@ -22478,7 +22595,7 @@ function registerLifecycle(runtime) {
 					if (writing) {
 						const changedIds = saveModuleConfigOrder(userModulesDir(), body.expectedRevision, body.entries, moduleId);
 						for (const id of changedIds) {
-							publication = await runtime.runOverridesChange(id);
+							publication = await runtime.schedulePublication(id);
 							if (publication.publicationPending) break;
 						}
 					}
@@ -22724,7 +22841,7 @@ function registerParams(runtime) {
 		try {
 			if (global) writeGlobalLayerSettings(userModulesDir(), rawOverrides ?? {});
 			else saveModuleParams(moduleRoot, templateName, rawOverrides, void 0);
-			const publication = record.rebuild === false ? published() : await runtime.runOverridesChange(global ? void 0 : basename(dir));
+			const publication = record.rebuild === false ? published() : await runtime.schedulePublication(global ? void 0 : basename(dir));
 			tx.write(200, {
 				ok: true,
 				value: {
@@ -25586,7 +25703,7 @@ function registerTransfer(runtime) {
 				}
 				const installed = await installModulePackage(userModulesDir(), files, request.params);
 				runtime.descriptor.invalidate();
-				const publication = await runtime.finishModuleChange(() => runtime.deps.moduleInstalled?.(installed.id));
+				const publication = await runtime.schedulePublication(installed.id, "installed");
 				tx.write(200, {
 					ok: true,
 					value: {
@@ -28702,6 +28819,110 @@ function createModuleInitialization(ctx) {
 	};
 }
 //#endregion
+//#region src/runtime/publication-queue.ts
+/** 保存防抖与请求前冲刷共用待发布集合；回调只消费当批快照。 */
+function createPublicationQueue(options) {
+	const serial = createTargetQueue();
+	const ids = /* @__PURE__ */ new Set();
+	const retries = /* @__PURE__ */ new Set();
+	const errors = /* @__PURE__ */ new Map();
+	let all = false, retryAll = false, active = true;
+	let timer;
+	let timerDone;
+	let resolveTimer;
+	let running;
+	const cancelTimer = () => {
+		if (timer !== void 0) clearTimeout(timer);
+		timer = void 0;
+		resolveTimer?.();
+		resolveTimer = void 0;
+		timerDone = void 0;
+	};
+	const assertActive = () => {
+		if (!active) throw new Error("publication queue released");
+	};
+	const include = (id) => {
+		if (id === void 0) {
+			all = true;
+			ids.clear();
+		} else if (!all) ids.add(id);
+	};
+	const start = () => {
+		cancelTimer();
+		if (running !== void 0) return running.catch(() => {}).then(start);
+		if (!active || !all && ids.size === 0) return Promise.resolve();
+		const modules = all ? void 0 : [...ids];
+		const retry = retryAll ? true : [...retries];
+		all = false;
+		retryAll = false;
+		ids.clear();
+		retries.clear();
+		const task = serial.run("publication", async () => {
+			try {
+				const complete = await options.publish(modules, retry);
+				if (modules === void 0 || complete === true) errors.clear();
+				else for (const id of modules) errors.delete(id);
+			} catch (error) {
+				const message = error instanceof Error ? error.message : String(error);
+				const at = Date.now();
+				for (const id of modules ?? [void 0]) errors.set(id ?? "", {
+					...id === void 0 ? {} : { moduleId: id },
+					message,
+					at
+				});
+				try {
+					options.warn(message);
+				} catch {}
+				throw error;
+			}
+		});
+		running = task;
+		const finished = () => {
+			if (running === task) running = void 0;
+		};
+		task.then(finished, finished);
+		return task;
+	};
+	return {
+		schedule(moduleId) {
+			assertActive();
+			include(moduleId);
+			cancelTimer();
+			timerDone = new Promise((resolve) => {
+				resolveTimer = resolve;
+			});
+			timer = setTimeout(() => {
+				start().catch(() => {});
+			}, 300);
+		},
+		flush(moduleId, retry = true) {
+			assertActive();
+			if (retry) {
+				include(moduleId);
+				if (moduleId === void 0) retryAll = true;
+				else retries.add(moduleId);
+			} else if (moduleId !== void 0) include(moduleId);
+			return start();
+		},
+		async settled() {
+			while (timerDone !== void 0 || running !== void 0) await Promise.all([timerDone, running?.catch(() => {})]);
+		},
+		failures() {
+			return active ? [...errors.values()].map((error) => ({ ...error })) : [];
+		},
+		async dispose() {
+			active = false;
+			cancelTimer();
+			all = false;
+			retryAll = false;
+			ids.clear();
+			retries.clear();
+			errors.clear();
+			await running?.catch(() => {});
+		}
+	};
+}
+//#endregion
 //#region src/host/generation-recovery-state.ts
 /** 会话恢复额度的唯一持久owner，重挂不重置，先扣额再允许唤醒。 */
 function createGenerationRecoveryState(root = join(storageRoot(), "generation-recovery")) {
@@ -28793,37 +29014,74 @@ const noNext = /* @__PURE__ */ new Set([
 ]);
 const compare = (a, b) => a.action.channelOrder - b.action.channelOrder || a.moduleId.localeCompare(b.moduleId) || a.ruleIndex - b.ruleIndex || a.action.actionIndex - b.action.actionIndex;
 const sourceError = (error, moduleId) => Object.assign(new Error(String(error?.message ?? error), { cause: error }), { sourceModuleId: moduleId });
+const pointKey = (point) => `${point.channel}:${point.phase}:${point.waterfallPosition}`;
+const compareEntries = (a, b) => a.sequence - b.sequence || a.sourceModuleId.localeCompare(b.sourceModuleId) || a.ruleIndex - b.ruleIndex || a.ruleActionIndex - b.ruleActionIndex;
+function pointHandler(ctx, point, snapshot, warnOnce, report, isActive) {
+	return (...args) => {
+		const handlers = snapshot();
+		const free = noNext.has(point.channel);
+		const payload = free ? args : args.slice(0, -1);
+		const next = free ? () => void 0 : args.at(-1);
+		if (!isActive()) return next();
+		let frame;
+		try {
+			frame = ruleFrame(point.channel, payload, warnOnce, ctx, report);
+		} catch (error) {
+			warnOnce(`rule engine: frame construction failed on ${point.channel}: ${String(error?.message ?? error)}`);
+			return next();
+		}
+		if (free) {
+			let pending;
+			for (const entry of handlers) {
+				const invoke = () => {
+					if (!isActive()) return void 0;
+					if (!actionMatches(entry, frame)) {
+						entry.miss?.(frame);
+						return;
+					}
+					return entry.handler(...payload, void 0, frame);
+				};
+				pending = pending?.then ? pending.then(invoke) : invoke();
+			}
+			return pending;
+		}
+		if (point.phase === "after-next") return Promise.resolve(next()).then(async (initial) => {
+			let result = initial;
+			for (const entry of handlers) {
+				if (!isActive()) continue;
+				if (!actionMatches(entry, frame)) {
+					entry.miss?.(frame);
+					continue;
+				}
+				result = await entry.handler(...payload, () => result, frame);
+			}
+			return result;
+		});
+		const invoke = (index) => {
+			if (!isActive() || index === handlers.length) return next();
+			const entry = handlers[index];
+			if (!actionMatches(entry, frame)) {
+				entry.miss?.(frame);
+				return invoke(index + 1);
+			}
+			return entry.handler(...payload, () => invoke(index + 1), frame);
+		};
+		return invoke(0);
+	};
+}
 /** 所有来源只进入这个装配入口；受众限定固定效果要求 ctx 属于 options.agent 的 scope。 */
-function mountRuleSources(ctx, sources, options = {}) {
+function mountSources(ctx, sources, options = {}) {
 	validateDeliverySources(sources);
-	const coordinator = (() => {
-		const service = getService(ctx, PRE_STEP_COORDINATOR_SERVICE);
-		return service !== null && typeof service === "object" && typeof service.registerPreset === "function" ? service : void 0;
-	})();
-	const pool = options.promotionPool ?? coordinator?.promotionPool ?? createPromotionPool(ctx);
-	const ownsPool = options.promotionPool === void 0 && coordinator?.promotionPool === void 0;
+	const pool = options.promotionPool;
 	const warnOnce = options.warnOnce ?? createWarnOnce(ctx, options.plugin ?? "rule-engine");
-	const report = options.onOutcome === void 0 ? void 0 : (() => {
-		const moduleOfRule = /* @__PURE__ */ new Map();
-		for (const source of sources) for (const rule of source.rules) if (!moduleOfRule.has(rule)) moduleOfRule.set(rule, source.moduleId);
-		return (rule, channel, outcome) => options.onOutcome({
-			moduleId: moduleOfRule.get(rule),
-			ruleId: rule.id,
-			channel,
-			outcome
-		});
-	})();
 	const releases = [];
-	if (ownsPool) releases.push(() => pool.dispose());
 	const points = /* @__PURE__ */ new Map();
-	const turnStopBudgets = /* @__PURE__ */ new Map();
 	const injections = new Map(sources.map((source) => [source.moduleId, {
 		moduleId: source.moduleId,
 		sourceId: moduleSourceId(source.moduleId),
 		configs: [],
 		ruleActions: []
 	}]));
-	let active = true;
 	const bind = (item, on) => prepareAction(item.action, {
 		plugin: options.plugin,
 		warnOnce,
@@ -28877,16 +29135,7 @@ function mountRuleSources(ctx, sources, options = {}) {
 			let textConfigs = [];
 			const flushLayers = () => {
 				if (!textConfigs.length) return;
-				releases.push(wireLayers(ctx, textConfigs, warnOnce, {
-					agent: options.agent,
-					turnStopBudgets,
-					sourceError,
-					on: (channel, handler) => {
-						if (channel !== point.channel) throw new TypeError(`rule action registered outside ${point.channel}: ${channel}`);
-						handlers.push({ handler });
-						return () => {};
-					}
-				}));
+				options.collectText(point, textConfigs);
 				textConfigs = [];
 			};
 			for (const item of point.items) {
@@ -28901,7 +29150,9 @@ function mountRuleSources(ctx, sources, options = {}) {
 						exclusive: false,
 						enabled: true,
 						actionWhen: action.actionWhen,
-						bypassRuleWhen: action.bypassRuleWhen
+						bypassRuleWhen: action.bypassRuleWhen,
+						runtimeOrder: action.channelOrder,
+						runtimeRuleIndex: item.ruleIndex
 					};
 					if (config.layer === "pre-step") injections.get(moduleId).configs.push(config);
 					else textConfigs.push(config);
@@ -28917,6 +29168,7 @@ function mountRuleSources(ctx, sources, options = {}) {
 						sequence: action.channelOrder,
 						sourceModuleId: moduleId,
 						ruleId: rule.id,
+						ruleIndex: item.ruleIndex,
 						ruleActionIndex: action.actionIndex,
 						id: action.id,
 						actionWhen: action.actionWhen,
@@ -28938,61 +29190,9 @@ function mountRuleSources(ctx, sources, options = {}) {
 			}
 			flushLayers();
 			if (!handlers.length) continue;
-			releases.push(ctx.on(point.channel, (...args) => {
-				const free = noNext.has(point.channel);
-				const payload = free ? args : args.slice(0, -1);
-				const next = free ? () => void 0 : args[args.length - 1];
-				if (!active) return next();
-				let frame;
-				try {
-					frame = ruleFrame(point.channel, payload, warnOnce, ctx, report);
-				} catch (error) {
-					warnOnce(`rule engine: frame construction failed on ${point.channel}: ${String(error?.message ?? error)}`);
-					return next();
-				}
-				if (free) {
-					let pending;
-					for (const entry of handlers) {
-						const invoke = () => {
-							if (!active) return void 0;
-							if (!actionMatches(entry, frame)) {
-								entry.miss?.(frame);
-								return;
-							}
-							return entry.handler(...payload, void 0, frame);
-						};
-						pending = pending?.then ? pending.then(invoke) : invoke();
-					}
-					return pending;
-				}
-				if (point.phase === "after-next") return Promise.resolve(next()).then(async (initial) => {
-					let result = initial;
-					for (const entry of handlers) {
-						if (!active) continue;
-						if (!actionMatches(entry, frame)) {
-							entry.miss?.(frame);
-							continue;
-						}
-						result = await entry.handler(...payload, () => result, frame);
-					}
-					return result;
-				});
-				const invoke = (index) => {
-					if (!active || index === handlers.length) return next();
-					const entry = handlers[index];
-					if (!actionMatches(entry, frame)) {
-						entry.miss?.(frame);
-						return invoke(index + 1);
-					}
-					return entry.handler(...payload, () => invoke(index + 1), frame);
-				};
-				return invoke(0);
-			}, point.waterfallPosition === "outermost" ? { prepend: true } : void 0));
+			options.collectPoint(point, handlers);
 		}
-		const promotion = options.promotion ?? coordinator?.promotion ?? {
-			main: pool.tracker(PROMOTE_EVENTS.either, { includeSubagents: false }),
-			withSubagents: pool.tracker(PROMOTE_EVENTS.either, { includeSubagents: true })
-		};
+		const promotion = options.promotion;
 		const preStep = [...injections.values()].filter((source) => source.configs.length || source.ruleActions.length).map((source) => createPreStepSource({
 			sourceId: source.sourceId,
 			ctx,
@@ -29004,21 +29204,233 @@ function mountRuleSources(ctx, sources, options = {}) {
 			}),
 			promotion
 		}));
-		if (preStep.length) releases.push(applyPromptConfigSources(preStep, { layers: false }));
+		if (preStep.length) releases.push(options.registerPreStep(preStep));
 	} catch (error) {
-		active = false;
 		for (const dispose of releases.reverse()) try {
 			dispose?.();
 		} catch {}
 		throw error;
 	}
 	return () => {
-		active = false;
 		for (const dispose of releases.splice(0).reverse()) try {
 			dispose?.();
 		} catch {}
 	};
 }
+/** 稳定执行点持有有序快照；来源仅在规则实例改变时重新绑定和注册。 */
+function createRuleRuntime(ctx, options = {}) {
+	const warnOnce = options.warnOnce ?? createWarnOnce(ctx, options.plugin ?? "rule-engine");
+	const coordinatorOf = () => {
+		const value = getService(ctx, PRE_STEP_COORDINATOR_SERVICE);
+		return typeof value?.registerPreset === "function" ? value : void 0;
+	};
+	const initialCoordinator = coordinatorOf();
+	const pool = options.promotionPool ?? initialCoordinator?.promotionPool ?? createPromotionPool(ctx);
+	const ownsPool = options.promotionPool === void 0 && initialCoordinator?.promotionPool === void 0;
+	const promotion = options.promotion ?? initialCoordinator?.promotion ?? {
+		main: pool.tracker(PROMOTE_EVENTS.either, { includeSubagents: false }),
+		withSubagents: pool.tracker(PROMOTE_EVENTS.either, { includeSubagents: true })
+	};
+	const standalone = /* @__PURE__ */ new Map();
+	const registrations = /* @__PURE__ */ new Map();
+	let registeredCoordinator = initialCoordinator;
+	let active = true;
+	let records = /* @__PURE__ */ new Map();
+	let points = /* @__PURE__ */ new Map();
+	const listeners = /* @__PURE__ */ new Map();
+	const ruleOwners = /* @__PURE__ */ new WeakMap();
+	const memo = /* @__PURE__ */ new Map();
+	const report = options.onOutcome === void 0 ? void 0 : (rule, channel, outcome) => options.onOutcome({
+		moduleId: ruleOwners.get(rule),
+		ruleId: rule.id,
+		channel,
+		outcome
+	});
+	let layers;
+	let releaseMemo, releaseFallback;
+	const register = (coordinator, source) => {
+		if (coordinator.promotion === void 0) throw new TypeError("prompt-tool: pre-step coordinator v2 must expose a promotion owner");
+		return coordinator.registerPreset(source.sourceId, {
+			...source,
+			promotion: coordinator.promotion
+		}) ?? (() => {});
+	};
+	const ensureFallback = () => {
+		if (releaseFallback !== void 0) return;
+		releaseMemo = ctx.on("session/event", (session, event) => confirmDelivered(memo, session, event));
+		try {
+			releaseFallback = ctx.on("agent/pre-step", async (payload, next) => {
+				const coordinator = coordinatorOf();
+				if (coordinator !== registeredCoordinator) {
+					for (const release of registrations.values()) release();
+					registrations.clear();
+					registeredCoordinator = coordinator;
+					if (coordinator !== void 0) for (const source of standalone.values()) registrations.set(source.sourceId, register(coordinator, source));
+				}
+				const sources = [...standalone.values()];
+				const decision = await next();
+				if (!active || coordinator !== void 0 || sources.length === 0) return decision;
+				return runPreStepBatch({
+					sources,
+					ctx,
+					payload,
+					agent: payload?.agent,
+					decision,
+					memo,
+					warnOnce
+				});
+			}, { prepend: true });
+		} catch (error) {
+			releaseMemo();
+			releaseMemo = void 0;
+			throw error;
+		}
+	};
+	const mount = (source) => {
+		const record = {
+			source,
+			points: [],
+			text: [],
+			dispose: void 0
+		};
+		for (const rule of source.rules) ruleOwners.set(rule, source.moduleId);
+		record.dispose = mountSources(ctx, [source], {
+			...options,
+			warnOnce,
+			promotionPool: pool,
+			promotion,
+			registerPreStep(sources) {
+				const installed = [];
+				const dispose = () => {
+					for (const item of installed) if (standalone.get(item.sourceId) === item) {
+						standalone.delete(item.sourceId);
+						registrations.get(item.sourceId)?.();
+						registrations.delete(item.sourceId);
+					}
+				};
+				try {
+					ensureFallback();
+					for (const item of sources) {
+						if (standalone.has(item.sourceId)) throw new TypeError(`prompt-tool: duplicate pre-step source ${item.sourceId}`);
+						standalone.set(item.sourceId, item);
+						installed.push(item);
+						const coordinator = coordinatorOf();
+						if (coordinator !== void 0) try {
+							registrations.set(item.sourceId, register(coordinator, item));
+						} catch (error) {
+							throw sourceError(error, source.moduleId);
+						}
+					}
+					return dispose;
+				} catch (error) {
+					dispose();
+					throw error;
+				}
+			},
+			collectPoint(point, handlers) {
+				record.points.push({
+					point,
+					handlers
+				});
+			},
+			collectText(point, configs) {
+				for (const config of configs) {
+					config.runtimePoint = point;
+					record.text.push(config);
+				}
+			}
+		});
+		return record;
+	};
+	const publishPoints = () => {
+		const next = /* @__PURE__ */ new Map();
+		const add = (point, entry) => {
+			const key = pointKey(point);
+			const value = next.get(key) ?? {
+				point,
+				handlers: []
+			};
+			value.handlers.push(entry);
+			next.set(key, value);
+		};
+		for (const record of records.values()) for (const { point, handlers } of record.points) for (const entry of handlers) add(point, entry);
+		for (const { channel, handler, config } of layers?.entries() ?? []) add({
+			...config.runtimePoint,
+			channel
+		}, {
+			handler,
+			sequence: config.runtimeOrder,
+			sourceModuleId: config.sourceModuleId,
+			ruleIndex: config.runtimeRuleIndex,
+			ruleActionIndex: config.ruleActionIndex ?? 0
+		});
+		for (const [key, value] of next) {
+			value.handlers.sort(compareEntries);
+			if (!listeners.has(key)) listeners.set(key, ctx.on(value.point.channel, pointHandler(ctx, value.point, () => points.get(key)?.handlers ?? [], warnOnce, report, () => active), value.point.waterfallPosition === "outermost" ? { prepend: true } : void 0));
+		}
+		points = next;
+	};
+	return {
+		replace(sources) {
+			if (!active) throw new Error("rule runtime disposed");
+			validateDeliverySources(sources);
+			const desired = /* @__PURE__ */ new Map();
+			for (const source of sources) {
+				if (desired.has(source.moduleId)) throw sourceError(/* @__PURE__ */ new TypeError(`duplicate rule source ${source.moduleId}`), source.moduleId);
+				desired.set(source.moduleId, source);
+			}
+			const old = records;
+			const changed = [...old.values()].filter((record) => desired.get(record.source.moduleId)?.rules !== record.source.rules);
+			if (changed.length === 0 && sources.length === old.size) return;
+			for (const record of changed) record.dispose();
+			const created = [];
+			try {
+				const next = /* @__PURE__ */ new Map();
+				for (const source of sources) {
+					let record = old.get(source.moduleId);
+					if (record?.source.rules !== source.rules) {
+						record = mount(source);
+						created.push(record);
+					}
+					next.set(source.moduleId, record);
+				}
+				records = next;
+				const text = [...records.values()].flatMap((record) => record.text);
+				if (text.length > 0) layers ??= createLayerRuntime(ctx, warnOnce, {
+					agent: options.agent,
+					turnStopBudgets: /* @__PURE__ */ new Map(),
+					sourceError
+				});
+				layers?.replace(text);
+				publishPoints();
+			} catch (error) {
+				for (const record of created.reverse()) record.dispose();
+				records = new Map(old);
+				try {
+					for (const record of changed) records.set(record.source.moduleId, mount(record.source));
+					layers?.replace([...records.values()].flatMap((record) => record.text));
+					publishPoints();
+				} catch (restoreError) {
+					throw Object.assign(new AggregateError([error, restoreError], `rule source replacement and recovery failed: ${String(error.message)}; ${String(restoreError.message)}`), { sourceModuleId: error.sourceModuleId });
+				}
+				throw error;
+			}
+		},
+		dispose() {
+			if (!active) return;
+			active = false;
+			for (const record of records.values()) record.dispose();
+			records.clear();
+			layers?.dispose();
+			for (const release of listeners.values()) release();
+			listeners.clear();
+			points.clear();
+			releaseFallback?.();
+			releaseMemo?.();
+			if (ownsPool) pool.dispose();
+		}
+	};
+}
 //#endregion
 //#region src/runtime/agent-assembly.ts
 /**
@@ -29238,6 +29650,7 @@ function createAgentAssembly(ctx, options) {
 	const watched = /* @__PURE__ */ new Map();
 	const disposed = /* @__PURE__ */ new WeakSet();
 	let pending = Promise.resolve();
+	let publishingContent;
 	const serialQueue = createTargetQueue();
 	let active = true;
 	const warn = (error) => {
@@ -29323,7 +29736,7 @@ function createAgentAssembly(ctx, options) {
 		mounts.delete(sessionId);
 		await current.fiber.dispose();
 	};
-	const reject = (agent, item) => {
+	const reject = (agent, item, error) => {
 		let rejected = rejectedVersions.get(agent);
 		if (rejected === void 0) {
 			rejected = /* @__PURE__ */ new Map();
@@ -29331,186 +29744,255 @@ function createAgentAssembly(ctx, options) {
 		}
 		let versions = rejected.get(item.moduleId);
 		if (versions === void 0) {
-			versions = /* @__PURE__ */ new Set();
+			versions = /* @__PURE__ */ new Map();
 			rejected.set(item.moduleId, versions);
 		}
-		versions.add(sourceVersions.get(item) ?? "");
+		versions.set(sourceVersions.get(item) ?? "", failureReason(error));
 		if (lastGood.get(agent)?.get(item.moduleId) === item) lastGood.get(agent)?.delete(item.moduleId);
 	};
-	const mount = async (agent, prepared, plan, duplicateIdentities = [], stamp = "", content = "") => {
-		let mounted = false, live = true;
-		const initializationErrors = [];
-		const waiting = new Map(prepared.map((item) => [item, /* @__PURE__ */ new Set()]));
-		const observers = [];
-		const initializationRoots = [];
+	const mount = async (agent, prepared, plan, duplicateIdentities = [], stamp = "", content = "", personaSignature = "") => {
+		for (const item of prepared) for (const name of item.services) if (agent.ctx.get(name) === void 0) throw Object.assign(/* @__PURE__ */ new Error(`模块 ${item.moduleId} 挂载所需宿主能力不可用：${name}`), { sourceModuleId: item.moduleId });
+		let current = mounts.get(agent.id);
+		if (current === void 0) {
+			let scope;
+			const root = agent.ctx.plugin({
+				name: "prompt-tool-assembly",
+				apply: (scopeCtx) => {
+					scope = scopeCtx;
+				}
+			});
+			try {
+				await root;
+			} catch (error) {
+				await root.dispose();
+				throw error;
+			}
+			if (scope === void 0) {
+				await root.dispose();
+				throw new Error("运行时配装作用域未初始化");
+			}
+			let rules;
+			try {
+				rules = createRuleRuntime(scope, {
+					agent,
+					onOutcome: ruleDiagnostics.record,
+					variableStore,
+					standingMountFor: await loadStandingMountFor(),
+					manifestCheck
+				});
+			} catch (error) {
+				await root.dispose();
+				throw error;
+			}
+			const record = {
+				agent,
+				scope,
+				rules,
+				modules: /* @__PURE__ */ new Map(),
+				shared: /* @__PURE__ */ new Map(),
+				prepared: [],
+				moduleIds: [],
+				stamp: "",
+				content: "",
+				personaSignature: "",
+				plan: {
+					sections: [],
+					suppressRuntimeContext: false
+				},
+				live: true,
+				committed: false,
+				mutating: false,
+				fiber: { dispose: () => {} }
+			};
+			const disposeFiber = ctx.effect(() => () => {
+				record.live = false;
+				for (const slot of [...record.modules.values(), ...record.shared.values()]) {
+					slot.live = false;
+					slot.off();
+				}
+				rules.dispose();
+				return root.dispose();
+			}, `prompt-tool assembly ${agent.id}`);
+			record.fiber = { dispose: async () => {
+				await disposeFiber();
+			} };
+			mounts.set(agent.id, record);
+			current = record;
+		}
+		const record = current;
 		const promote = () => {
-			if (!live || !mounted || !active || disposed.has(agent)) return;
+			if (!record.live || !record.committed || record.mutating || !active || disposed.has(agent)) return;
 			let good = lastGood.get(agent);
 			if (good === void 0) {
 				good = /* @__PURE__ */ new Map();
 				lastGood.set(agent, good);
 			}
-			for (const item of prepared) if (waiting.get(item)?.size === 0 && !initializationErrors.some((failure) => failure.owners.includes(item))) good.set(item.moduleId, item);
+			for (const item of record.prepared) if ([...record.modules.values(), ...record.shared.values()].filter((slot) => slot.owners.includes(item)).every((slot) => slot.ready && slot.failed === void 0)) good.set(item.moduleId, item);
 		};
-		const observe = (child, owners) => {
-			initializationRoots.push(child);
-			const token = {};
-			for (const item of owners) waiting.get(item)?.add(token);
-			observers.push(initialization.observe(child, {
+		const disposeSlot = async (slot) => {
+			slot.live = false;
+			slot.off();
+			await slot.fiber.dispose();
+		};
+		const applyCapability = async (scopeCtx, item, module) => {
+			const result = await module.apply(scopeCtx, module.config, {
+				agent,
+				sourceModuleId: item.moduleId,
+				sourceModuleDir: resolveModuleDir(item.moduleId, options.moduleRoot),
+				recoveryState,
+				contextRuntimeOf
+			});
+			if (typeof result === "function") scopeCtx.effect(() => result, module.id);
+		};
+		const createSlot = async (map, key, owners, apply, signature) => {
+			const fiber = record.scope.plugin({
+				name: `prompt-tool-${map === record.modules ? "module" : "shared"}:${key}`,
+				inject: [...new Set(owners.flatMap((item) => [...item.services]))],
+				apply
+			});
+			const slot = {
+				fiber,
+				owners,
+				ready: false,
+				live: true,
+				off: () => {},
+				...signature === void 0 ? {} : { signature }
+			};
+			map.set(key, slot);
+			slot.off = initialization.observe(fiber, {
 				ready: () => {
-					for (const item of owners) waiting.get(item)?.delete(token);
-					promote();
+					if (slot.live) {
+						slot.ready = true;
+						promote();
+					}
 				},
 				failed: (error) => {
-					if (!live || !active || disposed.has(agent)) return;
-					initializationErrors.push({
-						owners,
-						error
-					});
-					if (!mounted) return;
-					for (const item of owners) reject(agent, item);
-					serial(async () => {
-						if (!live || !active || disposed.has(agent)) return;
-						try {
-							await replace([agent]);
-						} catch (failure) {
-							warn(failure);
-						}
-					});
-					warn(new Error(`模块 ${owners.map((item) => item.moduleId).join("、")} 初始化失败：${failureReason(error)}`, { cause: error }));
+					if (!slot.live || !record.live || !active || disposed.has(agent) || map.get(key) !== slot) return;
+					slot.failed = error;
+					if (record.mutating || !record.committed) return;
+					for (const item of slot.owners) {
+						reject(agent, item, error);
+						publication.schedule(item.moduleId);
+					}
+					warn(new Error(`模块 ${slot.owners.map((item) => item.moduleId).join("、")} 初始化失败：${failureReason(error)}`, { cause: error }));
 				}
-			}));
+			});
+			try {
+				await fiber;
+				await initialization.settled([fiber]);
+				if (slot.failed !== void 0) throw slot.failed;
+			} catch (error) {
+				await disposeSlot(slot);
+				map.delete(key);
+				throw Object.assign(new Error(`模块 ${owners.map((item) => item.moduleId).join("、")} 挂载失败：${failureReason(error)}`, { cause: error }), { sourceModuleIds: owners.map((item) => item.moduleId) });
+			}
 		};
-		const services = /* @__PURE__ */ new Set();
-		for (const item of prepared) for (const name of item.services) {
-			if (agent.ctx.get(name) === void 0) throw Object.assign(/* @__PURE__ */ new Error(`模块 ${item.moduleId} 挂载所需宿主能力不可用：${name}`), { sourceModuleId: item.moduleId });
-			services.add(name);
-		}
-		const personaActive = plan.sections.length > 0 || plan.suppressRuntimeContext;
-		if (personaActive) services.add("systemPrompt");
-		const fiber = agent.ctx.plugin({
-			name: "prompt-tool-assembly",
-			inject: [...services],
-			apply: async (scopeCtx) => {
-				for (const item of duplicateIdentities) {
-					const where = item.channel === "kind" ? `显式 sourceKind ${JSON.stringify(item.identity)}` : `去重身份 ${JSON.stringify(item.identity)}`;
-					warnOnce(item.suspectedCopy ? `模块 ${item.moduleIds.join("、")} 疑似由复制产生同一个${where}（dedupe: session/batch）：去重按模块各记一份，两份正文都会注入，请改 rule id 或显式 identity 以区分` : `模块 ${item.moduleIds.join("、")} 声明了同一个${where}（dedupe: session/batch）：去重按模块各记一份，两模块各自注入；同一模块内才共享这份去重`);
+		record.mutating = true;
+		try {
+			record.rules.replace(prepared.filter((item) => item.rules.length > 0).map((item) => ({
+				moduleId: item.moduleId,
+				rules: item.rules
+			})));
+			const desired = new Set(prepared.map((item) => item.moduleId));
+			for (const [id, slot] of record.modules) if (!desired.has(id) || !prepared.includes(slot.owners[0]) || !slot.live || slot.failed !== void 0) {
+				await disposeSlot(slot);
+				record.modules.delete(id);
+			}
+			for (const item of prepared) {
+				const capabilities = item.modules.filter((module) => PRIVATE_SERVICES[module.id] === void 0 || module.id === "retrieval");
+				if (capabilities.length > 0 && !record.modules.has(item.moduleId)) await createSlot(record.modules, item.moduleId, [item], async (scopeCtx) => {
+					for (const module of capabilities) await applyCapability(scopeCtx, item, module);
+				});
+			}
+			const shared = /* @__PURE__ */ new Map();
+			for (const item of prepared) for (const module of item.modules) {
+				if (PRIVATE_SERVICES[module.id] === void 0 || module.id === "retrieval" || shared.has(module.id)) continue;
+				const owners = prepared.filter((source) => source.modules.some((candidate) => candidate.id === module.id));
+				shared.set(module.id, {
+					owners,
+					item,
+					module,
+					signature: JSON.stringify([
+						owners.map((owner) => owner.moduleId),
+						item.moduleId,
+						module.config
+					])
+				});
+			}
+			for (const [id, slot] of record.shared) if (shared.get(id)?.signature !== slot.signature || !slot.live || slot.failed !== void 0) {
+				await disposeSlot(slot);
+				record.shared.delete(id);
+			}
+			for (const [id, entry] of shared) {
+				const old = record.shared.get(id);
+				if (old !== void 0) old.owners = entry.owners;
+				else await createSlot(record.shared, id, entry.owners, (scopeCtx) => applyCapability(scopeCtx, entry.item, entry.module), entry.signature);
+			}
+			const personaKey = JSON.stringify([
+				personaSignature,
+				plan.suppressRuntimeContext,
+				plan.sections.map((section) => ({
+					...section,
+					text: String(section.text)
+				}))
+			]);
+			if (record.persona?.signature !== personaKey) {
+				if (record.persona !== void 0) {
+					await record.persona.fiber.dispose();
+					delete record.persona;
 				}
-				const standingMountFor = await loadStandingMountFor();
-				const ruleSources = prepared.filter((item) => item.rules.length > 0).map((item) => ({
-					moduleId: item.moduleId,
-					rules: item.rules
-				}));
-				scopeCtx.effect(() => mountRuleSources(scopeCtx, ruleSources, {
-					agent,
-					onOutcome: ruleDiagnostics.record,
-					variableStore,
-					standingMountFor,
-					manifestCheck
-				}));
-				if (personaActive) {
-					const capture = options.personaCapture;
-					const scope = scopeOf(scopeCtx);
-					scopeCtx.effect(() => {
-						const applied = [];
-						const rollback = () => {
-							while (applied.length > 0) applied.pop()?.();
-						};
-						try {
-							for (const section of plan.sections) {
-								(scope === void 0 ? void 0 : capture?.records(scope).find((record) => record.name === section.name))?.off();
-								applied.push(scopeCtx.systemPrompt.section(section));
+				if (plan.sections.length > 0 || plan.suppressRuntimeContext) {
+					const fiber = record.scope.plugin({
+						name: "prompt-tool-persona",
+						inject: ["systemPrompt"],
+						apply: (scopeCtx) => {
+							const applied = [], scope = scopeOf(scopeCtx);
+							const rollback = () => {
+								while (applied.length > 0) applied.pop()?.();
+							};
+							try {
+								for (const section of plan.sections) {
+									if (scope !== void 0) options.personaCapture?.records(scope).find((record) => record.name === section.name)?.off();
+									applied.push(scopeCtx.systemPrompt.section(section));
+								}
+								if (plan.suppressRuntimeContext) applied.push(scopeCtx.systemPrompt.suppressRuntimeContext());
+							} catch (error) {
+								rollback();
+								throw error;
 							}
-							if (plan.suppressRuntimeContext) applied.push(scopeCtx.systemPrompt.suppressRuntimeContext());
-						} catch (error) {
-							rollback();
-							throw error;
-						}
-						return rollback;
-					}, "prompt-tool persona");
-				}
-				const applyCapability = async (capabilityCtx, item, module) => {
-					const result = await module.apply(capabilityCtx, module.config, {
-						agent,
-						sourceModuleId: item.moduleId,
-						sourceModuleDir: resolveModuleDir(item.moduleId, options.moduleRoot),
-						recoveryState,
-						contextRuntimeOf
-					});
-					if (typeof result === "function") capabilityCtx.effect(() => result, module.id);
-				};
-				const ownTokens = new Map(prepared.map((item) => [item, {}]));
-				for (const item of prepared) waiting.get(item)?.add(ownTokens.get(item));
-				for (const item of prepared) {
-					const capabilities = item.modules.filter((module) => PRIVATE_SERVICES[module.id] === void 0 || module.id === "retrieval");
-					if (capabilities.length === 0) continue;
-					const child = scopeCtx.plugin({
-						name: `prompt-tool-module:${item.moduleId}`,
-						apply: async (moduleCtx) => {
-							for (const module of capabilities) await applyCapability(moduleCtx, item, module);
-						}
-					});
-					observe(child, [item]);
-					try {
-						await child;
-					} catch (error) {
-						await child.dispose();
-						throw Object.assign(new Error(`模块 ${item.moduleId} 挂载失败：${failureReason(error)}`, { cause: error }), { sourceModuleId: item.moduleId });
-					}
-				}
-				const privateMounted = /* @__PURE__ */ new Set();
-				for (const item of prepared) for (const module of item.modules) {
-					if (PRIVATE_SERVICES[module.id] === void 0 || module.id === "retrieval" || privateMounted.has(module.id)) continue;
-					const owners = prepared.filter((source) => source.modules.some((candidate) => candidate.id === module.id));
-					const child = scopeCtx.plugin({
-						name: `prompt-tool-shared:${module.id}`,
-						apply: async (sharedCtx) => {
-							await applyCapability(sharedCtx, item, module);
+							scopeCtx.effect(() => rollback, "prompt-tool persona");
 						}
 					});
-					observe(child, owners);
 					try {
-						await child;
+						await fiber;
 					} catch (error) {
-						throw Object.assign(new Error(`模块 ${owners.map((owner) => owner.moduleId).join("、")} 共享能力 ${module.id} 初始化失败：${failureReason(error)}`, { cause: error }), { sourceModuleIds: owners.map((owner) => owner.moduleId) });
+						await fiber.dispose();
+						throw error;
 					}
-					privateMounted.add(module.id);
+					record.persona = {
+						fiber,
+						signature: personaKey
+					};
 				}
-				for (const item of prepared) waiting.get(item)?.delete(ownTokens.get(item));
 			}
-		});
-		const disposeFiber = ctx.effect(() => () => {
-			live = false;
-			for (const off of observers) off();
-			return fiber.dispose();
-		}, `prompt-tool assembly ${agent.id}`);
-		try {
-			await fiber;
-			await initialization.settled(initializationRoots);
-			if (initializationErrors.length > 0) {
-				const failure = initializationErrors[0];
-				throw Object.assign(new Error(`模块 ${failure.owners.map((item) => item.moduleId).join("、")} 初始化失败：${failureReason(failure.error)}`, { cause: failure.error }), { sourceModuleIds: failure.owners.map((item) => item.moduleId) });
+			if (!active || disposed.has(agent)) {
+				await release(agent.id, agent);
+				return;
 			}
-		} catch (error) {
-			await disposeFiber();
-			throw error;
-		}
-		if (!active || disposed.has(agent)) {
-			await disposeFiber();
-			return;
+			record.prepared = prepared;
+			record.moduleIds = prepared.map((item) => item.moduleId);
+			record.stamp = stamp;
+			record.content = content;
+			record.plan = plan;
+			record.personaSignature = personaSignature;
+			record.committed = true;
+			for (const item of duplicateIdentities) {
+				const where = item.channel === "kind" ? `显式 sourceKind ${JSON.stringify(item.identity)}` : `去重身份 ${JSON.stringify(item.identity)}`;
+				warnOnce(item.suspectedCopy ? `模块 ${item.moduleIds.join("、")} 疑似由复制产生同一个${where}（dedupe: session/batch）：去重按模块各记一份，两份正文都会注入，请改 rule id 或显式 identity 以区分` : `模块 ${item.moduleIds.join("、")} 声明了同一个${where}（dedupe: session/batch）：去重按模块各记一份，两模块各自注入；同一模块内才共享这份去重`);
+			}
+		} finally {
+			record.mutating = false;
 		}
-		mounts.set(agent.id, {
-			agent,
-			fiber: { dispose: async () => {
-				await disposeFiber();
-			} },
-			prepared,
-			moduleIds: prepared.map((item) => item.moduleId),
-			stamp,
-			content,
-			plan
-		});
-		mounted = true;
 		promote();
 	};
 	const assemblyStamp = (ids, personas) => JSON.stringify(personas) + readModulesRevision(options.moduleRoot, ids);
@@ -29534,7 +30016,23 @@ function createAgentAssembly(ctx, options) {
 		}
 		for (const file of files) if (!watched.has(file)) {
 			const listener = () => {
-				if (active) for (const agent of knownAgents) ensureFresh(agent);
+				if (!active) return;
+				try {
+					const ids = options.enabledModules(), personas = options.personaModules?.(), stamp = assemblyStamp(ids, personas);
+					if (publishingContent !== void 0 && contentSignature(ids, personas) === publishingContent) return;
+					const agents = /* @__PURE__ */ new Set([...knownAgents, ...ctx.get("agents")?.list() ?? []]);
+					let changed = false;
+					for (const agent of agents) {
+						if (disposed.has(agent)) continue;
+						const current = mounts.get(agent.id);
+						if (current?.stamp === stamp) continue;
+						if (current !== void 0 && current.content === contentSignature(ids, personas, current.content)) current.stamp = stamp;
+						else changed = true;
+					}
+					if (changed) publication.schedule();
+				} catch {
+					publication.schedule();
+				}
 			};
 			watched.set(file, listener);
 			watchFile(file, {
@@ -29543,7 +30041,7 @@ function createAgentAssembly(ctx, options) {
 			}, listener);
 		}
 	};
-	const replace = async (targets, retry = false) => {
+	const replace = async (targets, retry = false, attempt = 0) => {
 		readGlobalLayerSettings(options.moduleRoot);
 		const ids = [...options.enabledModules()];
 		const personaModules = options.personaModules?.();
@@ -29551,36 +30049,48 @@ function createAgentAssembly(ctx, options) {
 		const live = targets.filter((agent) => active && !disposed.has(agent));
 		const failures = [];
 		const candidates = [];
+		const signatureSnapshot = contentSignature(ids, personaModules);
+		const versions = new Map(ids.map((id) => [id, contentSignature([id], void 0)]));
 		for (const agent of live) {
 			const previous = mounts.get(agent.id);
 			if (retry === true) rejectedVersions.delete(agent);
-			else if (typeof retry === "string") rejectedVersions.get(agent)?.delete(retry);
+			else if (Array.isArray(retry)) for (const id of retry) rejectedVersions.get(agent)?.delete(id);
 			const good = lastGood.get(agent);
 			const goodSnapshot = good === void 0 ? void 0 : new Map(good);
 			const prepared = [];
-			for (const id of ids) try {
-				const item = await prepareAssembly(options.moduleRoot, id, (name) => agent.ctx.get(name) !== void 0);
-				const version = contentSignature([id], void 0);
-				sourceVersions.set(item, version);
-				if (rejectedVersions.get(agent)?.get(id)?.has(version)) {
+			for (const id of ids) {
+				try {
+					const version = versions.get(id);
+					const old = previous?.prepared.find((item) => item.moduleId === id);
+					const item = old !== void 0 && sourceVersions.get(old) === version ? old : await prepareAssembly(options.moduleRoot, id, (name) => agent.ctx.get(name) !== void 0);
+					sourceVersions.set(item, version);
+					if (rejectedVersions.get(agent)?.get(id)?.has(version)) {
+						failures.push(/* @__PURE__ */ new Error(`模块 ${id}（Agent ${agent.id}）上次发布失败：${rejectedVersions.get(agent).get(id).get(version)}`));
+						const fallback = good?.get(id);
+						if (fallback !== void 0) prepared.push(fallback);
+					} else {
+						rejectedVersions.get(agent)?.delete(id);
+						prepared.push(item);
+					}
+				} catch (error) {
+					failures.push(new Error(`模块 ${id}（Agent ${agent.id}）准备失败：${failureReason(error)}`, { cause: error }));
 					const fallback = good?.get(id);
 					if (fallback !== void 0) prepared.push(fallback);
-				} else {
-					rejectedVersions.get(agent)?.delete(id);
-					prepared.push(item);
 				}
-			} catch (error) {
-				failures.push(new Error(`模块 ${id}（Agent ${agent.id}）准备失败：${failureReason(error)}`, { cause: error }));
-				const fallback = good?.get(id);
-				if (fallback !== void 0) prepared.push(fallback);
+				await new Promise((resolve) => setImmediate(resolve));
 			}
 			candidates.push({
 				agent,
 				prepared,
-				previous,
+				previous: previous === void 0 ? void 0 : { ...previous },
 				goodSnapshot
 			});
 		}
+		if (JSON.stringify(options.enabledModules()) !== JSON.stringify(ids) || contentSignature(ids, options.personaModules?.()) !== signatureSnapshot) {
+			if (attempt < 3) return replace(targets, retry, attempt + 1);
+			publication.schedule();
+			throw new Error("模块定义在准备期间持续变化，已安排重新发布");
+		}
 		const stamp = assemblyStamp(ids, personaModules);
 		for (const item of candidates.flatMap((candidate) => candidate.prepared)) for (const id of item.skippedOfficialRows) warnOnce(`模块 ${item.moduleId} 声明官方 recipe 行 ${id}；该行只能由会话原有预设提供，本插件不挂载官方包`);
 		if (!active) return;
@@ -29611,11 +30121,15 @@ function createAgentAssembly(ctx, options) {
 			for (const [index, candidate] of candidates.entries()) {
 				if (!active || disposed.has(candidate.agent)) continue;
 				changed.push(candidate);
-				await release(candidate.agent.id);
-				const content = contentSignature(ids, personaModules, candidate.previous?.content);
+				const content = signatureSnapshot;
+				const personaSignature = JSON.stringify(personaModules ?? candidate.prepared.map(({ moduleId, persona, variablesEnabled }) => ({
+					moduleId,
+					persona,
+					variablesEnabled
+				})));
 				let plan = plans[index];
 				while (true) try {
-					await mount(candidate.agent, candidate.prepared, plan, duplicateDedupeIdentities(candidate.prepared), stamp, content);
+					await mount(candidate.agent, candidate.prepared, plan, duplicateDedupeIdentities(candidate.prepared), stamp, content, personaSignature);
 					break;
 				} catch (error) {
 					const sourceIds = error !== null && typeof error === "object" ? "sourceModuleIds" in error && Array.isArray(error.sourceModuleIds) ? error.sourceModuleIds : "sourceModuleId" in error ? [error.sourceModuleId] : [] : [];
@@ -29623,7 +30137,7 @@ function createAgentAssembly(ctx, options) {
 					if (failed.length === 0) throw error;
 					for (const item of failed) {
 						failures.push(new Error(`模块 ${item.moduleId}（Agent ${candidate.agent.id}）发布失败：${failureReason(error)}`, { cause: error }));
-						reject(candidate.agent, item);
+						reject(candidate.agent, item, error);
 					}
 					candidate.prepared = candidate.prepared.flatMap((item) => {
 						if (!failed.includes(item)) return [item];
@@ -29632,18 +30146,24 @@ function createAgentAssembly(ctx, options) {
 					});
 					plan = planFor(candidate.agent, candidate.prepared);
 				}
+				await new Promise((resolve) => setImmediate(resolve));
 			}
 		} catch (error) {
 			const restoreErrors = [];
 			for (const { agent, previous, goodSnapshot } of changed.reverse()) {
 				if (!active || disposed.has(agent)) continue;
 				try {
-					await release(agent.id);
 					if (goodSnapshot === void 0) lastGood.delete(agent);
 					else lastGood.set(agent, new Map(goodSnapshot));
-					if (previous?.agent === agent) await mount(agent, previous.prepared, previous.plan, [], previous.stamp, previous.content);
+					if (previous?.agent === agent) await mount(agent, previous.prepared, previous.plan, [], previous.stamp, previous.content, previous.personaSignature);
+					else await release(agent.id, agent);
 				} catch (restoreError) {
 					restoreErrors.push(restoreError);
+					try {
+						await release(agent.id, agent);
+					} catch (cleanupError) {
+						restoreErrors.push(cleanupError);
+					}
 				}
 			}
 			if (restoreErrors.length > 0) throw new AggregateError([error, ...restoreErrors], `切换装配失败（${failureReason(error)}），且恢复原有装配也失败（${restoreErrors.map(failureReason).join("；")}）`);
@@ -29658,12 +30178,40 @@ function createAgentAssembly(ctx, options) {
 	const install = async (agent) => {
 		knownAgents.add(agent);
 		if (!active || disposed.has(agent) || mounts.get(agent.id)?.agent === agent) return;
-		await replace([agent]);
-	};
+		publishingContent = contentSignature(options.enabledModules(), options.personaModules?.());
+		try {
+			await replace([agent]);
+		} finally {
+			publishingContent = void 0;
+		}
+	};
+	const publication = createPublicationQueue({
+		warn: (message) => warn(message),
+		publish: (moduleIds, retry) => serial(async () => {
+			if (!active) return;
+			const enabled = options.enabledModules();
+			const personas = options.personaModules?.();
+			const live = [.../* @__PURE__ */ new Set([
+				...ctx.get("agents")?.list() ?? [],
+				...knownAgents,
+				...[...mounts.values()].map((mount) => mount.agent)
+			])].filter((agent) => !disposed.has(agent));
+			const targets = live.filter((agent) => moduleIds === void 0 || moduleIds.some((id) => enabled.includes(id) || mounts.get(agent.id)?.moduleIds.includes(id) || (personas ?? []).some((item) => item.moduleId === id && item.persona?.[isDelegated(agent.session) ? "subagent" : "main"] !== void 0)));
+			publishingContent = contentSignature(enabled, personas);
+			try {
+				await replace(targets, retry);
+			} finally {
+				publishingContent = void 0;
+			}
+			return targets.length === live.length;
+		})
+	});
 	let lastReadError;
-	const ensureFresh = (agent) => serial(async () => {
+	const ensureFresh = async (agent) => {
 		if (!active || disposed.has(agent) || !knownAgents.has(agent)) return;
 		try {
+			await publication.flush(void 0, false);
+			await pending;
 			readGlobalLayerSettings(options.moduleRoot);
 			const ids = options.enabledModules(), personas = options.personaModules?.();
 			watchSources(ids, personas);
@@ -29671,7 +30219,10 @@ function createAgentAssembly(ctx, options) {
 			const current = mounts.get(agent.id);
 			if (current?.stamp !== stamp) {
 				if (current?.content === contentSignature(ids, personas, current?.content)) current.stamp = stamp;
-				else await replace([agent]);
+				else {
+					publication.schedule();
+					await publication.flush(void 0, false);
+				}
 			}
 			lastReadError = void 0;
 		} catch (error) {
@@ -29679,7 +30230,7 @@ function createAgentAssembly(ctx, options) {
 			if (message !== lastReadError) warn(error);
 			lastReadError = message;
 		}
-	});
+	};
 	const listeners = [
 		ctx.on("internal/get", (_caller, name, _error, next) => {
 			const service = next();
@@ -29714,7 +30265,7 @@ function createAgentAssembly(ctx, options) {
 		for (const [file, listener] of watched) unwatchFile(file, listener);
 		watched.clear();
 		knownAgents.clear();
-		return pending.then(async () => {
+		return publication.dispose().then(() => pending).then(async () => {
 			for (const id of mounts.keys()) await release(id);
 		});
 	}, "prompt-tool assembly runtime");
@@ -29728,24 +30279,22 @@ function createAgentAssembly(ctx, options) {
 			let previous;
 			do {
 				await initialization.settled();
+				await publication.settled();
 				previous = pending;
 				await previous;
 			} while (previous !== pending);
 		},
-		hasMounted: (sessionId) => mounts.has(sessionId),
+		hasMounted: (sessionId) => mounts.get(sessionId)?.committed === true,
 		moduleIds: (sessionId) => mounts.get(sessionId)?.moduleIds ?? [],
 		ruleDiagnostics: () => active ? ruleDiagnostics.snapshot() : emptyRuleDiagnostics(),
+		schedule: (moduleId) => {
+			if (active) publication.schedule(moduleId);
+		},
+		publicationFailures: () => publication.failures(),
 		refresh: async (moduleId) => {
 			if (!active) throw new Error("运行时配装已释放");
 			try {
-				await serial(async () => {
-					const enabled = options.enabledModules();
-					const targets = [.../* @__PURE__ */ new Set([...ctx.get("agents")?.list() ?? [], ...[...mounts.values()].map((mount) => mount.agent)])].filter((agent) => {
-						const current = mounts.get(agent.id);
-						return options.personaModules !== void 0 || moduleId === void 0 || current === void 0 || current.moduleIds.includes(moduleId) || enabled.includes(moduleId);
-					});
-					await replace(targets, moduleId ?? true);
-				});
+				await publication.flush(moduleId, true);
 			} catch (error) {
 				throw new AggregateError([error], `运行时配装更新失败：${failureReason(error)}`);
 			}
@@ -29756,6 +30305,7 @@ function createAgentAssembly(ctx, options) {
 			for (const [file, listener] of watched) unwatchFile(file, listener);
 			watched.clear();
 			knownAgents.clear();
+			await publication.dispose();
 			await pending;
 			for (const id of mounts.keys()) await release(id);
 		}
@@ -29879,6 +30429,11 @@ function apply(ctx, configIn) {
 		},
 		capabilityChanged: (id) => id === void 0 ? assembly?.refresh() : refreshModuleRuntime(id),
 		moduleListChanged: () => assembly?.refresh(),
+		schedulePublication: (id, reason) => {
+			if (reason === "installed") skillsRuntime.invalidate();
+			assembly?.schedule(reason === "list" ? void 0 : id);
+		},
+		publicationFailures: () => assembly?.publicationFailures() ?? [],
 		ruleDiagnostics: () => assembly?.ruleDiagnostics() ?? emptyRuleDiagnostics(),
 		warn: (message) => warn(ctx, message)
 	});