@shgroup/dsh-serenity-hooks 1.17.3 → 1.17.5

package/dsh.plugin.json

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

@@ -1,6 +1,6 @@
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
-import { appendFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, utimesSync, writeFileSync } from "node:fs";
+import { appendFileSync, chmodSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, rmdirSync, statSync, unlinkSync, utimesSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { execFile, execFileSync, spawn, spawnSync } from "node:child_process";
 import { homedir, platform } from "node:os";
@@ -71,12 +71,19 @@ function resolveInside(root, p) {
 * .dsh 仅作 dsh 运行时回退，不优先）。
 */
 const DEFAULT_SERENITY_CONFIG_PATHS = [".opencode/serenity.json", ".dsh/serenity.json"];
+/**
+* 读取 UTF-8 文件并剥离 BOM（Windows 审计问题 16）：PowerShell/Windows 编辑器
+* 写出的 BOM（\uFEFF）会让 JSON.parse 抛错（配置静默变空）或 frontmatter 检测失败（技能被丢弃）。
+*/
+function readUtf8(path) {
+	return readFileSync(path, "utf-8").replace(/^\uFEFF/, "");
+}
 function loadSerenityConfig(root, paths = DEFAULT_SERENITY_CONFIG_PATHS) {
 	for (const candidate of paths) {
 		const p = resolve(root, candidate);
 		if (!existsSync(p)) continue;
 		try {
-			return JSON.parse(readFileSync(p, "utf-8"));
+			return JSON.parse(readUtf8(p));
 		} catch {
 			return {};
 		}
@@ -87,16 +94,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
@@ -165,13 +190,22 @@ function safeRel(root, abs) {
 }
 function validateWritePath(root, target) {
 	const absPath = target.startsWith("/") ? resolve(target) : resolveInside(root, target);
-	if (target.startsWith("/") && !absPath.startsWith(root)) throw new Error(`cc-fs: path "${target}" resolves to "${absPath}" which is outside serenity root "${root}"`);
-	if (absPath.endsWith("/mech-registry.json") && absPath.includes("/.opencode/skills/")) throw new Error(`cc-fs: refusing to directly modify mech-registry.json — use acc_msm register/deregister instead`);
+	if (!pathInside(resolve(root), absPath)) throw new Error(`cc-fs: path "${target}" resolves to "${absPath}" which is outside serenity root "${root}"`);
+	const rel = relative(root, absPath).split("\\").join("/");
+	if (rel.endsWith("/mech-registry.json") && rel.includes("/.opencode/skills/")) throw new Error(`cc-fs: refusing to directly modify mech-registry.json — use acc_msm register/deregister instead`);
+	if (existsSync(absPath)) try {
+		const real = realpathSync(absPath);
+		if (!pathInside(resolve(root), real)) throw new Error(`cc-fs: path "${target}" resolves via symlink to "${real}" outside serenity root "${root}"`);
+	} catch (e) {
+		if (e instanceof Error && e.message.includes("symlink")) throw e;
+	}
 	return absPath;
 }
 function assertNotProtected(root, absPath, targetLabel) {
-	if (absPath === resolve(root, ".serenity")) throw new Error(`cc-fs: refusing to delete protected path: ${targetLabel} (.serenity is the CCC marker)`);
-	if (absPath === root) throw new Error(`cc-fs: refusing to delete the CCC root directory: ${targetLabel}`);
+	const ci = process.platform === "win32";
+	const eq = (a, b) => ci ? a.toLowerCase() === b.toLowerCase() : a === b;
+	if (eq(absPath, resolve(root, ".serenity"))) throw new Error(`cc-fs: refusing to delete protected path: ${targetLabel} (.serenity is the CCC marker)`);
+	if (eq(absPath, root)) throw new Error(`cc-fs: refusing to delete the CCC root directory: ${targetLabel}`);
 }
 function runCcFs(root, args) {
 	const a = args.action;
@@ -288,7 +322,12 @@ function runCcFs(root, args) {
 					recursive: true,
 					force: false
 				});
-				else unlinkSync(absPath);
+				else {
+					if (process.platform === "win32") try {
+						chmodSync(absPath, 438);
+					} catch {}
+					unlinkSync(absPath);
+				}
 				results.push(`[OK] deleted: ${relLabel}`);
 			}
 			return results.join("\n");
@@ -349,7 +388,7 @@ function runCcFs(root, args) {
 					const revealPath = statSync(absPath).isDirectory() ? absPath : dirname(absPath);
 					execFileSync("xdg-open", [revealPath], { timeout: 1e4 });
 				} else if (os === "win32") {
-					const winArgs = statSync(absPath).isDirectory() ? [absPath] : ["/select,", absPath];
+					const winArgs = statSync(absPath).isDirectory() ? [absPath] : [`/select,${absPath}`];
 					const child = spawn("explorer", winArgs, {
 						detached: true,
 						stdio: "ignore",
@@ -694,7 +733,7 @@ safe-mode 由 WebUI 开关控制（写 .serenity-safe-on 标记）；黑名单
     { "safeMode": { "blacklist": [".secrets/"] } }
 `;
 function parseRegistry(raw) {
-	const data = JSON.parse(raw);
+	const data = JSON.parse(raw.replace(/^\uFEFF/, ""));
 	if (Array.isArray(data)) return data;
 	const entries = data.entries;
 	if (!Array.isArray(entries)) throw new Error("invalid registry: missing entries[]");
@@ -773,7 +812,7 @@ function runMsm(root, args) {
 				],
 				env: buildMsmEnv(root)
 			});
-			if (r.error && r.error.code === "ENOENT") r = spawnSync(NPX_BIN, [
+			if (r.error && isBunMissing(r.error)) r = spawnSync(NPX_BIN, [
 				"tsx",
 				entry.path,
 				...businessArgs
@@ -1019,6 +1058,15 @@ function msmExecResult(name, status, stdout, stderr, fmtJson, hasHelp = false) {
 * 用 execFile + promisify + timeout（超时自动 kill），**不阻塞 Node 事件循环**。
 * （同步 spawnSync 版会阻塞 web 事件循环 → MSM 脚本自请求 3080 时死锁，见 postmortem。）
 */
+/** bun 缺失的错误码集（Windows 兼容：无 bun 时 execFile('bun') 抛 EINVAL 而非 ENOENT，见 Windows 审计问题 5） */
+const BUN_MISSING_CODES = /* @__PURE__ */ new Set([
+	"ENOENT",
+	"EINVAL",
+	"EPERM"
+]);
+function isBunMissing(err) {
+	return typeof err.code === "string" && BUN_MISSING_CODES.has(err.code);
+}
 async function runMsmAsync(root, args) {
 	if (args.action !== "exec") return runMsm(root, args);
 	const { entry, businessArgs, fmtJson, hasHelp, protocol } = prepareExec(root, args);
@@ -1035,7 +1083,7 @@ async function runMsmAsync(root, args) {
 		return msmExecResult(entry.name, 0, r.stdout, r.stderr, fmtJson, hasHelp);
 	} catch (e) {
 		const err = e;
-		if (err.code === "ENOENT") try {
+		if (isBunMissing(err)) try {
 			const r = await execFileAsync(NPX_BIN, [
 				"tsx",
 				entry.path,
@@ -1203,6 +1251,12 @@ function sessionMdTemplate(title, id, goal, now) {
 	return `# SESSION: ${title}\n- ID: ${id}\n\n## 目标\n${goal ?? "（待补充）"}\n\n## 状态\n- [ ] 进行中\n\n## 关键决策\n| # | 决策 | 理由 |\n|---|------|------|\n| 1 | | |\n\n## 进度记录\n- ${ts} — 创建\n\n## 产出物\n- \n\n## 未解决的问题\n- \n`;
 }
 /** create 子命令（对齐 osp createSession：--desc/--issue 二选一 + dry-run + 长度限制） */
+/** 目录名脱敏（Windows 审计问题 10）：非法字符 → '-', 去尾点/空格, 保留名（CON/NUL 等）加前缀 */
+function sanitizeDirName(s) {
+	const cleaned = s.replace(/[<>:"/\\|?*\u0000-\u001f]/g, "-").replace(/[ .]+$/g, "");
+	if (/^(con|prn|aux|nul|com[1-9]|lpt[1-9])$/i.test(cleaned)) return `_${cleaned}`;
+	return cleaned;
+}
 function createSession(opts) {
 	const { root, desc, issue, goal, dryRun } = opts;
 	const sessionsDir = sessionsRoot(root);
@@ -1212,7 +1266,7 @@ function createSession(opts) {
 	if (desc && issue) throw new Error("--desc and --issue are mutually exclusive");
 	if (issue) {
 		if (issue.length > 100) throw new Error(`issue too long: ${issue.length} chars (max 100)`);
-		const dirName = `${datePrefix}--${issue}`;
+		const dirName = `${datePrefix}--${sanitizeDirName(issue)}`;
 		const sessionPath = join(sessionsDir, dirName);
 		if (!dryRun && existsSync(sessionPath)) throw new Error(`Session directory already exists: "${dirName}"`);
 		if (dryRun) return {
@@ -1242,7 +1296,7 @@ function createSession(opts) {
 		}
 	}
 	const nextId = String(maxId + 1).padStart(3, "0");
-	const dirName = `${datePrefix}--S${nextId}--${desc}`;
+	const dirName = `${datePrefix}--S${nextId}--${sanitizeDirName(desc)}`;
 	const sessionPath = join(sessionsDir, dirName);
 	if (!dryRun && existsSync(sessionPath)) throw new Error(`Session directory already exists: "${dirName}"`);
 	if (dryRun) return {
@@ -1342,6 +1396,7 @@ function closeSession(root, key, confirm, scope = DEFAULT_SESSION_SCOPE) {
 	const mdPath = join(session.path, SESSION_MD);
 	if (!existsSync(mdPath)) throw new Error(`Session "${session.dirName}" has no SESSION.md — nothing to close.`);
 	let content = readFileSync(mdPath, "utf-8");
+	content = content.replace(/\r\n/g, "\n");
 	content = content.replace(/## 状态\n\n?- \[ \] 进行中/, "## 状态\n- [x] 已完成\n- [x] 已关闭");
 	const now = (/* @__PURE__ */ new Date()).toISOString().slice(0, 16).replace("T", " ");
 	if (!content.includes("-- 关闭")) content = content.replace(/(## 进度记录\n)/, `$1- ${now} — 关闭\n`);
@@ -1864,18 +1919,19 @@ function decideGuard(input) {
 		kind: "deny"
 	};
 	if (pathArg !== void 0) {
-		const rel = relative(root, resolve(root, pathArg));
-		if (rel.startsWith("..")) return {
+		const abs = resolve(root, pathArg);
+		if (!pathInside(resolve(root), abs)) return {
 			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: `blacklist blocked: "${pathArg}" 命中规则 "${hit}"`,
+			deny: hit.message ?? `blacklist blocked: "${pathArg}" 命中规则 "${hit.pattern}"`,
 			kind: "deny"
 		};
 	}
@@ -2000,14 +2056,21 @@ function registerGuards(ctx, opts = {}) {
 * WebUI 停靠栏的数据源：ACC 版本 / CCC 根 / safe-mode 状态 / 黑名单 / keeper 阈值 / loop 模型。
 * setSafeMode 直接读写 .serenity-safe-on 标记（守卫实时读取，写即生效）。
 */
-/** 读取已安装 DSH CLI 版本（npm 全局 @deepseek-ai/dsh）；读不到返回 null */
+/**
+* 读取已安装 DSH CLI 版本；读不到返回 null。
+* 跨平台（Windows 审计问题 13）：Windows npm 全局装在 %APPDATA%\npm（非 ~/.npm-global）——
+* 依次尝试 npm_config_prefix / APPDATA\npm / ~/.npm-global。
+*/
 function readDshVersion() {
-	try {
-		const pkg = JSON.parse(readFileSync(join(homedir(), ".npm-global", "lib", "node_modules", "@deepseek-ai", "dsh", "package.json"), "utf-8"));
-		return typeof pkg.version === "string" ? pkg.version : null;
-	} catch {
-		return null;
-	}
+	const candidates = [];
+	if (process.env.npm_config_prefix) candidates.push(join(process.env.npm_config_prefix, "lib", "node_modules", "@deepseek-ai", "dsh"));
+	if (process.env.APPDATA) candidates.push(join(process.env.APPDATA, "npm", "node_modules", "@deepseek-ai", "dsh"));
+	candidates.push(join(homedir(), ".npm-global", "lib", "node_modules", "@deepseek-ai", "dsh"));
+	for (const p of candidates) try {
+		const pkg = JSON.parse(readFileSync(join(p, "package.json"), "utf-8"));
+		if (typeof pkg.version === "string") return pkg.version;
+	} catch {}
+	return null;
 }
 function getStatus(cwd, configPaths = DEFAULT_SERENITY_CONFIG_PATHS) {
 	const root = findSerenityRoot(cwd);
@@ -2249,7 +2312,7 @@ function readAll(root) {
 	const p = localstorePath(root);
 	if (!existsSync(p)) return {};
 	try {
-		const v = JSON.parse(readFileSync(p, "utf-8"));
+		const v = JSON.parse(readFileSync(p, "utf-8").replace(/^\uFEFF/, ""));
 		if (v && typeof v === "object" && !Array.isArray(v)) return v;
 		return {};
 	} catch {
@@ -2463,6 +2526,9 @@ const GIT_ACTIONS = [
 	"pull",
 	"diff"
 ];
+/** git 操作超时（ms）——网络路径（push/pull/fetch）可能挂起（GCM 弹认证框等），
+*  无 timeout 会冻结 Node 事件循环 / DSH 3080 server（Windows 审计问题 12） */
+const GIT_TIMEOUT_MS = 3e4;
 function git(root, args) {
 	try {
 		return {
@@ -2474,14 +2540,15 @@ function git(root, args) {
 					"pipe",
 					"pipe"
 				],
-				maxBuffer: 1048576
+				maxBuffer: 1048576,
+				timeout: GIT_TIMEOUT_MS
 			}).trimEnd(),
 			stderr: ""
 		};
 	} catch (err) {
 		return {
 			stdout: (err.stdout?.toString() ?? "").trimEnd(),
-			stderr: (err.stderr?.toString() ?? "").trimEnd()
+			stderr: err.killed ? `git 操作超时（${GIT_TIMEOUT_MS / 1e3}s）` : (err.stderr?.toString() ?? "").trimEnd()
 		};
 	}
 }
@@ -2986,11 +3053,16 @@ function loopPresetInheritance(parentCtx) {
 * 对齐 opencode-serenity-plugin 老 loop 语义：进度文件（loop-<label>.md/.json）、
 * 续跑、轮次 prompt 结构、stop token。
 */
+/** label 脱敏（Windows 审计问题 17）：非法字符 → '-'，去尾点/空格，限长 */
+function sanitizeLabel(label) {
+	return label.replace(/[<>:"/\\|?*\u0000-\u001f]/g, "-").replace(/[ .]+$/g, "").slice(0, 50);
+}
 function loopProgressPaths(root, label) {
 	const dir = join(root, "AGENT_SESSIONS");
+	const safe = sanitizeLabel(label);
 	return {
-		md: join(dir, `loop-${label}.md`),
-		json: join(dir, `loop-${label}.json`)
+		md: join(dir, `loop-${safe}.md`),
+		json: join(dir, `loop-${safe}.json`)
 	};
 }
 /** 读取进度（续跑）；无文件返回 round 0 */
@@ -3750,7 +3822,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");
 }
@@ -4235,16 +4307,17 @@ function registerEnv(ctx) {
 */
 /** 解析 --- 分隔的 YAML frontmatter（只需 name/description/whenToUse） */
 function parseFrontmatter(raw) {
-	const m = /^---\s*\n([\s\S]*?)\n---\s*\n?/.exec(raw);
+	const text = raw.replace(/^\uFEFF/, "");
+	const m = /^---\s*\n([\s\S]*?)\n---\s*\n?/.exec(text);
 	if (!m) return {
 		meta: {
 			name: "",
 			description: ""
 		},
-		content: raw
+		content: text
 	};
 	const fm = m[1];
-	const body = raw.slice(m[0].length);
+	const body = text.slice(m[0].length);
 	const grab = (key) => {
 		const line = fm.split("\n").find((l) => l.startsWith(`${key}:`));
 		if (!line) return void 0;

package/package.json

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