@shgroup/dsh-serenity-hooks 1.23.2 → 1.23.4

package/dsh.plugin.json

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

package/lib/index.js

@@ -5106,13 +5106,13 @@ function parseSessionContextFromEvents(events) {
 			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*(\S+)/);
+			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]
+					mdPath: mdMatch[1].trim()
 				};
 			}
 		}
@@ -5988,11 +5988,14 @@ function stripAckSuffix(text) {
 */
 function buildRebuildAnchor(root, sessionName, activeMdPath, anchorMessages = DEFAULT_ANCHOR_MESSAGES) {
 	const rel = activeMdPath.startsWith(root) ? activeMdPath.slice(root.length + 1) : activeMdPath;
+	const sessionDir = basename(dirname(activeMdPath));
+	const sessionLine = sessionDir !== "AGENT_SESSIONS" ? `- Serenity session: ${sessionName !== "" ? `${sessionName} (${sessionDir})` : sessionDir}` : null;
 	return [
 		"[TRAJECTORY-REBUILD] The conversation has been cleared and rebuilt (Ship of Theseus: the carrier is replaced, the trajectory continues).",
 		"",
 		...anchorMessages.flatMap((text) => [stripAckSuffix(text), ""]),
 		sessionName !== "" ? `Continue the work of ${sessionName}.` : "Continue the current work.",
+		...sessionLine ? [sessionLine] : [],
 		`- Persistent trajectory (SESSION.md, unmoved): ${rel}`,
 		`- Read that SESSION.md first (goal/decisions/progress/unresolved), then continue from the last checkpoint.`
 	].join("\n");
@@ -6265,11 +6268,20 @@ var KeeperTracker = class {
 function reminderText(code, score) {
 	return `[TRAJECTORY-STEWARD] Score threshold reached (${score}). Please acknowledge with [TRAJECTORY-STEWARD-recorded-${code}] once progress is synced to the working session (acc-session show). No need to interrupt your work — just acknowledge inline and keep going.`;
 }
-/** F2 rebuild 提示（v1.21；v1.22.1 对齐"轨迹跟踪器"概念；v1.23.0 英化 + 载体关系）：
-* SESSION.md = trajectory 持久身体，自身会话 = 可重建载体（工作副本）。
-* 上下文接近上限时引导 LLM 主动触发 session_rebuild。 */
-function rebuildReminderText(ratio) {
-	return `[TRAJECTORY] Context usage at ${(ratio * 100).toFixed(0)}% (trajectory-tracker threshold). This session is the rebuildable carrier of the trajectory: SESSION.md is the persistent body, this conversation is only a temporary work copy — no compaction needed. Call session_rebuild at a natural pause to rebuild the carrier (this copy is discarded; identity continues from SESSION.md).`;
+/**
+* F2 rebuild 提示（v1.21；v1.22.1 对齐"轨迹跟踪器"概念；v1.23.0 英化 + 载体关系；
+* v1.23.3 行动指令化——用户反馈"一直在触发为啥没执行"：旧文案是状态播报式
+* （"[TRAJECTORY] Context usage at N%..."），模型当成系统状态而非行动请求，可一直忽略。
+* 新文案 = 明确的行动指令（ACT NOW + 何时执行 + 必须执行），对齐 steward ACK 协议风格。
+*
+* 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.`;
 }
 /** 读取会话 contextPressure 投影（sessionProjections 可选服务；未装配返回 null） */
 function readContextPressure(ctx, session) {
@@ -6292,6 +6304,9 @@ const PLUGIN_SOURCE$1 = {
 };
 /** 每 agent 一个跟踪器（进程内存态，agent token 维度） */
 const trackers = /* @__PURE__ */ new Map();
+/** 连续超阈值轮数达此值 → 升级为 [TRAJECTORY-ESCALATED] 强制语气（此后持续升级催，直到 rebuild） */
+const REBUILD_ESCALATE_AFTER = 3;
+const rebuildReminderStates = /* @__PURE__ */ new Map();
 function registerKeeper(ctx, opts = {}) {
 	const defaultThreshold = opts.defaultThreshold ?? 150;
 	const trackerFor = (exec) => {
@@ -6324,10 +6339,18 @@ function registerKeeper(ctx, opts = {}) {
 				const pressure = readContextPressure(ctx, session);
 				if (pressure && pressure.contextWindow && pressure.contextWindow > 0) {
 					const ratio = pressure.projectedTokens / pressure.contextWindow;
-					if (ratio >= readSimpleSettings().rebuildThreshold) blocks.push({
-						type: "text",
-						text: rebuildReminderText(ratio)
-					});
+					const threshold = readSimpleSettings().rebuildThreshold;
+					if (ratio >= threshold) {
+						const key = exec.agent?.session?.id ?? "global";
+						const st = rebuildReminderStates.get(key) ?? { consecutive: 0 };
+						st.consecutive += 1;
+						const escalated = st.consecutive >= REBUILD_ESCALATE_AFTER;
+						blocks.push({
+							type: "text",
+							text: rebuildReminderText(ratio, threshold, escalated)
+						});
+						rebuildReminderStates.set(key, st);
+					}
 				}
 			}
 		}

package/package.json

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