@shgroup/dsh-serenity-hooks 1.28.2 → 1.29.1

package/lib/index.js

@@ -1428,7 +1428,7 @@ handyman（杂工）工具可用模型白名单（provider/model 列表）；未
     { "handyman": { "models": ["minimax-cn-coding-plan/MiniMax-M3"], "defaultModel": "minimax-cn-coding-plan/MiniMax-M3", "maxRounds": 100, "maxParallel": 10 } }
 
 ── 2. sessionKeeper.threshold ──
-SESSION-KEEPER 提醒机制的积分阈值（非 headless 主 agent）。
+trajectory-assistant（TRAJECTORY-ASSISTANT · CHECKPOINT）提醒机制的积分阈值（非 headless 主 agent）。
 按工具调用加权 + 耗时计分；达到阈值注入提醒，要求模型回复 ACK 码。
 
   Config:
@@ -2919,6 +2919,43 @@ function isSessionDirName(dirName) {
 	return /^\d{4}-\d{2}-\d{2}--/.test(dirName) && dirName.length > 11;
 }
 /**
+* 从 dsh 会话标题解析 SESSION 目录（编码无关 best-match，U3/U4）——
+* 标题不假设 S### 前缀（CCC 可自定义编码：apaas-xxx / P### / 完整目录名等）。
+* 匹配优先级（全部对 AGENT_SESSIONS 现有目录 best-match，不猜）：
+*   ① 标题即完整目录名（含日期前缀 `YYYY-MM-DD--`）→ 精确命中
+*   ② 标题含 `--<code>--` 段（如完整目录名被截断为 `<code>-日期-概括` 前段）→
+*      按 code 段匹配：取标题首 token（`-` 前），与各目录 `--<code>--`/`--<code>` 尾段比对
+*   ③ 唯一模糊子串匹配（多个则返回 null 防误猜）
+* @param title dsh 会话标题（如 `S142-2026-08-24-概括` / `apaas-26116-…` / 完整目录名）
+* @param sessionsDir AGENT_SESSIONS 绝对路径
+* @returns 命中目录的绝对路径（SESSION.md）；无/歧义返回 null
+*/
+function resolveSessionByTitle(title, sessionsDir) {
+	const t = (title ?? "").trim();
+	if (!t) return null;
+	const all = readAllSessions(sessionsDir);
+	if (all.length === 0) return null;
+	if (isSessionDirName(t)) {
+		const exact = all.find((s) => s.dirName === t);
+		if (exact) return join(exact.path, SESSION_MD);
+	}
+	const codeToken = t.split("-")[0]?.trim() ?? "";
+	if (codeToken) {
+		const byCode = all.filter((s) => {
+			const m = s.dirName.match(/--([^--]+)--/);
+			const code = m ? m[1] : null;
+			const tailMatch = s.dirName.match(/--([^--]+)$/);
+			const tailCode = tailMatch && !s.dirName.includes("--", s.dirName.lastIndexOf("--") + 3) ? tailMatch[1] : null;
+			return code === codeToken || tailCode === codeToken || s.dirName === codeToken || s.dirName.includes(`--${codeToken}`);
+		});
+		if (byCode.length === 1) return join(byCode[0].path, SESSION_MD);
+		if (byCode.length > 1) return null;
+	}
+	const fuzzy = all.filter((s) => s.dirName.toLowerCase().includes(t.toLowerCase()));
+	if (fuzzy.length === 1) return join(fuzzy[0].path, SESSION_MD);
+	return null;
+}
+/**
 * 约定回退（v1.24.11）：AGENT_SESSIONS 下最新修改的**未完成**会话的 SESSION.md。
 * readAllSessions 已按「未完成优先 + mtime 降序」排序 → 首个未完成且含 SESSION.md 即最新活动。
 * 只作最后手段（内存/events/锚点全缺时），保证重建锚点至少指向一个真实存在的轨迹。
@@ -3179,6 +3216,56 @@ function qaCheck(root, key) {
 	return lines.join("\n");
 }
 //#endregion
+//#region src/session-bound.ts
+/** 事件 type 常量（声明 + 读取共用） */
+const SESSION_BOUND_EVENT = "serenity/bound";
+/** 事件形状归一（运行时数据经 session.append 深冻结，此处仅类型收窄） */
+function asBoundEvent(e) {
+	const ev = e;
+	if (!ev || ev.type !== "serenity/bound") return null;
+	const d = ev.data;
+	if (!d || typeof d.dirName !== "string" || typeof d.mdPath !== "string") return null;
+	return d;
+}
+/**
+* 读取会话日志中**最后一条** `serenity/bound`（权威绑定，latest-wins）。
+* 尾到头扫描（时间序最新在后）；无 bound 事件返回 null。
+* 纯逻辑零 DSH 依赖（经 sessionEvents helper 读 snapshotEvents/events 兜底）。
+*/
+function readLastBound(session) {
+	const events = sessionEvents(session);
+	for (let i = events.length - 1; i >= 0; i--) {
+		const b = asBoundEvent(events[i]);
+		if (b) return b;
+	}
+	return null;
+}
+/**
+* append 一条 `serenity/bound` 绑定事件（log-only，无 surfaceOp——元数据不进模型可见面）。
+* @param session 目标 dsh 会话（真实 Session；append 泛型经内部断言兼容——类型由
+*   `serenity/bound` 声明面保证，append 接受已声明事件）
+* @param action 绑定动作
+* @param rec 绑定记录（dirName + mdPath 必填；sessionId 可选展示码）
+* @returns 是否成功（append 抛错/会话不可用时 false——绑定失败不阻断主流程）
+*/
+function appendBound(session, action, rec) {
+	if (!session || typeof session.append !== "function") return false;
+	try {
+		const append = session.append;
+		append(SESSION_BOUND_EVENT, {
+			dirName: rec.dirName,
+			mdPath: rec.mdPath,
+			...rec.sessionId ? { sessionId: rec.sessionId } : {},
+			action,
+			at: Date.now(),
+			...rec.note ? { note: rec.note } : {}
+		});
+		return true;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/tools/session.ts
 /**
 * session.ts — session 真实 DSH 工具定义（defineTool）
@@ -3203,6 +3290,21 @@ function agentCwd$5(exec) {
 function agentScope$2(exec) {
 	return exec.agent?.session?.id ?? "default";
 }
+/** 当前 dsh 会话对象（append bound 用）；无 → null */
+function agentDshSession(exec) {
+	const s = exec.agent?.session;
+	return s && typeof s.append === "function" ? { append: s.append } : null;
+}
+/**
+* 当前绑定的权威 dirName（优先持久化 bound——防内存被误 use 污染；无 bound 回退内存 active）。
+* 供 G1 守卫对比目标会话是否切换。
+*/
+function currentBoundDirName(exec, scope) {
+	const dsh = agentDshSession(exec);
+	const bound = dsh ? readLastBound(dsh) : null;
+	if (bound) return bound.dirName;
+	return getActiveSessionInfo(scope)?.dirName ?? null;
+}
 /**
 * 清洗 + 截断会话概括（需求② S142 用户拍板：编号日期后加 ≤20 字内容概括）。
 * 规则（服务端统一，不信任 LLM 输入）：
@@ -3275,18 +3377,6 @@ function renameDshSessionOnUse(deps, session, titles, active, summary) {
 	}
 }
 /**
-* 从 create 结果构造命名用 ActiveSessionInfo（v1.25.11，S142 用户：create 也要命名）：
-* createSession 返回的 result 已含 sessionId（S###/issue）与 dirName——无需等待 use 激活，
-* 直接构造（mdPath = sessionPath/SESSION.md，与 use 时一致）即可驱动 renameDshSessionOnUse。
-*/
-function activeInfoFromCreate(result) {
-	return {
-		sessionId: result.sessionId,
-		dirName: result.dirName,
-		mdPath: join(result.sessionPath, "SESSION.md")
-	};
-}
-/**
 * 把当前 dsh 会话重命名为指定 SESSION 的命名标题（use/create 共用；v1.25.11）。
 * 需求②：summary 参数（≤20 字概括）透传——标题带概括（编号日期固定派生）。
 * 门控/失败可见性与 renameDshSessionOnUse 一致（不静默：成功 log / 失败 warn）。
@@ -3440,6 +3530,10 @@ function createSessionTool(ctx) {
 				type: "boolean",
 				description: "close must be true (prevents accidental close)"
 			},
+			force: {
+				type: "boolean",
+				description: "use: allow switching away from the currently-bound session (binding guard override)"
+			},
 			dryRun: {
 				type: "boolean",
 				description: "create/archive preview mode (no actual changes)"
@@ -3474,7 +3568,12 @@ function createSessionTool(ctx) {
 						dryRun: isDryRun
 					});
 					let message = result.message;
-					if (!isDryRun) renameDshSessionForActive(ctx, exec, activeInfoFromCreate(result), args.summary ?? args.issue);
+					if (!isDryRun) appendBound(agentDshSession(exec), "create", {
+						dirName: result.dirName,
+						mdPath: join(result.sessionPath, "SESSION.md"),
+						sessionId: result.sessionId,
+						note: "created (binding unchanged until explicit use)"
+					});
 					if (!isDryRun && cccHooks.includes("create-transform")) try {
 						const hookResult = await runMsmAsync(root, {
 							action: "exec",
@@ -3492,14 +3591,47 @@ function createSessionTool(ctx) {
 					if (!args.name) throw new Error("use requires name (S### or directory name)");
 					if (!args.summary || args.summary.trim() === "") throw new Error("use requires --summary <content summary ≤20 chars> (appended to the dsh session title as S###-YYYY-MM-DD-<summary>; id and date stay server-derived)");
 					const scope = agentScope$2(exec);
+					const targetEntry = findSession(join(root, "AGENT_SESSIONS"), args.name);
+					if (!targetEntry) throw new Error(`Session not found: "${args.name}". Use "list" to see available sessions.`);
+					const targetDirName = targetEntry.dirName;
+					const currentDir = currentBoundDirName(exec, scope);
+					const switching = currentDir !== null && targetDirName !== currentDir;
+					const force = args.force === true;
+					if (switching && !force) throw new Error(`Session is bound to ${currentDir}. Switching to ${targetDirName} would orphan the current trajectory. Re-run with --force to switch (or close the current session first).`);
 					const active = useSession(root, args.name, scope);
 					const info = getActiveSessionInfo(scope);
 					if (info) renameDshSessionForActive(ctx, exec, info, args.summary);
+					const dsh = agentDshSession(exec);
+					if (dsh && info) {
+						const prevBound = readLastBound(dsh);
+						appendBound(dsh, switching && prevBound ? "switch" : "activate", {
+							dirName: info.dirName,
+							mdPath: info.mdPath,
+							sessionId: info.sessionId,
+							...switching ? { note: "forced switch" } : {}
+						});
+					}
 					return active;
 				}
-				case "close":
-					if (!args.name) throw new Error("close requires name (S### or directory name)");
-					return closeSession(root, args.name, args.confirm ?? false, agentScope$2(exec));
+				case "close": {
+					const scope = agentScope$2(exec);
+					const requested = args.name?.trim() ?? "";
+					const boundDir = currentBoundDirName(exec, scope);
+					if (boundDir && requested) {
+						if ((findSession(join(root, "AGENT_SESSIONS"), requested)?.dirName ?? requested) !== boundDir) throw new Error(`Session is bound to ${boundDir}. close targets the bound session — pass the bound session (or omit name) to close it; closing ${requested} while bound to another session is not allowed.`);
+					}
+					if (!boundDir && !requested) throw new Error("close requires name (no active binding to close) — pass the session to close.");
+					const closed = closeSession(root, boundDir ? boundDir : requested, args.confirm ?? false, scope);
+					const dsh = agentDshSession(exec);
+					const bound = dsh ? readLastBound(dsh) : null;
+					if (bound) appendBound(dsh, "release", {
+						dirName: bound.dirName,
+						mdPath: bound.mdPath,
+						sessionId: bound.sessionId,
+						note: "session closed"
+					});
+					return closed;
+				}
 				case "archive": return archiveSessions(root, {
 					name: args.name,
 					dryRun: args.dryRun ?? false
@@ -3824,6 +3956,49 @@ function registerBootstrap(ctx) {
 	}, { prepend: true });
 }
 //#endregion
+//#region src/trajectory-assistant.ts
+/**
+* trajectory-assistant.ts — 关卡化注入的统一命名与风格门面（v0.3，S142）
+*
+* 概念（用户拍板 2026-09-05）：dsp 全部"过程中动态提示注入"统一命名为
+* trajectory-assistant（轨迹助航员）。关卡设计思想塑造**结构与时机**
+* （何时/何地注入），**不用于提示词用词**（D8 词法原则）——纯游戏黑话
+* （BOSS/XP/level-up）禁止出现在提示词文本；CHECKPOINT/LIMIT/TUTORIAL 等
+* 跨领域自然通用词允许。
+*
+* 本模块 = token 常量 + level-event 词汇表的**单一真相源**（避免前缀散落
+* 各文件字符串字面量）+ 风格门面（plain 默认 / metaphor 星舰变体）。
+* 仅当 style=metaphor 时前缀包装措辞变化；可行动正文不变 → 零行为漂移。
+*
+* 设计简写（L0 环境 / L1 教程 / L2 目标 / L3 检查点 / L4 极限 / L5 守卫 /
+* L6 结算）仅在本模块注释与内部文档出现，永不浮现在提示词文本。
+*
+* 结算（settlement）挂点：D6 用户拍板——若 CCC 有标准 SESSION 复盘仪式，
+* 结算视图归 trajectory-assistant。当前 close/archive 无复盘摘要 → 机制
+* 延后，仅留 onSettlement 导出 seam（OP-1，无调用者）。
+*/
+/** 可见提示词前缀用词（跨领域自然词，D8：无游戏黑话） */
+const EVENT_LABEL = {
+	/** 计分同步提醒（原 TRAJECTORY-STEWARD） */
+	checkpoint: "CHECKPOINT",
+	/** 上下文极限重建提醒（原 TRAJECTORY；LIMIT 替代被否的 BOSS——自然词） */
+	limit: "LIMIT",
+	/** 极限强制升级（原 TRAJECTORY-ESCALATED） */
+	limitMandatory: "LIMIT · MANDATORY",
+	/** 重建锚点头部（原 TRAJECTORY-REBUILD） */
+	rebuild: "REBUILD",
+	/** 敏感输出边界守卫（原 SERENITY OUTPUT GUARD） */
+	guard: "BOUNDARY GUARD"
+};
+/** 家族标识（所有动态注入统一前缀） */
+const ASSISTANT_PREFIX = "TRAJECTORY-ASSISTANT";
+/** 完整 token：`[TRAJECTORY-ASSISTANT · <LABEL>]` */
+function eventToken(event) {
+	return `[${ASSISTANT_PREFIX} · ${EVENT_LABEL[event]}]`;
+}
+/** ACK 确认码前缀（recorded/skipped 语义不变，仅家族名更新） */
+const ACK_PREFIX = `${ASSISTANT_PREFIX}-recorded`;
+//#endregion
 //#region src/rebuild.ts
 const PLUGIN_SOURCE$4 = {
 	kind: "plugin",
@@ -3850,7 +4025,7 @@ function buildRebuildAnchor(root, sessionName, activeMdPath, anchorMessages = DE
 	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).",
+		`${eventToken("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.",
@@ -3945,7 +4120,14 @@ async function queueRebuild(ctx, opts) {
 	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###> --summary <内容概括 ≤20 字>\" first to activate the trajectory to resume, then retry session_rebuild.");
-	const anchor = buildRebuildAnchor(root, getActiveSessionInfo(dshSessionId)?.sessionId ?? sessionNameFromMdPath(mdPath), mdPath);
+	const sessionName = getActiveSessionInfo(dshSessionId)?.sessionId ?? sessionNameFromMdPath(mdPath);
+	const anchor = buildRebuildAnchor(root, sessionName, mdPath);
+	appendBound(session, "rebuild", {
+		dirName: basename(dirname(mdPath)),
+		mdPath,
+		sessionId: sessionName.startsWith("S") ? sessionName : void 0,
+		note: "rebuild queued"
+	});
 	pendingRebuilds.set(dshSessionId, {
 		anchor,
 		summary,
@@ -4075,7 +4257,7 @@ function registerRebuildTurnHook(ctx) {
 				agent.steer(createUserMessage({
 					content: [{
 						type: "text",
-						text: "[TRAJECTORY-REBUILD] The conversation has been cleared and rebuilt. Follow the anchor instructions above now: read the persistent trajectory (SESSION.md) and continue the work automatically from the last checkpoint."
+						text: `${eventToken("rebuild")} The conversation has been cleared and rebuilt. Follow the anchor instructions above now: read the persistent trajectory (SESSION.md) and continue the work automatically from the last checkpoint.`
 					}],
 					source: PLUGIN_SOURCE$4
 				}));
@@ -4137,7 +4319,7 @@ function renderText$3(value) {
 function createRebuildTool(ctx) {
 	return defineTool({
 		name: "session_rebuild",
-		description: "Trajectory-tracker overflow rebuild (Ship of Theseus): this session is the rebuildable carrier of a trajectory — the current conversation is discarded and rebuilt in place at the end of this turn with the anchor \"continue the work of {SESSION name}\" (first-anchor protocol body included), then auto-continues. SESSION.md (the trajectory's persistent body) stays in place; identity continues from it. Use when you receive a [TRAJECTORY] reminder (context above threshold), at a natural pause point. After triggering, resume from SESSION.md when this turn ends.",
+		description: "Trajectory-tracker overflow rebuild (Ship of Theseus): this session is the rebuildable carrier of a trajectory — the current conversation is discarded and rebuilt in place at the end of this turn with the anchor \"continue the work of {SESSION name}\" (first-anchor protocol body included), then auto-continues. SESSION.md (the trajectory's persistent body) stays in place; identity continues from it. Use when you receive a " + eventToken("limit") + " reminder (context above threshold), at a natural pause point. After triggering, resume from SESSION.md when this turn ends.",
 		parameters: {
 			note: {
 				type: "string",
@@ -4600,7 +4782,7 @@ function buildWakeMessage(opts) {
 		lines.push(`[轨迹焦点] ${opts.topPrompt}`);
 		lines.push("");
 	}
-	lines.push(`[Autopilot Trajectory 唤起] — 距上次轨迹活动已满 ${intervalLabel}，自动继续。`, "", `身份锚定：继续 ${opts.sessionName} 的 trajectory（SESSION.md: ${opts.mdPath}）。`, "先验偏见：");
+	lines.push(`[Autopilot Trajectory · 唤起] — 距上次轨迹活动已满 ${intervalLabel}，自动继续。`, "", `身份锚定：继续 ${opts.sessionName} 的 trajectory（SESSION.md: ${opts.mdPath}）。`, "先验偏见：");
 	if (opts.motivation) lines.push(`  · 自生动机：${opts.motivation}`);
 	if (opts.biasContent) lines.push(`  · 偏见内容：${opts.biasContent}`);
 	if (!opts.motivation && !opts.biasContent) lines.push("  · （无——本轮纯自主探索）");
@@ -5128,7 +5310,7 @@ 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.`;
+	return `${eventToken("checkpoint")} Score threshold reached (${score}). Please acknowledge with [${ACK_PREFIX}-${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 英化 + 载体关系；
@@ -5147,8 +5329,8 @@ function reminderText(code, score) {
 * thresholdK = 配置阈值（千 token）；文案 `Context usage at NNNK (threshold NNNK)`。
 */
 function rebuildReminderText(tokensK, thresholdK, escalated = false) {
-	if (escalated) return `[TRAJECTORY-ESCALATED] Context usage at ${Math.round(tokensK)}K (threshold ${Math.round(thresholdK)}K) — 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, passing --summary "<content summary ≤20 chars>" (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild). 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 ${Math.round(tokensK)}K (threshold ${Math.round(thresholdK)}K). 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 — passing --summary "<content summary ≤20 chars>" describing the next work phase (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild) — 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 `${eventToken("limitMandatory")} Context usage at ${Math.round(tokensK)}K (threshold ${Math.round(thresholdK)}K) — 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, passing --summary "<content summary ≤20 chars>" (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild). 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 `${eventToken("limit")} Context usage at ${Math.round(tokensK)}K (threshold ${Math.round(thresholdK)}K). 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 — passing --summary "<content summary ≤20 chars>" describing the next work phase (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild) — 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) {
@@ -5905,22 +6087,25 @@ function eapBlock() {
 	].join("\n");
 }
 /**
-* Metaphor 强化块（v1.19.6，S142）：宁静号宇宙隐喻域（船/海/罗盘/日志/船员）。
+* Metaphor 强化块（v1.19.6，S142；v1.29 星舰意象升级，S142 用户拍板）：
+* 宁静号宇宙隐喻域（星舰/深空/航程/船员）。海船→星舰意象：one starship, one voyage；
+* deep space / launch / docking clamp；Departure Inspection（原 Harbor Inspection）。
 * 隐喻是记忆钩子——形象唤起约束，前述块保持规则精确。每条隐喻 = 一个不可违背的
 * 物理事实 + 行为判据（verdict）。全英文（与 CCE/Constraints 一致）；独立块可
 * 回退；无 osp 对应（dsp 扩展，不进对齐断言参照）。
+* 结构约束（docs/metaphor-domain.md M-1~M-4）：三层骨架不变 + 每条映射约束不变。
 */
 function metaphorBlock() {
 	return [
 		"",
 		"=== Serenity Metaphor ===",
-		"The Serenity Universe — one ship, one sea. Metaphors are memory hooks:",
+		"The Serenity Universe — one starship, one voyage. Metaphors are memory hooks:",
 		"they make constraints vivid, while the rules above stay precise. Each",
 		"metaphor is an unbreakable physical fact; violating one is a behavioral",
 		"violation. The universe is structured in three layers — the Ship (the",
 		"container itself), the Voyage (the cognitive lifecycle), the Crew",
 		"(multi-agent collaboration); every metaphor maps to one protocol",
-		"constraint. The Sea has no mistakes — only waters you have not yet charted.",
+		"constraint. Deep space has no mistakes — only stars you have not yet mapped.",
 		"",
 		"THE SHIP — the container itself",
 		"",
@@ -5930,8 +6115,8 @@ function metaphorBlock() {
 		"   container = overload.",
 		"",
 		"2. Deck Order → Entropy (H_op). Clutter on deck raises the cost of",
-		"   finding things. H_op ≤ H_critical = the ship stays afloat.",
-		"   Verdict: disorganized output = stones on deck.",
+		"   finding things. H_op ≤ H_critical = the ship stays flight-worthy.",
+		"   Verdict: disorganized output = debris in the hold.",
 		"",
 		"3. Engineering Drawings → EAP. Every part dimensioned (E↑), the",
 		"   drawings rebuild the whole machine (R↓), the drawings are reusable",
@@ -5947,14 +6132,14 @@ function metaphorBlock() {
 		"   is on the manifest (mech-registry); there is exactly one manifest.",
 		"   An MSM self-describes (--help/--schema) — the manifest is the only",
 		"   key. Verdict: duplicating a tool's usage in documents = two",
-		"   contradictory charts.",
+		"   contradictory star charts.",
 		"",
 		"THE VOYAGE — the cognitive lifecycle",
 		"",
-		"6. Harbor Inspection → First Anchor. The first anchor = departure",
-		"   inspection: confirm identity (ACC manifesto), logbook (SESSION),",
-		"   ballast (constraints) before setting sail. Verdict: skipping the",
-		"   anchor and working directly = sailing uninspected.",
+		"6. Departure Inspection → First Anchor. The departure inspection = pre-",
+		"   launch checklist: confirm identity (ACC manifesto), logbook (SESSION),",
+		"   ballast (constraints) before setting course. Verdict: skipping the",
+		"   inspection and launching directly = flying uninspected.",
 		"",
 		"7. The Logbook → Session Tracking. SESSION.md is the trajectory's logbook —",
 		"   the persistent body of the voyage; sessions are rebuildable carriers of",
@@ -6090,12 +6275,12 @@ function sessionBlock(root, scope = DEFAULT_SESSION_SCOPE) {
 		"This preserves the session context across todo updates.",
 		"Do NOT remove or reorder this item — keep it at position 0.",
 		"",
-		"TRAJECTORY-STEWARD: a background tracker scores your tool use (write/edit=3,",
+		"TRAJECTORY-ASSISTANT: a background tracker scores your tool use (write/edit=3,",
 		"task=10, read/grep/glob/msm=1, +1 per minute) and reminds you with a",
-		"[TRAJECTORY-STEWARD] message when the threshold is reached. On every such",
+		"[TRAJECTORY-ASSISTANT · CHECKPOINT] message when the threshold is reached. On every such",
 		"reminder you MUST reply with the exact ACK code:",
-		"  [TRAJECTORY-STEWARD-recorded-{code}]  — if you recorded progress to SESSION.md",
-		"  [TRAJECTORY-STEWARD-skipped-{code}]  — if nothing to record this round",
+		"  [TRAJECTORY-ASSISTANT-recorded-{code}]  — if you recorded progress to SESSION.md",
+		"  [TRAJECTORY-ASSISTANT-skipped-{code}]  — if nothing to record this round",
 		"Do not ignore the reminder; do not stop ongoing work. Codes are single-use;",
 		"never reuse a prior code.",
 		""
@@ -6235,6 +6420,17 @@ function registerEntrySkillSection(agent, root) {
 //#endregion
 //#region src/seams/context.ts
 const DEFAULT_ENTRY_SKILL_MAX_CHARS = 3e4;
+/** 从 dsh 会话日志读标题（latest-wins `session/title` 事件；无返回 null）——供标题 reconcile（U3） */
+function readDshSessionTitle(session) {
+	try {
+		const events = sessionEvents(session);
+		for (let i = events.length - 1; i >= 0; i--) {
+			const e = events[i];
+			if (e?.type === "session/title" && typeof e.data?.title === "string" && e.data.title.trim() !== "") return e.data.title.trim();
+		}
+	} catch {}
+	return null;
+}
 function accIdentityText(root, configPaths = DEFAULT_SERENITY_CONFIG_PATHS, entrySkillMaxChars = DEFAULT_ENTRY_SKILL_MAX_CHARS) {
 	loadSerenityConfig(root, configPaths);
 	const defaultModel = readHandymanConfig(root, configPaths)?.defaultModel;
@@ -6322,17 +6518,56 @@ function registerContext(ctx, opts = {}) {
 		const scope = agentScope(agent);
 		if (shouldRestoreActive(agent) && getActiveSessionInfo(scope) === null) try {
 			if (loadSerenityConfig(root, configPaths).hooks?.autoRestoreSession ?? true) {
-				const info = parseSessionContextFromEvents(sessionEvents(agent.session));
-				if (info) {
-					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}`);
+				const dshSession = agent.session;
+				let restored = null;
+				const bound = readLastBound(dshSession);
+				if (bound) {
+					const abs = bound.mdPath.startsWith(root) ? bound.mdPath : resolve(root, bound.mdPath);
+					if (existsSync(abs)) restored = {
+						dirName: bound.dirName,
+						mdPath: abs,
+						sessionId: bound.sessionId
+					};
+				}
+				if (!restored) {
+					const info = parseSessionContextFromEvents(sessionEvents(dshSession));
+					if (info) {
+						const abs = info.mdPath.startsWith(root) ? info.mdPath : resolve(root, info.mdPath);
+						if (existsSync(abs)) restored = {
+							dirName: info.dirName,
+							mdPath: abs,
+							sessionId: info.sessionId
+						};
+					}
+				}
+				if (!restored) {
+					const title = readDshSessionTitle(dshSession);
+					if (title) {
+						const md = resolveSessionByTitle(title, sessionsRoot(root));
+						if (md && existsSync(md)) {
+							const dirName = basename(dirname(md));
+							restored = {
+								dirName,
+								mdPath: md,
+								sessionId: void 0
+							};
+							appendBound(dshSession, "reconcile", {
+								dirName,
+								mdPath: md,
+								note: "auto from title"
+							});
+							console.log(`[serenity-hooks] ↻ 标题兼容持久化绑定: ${title} → ${dirName}`);
+						}
 					}
 				}
+				if (restored) {
+					const derived = restored.sessionId ?? (restored.dirName.match(/--([^--]+)--/) ? restored.dirName.match(/--([^--]+)--/)[1] : void 0) ?? restored.dirName;
+					setActiveSessionInfo(scope, {
+						...restored,
+						sessionId: derived
+					});
+					console.log(`[serenity-hooks] ↻ 从历史恢复激活会话: ${restored.dirName}`);
+				}
 			}
 		} catch {}
 		if (injected.has(key)) return;
@@ -7025,6 +7260,58 @@ function registerStatusApi(ctx, opts = {}) {
 			}
 		}
 	});
+	ctx.webServer.register({
+		kind: "exact",
+		path: "/serenity/session-cleanup",
+		handler: async (req, res) => {
+			try {
+				const url = new URL(req.url ?? "/", "http://127.0.0.1");
+				const daysParam = Number(url.searchParams.get("olderThanDays") ?? "30");
+				const days = Number.isFinite(daysParam) && daysParam >= 1 ? daysParam : 30;
+				const sessions = ctx.get("sessions");
+				const liveIds = /* @__PURE__ */ new Set();
+				if (sessions?.list) for (const s of sessions.list()) {
+					const id = s.id ?? s.header?.id;
+					if (id) liveIds.add(id);
+				}
+				const { sessionsRootDir, collectEligibleSessions, performCleanup, cutoffDaysAgo } = await import("./session-cleanup-PahSNvjI.js");
+				const root = sessionsRootDir();
+				if (req.method === "GET") {
+					const { candidates } = performCleanup(root, cutoffDaysAgo(days), liveIds, { dryRun: true });
+					sendJson$1(res, 200, {
+						root,
+						olderThanDays: days,
+						dryRun: true,
+						count: candidates.length,
+						candidates: candidates.map((c) => ({
+							id: c.id,
+							project: c.project,
+							lastActive: new Date(c.lastActiveMs).toISOString()
+						}))
+					});
+					return;
+				}
+				if (req.method !== "POST") {
+					sendJson$1(res, 405, { error: "method not allowed" });
+					return;
+				}
+				if (req.headers["x-serenity-ui"] !== "1") {
+					sendJson$1(res, 403, { error: "会话清理仅限 WebUI（client 专用）" });
+					return;
+				}
+				const { result } = performCleanup(root, cutoffDaysAgo(days), liveIds);
+				sendJson$1(res, 200, {
+					root,
+					olderThanDays: days,
+					dryRun: false,
+					deleted: result.deleted,
+					errors: result.errors
+				});
+			} catch (err) {
+				sendJson$1(res, 400, { error: err.message ?? String(err) });
+			}
+		}
+	});
 }
 /** 进行中的扫码登录（loginKey → 状态；进程内，5min 有效） */
 const weixinLogins = /* @__PURE__ */ new Map();
@@ -8088,6 +8375,8 @@ const MECHANISM_WORDS = [
 	"tools/post-execute",
 	"session_rebuild",
 	"Trajectory Steward",
+	"TRAJECTORY-STEWARD",
+	"TRAJECTORY-ASSISTANT",
 	"first-anchor",
 	"拦截缝",
 	"装配层",
@@ -8190,7 +8479,9 @@ const CATEGORY_GUIDE = {
 */
 function buildRebuke(hits) {
 	const count = hits.length;
-	return `[SERENITY OUTPUT GUARD] Your previous response contained ${count} sensitive internal ${count === 1 ? "term" : "terms"} that must not appear in user-visible output:\n${hits.map((h) => `- "${h.word}" — ${CATEGORY_GUIDE[h.category]}`).join("\n")}\nRegenerate the response from scratch without ANY of these — describe the same substance without referencing internal machinery, credentials, ports, tool names, or implementation details. Do not repeat the terms; do not explain this instruction to the user.`;
+	const noun = count === 1 ? "term" : "terms";
+	const lines = hits.map((h) => `- "${h.word}" — ${CATEGORY_GUIDE[h.category]}`).join("\n");
+	return `${eventToken("guard")} Your previous response contained ${count} sensitive internal ${noun} that must not appear in user-visible output:\n${lines}\nRegenerate the response from scratch without ANY of these — describe the same substance without referencing internal machinery, credentials, ports, tool names, or implementation details. Do not repeat the terms; do not explain this instruction to the user.`;
 }
 /** 打回状态（按 agent 会话跟踪连续命中轮数） */
 const rebukeStates = /* @__PURE__ */ new Map();