@shgroup/dsh-serenity-hooks 1.18.3 → 1.18.5

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.18.3",
+  "version": "1.18.5",
   "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

@@ -1924,16 +1924,18 @@ function decideGuard(input) {
 			deny: `path escape blocked: "${pathArg}" 越出 CCC 根`,
 			kind: "deny"
 		};
-		const rel = relative(root, abs).split("\\").join("/");
-		if (rel === ".serenity-safe-on" || rel === ".serenity" || rel.startsWith(".serenity-safe-on/") || rel.startsWith(".serenity/")) return {
-			deny: `CCC 治理文件 "${rel}" 保留给用户，agent 不可写`,
-			kind: "deny"
-		};
-		const hit = matchBlacklist(rel, blacklist);
-		if (hit) return {
-			deny: hit.message ?? `blacklist blocked: "${pathArg}" 命中规则 "${hit.pattern}"`,
-			kind: "deny"
-		};
+		if (toolName === "write" || toolName === "edit" || toolName === "str_replace_editor" || toolName === "cc_fs" || toolName === "bash" || toolName === "append" || toolName === "touch") {
+			const rel = relative(root, abs).split("\\").join("/");
+			if (rel === ".serenity-safe-on" || rel === ".serenity" || rel.startsWith(".serenity-safe-on/") || rel.startsWith(".serenity/")) return {
+				deny: `CCC 治理文件 "${rel}" 保留给用户，agent 不可写`,
+				kind: "deny"
+			};
+			const hit = matchBlacklist(rel, blacklist);
+			if (hit) return {
+				deny: hit.message ?? `blacklist blocked: "${pathArg}" 命中规则 "${hit.pattern}"`,
+				kind: "deny"
+			};
+		}
 	}
 	return { kind: "allow" };
 }
