@shgroup/dsh-serenity-hooks 1.27.1 → 1.27.2

package/dsh.plugin.json

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

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as findSerenityRoot, c as matchBlacklist, d as readHandymanConfig, i as findGitRoot, l as pathInside, n as SAFE_MODE_MARKER, o as isSafeModeOn, p as resolveInside, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-CfDrlfA7.js";
 import { a as resolveRoleSystemPrompt, i as readSkiffRoles, l as systemPromptSource, r as isSkiffSessionId, s as roleToolWhitelist } from "./skiff-role-Dw7UKCUm.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-ZVbIqttn.js";
-import { a as weixinSessionIdFor, c as checkLocalstoreGitCompliance, d as runLocalStore, i as readWeixinSettings, l as localstorePath, n as matchWeixinRoute, r as readWeixinCredential, s as LOCALSTORE_SCOPES, t as extractWeixinText, u as readGitTrack } from "./weixin-route-CDdlFn1E.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-vLsdk7wV.js";
+import { a as weixinSessionIdFor, c as checkLocalstoreGitCompliance, d as runLocalStore, i as readWeixinSettings, l as localstorePath, n as matchWeixinRoute, r as readWeixinCredential, s as LOCALSTORE_SCOPES, t as extractWeixinText, u as readGitTrack } from "./weixin-route-CvAWARN3.js";
 import { n as sendTextMessage, t as getUpdates } from "./weixin-api-b8HLmcPE.js";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -8342,7 +8342,7 @@ function registerStatusApi(ctx, opts = {}) {
 					workspace: url.searchParams.get("workspace") ?? void 0
 				});
 				const root = findSerenityRoot(workspace) ?? "";
