@shgroup/dsh-serenity-hooks 1.17.3 → 1.17.4

package/dsh.plugin.json

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

@@ -87,16 +87,34 @@ const SAFE_MODE_MARKER = ".serenity-safe-on";
 function isSafeModeOn(root) {
 	return existsSync(resolve(root, SAFE_MODE_MARKER));
 }
+/**
+* 读取黑名单（对齐 osp readBlacklist）：支持两种条目格式——
+*   string：".secrets/" 或 "regex:^..."（前缀 / 正则）
+*   object：{ "pattern": ".secrets/", "message": "自定义提示" }
+* dsp v1.17.4 前只支持 string（对象会被 String() 成 "[object Object]" → 规则失效，不拦截）。
+*/
 function readBlacklist(root, paths = DEFAULT_SERENITY_CONFIG_PATHS) {
 	const rules = loadSerenityConfig(root, paths).safeMode?.blacklist;
-	return Array.isArray(rules) ? rules.map(String) : [];
+	if (!Array.isArray(rules)) return [];
+	const out = [];
+	for (const item of rules) if (typeof item === "string") {
+		if (item) out.push({ pattern: item });
+	} else if (item && typeof item === "object" && typeof item.pattern === "string") {
+		const obj = item;
+		const p = obj.pattern;
+		if (p) out.push({
+			pattern: p,
+			message: typeof obj.message === "string" ? obj.message : void 0
+		});
+	}
+	return out;
 }
-/** 匹配黑名单规则；命中返回规则，未命中返回 null。前缀匹配 / regex: 前缀 */
+/** 匹配黑名单规则；命中返回条目，未命中返回 null。前缀匹配 / regex: 前缀（对齐 osp） */
 function matchBlacklist(relPath, rules) {
-	for (const rule of rules) if (rule.startsWith("regex:")) try {
-		if (new RegExp(rule.slice(6)).test(relPath)) return rule;
+	for (const rule of rules) if (rule.pattern.startsWith("regex:")) try {
+		if (new RegExp(rule.pattern.slice(6)).test(relPath)) return rule;
 	} catch {}
-	else if (relPath.startsWith(rule)) return rule;
+	else if (relPath.startsWith(rule.pattern)) return rule;
 	return null;
 }
 //#endregion
@@ -1875,7 +1893,7 @@ function decideGuard(input) {
 		};
 		const hit = matchBlacklist(rel, blacklist);
 		if (hit) return {
-			deny: `blacklist blocked: "${pathArg}" 命中规则 "${hit}"`,
+			deny: hit.message ?? `blacklist blocked: "${pathArg}" 命中规则 "${hit.pattern}"`,
 			kind: "deny"
 		};
 	}
@@ -3750,7 +3768,7 @@ function safeModeBlock(root) {
 		"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(", ")}` : "",
+		blacklist.length > 0 ? `\nActive blacklist rules: ${blacklist.map((b) => b.message ?? b.pattern).join(", ")}` : "",
 		""
 	].join("\n");
 }

package/package.json

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