@shgroup/dsh-serenity-hooks 1.24.10 → 1.24.12

package/dsh.plugin.json

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

package/lib/index.js

@@ -5227,26 +5227,38 @@ function closeSession(root, key, confirm, scope = DEFAULT_SESSION_SCOPE) {
 	return `Session "${session.dirName}" closed and marked as completed.`;
 }
 /**
-* 从会话历史（events）解析最后一条 [SESSION CONTEXT] 标记（进程重启恢复；
-* 只扫**当前会话**自己的历史——无跨会话串台）。
+* 从会话历史（events）解析会话身份（进程重启恢复；只扫**当前会话**自己的历史——无跨会话串台）。
+*
+* v1.24.11 稳固化（S142 用户需求：重建后新会话必须准确知道从哪个 SESSION 恢复）：
+* **路径规范行即可，不再要求 [SESSION CONTEXT] 标记**——`session use` 上下文与重建锚点
+* （buildRebuildAnchor 的 `- Persistent trajectory — SESSION.md path: <rel>` 行）同格式，
+* 因此**仅靠重建锚点的会话（从未显式 use）同样可恢复**。从**尾到头**扫描，最后一条
+* 合法路径胜出（时间序最新）；会话目录名/ID 从路径本身派生（单一真相源，不猜）。
+* 路径可为相对（重建锚点存 rel）——绝对化与存在性校验在调用方（知道 root）执行。
 */
 function parseSessionContextFromEvents(events) {
 	for (let i = events.length - 1; i >= 0; i--) {
 		const strs = [];
 		collectStrings(events[i], strs);
 		for (const s of strs) {
-			const idx = s.indexOf(SESSION_CONTEXT_MARKER);
-			if (idx < 0) continue;
-			const dirName = s.slice(idx + 28).trim().split("\n")[0]?.trim() ?? "";
-			const mdMatch = s.match(/SESSION\.md path:\s*([^\r\n]+)/);
-			if (/^\d{4}-\d{2}-\d{2}--/.test(dirName) && mdMatch) {
-				const idMatch = dirName.match(/--S(\d{3,})--/);
-				return {
-					sessionId: idMatch ? `S${idMatch[1]}` : basename(dirName),
-					dirName,
-					mdPath: mdMatch[1].trim()
-				};
-			}
+			const md = extractSessionMdPathFromText(s);
+			if (!md) continue;
+			let dirName;
+			let filePath;
+			if (basename(md) === SESSION_MD) {
+				dirName = basename(dirname(md));
+				filePath = md;
+			} else if (isSessionDirName(basename(md))) {
+				dirName = basename(md);
+				filePath = join(md, SESSION_MD);
+			} else continue;
+			if (!isSessionDirName(dirName)) continue;
+			const idMatch = dirName.match(/--S(\d{3,})--/);
+			return {
+				sessionId: idMatch ? `S${idMatch[1]}` : dirName,
+				dirName,
+				mdPath: filePath
+			};
 		}
 	}
 	return null;
@@ -5259,6 +5271,35 @@ function collectStrings(v, out) {
 	}
 	if (v && typeof v === "object") for (const val of Object.values(v)) collectStrings(val, out);
 }
