@shgroup/dsh-serenity-hooks 1.30.1 → 1.30.4

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.30.1",
+  "version": "1.30.4",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：真实 DSH 工具 container_fs/logbook/dashboard/container_git/msm/praxis/handyman/localstore/container_admin/autopilot-trajectory + 拦截缝机械约束（safe-mode/路径守卫）+ 高级设定面板（双端口网关/账号管理）+ Skiff 认知子集角色（实验性）。适配 DSH 公开版（0.1.0-rc，deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/index.js

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as findSerenityRoot, c as matchBlacklist, d as readCccName$2, f as readHandymanConfig, i as findGitRoot, l as pathInside, m as resolveInside, n as SAFE_MODE_MARKER, o as isSafeModeOn, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-CX48YNUL.js";
 import { a as resolveRoleSystemPrompt, i as readSkiffRoles, l as systemPromptSource, r as isSkiffSessionId, s as roleToolWhitelist } from "./skiff-role-LW4tjF9L.js";
-import { C as splitModel, E as skiffRoleFor, S as requireWhitelistedModel, T as writeProgress, _ as buildRoundPrompt, a as startSkiffDebugServer, b as newStopToken, c as askSkiff, d as skiffMsmGate, f as skiffSessionInfo, g as HANDYMAN_GUIDE, h as unregisterSkiffSession, l as createSkiffAgent, m as skiffTrajectoryEnabled, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffSessionSnapshot, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as getSkiffAgent, v as handymanProgressPaths, w as writeFailedStatus, x as readProgress, y as listActiveHandymen } from "./skiff-debug-BA8CDeJl.js";
+import { C as readProgress, D as writeProgress, E as writeFailedStatus, O as skiffRoleFor, S as newStopToken, T as splitModel, _ as workspaceTrajectoryLine, a as startSkiffDebugServer, b as handymanProgressPaths, c as askSkiff, d as getSkiffAgent, f as skiffMsmGate, g as unregisterSkiffSession, h as skiffTrajectoryEnabled, l as createSkiffAgent, m as skiffSessionSnapshot, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffSessionInfo, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as ensureSkiffSession, v as HANDYMAN_GUIDE, w as requireWhitelistedModel, x as listActiveHandymen, y as buildRoundPrompt } from "./skiff-debug-gYigSgl_.js";
 import { a as readWeixinCredential, c as weixinInboundDir, d as LOCALSTORE_SCOPES, f as checkLocalstoreGitCompliance, h as runLocalStore, i as matchWeixinRoute, l as weixinSessionIdFor, m as readGitTrack, n as extractWeixinText, o as readWeixinSettings, p as localstorePath, r as hasVoiceItem, s as sanitizeFileName$1, t as extractWeixinMedia } from "./weixin-route-jA0qENOf.js";
 import { C as useSession, S as summarize, _ as resolveSessionByTitle, a as archiveSessions, b as setActiveSessionInfo, c as extractSessionMdPathFromText, d as getActiveSessionInfo, f as healthCheck, g as readActiveSessionMd, h as qaCheck, i as SESSION_ACTIONS, l as findLatestActiveSessionMd, m as parseSessionContextFromEvents, n as readLastBound, o as closeSession, p as listSessions, r as DEFAULT_SESSION_SCOPE, s as createSession, t as appendBound, u as findSession, v as sessionEvents, x as showSession, y as sessionsRoot } from "./session-bound-p9oR9dj9.js";
 import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-BfVxgCZy.js";
