@shgroup/dsh-serenity-hooks 1.16.1 → 1.16.3

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "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/client.js

@@ -0,0 +1,201 @@
+window.__ModuleLoader__.load({
+	id: "@shgroup/dsh-serenity-hooks",
+	factory: (require) => {
+		var module = { exports: {} };
+		var exports = module.exports;
+		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+		let react = require("react");
+		let react_jsx_runtime = require("react/jsx-runtime");
+		//#region \0sp-css:/home/yh/home/home-serenity/AI_LAB/dsh-serenity-plugin/hooks/dsh-serenity-hooks/src/client/SafeModePanel
+		const css = "/* SafeModePanel — 会话头部 Serenity 状态徽章（点击展开详情卡）。\n * 遵循 web-styling.md：颜色只用 --dsw-alias-* 语义 token（明暗自适应）；\n * 尺寸与官方 header 标签一致；前缀 sp- 防冲突。 */\n\n.sp-root {\n  position: relative;\n  display: inline-flex;\n  align-items: center;\n  gap: 6px;\n  height: 24px;\n  padding: 0 4px 0 4px;\n  border-radius: 6px;\n  background: var(--dsw-alias-bg-module-platform);\n  font-size: 12px;\n  line-height: 24px;\n  white-space: nowrap;\n}\n\n.sp-badge {\n  display: inline-flex;\n  align-items: center;\n  gap: 6px;\n  height: 22px;\n  padding: 0 6px;\n  border: none;\n  border-radius: 5px;\n  background: transparent;\n  color: inherit;\n  font-size: 12px;\n  cursor: pointer;\n  transition: background var(--ds-transition-duration-fast, 0.1s) var(--ds-ease-in-out, ease);\n}\n\n.sp-badge:hover {\n  background: var(--dsw-alias-interactive-bg-hover);\n}\n\n.sp-badge:focus-visible {\n  outline: 2px solid var(--dsw-alias-button-ghost-active-border);\n  outline-offset: 1px;\n}\n\n.sp-dot {\n  flex: none;\n  width: 7px;\n  height: 7px;\n  border-radius: 50%;\n}\n\n.sp-dotOn {\n  background: var(--dsw-alias-state-success-primary);\n}\n\n.sp-dotOff {\n  background: var(--dsw-alias-label-dimmed);\n}\n\n.sp-brand {\n  color: var(--dsw-alias-label-primary);\n  font-weight: 500;\n}\n\n.sp-toggle {\n  display: inline-flex;\n  align-items: center;\n  gap: 4px;\n  height: 18px;\n  padding: 0 8px;\n  border: none;\n  border-radius: 5px;\n  font-size: 12px;\n  font-weight: 600;\n  line-height: 18px;\n  cursor: pointer;\n  transition: background var(--ds-transition-duration-fast, 0.1s) var(--ds-ease-in-out, ease);\n}\n\n.sp-toggle:focus-visible {\n  outline: 2px solid var(--dsw-alias-button-ghost-active-border);\n  outline-offset: 1px;\n}\n\n.sp-toggle:disabled {\n  opacity: 0.55;\n  cursor: default;\n}\n\n.sp-toggleOn {\n  background: var(--dsw-alias-state-error-primary);\n  color: var(--dsw-alias-label-primary-foreground);\n}\n\n.sp-toggleOn:hover:not(:disabled) {\n  background: var(--dsw-alias-state-error-secondary);\n}\n\n.sp-toggleOff {\n  background: var(--dsw-alias-interactive-bg-hover);\n  color: var(--dsw-alias-label-secondary);\n}\n\n.sp-toggleOff:hover:not(:disabled) {\n  background: var(--dsw-alias-interactive-bg-hover-solid);\n}\n\n.sp-toggleIcon {\n  flex: none;\n}\n\n.sp-toggleLg {\n  height: 26px;\n  padding: 0 14px;\n  font-size: 13px;\n  line-height: 26px;\n  border-radius: 6px;\n}\n\n/* 详情卡：相对徽章绝对定位（右对齐），卡片 token */\n.sp-pop {\n  position: absolute;\n  top: calc(100% + 8px);\n  right: 0;\n  z-index: 20;\n  width: 300px;\n  box-sizing: border-box;\n  padding: 12px 14px;\n  border: 1px solid var(--dsw-alias-border-l1);\n  border-radius: 12px;\n  background: var(--dsw-specific-tip);\n  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);\n  display: flex;\n  flex-direction: column;\n  gap: 8px;\n}\n\n.sp-popRow {\n  display: flex;\n  align-items: baseline;\n  gap: 10px;\n  min-width: 0;\n}\n\n.sp-popLabel {\n  flex: none;\n  width: 34px;\n  font-size: 12px;\n  color: var(--dsw-alias-label-caption);\n}\n\n.sp-popValue {\n  flex: 1;\n  min-width: 0;\n  overflow: hidden;\n  text-overflow: ellipsis;\n  font-size: 12px;\n  color: var(--dsw-alias-label-secondary);\n  font-family: var(--ds-font-family-code, monospace);\n}\n\n.sp-popActions {\n  display: flex;\n  justify-content: flex-end;\n  padding-top: 4px;\n  border-top: 1px solid var(--dsw-alias-border-l1);\n  margin-top: 2px;\n}\n\n@media (prefers-reduced-motion: reduce) {\n  .sp-toggle,\n  .sp-badge {\n    transition: none;\n  }\n}\n";
+		if (typeof document !== "undefined" && document.querySelector("style[data-sp-css]") === null) {
+			const tag = document.createElement("style");
+			tag.setAttribute("data-sp-css", "1");
+			tag.textContent = css;
+			document.head.appendChild(tag);
+		}
+		//#endregion
+		//#region src/client/SafeModePanel.tsx
+		const API = "/serenity/status";
+		/** 拼接类名（等价 clsx 最小子集，避免额外依赖） */
+		function cx(...parts) {
+			return parts.filter(Boolean).join(" ");
+		}
+		/** 会话头部：可点击徽章 + safe-mode 开关；点击徽章展开状态详情卡 */
+		function SafeModePanel(props) {
+			const [status, setStatus] = (0, react.useState)(null);
+			const [busy, setBusy] = (0, react.useState)(false);
+			const [open, setOpen] = (0, react.useState)(false);
+			const rootRef = (0, react.useRef)(null);
+			const sessionId = props.sessionId;
+			const refresh = (0, react.useCallback)(async () => {
+				const qs = sessionId ? `?sessionId=${encodeURIComponent(sessionId)}` : "";
+				try {
+					const r = await fetch(`${API}${qs}`, { headers: { accept: "application/json" } });
+					setStatus(await r.json());
+				} catch {
+					setStatus(null);
+				}
+			}, [sessionId]);
+			(0, react.useEffect)(() => {
+				refresh();
+			}, [refresh]);
+			(0, react.useEffect)(() => {
+				if (!open) return;
+				const onDown = (e) => {
+					if (rootRef.current !== null && !rootRef.current.contains(e.target)) setOpen(false);
+				};
+				document.addEventListener("pointerdown", onDown);
+				return () => document.removeEventListener("pointerdown", onDown);
+			}, [open]);
+			const toggle = async (on) => {
+				setBusy(true);
+				try {
+					await fetch(API, {
+						method: "POST",
+						headers: {
+							"content-type": "application/json",
+							"x-serenity-ui": "1"
+						},
+						body: JSON.stringify({
+							sessionId,
+							on
+						})
+					});
+					await refresh();
+				} finally {
+					setBusy(false);
+				}
+			};
+			if (!status) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: cx("sp-root"),
+				children: "⏳ Serenity…"
+			});
+			const inCcc = status.root !== null;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				ref: rootRef,
+				className: cx("sp-root"),
+				title: status.root ?? void 0,
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						className: cx("sp-badge"),
+						"aria-expanded": open,
+						onClick: () => setOpen((v) => !v),
+						title: open ? "收起详情" : "查看 Serenity 状态",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: cx("sp-dot", inCcc ? "sp-dotOn" : "sp-dotOff") }),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: cx("sp-brand"),
+								children: ["Serenity v", status.accVersion]
+							}),
+							open ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronUpOutline14, { size: 12 }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, { size: 12 })
+						]
+					}),
+					inCcc && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						className: cx("sp-toggle", status.safeModeOn ? "sp-toggleOn" : "sp-toggleOff"),
+						disabled: busy,
+						onClick: () => void toggle(!status.safeModeOn),
+						title: status.safeModeOn ? "关闭 safe-mode（解除 bash 限制）" : "开启 safe-mode（隐藏写工具）",
+						children: [
+							status.safeModeOn && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutline16, {
+								size: 12,
+								className: cx("sp-toggleIcon")
+							}),
+							"safe-mode ",
+							status.safeModeOn ? "ON" : "OFF"
+						]
+					}),
+					open && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: cx("sp-pop"),
+						role: "dialog",
+						"aria-label": "Serenity 状态详情",
+						children: inCcc ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: cx("sp-popRow"),
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: cx("sp-popLabel"),
+									children: "CCC"
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: cx("sp-popValue"),
+									title: status.root ?? void 0,
+									children: status.root
+								})]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: cx("sp-popRow"),
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: cx("sp-popLabel"),
+									children: "loop"
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: cx("sp-popValue"),
+									title: status.loopModel ? `loop.defaultModel: ${status.loopModel}` : void 0,
+									children: status.loopModel ?? "未配置"
+								})]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: cx("sp-popRow"),
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: cx("sp-popLabel"),
+									children: "守卫"
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+									className: cx("sp-popValue"),
+									children: [
+										"blacklist ",
+										status.blacklist.length,
+										" 条",
+										status.threshold !== null ? ` · keeper 阈值 ${status.threshold}` : ""
+									]
+								})]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: cx("sp-popActions"),
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+									type: "button",
+									className: cx("sp-toggle", status.safeModeOn ? "sp-toggleOn" : "sp-toggleOff", "sp-toggleLg"),
+									disabled: busy,
+									onClick: () => void toggle(!status.safeModeOn),
+									children: [
+										status.safeModeOn && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutline16, {
+											size: 14,
+											className: cx("sp-toggleIcon")
+										}),
+										"safe-mode ",
+										status.safeModeOn ? "ON" : "OFF"
+									]
+								})
+							})
+						] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: cx("sp-popRow"),
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: cx("sp-popLabel"),
+								children: "状态"
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: cx("sp-popValue"),
+								children: "ACC 未激活（工作区不在 CCC 内）"
+							})]
+						})
+					})
+				]
+			});
+		}
+		//#endregion
+		//#region src/client/index.ts
+		const inject = ["slots", "conversation"];
+		function apply(ctx) {
+			ctx.inject(["slots", "conversation"], (scope) => {
+				scope.effect(() => scope.slots.register({
+					name: "conversation.session.header.actions",
+					id: "serenity-safe",
+					order: 10
+				}, SafeModePanel), "serenity: header status badge");
+			});
+		}
+		//#endregion
+		exports.apply = apply;
+		exports.inject = inject;
+		return module.exports;
+	}
+});

