@shgroup/dsh-serenity-hooks 1.18.0 → 1.18.2

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：真实 DSH 工具 cc_fs/session/acc_msm/eap/neat/cce/loop + 拦截缝机械约束（safe-mode/路径守卫/会话落盘）。适配 DSH 公开版（0.1.0-rc，deepseek-ai/deepseek-harness）。私有（dsh-external 组织）。",
   "engines": {

package/lib/index.js

@@ -3621,10 +3621,11 @@ function resolveBootstrapSettings(opts) {
 	if (promoteOn !== "either" && promoteOn !== "tool-call" && promoteOn !== "assistant-message") throw new TypeError(`bootstrap: promoteOn must be one of "tool-call", "assistant-message", "either"; got ${JSON.stringify(promoteOn)}`);
 	return {
 		bootstrapTools: stringList(opts.bootstrapTools, "bootstrapTools", DEFAULT_BOOTSTRAP_TOOLS),
-		promoteEvents: PROMOTE_EVENTS[promoteOn],
+		promoteEvents: opts.zeroTools ? PROMOTE_EVENTS["assistant-message"] : PROMOTE_EVENTS[promoteOn],
 		suppressedSources: sourceList(opts.suppressedContextSources, "suppressedContextSources", DEFAULT_SUPPRESSED_SOURCES),
 		compactionTools: stringList(opts.compactionTools, "compactionTools", DEFAULT_COMPACTION_TOOLS),
-		anchorMessage: typeof opts.anchorMessage === "string" && opts.anchorMessage.length > 0 ? opts.anchorMessage : DEFAULT_ANCHOR_MESSAGE
+		anchorMessage: typeof opts.anchorMessage === "string" && opts.anchorMessage.length > 0 ? opts.anchorMessage : DEFAULT_ANCHOR_MESSAGE,
+		zeroTools: opts.zeroTools === true
 	};
 }
 /**
@@ -3642,26 +3643,41 @@ function agentRoot(agent) {
 	if (typeof cwd !== "string") return null;
 	return findSerenityRoot(cwd);
 }
-/** 按 agent cwd 解析 bootstrap 配置；未开启返回 null */
+/** 按 agent cwd 解析 bootstrap 配置（总是生效——无 enabled 开关，用户明确"直接开启不能关"；
+*  CCC 的 serenity.json bootstrap 段仅用于调参数，缺省用默认设置） */
 function readBootstrapConfig(agent) {
 	const root = agentRoot(agent);
-	if (!root) return null;
+	if (!root) return resolveBootstrapSettings({});
 	const b = loadSerenityConfig(root).bootstrap;
-	if (!b?.enabled) return null;
 	return resolveBootstrapSettings({
-		bootstrapTools: b.bootstrapTools,
-		promoteOn: b.promoteOn,
-		suppressedContextSources: b.suppressedContextSources,
-		compactionTools: b.compactionTools,
-		anchorMessage: b.anchorMessage
+		bootstrapTools: b?.bootstrapTools,
+		promoteOn: b?.promoteOn,
+		suppressedContextSources: b?.suppressedContextSources,
+		compactionTools: b?.compactionTools,
+		anchorMessage: b?.anchorMessage,
+		zeroTools: b?.zeroTools
 	});
 }
 function registerBootstrap(ctx) {
 	const settingsByRoot = /* @__PURE__ */ new Map();
-	const tracker = createEpochPromotion(/* @__PURE__ */ new Set(["tool/call", "assistant/message"]));
+	const trackers = /* @__PURE__ */ new Map();
+	const trackerFor = (root, settings) => {
+		let t = trackers.get(root);
+		if (!t) {
+			t = createEpochPromotion(settings.promoteEvents);
+			trackers.set(root, t);
+		}
+		return t;
+	};
 	ctx.on("session/event", (session, event) => {
 		try {
-			tracker.observe(session, event);
+			const cwd = session?.header?.cwd;
+			if (typeof cwd !== "string") return;
+			const root = findSerenityRoot(cwd);
+			if (!root) return;
+			const settings = settingsByRoot.get(root) ?? readBootstrapConfig({ session });
+			settingsByRoot.set(root, settings);
+			trackerFor(root, settings).observe(session, event);
 		} catch {}
 	});
 	ctx.on("agent/inbox/inserted", ({ agent, message }) => {
@@ -3669,7 +3685,6 @@ function registerBootstrap(ctx) {
 			const root = agentRoot(agent);
 			if (!root) return;
 			const settings = settingsByRoot.get(root) ?? readBootstrapConfig(agent);
-			if (!settings) return;
 			const session = agent.session;
 			if ((session?.header?.delegationDepth ?? 0) > 0) return;
 			if (session?.events?.some((event) => event.type === "user/message")) return;
@@ -3708,15 +3723,30 @@ function registerBootstrap(ctx) {
 			const root = agentRoot(agent);
 			if (!root) return assembled;
 			const settings = settingsByRoot.get(root) ?? readBootstrapConfig(agent);
-			if (!settings) return assembled;
 			settingsByRoot.set(root, settings);
-			const status = tracker.status(agent);
+			const status = trackerFor(root, settings).status(agent);
 			if (status.promoted) return assembled;
-			const keep = new Set(settings.bootstrapTools);
-			if (status.boundary >= 0) for (const toolName of settings.compactionTools) keep.add(toolName);
 			const tools = assembled.tools;
 			if (!Array.isArray(tools)) return assembled;
 			const available = new Set(tools.map((tool) => tool.name).filter((n) => typeof n === "string"));
+			if (settings.zeroTools) {
+				if (status.boundary < 0) return {
+					...assembled,
+					tools: []
+				};
+				const keep = new Set(settings.compactionTools);
+				const missing = [...keep].filter((name) => !available.has(name));
+				if (missing.length > 0) {
+					warnOnce(`expected compaction tools missing=${JSON.stringify(missing)} — bootstrap disabled, full catalog exposed`);
+					return assembled;
+				}
+				return {
+					...assembled,
+					tools: tools.filter((tool) => typeof tool.name === "string" && keep.has(tool.name))
+				};
+			}
+			const keep = new Set(settings.bootstrapTools);
+			if (status.boundary >= 0) for (const toolName of settings.compactionTools) keep.add(toolName);
 			const missing = [...keep].filter((name) => !available.has(name));
 			if (missing.length > 0) {
 				warnOnce(`expected bootstrap tools missing=${JSON.stringify(missing)} — bootstrap disabled, full catalog exposed`);
@@ -3735,9 +3765,11 @@ function registerBootstrap(ctx) {
 		const decision = await next();
 		if (decision.kind === "reject") return decision;
 		try {
-			const settings = readBootstrapConfig(agent);
-			if (!settings) return decision;
-			if (tracker.status(agent).promoted || settings.suppressedSources.size === 0) return decision;
+			const root = agentRoot(agent);
+			if (!root) return decision;
+			const settings = settingsByRoot.get(root) ?? readBootstrapConfig(agent);
+			settingsByRoot.set(root, settings);
+			if (trackerFor(root, settings).status(agent).promoted || settings.suppressedSources.size === 0) return decision;
 			const messages = decision.messages;
 			if (!Array.isArray(messages)) return decision;
 			const kept = messages.filter((message) => {
@@ -4686,8 +4718,7 @@ const Config = z.object({
 	api: z.boolean().default(true),
 	entrySkillMaxChars: z.number().default(3e4),
 	env: z.boolean().default(true),
-	opencodeSkills: z.boolean().default(true),
-	bootstrap: z.boolean().default(false)
+	opencodeSkills: z.boolean().default(true)
 });
 function apply(ctx, config) {
 	if (config.tools) {
@@ -4720,7 +4751,7 @@ function apply(ctx, config) {
 	if (config.api) registerStatusApi(ctx, { configPaths: config.serenityConfigPaths });
 	if (config.env) registerEnv(ctx);
 	if (config.opencodeSkills) registerOpencodeSkills(ctx);
-	if (config.bootstrap) registerBootstrap(ctx);
+	registerBootstrap(ctx);
 }
 //#endregion
 export { Config, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "宁静号 ACC harness — Native Cordis 插件（DeepSeek Harness 运行时）。真实 DSH 工具注册（cc_fs/session/acc_msm 等 9 工具）+ 拦截缝机械约束（safe-mode/路径守卫/会话落盘）+ 系统提示词注入（ACC/CCE/Constraints/SKILL/Session 五块）。适配 DSH 公开版（deepseek-ai/deepseek-harness 0.1.0-rc）。",
   "license": "MIT",
   "repository": {