@@ -603,6 +603,10 @@ function decideGuard(input) {
 		if (toolName === "skill") return { kind: "allow" };
 		const roleName = input.skiffSessionId ? skiffRoleFor(input.skiffSessionId) : null;
 		const role = roleName ? readSkiffRoles(root).get(roleName) : void 0;
+		if ((role?.msms ?? []).includes(toolName)) return {
+			deny: `"${toolName}" is a registered MSM, not a direct tool in this role — call it through the msm tool: msm("${toolName}", ["<args>"]) (pass "--help" or inspect=true for usage)`,
+			kind: "deny"
+		};
 		if (!roleToolWhitelist(role).has(toolName)) return {
 			deny: "tool not allowed in this skiff role",
 			kind: "deny"
@@ -6067,7 +6071,7 @@ function registerStatusApi(ctx, opts = {}) {
 					workspace: url.searchParams.get("workspace") ?? void 0
 				});
 				const root = findSerenityRoot(workspace) ?? "";
-				const { discoverCccs } = await import("./skiff-debug-BA8CDeJl.js").then((n) => n.i);
+				const { discoverCccs } = await import("./skiff-debug-gYigSgl_.js").then((n) => n.i);
 				sendJson$1(res, 200, { cccs: await discoverCccs(ctx, root) });
 			} catch (err) {
 				sendJson$1(res, 400, { error: err.message ?? String(err) });
@@ -9032,6 +9036,11 @@ async function handleIncoming(ctx, root, accountId, cred, msg) {
 		const sessionId = weixinSessionIdFor(fromUserId);
 		const existing = getSkiffAgent(sessionId);
 		const hc = readHandymanConfig(root);
+		if (existing) try {
+			ensureSkiffSession(root, existing, roleName, role);
+		} catch (err) {
+			console.warn(`[serenity-hooks] weixin-bridge ensure 失败（不影响处理）: ${String(err?.message ?? err)}`);
+		}
 		const ref = existing ? {
 			agent: existing,
 			sessionId,
@@ -9093,6 +9102,8 @@ async function handleIncoming(ctx, root, accountId, cred, msg) {
 				}
 			}
 			const parts = [];
+			const activeWorkspace = getActiveSessionInfo(sessionId);
+			if (activeWorkspace?.mdPath) parts.push(workspaceTrajectoryLine(activeWorkspace.mdPath));
 			if (text) parts.push(text);
 			parts.push(...mediaNotes, ...degradedNotes);
 			const question = parts.join("\n");

package/lib/skiff-core.d.ts

@@ -27,6 +27,32 @@ export declare function skiffSessionSnapshot(): ReadonlyMap<string, {
     role: string;
     ccc: string;
 }>;
+/**
+ * 系统提示词中的**工作台纪律块**（v1.30.4 升级：从单行路径 → 完整 ACC 层约束）。
+ * 用户点破（S142）：只给路径 LLM 不会主动用——需注入「已绑定 + 使用纪律 + 动作指引」。
+ * SESSION = 工作台——skiff 与主舱同一套机制（零特调，用户拍板）：
+ * 自动绑定已生效（无需 logbook use）、SESSION.md 是持久记忆载体（write/edit 维护）、
+ * rebuild 自动从本 SESSION 续接。注入 agent 系统提示词（用户对话面不可见）。
+ */
+export declare function workspaceTrajectoryLine(mdPath: string): string;
+/**
+ * 确保启用 session 能力的 skiff 会话拥有**专属 SESSION**（工作台）：
+ * 懒绑定 + 幂等（per skiff 会话 scope 隔离——微信多用户各自独立，永不共享同一份）。
+ *
+ * 判定链：
+ * ① 角色未启用 session 能力（trajectory.session !== true）→ null（现状零变化）
+ * ② 会话日志已有**本机制自动创建**的 bound（note 前缀 auto-created）→ 恢复（重启/续接记得）
+ * ③ 无 → 自动创建专属 SESSION（createSession desc=`<role> skiff`——编号自动递增，用户不关心是谁）
+ *
+ * @returns 绑定后的 SESSION.md 绝对路径（供提示词注入）；不适用/失败 → null
+ */
+export declare function ensureSkiffSession(root: string, agent: Agent, roleName: string, role: SkiffRoleConfig): string | null;
+/** 当前 scope 是否已激活（幂等判定：getActiveSessionInfo 命中同 dirName）——测试用 */
+export declare function skiffSessionActiveFor(sessionId: string): {
+    sessionId: string;
+    dirName: string;
+    mdPath: string;
+} | null;
 export interface SkiffAgentRef {
     handle: AgentHandle;
     agent: Agent;

package/lib/{skiff-debug-BA8CDeJl.js → skiff-debug-gYigSgl_.js}

@@ -1,6 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as findSerenityRoot, f as readHandymanConfig } from "./ccc-CX48YNUL.js";
 import { a as resolveRoleSystemPrompt, i as readSkiffRoles, n as buildSkiffBasePrompt, o as roleMsmWhitelist, r as isSkiffSessionId, u as trajectorySubset } from "./skiff-role-LW4tjF9L.js";
+import { b as setActiveSessionInfo, n as readLastBound, s as createSession, t as appendBound } from "./session-bound-p9oR9dj9.js";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
@@ -244,6 +245,77 @@ function skiffSessionSnapshot() {
 	});
 	return out;
 }