-				const { discoverCccs } = await import("./skiff-debug-ZVbIqttn.js").then((n) => n.i);
+				const { discoverCccs } = await import("./skiff-debug-vLsdk7wV.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) });
@@ -8468,11 +8468,11 @@ function registerStatusApi(ctx, opts = {}) {
 						sendJson$1(res, 400, { error: chk.error });
 						return;
 					}
-					const { readWeixinSettings } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+					const { readWeixinSettings } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 					const { weixinBridgeStatus } = await Promise.resolve().then(() => weixin_bridge_exports);
 					const settings = readWeixinSettings(chk.root);
 					const bridge = weixinBridgeStatus().find((b) => b.ccc === chk.root);
-					const { readWeixinCredential } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+					const { readWeixinCredential } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 					const accounts = (settings.accounts ?? []).map((a) => ({
 						accountId: a.accountId,
 						name: a.name ?? void 0,
@@ -8504,7 +8504,7 @@ function registerStatusApi(ctx, opts = {}) {
 					const { fetchQRCode } = await import("./weixin-api-b8HLmcPE.js").then((n) => n.r);
 					const { randomUUID } = await import("node:crypto");
 					for (const [key, v] of weixinLogins) if (Date.now() - v.startedAt > WEIXIN_LOGIN_TTL_MS) weixinLogins.delete(key);
-					const { readWeixinSettings } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+					const { readWeixinSettings } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 					const qr = await fetchQRCode({ botType: readWeixinSettings(root).botType ?? void 0 });
 					const loginKey = randomUUID();
 					weixinLogins.set(loginKey, {
@@ -8525,7 +8525,7 @@ function registerStatusApi(ctx, opts = {}) {
 						sendJson$1(res, 400, { error: "missing accountId" });
 						return;
 					}
-					const { removeWeixinAccount } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+					const { removeWeixinAccount } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 					const { syncCccBridge } = await Promise.resolve().then(() => weixin_bridge_exports);
 					removeWeixinAccount(root, body.accountId);
 					syncCccBridge(ctx, root);
@@ -8538,7 +8538,7 @@ function registerStatusApi(ctx, opts = {}) {
 						sendJson$1(res, 400, { error: "invalid routes (expected [{user, role}, ...])" });
 						return;
 					}
-					const { saveWeixinRoutes } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+					const { saveWeixinRoutes } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 					const { readSkiffRoles } = await import("./skiff-role-Dw7UKCUm.js").then((n) => n.c);
 					const roles = readSkiffRoles(root);
 					for (const r of routes) if (!roles.has(r.role)) {
@@ -8551,7 +8551,7 @@ function registerStatusApi(ctx, opts = {}) {
 				}
 				if (body.action === "set-enabled") {
 					const enabled = body.enabled === true;
-					const { readWeixinSettings, setWeixinEnabled } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+					const { readWeixinSettings, setWeixinEnabled } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 					const { syncCccBridge } = await Promise.resolve().then(() => weixin_bridge_exports);
 					const settings = readWeixinSettings(root);
 					if (enabled && (settings.accounts ?? []).length === 0) {
@@ -8598,7 +8598,7 @@ function registerStatusApi(ctx, opts = {}) {
 					return;
 				}
 				const { pollQRStatus } = await import("./weixin-api-b8HLmcPE.js").then((n) => n.r);
-				const { readWeixinSettings } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+				const { readWeixinSettings } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 				const settings = readWeixinSettings(login.root);
 				const status = await pollQRStatus({
 					baseUrl: void 0,
@@ -8613,7 +8613,7 @@ function registerStatusApi(ctx, opts = {}) {
 							});
 							return;
 						}
-						const { upsertWeixinAccount, writeWeixinCredential, nextWeixinAccountId } = await import("./weixin-route-CDdlFn1E.js").then((n) => n.o);
+						const { upsertWeixinAccount, writeWeixinCredential, nextWeixinAccountId } = await import("./weixin-route-CvAWARN3.js").then((n) => n.o);
 						const { syncCccBridge } = await Promise.resolve().then(() => weixin_bridge_exports);
 						const accountId = nextWeixinAccountId(settings);
 						upsertWeixinAccount(login.root, {
@@ -10576,7 +10576,9 @@ async function runAccountLoop(ctx, root, accountId, cred, loop) {
 *
 * 会话语义：`weixinSessionIdFor(fromUserId)` 固定可重建——同用户长期同一会话；
 * 进程内已有（getSkiffAgent 命中）→ 延续；无（首次/进程重启）→ createSkiffAgent
-* 以固定 id 新建（角色不变，记忆从新开始——重启后自动重建，与 3100 问答页同语义）。
+* 固定 id resume-or-create（v1.27.2）：磁盘已有持久化 log → resume（历史延续，
+* 重启后记忆保留——真正的"同用户长期延续"）；无 log（首次）→ create。
+* "新的对话已开始"通知仅真正首次（create）时发送；resume/进程内延续不发。
 */
 async function handleIncoming(ctx, root, _accountId, cred, msg) {
 	const fromUserId = msg.from_user_id;
@@ -10595,13 +10597,13 @@ async function handleIncoming(ctx, root, _accountId, cred, msg) {
 		}
 		const sessionId = weixinSessionIdFor(fromUserId);
 		const existing = getSkiffAgent(sessionId);
-		const recreated = !existing;
 		const hc = readHandymanConfig(root);
 		const ref = existing ? {
 			agent: existing,
-			sessionId
+			sessionId,
+			resumed: true
 		} : await createSkiffAgent(ctx, root, roleName, role, hc?.defaultModel, sessionId);
-		if (recreated) await sendTextMessage({
+		if (!ref.resumed) await sendTextMessage({
 			baseUrl: cred.baseUrl,
 			token: cred.token,
 			toUserId: fromUserId,
@@ -10618,7 +10620,10 @@ async function handleIncoming(ctx, root, _accountId, cred, msg) {
 			contextToken: msg.context_token
 		});
 	} catch (err) {
-		console.log(`[serenity-hooks] weixin-bridge error (ccc=${root}): ${err instanceof Error ? err.message : String(err)}`);
+		const msg = err instanceof Error ? err.message : String(err);
+		console.log(`[serenity-hooks] weixin-bridge error (ccc=${root}): ${msg}`);
+		const stack = err instanceof Error ? err.stack : void 0;
+		if (stack) console.log(`[serenity-hooks] weixin-bridge stack:\n${stack.slice(0, 1500)}`);
 	}
 }
 /**

package/lib/skiff-core.d.ts

@@ -31,10 +31,19 @@ export interface SkiffAgentRef {
     handle: AgentHandle;
     agent: Agent;
     sessionId: string;
+    /** true = 从持久化恢复既有会话（历史延续，非新对话）；false = 新建（首次/无持久化） */
+    resumed: boolean;
 }
 /**
  * 创建 Skiff agent：标准 DSH agent + cwd=CCC root + 角色模型 +
  * standard preset（平台工具面）+ scoped 系统提示词（基础提示词 + CCC 定义段，全替换 ACC 默认注入）。
+ *
+ * **固定 sessionId 的 resume-or-create（v1.27.2，微信桥 id collision 修复）**：
+ * 指定 sessionId 且磁盘已有持久化 log → `ctx.agents.resume`（DSH 持久化语义：
+ * sessionId 即身份，已持久化会话必须 resume——历史 + turn 续号延续，同用户长期记忆保留）；
+ * 无 log（首次）/持久化未配置 → `ctx.agents.create`（新建）。不指定 sessionId →
+ * 随机 id 恒 create（ACP/调试页默认路径）。
+ *
  * @param sessionId 指定会话 id（可选；微信桥等外部面用固定 id 实现用户↔会话长期映射——
  *   不传则随机生成 skiff-<role>-<uuid>，ACP/调试页默认路径）
  */

package/lib/{skiff-debug-ZVbIqttn.js → skiff-debug-vLsdk7wV.js}

@@ -251,6 +251,13 @@ const SKIFF_PRESET = "standard";
 /**
 * 创建 Skiff agent：标准 DSH agent + cwd=CCC root + 角色模型 +
 * standard preset（平台工具面）+ scoped 系统提示词（基础提示词 + CCC 定义段，全替换 ACC 默认注入）。
+*
+* **固定 sessionId 的 resume-or-create（v1.27.2，微信桥 id collision 修复）**：
+* 指定 sessionId 且磁盘已有持久化 log → `ctx.agents.resume`（DSH 持久化语义：
+* sessionId 即身份，已持久化会话必须 resume——历史 + turn 续号延续，同用户长期记忆保留）；
+* 无 log（首次）/持久化未配置 → `ctx.agents.create`（新建）。不指定 sessionId →
+* 随机 id 恒 create（ACP/调试页默认路径）。
+*
 * @param sessionId 指定会话 id（可选；微信桥等外部面用固定 id 实现用户↔会话长期映射——
 *   不传则随机生成 skiff-<role>-<uuid>，ACP/调试页默认路径）
 */
@@ -258,19 +265,12 @@ async function createSkiffAgent(ctx, root, roleName, role, defaultModel, session
 	if (!ctx.agents) throw new Error("skiff: ctx.agents unavailable");
 	const model = role.model?.trim() || defaultModel || "";
 	const id = sessionId ?? `skiff-${roleName}-${randomUUID()}`;
-	const handle = await ctx.agents.create({
-		sessionId: id,
-		meta: {
-			cwd: root,
-			agentPreset: SKIFF_PRESET
-		},
-		setup: async (agentCtx) => {
-			try {
-				await agentCtx.get("agentPresets")?.mount?.(agentCtx, SKIFF_PRESET);
-			} catch {}
-		},
-		...model ? { agentOptions: splitModel(model) } : {}
-	});
+	const setup = async (agentCtx) => {
+		try {
+			await agentCtx.get("agentPresets")?.mount?.(agentCtx, SKIFF_PRESET);
+		} catch {}
+	};
+	const handle = await createOrResumeAgent(ctx, id, root, model, setup, sessionId !== void 0);
 	const agent = handle.agent;
 	let cccPrompt = "";
 	try {
@@ -291,9 +291,68 @@ async function createSkiffAgent(ctx, root, roleName, role, defaultModel, session
 	return {
 		handle,
 		agent,
-		sessionId: id
+		sessionId: id,
+		resumed: handle.resumed
 	};
 }
+/**
+* resume-or-create 分派：固定 id → 优先 resume（持久化历史延续），失败降级 create；
+* 随机 id（无固定 sessionId）→ 恒 create。返回 handle + resumed 标志。
+*/
+async function createOrResumeAgent(ctx, id, root, model, setup, fixedId) {
+	if (!fixedId) return {
+		...await ctx.agents.create({
+			sessionId: id,
+			meta: {
+				cwd: root,
+				agentPreset: SKIFF_PRESET
+			},
+			setup,
+			...model ? { agentOptions: splitModel(model) } : {}
+		}),
+		resumed: false
+	};
+	const agentsWithResume = ctx.agents;
+	if (typeof agentsWithResume.resume !== "function") return {
+		...await ctx.agents.create({
+			sessionId: id,
+			meta: {
+				cwd: root,
+				agentPreset: SKIFF_PRESET
+			},
+			setup,
+			...model ? { agentOptions: splitModel(model) } : {}
+		}),
+		resumed: false
+	};
+	try {
+		return {
+			...await agentsWithResume.resume({
+				resumeSessionId: id,
+				setup,
+				...model ? { agentOptions: splitModel(model) } : {}
+			}),
+			resumed: true
+		};
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		const stack = err instanceof Error ? err.stack ?? "" : "";
+		console.log(`[serenity-hooks] skiff resume 失败降级 create (id=${id}): ${msg}`);
+		if (stack) console.log(`[serenity-hooks] skiff resume stack:\n${stack.slice(0, 1200)}`);
+		return {
+			...await ctx.agents.create({
+				sessionId: id,
+				meta: {
+					cwd: root,
+					agentPreset: SKIFF_PRESET
+				},
+				setup,
+				...model ? { agentOptions: splitModel(model) } : {}
+			}),
+			resumed: false
+		};
+	}
+}
 /** 等待 agent 空闲（agent/status → idle）；无超时（agent 工作多久等多久，handyman 同款） */
 function waitIdle(ctx, agent) {
 	return new Promise((resolve) => {

package/lib/weixin-bridge.d.ts

@@ -19,7 +19,9 @@ import { type WeixinAccountCredential } from './weixin-route.js';
  *
  * 会话语义：`weixinSessionIdFor(fromUserId)` 固定可重建——同用户长期同一会话；
  * 进程内已有（getSkiffAgent 命中）→ 延续；无（首次/进程重启）→ createSkiffAgent
- * 以固定 id 新建（角色不变，记忆从新开始——重启后自动重建，与 3100 问答页同语义）。
+ * 固定 id resume-or-create（v1.27.2）：磁盘已有持久化 log → resume（历史延续，
+ * 重启后记忆保留——真正的"同用户长期延续"）；无 log（首次）→ create。
+ * "新的对话已开始"通知仅真正首次（create）时发送；resume/进程内延续不发。
  */
 export declare function handleIncoming(ctx: Context, root: string, _accountId: string, cred: WeixinAccountCredential, msg: {
     from_user_id?: string;

package/lib/{weixin-route-CDdlFn1E.js → weixin-route-CvAWARN3.js}

@@ -282,7 +282,8 @@ function runLocalStore(root, args) {
 * 职责（零 DSH 依赖，可独立单测）：
 * - 读取 CCC 的 weixin 配置（.opencode/serenity.json weixin 段——结构/路由/开关）
 * - 读取/写入 CCC localstore 的账号凭据（weixin.accounts.<accountId>.token/.baseUrl/.userId）
-* - 微信用户 → skiff 会话 id 映射（固定可重建：skiff-weixin-<sha256(userid)>.slice(16)）
+* - 微信用户 → skiff 会话 id 映射（固定可重建：skiff-weixin-<sha256(userid)>.slice(1, 17)；
+*   v1.27.3 错位一位避开损坏 log）
 * - 路由匹配（exact user → 通配 * 兜底）
 *
 * 配置归属（S142 用户拍板）：**CCC 级**——serenity.json 结构 + localstore 凭据分离；
@@ -312,9 +313,12 @@ function accountKeyPart(accountId) {
 }
 /** 微信桥 skiff 会话 id 前缀（seams 旁路判定；对外面纯净——守卫识别外部面） */
 const WEIXIN_SESSION_PREFIX = "skiff-weixin-";
-/** 微信用户 → 固定会话 id（同用户长期同一会话，记忆延续；多用户天然隔离） */
+/** 微信用户 → 固定会话 id（同用户长期同一会话，记忆延续；多用户天然隔离）。
+*  **v1.27.3 错位一位（用户拍板）**：`.slice(0, 16)` → `.slice(1, 17)`——旧规则生成的
+*  固定 id 已与磁盘损坏的持久化 log 绑定（dsh 不可硬删，create 同 id 必撞）→
+*  新规则下同用户生成**全新 id**，避开损坏 log；固定可重建语义不变（同用户恒同 id）。 */
 function weixinSessionIdFor(fromUserId) {
-	const digest = createHash("sha256").update(fromUserId).digest("hex").slice(0, 16);
+	const digest = createHash("sha256").update(fromUserId).digest("hex").slice(1, 17);
 	return `${WEIXIN_SESSION_PREFIX}${digest}`;
 }
 /**

package/lib/weixin-route.d.ts

@@ -4,7 +4,8 @@
  * 职责（零 DSH 依赖，可独立单测）：
  * - 读取 CCC 的 weixin 配置（.opencode/serenity.json weixin 段——结构/路由/开关）
  * - 读取/写入 CCC localstore 的账号凭据（weixin.accounts.<accountId>.token/.baseUrl/.userId）
- * - 微信用户 → skiff 会话 id 映射（固定可重建：skiff-weixin-<sha256(userid)>.slice(16)）
+ * - 微信用户 → skiff 会话 id 映射（固定可重建：skiff-weixin-<sha256(userid)>.slice(1, 17)；
+ *   v1.27.3 错位一位避开损坏 log）
  * - 路由匹配（exact user → 通配 * 兜底）
  *
  * 配置归属（S142 用户拍板）：**CCC 级**——serenity.json 结构 + localstore 凭据分离；
@@ -15,7 +16,10 @@ import { type WeixinSettings, type WeixinRouteConfig, type WeixinAccountConfig }
 export declare const WEIXIN_SESSION_PREFIX = "skiff-weixin-";
 /** 判定 sessionId 是否为微信桥会话（外部面——输出守卫/轨迹隐藏生效） */
 export declare function isWeixinSessionId(sessionId: string | undefined): boolean;
-/** 微信用户 → 固定会话 id（同用户长期同一会话，记忆延续；多用户天然隔离） */
+/** 微信用户 → 固定会话 id（同用户长期同一会话，记忆延续；多用户天然隔离）。
+ *  **v1.27.3 错位一位（用户拍板）**：`.slice(0, 16)` → `.slice(1, 17)`——旧规则生成的
+ *  固定 id 已与磁盘损坏的持久化 log 绑定（dsh 不可硬删，create 同 id 必撞）→
+ *  新规则下同用户生成**全新 id**，避开损坏 log；固定可重建语义不变（同用户恒同 id）。 */
 export declare function weixinSessionIdFor(fromUserId: string): string;
 /**
  * 读取 CCC 微信桥配置（未配置/未启用 → 归一默认）。

package/package.json

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