@shgroup/dsh-serenity-hooks 1.18.8 → 1.19.1

package/dsh.plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.18.8",
+  "version": "1.19.1",
   "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 组织）。",
+  "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": {
     "dsh": ">=0.1.0-rc.5"
   },

package/lib/index.js

@@ -1684,15 +1684,6 @@ function qaCheck(root, key) {
 	if (verified) lines.push("  • Session looks clean — no issues detected");
 	return lines.join("\n");
 }
-/** 追加会话心跳（turn-stopping 机械落盘用） */
-function appendHeartbeat(sessionMd) {
-	try {
-		appendFileSync(sessionMd, `- ${(/* @__PURE__ */ new Date()).toISOString()} — [auto] turn heartbeat (dsh-serenity-hooks)\n`, "utf-8");
-		return true;
-	} catch {
-		return false;
-	}
-}
 //#endregion
 //#region src/tools/session.ts
 /**
@@ -1906,6 +1897,32 @@ const sessionTool = defineTool({
 *
 * 对应 opencode-serenity-plugin 的 tool.execute.before 路径守卫 + bash 开关 + 黑名单。
 */
+/** 写类工具名（黑名单/治理文件只拦这些；读工具只做路径越界检查——对齐 osp） */
+const WRITE_TOOLS = /* @__PURE__ */ new Set([
+	"write",
+	"edit",
+	"str_replace_editor",
+	"cc_fs",
+	"bash",
+	"append",
+	"touch"
+]);
+/** cc_fs 的写类子命令（mkdir/rm/mv/cp/touch/append）；其余 9 子命令（root/resolve/exists/
+*  list/tree/relative/reveal/info/find）为只读——只读子命令不查黑名单（同 read 语义） */
+const CC_FS_WRITE_ACTIONS = /* @__PURE__ */ new Set([
+	"mkdir",
+	"rm",
+	"mv",
+	"cp",
+	"touch",
+	"append"
+]);
+/** 判定工具是否为写类：普通工具按名；cc_fs 复合工具按子命令 action */
+function isWriteTool(toolName, action) {
+	if (!WRITE_TOOLS.has(toolName)) return false;
+	if (toolName === "cc_fs") return action !== void 0 && CC_FS_WRITE_ACTIONS.has(action);
+	return true;
+}
 /**
 * 安全模式 + 黑名单 + P3 路径守卫的纯决策。
 * 对齐 opencode-serenity-plugin 标准：安全模式 = **bash 禁用** + 写入黑名单；
@@ -1913,7 +1930,7 @@ const sessionTool = defineTool({
 * 优先级：safe-mode bash > 路径越界 > 黑名单命中。
 */
 function decideGuard(input) {
-	const { root, toolName, safeModeOn, blacklist, pathArg } = input;
+	const { root, toolName, safeModeOn, blacklist, pathArg, action } = input;
 	if (safeModeOn && toolName === "bash") return {
 		deny: `bash: 没有这个工具`,
 		kind: "deny"
@@ -1924,7 +1941,7 @@ function decideGuard(input) {
 			deny: `path escape blocked: "${pathArg}" 越出 CCC 根`,
 			kind: "deny"
 		};
-		if (toolName === "write" || toolName === "edit" || toolName === "str_replace_editor" || toolName === "cc_fs" || toolName === "bash" || toolName === "append" || toolName === "touch") {
+		if (isWriteTool(toolName, action)) {
 			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 不可写`,
@@ -2003,7 +2020,11 @@ function syncSafeModeRestriction(agent, root) {
 	}
 	writeRestrictDiag(root);
 }
-/** 从 exec 参数中提取常见路径字段（write/edit 工具）；宽松读取 */
+/**
+* 从 exec 参数中提取常见路径字段（write/edit 工具）；宽松读取。
+* cc_fs 复合工具：path（单路径）/ paths（数组）/ src / dst——取第一个命中（越界检查
+* 逐路径由 decideGuard 单 pathArg 覆盖；多路径字段取首个，避免漏检主体路径）。
+*/
 function extractPathArg(exec) {
 	const args = exec.arguments;
 	if (args === null || typeof args !== "object") return void 0;
@@ -2012,11 +2033,21 @@ function extractPathArg(exec) {
 		"path",
 		"file_path",
 		"target",
+		"src",
 		"dst"
 	]) {
 		const v = a[key];
 		if (typeof v === "string") return v;
 	}
+	const paths = a["paths"];
+	if (Array.isArray(paths) && paths.length > 0 && typeof paths[0] === "string") return paths[0];
+}
+/** 从 exec 参数提取 cc_fs 子命令 action；无则 undefined */
+function extractAction(exec) {
+	const args = exec.arguments;
+	if (args === null || typeof args !== "object") return void 0;
+	const a = args;
+	return typeof a.action === "string" ? a.action : void 0;
 }
 /**
 * 注册守卫：tools/pre-execute 瀑布 + ctx.tools.guard 终局。
@@ -2030,12 +2061,14 @@ function registerGuards(ctx, opts = {}) {
 		const safeModeOn = isSafeModeOn(root);
 		const blacklist = readBlacklist(root, configPaths);
 		const pathArg = extractPathArg(exec);
+		const action = extractAction(exec);
 		return decideGuard({
 			root,
 			toolName: exec.name,
 			safeModeOn,
 			blacklist,
-			pathArg
+			pathArg,
+			action
 		});
 	};
 	ctx.on("tools/pre-execute", async (exec, next) => {
@@ -3816,22 +3849,6 @@ function registerBootstrap(ctx) {
 	}, { prepend: true });
 }
 //#endregion
-//#region src/seams/loop.ts
-/** 解析当前 dsh 会话 scope 的活跃会话 SESSION.md 绝对路径；无标记/越界返回 null */
-function resolveActiveSession(root, scope = DEFAULT_SESSION_SCOPE) {
-	return readActiveSessionMd(root, scope);
-}
-/** 注册 agent/turn-stopping：CCC 内活动会话自动心跳落盘（按 dsh 会话隔离） */
-function registerTurnFlush(ctx) {
-	ctx.on("agent/turn-stopping", async (payload) => {
-		const agent = payload.agent;
-		const root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
-		if (!root) return;
-		const sessionMd = resolveActiveSession(root, agent.session?.id ?? "default");
-		if (sessionMd) appendHeartbeat(sessionMd);
-	});
-}
-//#endregion
 //#region src/seams/keeper.ts
 const SCORES = {
 	write: 3,
@@ -4744,7 +4761,6 @@ const Config = z.object({
 	serenityConfigPaths: z.array(z.string()).default([...DEFAULT_SERENITY_CONFIG_PATHS]),
 	tools: z.boolean().default(true),
 	guards: z.boolean().default(true),
-	turnFlush: z.boolean().default(true),
 	keeper: z.boolean().default(true),
 	keeperThreshold: z.number().default(150),
 	context: z.boolean().default(true),
@@ -4768,7 +4784,6 @@ function apply(ctx, config) {
 		ctx.tools.register(localstoreTool);
 	}
 	if (config.guards) registerGuards(ctx, { configPaths: config.serenityConfigPaths });
-	if (config.turnFlush) registerTurnFlush(ctx);
 	if (config.keeper) registerKeeper(ctx, {
 		configPaths: config.serenityConfigPaths,
 		defaultThreshold: config.keeperThreshold

package/package.json

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