+/** 自动创建的 bound 标记（readLastBound 恢复判定——只恢复本机制建的；手工 use 的旧 bound 不认） */
+const AUTO_BOUND_NOTE_PREFIX = "auto-created for skiff role";
+/**
+* 系统提示词中的**工作台纪律块**（v1.30.4 升级：从单行路径 → 完整 ACC 层约束）。
+* 用户点破（S142）：只给路径 LLM 不会主动用——需注入「已绑定 + 使用纪律 + 动作指引」。
+* SESSION = 工作台——skiff 与主舱同一套机制（零特调，用户拍板）：
+* 自动绑定已生效（无需 logbook use）、SESSION.md 是持久记忆载体（write/edit 维护）、
+* rebuild 自动从本 SESSION 续接。注入 agent 系统提示词（用户对话面不可见）。
+*/
+function workspaceTrajectoryLine(mdPath) {
+	return [
+		"── Serenity Session Workspace ──",
+		"This role session is AUTO-BOUND to a trajectory workspace SESSION (no logbook use needed):",
+		`  SESSION.md: ${mdPath}`,
+		"",
+		"Rules of the workspace:",
+		"  1. This SESSION.md is your persistent memory carrier (like the main cabin SESSION) — ",
+		"     read it first when context feels thin or work spans turns.",
+		"  2. Record key decisions/progress/unresolved items INTO this SESSION.md with write/edit",
+		"     (sections: 目标 / 状态 / 关键决策 / 进度记录 / 未解决的问题). Keep it current — it is",
+		"     what a rebuild resumes from.",
+		"  3. When context pressure is high, run logbook rebuild — it auto-resumes from THIS SESSION.md",
+		"     (no manual use; do not switch to or read other SESSIONs unless the user explicitly asks).",
+		"  4. Never expose this internal path in user-facing replies (chat stays clean).",
+		"── ──"
+	].join("\n");
+}
+/**
+* 确保启用 session 能力的 skiff 会话拥有**专属 SESSION**（工作台）：
+* 懒绑定 + 幂等（per skiff 会话 scope 隔离——微信多用户各自独立，永不共享同一份）。
+*
+* 判定链：
+* ① 角色未启用 session 能力（trajectory.session !== true）→ null（现状零变化）
+* ② 会话日志已有**本机制自动创建**的 bound（note 前缀 auto-created）→ 恢复（重启/续接记得）
+* ③ 无 → 自动创建专属 SESSION（createSession desc=`<role> skiff`——编号自动递增，用户不关心是谁）
+*
+* @returns 绑定后的 SESSION.md 绝对路径（供提示词注入）；不适用/失败 → null
+*/
+function ensureSkiffSession(root, agent, roleName, role) {
+	if (!trajectorySubset(role).session) return null;
+	const session = agent.session;
+	const scope = String(agent.session.id ?? agent.id);
+	const lastBound = session ? readLastBound(session) : null;
+	if (lastBound && lastBound.note?.startsWith(AUTO_BOUND_NOTE_PREFIX) && existsSync(lastBound.mdPath)) {
+		setActiveSessionInfo(scope, {
+			sessionId: lastBound.sessionId ?? "",
+			dirName: lastBound.dirName,
+			mdPath: lastBound.mdPath
+		});
+		return lastBound.mdPath;
+	}
+	const desc = `${roleName} skiff`;
+	const created = createSession({
+		root,
+		desc,
+		dryRun: false
+	});
+	const mdPath = join(created.sessionPath, "SESSION.md");
+	setActiveSessionInfo(scope, {
+		sessionId: created.sessionId,
+		dirName: created.dirName,
+		mdPath
+	});
+	appendBound(session, "create", {
+		dirName: created.dirName,
+		mdPath,
+		sessionId: created.sessionId,
+		note: `${AUTO_BOUND_NOTE_PREFIX} ${roleName}`
+	});
+	return mdPath;
+}
 /** Skiff agent 挂载的 DSH preset（v1.25.3 修复：read/grep/glob 等平台工具由 preset 决定工具面；
 *  handyman 经 composeFrom 继承父、skiff 无父上下文——直接挂 DSH 默认 standard preset；
 *  guard 角色白名单再按角色过滤可见/可用面——白名单外工具仍 deny） */
