@shgroup/dsh-serenity-hooks 1.25.9 → 1.25.10

package/dsh.plugin.json

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

@@ -647,7 +647,8 @@ function readSkiffRoles(root, paths = DEFAULT_SERENITY_CONFIG_PATHS) {
 					keeper: role.trajectory.keeper === true,
 					rebuild: role.trajectory.rebuild === true
 				} : void 0,
-				systemPrompt: typeof role.systemPrompt === "string" ? role.systemPrompt : void 0
+				systemPrompt: typeof role.systemPrompt === "string" ? role.systemPrompt : void 0,
+				systemPromptFile: typeof role.systemPromptFile === "string" ? role.systemPromptFile : void 0
 			});
 		}
 	} catch {}
@@ -672,6 +673,32 @@ function roleMsmWhitelist(role) {
 	return new Set(role?.msms ?? []);
 }
 /**
+* 解析角色的系统提示词全文（v1.25.10，S142 用户：超长提示词 JSON 内嵌不可读）：
+* ① `systemPromptFile` 存在 → 读取文件内容（**推荐配置方法**；相对 CCC 根，
+*    路径逃逸拒绝（resolveInside）+ BOM 剥除（readUtf8）+ 存在性校验）
+* ② 否则 → 内嵌 `systemPrompt`（兼容旧配置）
+* ③ 都无 → 空字符串
+* 文件缺失/逃逸 → 抛错（调用方 catch 降级 + validate 报 issue）。
+* 懒读取：readSkiffRoles 不读文件（guards/seams 每次工具调用查询的热路径零 IO），
+* 仅在本函数（创建 agent / validate / list 时）读取。
+*/
+function resolveRoleSystemPrompt(root, role) {
+	if (!role) return "";
+	const file = role.systemPromptFile?.trim();
+	if (file) {
+		const abs = resolveInside(root, file);
+		if (!existsSync(abs)) throw new Error(`skiff role "${role.systemPrompt ?? "(unnamed)"}": systemPromptFile "${file}" not found (resolved: ${abs})`);
+		return readUtf8(abs).trim();
+	}
+	return role.systemPrompt ?? "";
+}
+/** 角色系统提示词来源（validate/list 展示用） */
+function systemPromptSource(role) {
+	if (role?.systemPromptFile?.trim()) return "file";
+	if (role?.systemPrompt?.trim()) return "inline";
+	return "none";
+}
+/**
 * Skiff 基础提示词（dsp 只给这部分；CCC 的 systemPrompt 段由调用方拼接）：
 * 身份 + 可用 MSM/工具清单 + 调用协议 + 边界声明。动态生成（清单来自角色白名单）。
 */
@@ -694,22 +721,20 @@ function buildSkiffBasePrompt(roleName, role) {
 }
 //#endregion
 //#region src/skiff-registry.ts
-/**
-* skiff-registry.ts — Skiff 会话注册表（sessionId → role；零 DSH 依赖，可被任何 seams 安全 import）
-*
-* F4b 会话映射：Skiff agent 创建时注册（skiff-core），guards/seams 按 sessionId 查角色。
-* 独立成模块的原因：guards.ts 等拦截缝需要查角色而不引入 skiff-core 的运行时依赖
-* （skiff-core 依赖 @deepseek-ai/dsh-llm，测试/装配级联成本高）——注册表本身纯内存 Map。
-*
-* 生命周期：进程内存态；连接/页面关闭时 unregister；进程重启自然清空（skiff 会话不复存在）。
-*/
 const skiffSessions = /* @__PURE__ */ new Map();
-/** 查 sessionId 的 Skiff 角色名（无 → null） */
+/** 查 sessionId 的 Skiff 角色名（无 → null）——向后兼容（guards/seams 依赖） */
 function skiffRoleFor$1(sessionId) {
+	return skiffSessions.get(sessionId)?.role ?? null;
+}
+/** 查 sessionId 的完整绑定（role + ccc；无 → null）——v1.25.10 会话追问校验 */
+function skiffSessionInfo$1(sessionId) {
 	return skiffSessions.get(sessionId) ?? null;
 }