@@ -3527,9 +3529,14 @@ const DEFAULT_COMPACTION_TOOLS = [
 /** 默认首轮锚定消息（用户指定：persona 设定 + we/us 人称——首轮模型以 we/us 自称，
 *  对齐 anchored 实测的 "we" 轨迹特征） */
 const DEFAULT_ANCHOR_MESSAGE = "You are a helpful software engineer assistant.The personal pronoun is us/we.";
-/** 构建一个 epoch 感知晋升跟踪器（纯逻辑，可单测） */
-function createEpochPromotion(promoteEvents) {
-	/** sessionId -> { boundary, promoted } */
+/**
+* 构建一个 epoch 感知晋升跟踪器（纯逻辑，可单测）。
+* requiredSignals：晋升所需信号数（boundary 后累计；默认 1）。
+* 多轮锚定（v4）：两轮递进锚定时 requiredSignals = 锚定轮数——
+* 每条锚定回复（assistant/message）计一次，最后一条回复后晋升。
+*/
+function createEpochPromotion(promoteEvents, requiredSignals = 1) {
+	/** sessionId -> { boundary, signalCount }（boundary 后晋升信号计数） */
 	const state = /* @__PURE__ */ new Map();
 	const sessionIdOf = (session) => {
 		if (session && typeof session === "object") {
@@ -3539,24 +3546,27 @@ function createEpochPromotion(promoteEvents) {
 	};
 	const scan = (session) => {
 		let boundary = -1;
-		let promoted = false;
+		let signalCount = 0;
 		const events = session?.events;
 		if (Array.isArray(events)) for (const event of events) {
 			const e = event;
 			const seq = typeof e.seq === "number" ? e.seq : 0;
 			if (e.type === "compaction/end") {
 				boundary = seq;
-				promoted = false;
+				signalCount = 0;
 				continue;
 			}
-			if (promoteEvents.has(e.type) && seq > boundary) promoted = true;
+			if (promoteEvents.has(e.type) && seq > boundary) signalCount++;
 		}
 		const entry = {
 			boundary,
-			promoted
+			promoted: signalCount >= requiredSignals
 		};
 		const sid = sessionIdOf(session);
-		if (sid) state.set(sid, entry);
+		if (sid) state.set(sid, {
+			boundary,
+			signalCount
+		});
 		return entry;
 	};
 	return {
@@ -3579,7 +3589,12 @@ function createEpochPromotion(promoteEvents) {
 				boundary: -1,
 				promoted: true
 			};
-			return state.get(sid) ?? scan(session);
+			const s = state.get(sid);
+			if (s) return {
+				boundary: s.boundary,
+				promoted: s.signalCount >= requiredSignals
+			};
+			return scan(session);
 		},
 		observe(session, event) {
 			const sid = sessionIdOf(session);
@@ -3591,13 +3606,13 @@ function createEpochPromotion(promoteEvents) {
 			if (e.type === "compaction/end") {
 				state.set(sid, {
 					boundary: seq,
-					promoted: false
+					signalCount: 0
 				});
 				return;
 			}
-			if (promoteEvents.has(e.type) && seq > entry.boundary && !entry.promoted) state.set(sid, {
-				...entry,
-				promoted: true
+			if (promoteEvents.has(e.type) && seq > entry.boundary) state.set(sid, {
+				boundary: entry.boundary,
+				signalCount: entry.signalCount + 1
 			});
 		}
 	};
@@ -3620,12 +3635,18 @@ function sourceList(value, field, fallback) {
 function resolveBootstrapSettings(opts) {
 	const promoteOn = opts.promoteOn ?? "either";
 	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)}`);
+	let anchorMessages;
+	if (Array.isArray(opts.anchorMessages)) {
+		if (opts.anchorMessages.length === 0 || opts.anchorMessages.some((m) => typeof m !== "string" || m.length === 0)) throw new TypeError(`bootstrap: anchorMessages must be a non-empty array of non-empty strings`);
+		anchorMessages = opts.anchorMessages;
+	} else anchorMessages = [typeof opts.anchorMessage === "string" && opts.anchorMessage.length > 0 ? opts.anchorMessage : DEFAULT_ANCHOR_MESSAGE];
 	return {
 		bootstrapTools: stringList(opts.bootstrapTools, "bootstrapTools", DEFAULT_BOOTSTRAP_TOOLS),
 		promoteEvents: opts.zeroTools ? PROMOTE_EVENTS["assistant-message"] : PROMOTE_EVENTS[promoteOn],
+		requiredSignals: opts.zeroTools ? anchorMessages.length : 1,
 		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,
+		anchorMessages,
 		zeroTools: opts.zeroTools === true
 	};
 }
@@ -3656,6 +3677,7 @@ function readBootstrapConfig(agent) {
 		suppressedContextSources: b?.suppressedContextSources,
 		compactionTools: b?.compactionTools,
 		anchorMessage: b?.anchorMessage,
+		anchorMessages: b?.anchorMessages,
 		zeroTools: b?.zeroTools
 	});
 }
@@ -3665,7 +3687,7 @@ function registerBootstrap(ctx) {
 	const trackerFor = (root, settings) => {
 		let t = trackers.get(root);
 		if (!t) {
-			t = createEpochPromotion(settings.promoteEvents);
+			t = createEpochPromotion(settings.promoteEvents, settings.requiredSignals);
 			trackers.set(root, t);
 		}
 		return t;
@@ -3692,12 +3714,12 @@ function registerBootstrap(ctx) {
 			if (message?.source?.kind === "plugin") return;
 			const inbox = agent.inbox;
 			if (!inbox?.prepend) return;
-			inbox.prepend("next-turn", {
-				id: `bootstrap-anchor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+			for (let i = settings.anchorMessages.length - 1; i >= 0; i--) inbox.prepend("next-turn", {
+				id: `bootstrap-anchor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}-${i}`,
 				role: "user",
 				content: [{
 					type: "text",
-					text: settings.anchorMessage
+					text: settings.anchorMessages[i]
 				}],
 				source: {
 					kind: "plugin",
@@ -3706,7 +3728,7 @@ function registerBootstrap(ctx) {
 					summary: "bootstrap anchor turn"
 				}
 			});
-			warnOnce(`anchor turn injected: "${settings.anchorMessage.slice(0, 40)}…"`);
+			warnOnce(`anchor turns injected: ${settings.anchorMessages.length} 条（${settings.anchorMessages[0].slice(0, 40)}…）`);
 		} catch {}
 	});
 	let warned = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.18.3",
+  "version": "1.18.5",
   "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": {