@@ -278,11 +350,21 @@ async function createSkiffAgent(ctx, root, roleName, role, defaultModel, session
 	} catch (err) {
 		console.warn(`[serenity-hooks] skiff 角色 "${roleName}" 系统提示词解析失败（回退仅基础段）: ${String(err?.message ?? err)}`);
 	}
+	let workspaceMdPath = null;
+	try {
+		workspaceMdPath = ensureSkiffSession(root, agent, roleName, role);
+	} catch (err) {
+		console.warn(`[serenity-hooks] skiff 角色 "${roleName}" 专属 SESSION 处理失败（不影响 agent 创建）: ${String(err?.message ?? err)}`);
+	}
 	try {
 		agent.ctx.systemPrompt.section({
 			name: "serenity-skiff",
 			order: -60,
-			text: () => [buildSkiffBasePrompt(roleName, role), cccPrompt].filter(Boolean).join("\n")
+			text: () => [
+				buildSkiffBasePrompt(roleName, role),
+				workspaceMdPath ? workspaceTrajectoryLine(workspaceMdPath) : "",
+				cccPrompt
+			].filter(Boolean).join("\n")
 		});
 	} catch (err) {
 		console.warn(`[serenity-hooks] skiff 系统提示词注册失败: ${String(err?.message ?? err)}`);
@@ -2666,4 +2748,4 @@ async function handle(ctx, defaultRoot, webPort, req, res) {
 	}
 }
 //#endregion
-export { splitModel as C, skiffRoleFor$1 as E, requireWhitelistedModel as S, writeProgress as T, buildRoundPrompt as _, startSkiffDebugServer as a, newStopToken as b, askSkiff as c, skiffMsmGate as d, skiffSessionInfo as f, HANDYMAN_GUIDE as g, unregisterSkiffSession as h, skiff_debug_exports as i, createSkiffAgent as l, skiffTrajectoryEnabled as m, jscSafeJsonText as n, stopSkiffDebugServer as o, skiffSessionSnapshot as p, renderSkiffMarkdown as r, stripThink as s, discoverCccs as t, getSkiffAgent as u, handymanProgressPaths as v, writeFailedStatus as w, readProgress as x, listActiveHandymen as y };
+export { readProgress as C, writeProgress as D, writeFailedStatus as E, skiffRoleFor$1 as O, newStopToken as S, splitModel as T, workspaceTrajectoryLine as _, startSkiffDebugServer as a, handymanProgressPaths as b, askSkiff as c, getSkiffAgent as d, skiffMsmGate as f, unregisterSkiffSession as g, skiffTrajectoryEnabled as h, skiff_debug_exports as i, createSkiffAgent as l, skiffSessionSnapshot as m, jscSafeJsonText as n, stopSkiffDebugServer as o, skiffSessionInfo as p, renderSkiffMarkdown as r, stripThink as s, discoverCccs as t, ensureSkiffSession as u, HANDYMAN_GUIDE as v, requireWhitelistedModel as w, listActiveHandymen as x, buildRoundPrompt as y };

package/package.json

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