@shgroup/dsh-serenity-hooks 1.16.10 → 1.16.12

package/dsh.plugin.json

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

@@ -2827,6 +2827,51 @@ function eapBlock() {
 		""
 	].join("\n");
 }
+/**
+* 运行时状态块 1) safe-mode（S134 v1.16.12）：ON 时告知 agent（行为约束；机制仍由 guards 强制）。
+* 文案与实现逐项对应（guards.ts）：bash 禁用（restrict deny + decideGuard）、
+* 黑名单路径拦截、CCC 治理文件保护；write/edit 等其余工具保留（受路径逃逸/黑名单约束）。
+*/
+function safeModeBlock(root) {
+	if (!isSafeModeOn(root)) return "";
+	const blacklist = readBlacklist(root);
+	return [
+		"",
+		"=== Serenity Safe Mode ===",
+		"Safe mode is ON (enabled by the user): bash is disabled (hidden and blocked);",
+		"blacklist rules apply to file paths; CCC governance files (.serenity,",
+		".serenity-safe-on) are protected from agent writes. Other read/write tools",
+		"remain available, subject to path-escape and blacklist guards.",
+		"Behavior constraints: do not attempt to bypass restrictions; do not write to",
+		"blacklisted paths or governance files.",
+		blacklist.length > 0 ? `\nActive blacklist rules: ${blacklist.join(", ")}` : "",
+		""
+	].join("\n");
+}
+/**
+* 运行时状态块 2) localstore git 策略（S134 v1.16.12）：localstore.json 存在时按 gitTrack
+* 提示敏感行为约束。deny（缺省）= 本地私有不提交；allow = 进 git（个人私有仓）但敏感数据
+* 只限于该文件内（不外泄到其他文件/对话/日志）。
+*/
+function localstoreBlock(root) {
+	if (!existsSync(localstorePath(root))) return "";
+	return (readGitTrack(root) === "allow" ? [
+		"",
+		"=== Serenity Localstore ===",
+		"localstore.json is committed to git (gitTrack=allow — personal private repository).",
+		"Sensitive data may live in this file, but ONLY in this file: keep credentials and",
+		"secret values confined to localstore.json — never leak them into other files,",
+		"conversation, or logs.",
+		""
+	] : [
+		"",
+		"=== Serenity Localstore ===",
+		"localstore.json is a local private file (gitTrack=deny — not committed to git,",
+		".gitignore enforced). Credentials/config live only on this machine: do not write",
+		"them into conversation or logs; do not attempt to commit this file (cc_git will refuse).",
+		""
+	]).join("\n");
+}
 /** 4) SKILL.md 全文：该 CCC 顶层入口 skill 原文（对齐 osp：原文直推，无包裹头；仅过滤治理内容） */
 function entrySkillSectionText(root) {
 	const skills = findEntrySkills(root);
@@ -2882,9 +2927,11 @@ function serenitySystemPrompt(root, scope = DEFAULT_SESSION_SCOPE) {
 	const parts = [
 		accBlock(root),
 		cceBlock(),
-		constraintsBlock(root),
-		eapBlock()
+		constraintsBlock(root)
 	];
+	const state = [safeModeBlock(root), localstoreBlock(root)].filter((b) => b !== "").join("\n");
+	if (state) parts.push(state);
+	parts.push(eapBlock());
 	const skill = entrySkillSectionText(root);
 	if (skill) parts.push(skill);
 	const session = sessionBlock(root, scope);
@@ -3009,14 +3056,15 @@ const PLUGIN_SOURCE = {
 	plugin: "dsh-serenity-hooks"
 };
 /**
-* ACC 注入消息：完整内容 = 简短身份头 + 完整系统提示词（ACC 5 块 + CCC 顶层 skill 原文）。
-* 用户要求：在此处注入完整 ACC 系统提示词内容 + CCC 顶层 skill 原文（对齐 osp system.transform）。
-* scope = dsh 会话 id：Session 块按会话隔离，不跨会话泄露。
+* ACC 注入消息（S134 去重）：**只含简短身份锚点**（[ACC] 已激活 + CCC 根 + 约束 + loop 模型 + Phase 2）。
+* 完整身份（ACC 5 块 + CCE + Constraints + EAP + SKILL 全文 + Session 块）由**系统提示词层**
+* （systemPrompt.section，每轮 prompt 装配自动注入，含 subagent）承担——对话消息流/压缩重注入
+* 不再重复注入同一内容（token 双倍浪费，见 S134 注入方案梳理）。
 */
-function accMessage(root, configPaths, entrySkillMaxChars, scope = DEFAULT_SESSION_SCOPE) {
+function accMessage(root, configPaths, entrySkillMaxChars) {
 	const content = [{
 		type: "text",
-		text: `${accIdentityText(root, configPaths, entrySkillMaxChars)}\n\n${serenitySystemPrompt(root, scope)}`
+		text: accIdentityText(root, configPaths, entrySkillMaxChars)
 	}];
 	return createUserMessage({
 		content,
@@ -3063,7 +3111,7 @@ function registerContext(ctx, opts = {}) {
 		} catch {}
 		if (injected.has(key)) return;
 		injected.add(key);
-		agent.inject(accMessage(root, configPaths, entrySkillMaxChars, agentScope(agent)));
+		agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
 		syncSafeModeRestriction(agent, root);
 	};
 	if (opts.seedOnStart ?? true) ctx.on("agent/session-start", (payload) => {
@@ -3087,7 +3135,7 @@ function registerContext(ctx, opts = {}) {
 		return {
 			kind: "enter",
 			messages: [
-				accMessage(root, configPaths, entrySkillMaxChars, agentScope(agent)),
+				accMessage(root, configPaths, entrySkillMaxChars),
 				...messages,
 				...downstream.messages
 			]
@@ -3110,9 +3158,8 @@ function registerCompactRetention(ctx, opts = {}) {
 		if (!agent) return;
 		const root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
 		if (!root) return;
-		const scope = agent.session?.id ?? "default";
 		try {
-			agent.inject(accMessage(root, configPaths, entrySkillMaxChars, scope));
+			agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
 		} catch {}
 	});
 }

package/package.json

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