-function registerSkiffSession$1(sessionId, role) {
-	skiffSessions.set(sessionId, role);
+function registerSkiffSession$1(sessionId, role, ccc) {
+	skiffSessions.set(sessionId, {
+		role,
+		ccc
+	});
 }
 //#endregion
 //#region src/seams/guards.ts
@@ -2357,9 +2382,17 @@ const skiffAgents = /* @__PURE__ */ new Map();
 function skiffRoleFor(sessionId) {
 	return skiffRoleFor$1(sessionId);
 }
-function registerSkiffSession(sessionId, role, agent) {
+/** 查 sessionId 的会话绑定（role + ccc；无 → null）——v1.25.10 追问校验 */
+function skiffSessionInfo(sessionId) {
+	return skiffSessionInfo$1(sessionId);
+}
+/** 查 sessionId 的活体 agent（进程内会话延续用；未注册/已清理 → undefined） */
+function getSkiffAgent(sessionId) {
+	return skiffAgents.get(sessionId);
+}
+function registerSkiffSession(sessionId, role, ccc, agent) {
 	skiffAgents.set(sessionId, agent);
-	registerSkiffSession$1(sessionId, role);
+	registerSkiffSession$1(sessionId, role, ccc);
 }
 /** Skiff agent 挂载的 DSH preset（v1.25.3 修复：read/grep/glob 等平台工具由 preset 决定工具面；
 *  handyman 经 composeFrom 继承父、skiff 无父上下文——直接挂 DSH 默认 standard preset；
@@ -2387,16 +2420,22 @@ async function createSkiffAgent(ctx, root, roleName, role, defaultModel) {
 		...model ? { agentOptions: splitModel(model) } : {}
 	});
 	const agent = handle.agent;
+	let cccPrompt = "";
+	try {
+		cccPrompt = resolveRoleSystemPrompt(root, role);
+	} catch (err) {
+		console.warn(`[serenity-hooks] skiff 角色 "${roleName}" 系统提示词解析失败（回退仅基础段）: ${String(err?.message ?? err)}`);
+	}
 	try {
 		agent.ctx.systemPrompt.section({
 			name: "serenity-skiff",
 			order: -60,
-			text: () => [buildSkiffBasePrompt(roleName, role), role.systemPrompt ?? ""].filter(Boolean).join("\n")
+			text: () => [buildSkiffBasePrompt(roleName, role), cccPrompt].filter(Boolean).join("\n")
 		});
 	} catch (err) {
 		console.warn(`[serenity-hooks] skiff 系统提示词注册失败: ${String(err?.message ?? err)}`);
 	}
-	registerSkiffSession(sessionId, roleName, agent);
+	registerSkiffSession(sessionId, roleName, root, agent);
 	return {
 		handle,
 		agent,
@@ -2478,11 +2517,12 @@ function truncate(s, n) {
 	return s.length > n ? `${s.slice(0, n)}…` : s;
 }
 /**
-* 提问一轮：followup → 等 idle → 读答案 + 本 turn 轨迹（增量 = followup 前 events 之后）。
-* @param eventsStart 本轮开始前的 events 长度（0 = 全量轨迹）
+* 提问一轮：followup → 等 idle → 读答案 + 轨迹。
+* @param eventsStart 轨迹起点：显式传 0 = 全量轨迹（会话追问时页面重绘完整时间线，
+*   v1.25.10 用户拍板）；不传（undefined）= 本轮增量（followup 前 events 之后）
 */
-async function askSkiff(ctx, agent, question, eventsStart = 0) {
-	const before = eventsStart > 0 ? eventsStart : agent.session.events.length;
+async function askSkiff(ctx, agent, question, eventsStart) {
+	const before = eventsStart === void 0 ? agent.session.events.length : eventsStart;
 	agent.followup(createUserMessage({
 		content: [{
 			type: "text",
@@ -6806,7 +6846,9 @@ dsp 只提供机制（双白名单强制 + 基础提示词 + 调试问答页）
         "msms": ["msm-a", "msm-b"],            // MSM 白名单（独立）：acc_msm exec 只能跑这些；register/deregister 必拒；list 只显示这些
         "tools": ["read","grep","glob",...],   // 非 MSM 工具白名单（独立）：白名单外工具一律不可用（guard 强制）
         "trajectory": { "session": false, "keeper": false, "rebuild": false },  // 轨迹纪律子集（缺省全关 = 完全独立）
-        "systemPrompt": "..."                  // 角色人格/认知边界/风格（CCC 完整定义；dsp 只给基础提示词）
+        // 角色人格/认知边界/风格（CCC 完整定义；dsp 只给基础提示词）
+        "systemPromptFile": ".opencode/skiff/<role>.md"   // ★ 推荐：引用 md 文件（相对 CCC 根；超长提示词在 JSON 内嵌不可读）
+        // "systemPrompt": "..."                          // 兼容：内嵌字符串仍可用；两者都设时 systemPromptFile 优先
       }
   } } }
 
@@ -6837,6 +6879,8 @@ dsp 只提供机制（双白名单强制 + 基础提示词 + 调试问答页）
   启停 = 人工（设置面板开关，不随插件加载自动启动）；未开启零资源占用
   生效机制：角色配置**实时读取**（改 .opencode/serenity.json → 刷新调试页即生效）；
   改配置后用 skiff_admin apply 做显式校验 + 应用确认（绑定 CCC + 角色清单）
+  会话追问（v1.25.10）：调试页持有当前会话，追问自动续接（同会话上下文延续）；
+  「新对话」按钮开新会话；进程重启后旧会话不可续（WebUI 仍可见历史）
   注意：skill 加载对 skiff **恒可用**（不设白名单——读知识面，无写能力）`;
 /** 校验当前 CCC 的 skiff 配置：roles schema 合法 / msms 均已注册 / model ∈ handyman.models / systemPrompt 非空 */
 function validateSkiffConfig(root) {
@@ -6852,7 +6896,11 @@ function validateSkiffConfig(root) {
 	const hc = readHandymanConfig(root);
 	const allowedModels = hc ? new Set(hc.models) : null;
 	for (const [name, role] of roles) {
-		if (!role.systemPrompt?.trim()) issues.push(`role "${name}": systemPrompt is empty (CCC should fully define the role persona)`);
+		try {
+			if (!resolveRoleSystemPrompt(root, role).trim()) issues.push(`role "${name}": system prompt is empty (define systemPromptFile (recommended) or systemPrompt)`);
+		} catch (err) {
+			issues.push(`role "${name}": ${String(err?.message ?? err)}`);
+		}
 		for (const m of role.msms ?? []) if (!registered.has(m)) issues.push(`role "${name}": msms "${m}" is not registered in mech-registry.json`);
 		if (role.model && allowedModels && !allowedModels.has(role.model)) issues.push(`role "${name}": model "${role.model}" not in handyman.models (${[...allowedModels].join(", ") || "(none)"})`);
 	}
@@ -6879,7 +6927,8 @@ function listSkiffRoles(root) {
 			keeper: role.trajectory?.keeper === true,
 			rebuild: role.trajectory?.rebuild === true
 		},
-		hasSystemPrompt: Boolean(role.systemPrompt?.trim())
+		promptSource: systemPromptSource(role),
+		...role.systemPromptFile ? { systemPromptFile: role.systemPromptFile } : {}
 	}));
 	return {
 		roles: items,
@@ -6914,7 +6963,7 @@ function applySkiffConfig(root) {
 }
 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); 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).",
+	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 / system prompt resolvable — systemPromptFile (recommended) or 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/prompt source). 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: [
@@ -11084,6 +11133,13 @@ function skiffDebugPage(cccs, defaultRoot, webPort) {
   .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; } }
+  .sessionbar { display: flex; align-items: center; gap: 10px; margin-bottom: 4px; }
+  .session-badge { font-family: ui-monospace, SFMono-Regular, monospace; font-size: 12px; padding: 3px 10px; border-radius: 999px; background: rgba(127,127,127,.12); word-break: break-all; }
+  .session-badge.continued { background: rgba(11,168,117,.12); color: #0ba875; }
+  @media (prefers-color-scheme: dark) { .session-badge.continued { color: #3ddc9a; } }
+  button.ghost { background: transparent; color: #57606a; border: 1px solid #d0d7de; padding: 4px 12px; font-size: 12px; border-radius: 8px; cursor: pointer; margin-top: 0; }
+  @media (prefers-color-scheme: dark) { button.ghost { color: #8b949e; border-color: #3a3d42; } }
+  button.ghost:hover { background: rgba(127,127,127,.1); }
   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; } }
@@ -11120,14 +11176,18 @@ function skiffDebugPage(cccs, defaultRoot, webPort) {
 <body>
 <main>
   <h1>Skiff Debug</h1>
-  <div class="sub">宁静号 trajectory 子集角色问答页（v1.25.9 实验性）— 多 CCC 可切换，走 DSH agent-loop 会话核心，回答 marked 服务端渲染 + think 折叠</div>
+  <div class="sub">宁静号 trajectory 子集角色问答页（v1.25.10 实验性）— 多 CCC 可切换，同会话可追问（新对话按钮开新会话），回答 marked 服务端渲染 + think 折叠</div>
   <div class="ccc" id="cccBadge"></div>
+  <div class="sessionbar">
+    <span id="sessionBadge" class="session-badge muted">（新会话）</span>
+    <button id="newChat" type="button" class="ghost">新对话</button>
+  </div>
   <label for="ccc">认知容器</label>
   <select id="ccc"></select>
   <label for="role">角色</label>
   <select id="role"></select>
   <label for="q">问题</label>
-  <textarea id="q" placeholder="向该角色提问…"></textarea>
+  <textarea id="q" placeholder="向该角色提问…（追问直接继续输入）"></textarea>
   <button id="ask">提问</button>
   <div id="answer" class="muted">等待提问…</div>
   <div id="trajectory"></div>
@@ -11140,10 +11200,26 @@ const defaultRoot = document.getElementById('skiff-data').dataset.default
 const cccSel = document.getElementById('ccc')
 const roleSel = document.getElementById('role')
 const badge = document.getElementById('cccBadge')
+const sessionBadge = document.getElementById('sessionBadge')
+const newChatBtn = document.getElementById('newChat')
 const btn = document.getElementById('ask')
 const answer = document.getElementById('answer')
 const traj = document.getElementById('trajectory')
 const esc = (s) => String(s ?? '').replace(/[&<>"']/g, (c) => ({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c]))
+let sessionId = ''
+function shortId(id) { return id.length > 24 ? id.slice(0, 18) + '…' + id.slice(-6) : id }
+function renderSessionBadge() {
+  sessionBadge.textContent = sessionId ? '会话 ' + shortId(sessionId) + '（追问续接）' : '（新会话）'
+  sessionBadge.className = 'session-badge' + (sessionId ? ' continued' : '')
+}
+function newConversation() {
+  sessionId = ''
+  renderSessionBadge()
+  answer.className = 'muted'
+  answer.textContent = '已开启新对话'
+  traj.innerHTML = ''
+  document.getElementById('q').value = ''
+}
 function currentCcc() {
   return CCCS.find((c) => c.root === cccSel.value) || (CCCS[0] || { root: '', name: '', roles: [] })
 }
@@ -11162,8 +11238,11 @@ function fillRoles() {
     ? c.roles.map((r) => '<option value="' + esc(r) + '">' + esc(r) + '</option>').join('')
     : '<option value="">(未配置角色)</option>'
 }
-cccSel.addEventListener('change', fillRoles)
+cccSel.addEventListener('change', () => { fillRoles(); newConversation() })
+roleSel.addEventListener('change', () => newConversation())
+newChatBtn.addEventListener('click', newConversation)
 fillCccs()
+renderSessionBadge()
 btn.addEventListener('click', async () => {
   const c = currentCcc()
   const role = roleSel.value
@@ -11174,11 +11253,18 @@ btn.addEventListener('click', async () => {
   answer.textContent = '运行中…'
   traj.innerHTML = ''
   try {
-    const res = await fetch('/ask', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ ccc: c.root, role, question: q }) })
+    const res = await fetch('/ask', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ ccc: c.root, role, question: q, sessionId: sessionId || undefined }) })
     const data = await res.json()
-    if (!res.ok) throw new Error(data.error || ('HTTP ' + res.status))
+    if (!res.ok) {
+      // 会话不可恢复/绑定不匹配 → 前端清空 sessionId 重建（用户拍板：切换即新对话）
+      sessionId = ''
+      renderSessionBadge()
+      throw new Error(data.error || ('HTTP ' + res.status))
+    }
     answer.className = ''
     answer.innerHTML = data.answer_html || esc(data.answer || '') || '（空回答）'
+    sessionId = data.sessionId || sessionId
+    renderSessionBadge()
     renderTrajectory(data.trajectory || [], data.sessionId || '')
   } catch (err) {
     answer.className = 'err'
@@ -11288,6 +11374,7 @@ async function handle(ctx, defaultRoot, webPort, req, res) {
 			const ccc = typeof body.ccc === "string" && body.ccc !== "" ? body.ccc : defaultRoot;
 			const roleName = typeof body.role === "string" ? body.role : "";
 			const question = typeof body.question === "string" ? body.question : "";
+			const sessionId = typeof body.sessionId === "string" && body.sessionId !== "" ? body.sessionId : void 0;
 			const role = readSkiffRoles(ccc).get(roleName);
 			if (!roleName || !role) {
 				sendJson(res, 400, { error: `unknown role: ${roleName} (ccc: ${ccc})` });
@@ -11297,11 +11384,30 @@ async function handle(ctx, defaultRoot, webPort, req, res) {
 				sendJson(res, 400, { error: "empty question" });
 				return;
 			}
-			const result = await askSkiff(ctx, (await createSkiffAgent(ctx, ccc, roleName, role, readHandymanConfig(ccc)?.defaultModel)).agent, question);
+			let agent;
+			let continued = false;
+			if (sessionId) {
+				const info = skiffSessionInfo(sessionId);
+				const live = getSkiffAgent(sessionId);
+				if (!info || !live) {
+					sendJson(res, 400, { error: "session is not recoverable (process restarted or session unknown) — start a new conversation" });
+					return;
+				}
+				if (info.role !== roleName || info.ccc !== ccc) {
+					sendJson(res, 400, { error: `session "${sessionId}" belongs to role "${info.role}" in another CCC — start a new conversation` });
+					return;
+				}
+				agent = live;
+				continued = true;
+			}
+			const hc = readHandymanConfig(ccc);
+			if (!agent) agent = (await createSkiffAgent(ctx, ccc, roleName, role, hc?.defaultModel)).agent;
+			const result = await askSkiff(ctx, agent, question, 0);
 			sendJson(res, 200, {
 				answer: result.answer,
 				answer_html: renderSkiffMarkdown(result.answer),
 				sessionId: result.sessionId,
+				continued,
 				trajectory: result.trajectory
 			});
 			return;

package/package.json

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