package/lib/index.js

@@ -769,29 +769,62 @@ function showSession(root, key) {
 		content: readFileSync(md, "utf-8")
 	};
 }
-/** 活动会话标记文件（sessionBlock 系统提示词注入读取） */
-const ACTIVE_SESSION_MARKER = join(".dsh", "active-session");
-/** 激活会话：写 .dsh/active-session 标记（内容 = 相对 CCC 根的 SESSION.md 路径） */
-function useSession(root, key) {
+/**
+* 活动会话标记：按 DSH 会话（agent.session.id）隔离，不再使用 CCC 级全局单文件。
+* 每个 dsh 会话一个标记文件（.dsh/active-sessions/<scope>），系统提示词 Session 块
+* 只注入当前 dsh 会话 use 的活跃会话 —— 多开 conversation / subagent / loop 牛马互不泄露。
+*
+* 旧版全局标记 `.dsh/active-session`（v1.16.1 及以前）：use 时删除（迁移清理），
+* 读取不再回退（隔离优先；升级后重新 use 一次即可）。
+*/
+const ACTIVE_SESSIONS_DIR = join(".dsh", "active-sessions");
+/** 旧版全局标记路径（v1.16.1 及以前 use 写入；新版本仅清理不再读取） */
+const LEGACY_ACTIVE_SESSION_MARKER = join(".dsh", "active-session");
+/** 默认 scope（agent.session.id 缺失时） */
+const DEFAULT_SESSION_SCOPE = "default";
+/** scope 用作文件名：仅保留安全字符（agent.session.id 可能含 / 等；`.` 排除以杜绝 `..` 路径段穿越） */
+function sanitizeScope(scope) {
+	return scope.replace(/[^A-Za-z0-9_-]/g, "_") || "default";
+}
+/** scope 标记文件绝对路径 */
+function activeSessionMarker(root, scope) {
+	return resolve(root, ACTIVE_SESSIONS_DIR, sanitizeScope(scope));
+}
+/** 激活会话：写 <scope> 标记（内容 = 相对 CCC 根的 SESSION.md 路径）；顺带清理旧全局标记 */
+function useSession(root, key, scope = DEFAULT_SESSION_SCOPE) {
 	const target = findSession(root, key);
 	if (!target) throw new Error(`未找到会话: ${key}`);
 	const md = join(sessionsRoot(root), target.dir, "SESSION.md");
 	if (!existsSync(md)) throw new Error(`会话 ${target.dir} 缺少 SESSION.md`);
-	const marker = resolve(root, ACTIVE_SESSION_MARKER);
-	mkdirSync(resolve(root, ".dsh"), { recursive: true });
+	const marker = activeSessionMarker(root, scope);
+	mkdirSync(resolve(root, ".dsh", "active-sessions"), { recursive: true });
 	const relMd = relative(root, md);
 	writeFileSync(marker, relMd, "utf-8");
+	const legacy = resolve(root, LEGACY_ACTIVE_SESSION_MARKER);
+	if (existsSync(legacy)) rmSync(legacy, { force: true });
 	return {
 		dir: target.dir,
 		mdPath: md
 	};
 }
-/** 关闭活动会话：删除 .dsh/active-session 标记 */
-function closeSession(root) {
-	const marker = resolve(root, ACTIVE_SESSION_MARKER);
+/** 关闭活动会话：删除 <scope> 标记 + 旧全局标记 */
+function closeSession(root, scope = DEFAULT_SESSION_SCOPE) {
+	const marker = activeSessionMarker(root, scope);
 	if (existsSync(marker)) rmSync(marker, { force: true });
+	const legacy = resolve(root, LEGACY_ACTIVE_SESSION_MARKER);
+	if (existsSync(legacy)) rmSync(legacy, { force: true });
 	return { dir: "active-session cleared" };
 }
+/** 读取指定 scope 的活跃会话 SESSION.md 绝对路径；无标记/越界返回 null */
+function readActiveSessionMd(root, scope = DEFAULT_SESSION_SCOPE) {
+	const marker = activeSessionMarker(root, scope);
+	if (!existsSync(marker)) return null;
+	const rel = readFileSync(marker, "utf-8").trim();
+	if (!rel) return null;
+	const abs = resolve(root, rel);
+	if (!abs.startsWith(resolve(root))) return null;
+	return abs;
+}
 function archiveSession(root, key) {
 	const target = findSession(root, key);
 	if (!target) throw new Error(`未找到会话: ${key}`);
@@ -872,6 +905,10 @@ function appendHeartbeat(sessionMd) {
 function agentCwd$5(exec) {
 	return exec.agent?.session?.header?.cwd ?? process.cwd();
 }
+/** 当前 dsh 会话 id（use/close 按会话隔离的 scope） */
+function agentScope$2(exec) {
+	return exec.agent?.session?.id ?? "default";
+}
 function renderText$7(value) {
 	return [{
 		type: "text",
@@ -880,7 +917,7 @@ function renderText$7(value) {
 }
 const sessionTool = defineTool({
 	name: "session",
-	description: "工作会话全周期管理（AGENT_SESSIONS/，home-session 约定）。list/show/create/use/close/health/qa/archive/summary。多步骤工作必须先 create 会话，use 激活当前会话（写 .dsh/active-session 标记 → 系统提示词 Session 块生效）。",
+	description: "工作会话全周期管理（AGENT_SESSIONS/，home-session 约定）。list/show/create/use/close/health/qa/archive/summary。多步骤工作必须先 create 会话，use 激活当前 dsh 会话的活跃会话（写 .dsh/active-sessions/<scope> 标记 → 系统提示词 Session 块生效，按 dsh 会话隔离不泄露）。",
 	parameters: {
 		action: {
 			type: "string",
@@ -934,8 +971,8 @@ const sessionTool = defineTool({
 				return showSession(root, args.key);
 			case "use":
 				if (!args.key) throw new Error("use 需要 key");
-				return useSession(root, args.key);
-			case "close": return closeSession(root);
+				return useSession(root, args.key, agentScope$2(exec));
+			case "close": return closeSession(root, agentScope$2(exec));
 			case "archive":
 				if (!args.key) throw new Error("archive 需要 key");
 				return archiveSession(root, args.key);
@@ -1461,6 +1498,24 @@ const cceTool = defineTool({
 	}
 });
 //#endregion
+//#region src/loop-preset-inherit.ts
+/**
+* 解析 loop agent 从父 agent 继承的 preset，并组装创建 setup 钩子。
+* @param parentCtx - 发起 loop 的 agent 的 scope ctx；无（headless/非 agent 上下文）时为 undefined。
+* @returns 继承结果：meta 用的 agentPreset 与创建 setup 钩子。
+*/
+function loopPresetInheritance(parentCtx) {
+	if (parentCtx === void 0) return {};
+	const agentPreset = parentCtx.get("agentPresets")?.composedPreset(parentCtx);
+	if (agentPreset === void 0) return {};
+	return {
+		agentPreset,
+		setup: (childCtx) => {
+			childCtx.get("agentPresets")?.composeFrom(childCtx, parentCtx);
+		}
+	};
+}
+//#endregion
 //#region src/loop-ops.ts
 /**
 * loop-ops.ts — acc_loop 纯逻辑层（零 DSH 依赖，可独立单测）
@@ -1550,9 +1605,13 @@ ${resumeNote}
 *   model（选）provider/model（如 minimax-cn-coding-plan/MiniMax-M3）；缺省读 loop.defaultModel
 *   maxRounds（默认 100）轮次上限；每轮等待 agent **无超时**（loop 可永续，agent 工作多久等多久）
 *
-* 机制：ctx.agentLoop.create({provider, model}) 创建专用 agent（进程内），
+* 机制：ctx.agents.create()（带 setup 钩子）创建专用 agent（进程内），
 * 每轮 followup → agent/status idle → 读 session.events 响应 → 写进度 → stop token 检查 → 续跑。
 * 工厂模式：apply 时闭包捕获插件 ctx（工具 execute 无 ctx 参数）。
+*
+* preset 继承：setup 钩子里对子 agent 执行 agentPresets.composeFrom（对齐 subagent 先例），
+* 使 loop agent 继承发起方会话的 agent preset 工具（read/write/edit 等 preset 层工具）。
+* agentPresets 是可选服务——无 preset 装配的环境（无 roster 部署）退化为空工具层（历史行为）。
 */
 function agentCwd$1(exec) {
 	return (exec.agent?.session)?.header?.cwd ?? process.cwd();
@@ -1592,6 +1651,7 @@ function lastAssistantText(agent) {
 	return "";
 }
 /** 创建 loop 工具（闭包捕获插件 ctx → 可访问 ctx.agentLoop） */
+/** 创建 loop 工具（闭包捕获插件 ctx → 可访问 ctx.agentLoop） */
 function createLoopTool(ctx) {
 	return defineTool({
 		name: "loop",
@@ -1636,10 +1696,23 @@ function createLoopTool(ctx) {
 			const stopToken = newStopToken();
 			let progress = readProgress(root, label);
 			const startRound = progress ? Math.min(progress.round + 1, maxRounds) : 1;
-			const loopAgent = ctx.agentLoop.create(`loop-${label}`, {
-				provider,
-				model: modelName
-			}, { cwd: root });
+			const parentCtx = exec.agent?.ctx;
+			const inherited = loopPresetInheritance(parentCtx);
+			if (!ctx.agents) throw new Error("loop: ctx.agents 不可用");
+			const sessionId = `loop-${label}`;
+			const handle = await ctx.agents.create({
+				sessionId,
+				meta: {
+					cwd: root,
+					...inherited.agentPreset === void 0 ? {} : { agentPreset: inherited.agentPreset }
+				},
+				agentOptions: {
+					provider,
+					model: modelName
+				},
+				...inherited.setup === void 0 ? {} : { setup: inherited.setup }
+			});
+			const loopAgent = handle.agent;
 			let done = false;
 			let lastResponse = progress?.lastResponse ?? "";
 			let finalRound = startRound - 1;
@@ -1690,7 +1763,9 @@ function createLoopTool(ctx) {
 					updated: (/* @__PURE__ */ new Date()).toISOString(),
 					lastResponse
 				});
-			} finally {}
+			} finally {
+				await handle.dispose().catch(() => {});
+			}
 			const { json } = loopProgressPaths(root, label);
 			return {
 				done,
@@ -1862,29 +1937,17 @@ function registerGuards(ctx, opts = {}) {
 }
 //#endregion
 //#region src/seams/loop.ts
-/**
-* loop.ts — 拦截缝：回合生命周期（agent/turn-stopping 机械落盘）
-*
-* 每个自然停止边界：若 agent 工作目录在 CCC 内且存在 `.dsh/active-session`
-* 标记（内容为相对 CCC 根的 SESSION.md 路径），自动追加心跳行——
-* 会话进度不再依赖模型自觉。
-*/
-/** 解析活动会话 SESSION.md 绝对路径；无标记/越界返回 null */
-function resolveActiveSession(root) {
-	const marker = resolve(root, ".dsh", "active-session");
-	if (!existsSync(marker)) return null;
-	const rel = readFileSync(marker, "utf-8").trim();
-	if (!rel) return null;
-	const abs = resolve(root, rel);
-	if (!abs.startsWith(resolve(root))) return null;
-	return abs;
+/** 解析当前 dsh 会话 scope 的活跃会话 SESSION.md 绝对路径；无标记/越界返回 null */
+function resolveActiveSession(root, scope = DEFAULT_SESSION_SCOPE) {
+	return readActiveSessionMd(root, scope);
 }
-/** 注册 agent/turn-stopping：CCC 内活动会话自动心跳落盘 */
+/** 注册 agent/turn-stopping：CCC 内活动会话自动心跳落盘（按 dsh 会话隔离） */
 function registerTurnFlush(ctx) {
 	ctx.on("agent/turn-stopping", async (payload) => {
-		const root = findSerenityRoot(payload.agent.session?.header?.cwd ?? process.cwd());
+		const agent = payload.agent;
+		const root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
 		if (!root) return;
-		const sessionMd = resolveActiveSession(root);
+		const sessionMd = resolveActiveSession(root, agent.session?.id ?? "default");
 		if (sessionMd) appendHeartbeat(sessionMd);
 	});
 }
@@ -2176,15 +2239,11 @@ function entrySkillSectionText(root) {
 	if (skills.length === 0) return "";
 	return skills.map((s) => sanitizeSkillContent(s.content)).filter((c) => c.length > 0).join("\n\n");
 }
-/** 活跃会话解析：.dsh/active-session 标记（内容 = 相对 CCC 根的 SESSION.md 路径） */
-function resolveActiveSessionInfo(root) {
+/** 活跃会话解析：按 dsh 会话 scope 读标记（隔离；不回退旧全局标记） */
+function resolveActiveSessionInfo(root, scope) {
 	try {
-		const marker = resolve(root, ".dsh", "active-session");
-		if (!existsSync(marker)) return null;
-		const rel = readFileSync(marker, "utf-8").trim();
-		if (!rel) return null;
-		const abs = resolve(root, rel);
-		if (!abs.startsWith(resolve(root))) return null;
+		const abs = readActiveSessionMd(root, scope);
+		if (!abs) return null;
 		const dirName = basename(dirname(abs));
 		const idMatch = dirName.match(/S(\d{3,})/);
 		return {
@@ -2196,9 +2255,9 @@ function resolveActiveSessionInfo(root) {
 		return null;
 	}
 }
-/** 5) Session 块：逐字对齐 osp（活跃会话 + todowrite 首位约定） */
-function sessionBlock(root) {
-	const active = resolveActiveSessionInfo(root);
+/** 5) Session 块：逐字对齐 osp（活跃会话 + todowrite 首位约定）；scope = dsh 会话维度 */
+function sessionBlock(root, scope = DEFAULT_SESSION_SCOPE) {
+	const active = resolveActiveSessionInfo(root, scope);
 	if (!active) return "";
 	return [
 		"",
@@ -2225,7 +2284,7 @@ function sessionBlock(root) {
 	].join("\n");
 }
 /** 完整系统提示词注入文本：ACC + CCE + Constraints + SKILL 全文 + Session（osp 顺序） */
-function serenitySystemPrompt(root) {
+function serenitySystemPrompt(root, scope = DEFAULT_SESSION_SCOPE) {
 	const parts = [
 		accBlock(root),
 		cceBlock(),
@@ -2233,7 +2292,7 @@ function serenitySystemPrompt(root) {
 	];
 	const skill = entrySkillSectionText(root);
 	if (skill) parts.push(skill);
-	const session = sessionBlock(root);
+	const session = sessionBlock(root, scope);
 	if (session) parts.push(session);
 	return parts.join("\n\n");
 }
@@ -2241,6 +2300,10 @@ function serenitySystemPrompt(root) {
 function agentCwd(context) {
 	return (context.agent?.session)?.header?.cwd;
 }
+/** 从 assembly context 解析 dsh 会话 id（Session 块按会话隔离的 scope） */
+function agentScope$1(context) {
+	return (context.agent?.session)?.id ?? "default";
+}
 /**
 * 全局注册系统提示词 section（osp system.transform 的 DSH 等价）。
 * text 回调按 context.agent 的 cwd 上溯 .serenity → 返回该 CCC 的完整注入文本；
@@ -2256,7 +2319,7 @@ function registerEntrySkillSectionGlobal(ctx) {
 				if (!cwd) return "";
 				const root = findSerenityRoot(cwd);
 				if (!root) return "";
-				return serenitySystemPrompt(root);
+				return serenitySystemPrompt(root, agentScope$1(context));
 			}
 		});
 		console.log("[serenity-hooks] ✓ 全局入口 skill section 已注册（systemPrompt 就绪）");
@@ -2293,11 +2356,12 @@ const PLUGIN_SOURCE = {
 /**
 * ACC 注入消息：完整内容 = 简短身份头 + 完整系统提示词（ACC 5 块 + CCC 顶层 skill 原文）。
 * 用户要求：在此处注入完整 ACC 系统提示词内容 + CCC 顶层 skill 原文（对齐 osp system.transform）。
+* scope = dsh 会话 id：Session 块按会话隔离，不跨会话泄露。
 */
-function accMessage(root, configPaths, entrySkillMaxChars) {
+function accMessage(root, configPaths, entrySkillMaxChars, scope = DEFAULT_SESSION_SCOPE) {
 	const content = [{
 		type: "text",
-		text: `${accIdentityText(root, configPaths, entrySkillMaxChars)}\n\n${serenitySystemPrompt(root)}`
+		text: `${accIdentityText(root, configPaths, entrySkillMaxChars)}\n\n${serenitySystemPrompt(root, scope)}`
 	}];
 	return createUserMessage({
 		content,
@@ -2309,6 +2373,9 @@ const injected = /* @__PURE__ */ new Set();
 function agentKey(agent) {
 	return agent.session.id ?? "global";
 }
+function agentScope(agent) {
+	return agent.session.id ?? "default";
+}
 function registerContext(ctx, opts = {}) {
 	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
 	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
@@ -2318,7 +2385,7 @@ function registerContext(ctx, opts = {}) {
 		const key = agentKey(agent);
 		if (injected.has(key)) return;
 		injected.add(key);
-		agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
+		agent.inject(accMessage(root, configPaths, entrySkillMaxChars, agentScope(agent)));
 		syncSafeModeRestriction(agent, root);
 	};
 	if (opts.seedOnStart ?? true) ctx.on("agent/session-start", (payload) => {
@@ -2339,7 +2406,7 @@ function registerContext(ctx, opts = {}) {
 		return {
 			kind: "enter",
 			messages: [
-				accMessage(root, configPaths, entrySkillMaxChars),
+				accMessage(root, configPaths, entrySkillMaxChars, agentScope(agent)),
 				...messages,
 				...downstream.messages
 			]
@@ -2362,8 +2429,9 @@ 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));
+			agent.inject(accMessage(root, configPaths, entrySkillMaxChars, scope));
 		} catch {}
 	});
 }

package/lib/invariant.js

@@ -1,5 +1,4 @@
 import { existsSync, readFileSync } from "node:fs";
-import "node:path";
 //#region src/invariant.ts
 /**
 * invariant.ts — 包级不变量伴生（dsh-my-rsi creating-a-plugin 规范）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "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": {
@@ -50,6 +50,7 @@
   "peerDependencies": {
     "@deepseek-ai/dsh-agent": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-agent-loop": "^0.1.0-rc.5",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-compaction": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-llm": "^0.1.0-rc.5",
@@ -59,7 +60,7 @@
     "@deepseek-ai/dsh-skill": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-tools": "^0.1.0-rc.5",
-    "@deepseek-ai/schemastery": "^0.1.0-rc.5",
+    "@deepseek-ai/schemastery": "^3.18.1",
     "cordis": "^4.0.0-rc.7"
   },
   "peerDependenciesMeta": {
@@ -75,6 +76,9 @@
     "@deepseek-ai/dsh-agent-loop": {
       "optional": true
     },
+    "@deepseek-ai/dsh-agent-presets": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-compaction": {
       "optional": true
     }