@shgroup/dsh-serenity-hooks 1.25.1 → 1.25.3

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.25.1",
+  "version": "1.25.3",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：真实 DSH 工具 cc_fs/session/acc_msm/eap/neat/cce/handyman/session_rebuild/skiff_admin + 拦截缝机械约束（safe-mode/路径守卫）+ 高级设定面板（双端口网关/账号管理）+ Skiff 认知子集角色（实验性）。适配 DSH 公开版（0.1.0-rc，deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/index.js

@@ -756,6 +756,7 @@ function isWriteTool(toolName, action) {
 function decideGuard(input) {
 	const { root, toolName, safeModeOn, blacklist, pathArg, action } = input;
 	if (input.skiffSessionId !== void 0 && isSkiffSessionId(input.skiffSessionId)) {
+		if (toolName === "skill") return { kind: "allow" };
 		const roleName = input.skiffSessionId ? skiffRoleFor$1(input.skiffSessionId) : null;
 		if (!roleToolWhitelist(roleName ? readSkiffRoles(root).get(roleName) : void 0).has(toolName)) return {
 			deny: "tool not allowed in this skiff role",
@@ -2360,9 +2361,13 @@ function registerSkiffSession(sessionId, role, agent) {
 	skiffAgents.set(sessionId, agent);
 	registerSkiffSession$1(sessionId, role);
 }
+/** Skiff agent 挂载的 DSH preset（v1.25.3 修复：read/grep/glob 等平台工具由 preset 决定工具面；
+*  handyman 经 composeFrom 继承父、skiff 无父上下文——直接挂 DSH 默认 standard preset；
+*  guard 角色白名单再按角色过滤可见/可用面——白名单外工具仍 deny） */
+const SKIFF_PRESET = "standard";
 /**
 * 创建 Skiff agent：标准 DSH agent + cwd=CCC root + 角色模型 +
-* scoped 系统提示词（基础提示词 + CCC 定义段，全替换 ACC 默认注入）。
+* standard preset（平台工具面）+ scoped 系统提示词（基础提示词 + CCC 定义段，全替换 ACC 默认注入）。
 */
 async function createSkiffAgent(ctx, root, roleName, role, defaultModel) {
 	if (!ctx.agents) throw new Error("skiff: ctx.agents unavailable");
@@ -2370,7 +2375,15 @@ async function createSkiffAgent(ctx, root, roleName, role, defaultModel) {
 	const sessionId = `${SKIFF_SESSION_PREFIX}${roleName}-${randomUUID()}`;
 	const handle = await ctx.agents.create({
 		sessionId,
-		meta: { cwd: root },
+		meta: {
+			cwd: root,
+			agentPreset: SKIFF_PRESET
+		},
+		setup: async (agentCtx) => {
+			try {
+				await agentCtx.get("agentPresets")?.mount?.(agentCtx, SKIFF_PRESET);
+			} catch {}
+		},
 		...model ? { agentOptions: splitModel(model) } : {}
 	});
 	const agent = handle.agent;
@@ -6821,7 +6834,10 @@ dsp 只提供机制（双白名单强制 + 基础提示词 + 调试问答页）
 ── 运行 ──
   调试：设置面板「Serenity」页 Skiff 区块开启 → http://127.0.0.1:<debugPort> 问答页实测
   （v1.25.0 唯一客户端面；ACP stdio 协议 F4c 后续，与调试页共用同一会话核心）
-  启停 = 人工（设置面板开关，不随插件加载自动启动）；未开启零资源占用`;
+  启停 = 人工（设置面板开关，不随插件加载自动启动）；未开启零资源占用
+  生效机制：角色配置**实时读取**（改 .opencode/serenity.json → 刷新调试页即生效）；
+  改配置后用 skiff_admin apply 做显式校验 + 应用确认（绑定 CCC + 角色清单）
+  注意：skill 加载对 skiff **恒可用**（不设白名单——读知识面，无写能力）`;
 /** 校验当前 CCC 的 skiff 配置：roles schema 合法 / msms 均已注册 / model ∈ handyman.models / systemPrompt 非空 */
 function validateSkiffConfig(root) {
 	const roles = readSkiffRoles(root);
@@ -6870,18 +6886,45 @@ function listSkiffRoles(root) {
 		count: items.length
 	};
 }
+/**
+* 应用当前 skiff 配置（v1.25.3，S142 用户：改了 json 应该有个生效机制）。
+*
+* 语义：配置是**每次请求实时读取**的（v1.25.2）——apply 不是"推送"，而是**显式校验 + 应用确认**：
+* ① 校验配置合法（复用 validate：msms 注册 / model 白名单 / systemPrompt 非空）
+* ② 非法 → 报告问题清单，不应用（提示修复后重跑 apply）
+* ③ 合法 → 应用确认：绑定 CCC + 角色清单 + 说明（调试页刷新即生效）
+*/
+function applySkiffConfig(root) {
+	const validation = validateSkiffConfig(root);
+	const roles = readSkiffRoles(root);
+	if (!validation.ok) return {
+		applied: false,
+		cccRoot: root,
+		roleCount: roles.size,
+		issues: validation.issues,
+		hint: "fix the issues above, then run skiff_admin apply again"
+	};
+	return {
+		applied: true,
+		cccRoot: root,
+		roleCount: roles.size,
+		roles: [...roles.keys()],
+		note: "roles are read live from .opencode/serenity.json — the skiff debug page reflects changes on refresh; skill loading is always available to skiff sessions (not whitelisted)"
+	};
+}
 const skiffAdminTool = defineTool({
 	name: "skiff_admin",
-	description: "Skiff (F4, experimental): CCC cognitive-subset roles (subsets of the full serenity trajectory). guide: definition tutorial (concept/role schema/cognitive MSM writing/dual whitelist/trajectory subset/examples); validate: check the CCC skiff config (roles schema legal / msms registered / model in handyman.models / systemPrompt non-empty); list: role summary (name/model/msms/tools/trajectory). Roles are defined by the CCC in .opencode/serenity.json skiff.roles.",
+	description: "Skiff (F4, experimental): CCC cognitive-subset roles (subsets of the full serenity trajectory). guide: definition tutorial (concept/role schema/cognitive MSM writing/dual whitelist/trajectory subset/examples); validate: check the CCC skiff config (roles schema legal / msms registered / model in handyman.models / systemPrompt non-empty); apply: validate then confirm the config is live (bound CCC + role list; roles are read live on every request); list: role summary (name/model/msms/tools/trajectory). Roles are defined by the CCC in .opencode/serenity.json skiff.roles; skill loading is always available to skiff sessions (not whitelisted).",
 	parameters: { action: {
 		type: "string",
 		enum: [
 			"guide",
 			"validate",
+			"apply",
 			"list"
 		],
 		required: true,
-		description: "Subcommand: guide (definition tutorial) / validate (config check) / list (role summary)"
+		description: "Subcommand: guide (definition tutorial) / validate (config check) / apply (validate + confirm live) / list (role summary)"
 	} },
 	output: {
 		schema: { type: "json" },
@@ -6893,8 +6936,9 @@ const skiffAdminTool = defineTool({
 		switch (args.action) {
 			case "guide": return { guide: SKIFF_GUIDE };
 			case "validate": return validateSkiffConfig(root);
+			case "apply": return applySkiffConfig(root);
 			case "list": return listSkiffRoles(root);
-			default: throw new Error("skiff_admin requires action: guide | validate | list");
+			default: throw new Error("skiff_admin requires action: guide | validate | apply | list");
 		}
 	}
 });
@@ -9333,8 +9377,8 @@ function sendHtml(res, html) {
 	});
 	res.end(html);
 }
-/** 问答页 HTML：角色下拉 + 输入 + 答案区 + 轨迹区（JS 渲染）+ WebUI 链接 */
-function skiffDebugPage(roles, webPort) {
+/** 问答页 HTML：角色下拉 + 输入 + 答案区 + 轨迹区（JS 渲染）+ 绑定的 CCC + WebUI 链接 */
+function skiffDebugPage(roles, cccRoot, webPort) {
 	const roleOptions = [...roles.entries()].map(([name, r]) => `<option value="${escapeHtml(name)}">${escapeHtml(name)}${r.model ? ` (${escapeHtml(r.model)})` : ""}</option>`).join("\n");
 	const webUrl = `http://127.0.0.1:${webPort}`;
 	return `<!DOCTYPE html>
@@ -9350,6 +9394,8 @@ function skiffDebugPage(roles, webPort) {
   main { max-width: 720px; margin: 0 auto; }
   h1 { font-size: 18px; margin: 0 0 4px; }
   .sub { opacity: .65; font-size: 13px; margin-bottom: 16px; }
+  .ccc { display: inline-block; padding: 3px 10px; border-radius: 999px; background: rgba(11,168,117,.12); color: #0ba875; font-size: 12px; font-weight: 600; margin-bottom: 12px; word-break: break-all; }
+  @media (prefers-color-scheme: dark) { .ccc { color: #3ddc9a; } }
   label { font-size: 13px; font-weight: 600; display: block; margin: 12px 0 4px; }
   select, textarea { width: 100%; box-sizing: border-box; padding: 8px 10px; border-radius: 8px; border: 1px solid #d0d7de; background: #fff; color: inherit; font-size: 14px; }
   @media (prefers-color-scheme: dark) { select, textarea { background: #26282c; border-color: #3a3d42; } }
@@ -9371,7 +9417,8 @@ function skiffDebugPage(roles, webPort) {
 <body>
 <main>
   <h1>Skiff Debug</h1>
-  <div class="sub">宁静号 trajectory 子集角色问答页（v1.25.0 实验性）— 走 DSH agent-loop 会话核心，轨迹与 WebUI 同源</div>
+  <div class="sub">宁静号 trajectory 子集角色问答页（v1.25.2 实验性）— 走 DSH agent-loop 会话核心，轨迹与 WebUI 同源</div>
+  <div class="ccc">CCC: ${escapeHtml(cccRoot)}</div>
   <label for="role">角色</label>
   <select id="role">${roleOptions || "<option value=\"\">(未配置角色)</option>"}</select>
   <label for="q">问题</label>
@@ -9431,15 +9478,20 @@ function escapeHtml(s) {
 }
 /**
 * 启动调试问答服务（单实例；重复启动幂等返回既有实例）。
-* @param root 当前 CCC 根（角色配置读取 + skiff agent cwd）
+*
+* **CCC 绑定（v1.25.2 用户指出）**：服务绑定一个 CCC root（调用方 resolveSkiffRoot
+* 解析：live 会话中**含 skiff.roles 的 CCC 优先**）；角色配置**每次请求实时读取**
+* （不缓存快照）——改 .opencode/serenity.json 后刷新页面即生效，无需重启服务。
+* 页面顶部显示绑定的 CCC root，绑定可核对。
+*
+* @param root 绑定的 CCC 根（角色配置读取 + skiff agent cwd）
 * @param port 调试端口（仅 127.0.0.1）
 * @param webPort 主 WebUI 端口（WebUI 链接）
 */
 async function startSkiffDebugServer(ctx, root, port, webPort) {
 	if (active) return;
-	const roles = readSkiffRoles(root);
 	const server = createServer((req, res) => {
-		handle(ctx, root, roles, webPort, req, res);
+		handle(ctx, root, webPort, req, res);
 	});
 	await new Promise((resolve, reject) => {
 		server.once("error", reject);
@@ -9449,7 +9501,7 @@ async function startSkiffDebugServer(ctx, root, port, webPort) {
 		server,
 		port
 	};
-	console.log(`[serenity-hooks] ✓ Skiff 调试问答页: http://127.0.0.1:${port}（角色: ${roles.size}，WebUI: ${webPort}）`);
+	console.log(`[serenity-hooks] ✓ Skiff 调试问答页: http://127.0.0.1:${port}（CCC: ${root}，WebUI: ${webPort}）`);
 }
 function stopSkiffDebugServer() {
 	if (!active) return;
@@ -9458,11 +9510,11 @@ function stopSkiffDebugServer() {
 	} catch {}
 	active = null;
 }
-async function handle(ctx, root, roles, webPort, req, res) {
+async function handle(ctx, root, webPort, req, res) {
 	try {
 		const url = (req.url ?? "/").split("?")[0] ?? "/";
 		if (req.method === "GET" && url === "/") {
-			sendHtml(res, skiffDebugPage(roles, webPort));
+			sendHtml(res, skiffDebugPage(readSkiffRoles(root), root, webPort));
 			return;
 		}
 		if (req.method === "POST" && url === "/ask") {
@@ -9477,7 +9529,7 @@ async function handle(ctx, root, roles, webPort, req, res) {
 			}
 			const roleName = typeof body.role === "string" ? body.role : "";
 			const question = typeof body.question === "string" ? body.question : "";
-			const role = roles.get(roleName);
+			const role = readSkiffRoles(root).get(roleName);
 			if (!roleName || !role) {
 				sendJson(res, 400, { error: `unknown role: ${roleName}` });
 				return;
@@ -9606,21 +9658,28 @@ function registerSkiff(ctx) {
 	} catch {}
 	sync();
 }
-/** 解析当前 CCC 根：进程 cwd 上溯 .serenity 优先，live 会话 cwd 兜底 */
+/**
+* 解析 Skiff 调试服务绑定的 CCC 根（v1.25.2 用户指出：skiff 必须绑定 CCC）：
+* ① live 会话中**配置了 skiff.roles 的 CCC 优先**（用户认知中的绑定目标）
+* ② 回退进程 cwd 上溯 .serenity
+* ③ 再回退任一 live 会话的 CCC
+*/
 function resolveSkiffRoot(ctx) {
-	const fromCwd = findSerenityRoot(process.cwd());
-	if (fromCwd) return fromCwd;
+	const liveRoots = [];
 	try {
 		const sessions = ctx.sessions;
 		for (const s of sessions?.list?.() ?? []) {
 			const cwd = s?.header?.cwd;
 			if (typeof cwd === "string") {
 				const r = findSerenityRoot(cwd);
-				if (r) return r;
+				if (r && !liveRoots.includes(r)) liveRoots.push(r);
 			}
 		}
 	} catch {}
-	return null;
+	for (const r of liveRoots) if (readSkiffRoles(r).size > 0) return r;
+	const fromCwd = findSerenityRoot(process.cwd());
+	if (fromCwd) return fromCwd;
+	return liveRoots[0] ?? null;
 }
 /** 主 WebUI 端口（WebUI 链接；webServer 未装配回退 3080） */
 function readWebPort(ctx) {

package/package.json

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