+/** 规范行正则：`SESSION.md path: <路径>`（路径可含空格 → [^\r\n]+ 整行匹配） */
+const SESSION_MD_PATH_RE = /SESSION\.md path:\s*([^\r\n]+)/;
+/** 从文本提取 SESSION.md 路径（use 上下文 / 重建锚点规范行通用；无匹配返回 null）。
+*  同行已知尾注（如系统提示词 Session 块的 persistent-body 注释）剥除——规范行只取路径本体。 */
+function extractSessionMdPathFromText(text) {
+	const m = text.match(SESSION_MD_PATH_RE);
+	if (!m) return null;
+	let p = m[1].trim();
+	const suffix = p.search(/ \(the trajectory's persistent body/);
+	if (suffix > 0) p = p.slice(0, suffix).trim();
+	return p;
+}
+/** 会话目录名形态校验（createSession 恒带日期前缀 `YYYY-MM-DD--`） */
+function isSessionDirName(dirName) {
+	return /^\d{4}-\d{2}-\d{2}--/.test(dirName) && dirName.length > 11;
+}
+/**
+* 约定回退（v1.24.11）：AGENT_SESSIONS 下最新修改的**未完成**会话的 SESSION.md。
+* readAllSessions 已按「未完成优先 + mtime 降序」排序 → 首个未完成且含 SESSION.md 即最新活动。
+* 只作最后手段（内存/events/锚点全缺时），保证重建锚点至少指向一个真实存在的轨迹。
+*/
+function findLatestActiveSessionMd(root) {
+	for (const s of readAllSessions(sessionsRoot(root))) {
+		if (s.status.completed) continue;
+		const md = join(s.path, SESSION_MD);
+		if (existsSync(md)) return md;
+	}
+	return null;
+}
 /** health 子命令（对齐 osp healthCheck：stale/stalled/ghost/drift 四类检查，文本输出） */
 function healthCheck(root) {
 	const sessions = readAllSessions(sessionsRoot(root));
@@ -6128,10 +6169,53 @@ function buildRebuildAnchor(root, sessionName, activeMdPath, anchorMessages = DE
 		...anchorMessages.flatMap((text) => [stripAckSuffix(text), ""]),
 		sessionName !== "" ? `Continue the work of ${sessionName}.` : "Continue the current work.",
 		...sessionLine ? [sessionLine] : [],
-		`- Persistent trajectory (SESSION.md, unmoved): ${rel}`,
+		`- Persistent trajectory — SESSION.md path: ${rel}`,
+		`  (the trajectory's persistent body — stays in place through rebuilds)`,
 		`- Read that SESSION.md first (goal/decisions/progress/unresolved), then continue from the last checkpoint.`
 	].join("\n");
 }
+/** 从会话 surface 首条 user 消息（重建锚点）解析 SESSION.md 路径（events 异常/缺失时的兜底） */
+function parseAnchorMdPath(session) {
+	try {
+		const nodes = [...session.surface.nodes];
+		if (nodes.length === 0) return null;
+		const events = session.events;
+		if (!Array.isArray(events)) return null;
+		const event = events[nodes[0]];
+		if (!event) return null;
+		const message = deriveEventMessage(event);
+		if (!message) return null;
+		return extractSessionMdPathFromText(message.content?.map((c) => c.type === "text" ? c.text ?? "" : "").join("") ?? "");
+	} catch {
+		return null;
+	}
+}
+/** 从 SESSION.md 绝对路径派生会话名（S###；issue 目录回退完整目录名） */
+function sessionNameFromMdPath(mdPath) {
+	const dirName = basename(dirname(mdPath));
+	const idMatch = dirName.match(/--S(\d{3,})--/);
+	return idMatch ? `S${idMatch[1]}` : dirName;
+}
+/**
+* 稳固的 SESSION.md 定位（多层候选 + 存在性校验，**绝不输出虚假路径**）：
+* ① 内存活跃会话（本会话显式 use 过）→ ② events 恢复（use 标记 + 重建锚点规范行，进程重启后）
+* → ③ surface 首条锚点（events 异常时兜底）→ ④ AGENT_SESSIONS 约定回退（最新未完成活动目录）。
+* 每候选 resolve 后 existsSync 校验（相对路径按 root 解析）；全部失败返回 null → 调用方报错引导。
+*/
+function resolveSessionMdPath(root, scope, session) {
+	const candidates = [];
+	candidates.push(getActiveSessionInfo(scope)?.mdPath ?? null);
+	const events = session.events;
+	if (Array.isArray(events)) candidates.push(parseSessionContextFromEvents(events)?.mdPath ?? null);
+	candidates.push(parseAnchorMdPath(session));
+	candidates.push(findLatestActiveSessionMd(root));
+	for (const c of candidates) {
+		if (!c) continue;
+		const abs = c.startsWith(root) ? c : resolve(root, c);
+		if (existsSync(abs)) return abs;
+	}
+	return null;
+}
 const pendingRebuilds = /* @__PURE__ */ new Map();
 /** 陈旧队列存活时长（毫秒）：超过则丢弃（turn 异常结束/agent 崩溃时防残留误清空） */
 const PENDING_TTL_MS = 6e5;
@@ -6145,19 +6229,11 @@ const PENDING_TTL_MS = 6e5;
 async function queueRebuild(ctx, opts) {
 	if (!readSimpleSettings().rebuildEnabled) throw new Error("session_rebuild is disabled (rebuild.enabled=false — enable it in the dsh settings panel)");
 	const { root, note, dshSessionId } = opts;
-	if (!ctx.sessions?.get?.(dshSessionId)) throw new Error(`Unable to locate dsh session ${dshSessionId} (session may be closed)`);
-	const scope = dshSessionId;
-	let sessionMdPath = null;
-	let sessionName = "";
-	try {
-		const active = getActiveSessionInfo(scope);
-		if (active?.mdPath) {
-			sessionMdPath = active.mdPath;
-			sessionName = active.sessionId ?? "";
-		}
-	} catch {}
-	const mdPath = sessionMdPath ?? join(root, "AGENT_SESSIONS", "SESSION.md");
-	const anchor = buildRebuildAnchor(root, sessionName, mdPath);
+	const session = ctx.sessions?.get?.(dshSessionId);
+	if (!session) throw new Error(`Unable to locate dsh session ${dshSessionId} (session may be closed)`);
+	const mdPath = resolveSessionMdPath(root, dshSessionId, session);
+	if (!mdPath) throw new Error("Unable to determine the active SESSION.md — no session context found in this conversation. Run \"session use <S###>\" first to activate the trajectory to resume, then retry session_rebuild.");
+	const anchor = buildRebuildAnchor(root, getActiveSessionInfo(dshSessionId)?.sessionId ?? sessionNameFromMdPath(mdPath), mdPath);
 	pendingRebuilds.set(dshSessionId, {
 		anchor,
 		queuedAt: Date.now()
@@ -6165,7 +6241,7 @@ async function queueRebuild(ctx, opts) {
 	return {
 		queued: true,
 		anchor,
-		sessionMdPath
+		sessionMdPath: mdPath
 	};
 }
 /**
@@ -6436,14 +6512,18 @@ function reminderText(code, score) {
 * （"[TRAJECTORY] Context usage at N%..."），模型当成系统状态而非行动请求，可一直忽略。
 * 新文案 = 明确的行动指令（ACT NOW + 何时执行 + 必须执行），对齐 steward ACK 协议风格。
 *
+* v1.24.12 沉淀协议（S142 用户需求）：rebuild 前若掌握值得沉淀的认知——修订 CCC 现有
+* skill（eap 结构化）；若需新建 skill——**不自行创建**，写提案进 SESSION.md 供用户参考。
+* 简短留自由度（不提"加载 eap 工具"，模型自知；只说修订 skill + 新建 skill 落 SESSION）。
+*
 * escalated=true（v1.23.3）：连续多轮超阈值仍未 rebuild → 升级强制语气
 * （STOP and rebuild now，持续注入直到调用 session_rebuild）。
 */
 function rebuildReminderText(ratio, threshold, escalated = false) {
 	const pct = (ratio * 100).toFixed(0);
 	const thr = (threshold * 100).toFixed(0);
-	if (escalated) return `[TRAJECTORY-ESCALATED] Context usage at ${pct}% (threshold ${thr}%) — you have been reminded repeatedly and have NOT called session_rebuild. This is now mandatory: STOP at the current task step and call the session_rebuild tool immediately. The conversation will be cleared and rebuilt in place; SESSION.md is the persistent trajectory and stays in place — identity continues from it. Do not continue working without rebuilding; this reminder persists until you call session_rebuild.`;
-	return `[TRAJECTORY] Context usage at ${pct}% (threshold ${thr}%). This session is the rebuildable carrier of the trajectory: SESSION.md is the persistent body, this conversation is only a temporary work copy. ACT NOW: at the next natural pause (end of the current task step), call the session_rebuild tool to clear and rebuild this conversation — the current copy is discarded, identity continues from SESSION.md. If you are in the middle of an unbreakable step, continue it, then rebuild at its end. Do not ignore this; rebuild is the expected action, not an option.`;
+	if (escalated) return `[TRAJECTORY-ESCALATED] Context usage at ${pct}% (threshold ${thr}%) — you have been reminded repeatedly and have NOT called session_rebuild. This is now mandatory: STOP at the current task step, preserve valuable cognition into the CCC skills (or write a new-skill proposal into SESSION.md), then call the session_rebuild tool immediately. The conversation will be cleared and rebuilt in place; SESSION.md is the persistent trajectory and stays in place — identity continues from it. Do not continue working without rebuilding; this reminder persists until you call session_rebuild.`;
+	return `[TRAJECTORY] Context usage at ${pct}% (threshold ${thr}%). This session is the rebuildable carrier of the trajectory: SESSION.md is the persistent body, this conversation is only a temporary work copy. Before rebuilding: if this conversation produced valuable cognition, revise the relevant existing skill of this CCC (structure it with eap); if a new skill is warranted, write a short proposal into SESSION.md for the user to review — do not create it yourself. ACT NOW: at the next natural pause (end of the current task step), call the session_rebuild tool to clear and rebuild this conversation — the current copy is discarded, identity continues from SESSION.md. If you are in the middle of an unbreakable step, continue it, then rebuild at its end. Do not ignore this; rebuild is the expected action, not an option.`;
 }
 /** 读取会话 contextPressure 投影（sessionProjections 可选服务；未装配返回 null） */
 function readContextPressure(ctx, session) {
@@ -7495,8 +7575,14 @@ function registerContext(ctx, opts = {}) {
 			if (loadSerenityConfig(root, configPaths).hooks?.autoRestoreSession ?? true) {
 				const info = parseSessionContextFromEvents(agent.session.events ?? []);
 				if (info) {
-					setActiveSessionInfo(scope, info);
-					console.log(`[serenity-hooks] ↻ 从历史恢复激活会话: ${info.dirName}`);
+					const abs = info.mdPath.startsWith(root) ? info.mdPath : resolve(root, info.mdPath);
+					if (existsSync(abs)) {
+						setActiveSessionInfo(scope, {
+							...info,
+							mdPath: abs
+						});
+						console.log(`[serenity-hooks] ↻ 从历史恢复激活会话: ${info.dirName}`);
+					}
 				}
 			}
 		} catch {}

package/package.json

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