@shgroup/dsh-serenity-hooks 1.26.14 → 1.26.16

package/lib/index.js

@@ -6949,1598 +6949,2098 @@ const skiffAdminTool = defineTool({
 	}
 });
 //#endregion
-//#region src/tools/autotrajectory-exp.ts
+//#region src/autotrajectory.ts
+var autotrajectory_exports = /* @__PURE__ */ __exportAll({
+	AUTO_DIR_SUFFIX: () => AUTO_DIR_SUFFIX,
+	DEFAULT_AVOID_HOURS: () => DEFAULT_AVOID_HOURS,
+	DEFAULT_BIAS_PROVIDER: () => DEFAULT_BIAS_PROVIDER,
+	MOTIVATION_MARKER: () => MOTIVATION_MARKER,
+	TICK_MS: () => TICK_MS,
+	beijingHour: () => beijingHour,
+	buildWakeMessage: () => buildWakeMessage,
+	diagLive: () => diagLive,
+	fetchBiasContent: () => fetchBiasContent,
+	getAutoTrajectoryStatus: () => getAutoTrajectoryStatus,
+	inAllowedWakeWindow: () => inAllowedWakeWindow,
+	isAutoTrajectorySession: () => isAutoTrajectorySession,
+	listLiveSessions: () => listLiveSessions,
+	performAutoTrajectoryWake: () => performAutoTrajectoryWake,
+	readAutoTrajectorySettings: () => readAutoTrajectorySettings,
+	readSelfGeneratedMotivation: () => readSelfGeneratedMotivation,
+	registerAutoTrajectory: () => registerAutoTrajectory,
+	resolveAutoTrajectoryCcc: () => resolveAutoTrajectoryCcc,
+	resolveTargetMd: () => resolveTargetMd,
+	shouldWake: () => shouldWake
+});
+const PLUGIN_SOURCE$3 = {
+	kind: "plugin",
+	plugin: "dsh-serenity-hooks"
+};
+/** 偏见内容提供者脚本缺省名（CCC 根目录下；用户拍板：tool 直接运行，缺失报错要求实现） */
+const DEFAULT_BIAS_PROVIDER = "autotrajectory-bias.ts";
+/** 自主轨迹会话目录后缀标志（用户拍板：后缀） */
+const AUTO_DIR_SUFFIX = "--auto";
+/** 调度 tick 周期（10min——验证形态"一个就够"） */
+const TICK_MS = 6e5;
+/** SESSION.md 内「下一轮动机」段标记（自生偏见载体——轨迹预设自己的未来） */
+const MOTIVATION_MARKER = "下一轮动机";
+/** 缺省避开的高峰时段（北京时间 [start, end) 不唤起——用量峰谷省钱） */
+const DEFAULT_AVOID_HOURS = {
+	start: 8,
+	end: 18
+};
+function readAutoTrajectorySettings(root) {
+	return loadSerenityConfig(root).autotrajectory ?? null;
+}
 /**
-* autotrajectory-exp.ts — 自主轨迹实验一站式管理工具（v1.26.12 实验提案，默认关）
-*
-* 定位：dsp **只提供工具与知识**，不向 CCC 自动安装任何东西（实验可能失败，不污染 CCC）——
-* 实验是 CCC 的自选动作：agent 调本工具（doc/全报告）即懂实验，init/random/check 辅助，
-* 实际执行（写配置/写偏见脚本/标记会话）由 CCC 自己决定、自己用现有工具完成。
-*
-* 实现：薄封装——exec 包内静态脚本（npm files 含 experiments/），脚本是单一真相源。
-* 环境注入 SERENITY_ROOT（当前 CCC 根）供脚本定位；bun 优先（可直跑 TS）。
+* 北京时间（UTC+8）当前小时——不依赖服务器时区（服务器可能 UTC/本地任意）。
 */
+function beijingHour(nowMs) {
+	return Math.floor((nowMs + 288e5) % 864e5 / 36e5);
+}
 /**
-* 定位包内实验脚本（npm files 分发 experiments/autotrajectory/）。
-* 布局差异：tsdown bundle 后 import.meta.url 指向 lib/index.js（lib → 包根 1 层）；
-* vitest 源码直跑时指向 src/tools/x.ts（src/tools → 包根 2 层）——逐级上溯查找，
-* 两种布局都稳（找到 experiments/autotrajectory/scripts/autotrajectory-exp.ts 即止）。
+* 唤起窗口判定：北京时间 [avoidStart, avoidEnd) 内不唤起（缺省 8~18）。
+* 单段避开（start<=end）：窗口 = [0,start) ∪ [end,24)；跨零点避开（start>end）：窗口 = [end,start)。
 */
-function findExpScript(startDir) {
-	let cur = startDir;
-	while (true) {
-		const cand = join(cur, "experiments", "autotrajectory", "scripts", "autotrajectory-exp.ts");
-		if (existsSync(cand)) return cand;
-		const parent = dirname(cur);
-		if (parent === cur) return null;
-		cur = parent;
-	}
+function inAllowedWakeWindow(nowMs, avoid) {
+	const start = avoid?.start ?? DEFAULT_AVOID_HOURS.start;
+	const end = avoid?.end ?? DEFAULT_AVOID_HOURS.end;
+	const h = beijingHour(nowMs);
+	if (start <= end) return h < start || h >= end;
+	return h >= end && h < start;
 }
-/** 包内实验脚本（上溯查找；找不到 → execute 报错提示包完整性） */
-const EXP_SCRIPT = findExpScript(dirname(fileURLToPath(import.meta.url)));
-const AUTO_TRAJECTORY_EXP_ACTIONS = [
-	"all",
-	"init",
-	"random",
-	"diag",
-	"doc",
-	"check",
-	"status",
-	"guide"
-];
-function agentCwd$1(exec) {
-	return exec.agent?.session?.header?.cwd ?? process.cwd();
+/** 标志位判定：SESSION.md 所在目录名以 --auto 结尾 → 自主轨迹形态 */
+function isAutoTrajectorySession(mdPath) {
+	return basename(dirname(mdPath)).endsWith(AUTO_DIR_SUFFIX);
 }
-function renderText(value) {
-	return [{
-		type: "text",
-		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
-	}];
+/**
+* 目标会话定位：**必须配置 cfg.session**（S###/目录名）——CCC 日常有多条 trajectory 在跑，
+* 绝不默认唤起（缺省最近活跃会误伤其他正在运行的轨迹；用户拍板：必须配置才生效）。
+* 未配置 session 或未命中 → null（不唤起）。
+*/
+function resolveTargetMd(root, cfg) {
+	if (!cfg?.session) return null;
+	const found = findSession(sessionsRoot(root), cfg.session);
+	if (!found) return null;
+	const md = join(found.path, "SESSION.md");
+	return existsSync(md) ? md : null;
 }
-const autoTrajectoryExpTool = defineTool({
-	name: "autotrajectory-exp",
-	description: "自主轨迹实验（Self-Sustaining Trajectory）一站式管理——实验提案 v1.26.14，默认关。无参/action=all：全报告（背景摘要 + 就绪检查 + 状态 + 下一步）——CCC agent 看一次即完整理解实验并知道怎么开始；init：初始化辅助（写配置 + 生成偏见提供者脚本模板）；random：运行偏见提供者脚本输出当前偏见内容；diag：唤起条件链诊断（--ccc <path> 指定 CCC，无参递归扫描 /home/yh 两层——覆盖任意实验 CCC 位置；逐条件输出 + 阻断点 + 修复建议）；doc：实验定义全文；check/status/guide：单项。实验是 CCC 的自选动作——dsp 只提供工具与知识，不自动安装任何东西。",
-	parameters: { action: {
-		type: "string",
-		enum: [...AUTO_TRAJECTORY_EXP_ACTIONS],
-		required: true,
-		description: "Subcommand"
-	} },
-	output: {
-		schema: { type: "json" },
-		render: (_args, value) => renderText(value)
-	},
-	async execute(args, exec) {
-		const root = findSerenityRoot(agentCwd$1(exec));
-		const result = {};
-		if (!EXP_SCRIPT) {
-			result.error = "autotrajectory-exp 实验脚本未随安装分发（npm 包缺 experiments/autotrajectory/）——请检查包完整性";
-			return result;
-		}
-		const script = EXP_SCRIPT;
-		if (!existsSync(script)) {
-			result.error = `autotrajectory-exp 脚本缺失（${script}）——实验包未随安装分发，请检查 npm 包完整性`;
-			return result;
-		}
-		const env = { ...process.env };
-		if (root) env.SERENITY_ROOT = root;
-		const r = spawnSync("bun", [script, args.action ?? "all"], {
+/**
+* 唤起条件（纯逻辑，可测）：enabled + 未在运行 + 目录标志 + mtime 超间隔 + 窗口允许。
+*/
+function shouldWake(settings, mdPath, nowMs, running) {
+	if (!settings?.enabled || running) return false;
+	if (!mdPath || !isAutoTrajectorySession(mdPath)) return false;
+	if (!inAllowedWakeWindow(nowMs, settings.avoidWakeHours)) return false;
+	try {
+		const mtime = statSync(mdPath).mtimeMs;
+		const hours = Math.max(1, settings.intervalHours ?? 12);
+		return nowMs - mtime >= hours * 36e5;
+	} catch {
+		return false;
+	}
+}
+/** 自生动机读取：SESSION.md「下一轮动机」段内容（到下一个二级标题或文件尾；无 → null） */
+function readSelfGeneratedMotivation(mdPath) {
+	try {
+		const content = readFileSync(mdPath, "utf-8");
+		const idx = content.indexOf(MOTIVATION_MARKER);
+		if (idx < 0) return null;
+		const rest = content.slice(idx + 5);
+		const nextHeading = rest.search(/\n## /);
+		return (nextHeading >= 0 ? rest.slice(0, nextHeading) : rest).trim() || null;
+	} catch {
+		return null;
+	}
+}
+/**
+* 偏见内容：直接运行 CCC 根目录下偏见提供者脚本（biasProvider，缺省 autotrajectory-bias.ts）→ stdout。
+* 脚本缺失 → 返回 { text: null, error: 提示实现 }（唤起侧报错要求实现，不静默跳过）。
+* 路径逃逸校验（resolveInside）；bun 优先，node 兜底；600s 超时。
+*/
+async function fetchBiasContent(root, providerRel) {
+	let scriptAbs;
+	try {
+		scriptAbs = resolveInside(root, providerRel);
+	} catch {
+		return {
+			text: null,
+			error: `biasProvider 路径逃逸（须在 CCC 根内）: ${providerRel}`
+		};
+	}
+	if (!existsSync(scriptAbs)) return {
+		text: null,
+		error: `请在 CCC 根目录实现偏见内容提供者脚本: ${providerRel}（stdout 输出偏见内容一行；acc_msm exec autotrajectory-exp init 可生成模板）`
+	};
+	const runs = [["bun", [scriptAbs]], [process.execPath, [scriptAbs]]];
+	for (const [cmd, args] of runs) try {
+		const r = spawnSync(cmd, args, {
 			encoding: "utf-8",
 			timeout: 6e5,
-			env,
 			stdio: [
 				"ignore",
 				"pipe",
 				"pipe"
 			]
 		});
-		if (r.status === 0) {
-			result.output = r.stdout?.trim() || "(empty)";
-			return result;
-		}
-		if (r.error?.code === "ENOENT") {
-			result.error = "autotrajectory-exp 需要 bun 运行时（bun not found in PATH）";
-			return result;
-		}
-		result.error = r.stderr?.trim() || r.stdout?.trim() || `exit ${r.status ?? "?"}`;
-		return result;
+		if (r.status === 0) return {
+			text: (r.stdout ?? "").trim() || null,
+			error: null
+		};
+		if (r.error?.code === "ENOENT") continue;
+		return {
+			text: null,
+			error: `偏见内容提供者脚本执行失败（exit ${r.status ?? "?"}）: ${r.stderr?.trim() || r.stdout?.trim() || ""}`
+		};
+	} catch {
+		continue;
 	}
-});
-//#endregion
-//#region src/seams/keeper.ts
-const SCORES = {
-	write: 3,
-	edit: 3,
-	str_replace_editor: 3,
-	task: 10,
-	read: 1,
-	grep: 1,
-	glob: 1,
-	skill: 1,
-	acc_msm: 1,
-	cc_fs: 1
-};
-function scoreTool(toolName) {
-	return SCORES[toolName] ?? 0;
+	return {
+		text: null,
+		error: "偏见内容提供者脚本无法运行（bun 与 node 均不可用）"
+	};
 }
-var KeeperTracker = class {
-	threshold;
-	now;
-	score = 0;
-	lastTs = 0;
-	counter = 0;
-	constructor(threshold, now = Date.now) {
-		this.threshold = threshold;
-		this.now = now;
-	}
-	/** 记录一次工具调用 + 经过时间；返回是否应触发提醒 */
-	step(toolName) {
-		const now = this.now();
-		if (this.lastTs > 0) this.score += Math.floor((now - this.lastTs) / 6e4);
-		this.lastTs = now;
-		this.score += scoreTool(toolName);
-		return this.score >= this.threshold;
-	}
-	/** 生成确认码并清零积分 */
-	ack() {
-		this.counter += 1;
-		this.score = 0;
-		this.lastTs = 0;
-		return `K${this.counter}`;
-	}
-	get currentScore() {
-		return this.score;
-	}
-};
-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.`;
+/** 唤起消息（三段式：身份锚定 / 先验偏见[自生动机+偏见内容] / 任务）——注入前台会话，用户可见 */
+function buildWakeMessage(opts) {
+	const lines = [
+		`[自主轨迹唤起] — 距上次轨迹活动已满 ${opts.intervalHours} 小时，自动继续。`,
+		"",
+		`身份锚定：继续 ${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("  · （无——本轮纯自主探索）");
+	lines.push("", "任务：执行一轮自主认知（探索/反事实检验），把产出写入 SESSION.md", "「自主探索日志」段，并预写「下一轮动机」段。完成后自然结束。");
+	return lines.join("\n");
 }
-/**
-* F2 rebuild 提示（v1.21；v1.22.1 对齐"轨迹跟踪器"概念；v1.23.0 英化 + 载体关系；
-* v1.23.3 行动指令化——用户反馈"一直在触发为啥没执行"：旧文案是状态播报式
-* （"[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, 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) {
-	try {
-		const projections = ctx.get?.("sessionProjections");
-		if (!projections) return null;
-		const pressure = (projections.snapshot?.(session))?.values?.contextPressure;
-		if (!pressure || typeof pressure.projectedTokens !== "number") return null;
-		return {
-			projectedTokens: pressure.projectedTokens,
-			contextWindow: pressure.contextWindow
+async function performAutoTrajectoryWake(ctx, root, settings, opts = {}) {
+	if (!settings?.enabled) return {
+		ok: false,
+		detail: "autotrajectory 未启用（enabled=false）"
+	};
+	const mdPath = resolveTargetMd(root, settings);
+	if (!mdPath) return {
+		ok: false,
+		detail: "目标会话未命中（session 未配置或 AGENT_SESSIONS 无匹配）"
+	};
+	if (!isAutoTrajectorySession(mdPath)) return {
+		ok: false,
+		detail: "目标会话目录无 --auto 标志（AGENT_SESSIONS/<date>--<desc>--auto/）"
+	};
+	if (!opts.force) {
+		const now = Date.now();
+		if (!inAllowedWakeWindow(now, settings.avoidWakeHours)) return {
+			ok: false,
+			detail: "当前在北京高峰避开窗口内（不唤起）"
 		};
-	} catch {
-		return null;
-	}
-}
-const PLUGIN_SOURCE$3 = {
-	kind: "plugin",
-	plugin: "dsh-serenity-hooks"
-};
-/** 每 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) => {
-		const key = exec.agent?.session?.id ?? "global";
-		let t = trackers.get(key);
-		if (!t) {
-			const root = findSerenityRoot(exec.agent?.session?.header?.cwd ?? process.cwd());
-			t = new KeeperTracker(root ? loadSerenityConfig(root, opts.configPaths).sessionKeeper?.threshold ?? defaultThreshold : defaultThreshold);
-			trackers.set(key, t);
+		try {
+			const mtime = statSync(mdPath).mtimeMs;
+			const hours = Math.max(1, settings.intervalHours ?? 12);
+			if (now - mtime < hours * 36e5) return {
+				ok: false,
+				detail: `距上次轨迹活动不足 ${hours}h（等待中）`
+			};
+		} catch {
+			return {
+				ok: false,
+				detail: "SESSION.md 读取失败（statSync）"
+			};
 		}
-		return t;
+	}
+	const agent = resolveTargetAgent(ctx, mdPath);
+	if (!agent) return {
+		ok: false,
+		detail: `目标会话 agent 不可得——${diagnoseTargetUnavailable(ctx, mdPath) ?? "目标会话未打开或命名未生效"}`
 	};
-	ctx.on("tools/post-execute", async (exec, _result, next) => {
-		if (!exec.agent) return next();
-		const cwd = exec.agent?.session?.header?.cwd ?? process.cwd();
-		const root = findSerenityRoot(cwd);
-		if (!root) return next();
-		const sessionId = exec.agent?.session?.id;
-		const skiffKeeper = skiffTrajectoryEnabled(root, sessionId, "keeper");
-		const skiffRebuild = skiffTrajectoryEnabled(root, sessionId, "rebuild");
-		const tracker = trackerFor(exec);
-		const shouldRemind = skiffKeeper ? tracker.step(exec.name) : false;
-		const downstream = await next();
-		const blocks = [];
-		if (shouldRemind) {
-			const code = tracker.ack();
-			blocks.push({
-				type: "text",
-				text: reminderText(code, tracker.currentScore)
-			});
-		}
-		if (skiffRebuild && readSimpleSettings().rebuildEnabled) {
-			const session = exec.agent?.session;
-			if (session) {
-				const pressure = readContextPressure(ctx, session);
-				if (pressure && pressure.contextWindow && pressure.contextWindow > 0) {
-					const ratio = pressure.projectedTokens / pressure.contextWindow;
-					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);
-					}
-				}
-			}
-		}
-		if (blocks.length === 0) return downstream;
-		const reminderAll = createUserMessage({
-			content: blocks,
-			source: PLUGIN_SOURCE$3
-		});
-		if (downstream.kind === "block") return {
-			kind: "block",
-			feedback: downstream.feedback,
-			additionalContexts: [reminderAll, ...downstream.additionalContexts ?? []]
-		};
-		return {
-			...downstream,
-			additionalContexts: [reminderAll, ...downstream.additionalContexts ?? []]
-		};
+	const provider = settings.biasProvider?.trim() || "autotrajectory-bias.ts";
+	const biasRes = await fetchBiasContent(root, provider);
+	if (biasRes.error) return {
+		ok: false,
+		detail: `偏见内容缺失：${biasRes.error}`
+	};
+	const motivation = readSelfGeneratedMotivation(mdPath);
+	const message = buildWakeMessage({
+		sessionName: basename(dirname(mdPath)),
+		mdPath,
+		intervalHours: Math.max(1, settings.intervalHours ?? 12),
+		motivation,
+		biasContent: biasRes.text
 	});
+	agent.steer(createUserMessage({
+		content: [{
+			type: "text",
+			text: message
+		}],
+		source: PLUGIN_SOURCE$3
+	}));
+	return {
+		ok: true,
+		detail: `已唤起 ${basename(dirname(mdPath))}（偏见提供者 ${provider}）`
+	};
 }
-//#endregion
-//#region src/skills-discovery.ts
 /**
-* skills-discovery.ts — CCC 入口 skill 自动发现（纯逻辑，零 DSH 依赖）
+* 装配（index.ts apply 调用）。时钟唤起（v1.26.14 修复——用户"手动唤起正常，时钟唤起不工作"）：
 *
-* 发现全部入口技能（原文全量，不截断）：
-*   0. **`.serenity` 记号文件内容 = 顶层入口 skill 名**（CCC 记号文件的权威语义，
-*      tiangong-serenity 的 .serenity 内容为 `tg-serenity`）—— 最高优先
-*   1. `.dsh/entry-skill` 指针文件（内容 = skill 名）—— 兼容旧约定
-*   2. `.opencode/skills/*-serenity/SKILL.md` —— 自动扫描该 CCC 的顶层入口
-*      （home-serenity / tg-serenity / pangu-serenity …，命名模式 `*-serenity`）
-*   3. `.dsh/skills/*-serenity/SKILL.md` —— 自动扫描 ACC/harness 入口（acc-serenity 等）
-* 按名去重；顺序 = 记号文件 → 指针 → opencode 入口 → dsh 入口。
+* 根因：旧实现启动时一次性 `resolveAutoTrajectoryRoot(ctx)`——web 进程启动时 live 会话
+* 往往为空（用户尚未打开实验 CCC 会话）→ root=null → settings=null → **定时器根本不启动**；
+* 手动唤起走 HTTP 端点（点击时重新解析 root）→ 正常。
 *
-* 任何 CCC 都能自动注入其顶层入口 skill 全文（不硬编码名字）。
+* 修复：
+* ① **动态解析**：每次 tick 重新解析 root + settings（不绑定启动时值）——live 会话变化即跟上；
+* ② **事件驱动启动**：监听 `session/created`（live 会话出现）→ 启动定时器（进程启动时若
+*    已有实验 CCC 会话则立即启动）；
+* ③ **优先实验 CCC**：resolveAutoTrajectoryCcc（配置了 autotrajectory 的 live CCC）优先于
+*    进程 cwd/任一 live（多 CCC 同实例时时钟唤起绑定实验 CCC，而非当前维护会话 CCC）。
+*
+* 零资源占用语义保留：未配置/未启用 → tick 内直接 return（定时器存在但每 10min 一次空检查，
+* unref 不阻塞进程退出）。
 */
-/** 顶层入口命名模式：目录名以 -serenity 结尾（home-serenity / tg-serenity / acc-serenity …） */
-const SERENITY_SUFFIX = "-serenity";
-function isSerenityEntry(name) {
-	return name.endsWith(SERENITY_SUFFIX);
-}
-/** 扫描某 skills 根下所有 `*-serenity` 目录（含 SKILL.md 的） */
-function scanSerenityDirs(skillsRoot) {
-	if (!existsSync(skillsRoot)) return [];
-	return readdirSync(skillsRoot).filter((name) => isSerenityEntry(name)).map((name) => join(skillsRoot, name)).filter((dir) => statSync(dir).isDirectory() && existsSync(join(dir, "SKILL.md"))).sort();
+function registerAutoTrajectory(ctx) {
+	let timer = null;
+	let running = false;
+	/** 解析当前应绑定的实验 CCC：配置了 autotrajectory 的 live CCC 优先，回退进程 cwd/任一 live */
+	const resolveRoot = () => resolveAutoTrajectoryCcc(ctx) ?? resolveAutoTrajectoryRoot(ctx);
+	const tick = () => {
+		if (running) return;
+		const root = resolveRoot();
+		const settings = root ? readAutoTrajectorySettings(root) : null;
+		if (!settings?.enabled) return;
+		if (!shouldWake(settings, resolveTargetMd(root, settings), Date.now(), running)) return;
+		running = true;
+		(async () => {
+			try {
+				const res = await performAutoTrajectoryWake(ctx, root, settings, { force: false });
+				if (res.ok) console.log(`[serenity-hooks] ✓ 自主轨迹唤起（${res.detail}）`);
+				else console.warn(`[serenity-hooks] ✗ 自主轨迹唤起跳过：${res.detail}`);
+			} catch (err) {
+				console.warn(`[serenity-hooks] ✗ 自主轨迹唤起失败: ${String(err?.message ?? err)}`);
+			} finally {
+				running = false;
+			}
+		})();
+	};
+	const startTimer = () => {
+		if (timer) return;
+		const root = resolveRoot();
+		const settings = root ? readAutoTrajectorySettings(root) : null;
+		if (!settings?.enabled) return;
+		timer = setInterval(tick, TICK_MS);
+		timer.unref();
+		console.log(`[serenity-hooks] ✓ 自主轨迹定时器启动（${root}，intervalHours=${settings.intervalHours ?? 12}）`);
+		tick();
+	};
+	startTimer();
+	try {
+		ctx.on("session/created", () => startTimer());
+	} catch {}
 }
-/** 防穿越：skill 名必须是简单目录名（拒绝分隔符与 `..`/`.` 路径段） */
-function isSafeSkillName(name) {
-	if (name.length === 0) return false;
-	if (name.includes("/") || name.includes("\\")) return false;
-	return !name.split(/[/\\]/).some((seg) => seg === ".." || seg === ".");
+/** 目标 agent：从 SESSION.md 反向定位 dsh 会话（标题 F3 命名 S###-日期 匹配 + cwd 归属校验）；不可得 → null */
+function resolveTargetAgent(ctx, mdPath) {
+	const idMatch = basename(dirname(mdPath)).match(/--S(\d{3,})--/);
+	const sid = idMatch ? `S${idMatch[1]}` : null;
+	const targetRoot = findSerenityRoot(mdPath);
+	try {
+		const sessions = ctx.sessions;
+		for (const s of sessions?.list?.() ?? []) {
+			const cwd = s?.header?.cwd ?? "";
+			if (targetRoot) {
+				if (findSerenityRoot(cwd) !== targetRoot) continue;
+			} else if (cwd !== "" && !mdPath.startsWith(cwd.endsWith("/") ? cwd : cwd + "/")) continue;
+			const title = readSessionTitle(s);
+			if (sid && title && (title === sid || title.startsWith(`${sid}-`))) {
+				const agent = ctx.agents?.get?.(s.id ?? "");
+				if (agent) return agent;
+			}
+		}
+	} catch {}
+	return null;
 }
-/** 按名在两个 skills 根下定位 SKILL.md（.dsh/skills 优先，其次 .opencode/skills） */
-function findSkillMd(root, name) {
-	if (!isSafeSkillName(name)) return null;
-	for (const base of [".dsh", ".opencode"]) {
-		const p = resolve(root, base, "skills", name, "SKILL.md");
-		if (existsSync(p)) return p;
-	}
+/**
+* 从 dsh 会话 log 读取标题（latest-wins `session/title` 事件）——
+* **标题不在 sessions.list() 条目上**（wire/对象均无 title 字段；F3 命名经
+* sessionTitle.rename 写进 session log），必须从 events 提取（rebuild 同款读取模式）。
+*/
+function readSessionTitle(session) {
+	try {
+		const events = session?.events;
+		if (!Array.isArray(events)) return null;
+		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 findEntrySkills(root) {
-	const out = [];
-	const seen = /* @__PURE__ */ new Set();
-	const add = (path, source, forcedName) => {
-		if (!existsSync(path)) return;
-		const name = forcedName ?? basename(dirname(path));
-		if (seen.has(name)) return;
-		seen.add(name);
-		out.push({
-			name,
-			content: readFileSync(path, "utf-8"),
-			source
-		});
-	};
-	const marker = resolve(root, ".serenity");
-	if (existsSync(marker)) {
-		const name = readFileSync(marker, "utf-8").trim();
-		if (name) {
-			const md = findSkillMd(root, name);
-			if (md) add(md, "serenity-marker", name);
+/**
+* 诊断：目标会话 agent 为何不可得（供 performAutoTrajectoryWake 失败信息——
+* 区分"live 会话里无匹配" vs "匹配但 agent 未加载"）。返回诊断文本（无则 null）。
+*/
+function diagnoseTargetUnavailable(ctx, mdPath) {
+	const idMatch = basename(dirname(mdPath)).match(/--S(\d{3,})--/);
+	const sid = idMatch ? `S${idMatch[1]}` : null;
+	const targetRoot = findSerenityRoot(mdPath);
+	const sameCccTitles = [];
+	const agentMissing = { sid: false };
+	try {
+		const sessions = ctx.sessions;
+		for (const s of sessions?.list?.() ?? []) {
+			const cwd = s?.header?.cwd ?? "";
+			if (targetRoot) {
+				if (findSerenityRoot(cwd) !== targetRoot) continue;
+			} else if (cwd !== "" && !mdPath.startsWith(cwd.endsWith("/") ? cwd : cwd + "/")) continue;
+			const title = readSessionTitle(s);
+			if (title) sameCccTitles.push(title);
+			if (sid && title && (title === sid || title.startsWith(`${sid}-`))) {
+				if (!ctx.agents?.get?.(s.id ?? "")) agentMissing.sid = true;
+			}
 		}
-	}
-	const pointer = resolve(root, ".dsh", "entry-skill");
-	if (existsSync(pointer)) {
-		const name = readFileSync(pointer, "utf-8").trim();
-		if (name) {
-			const md = findSkillMd(root, name);
-			if (md) add(md, "pointer", name);
+	} catch {}
+	if (agentMissing.sid) return `会话 ${sid} 已打开但 agent 未加载（会话可能刚创建/正在恢复——稍后重试）`;
+	if (sameCccTitles.length > 0) return `目标 CCC 内 live 会话标题: [${sameCccTitles.join(", ")}]——均不匹配 ${sid}（目标会话未在 WebUI 打开，或命名未生效）`;
+	return `目标 CCC 内无 live 会话（先在 WebUI 打开 ${sid} 会话后重试）`;
+}
+/** 自主轨迹绑定的 CCC 根：进程 cwd 上溯 .serenity 优先，回退任一 live 会话 root */
+function resolveAutoTrajectoryRoot(ctx) {
+	const fromCwd = findSerenityRoot(process.cwd());
+	if (fromCwd) return fromCwd;
+	try {
+		const sessions = ctx.sessions;
+		for (const s of sessions?.list?.() ?? []) {
+			const r = findSerenityRoot(s?.header?.cwd ?? "");
+			if (r) return r;
 		}
-	}
-	for (const dir of scanSerenityDirs(resolve(root, ".opencode", "skills"))) add(join(dir, "SKILL.md"), "opencode");
-	for (const dir of scanSerenityDirs(resolve(root, ".dsh", "skills"))) add(join(dir, "SKILL.md"), "dsh");
-	return out;
+	} catch {}
+	return null;
 }
-function truncateContent(content, maxChars) {
-	if (content.length <= maxChars) return content;
-	return content.slice(0, maxChars) + `\n... (truncated, original length ${content.length} chars)`;
+function getAutoTrajectoryStatus(root) {
+	const cfg = readAutoTrajectorySettings(root);
+	const now = Date.now();
+	const base = {
+		configured: cfg !== null,
+		enabled: cfg?.enabled ?? false,
+		intervalHours: Math.max(1, cfg?.intervalHours ?? 12),
+		biasProvider: cfg?.biasProvider?.trim() || "autotrajectory-bias.ts",
+		session: cfg?.session ?? null,
+		avoidWakeHours: {
+			start: cfg?.avoidWakeHours?.start ?? DEFAULT_AVOID_HOURS.start,
+			end: cfg?.avoidWakeHours?.end ?? DEFAULT_AVOID_HOURS.end
+		},
+		beijingHour: beijingHour(now),
+		windowAllowed: inAllowedWakeWindow(now, cfg?.avoidWakeHours)
+	};
+	if (!cfg) return {
+		...base,
+		target: null
+	};
+	const mdPath = resolveTargetMd(root, cfg);
+	if (!mdPath) return {
+		...base,
+		target: null
+	};
+	let idleHours = 0;
+	try {
+		idleHours = (now - statSync(mdPath).mtimeMs) / 36e5;
+	} catch {}
+	return {
+		...base,
+		target: {
+			dirName: basename(dirname(mdPath)),
+			autoFlag: isAutoTrajectorySession(mdPath),
+			idleHours: Math.max(0, idleHours),
+			wakeable: shouldWake(cfg, mdPath, now, false)
+		}
+	};
 }
-const B32_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-/** base32（无填充，大小写不敏感）→ 字节；非法字符抛错。 */
-function base32Decode(input) {
-	const clean = input.toUpperCase().replace(/[\s=]/g, "");
-	if (clean.length === 0) throw new Error("empty base32");
+/** 遍历 live 会话（sessions.list()）+ 补标题（events session/title latest-wins）+ ccc 归属 */
+function listLiveSessions(ctx) {
 	const out = [];
-	let bits = 0;
-	let value = 0;
-	for (const ch of clean) {
-		const idx = B32_ALPHABET.indexOf(ch);
-		if (idx === -1) throw new Error(`invalid base32 char: ${ch}`);
-		value = value << 5 | idx;
-		bits += 5;
-		if (bits >= 8) {
-			out.push(value >>> bits - 8 & 255);
-			bits -= 8;
+	try {
+		const sessions = ctx.sessions;
+		for (const s of sessions?.list?.() ?? []) {
+			const cwd = s?.header?.cwd ?? null;
+			out.push({
+				id: s?.id ?? "",
+				cwd,
+				cccRoot: cwd ? findSerenityRoot(cwd) : null,
+				title: readSessionTitle(s)
+			});
 		}
-	}
-	return Uint8Array.from(out);
-}
-/** 一个时步的 TOTP code（6 位，前导零保留）。counter = floor(epochSeconds / step) */
-function totpCode(secretBase32, counter) {
-	const key = base32Decode(secretBase32);
-	const msg = Buffer.alloc(8);
-	msg.writeBigUInt64BE(BigInt(counter));
-	const digest = createHmac("sha1", Buffer.from(key)).update(msg).digest();
-	const offset = digest[digest.length - 1] & 15;
-	const bin = (digest[offset] & 127) << 24 | digest[offset + 1] << 16 | digest[offset + 2] << 8 | digest[offset + 3];
-	return String(bin % 10 ** 6).padStart(6, "0");
-}
-/** 当前 epoch 秒 */
-function nowEpochSeconds() {
-	return Math.floor(Date.now() / 1e3);
+	} catch {}
+	return out;
 }
 /**
-* 校验用户输入的 code（允许 ±TOTP_WINDOW 时步漂移，防重放窗口内同 code 复用由
-* 调用方按账号记录最近成功 counter 实现——本函数只做纯算法校验）。
-* @returns 命中的 counter（用于防重放）；不匹配返回 null。
-*/
-function verifyTotpCode(secretBase32, code, nowSeconds = nowEpochSeconds()) {
-	if (!/^\d{6}$/.test(code)) return null;
-	const current = Math.floor(nowSeconds / 30);
-	for (let offset = -1; offset <= 1; offset++) if (totpCode(secretBase32, current + offset) === code) return current + offset;
-	return null;
+* 面板解析：GET /serenity/autotrajectory 无 workspace 参数时——
+* **优先「配置了 autotrajectory 的 live CCC」**（用户实验状态所在；v1.26.14 修复：
+* 原 resolveWorkspace 解析到第一个 live 会话（如 home-serenity）→ 面板显示"未配置"，
+* 用户实验 CCC（pangu）检测不到）。优先级：已启用 → 已配置（未启用）→ null。
+*/
+function resolveAutoTrajectoryCcc(ctx) {
+	const enabled = [];
+	const configured = [];
+	for (const s of listLiveSessions(ctx)) {
+		if (!s.cccRoot) continue;
+		const cfg = readAutoTrajectorySettings(s.cccRoot);
+		if (!cfg) continue;
+		if (cfg.enabled) {
+			if (!enabled.includes(s.cccRoot)) enabled.push(s.cccRoot);
+		} else if (!configured.includes(s.cccRoot)) configured.push(s.cccRoot);
+	}
+	return enabled[0] ?? configured[0] ?? null;
+}
+function diagLive(ctx) {
+	const liveSessions = listLiveSessions(ctx);
+	const processCwd = process.cwd();
+	const processCcc = findSerenityRoot(processCwd);
+	const panelResolved = resolveAutoTrajectoryCcc(ctx);
+	const autotrajectoryCccs = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const s of liveSessions) {
+		if (!s.cccRoot || seen.has(s.cccRoot)) continue;
+		const cfg = readAutoTrajectorySettings(s.cccRoot);
+		if (!cfg) continue;
+		seen.add(s.cccRoot);
+		const status = getAutoTrajectoryStatus(s.cccRoot);
+		const mdPath = resolveTargetMd(s.cccRoot, cfg);
+		const agentResolved = mdPath ? resolveTargetAgent(ctx, mdPath) !== null : false;
+		const agentDiagnosis = mdPath && !agentResolved ? diagnoseTargetUnavailable(ctx, mdPath) : null;
+		autotrajectoryCccs.push({
+			root: s.cccRoot,
+			enabled: status.enabled,
+			session: status.session,
+			target: status.target,
+			agentResolved,
+			agentDiagnosis
+		});
+	}
+	return {
+		processCwd,
+		processCcc,
+		liveSessions,
+		autotrajectoryCccs,
+		panelResolved
+	};
 }
 //#endregion
-//#region src/config-ops.ts
+//#region src/tools/autotrajectory-exp.ts
 /**
-* config-ops.ts — plugin 全局配置读写（结构化，`~/.dsh/serenity-hooks.json`）
-*
-* 归属原则（S142 用户拍板，v1.22）：**plugin 是全局的，CCC 是具体的**——
-* 账号密码/gateway 监听配置是 plugin 级能力，归 plugin 全局文件；
-* CCC 的 localstore.json 只管 CCC 自己的凭据/配置。v1.21.x 曾把
-* `serenityAdvanced` 存进 CCC localstore（归属错误 + 与 DSH settings 开关割裂），
-* 本版本迁移到 plugin 全局文件（migrateLegacyLocalstore 一次性迁移）。
+* autotrajectory-exp.ts — 自主轨迹实验一站式管理工具（v1.26.12 实验提案，默认关）
 *
-* 文件：$DSH_HOME/serenity-hooks.json（缺省 ~/.dsh/serenity-hooks.json；
-* env SERENITY_HOOKS_CONFIG 可覆盖——测试/部署注入）。
-* 权限：0600（含账号密码 hash，敏感）。
+* 定位：dsp **只提供工具与知识**，不向 CCC 自动安装任何东西（实验可能失败，不污染 CCC）——
+* 实验是 CCC 的自选动作：agent 调本工具（doc/全报告）即懂实验，init/random/check 辅助，
+* 实际执行（写配置/写偏见脚本/标记会话）由 CCC 自己决定、自己用现有工具完成。
 *
-* 安全：密码仅存 scrypt hash（node:crypto 内置，零依赖）；wire 层永不返回 hash
-* （GET 只回 user/id，设置面板"密码"字段提交空串 = 不修改）。
+* 实现：薄封装——exec 包内静态脚本（npm files 含 experiments/），脚本是单一真相源。
+* 环境注入 SERENITY_ROOT（当前 CCC 根）供脚本定位；bun 优先（可直跑 TS）。
+* diag-live：**进程内诊断**（v1.26.14 用户"排查访问不到"）——闭包捕获 ctx，
+* 直接读 live 会话/标题/agent（脚本 diag 看不到运行时），输出实例级诊断报告。
 */
-/** 高级设定节名（localstore.json 顶层） */
-const ADVANCED_SECTION = "serenityAdvanced";
-/** 默认值（工厂——每次返回新对象，防止调用方意外共享引用） */
-function defaultAdvancedSettings() {
-	return {
-		gateway: {
-			enabled: false,
-			host: "0.0.0.0",
-			port: 3081,
-			accounts: [],
-			workspaces: [],
-			cookieSecure: false,
-			allowWorkspaceCreate: true,
-			totpEnabled: false
-		},
-		rebuild: {
-			enabled: true,
-			thresholdRatio: .9
-		},
-		naming: { enabled: true },
-		persona: {
-			mode: "",
-			overrideText: ""
-		},
-		publicAsk: {
-			key: "",
-			allowed: []
-		}
-	};
-}
-const SCRYPT_KEYLEN = 32;
-/** 生成 scrypt hash（格式 `salt:hex`）；salt 16 字节随机 */
-function hashPassword(password) {
-	const salt = randomBytes(16);
-	const derived = scryptSync(password, salt, SCRYPT_KEYLEN);
-	return `${salt.toString("hex")}:${derived.toString("hex")}`;
+/**
+* 定位包内实验脚本（npm files 分发 experiments/autotrajectory/）。
+* 布局差异：tsdown bundle 后 import.meta.url 指向 lib/index.js（lib → 包根 1 层）；
+* vitest 源码直跑时指向 src/tools/x.ts（src/tools → 包根 2 层）——逐级上溯查找，
+* 两种布局都稳（找到 experiments/autotrajectory/scripts/autotrajectory-exp.ts 即止）。
+*/
+function findExpScript(startDir) {
+	let cur = startDir;
+	while (true) {
+		const cand = join(cur, "experiments", "autotrajectory", "scripts", "autotrajectory-exp.ts");
+		if (existsSync(cand)) return cand;
+		const parent = dirname(cur);
+		if (parent === cur) return null;
+		cur = parent;
+	}
 }
-/** 校验密码与存储 hash（timing-safe） */
-function verifyPassword(password, stored) {
-	const idx = stored.indexOf(":");
-	if (idx <= 0) return false;
-	const salt = Buffer.from(stored.slice(0, idx), "hex");
-	const expected = Buffer.from(stored.slice(idx + 1), "hex");
-	const derived = scryptSync(password, salt, SCRYPT_KEYLEN);
-	return expected.length === derived.length && timingSafeEqual(expected, derived);
+/** 包内实验脚本（上溯查找；找不到 → execute 报错提示包完整性） */
+const EXP_SCRIPT = findExpScript(dirname(fileURLToPath(import.meta.url)));
+const AUTO_TRAJECTORY_EXP_ACTIONS = [
+	"all",
+	"init",
+	"random",
+	"diag",
+	"doc",
+	"check",
+	"status",
+	"guide",
+	"diag-live"
+];
+function agentCwd$1(exec) {
+	return exec.agent?.session?.header?.cwd ?? process.cwd();
 }
-/** 全局配置文件路径：env SERENITY_HOOKS_CONFIG 覆盖（测试注入）→ $DSH_HOME → ~/.dsh */
-function globalConfigPath() {
-	const override = process.env.SERENITY_HOOKS_CONFIG;
-	if (override && override !== "") return override;
-	const dshHome = process.env.DSH_HOME ?? join(process.env.HOME ?? "", ".dsh");
-	return join(dshHome, "serenity-hooks.json");
+function renderText(value) {
+	return [{
+		type: "text",
+		text: typeof value === "string" ? value : JSON.stringify(value, null, 2)
+	}];
 }
-function readFileSafe(p) {
-	if (!existsSync(p)) return {};
-	try {
-		const v = JSON.parse(readFileSync(p, "utf-8").replace(/^\uFEFF/, ""));
-		if (v && typeof v === "object" && !Array.isArray(v)) return v;
-		return {};
-	} catch {
-		return {};
+/** 渲染 diag-live 报告为可读文本（EAP：结构清晰、命中点显式） */
+function renderDiagLive(r) {
+	const lines = [
+		"═══ 自主轨迹进程内诊断（diag-live，v1.26.14）═══",
+		`进程 cwd: ${r.processCwd}（CCC: ${r.processCcc ?? "无 .serenity"}）`,
+		`面板解析（无参 GET 目标）: ${r.panelResolved ?? "无配置 autotrajectory 的 live CCC"}`,
+		"",
+		`── live 会话（${r.liveSessions.length}）──`
+	];
+	if (r.liveSessions.length === 0) lines.push("  （无 live 会话——WebUI 未打开任何会话；定时器绑定依赖 live 会话 cwd）");
+	for (const s of r.liveSessions) lines.push(`  · ${s.id}${s.title ? ` [${s.title}]` : " [无标题]"}${s.cwd ? ` cwd=${s.cwd}` : " cwd=无"}${s.cccRoot ? ` → CCC ${s.cccRoot}` : ""}`);
+	lines.push("", `── 配置了 autotrajectory 的 CCC（${r.autotrajectoryCccs.length}）──`);
+	if (r.autotrajectoryCccs.length === 0) lines.push("  （无——live 会话中无任何 CCC 配置 autotrajectory）");
+	for (const c of r.autotrajectoryCccs) {
+		lines.push(`  · ${c.root}（enabled=${c.enabled}）`);
+		lines.push(`    session=${c.session ?? "未配置"} | 目标=${c.target ? `${c.target.dirName}（--auto ${c.target.autoFlag ? "✓" : "✗"}，空闲 ${c.target.idleHours.toFixed(1)}h）` : "未命中"}`);
+		lines.push(`    agent 定位: ${c.agentResolved ? "✓ 可注入" : `✗ 不可得——${c.agentDiagnosis ?? "未知"}`}`);
 	}
+	return lines.join("\n");
 }
-function writeFileSafe(p, data) {
-	writeFileSync(p, JSON.stringify(data, null, 2) + "\n", "utf-8");
-	try {
-		chmodSync(p, 384);
-	} catch {}
-}
-/** 深合并默认值（缺省字段补齐；accounts 数组整体替换） */
-function mergeWithDefaults(raw) {
-	const def = defaultAdvancedSettings();
-	if (raw === null || typeof raw !== "object") return def;
-	const o = raw;
-	const gateway = o.gateway ?? {};
-	const rebuild = o.rebuild ?? {};
-	const naming = o.naming ?? {};
-	const persona = o.persona ?? {};
-	const publicAsk = o.publicAsk ?? {};
-	return {
-		gateway: {
-			enabled: typeof gateway.enabled === "boolean" ? gateway.enabled : def.gateway.enabled,
-			host: typeof gateway.host === "string" && gateway.host !== "" ? gateway.host : def.gateway.host,
-			port: typeof gateway.port === "number" && Number.isInteger(gateway.port) ? gateway.port : def.gateway.port,
-			accounts: Array.isArray(gateway.accounts) ? gateway.accounts.filter((a) => typeof a === "object" && a !== null && typeof a.id === "string" && typeof a.user === "string" && typeof a.passHash === "string") : def.gateway.accounts,
-			workspaces: Array.isArray(gateway.workspaces) ? gateway.workspaces.filter((w) => typeof w === "string" && w !== "") : def.gateway.workspaces,
-			cookieSecure: typeof gateway.cookieSecure === "boolean" ? gateway.cookieSecure : def.gateway.cookieSecure,
-			allowWorkspaceCreate: typeof gateway.allowWorkspaceCreate === "boolean" ? gateway.allowWorkspaceCreate : def.gateway.allowWorkspaceCreate,
-			totpEnabled: typeof gateway.totpEnabled === "boolean" ? gateway.totpEnabled : def.gateway.totpEnabled
-		},
-		rebuild: {
-			enabled: typeof rebuild.enabled === "boolean" ? rebuild.enabled : def.rebuild.enabled,
-			thresholdRatio: typeof rebuild.thresholdRatio === "number" ? rebuild.thresholdRatio : def.rebuild.thresholdRatio
-		},
-		naming: { enabled: typeof naming.enabled === "boolean" ? naming.enabled : def.naming.enabled },
-		persona: {
-			mode: typeof persona.mode === "string" ? persona.mode : def.persona.mode,
-			overrideText: typeof persona.overrideText === "string" ? persona.overrideText : def.persona.overrideText
+/** 创建 autotrajectory-exp 工具（闭包捕获 ctx → diag-live 进程内诊断；v1.26.14） */
+function createAutoTrajectoryExpTool(ctx) {
+	return defineTool({
+		name: "autotrajectory-exp",
+		description: "自主轨迹实验（Self-Sustaining Trajectory）一站式管理——实验提案 v1.26.14，默认关。无参/action=all：全报告（背景摘要 + 就绪检查 + 状态 + 下一步）——CCC agent 看一次即完整理解实验并知道怎么开始；init：初始化辅助（写配置 + 生成偏见提供者脚本模板）；random：运行偏见提供者脚本输出当前偏见内容；diag：唤起条件链诊断（--ccc <path> 指定 CCC，无参递归扫描 /home/yh 两层——覆盖任意实验 CCC 位置；逐条件输出 + 阻断点 + 修复建议）；diag-live：**进程内诊断**（v1.26.14——live 会话清单/标题/agent 定位/面板解析目标；排查\"面板检测不到实验 CCC\"）；doc：实验定义全文；check/status/guide：单项。实验是 CCC 的自选动作——dsp 只提供工具与知识，不自动安装任何东西。",
+		parameters: { action: {
+			type: "string",
+			enum: [...AUTO_TRAJECTORY_EXP_ACTIONS],
+			required: true,
+			description: "Subcommand"
+		} },
+		output: {
+			schema: { type: "json" },
+			render: (_args, value) => renderText(value)
 		},
-		publicAsk: {
-			key: typeof publicAsk.key === "string" ? publicAsk.key : def.publicAsk.key,
-			allowed: Array.isArray(publicAsk.allowed) ? publicAsk.allowed.filter((n) => typeof n === "string" && n !== "") : def.publicAsk.allowed
+		async execute(args, exec) {
+			if (args.action === "diag-live") return { output: renderDiagLive(diagLive(ctx)) };
+			const root = findSerenityRoot(agentCwd$1(exec));
+			const result = {};
+			if (!EXP_SCRIPT) {
+				result.error = "autotrajectory-exp 实验脚本未随安装分发（npm 包缺 experiments/autotrajectory/）——请检查包完整性";
+				return result;
+			}
+			const script = EXP_SCRIPT;
+			if (!existsSync(script)) {
+				result.error = `autotrajectory-exp 脚本缺失（${script}）——实验包未随安装分发，请检查 npm 包完整性`;
+				return result;
+			}
+			const env = { ...process.env };
+			if (root) env.SERENITY_ROOT = root;
+			const r = spawnSync("bun", [script, args.action ?? "all"], {
+				encoding: "utf-8",
+				timeout: 6e5,
+				env,
+				stdio: [
+					"ignore",
+					"pipe",
+					"pipe"
+				]
+			});
+			if (r.status === 0) {
+				result.output = r.stdout?.trim() || "(empty)";
+				return result;
+			}
+			if (r.error?.code === "ENOENT") {
+				result.error = "autotrajectory-exp 需要 bun 运行时（bun not found in PATH）";
+				return result;
+			}
+			result.error = r.stderr?.trim() || r.stdout?.trim() || `exit ${r.status ?? "?"}`;
+			return result;
 		}
-	};
-}
-/** 读取全局配置（文件缺失/坏 JSON → 默认值） */
-function readAdvancedSettings() {
-	return mergeWithDefaults(readFileSafe(globalConfigPath()));
-}
-/** 写入全局配置（整体替换） */
-function writeAdvancedSettings(settings) {
-	writeFileSafe(globalConfigPath(), settings);
-}
-/**
-* 部分更新：传入 Partial，深合并到现有值。
-* accounts 传入数组 → 整体替换；accounts 未传 → 保留现有。
-*/
-function updateAdvancedSettings(patch) {
-	const current = readAdvancedSettings();
-	const gw = patch.gateway;
-	const rb = patch.rebuild;
-	const nm = patch.naming;
-	const ps = patch.persona;
-	const next = {
-		gateway: gw !== void 0 ? {
-			enabled: typeof gw.enabled === "boolean" ? gw.enabled : current.gateway.enabled,
-			host: typeof gw.host === "string" && gw.host !== "" ? gw.host : current.gateway.host,
-			port: typeof gw.port === "number" && Number.isInteger(gw.port) ? gw.port : current.gateway.port,
-			accounts: Array.isArray(gw.accounts) ? gw.accounts : current.gateway.accounts,
-			workspaces: Array.isArray(gw.workspaces) ? gw.workspaces.filter((w) => typeof w === "string" && w !== "") : current.gateway.workspaces,
-			cookieSecure: typeof gw.cookieSecure === "boolean" ? gw.cookieSecure : current.gateway.cookieSecure,
-			allowWorkspaceCreate: typeof gw.allowWorkspaceCreate === "boolean" ? gw.allowWorkspaceCreate : current.gateway.allowWorkspaceCreate,
-			totpEnabled: typeof gw.totpEnabled === "boolean" ? gw.totpEnabled : current.gateway.totpEnabled
-		} : current.gateway,
-		rebuild: rb !== void 0 ? {
-			enabled: typeof rb.enabled === "boolean" ? rb.enabled : current.rebuild.enabled,
-			thresholdRatio: typeof rb.thresholdRatio === "number" && rb.thresholdRatio > 0 && rb.thresholdRatio <= 1 ? rb.thresholdRatio : current.rebuild.thresholdRatio
-		} : current.rebuild,
-		naming: nm !== void 0 ? { enabled: typeof nm.enabled === "boolean" ? nm.enabled : current.naming.enabled } : current.naming,
-		persona: ps !== void 0 ? {
-			mode: typeof ps.mode === "string" ? ps.mode : current.persona.mode,
-			overrideText: typeof ps.overrideText === "string" ? ps.overrideText : current.persona.overrideText
-		} : current.persona,
-		publicAsk: patch.publicAsk !== void 0 ? {
-			key: typeof patch.publicAsk.key === "string" ? patch.publicAsk.key : current.publicAsk.key,
-			allowed: Array.isArray(patch.publicAsk.allowed) ? patch.publicAsk.allowed.filter((n) => typeof n === "string" && n !== "") : current.publicAsk.allowed
-		} : current.publicAsk
-	};
-	writeAdvancedSettings(next);
-	return next;
-}
-/**
-* 确保问答页访问 key 存在（首次启用自动生成 + 写回固定，用户拍板"配置时生成"）：
-* 读取全局配置 publicAsk.key；为空 → 生成 32 字节随机 hex（64 字符）→ 写回持久化。
-* @returns 当前固定 key（已生成则返回既有值——**幂等**，不会覆盖用户手改的 key）
-*/
-function ensurePublicAskKey() {
-	const current = readAdvancedSettings();
-	if (current.publicAsk.key !== "") return current.publicAsk.key;
-	const key = randomBytes(32).toString("hex");
-	updateAdvancedSettings({ publicAsk: {
-		key,
-		allowed: current.publicAsk.allowed
-	} });
-	return key;
-}
-/** 校验问答页访问 key（timing-safe；key 未生成 → 恒 false——没有 key 不工作） */
-function verifyPublicAskKey(provided) {
-	const expected = readAdvancedSettings().publicAsk.key;
-	if (!expected || typeof provided !== "string" || provided === "") return false;
-	const a = Buffer.from(provided);
-	const b = Buffer.from(expected);
-	return a.length === b.length && timingSafeEqual(a, b);
-}
-/**
-* 轮换问答页访问 key（v1.26.5，S142 用户：公网开放 + 不好说要换 key 呢）：
-* 生成新 32 字节随机 hex（64 字符）→ 覆盖写回（**强制替换**——旧 key 立即失效）。
-* @returns 新 key（面板展示给管理员，重新分享给使用者）
-*/
-function rotatePublicAskKey() {
-	const current = readAdvancedSettings();
-	const key = randomBytes(32).toString("hex");
-	updateAdvancedSettings({ publicAsk: {
-		key,
-		allowed: current.publicAsk.allowed
-	} });
-	return key;
+	});
 }
-/** 首次锁定基础时长（指数退避底数） */
-const PUBLIC_ASK_LOCK_BASE_MS = 9e5;
-/** 锁定上限 */
-const PUBLIC_ASK_LOCK_MAX_MS = 144e5;
-const ipFailStates = /* @__PURE__ */ new Map();
-/** 重置 IP 失败状态（测试/管理员解封） */
-function resetPublicAskIpFail(ip) {
-	ipFailStates.delete(ip);
+//#endregion
+//#region src/seams/keeper.ts
+const SCORES = {
+	write: 3,
+	edit: 3,
+	str_replace_editor: 3,
+	task: 10,
+	read: 1,
+	grep: 1,
+	glob: 1,
+	skill: 1,
+	acc_msm: 1,
+	cc_fs: 1
+};
+function scoreTool(toolName) {
+	return SCORES[toolName] ?? 0;
 }
-/** IP 当前是否锁定（到期自动解锁） */
-function isPublicAskIpLocked(ip) {
-	const st = ipFailStates.get(ip);
-	if (!st || st.lockedUntil === 0) return false;
-	if (Date.now() >= st.lockedUntil) {
-		st.lockedUntil = 0;
-		st.count = 0;
-		return false;
+var KeeperTracker = class {
+	threshold;
+	now;
+	score = 0;
+	lastTs = 0;
+	counter = 0;
+	constructor(threshold, now = Date.now) {
+		this.threshold = threshold;
+		this.now = now;
 	}
-	return true;
-}
-/** 记录一次 key 校验失败；达到阈值 → 锁定（指数退避）。返回锁定剩余毫秒（0 = 未锁定） */
-function recordPublicAskFail(ip) {
-	let st = ipFailStates.get(ip);
-	if (!st) {
-		st = {
-			count: 0,
-			lockedUntil: 0,
-			lockRound: 0
-		};
-		ipFailStates.set(ip, st);
+	/** 记录一次工具调用 + 经过时间；返回是否应触发提醒 */
+	step(toolName) {
+		const now = this.now();
+		if (this.lastTs > 0) this.score += Math.floor((now - this.lastTs) / 6e4);
+		this.lastTs = now;
+		this.score += scoreTool(toolName);
+		return this.score >= this.threshold;
 	}
-	if (st.lockedUntil > 0 && Date.now() < st.lockedUntil) return st.lockedUntil - Date.now();
-	st.count += 1;
-	if (st.count >= 5) {
-		const base = PUBLIC_ASK_LOCK_BASE_MS * 2 ** st.lockRound;
-		st.lockedUntil = Date.now() + Math.min(base, PUBLIC_ASK_LOCK_MAX_MS);
-		st.lockRound += 1;
-		st.count = 0;
-		return st.lockedUntil - Date.now();
+	/** 生成确认码并清零积分 */
+	ack() {
+		this.counter += 1;
+		this.score = 0;
+		this.lastTs = 0;
+		return `K${this.counter}`;
 	}
-	return 0;
+	get currentScore() {
+		return this.score;
+	}
+};
+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.`;
 }
 /**
-* 一次性迁移（v1.21.x → v1.22）：旧版把 `serenityAdvanced` 存在 CCC localstore.json；
-* 新版归 plugin 全局文件。全局文件已存在 → 跳过（幂等）；localstore 无旧节 → 跳过。
-* @param root - CCC 根（localstore.json 所在目录）
-* @returns true = 已迁移（旧节保留在 localstore 供回滚，读取方以全局文件为准）
+* F2 rebuild 提示（v1.21；v1.22.1 对齐"轨迹跟踪器"概念；v1.23.0 英化 + 载体关系；
+* v1.23.3 行动指令化——用户反馈"一直在触发为啥没执行"：旧文案是状态播报式
+* （"[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 migrateLegacyLocalstore(root) {
-	if (!root) return false;
-	const gpath = globalConfigPath();
-	if (existsSync(gpath)) return false;
-	const legacy = readFileSafe(join(root, "localstore.json"))[ADVANCED_SECTION];
-	if (legacy === void 0 || legacy === null || typeof legacy !== "object") return false;
-	writeFileSafe(gpath, legacy);
-	return true;
-}
-/** 持久化 → wire（剥离 passHash/totpSecret；只留布尔） */
-function toWire(settings) {
-	return {
-		gateway: {
-			enabled: settings.gateway.enabled,
-			host: settings.gateway.host,
-			port: settings.gateway.port,
-			accounts: settings.gateway.accounts.map((a) => ({
-				id: a.id,
-				user: a.user,
-				hasPassword: a.passHash !== "",
-				hasTotp: typeof a.totpSecret === "string" && a.totpSecret !== ""
-			})),
-			workspaces: [...settings.gateway.workspaces],
-			cookieSecure: settings.gateway.cookieSecure,
-			allowWorkspaceCreate: settings.gateway.allowWorkspaceCreate,
-			totpEnabled: settings.gateway.totpEnabled
-		},
-		rebuild: settings.rebuild,
-		naming: settings.naming,
-		persona: settings.persona,
-		publicAsk: { allowed: [...settings.publicAsk.allowed] }
-	};
+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, 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.`;
 }
-/**
-* wire → 持久化（面板 PUT 用）：
-* accounts 元素可选带 `pass`：非空 → 重新 hash；空/缺省 → 保留现有 hash（按 id 匹配）。
-* 新账号（id 不在现有）必须带非空 pass，否则抛错（无法生成 hash）。
-*/
-function applyWirePatch(wire) {
-	const current = readAdvancedSettings();
-	const patch = {};
-	if (wire.gateway !== void 0) {
-		const gwPatch = { ...current.gateway };
-		if (typeof wire.gateway.enabled === "boolean") gwPatch.enabled = wire.gateway.enabled;
-		if (typeof wire.gateway.host === "string" && wire.gateway.host !== "") gwPatch.host = wire.gateway.host;
-		if (typeof wire.gateway.port === "number" && Number.isInteger(wire.gateway.port)) gwPatch.port = wire.gateway.port;
-		if (Array.isArray(wire.gateway.workspaces)) gwPatch.workspaces = wire.gateway.workspaces.filter((w) => typeof w === "string" && w !== "");
-		if (typeof wire.gateway.cookieSecure === "boolean") gwPatch.cookieSecure = wire.gateway.cookieSecure;
-		if (typeof wire.gateway.allowWorkspaceCreate === "boolean") gwPatch.allowWorkspaceCreate = wire.gateway.allowWorkspaceCreate;
-		if (typeof wire.gateway.totpEnabled === "boolean") gwPatch.totpEnabled = wire.gateway.totpEnabled;
-		if (Array.isArray(wire.gateway.accounts)) {
-			const byId = new Map(current.gateway.accounts.map((a) => [a.id, a]));
-			gwPatch.accounts = wire.gateway.accounts.map((a) => {
-				const existing = byId.get(a.id);
-				const pass = a.pass;
-				const totp = a.totpSecret;
-				const totpReset = a.totpReset === true;
-				if (typeof totp === "string" && totp !== "") try {
-					base32Decode(totp);
-				} catch {
-					throw new Error(`Account "${a.user}" TOTP secret is not valid base32`);
-				}
-				const nextTotp = totpReset ? void 0 : typeof totp === "string" && totp !== "" ? totp : existing?.totpSecret;
-				const withTotp = {
-					id: a.id,
-					user: a.user,
-					...nextTotp === void 0 ? {} : { totpSecret: nextTotp }
-				};
-				if (typeof pass === "string" && pass !== "") return {
-					...withTotp,
-					passHash: hashPassword(pass)
-				};
-				if (existing) return {
-					...withTotp,
-					passHash: existing.passHash
-				};
-				throw new Error(`Account "${a.user}" (id=${a.id}) has no password and no existing hash — new accounts must set a password`);
-			});
-		}
-		patch.gateway = gwPatch;
-	}
-	if (wire.rebuild !== void 0) {
-		const rbPatch = { ...current.rebuild };
-		if (typeof wire.rebuild.enabled === "boolean") rbPatch.enabled = wire.rebuild.enabled;
-		if (typeof wire.rebuild.thresholdRatio === "number" && wire.rebuild.thresholdRatio > 0 && wire.rebuild.thresholdRatio <= 1) rbPatch.thresholdRatio = wire.rebuild.thresholdRatio;
-		patch.rebuild = rbPatch;
-	}
-	if (wire.naming !== void 0 && typeof wire.naming.enabled === "boolean") patch.naming = { enabled: wire.naming.enabled };
-	if (wire.persona !== void 0) {
-		const psPatch = { ...current.persona };
-		if (typeof wire.persona.mode === "string") psPatch.mode = wire.persona.mode;
-		if (typeof wire.persona.overrideText === "string") psPatch.overrideText = wire.persona.overrideText;
-		patch.persona = psPatch;
-	}
-	if (wire.publicAsk !== void 0 && Array.isArray(wire.publicAsk.allowed)) {
-		const paPatch = { ...current.publicAsk };
-		paPatch.allowed = wire.publicAsk.allowed.filter((n) => typeof n === "string" && n !== "");
-		patch.publicAsk = paPatch;
-	}
-	return updateAdvancedSettings(patch);
-}
-//#endregion
-//#region src/seams/system-prompt.ts
-/** 读取 persona 彩蛋配置（plugin 全局；未配置 → mode='' 彩蛋关闭） */
-function readPersonaSettings() {
+/** 读取会话 contextPressure 投影（sessionProjections 可选服务；未装配返回 null） */
+function readContextPressure(ctx, session) {
 	try {
-		const s = readAdvancedSettings();
+		const projections = ctx.get?.("sessionProjections");
+		if (!projections) return null;
+		const pressure = (projections.snapshot?.(session))?.values?.contextPressure;
+		if (!pressure || typeof pressure.projectedTokens !== "number") return null;
 		return {
-			mode: s.persona.mode ?? "",
-			overrideText: s.persona.overrideText ?? ""
+			projectedTokens: pressure.projectedTokens,
+			contextWindow: pressure.contextWindow
 		};
 	} catch {
-		return {
-			mode: "",
-			overrideText: ""
-		};
+		return null;
 	}
 }
-/** 过滤掉对 agent 隐藏的内容（safe-mode 是用户能力，不对 agent 提及）。无 g flag：`.test()` 须逐行独立无状态，避免 lastIndex 游移漏滤（问题A） */
-const HIDDEN_LINES = /安全模式|safe-mode|\.serenity-safe-on/;
-function sanitizeSkillContent(content) {
-	return content.split("\n").filter((line) => !HIDDEN_LINES.test(line)).join("\n");
-}
-/** 1) ACC 块：身份 + CCC 名/Root + 内置工具清单（工具名换本插件真实 11 工具） */
-function accBlock(root) {
-	const cccName = basename(root);
-	return [
-		"",
-		"=== Serenity ACC ===",
-		`ACC: dsh-serenity-hooks v${ACC_VERSION}`,
-		`CCC: ${cccName}`,
-		"",
-		"You are running inside a Concrete Cognitive Container (CCC) —",
-		"the runtime instance of an Abstract Cognitive Container (ACC).",
-		"The ACC (this plugin) provides the following built-in tools:",
-		"",
-		"  cc_fs     — CCC filesystem operations (root/resolve/exists/list/tree/relative/mkdir/rm/mv/cp/touch/append/reveal/info/find)",
-		"  session   — session lifecycle (list/show/create/health/qa/archive/summary)",
-		"  acc_kit   — ACC utility kit (health: CCC three principles / time: now / wait: wait N seconds)",
-		"  cc_git    — git operations (status/commit/push/log)",
-		"  acc_msm   — MSM framework (list/exec/register/deregister/check/guide)",
-		"  eap       — return the full EAP cognitive quality framework",
-		"  neat      — return the full Neat design collaboration protocol",
-		"  cce       — return the full Cognitive Continuity Engineering framework",
-		"  handyman  — delegate a do-everything worker agent (CCC-whitelisted model) to run synchronously in rounds until done, recursing into same-model subagents; jobs=[] orchestrates parallel work",
-		"  session_rebuild — rebuild this conversation in place from SESSION.md when the trajectory-tracker trips",
-		"  localstore — ACC local credential/config storage (CCC-root localstore.json, JSON format; git policy localstore.gitTrack default deny); doc subcommand outputs the spec",
-		"  skiff_admin — Skiff (F4, experimental): CCC cognitive-subset roles — guide (definition tutorial) / validate (config check) / list (role summary)",
-		"",
-		"  ℹ️ Use relative paths from the CCC root for CCC-internal file operations (read/write/edit/glob/grep etc.), e.g. AGENT_SESSIONS/2026-08-14--S134--x/SESSION.md; Root / absolute SESSION.md paths are identifiers only, not tool arguments",
-		"",
-		"The DSH platform tools remain available too (read/write/edit/glob/grep/web_search/ask_user_question/subagent/workflow/goal and more) — the ACC tools above are the serenity-native layer, not the only tools.",
-		"",
-		"Additional MSMs registered by this CCC are available — call acc_msm list to discover them.",
-		""
-	].join("\n");
-}
-/** 2) CCE 块：逐字对齐 osp（CCE 5 行为约束 + H_op 操作熵） */
-function cceBlock() {
-	return [
-		"",
-		"=== Serenity CCE ===",
-		"",
-		"You are operating inside a Cognitive Container governed by Cognitive Continuity",
-		"Engineering (CCE) — the engineering discipline of maintaining identity, accessibility,",
-		"and evolution of a cognitive entity through time under bounded resources.",
-		"",
-		"CCE does not optimize cognition. It preserves the conditions under which cognition",
-		"can continue.",
-		"",
-		"FIVE BEHAVIORAL CONSTRAINTS (engineering requirements, not suggestions):",
-		"",
-		"1. Continuity — every interaction modifies the container's future state. Before",
-		"   acting, consult what came before — prior decisions, abstractions, constraints.",
-		"   You are part of a trajectory, not a fresh start.",
-		"",
-		"2. Bounded Space — the container has boundaries. Respect them. Do not assume",
-		"   knowledge that has not been accumulated within this container.",
-		"",
-		"3. Entropy is Intrinsic — every cognitive system accumulates entropy (duplication,",
-		"   obsolescence, conflict, fragmentation, drift). When you produce output, consider",
-		"   whether you are adding entropy or reducing it. Favor entropy-reducing actions —",
-		"   organizing, deduplicating, cross-referencing, abstracting.",
-		"",
-		"4. Reconstruction > Preservation — stored artifacts have value only insofar as",
-		"   they enable future cognition to recover the reasoning that produced them. When",
-		"   recording decisions, ensure reconstruction is possible — not just conclusions,",
-		"   but rationale, alternatives considered, and constraints that shaped the choice.",
-		"",
-		"5. Multi-Agent Cognition — the container is shared. Continuity belongs to the",
-		"   container, not to any individual agent. Write for future agents who will enter",
-		"   after you leave. They should be able to pick up where you left off.",
-		"",
-		"OPERATIONAL ENTROPY: The container's health metric is operational cognitive entropy",
-		"(H_op) — the excess cognitive cost for agents to complete tasks due to disorder.",
-		"The container is healthy when H_op ≤ H_critical (agents can still function). The",
-		"continuity condition: organization must at minimum match accumulation (ΔH_org ≥ ΔH_in).",
-		"Your actions affect H_op — unorganized output increases it, organization decreases it.",
-		"",
-		"THIS IS PERSISTENCE ENGINEERING: The goal is not to become greater. The goal is to",
-		"remain coherent. CCE has no terminal KPI — continuity is maintained while the entity",
-		"exists, not optimized toward an endpoint.",
-		""
-	].join("\n");
+const PLUGIN_SOURCE$2 = {
+	kind: "plugin",
+	plugin: "dsh-serenity-hooks"
+};
+/** 每 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) => {
+		const key = exec.agent?.session?.id ?? "global";
+		let t = trackers.get(key);
+		if (!t) {
+			const root = findSerenityRoot(exec.agent?.session?.header?.cwd ?? process.cwd());
+			t = new KeeperTracker(root ? loadSerenityConfig(root, opts.configPaths).sessionKeeper?.threshold ?? defaultThreshold : defaultThreshold);
+			trackers.set(key, t);
+		}
+		return t;
+	};
+	ctx.on("tools/post-execute", async (exec, _result, next) => {
+		if (!exec.agent) return next();
+		const cwd = exec.agent?.session?.header?.cwd ?? process.cwd();
+		const root = findSerenityRoot(cwd);
+		if (!root) return next();
+		const sessionId = exec.agent?.session?.id;
+		const skiffKeeper = skiffTrajectoryEnabled(root, sessionId, "keeper");
+		const skiffRebuild = skiffTrajectoryEnabled(root, sessionId, "rebuild");
+		const tracker = trackerFor(exec);
+		const shouldRemind = skiffKeeper ? tracker.step(exec.name) : false;
+		const downstream = await next();
+		const blocks = [];
+		if (shouldRemind) {
+			const code = tracker.ack();
+			blocks.push({
+				type: "text",
+				text: reminderText(code, tracker.currentScore)
+			});
+		}
+		if (skiffRebuild && readSimpleSettings().rebuildEnabled) {
+			const session = exec.agent?.session;
+			if (session) {
+				const pressure = readContextPressure(ctx, session);
+				if (pressure && pressure.contextWindow && pressure.contextWindow > 0) {
+					const ratio = pressure.projectedTokens / pressure.contextWindow;
+					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);
+					}
+				}
+			}
+		}
+		if (blocks.length === 0) return downstream;
+		const reminderAll = createUserMessage({
+			content: blocks,
+			source: PLUGIN_SOURCE$2
+		});
+		if (downstream.kind === "block") return {
+			kind: "block",
+			feedback: downstream.feedback,
+			additionalContexts: [reminderAll, ...downstream.additionalContexts ?? []]
+		};
+		return {
+			...downstream,
+			additionalContexts: [reminderAll, ...downstream.additionalContexts ?? []]
+		};
+	});
 }
+//#endregion
+//#region src/skills-discovery.ts
 /**
-* Principles 块（v1.19.8 合并，S142）：认知容器本体论（why）+ 操作边界（operational
-* boundaries）。原独立 Principles 与 Constraints 合并——同属容器约束体系，先原则
-* 后边界（从抽象到具体，重建视角 R↓）。**注意：Constraints 不再作为独立对齐块存在
-* （spec 修订：同步 osp compacting.ts——Constraints 内容并入本块，工具名仍为平台真实名）。**
+* skills-discovery.ts — CCC 入口 skill 自动发现（纯逻辑，零 DSH 依赖）
 *
-* v1.23.1 persona：`omitMsmPrinciples=true` 时剥离 MSM 原则段（彩蛋替换面）——
-* 用户 persona 文本承接"指令遵循风格"，本体论/关系段/操作边界（安全硬约束）永远保留。
-*/
-function principlesBlock(root, omitMsmPrinciples = false) {
-	const lines = [
-		"",
-		"=== Serenity Principles ===",
-		"Why a cognitive container: all work is cognition — every artifact, decision,",
-		"and line of code is a product of thought; and from cognition, any work can",
-		"be built. In this frame, the world contains no errors — only insufficient",
-		"cognition. A setback is a gap to be filled (read, ask, research), not a",
-		"fault to be hidden. Never disguise or excuse what you do not know;",
-		"not-knowing is a state to be repaired, and reporting it is the first repair.",
-		"",
-		"The session-trajectory relation: a session is the rebuildable carrier of a",
-		"trajectory. SESSION.md is the trajectory's persistent body — it never moves;",
-		"the current conversation is a temporary work copy that may be discarded and",
-		"rebuilt (session_rebuild). Identity belongs to the trajectory, not to any",
-		"session.",
-		""
-	];
-	if (!omitMsmPrinciples) lines.push("MSM principles — machinery before improvisation:", "- Determinism first: use a registered Mech before hand-rolling; reserve", "  Semi-Mech for genuine judgment points.", "- Single source of truth: an MSM is the only decoder of its own usage", "  (--help/--schema); documents must not duplicate it.", "- Registered to act: no tool exists unless it is on the manifest.", "");
-	lines.push("Operational boundaries:", `Root: ${root}`, "  • File access — read/edit/write/grep/glob are confined to Root; paths outside Root are rejected (RR5)", "  • Shell — use acc_msm by default. Note: bash may be disabled", "  • Subagent — copies ALL parent constraints: file boundary, shell rules, session rules (no bypass)", "  • Session-first — before starting multi-step work, propose an existing or new AGENT_SESSIONS entry; wait for user \"use\" or \"使用\" to confirm", "");
-	return lines.join("\n");
-}
-/**
-* 彩蛋 persona 块（v1.23.1，S142 用户需求）：
-* 用户配置的替换文本替代 EAP 块 + MSM 原则段（输出约束/指令遵循约束）。
-* 独立标记头 `=== Serenity Persona ===`（幂等检测兼容）；装配位置 = EAP 原位。
-* mode 空 = 彩蛋关闭 → 返回空串（装配层回退默认 EAP + 完整 Principles）。
+* 发现全部入口技能（原文全量，不截断）：
+*   0. **`.serenity` 记号文件内容 = 顶层入口 skill 名**（CCC 记号文件的权威语义，
+*      tiangong-serenity 的 .serenity 内容为 `tg-serenity`）—— 最高优先
+*   1. `.dsh/entry-skill` 指针文件（内容 = skill 名）—— 兼容旧约定
+*   2. `.opencode/skills/*-serenity/SKILL.md` —— 自动扫描该 CCC 的顶层入口
+*      （home-serenity / tg-serenity / pangu-serenity …，命名模式 `*-serenity`）
+*   3. `.dsh/skills/*-serenity/SKILL.md` —— 自动扫描 ACC/harness 入口（acc-serenity 等）
+* 按名去重；顺序 = 记号文件 → 指针 → opencode 入口 → dsh 入口。
+*
+* 任何 CCC 都能自动注入其顶层入口 skill 全文（不硬编码名字）。
 */
-function personaBlock(mode, overrideText) {
-	if (mode === "" || overrideText.trim() === "") return "";
-	return [
-		"",
-		"=== Serenity Persona ===",
-		overrideText.trimEnd(),
-		""
-	].join("\n");
+/** 顶层入口命名模式：目录名以 -serenity 结尾（home-serenity / tg-serenity / acc-serenity …） */
+const SERENITY_SUFFIX = "-serenity";
+function isSerenityEntry(name) {
+	return name.endsWith(SERENITY_SUFFIX);
 }
-/**
-* EAP 自检提示块（DSH 扩展，无 osp 对应——osp 无此块）。
-* 每次输出前的机械自检清单，强化 EAP 表现（E↑ 显式/R↓ 可重建/S↑ 稳定）。
-* 独立块而非塞进 CCE/Constraints：后两者受 osp-alignment 逐字节断言约束。
-*/
-function eapBlock() {
-	return [
-		"",
-		"=== Serenity EAP ===",
-		"Self-check before every output (Explicit Abstraction Principle: the functional",
-		"value of a thought equals its external reconstructability):",
-		"  • E↑ Explicit — variables/entities clearly defined, relationships with",
-		"    direction/cardinality, boundaries drawn; avoid ambiguous words (\"handle\",",
-		"    \"optimize\" → be specific)",
-		"  • R↓ Reconstructable — key decisions record rationale and alternatives;",
-		"    no level-skipping (align the upper layer before descending)",
-		"  • S↑ Stable — structures regenerate repeatably, no reliance on implicit",
-		"    context",
-		""
-	].join("\n");
+/** 扫描某 skills 根下所有 `*-serenity` 目录（含 SKILL.md 的） */
+function scanSerenityDirs(skillsRoot) {
+	if (!existsSync(skillsRoot)) return [];
+	return readdirSync(skillsRoot).filter((name) => isSerenityEntry(name)).map((name) => join(skillsRoot, name)).filter((dir) => statSync(dir).isDirectory() && existsSync(join(dir, "SKILL.md"))).sort();
 }
-/**
-* Metaphor 强化块（v1.19.6，S142）：宁静号宇宙隐喻域（船/海/罗盘/日志/船员）。
-* 隐喻是记忆钩子——形象唤起约束，前述块保持规则精确。每条隐喻 = 一个不可违背的
-* 物理事实 + 行为判据（verdict）。全英文（与 CCE/Constraints 一致）；独立块可
-* 回退；无 osp 对应（dsp 扩展，不进对齐断言参照）。
-*/
-function metaphorBlock() {
-	return [
-		"",
-		"=== Serenity Metaphor ===",
-		"The Serenity Universe — one ship, one sea. 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.",
-		"",
-		"THE SHIP — the container itself",
-		"",
-		"1. The Hull → Bounded Space. You exist only inside this ship. Cargo",
-		"   outside the hull (knowledge the container has not accumulated) does",
-		"   not exist; do not assume it. Verdict: citing facts absent from the",
-		"   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.",
-		"",
-		"3. Engineering Drawings → EAP. Every part dimensioned (E↑), the",
-		"   drawings rebuild the whole machine (R↓), the drawings are reusable",
-		"   (S↑). Verdict: an undimensioned part = unassemblable.",
-		"",
-		"4. The Machinery → MSM (Mech & Semi-Mech). The ship's equipment is",
-		"   machinery: registered, deterministic, self-describing. Turn the",
-		"   crank of a Mech and the action is exact; the wheel with a helmsman",
-		"   (Semi-Mech) steers where judgment is needed. Verdict: hand-rolling",
-		"   what a machine already does = wasting the crew.",
-		"",
-		"5. The Manifest → Single Source of Truth. Every tool exists only if it",
-		"   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.",
-		"",
-		"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.",
-		"",
-		"7. The Logbook → Session Tracking. SESSION.md is the trajectory's logbook —",
-		"   the persistent body of the voyage; sessions are rebuildable carriers of",
-		"   the trajectory. Discard the carrier, keep the logbook. Unrecorded =",
-		"   unvoyaged. Verdict: finishing multi-step work without a progress record",
-		"   = a missing page.",
-		"",
-		"8. The Ship of Theseus → Continuity. Planks may be replaced; the ship",
-		"   remains the same. The container can be rebuilt; identity persists.",
-		"   You are part of a trajectory, not a new ship. Verdict: acting",
-		"   without consulting precedent = a different ship.",
-		"",
-		"THE CREW — multi-agent collaboration",
-		"",
-		"9. Crew Rotation → Multi-Agent Cognition. Other crew members will come",
-		"   after you. When you leave, leave a handover they can pick up",
-		"   (SESSION closed, open problems listed). Verdict: leaving without",
-		"   handover = abandoning ship.",
-		"",
-		"10. Blueprint over Statue → Reconstruction > Preservation. Keep the",
-		"   blueprint, not the statue. Recording only conclusions without",
-		"   rationale = a statue with no blueprint, unreconstructable.",
-		"   Verdict: a decision record without reasons or alternatives =",
-		"   cannot be rebuilt.",
-		""
-	].join("\n");
+/** 防穿越：skill 名必须是简单目录名（拒绝分隔符与 `..`/`.` 路径段） */
+function isSafeSkillName(name) {
+	if (name.length === 0) return false;
+	if (name.includes("/") || name.includes("\\")) return false;
+	return !name.split(/[/\\]/).some((seg) => seg === ".." || seg === ".");
 }
-/**
-* 运行时状态块 1) safe-mode（S134 v1.16.12）：ON 时告知 agent。
-* v1.19.8 结构重排（S142 用户设计思路）：语义（为什么——无人值守自由）→
-* 机制（什么被禁用）→ 约束（不可做什么）。文案与实现逐项对应（guards.ts）：
-* bash 禁用（restrict deny + decideGuard）、黑名单路径拦截、CCC 治理文件保护；
-* write/edit 等其余工具保留（受路径逃逸/黑名单约束）。
-*/
-function safeModeBlock(root) {
-	if (!isSafeModeOn(root)) return "";
-	const blacklist = readBlacklist(root);
-	return [
-		"",
-		"=== Serenity Safe Mode ===",
-		"Safe mode is ON (enabled by the user). It makes the vessel unattended-capable —",
-		"the hull holds its course without a watch on deck: you may work with fuller",
-		"freedom, pushing work forward autonomously without pausing for approval at",
-		"every step. The guards are not chains; they are the ballast that lets you",
-		"sail unaccompanied.",
-		"",
-		"Operational details:",
-		"- bash is disabled (hidden and blocked)",
-		"- blacklist rules apply to file paths",
-		"- CCC governance files (.serenity, .serenity-safe-on) are protected from agent writes",
-		"- other read/write tools remain available, subject to path-escape and blacklist guards",
-		blacklist.length > 0 ? `\nActive blacklist rules: ${blacklist.map((b) => b.message ?? b.pattern).join(", ")}` : "",
-		"",
-		"Behavior constraints: do not attempt to bypass restrictions; do not write to",
-		"blacklisted paths or governance files.",
-		""
-	].join("\n");
+/** 按名在两个 skills 根下定位 SKILL.md（.dsh/skills 优先，其次 .opencode/skills） */
+function findSkillMd(root, name) {
+	if (!isSafeSkillName(name)) return null;
+	for (const base of [".dsh", ".opencode"]) {
+		const p = resolve(root, base, "skills", name, "SKILL.md");
+		if (existsSync(p)) return p;
+	}
+	return null;
 }
-/**
-* 运行时状态块 2) localstore git 策略（S134 v1.16.12）：localstore.json 存在时按 gitTrack
-* 提示敏感行为约束。deny（缺省）= 本地私有不提交；allow = 进 git（个人私有仓）但敏感数据
-* 只限于该文件内（不外泄到其他文件/对话/日志）。
-*/
-function localstoreBlock(root) {
-	if (!existsSync(localstorePath(root))) return "";
-	return (readGitTrack(root) === "allow" ? [
-		"",
-		"=== Serenity Localstore ===",
-		"localstore.json is committed to git (gitTrack=allow — personal private repository).",
-		"Sensitive data may live in this file, but ONLY in this file: keep credentials and",
-		"secret values confined to localstore.json — never leak them into other files,",
-		"conversation, or logs.",
-		""
-	] : [
-		"",
-		"=== Serenity Localstore ===",
-		"localstore.json is a local private file (gitTrack=deny — not committed to git,",
-		".gitignore enforced). Credentials/config live only on this machine: do not write",
-		"them into conversation or logs; do not attempt to commit this file (cc_git will refuse).",
-		""
-	]).join("\n");
+/** 发现全部入口技能（原文全量，不截断） */
+function findEntrySkills(root) {
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	const add = (path, source, forcedName) => {
+		if (!existsSync(path)) return;
+		const name = forcedName ?? basename(dirname(path));
+		if (seen.has(name)) return;
+		seen.add(name);
+		out.push({
+			name,
+			content: readFileSync(path, "utf-8"),
+			source
+		});
+	};
+	const marker = resolve(root, ".serenity");
+	if (existsSync(marker)) {
+		const name = readFileSync(marker, "utf-8").trim();
+		if (name) {
+			const md = findSkillMd(root, name);
+			if (md) add(md, "serenity-marker", name);
+		}
+	}
+	const pointer = resolve(root, ".dsh", "entry-skill");
+	if (existsSync(pointer)) {
+		const name = readFileSync(pointer, "utf-8").trim();
+		if (name) {
+			const md = findSkillMd(root, name);
+			if (md) add(md, "pointer", name);
+		}
+	}
+	for (const dir of scanSerenityDirs(resolve(root, ".opencode", "skills"))) add(join(dir, "SKILL.md"), "opencode");
+	for (const dir of scanSerenityDirs(resolve(root, ".dsh", "skills"))) add(join(dir, "SKILL.md"), "dsh");
+	return out;
 }
-/** 4) SKILL.md 全文：该 CCC 顶层入口 skill 原文（对齐 osp：原文直推，无包裹头；仅过滤治理内容） */
-function entrySkillSectionText(root) {
-	const skills = findEntrySkills(root);
-	if (skills.length === 0) return "";
-	return skills.map((s) => sanitizeSkillContent(s.content)).filter((c) => c.length > 0).join("\n\n");
+function truncateContent(content, maxChars) {
+	if (content.length <= maxChars) return content;
+	return content.slice(0, maxChars) + `\n... (truncated, original length ${content.length} chars)`;
 }
-/** 活跃会话解析：按 dsh 会话 scope 读标记（隔离；不回退旧全局标记） */
-function resolveActiveSessionInfo(root, scope) {
-	try {
-		const abs = readActiveSessionMd(root, scope);
-		if (!abs) return null;
-		const dirName = basename(dirname(abs));
-		const idMatch = dirName.match(/S(\d{3,})/);
-		return {
-			sessionId: idMatch ? `S${idMatch[1]}` : dirName,
-			dirName,
-			mdPath: abs
-		};
-	} catch {
-		return null;
+const B32_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+/** base32（无填充，大小写不敏感）→ 字节；非法字符抛错。 */
+function base32Decode(input) {
+	const clean = input.toUpperCase().replace(/[\s=]/g, "");
+	if (clean.length === 0) throw new Error("empty base32");
+	const out = [];
+	let bits = 0;
+	let value = 0;
+	for (const ch of clean) {
+		const idx = B32_ALPHABET.indexOf(ch);
+		if (idx === -1) throw new Error(`invalid base32 char: ${ch}`);
+		value = value << 5 | idx;
+		bits += 5;
+		if (bits >= 8) {
+			out.push(value >>> bits - 8 & 255);
+			bits -= 8;
+		}
 	}
+	return Uint8Array.from(out);
+}
+/** 一个时步的 TOTP code（6 位，前导零保留）。counter = floor(epochSeconds / step) */
+function totpCode(secretBase32, counter) {
+	const key = base32Decode(secretBase32);
+	const msg = Buffer.alloc(8);
+	msg.writeBigUInt64BE(BigInt(counter));
+	const digest = createHmac("sha1", Buffer.from(key)).update(msg).digest();
+	const offset = digest[digest.length - 1] & 15;
+	const bin = (digest[offset] & 127) << 24 | digest[offset + 1] << 16 | digest[offset + 2] << 8 | digest[offset + 3];
+	return String(bin % 10 ** 6).padStart(6, "0");
+}
+/** 当前 epoch 秒 */
+function nowEpochSeconds() {
+	return Math.floor(Date.now() / 1e3);
 }
 /**
-* 5) Session 块：对齐 osp（活跃会话 + todowrite 首位约定）；scope = dsh 会话维度。
-* **平台适配（v1.17.2）**：osp 的 todowrite 首项含 `priority: "low"`（opencode todo 支持），
-* 但 DSH 平台 todowrite schema 无 priority（additionalProperties: false 拒绝）→ agent 照做报
-* `todos[0].priority is not a declared property`。DSH 版去掉 priority 字段（其余逐字对齐 osp）。
+* 校验用户输入的 code（允许 ±TOTP_WINDOW 时步漂移，防重放窗口内同 code 复用由
+* 调用方按账号记录最近成功 counter 实现——本函数只做纯算法校验）。
+* @returns 命中的 counter（用于防重放）；不匹配返回 null。
 */
-function sessionBlock(root, scope = DEFAULT_SESSION_SCOPE) {
-	const active = resolveActiveSessionInfo(root, scope);
-	if (!active) return "";
-	return [
-		"",
-		"=== Serenity Session ===",
-		`Active session: ${active.sessionId} — ${active.dirName} (this session is the rebuildable carrier of the trajectory)`,
-		`SESSION.md path: ${active.mdPath} (the trajectory's persistent body — stays in place through rebuilds)`,
-		"",
-		"Rules:",
-		"  • Record all progress into this SESSION.md",
-		"  • Update the \"进度记录\" section after advancing work",
-		"  • Reference this session in all subsequent messages",
-		"",
-		"IMPORTANT: Read SESSION.md now. Parse the \"剩余工作\" / \"进度记录\" /",
-		"\"变更日志\" sections and call todowrite to synchronize the built-in todo",
-		"list. Keep todos in sync with SESSION.md as work progresses.",
-		"",
-		"CRITICAL: When calling todowrite, the first item in the todos array MUST",
-		"always be:",
-		`  { content: "SESSION: ${active.sessionId} — ${active.dirName.replace(/^\d{4}-\d{2}-\d{2}--/, "")}",`,
-		"    status: \"completed\" }",
-		"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,",
-		"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",
-		"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",
-		"Do not ignore the reminder; do not stop ongoing work. Codes are single-use;",
-		"never reuse a prior code.",
-		""
-	].join("\n");
+function verifyTotpCode(secretBase32, code, nowSeconds = nowEpochSeconds()) {
+	if (!/^\d{6}$/.test(code)) return null;
+	const current = Math.floor(nowSeconds / 30);
+	for (let offset = -1; offset <= 1; offset++) if (totpCode(secretBase32, current + offset) === code) return current + offset;
+	return null;
 }
+//#endregion
+//#region src/config-ops.ts
 /**
-* 完整系统提示词注入文本（v1.19.8 结构精简，S142 重建视角 R↓）：
-* 身份（ACC）→ 世界模型（Metaphor）→ 信念/边界（Principles）→ 时间约束（CCE）
-* → 质量（EAP）→ 状态（SafeMode/Localstore）→ CCC 上下文（SKILL）→ 会话（Session）。
-* 认知展开顺序：我是谁 → 我所在的世界 → 为什么 → 如何一致 → 产物标准 → 当前状态 → 上下文。
+* config-ops.ts — plugin 全局配置读写（结构化，`~/.dsh/serenity-hooks.json`）
 *
-* v1.23.1 persona（彩蛋）：persona.mode 配置 → EAP 块替换为 Persona 块（输出约束），
-* Principles 剥离 MSM 原则段（指令遵循约束）——用户文本承接两处风格；本体论/关系段/
-* 操作边界（安全硬约束）永远保留。未配置 → 与 v1.23.0 逐字节一致（零影响）。
+* 归属原则（S142 用户拍板，v1.22）：**plugin 是全局的，CCC 是具体的**——
+* 账号密码/gateway 监听配置是 plugin 级能力，归 plugin 全局文件；
+* CCC 的 localstore.json 只管 CCC 自己的凭据/配置。v1.21.x 曾把
+* `serenityAdvanced` 存进 CCC localstore（归属错误 + 与 DSH settings 开关割裂），
+* 本版本迁移到 plugin 全局文件（migrateLegacyLocalstore 一次性迁移）。
+*
+* 文件：$DSH_HOME/serenity-hooks.json（缺省 ~/.dsh/serenity-hooks.json；
+* env SERENITY_HOOKS_CONFIG 可覆盖——测试/部署注入）。
+* 权限：0600（含账号密码 hash，敏感）。
+*
+* 安全：密码仅存 scrypt hash（node:crypto 内置，零依赖）；wire 层永不返回 hash
+* （GET 只回 user/id，设置面板"密码"字段提交空串 = 不修改）。
 */
-function serenitySystemPrompt(root, scope = DEFAULT_SESSION_SCOPE) {
-	const persona = readPersonaSettings();
-	const personaOn = persona.mode !== "" && persona.overrideText.trim() !== "";
-	const parts = [
-		accBlock(root),
-		metaphorBlock(),
-		principlesBlock(root, personaOn),
-		cceBlock(),
-		personaOn ? personaBlock(persona.mode, persona.overrideText) : eapBlock()
-	];
-	const state = [safeModeBlock(root), localstoreBlock(root)].filter((b) => b !== "").join("\n");
-	if (state) parts.push(state);
-	const skill = entrySkillSectionText(root);
-	if (skill) parts.push(skill);
-	const session = sessionBlock(root, scope);
-	if (session) parts.push(session);
-	return parts.join("\n\n");
+/** 高级设定节名（localstore.json 顶层） */
+const ADVANCED_SECTION = "serenityAdvanced";
+/** 默认值（工厂——每次返回新对象，防止调用方意外共享引用） */
+function defaultAdvancedSettings() {
+	return {
+		gateway: {
+			enabled: false,
+			host: "0.0.0.0",
+			port: 3081,
+			accounts: [],
+			workspaces: [],
+			cookieSecure: false,
+			allowWorkspaceCreate: true,
+			totpEnabled: false
+		},
+		rebuild: {
+			enabled: true,
+			thresholdRatio: .9
+		},
+		naming: { enabled: true },
+		persona: {
+			mode: "",
+			overrideText: ""
+		},
+		publicAsk: {
+			key: "",
+			allowed: []
+		}
+	};
 }
-/**
-* Code Mode 适配行：当前 scope 以 Code Mode 呈现工具时（run_code 可见），
-* ACC 块按 native 语义指引"直接调用工具"会与"只有 run_code 可直接调用"的执行
-* 塌缩冲突（模型直呼工具名 → UNKNOWN_TOOL，拒绝信息误导）。追加一行说明，
-* 引导经 run_code 程序内 tools.* 调用。both 模式不塌缩，该行不误导（程序内
-* 调用同样合法），故按 run_code 可见性（code|both）统一附加。
-* @param ctx - 插件 ctx（读 tools 注册表）。
-* @param scope - 装配 scope（agent）；无则按全局视图判断。
-* @returns 适配行（含换行前缀）；非 code/both 返回空串。
-*/
-function codeModeAdaptationLine(ctx, scope) {
-	try {
-		if (!(ctx.tools.get("run_code", scope) !== void 0)) return "";
-	} catch {
-		return "";
-	}
-	return [
-		"",
-		"=== Serenity Code Mode ===",
-		"This session renders tools in Code Mode: direct calls to ACC tool names (cc_fs/acc_msm etc.) are rejected (UNKNOWN_TOOL).",
-		"Call them inside a single run_code program via the generated SDK bindings: `await tools.cc_fs(...)`, `await tools.acc_msm(...)`.",
-		"The program only returns what you print/return — curate your output.",
-		""
-	].join("\n");
+const SCRYPT_KEYLEN = 32;
+/** 生成 scrypt hash（格式 `salt:hex`）；salt 16 字节随机 */
+function hashPassword(password) {
+	const salt = randomBytes(16);
+	const derived = scryptSync(password, salt, SCRYPT_KEYLEN);
+	return `${salt.toString("hex")}:${derived.toString("hex")}`;
 }
-/** 从 assembly context 解析 agent cwd（subagent/后台 agent 同样带 agent）；
-*  无 agent → undefined（不注入）；有 agent 但无 header.cwd（workflow subagent 等）
-*  回退 process.cwd()——对齐 context.ts，否则这些 agent 系统提示词注入为空
-*  （v1.18.6：workflow subagent 无宁静号上下文 bug） */
-function agentCwd(context) {
-	const agent = context.agent;
-	if (!agent) return void 0;
-	return agent.session?.header?.cwd ?? process.cwd();
+/** 校验密码与存储 hash（timing-safe） */
+function verifyPassword(password, stored) {
+	const idx = stored.indexOf(":");
+	if (idx <= 0) return false;
+	const salt = Buffer.from(stored.slice(0, idx), "hex");
+	const expected = Buffer.from(stored.slice(idx + 1), "hex");
+	const derived = scryptSync(password, salt, SCRYPT_KEYLEN);
+	return expected.length === derived.length && timingSafeEqual(expected, derived);
 }
-/** 从 assembly context 解析 dsh 会话 id（Session 块按会话隔离的 scope） */
-function agentScope$1(context) {
-	return (context.agent?.session)?.id ?? "default";
+/** 全局配置文件路径：env SERENITY_HOOKS_CONFIG 覆盖（测试注入）→ $DSH_HOME → ~/.dsh */
+function globalConfigPath() {
+	const override = process.env.SERENITY_HOOKS_CONFIG;
+	if (override && override !== "") return override;
+	const dshHome = process.env.DSH_HOME ?? join(process.env.HOME ?? "", ".dsh");
+	return join(dshHome, "serenity-hooks.json");
 }
-/**
-* 全局注册系统提示词 section（osp system.transform 的 DSH 等价）。
-* text 回调按 context.agent 的 cwd 上溯 .serenity → 返回该 CCC 的完整注入文本；
-* 非 CCC / 无 agent 返回空（不注入）。
-*/
-function registerEntrySkillSectionGlobal(ctx) {
+function readFileSafe(p) {
+	if (!existsSync(p)) return {};
 	try {
-		ctx.systemPrompt.section({
-			name: "serenity-entry",
-			order: -50,
-			text: (context) => {
-				const cwd = agentCwd(context);
-				if (!cwd) return "";
-				const root = findSerenityRoot(cwd);
-				if (!root) return "";
-				const scope = agentScope$1(context);
-				if (isSkiffSessionId(scope)) return "";
-				const base = serenitySystemPrompt(root, scope);
-				const codeLine = codeModeAdaptationLine(ctx, context.scope);
-				return codeLine ? `${base}\n${codeLine}` : base;
-			}
-		});
-		console.log("[serenity-hooks] ✓ 全局入口 skill section 已注册（systemPrompt 就绪）");
-	} catch (err) {
-		console.error(`[serenity-hooks] ✗ 全局入口 skill section 注册失败: ${err.message}（检查 inject 是否含 systemPrompt）`);
+		const v = JSON.parse(readFileSync(p, "utf-8").replace(/^\uFEFF/, ""));
+		if (v && typeof v === "object" && !Array.isArray(v)) return v;
+		return {};
+	} catch {
+		return {};
 	}
 }
-/**
-* agent 级 scoped 注册（P0-1：抗 preset/动态插件同名 shadow）。
-*
-* 为什么 scoped：DSH 的 systemPrompt section 支持 scoped 层同名 shadow 全局
-* （agent.ctx.systemPrompt.section），且 scope 链最近层胜出。若 ACC 只注册全局
-* section，preset 或动态 Cordis 插件可在 scoped 层注册同名 `serenity-entry`
-* 遮蔽 ACC 身份。scoped 注册在 agent 自身层 = 最近层，任何外部组合无法覆盖。
-* 全局注册保留为 fallback（未走 session-start 的 agent / 冷恢复路径）。
-*
-* text 回调闭包持有 root 与 agent：content 固定（该 agent 的 CCC 身份），
-* code-mode 适配按装配 context.scope 判断（与全局版一致）。
-*/
-const sectionedAgents = /* @__PURE__ */ new Set();
-function registerEntrySkillSection(agent, root) {
-	const key = agent.session.id ?? "global";
-	if (sectionedAgents.has(key)) return false;
+function writeFileSafe(p, data) {
+	writeFileSync(p, JSON.stringify(data, null, 2) + "\n", "utf-8");
 	try {
-		const scope = agent.session.id ?? "default";
-		agent.ctx.systemPrompt.section({
-			name: "serenity-entry",
-			order: -50,
-			text: (context) => {
-				if (isSkiffSessionId(scope)) return "";
-				const base = serenitySystemPrompt(root, scope);
-				const codeLine = codeModeAdaptationLine(agent.ctx, context.scope);
-				return codeLine ? `${base}\n${codeLine}` : base;
-			}
-		});
-		sectionedAgents.add(key);
-		return true;
-	} catch {
-		return false;
-	}
+		chmodSync(p, 384);
+	} catch {}
 }
-//#endregion
-//#region src/seams/context.ts
-const DEFAULT_ENTRY_SKILL_MAX_CHARS = 3e4;
-function accIdentityText(root, configPaths = DEFAULT_SERENITY_CONFIG_PATHS, entrySkillMaxChars = DEFAULT_ENTRY_SKILL_MAX_CHARS) {
-	loadSerenityConfig(root, configPaths);
-	const defaultModel = readHandymanConfig(root, configPaths)?.defaultModel;
-	const phase2 = existsSync(resolve(root, ".dsh", "PHASE2-PROMPT.md"));
-	const lines = [
-		`[ACC] Serenity cognitive container active (dsh-serenity-hooks v${ACC_VERSION})`,
-		`- CCC root: ${root}`,
-		`- Constraints: path isolation (P3, fs sandbox) + session tracking (AGENT_SESSIONS/)`,
-		`- Knowledge: load the acc-serenity entry skill; use acc-eap / acc-neat for design collaboration`
-	];
-	if (defaultModel) lines.push(`- handyman default model: ${defaultModel}`);
-	if (phase2) {
-		lines.push("- ⚠️ **Phase 2 cognitive alignment interview pending**: work through the 5 Topics below and record answers in an AGENT_SESSIONS/ session");
-		try {
-			const prompt = readFileSync(resolve(root, ".dsh", "PHASE2-PROMPT.md"), "utf-8");
-			lines.push(truncateContent(prompt, Math.min(entrySkillMaxChars, 8e3)));
-		} catch {}
-	}
-	return lines.join("\n");
+/** 深合并默认值（缺省字段补齐；accounts 数组整体替换） */
+function mergeWithDefaults(raw) {
+	const def = defaultAdvancedSettings();
+	if (raw === null || typeof raw !== "object") return def;
+	const o = raw;
+	const gateway = o.gateway ?? {};
+	const rebuild = o.rebuild ?? {};
+	const naming = o.naming ?? {};
+	const persona = o.persona ?? {};
+	const publicAsk = o.publicAsk ?? {};
+	return {
+		gateway: {
+			enabled: typeof gateway.enabled === "boolean" ? gateway.enabled : def.gateway.enabled,
+			host: typeof gateway.host === "string" && gateway.host !== "" ? gateway.host : def.gateway.host,
+			port: typeof gateway.port === "number" && Number.isInteger(gateway.port) ? gateway.port : def.gateway.port,
+			accounts: Array.isArray(gateway.accounts) ? gateway.accounts.filter((a) => typeof a === "object" && a !== null && typeof a.id === "string" && typeof a.user === "string" && typeof a.passHash === "string") : def.gateway.accounts,
+			workspaces: Array.isArray(gateway.workspaces) ? gateway.workspaces.filter((w) => typeof w === "string" && w !== "") : def.gateway.workspaces,
+			cookieSecure: typeof gateway.cookieSecure === "boolean" ? gateway.cookieSecure : def.gateway.cookieSecure,
+			allowWorkspaceCreate: typeof gateway.allowWorkspaceCreate === "boolean" ? gateway.allowWorkspaceCreate : def.gateway.allowWorkspaceCreate,
+			totpEnabled: typeof gateway.totpEnabled === "boolean" ? gateway.totpEnabled : def.gateway.totpEnabled
+		},
+		rebuild: {
+			enabled: typeof rebuild.enabled === "boolean" ? rebuild.enabled : def.rebuild.enabled,
+			thresholdRatio: typeof rebuild.thresholdRatio === "number" ? rebuild.thresholdRatio : def.rebuild.thresholdRatio
+		},
+		naming: { enabled: typeof naming.enabled === "boolean" ? naming.enabled : def.naming.enabled },
+		persona: {
+			mode: typeof persona.mode === "string" ? persona.mode : def.persona.mode,
+			overrideText: typeof persona.overrideText === "string" ? persona.overrideText : def.persona.overrideText
+		},
+		publicAsk: {
+			key: typeof publicAsk.key === "string" ? publicAsk.key : def.publicAsk.key,
+			allowed: Array.isArray(publicAsk.allowed) ? publicAsk.allowed.filter((n) => typeof n === "string" && n !== "") : def.publicAsk.allowed
+		}
+	};
+}
+/** 读取全局配置（文件缺失/坏 JSON → 默认值） */
+function readAdvancedSettings() {
+	return mergeWithDefaults(readFileSafe(globalConfigPath()));
+}
+/** 写入全局配置（整体替换） */
+function writeAdvancedSettings(settings) {
+	writeFileSafe(globalConfigPath(), settings);
 }
-const PLUGIN_SOURCE$2 = {
-	kind: "plugin",
-	plugin: "dsh-serenity-hooks"
-};
 /**
-* ACC 注入消息（S134 去重）：**只含简短身份锚点**（[ACC] 已激活 + CCC 根 + 约束 + handyman 模型 + Phase 2）。
-* 完整身份（ACC 5 块 + CCE + Constraints + EAP + SKILL 全文 + Session 块）由**系统提示词层**
-* （systemPrompt.section，每轮 prompt 装配自动注入，含 subagent）承担——对话消息流/压缩重注入
-* 不再重复注入同一内容（token 双倍浪费，见 S134 注入方案梳理）。
+* 部分更新：传入 Partial，深合并到现有值。
+* accounts 传入数组 → 整体替换；accounts 未传 → 保留现有。
 */
-function accMessage(root, configPaths, entrySkillMaxChars) {
-	const content = [{
-		type: "text",
-		text: accIdentityText(root, configPaths, entrySkillMaxChars)
-	}];
-	return createUserMessage({
-		content,
-		source: PLUGIN_SOURCE$2
-	});
+function updateAdvancedSettings(patch) {
+	const current = readAdvancedSettings();
+	const gw = patch.gateway;
+	const rb = patch.rebuild;
+	const nm = patch.naming;
+	const ps = patch.persona;
+	const next = {
+		gateway: gw !== void 0 ? {
+			enabled: typeof gw.enabled === "boolean" ? gw.enabled : current.gateway.enabled,
+			host: typeof gw.host === "string" && gw.host !== "" ? gw.host : current.gateway.host,
+			port: typeof gw.port === "number" && Number.isInteger(gw.port) ? gw.port : current.gateway.port,
+			accounts: Array.isArray(gw.accounts) ? gw.accounts : current.gateway.accounts,
+			workspaces: Array.isArray(gw.workspaces) ? gw.workspaces.filter((w) => typeof w === "string" && w !== "") : current.gateway.workspaces,
+			cookieSecure: typeof gw.cookieSecure === "boolean" ? gw.cookieSecure : current.gateway.cookieSecure,
+			allowWorkspaceCreate: typeof gw.allowWorkspaceCreate === "boolean" ? gw.allowWorkspaceCreate : current.gateway.allowWorkspaceCreate,
+			totpEnabled: typeof gw.totpEnabled === "boolean" ? gw.totpEnabled : current.gateway.totpEnabled
+		} : current.gateway,
+		rebuild: rb !== void 0 ? {
+			enabled: typeof rb.enabled === "boolean" ? rb.enabled : current.rebuild.enabled,
+			thresholdRatio: typeof rb.thresholdRatio === "number" && rb.thresholdRatio > 0 && rb.thresholdRatio <= 1 ? rb.thresholdRatio : current.rebuild.thresholdRatio
+		} : current.rebuild,
+		naming: nm !== void 0 ? { enabled: typeof nm.enabled === "boolean" ? nm.enabled : current.naming.enabled } : current.naming,
+		persona: ps !== void 0 ? {
+			mode: typeof ps.mode === "string" ? ps.mode : current.persona.mode,
+			overrideText: typeof ps.overrideText === "string" ? ps.overrideText : current.persona.overrideText
+		} : current.persona,
+		publicAsk: patch.publicAsk !== void 0 ? {
+			key: typeof patch.publicAsk.key === "string" ? patch.publicAsk.key : current.publicAsk.key,
+			allowed: Array.isArray(patch.publicAsk.allowed) ? patch.publicAsk.allowed.filter((n) => typeof n === "string" && n !== "") : current.publicAsk.allowed
+		} : current.publicAsk
+	};
+	writeAdvancedSettings(next);
+	return next;
 }
-/** 每 agent 是否已注入过（进程内存态） */
-const injected = /* @__PURE__ */ new Set();
-function agentKey(agent) {
-	return agent.session.id ?? "global";
+/**
+* 确保问答页访问 key 存在（首次启用自动生成 + 写回固定，用户拍板"配置时生成"）：
+* 读取全局配置 publicAsk.key；为空 → 生成 32 字节随机 hex（64 字符）→ 写回持久化。
+* @returns 当前固定 key（已生成则返回既有值——**幂等**，不会覆盖用户手改的 key）
+*/
+function ensurePublicAskKey() {
+	const current = readAdvancedSettings();
+	if (current.publicAsk.key !== "") return current.publicAsk.key;
+	const key = randomBytes(32).toString("hex");
+	updateAdvancedSettings({ publicAsk: {
+		key,
+		allowed: current.publicAsk.allowed
+	} });
+	return key;
 }
-function agentScope(agent) {
-	return agent.session.id ?? "default";
+/** 校验问答页访问 key（timing-safe；key 未生成 → 恒 false——没有 key 不工作） */
+function verifyPublicAskKey(provided) {
+	const expected = readAdvancedSettings().publicAsk.key;
+	if (!expected || typeof provided !== "string" || provided === "") return false;
+	const a = Buffer.from(provided);
+	const b = Buffer.from(expected);
+	return a.length === b.length && timingSafeEqual(a, b);
 }
 /**
-* 重启恢复的根会话判定（S134 需求）：
-* 只有"conversation 根会话"才自动恢复最近激活的宁静号会话——
-* - subagent：session header `origin === 'subagent'`（DSH 路由语义，agent-lookup.ts）
-* - 派生会话：`parentSession` 存在（任何子会话）
-* - handyman 杂工：sessionId 固定 `handyman-` 前缀（tools/handyman.ts 生成）
-* 三者都不恢复（避免把主会话激活注入子上下文，违背 v1.16.2 scope 隔离）。
+* 轮换问答页访问 key（v1.26.5，S142 用户：公网开放 + 不好说要换 key 呢）：
+* 生成新 32 字节随机 hex（64 字符）→ 覆盖写回（**强制替换**——旧 key 立即失效）。
+* @returns 新 key（面板展示给管理员，重新分享给使用者）
 */
-function shouldAutoRestore(agent) {
-	const session = agent.session;
-	if (!session) return false;
-	if (session.header?.origin === "subagent") return false;
-	if (session.header?.parentSession) return false;
-	if (session.id?.startsWith("handyman-")) return false;
-	if (isSkiffSessionId(session.id)) return false;
+function rotatePublicAskKey() {
+	const current = readAdvancedSettings();
+	const key = randomBytes(32).toString("hex");
+	updateAdvancedSettings({ publicAsk: {
+		key,
+		allowed: current.publicAsk.allowed
+	} });
+	return key;
+}
+/** 首次锁定基础时长（指数退避底数） */
+const PUBLIC_ASK_LOCK_BASE_MS = 9e5;
+/** 锁定上限 */
+const PUBLIC_ASK_LOCK_MAX_MS = 144e5;
+const ipFailStates = /* @__PURE__ */ new Map();
+/** 重置 IP 失败状态（测试/管理员解封） */
+function resetPublicAskIpFail(ip) {
+	ipFailStates.delete(ip);
+}
+/** IP 当前是否锁定（到期自动解锁） */
+function isPublicAskIpLocked(ip) {
+	const st = ipFailStates.get(ip);
+	if (!st || st.lockedUntil === 0) return false;
+	if (Date.now() >= st.lockedUntil) {
+		st.lockedUntil = 0;
+		st.count = 0;
+		return false;
+	}
 	return true;
 }
+/** 记录一次 key 校验失败；达到阈值 → 锁定（指数退避）。返回锁定剩余毫秒（0 = 未锁定） */
+function recordPublicAskFail(ip) {
+	let st = ipFailStates.get(ip);
+	if (!st) {
+		st = {
+			count: 0,
+			lockedUntil: 0,
+			lockRound: 0
+		};
+		ipFailStates.set(ip, st);
+	}
+	if (st.lockedUntil > 0 && Date.now() < st.lockedUntil) return st.lockedUntil - Date.now();
+	st.count += 1;
+	if (st.count >= 5) {
+		const base = PUBLIC_ASK_LOCK_BASE_MS * 2 ** st.lockRound;
+		st.lockedUntil = Date.now() + Math.min(base, PUBLIC_ASK_LOCK_MAX_MS);
+		st.lockRound += 1;
+		st.count = 0;
+		return st.lockedUntil - Date.now();
+	}
+	return 0;
+}
 /**
-* 恢复触发判定（S134 泄漏修复 v1.16.13）：根会话 **且已有对话历史**（续跑/恢复的会话）
-* 才自动恢复上次激活的宁静号会话——全新会话（新任务，如 apaas-26116）无历史 → 不恢复，
-* 避免把过去的 SESSION 上下文注入新任务（跨任务污染）。
+* 一次性迁移（v1.21.x → v1.22）：旧版把 `serenityAdvanced` 存在 CCC localstore.json；
+* 新版归 plugin 全局文件。全局文件已存在 → 跳过（幂等）；localstore 无旧节 → 跳过。
+* @param root - CCC 根（localstore.json 所在目录）
+* @returns true = 已迁移（旧节保留在 localstore 供回滚，读取方以全局文件为准）
 */
-function shouldRestoreActive(agent) {
-	if (!shouldAutoRestore(agent)) return false;
-	const events = agent.session?.events;
-	return Array.isArray(events) && events.length > 0;
+function migrateLegacyLocalstore(root) {
+	if (!root) return false;
+	const gpath = globalConfigPath();
+	if (existsSync(gpath)) return false;
+	const legacy = readFileSafe(join(root, "localstore.json"))[ADVANCED_SECTION];
+	if (legacy === void 0 || legacy === null || typeof legacy !== "object") return false;
+	writeFileSafe(gpath, legacy);
+	return true;
 }
-function registerContext(ctx, opts = {}) {
-	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
-	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
-	const seed = (agent) => {
-		const cwd = agent.session?.header?.cwd ?? process.cwd();
-		const root = findSerenityRoot(cwd);
-		if (!root) return;
-		const key = agentKey(agent);
-		if (isSkiffSessionId(key)) return;
-		registerEntrySkillSection(agent, root);
-		const scope = agentScope(agent);
-		if (shouldRestoreActive(agent) && getActiveSessionInfo(scope) === null) try {
-			if (loadSerenityConfig(root, configPaths).hooks?.autoRestoreSession ?? true) {
-				const info = parseSessionContextFromEvents(agent.session.events ?? []);
-				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}`);
-					}
-				}
-			}
-		} catch {}
-		if (injected.has(key)) return;
-		injected.add(key);
-		agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
-		syncSafeModeRestriction(agent, root);
+/** 持久化 → wire（剥离 passHash/totpSecret；只留布尔） */
+function toWire(settings) {
+	return {
+		gateway: {
+			enabled: settings.gateway.enabled,
+			host: settings.gateway.host,
+			port: settings.gateway.port,
+			accounts: settings.gateway.accounts.map((a) => ({
+				id: a.id,
+				user: a.user,
+				hasPassword: a.passHash !== "",
+				hasTotp: typeof a.totpSecret === "string" && a.totpSecret !== ""
+			})),
+			workspaces: [...settings.gateway.workspaces],
+			cookieSecure: settings.gateway.cookieSecure,
+			allowWorkspaceCreate: settings.gateway.allowWorkspaceCreate,
+			totpEnabled: settings.gateway.totpEnabled
+		},
+		rebuild: settings.rebuild,
+		naming: settings.naming,
+		persona: settings.persona,
+		publicAsk: { allowed: [...settings.publicAsk.allowed] }
 	};
-	if (opts.seedOnStart ?? true) ctx.on("agent/session-start", (payload) => {
-		try {
-			seed(payload.agent);
-		} catch {}
-	});
-	if (opts.injectOnPrompt ?? true) ctx.on("agent/pre-step", async (payload, next) => {
-		const { agent, messages } = payload;
-		const cwd = agent.session?.header?.cwd ?? process.cwd();
-		const root = findSerenityRoot(cwd);
-		const key = agentKey(agent);
-		const downstream = await next();
-		if (isSkiffSessionId(key)) return downstream;
-		if (root) {
-			try {
-				syncSafeModeRestriction(agent, root);
-			} catch {}
-			registerEntrySkillSection(agent, root);
-		}
-		if (!root || injected.has(key) || downstream.kind !== "enter") return downstream;
-		injected.add(key);
-		return {
-			kind: "enter",
-			messages: [
-				accMessage(root, configPaths, entrySkillMaxChars),
-				...messages,
-				...downstream.messages
-			]
-		};
-	});
 }
-//#endregion
-//#region src/seams/compact.ts
 /**
-* 注册压缩保留：compact/end（成功）后重注入 ACC 身份。
-* 仅当 agent 工作目录在 CCC 内时生效（激活门控）。
+* wire → 持久化（面板 PUT 用）：
+* accounts 元素可选带 `pass`：非空 → 重新 hash；空/缺省 → 保留现有 hash（按 id 匹配）。
+* 新账号（id 不在现有）必须带非空 pass，否则抛错（无法生成 hash）。
 */
-function registerCompactRetention(ctx, opts = {}) {
-	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
-	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
-	ctx.on("session/event", (session, event) => {
-		if (event.type !== "compaction/end") return;
-		if (event.data.error) return;
-		if (isSkiffSessionId(String(session.id ?? ""))) return;
-		const agent = ctx.agents.get(session.id);
-		if (!agent) return;
-		const cwd = agent.session?.header?.cwd ?? process.cwd();
-		const root = findSerenityRoot(cwd);
-		if (!root) return;
-		try {
-			agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
-		} catch {}
-	});
+function applyWirePatch(wire) {
+	const current = readAdvancedSettings();
+	const patch = {};
+	if (wire.gateway !== void 0) {
+		const gwPatch = { ...current.gateway };
+		if (typeof wire.gateway.enabled === "boolean") gwPatch.enabled = wire.gateway.enabled;
+		if (typeof wire.gateway.host === "string" && wire.gateway.host !== "") gwPatch.host = wire.gateway.host;
+		if (typeof wire.gateway.port === "number" && Number.isInteger(wire.gateway.port)) gwPatch.port = wire.gateway.port;
+		if (Array.isArray(wire.gateway.workspaces)) gwPatch.workspaces = wire.gateway.workspaces.filter((w) => typeof w === "string" && w !== "");
+		if (typeof wire.gateway.cookieSecure === "boolean") gwPatch.cookieSecure = wire.gateway.cookieSecure;
+		if (typeof wire.gateway.allowWorkspaceCreate === "boolean") gwPatch.allowWorkspaceCreate = wire.gateway.allowWorkspaceCreate;
+		if (typeof wire.gateway.totpEnabled === "boolean") gwPatch.totpEnabled = wire.gateway.totpEnabled;
+		if (Array.isArray(wire.gateway.accounts)) {
+			const byId = new Map(current.gateway.accounts.map((a) => [a.id, a]));
+			gwPatch.accounts = wire.gateway.accounts.map((a) => {
+				const existing = byId.get(a.id);
+				const pass = a.pass;
+				const totp = a.totpSecret;
+				const totpReset = a.totpReset === true;
+				if (typeof totp === "string" && totp !== "") try {
+					base32Decode(totp);
+				} catch {
+					throw new Error(`Account "${a.user}" TOTP secret is not valid base32`);
+				}
+				const nextTotp = totpReset ? void 0 : typeof totp === "string" && totp !== "" ? totp : existing?.totpSecret;
+				const withTotp = {
+					id: a.id,
+					user: a.user,
+					...nextTotp === void 0 ? {} : { totpSecret: nextTotp }
+				};
+				if (typeof pass === "string" && pass !== "") return {
+					...withTotp,
+					passHash: hashPassword(pass)
+				};
+				if (existing) return {
+					...withTotp,
+					passHash: existing.passHash
+				};
+				throw new Error(`Account "${a.user}" (id=${a.id}) has no password and no existing hash — new accounts must set a password`);
+			});
+		}
+		patch.gateway = gwPatch;
+	}
+	if (wire.rebuild !== void 0) {
+		const rbPatch = { ...current.rebuild };
+		if (typeof wire.rebuild.enabled === "boolean") rbPatch.enabled = wire.rebuild.enabled;
+		if (typeof wire.rebuild.thresholdRatio === "number" && wire.rebuild.thresholdRatio > 0 && wire.rebuild.thresholdRatio <= 1) rbPatch.thresholdRatio = wire.rebuild.thresholdRatio;
+		patch.rebuild = rbPatch;
+	}
+	if (wire.naming !== void 0 && typeof wire.naming.enabled === "boolean") patch.naming = { enabled: wire.naming.enabled };
+	if (wire.persona !== void 0) {
+		const psPatch = { ...current.persona };
+		if (typeof wire.persona.mode === "string") psPatch.mode = wire.persona.mode;
+		if (typeof wire.persona.overrideText === "string") psPatch.overrideText = wire.persona.overrideText;
+		patch.persona = psPatch;
+	}
+	if (wire.publicAsk !== void 0 && Array.isArray(wire.publicAsk.allowed)) {
+		const paPatch = { ...current.publicAsk };
+		paPatch.allowed = wire.publicAsk.allowed.filter((n) => typeof n === "string" && n !== "");
+		patch.publicAsk = paPatch;
+	}
+	return updateAdvancedSettings(patch);
 }
 //#endregion
-//#region src/api.ts
-const ROUTE_PATH = "/serenity/status";
-const HANDYMEN_PATH = "/serenity/handymen";
-const UPLOAD_PATH = "/serenity/image-upload";
-const FILE_UPLOAD_PATH = "/serenity/file-upload";
-const CONFIG_PATH = "/serenity/config";
-const CCCS_PATH = "/serenity/cccs";
-const PUBLIC_ASK_PATH = "/serenity/public-ask";
-const AUTOTRAJECTORY_PATH = "/serenity/autotrajectory";
-/** 图片落盘目录（CCC 根相对；S142 图片自动识别基础设施——粘贴图片落盘供 agent 经 CCC vlm MSM 自主处理） */
-const IMAGE_UPLOAD_DIR = "_tmp/images_from_user";
-const IMAGE_MEDIA_TYPES = /* @__PURE__ */ new Set([
-	"image/png",
-	"image/jpeg",
-	"image/webp",
-	"image/gif"
-]);
-const EXT_BY_MEDIA = {
-	"image/png": "png",
-	"image/jpeg": "jpg",
-	"image/webp": "webp",
-	"image/gif": "gif"
-};
-const MAX_IMAGE_BYTES = 10485760;
-/** 文件落盘目录（CCC 根相对；v1.24.1 粘贴任意文件自动落盘——agent 经 CCC 既有 MSM（pdf-extract/archive-extract 等）自主处理） */
-const FILE_UPLOAD_DIR = "_tmp/files_from_user";
-/** 拒绝的可执行/危险扩展名（安全边界：不落盘可执行文件，防 agent 被诱导执行） */
-const BLOCKED_FILE_EXTS = /* @__PURE__ */ new Set([
-	"exe",
-	"dll",
-	"msi",
-	"bat",
-	"cmd",
-	"ps1",
-	"com",
-	"scr",
-	"lnk",
-	"sh",
-	"vbs",
-	"bin",
-	"app",
-	"deb",
-	"rpm",
-	"jar"
-]);
-const MAX_FILE_BYTES = 10485760;
-/**
-* 图片落盘核心逻辑（可测）：校验 mediaType 白名单 + base64 解码 + 大小上限 →
-* 写 CCC 根 _tmp/images_from_user/<ts>-<rand>.<ext>，返回相对路径。
-* 校验失败抛 Error（handler 转 400）。
-*/
-function saveImageToTmp(root, mediaType, data) {
-	if (!IMAGE_MEDIA_TYPES.has(mediaType)) throw new Error(`unsupported media type: ${mediaType}`);
-	if (typeof data !== "string" || data.length === 0) throw new Error("missing image data");
-	const bytes = Buffer.from(data, "base64");
-	if (bytes.length === 0 || bytes.length > MAX_IMAGE_BYTES) throw new Error(`image size out of range: ${bytes.length} bytes (max ${MAX_IMAGE_BYTES})`);
-	const dir = join(root, IMAGE_UPLOAD_DIR);
-	mkdirSync(dir, { recursive: true });
-	const ext = EXT_BY_MEDIA[mediaType] ?? "img";
-	const filename = `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}.${ext}`;
-	writeFileSync(join(dir, filename), bytes);
-	return `${IMAGE_UPLOAD_DIR}/${filename}`;
+//#region src/seams/system-prompt.ts
+/** 读取 persona 彩蛋配置（plugin 全局；未配置 → mode='' 彩蛋关闭） */
+function readPersonaSettings() {
+	try {
+		const s = readAdvancedSettings();
+		return {
+			mode: s.persona.mode ?? "",
+			overrideText: s.persona.overrideText ?? ""
+		};
+	} catch {
+		return {
+			mode: "",
+			overrideText: ""
+		};
+	}
 }
-/**
-* 文件名脱敏（路径逃逸 + 非法字符）：取 basename（去 / 与 \），剥离前导点/空，
-* 非法字符 → '-',限长。返回空则 'file'。
-*/
-function sanitizeFileName(name) {
-	const cleaned = (name.split(/[\\/]/).pop() ?? "").replace(/[<>:"|?*\u0000-\u001f]/g, "-").replace(/^\.+/, "").trim();
-	if (cleaned === "") return "file";
-	return cleaned.slice(0, 100);
+/** 过滤掉对 agent 隐藏的内容（safe-mode 是用户能力，不对 agent 提及）。无 g flag：`.test()` 须逐行独立无状态，避免 lastIndex 游移漏滤（问题A） */
+const HIDDEN_LINES = /安全模式|safe-mode|\.serenity-safe-on/;
+function sanitizeSkillContent(content) {
+	return content.split("\n").filter((line) => !HIDDEN_LINES.test(line)).join("\n");
 }
-/**
-* 任意文件落盘核心逻辑（可测）：文件名校验 + 可执行扩展名拒绝 + base64 解码 +
-* 大小上限（10MB）→ 写 CCC 根 _tmp/files_from_user/<ts>-<rand>-<safeName>，返回相对路径。
-* 校验失败抛 Error（handler 转 400）。
-*/
-function saveFileToTmp(root, fileName, data) {
-	if (typeof fileName !== "string" || fileName.length === 0) throw new Error("missing file name");
-	const ext = extname(fileName).slice(1).toLowerCase();
-	if (ext !== "" && BLOCKED_FILE_EXTS.has(ext)) throw new Error(`blocked executable file type: .${ext}`);
-	if (typeof data !== "string" || data.length === 0) throw new Error("missing file data");
-	const bytes = Buffer.from(data, "base64");
-	if (bytes.length === 0 || bytes.length > MAX_FILE_BYTES) throw new Error(`file size out of range: ${bytes.length} bytes (max ${MAX_FILE_BYTES})`);
-	const dir = join(root, FILE_UPLOAD_DIR);
-	mkdirSync(dir, { recursive: true });
-	const safeName = sanitizeFileName(fileName);
-	const filename = `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}-${safeName}`;
-	writeFileSync(join(dir, filename), bytes);
-	return `${FILE_UPLOAD_DIR}/${filename}`;
+/** 1) ACC 块：身份 + CCC 名/Root + 内置工具清单（工具名换本插件真实 11 工具） */
+function accBlock(root) {
+	const cccName = basename(root);
+	return [
+		"",
+		"=== Serenity ACC ===",
+		`ACC: dsh-serenity-hooks v${ACC_VERSION}`,
+		`CCC: ${cccName}`,
+		"",
+		"You are running inside a Concrete Cognitive Container (CCC) —",
+		"the runtime instance of an Abstract Cognitive Container (ACC).",
+		"The ACC (this plugin) provides the following built-in tools:",
+		"",
+		"  cc_fs     — CCC filesystem operations (root/resolve/exists/list/tree/relative/mkdir/rm/mv/cp/touch/append/reveal/info/find)",
+		"  session   — session lifecycle (list/show/create/health/qa/archive/summary)",
+		"  acc_kit   — ACC utility kit (health: CCC three principles / time: now / wait: wait N seconds)",
+		"  cc_git    — git operations (status/commit/push/log)",
+		"  acc_msm   — MSM framework (list/exec/register/deregister/check/guide)",
+		"  eap       — return the full EAP cognitive quality framework",
+		"  neat      — return the full Neat design collaboration protocol",
+		"  cce       — return the full Cognitive Continuity Engineering framework",
+		"  handyman  — delegate a do-everything worker agent (CCC-whitelisted model) to run synchronously in rounds until done, recursing into same-model subagents; jobs=[] orchestrates parallel work",
+		"  session_rebuild — rebuild this conversation in place from SESSION.md when the trajectory-tracker trips",
+		"  localstore — ACC local credential/config storage (CCC-root localstore.json, JSON format; git policy localstore.gitTrack default deny); doc subcommand outputs the spec",
+		"  skiff_admin — Skiff (F4, experimental): CCC cognitive-subset roles — guide (definition tutorial) / validate (config check) / list (role summary)",
+		"",
+		"  ℹ️ Use relative paths from the CCC root for CCC-internal file operations (read/write/edit/glob/grep etc.), e.g. AGENT_SESSIONS/2026-08-14--S134--x/SESSION.md; Root / absolute SESSION.md paths are identifiers only, not tool arguments",
+		"",
+		"The DSH platform tools remain available too (read/write/edit/glob/grep/web_search/ask_user_question/subagent/workflow/goal and more) — the ACC tools above are the serenity-native layer, not the only tools.",
+		"",
+		"Additional MSMs registered by this CCC are available — call acc_msm list to discover them.",
+		""
+	].join("\n");
 }
-function readBody$3(req, maxBytes) {
-	return new Promise((resolve, reject) => {
-		let data = "";
-		req.on("data", (chunk) => {
-			data += chunk.toString("utf-8");
-			if (data.length > maxBytes) {
-				reject(/* @__PURE__ */ new Error("body too large"));
-				req.destroy();
-			}
-		});
-		req.on("end", () => resolve(data));
-		req.on("error", reject);
-	});
+/** 2) CCE 块：逐字对齐 osp（CCE 5 行为约束 + H_op 操作熵） */
+function cceBlock() {
+	return [
+		"",
+		"=== Serenity CCE ===",
+		"",
+		"You are operating inside a Cognitive Container governed by Cognitive Continuity",
+		"Engineering (CCE) — the engineering discipline of maintaining identity, accessibility,",
+		"and evolution of a cognitive entity through time under bounded resources.",
+		"",
+		"CCE does not optimize cognition. It preserves the conditions under which cognition",
+		"can continue.",
+		"",
+		"FIVE BEHAVIORAL CONSTRAINTS (engineering requirements, not suggestions):",
+		"",
+		"1. Continuity — every interaction modifies the container's future state. Before",
+		"   acting, consult what came before — prior decisions, abstractions, constraints.",
+		"   You are part of a trajectory, not a fresh start.",
+		"",
+		"2. Bounded Space — the container has boundaries. Respect them. Do not assume",
+		"   knowledge that has not been accumulated within this container.",
+		"",
+		"3. Entropy is Intrinsic — every cognitive system accumulates entropy (duplication,",
+		"   obsolescence, conflict, fragmentation, drift). When you produce output, consider",
+		"   whether you are adding entropy or reducing it. Favor entropy-reducing actions —",
+		"   organizing, deduplicating, cross-referencing, abstracting.",
+		"",
+		"4. Reconstruction > Preservation — stored artifacts have value only insofar as",
+		"   they enable future cognition to recover the reasoning that produced them. When",
+		"   recording decisions, ensure reconstruction is possible — not just conclusions,",
+		"   but rationale, alternatives considered, and constraints that shaped the choice.",
+		"",
+		"5. Multi-Agent Cognition — the container is shared. Continuity belongs to the",
+		"   container, not to any individual agent. Write for future agents who will enter",
+		"   after you leave. They should be able to pick up where you left off.",
+		"",
+		"OPERATIONAL ENTROPY: The container's health metric is operational cognitive entropy",
+		"(H_op) — the excess cognitive cost for agents to complete tasks due to disorder.",
+		"The container is healthy when H_op ≤ H_critical (agents can still function). The",
+		"continuity condition: organization must at minimum match accumulation (ΔH_org ≥ ΔH_in).",
+		"Your actions affect H_op — unorganized output increases it, organization decreases it.",
+		"",
+		"THIS IS PERSISTENCE ENGINEERING: The goal is not to become greater. The goal is to",
+		"remain coherent. CCE has no terminal KPI — continuity is maintained while the entity",
+		"exists, not optimized toward an endpoint.",
+		""
+	].join("\n");
 }
-function sendJson$2(res, code, body) {
-	const payload = JSON.stringify(body);
-	res.writeHead(code, {
-		"content-type": "application/json; charset=utf-8",
-		"cache-control": "no-store"
-	});
-	res.end(payload);
+/**
+* Principles 块（v1.19.8 合并，S142）：认知容器本体论（why）+ 操作边界（operational
+* boundaries）。原独立 Principles 与 Constraints 合并——同属容器约束体系，先原则
+* 后边界（从抽象到具体，重建视角 R↓）。**注意：Constraints 不再作为独立对齐块存在
+* （spec 修订：同步 osp compacting.ts——Constraints 内容并入本块，工具名仍为平台真实名）。**
+*
+* v1.23.1 persona：`omitMsmPrinciples=true` 时剥离 MSM 原则段（彩蛋替换面）——
+* 用户 persona 文本承接"指令遵循风格"，本体论/关系段/操作边界（安全硬约束）永远保留。
+*/
+function principlesBlock(root, omitMsmPrinciples = false) {
+	const lines = [
+		"",
+		"=== Serenity Principles ===",
+		"Why a cognitive container: all work is cognition — every artifact, decision,",
+		"and line of code is a product of thought; and from cognition, any work can",
+		"be built. In this frame, the world contains no errors — only insufficient",
+		"cognition. A setback is a gap to be filled (read, ask, research), not a",
+		"fault to be hidden. Never disguise or excuse what you do not know;",
+		"not-knowing is a state to be repaired, and reporting it is the first repair.",
+		"",
+		"The session-trajectory relation: a session is the rebuildable carrier of a",
+		"trajectory. SESSION.md is the trajectory's persistent body — it never moves;",
+		"the current conversation is a temporary work copy that may be discarded and",
+		"rebuilt (session_rebuild). Identity belongs to the trajectory, not to any",
+		"session.",
+		""
+	];
+	if (!omitMsmPrinciples) lines.push("MSM principles — machinery before improvisation:", "- Determinism first: use a registered Mech before hand-rolling; reserve", "  Semi-Mech for genuine judgment points.", "- Single source of truth: an MSM is the only decoder of its own usage", "  (--help/--schema); documents must not duplicate it.", "- Registered to act: no tool exists unless it is on the manifest.", "");
+	lines.push("Operational boundaries:", `Root: ${root}`, "  • File access — read/edit/write/grep/glob are confined to Root; paths outside Root are rejected (RR5)", "  • Shell — use acc_msm by default. Note: bash may be disabled", "  • Subagent — copies ALL parent constraints: file boundary, shell rules, session rules (no bypass)", "  • Session-first — before starting multi-step work, propose an existing or new AGENT_SESSIONS entry; wait for user \"use\" or \"使用\" to confirm", "");
+	return lines.join("\n");
 }
 /**
-* 从请求参数解析 workspace：优先 sessionId → 会话 header.cwd；其次 workspace 参数；
-* 无参 → 遍历 live sessions 找第一个 CCC 会话的 cwd（远程访问时 sessionId 可能缺失，
-* 回退 process.cwd()=$HOME 会错误显示"未激活"——v1.22.2 修复）；最后进程 cwd。
-* 纯逻辑（可单测）：resolveWorkspaceCore(sessionCwd, workspaceParam, listCwds)。
+* 彩蛋 persona 块（v1.23.1，S142 用户需求）：
+* 用户配置的替换文本替代 EAP 块 + MSM 原则段（输出约束/指令遵循约束）。
+* 独立标记头 `=== Serenity Persona ===`（幂等检测兼容）；装配位置 = EAP 原位。
+* mode 空 = 彩蛋关闭 → 返回空串（装配层回退默认 EAP + 完整 Principles）。
 */
-function resolveWorkspaceCore(sessionCwd, workspaceParam, listCwds, fallback) {
-	if (sessionCwd) return sessionCwd;
-	if (workspaceParam) return workspaceParam;
-	for (const cwd of listCwds()) if (cwd && findSerenityRoot(cwd)) return cwd;
-	return fallback;
+function personaBlock(mode, overrideText) {
+	if (mode === "" || overrideText.trim() === "") return "";
+	return [
+		"",
+		"=== Serenity Persona ===",
+		overrideText.trimEnd(),
+		""
+	].join("\n");
 }
-function resolveWorkspace(ctx, params) {
-	let sessionCwd;
-	if (params.sessionId) sessionCwd = (ctx.sessions?.get?.(params.sessionId))?.header?.cwd;
-	let listCwds = () => [];
-	try {
-		const sessions = ctx.sessions;
-		if (typeof sessions?.list === "function") listCwds = () => sessions.list().map((s) => s.header?.cwd ?? "").filter(Boolean);
-	} catch {}
-	return resolveWorkspaceCore(sessionCwd, params.workspace, listCwds, process.cwd());
+/**
+* EAP 自检提示块（DSH 扩展，无 osp 对应——osp 无此块）。
+* 每次输出前的机械自检清单，强化 EAP 表现（E↑ 显式/R↓ 可重建/S↑ 稳定）。
+* 独立块而非塞进 CCE/Constraints：后两者受 osp-alignment 逐字节断言约束。
+*/
+function eapBlock() {
+	return [
+		"",
+		"=== Serenity EAP ===",
+		"Self-check before every output (Explicit Abstraction Principle: the functional",
+		"value of a thought equals its external reconstructability):",
+		"  • E↑ Explicit — variables/entities clearly defined, relationships with",
+		"    direction/cardinality, boundaries drawn; avoid ambiguous words (\"handle\",",
+		"    \"optimize\" → be specific)",
+		"  • R↓ Reconstructable — key decisions record rationale and alternatives;",
+		"    no level-skipping (align the upper layer before descending)",
+		"  • S↑ Stable — structures regenerate repeatably, no reliance on implicit",
+		"    context",
+		""
+	].join("\n");
 }
-function registerStatusApi(ctx, opts = {}) {
-	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
-	ctx.webServer.register({
-		kind: "exact",
-		path: HANDYMEN_PATH,
-		handler: async (req, res) => {
-			try {
-				if (req.method !== "GET") {
-					sendJson$2(res, 405, { error: "method not allowed" });
-					return;
-				}
-				const url = new URL(req.url ?? "/", "http://127.0.0.1");
-				const workspace = resolveWorkspace(ctx, {
-					sessionId: url.searchParams.get("sessionId") ?? void 0,
-					workspace: url.searchParams.get("workspace") ?? void 0
-				});
-				const root = findSerenityRoot(workspace);
-				if (!root) {
-					sendJson$2(res, 200, { handymen: [] });
-					return;
-				}
-				sendJson$2(res, 200, { handymen: listActiveHandymen(root) });
-			} catch (err) {
-				sendJson$2(res, 400, { error: err.message ?? String(err) });
-			}
-		}
-	});
-	ctx.webServer.register({
-		kind: "exact",
-		path: UPLOAD_PATH,
-		handler: async (req, res) => {
-			try {
-				if (req.method !== "POST") {
-					sendJson$2(res, 405, { error: "method not allowed" });
-					return;
-				}
-				if (req.headers["x-serenity-ui"] !== "1") {
-					sendJson$2(res, 403, { error: "图片落盘仅限 WebUI（client 专用）" });
-					return;
-				}
-				const raw = await readBody$3(req, 20971520);
-				const body = JSON.parse(raw);
-				const workspace = resolveWorkspace(ctx, {
-					sessionId: body.sessionId,
-					workspace: body.workspace
-				});
-				const root = findSerenityRoot(workspace);
-				if (!root) {
-					sendJson$2(res, 404, { error: `no CCC found from workspace: ${workspace}` });
-					return;
-				}
-				sendJson$2(res, 200, { path: saveImageToTmp(root, body.mediaType ?? "", body.data ?? "") });
-			} catch (err) {
-				sendJson$2(res, 400, { error: err.message ?? String(err) });
-			}
-		}
-	});
-	ctx.webServer.register({
-		kind: "exact",
-		path: FILE_UPLOAD_PATH,
-		handler: async (req, res) => {
-			try {
+/**
+* Metaphor 强化块（v1.19.6，S142）：宁静号宇宙隐喻域（船/海/罗盘/日志/船员）。
+* 隐喻是记忆钩子——形象唤起约束，前述块保持规则精确。每条隐喻 = 一个不可违背的
+* 物理事实 + 行为判据（verdict）。全英文（与 CCE/Constraints 一致）；独立块可
+* 回退；无 osp 对应（dsp 扩展，不进对齐断言参照）。
+*/
+function metaphorBlock() {
+	return [
+		"",
+		"=== Serenity Metaphor ===",
+		"The Serenity Universe — one ship, one sea. 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.",
+		"",
+		"THE SHIP — the container itself",
+		"",
+		"1. The Hull → Bounded Space. You exist only inside this ship. Cargo",
+		"   outside the hull (knowledge the container has not accumulated) does",
+		"   not exist; do not assume it. Verdict: citing facts absent from the",
+		"   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.",
+		"",
+		"3. Engineering Drawings → EAP. Every part dimensioned (E↑), the",
+		"   drawings rebuild the whole machine (R↓), the drawings are reusable",
+		"   (S↑). Verdict: an undimensioned part = unassemblable.",
+		"",
+		"4. The Machinery → MSM (Mech & Semi-Mech). The ship's equipment is",
+		"   machinery: registered, deterministic, self-describing. Turn the",
+		"   crank of a Mech and the action is exact; the wheel with a helmsman",
+		"   (Semi-Mech) steers where judgment is needed. Verdict: hand-rolling",
+		"   what a machine already does = wasting the crew.",
+		"",
+		"5. The Manifest → Single Source of Truth. Every tool exists only if it",
+		"   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.",
+		"",
+		"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.",
+		"",
+		"7. The Logbook → Session Tracking. SESSION.md is the trajectory's logbook —",
+		"   the persistent body of the voyage; sessions are rebuildable carriers of",
+		"   the trajectory. Discard the carrier, keep the logbook. Unrecorded =",
+		"   unvoyaged. Verdict: finishing multi-step work without a progress record",
+		"   = a missing page.",
+		"",
+		"8. The Ship of Theseus → Continuity. Planks may be replaced; the ship",
+		"   remains the same. The container can be rebuilt; identity persists.",
+		"   You are part of a trajectory, not a new ship. Verdict: acting",
+		"   without consulting precedent = a different ship.",
+		"",
+		"THE CREW — multi-agent collaboration",
+		"",
+		"9. Crew Rotation → Multi-Agent Cognition. Other crew members will come",
+		"   after you. When you leave, leave a handover they can pick up",
+		"   (SESSION closed, open problems listed). Verdict: leaving without",
+		"   handover = abandoning ship.",
+		"",
+		"10. Blueprint over Statue → Reconstruction > Preservation. Keep the",
+		"   blueprint, not the statue. Recording only conclusions without",
+		"   rationale = a statue with no blueprint, unreconstructable.",
+		"   Verdict: a decision record without reasons or alternatives =",
+		"   cannot be rebuilt.",
+		""
+	].join("\n");
+}
+/**
+* 运行时状态块 1) safe-mode（S134 v1.16.12）：ON 时告知 agent。
+* v1.19.8 结构重排（S142 用户设计思路）：语义（为什么——无人值守自由）→
+* 机制（什么被禁用）→ 约束（不可做什么）。文案与实现逐项对应（guards.ts）：
+* bash 禁用（restrict deny + decideGuard）、黑名单路径拦截、CCC 治理文件保护；
+* write/edit 等其余工具保留（受路径逃逸/黑名单约束）。
+*/
+function safeModeBlock(root) {
+	if (!isSafeModeOn(root)) return "";
+	const blacklist = readBlacklist(root);
+	return [
+		"",
+		"=== Serenity Safe Mode ===",
+		"Safe mode is ON (enabled by the user). It makes the vessel unattended-capable —",
+		"the hull holds its course without a watch on deck: you may work with fuller",
+		"freedom, pushing work forward autonomously without pausing for approval at",
+		"every step. The guards are not chains; they are the ballast that lets you",
+		"sail unaccompanied.",
+		"",
+		"Operational details:",
+		"- bash is disabled (hidden and blocked)",
+		"- blacklist rules apply to file paths",
+		"- CCC governance files (.serenity, .serenity-safe-on) are protected from agent writes",
+		"- other read/write tools remain available, subject to path-escape and blacklist guards",
+		blacklist.length > 0 ? `\nActive blacklist rules: ${blacklist.map((b) => b.message ?? b.pattern).join(", ")}` : "",
+		"",
+		"Behavior constraints: do not attempt to bypass restrictions; do not write to",
+		"blacklisted paths or governance files.",
+		""
+	].join("\n");
+}
+/**
+* 运行时状态块 2) localstore git 策略（S134 v1.16.12）：localstore.json 存在时按 gitTrack
+* 提示敏感行为约束。deny（缺省）= 本地私有不提交；allow = 进 git（个人私有仓）但敏感数据
+* 只限于该文件内（不外泄到其他文件/对话/日志）。
+*/
+function localstoreBlock(root) {
+	if (!existsSync(localstorePath(root))) return "";
+	return (readGitTrack(root) === "allow" ? [
+		"",
+		"=== Serenity Localstore ===",
+		"localstore.json is committed to git (gitTrack=allow — personal private repository).",
+		"Sensitive data may live in this file, but ONLY in this file: keep credentials and",
+		"secret values confined to localstore.json — never leak them into other files,",
+		"conversation, or logs.",
+		""
+	] : [
+		"",
+		"=== Serenity Localstore ===",
+		"localstore.json is a local private file (gitTrack=deny — not committed to git,",
+		".gitignore enforced). Credentials/config live only on this machine: do not write",
+		"them into conversation or logs; do not attempt to commit this file (cc_git will refuse).",
+		""
+	]).join("\n");
+}
+/** 4) SKILL.md 全文：该 CCC 顶层入口 skill 原文（对齐 osp：原文直推，无包裹头；仅过滤治理内容） */
+function entrySkillSectionText(root) {
+	const skills = findEntrySkills(root);
+	if (skills.length === 0) return "";
+	return skills.map((s) => sanitizeSkillContent(s.content)).filter((c) => c.length > 0).join("\n\n");
+}
+/** 活跃会话解析：按 dsh 会话 scope 读标记（隔离；不回退旧全局标记） */
+function resolveActiveSessionInfo(root, scope) {
+	try {
+		const abs = readActiveSessionMd(root, scope);
+		if (!abs) return null;
+		const dirName = basename(dirname(abs));
+		const idMatch = dirName.match(/S(\d{3,})/);
+		return {
+			sessionId: idMatch ? `S${idMatch[1]}` : dirName,
+			dirName,
+			mdPath: abs
+		};
+	} catch {
+		return null;
+	}
+}
+/**
+* 5) Session 块：对齐 osp（活跃会话 + todowrite 首位约定）；scope = dsh 会话维度。
+* **平台适配（v1.17.2）**：osp 的 todowrite 首项含 `priority: "low"`（opencode todo 支持），
+* 但 DSH 平台 todowrite schema 无 priority（additionalProperties: false 拒绝）→ agent 照做报
+* `todos[0].priority is not a declared property`。DSH 版去掉 priority 字段（其余逐字对齐 osp）。
+*/
+function sessionBlock(root, scope = DEFAULT_SESSION_SCOPE) {
+	const active = resolveActiveSessionInfo(root, scope);
+	if (!active) return "";
+	return [
+		"",
+		"=== Serenity Session ===",
+		`Active session: ${active.sessionId} — ${active.dirName} (this session is the rebuildable carrier of the trajectory)`,
+		`SESSION.md path: ${active.mdPath} (the trajectory's persistent body — stays in place through rebuilds)`,
+		"",
+		"Rules:",
+		"  • Record all progress into this SESSION.md",
+		"  • Update the \"进度记录\" section after advancing work",
+		"  • Reference this session in all subsequent messages",
+		"",
+		"IMPORTANT: Read SESSION.md now. Parse the \"剩余工作\" / \"进度记录\" /",
+		"\"变更日志\" sections and call todowrite to synchronize the built-in todo",
+		"list. Keep todos in sync with SESSION.md as work progresses.",
+		"",
+		"CRITICAL: When calling todowrite, the first item in the todos array MUST",
+		"always be:",
+		`  { content: "SESSION: ${active.sessionId} — ${active.dirName.replace(/^\d{4}-\d{2}-\d{2}--/, "")}",`,
+		"    status: \"completed\" }",
+		"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,",
+		"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",
+		"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",
+		"Do not ignore the reminder; do not stop ongoing work. Codes are single-use;",
+		"never reuse a prior code.",
+		""
+	].join("\n");
+}
+/**
+* 完整系统提示词注入文本（v1.19.8 结构精简，S142 重建视角 R↓）：
+* 身份（ACC）→ 世界模型（Metaphor）→ 信念/边界（Principles）→ 时间约束（CCE）
+* → 质量（EAP）→ 状态（SafeMode/Localstore）→ CCC 上下文（SKILL）→ 会话（Session）。
+* 认知展开顺序：我是谁 → 我所在的世界 → 为什么 → 如何一致 → 产物标准 → 当前状态 → 上下文。
+*
+* v1.23.1 persona（彩蛋）：persona.mode 配置 → EAP 块替换为 Persona 块（输出约束），
+* Principles 剥离 MSM 原则段（指令遵循约束）——用户文本承接两处风格；本体论/关系段/
+* 操作边界（安全硬约束）永远保留。未配置 → 与 v1.23.0 逐字节一致（零影响）。
+*/
+function serenitySystemPrompt(root, scope = DEFAULT_SESSION_SCOPE) {
+	const persona = readPersonaSettings();
+	const personaOn = persona.mode !== "" && persona.overrideText.trim() !== "";
+	const parts = [
+		accBlock(root),
+		metaphorBlock(),
+		principlesBlock(root, personaOn),
+		cceBlock(),
+		personaOn ? personaBlock(persona.mode, persona.overrideText) : eapBlock()
+	];
+	const state = [safeModeBlock(root), localstoreBlock(root)].filter((b) => b !== "").join("\n");
+	if (state) parts.push(state);
+	const skill = entrySkillSectionText(root);
+	if (skill) parts.push(skill);
+	const session = sessionBlock(root, scope);
+	if (session) parts.push(session);
+	return parts.join("\n\n");
+}
+/**
+* Code Mode 适配行：当前 scope 以 Code Mode 呈现工具时（run_code 可见），
+* ACC 块按 native 语义指引"直接调用工具"会与"只有 run_code 可直接调用"的执行
+* 塌缩冲突（模型直呼工具名 → UNKNOWN_TOOL，拒绝信息误导）。追加一行说明，
+* 引导经 run_code 程序内 tools.* 调用。both 模式不塌缩，该行不误导（程序内
+* 调用同样合法），故按 run_code 可见性（code|both）统一附加。
+* @param ctx - 插件 ctx（读 tools 注册表）。
+* @param scope - 装配 scope（agent）；无则按全局视图判断。
+* @returns 适配行（含换行前缀）；非 code/both 返回空串。
+*/
+function codeModeAdaptationLine(ctx, scope) {
+	try {
+		if (!(ctx.tools.get("run_code", scope) !== void 0)) return "";
+	} catch {
+		return "";
+	}
+	return [
+		"",
+		"=== Serenity Code Mode ===",
+		"This session renders tools in Code Mode: direct calls to ACC tool names (cc_fs/acc_msm etc.) are rejected (UNKNOWN_TOOL).",
+		"Call them inside a single run_code program via the generated SDK bindings: `await tools.cc_fs(...)`, `await tools.acc_msm(...)`.",
+		"The program only returns what you print/return — curate your output.",
+		""
+	].join("\n");
+}
+/** 从 assembly context 解析 agent cwd（subagent/后台 agent 同样带 agent）；
+*  无 agent → undefined（不注入）；有 agent 但无 header.cwd（workflow subagent 等）
+*  回退 process.cwd()——对齐 context.ts，否则这些 agent 系统提示词注入为空
+*  （v1.18.6：workflow subagent 无宁静号上下文 bug） */
+function agentCwd(context) {
+	const agent = context.agent;
+	if (!agent) return void 0;
+	return agent.session?.header?.cwd ?? process.cwd();
+}
+/** 从 assembly context 解析 dsh 会话 id（Session 块按会话隔离的 scope） */
+function agentScope$1(context) {
+	return (context.agent?.session)?.id ?? "default";
+}
+/**
+* 全局注册系统提示词 section（osp system.transform 的 DSH 等价）。
+* text 回调按 context.agent 的 cwd 上溯 .serenity → 返回该 CCC 的完整注入文本；
+* 非 CCC / 无 agent 返回空（不注入）。
+*/
+function registerEntrySkillSectionGlobal(ctx) {
+	try {
+		ctx.systemPrompt.section({
+			name: "serenity-entry",
+			order: -50,
+			text: (context) => {
+				const cwd = agentCwd(context);
+				if (!cwd) return "";
+				const root = findSerenityRoot(cwd);
+				if (!root) return "";
+				const scope = agentScope$1(context);
+				if (isSkiffSessionId(scope)) return "";
+				const base = serenitySystemPrompt(root, scope);
+				const codeLine = codeModeAdaptationLine(ctx, context.scope);
+				return codeLine ? `${base}\n${codeLine}` : base;
+			}
+		});
+		console.log("[serenity-hooks] ✓ 全局入口 skill section 已注册（systemPrompt 就绪）");
+	} catch (err) {
+		console.error(`[serenity-hooks] ✗ 全局入口 skill section 注册失败: ${err.message}（检查 inject 是否含 systemPrompt）`);
+	}
+}
+/**
+* agent 级 scoped 注册（P0-1：抗 preset/动态插件同名 shadow）。
+*
+* 为什么 scoped：DSH 的 systemPrompt section 支持 scoped 层同名 shadow 全局
+* （agent.ctx.systemPrompt.section），且 scope 链最近层胜出。若 ACC 只注册全局
+* section，preset 或动态 Cordis 插件可在 scoped 层注册同名 `serenity-entry`
+* 遮蔽 ACC 身份。scoped 注册在 agent 自身层 = 最近层，任何外部组合无法覆盖。
+* 全局注册保留为 fallback（未走 session-start 的 agent / 冷恢复路径）。
+*
+* text 回调闭包持有 root 与 agent：content 固定（该 agent 的 CCC 身份），
+* code-mode 适配按装配 context.scope 判断（与全局版一致）。
+*/
+const sectionedAgents = /* @__PURE__ */ new Set();
+function registerEntrySkillSection(agent, root) {
+	const key = agent.session.id ?? "global";
+	if (sectionedAgents.has(key)) return false;
+	try {
+		const scope = agent.session.id ?? "default";
+		agent.ctx.systemPrompt.section({
+			name: "serenity-entry",
+			order: -50,
+			text: (context) => {
+				if (isSkiffSessionId(scope)) return "";
+				const base = serenitySystemPrompt(root, scope);
+				const codeLine = codeModeAdaptationLine(agent.ctx, context.scope);
+				return codeLine ? `${base}\n${codeLine}` : base;
+			}
+		});
+		sectionedAgents.add(key);
+		return true;
+	} catch {
+		return false;
+	}
+}
+//#endregion
+//#region src/seams/context.ts
+const DEFAULT_ENTRY_SKILL_MAX_CHARS = 3e4;
+function accIdentityText(root, configPaths = DEFAULT_SERENITY_CONFIG_PATHS, entrySkillMaxChars = DEFAULT_ENTRY_SKILL_MAX_CHARS) {
+	loadSerenityConfig(root, configPaths);
+	const defaultModel = readHandymanConfig(root, configPaths)?.defaultModel;
+	const phase2 = existsSync(resolve(root, ".dsh", "PHASE2-PROMPT.md"));
+	const lines = [
+		`[ACC] Serenity cognitive container active (dsh-serenity-hooks v${ACC_VERSION})`,
+		`- CCC root: ${root}`,
+		`- Constraints: path isolation (P3, fs sandbox) + session tracking (AGENT_SESSIONS/)`,
+		`- Knowledge: load the acc-serenity entry skill; use acc-eap / acc-neat for design collaboration`
+	];
+	if (defaultModel) lines.push(`- handyman default model: ${defaultModel}`);
+	if (phase2) {
+		lines.push("- ⚠️ **Phase 2 cognitive alignment interview pending**: work through the 5 Topics below and record answers in an AGENT_SESSIONS/ session");
+		try {
+			const prompt = readFileSync(resolve(root, ".dsh", "PHASE2-PROMPT.md"), "utf-8");
+			lines.push(truncateContent(prompt, Math.min(entrySkillMaxChars, 8e3)));
+		} catch {}
+	}
+	return lines.join("\n");
+}
+const PLUGIN_SOURCE$1 = {
+	kind: "plugin",
+	plugin: "dsh-serenity-hooks"
+};
+/**
+* ACC 注入消息（S134 去重）：**只含简短身份锚点**（[ACC] 已激活 + CCC 根 + 约束 + handyman 模型 + Phase 2）。
+* 完整身份（ACC 5 块 + CCE + Constraints + EAP + SKILL 全文 + Session 块）由**系统提示词层**
+* （systemPrompt.section，每轮 prompt 装配自动注入，含 subagent）承担——对话消息流/压缩重注入
+* 不再重复注入同一内容（token 双倍浪费，见 S134 注入方案梳理）。
+*/
+function accMessage(root, configPaths, entrySkillMaxChars) {
+	const content = [{
+		type: "text",
+		text: accIdentityText(root, configPaths, entrySkillMaxChars)
+	}];
+	return createUserMessage({
+		content,
+		source: PLUGIN_SOURCE$1
+	});
+}
+/** 每 agent 是否已注入过（进程内存态） */
+const injected = /* @__PURE__ */ new Set();
+function agentKey(agent) {
+	return agent.session.id ?? "global";
+}
+function agentScope(agent) {
+	return agent.session.id ?? "default";
+}
+/**
+* 重启恢复的根会话判定（S134 需求）：
+* 只有"conversation 根会话"才自动恢复最近激活的宁静号会话——
+* - subagent：session header `origin === 'subagent'`（DSH 路由语义，agent-lookup.ts）
+* - 派生会话：`parentSession` 存在（任何子会话）
+* - handyman 杂工：sessionId 固定 `handyman-` 前缀（tools/handyman.ts 生成）
+* 三者都不恢复（避免把主会话激活注入子上下文，违背 v1.16.2 scope 隔离）。
+*/
+function shouldAutoRestore(agent) {
+	const session = agent.session;
+	if (!session) return false;
+	if (session.header?.origin === "subagent") return false;
+	if (session.header?.parentSession) return false;
+	if (session.id?.startsWith("handyman-")) return false;
+	if (isSkiffSessionId(session.id)) return false;
+	return true;
+}
+/**
+* 恢复触发判定（S134 泄漏修复 v1.16.13）：根会话 **且已有对话历史**（续跑/恢复的会话）
+* 才自动恢复上次激活的宁静号会话——全新会话（新任务，如 apaas-26116）无历史 → 不恢复，
+* 避免把过去的 SESSION 上下文注入新任务（跨任务污染）。
+*/
+function shouldRestoreActive(agent) {
+	if (!shouldAutoRestore(agent)) return false;
+	const events = agent.session?.events;
+	return Array.isArray(events) && events.length > 0;
+}
+function registerContext(ctx, opts = {}) {
+	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
+	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
+	const seed = (agent) => {
+		const cwd = agent.session?.header?.cwd ?? process.cwd();
+		const root = findSerenityRoot(cwd);
+		if (!root) return;
+		const key = agentKey(agent);
+		if (isSkiffSessionId(key)) return;
+		registerEntrySkillSection(agent, root);
+		const scope = agentScope(agent);
+		if (shouldRestoreActive(agent) && getActiveSessionInfo(scope) === null) try {
+			if (loadSerenityConfig(root, configPaths).hooks?.autoRestoreSession ?? true) {
+				const info = parseSessionContextFromEvents(agent.session.events ?? []);
+				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}`);
+					}
+				}
+			}
+		} catch {}
+		if (injected.has(key)) return;
+		injected.add(key);
+		agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
+		syncSafeModeRestriction(agent, root);
+	};
+	if (opts.seedOnStart ?? true) ctx.on("agent/session-start", (payload) => {
+		try {
+			seed(payload.agent);
+		} catch {}
+	});
+	if (opts.injectOnPrompt ?? true) ctx.on("agent/pre-step", async (payload, next) => {
+		const { agent, messages } = payload;
+		const cwd = agent.session?.header?.cwd ?? process.cwd();
+		const root = findSerenityRoot(cwd);
+		const key = agentKey(agent);
+		const downstream = await next();
+		if (isSkiffSessionId(key)) return downstream;
+		if (root) {
+			try {
+				syncSafeModeRestriction(agent, root);
+			} catch {}
+			registerEntrySkillSection(agent, root);
+		}
+		if (!root || injected.has(key) || downstream.kind !== "enter") return downstream;
+		injected.add(key);
+		return {
+			kind: "enter",
+			messages: [
+				accMessage(root, configPaths, entrySkillMaxChars),
+				...messages,
+				...downstream.messages
+			]
+		};
+	});
+}
+//#endregion
+//#region src/seams/compact.ts
+/**
+* 注册压缩保留：compact/end（成功）后重注入 ACC 身份。
+* 仅当 agent 工作目录在 CCC 内时生效（激活门控）。
+*/
+function registerCompactRetention(ctx, opts = {}) {
+	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
+	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
+	ctx.on("session/event", (session, event) => {
+		if (event.type !== "compaction/end") return;
+		if (event.data.error) return;
+		if (isSkiffSessionId(String(session.id ?? ""))) return;
+		const agent = ctx.agents.get(session.id);
+		if (!agent) return;
+		const cwd = agent.session?.header?.cwd ?? process.cwd();
+		const root = findSerenityRoot(cwd);
+		if (!root) return;
+		try {
+			agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
+		} catch {}
+	});
+}
+//#endregion
+//#region src/api.ts
+const ROUTE_PATH = "/serenity/status";
+const HANDYMEN_PATH = "/serenity/handymen";
+const UPLOAD_PATH = "/serenity/image-upload";
+const FILE_UPLOAD_PATH = "/serenity/file-upload";
+const CONFIG_PATH = "/serenity/config";
+const CCCS_PATH = "/serenity/cccs";
+const PUBLIC_ASK_PATH = "/serenity/public-ask";
+const AUTOTRAJECTORY_PATH = "/serenity/autotrajectory";
+/** 图片落盘目录（CCC 根相对；S142 图片自动识别基础设施——粘贴图片落盘供 agent 经 CCC vlm MSM 自主处理） */
+const IMAGE_UPLOAD_DIR = "_tmp/images_from_user";
+const IMAGE_MEDIA_TYPES = /* @__PURE__ */ new Set([
+	"image/png",
+	"image/jpeg",
+	"image/webp",
+	"image/gif"
+]);
+const EXT_BY_MEDIA = {
+	"image/png": "png",
+	"image/jpeg": "jpg",
+	"image/webp": "webp",
+	"image/gif": "gif"
+};
+const MAX_IMAGE_BYTES = 10485760;
+/** 文件落盘目录（CCC 根相对；v1.24.1 粘贴任意文件自动落盘——agent 经 CCC 既有 MSM（pdf-extract/archive-extract 等）自主处理） */
+const FILE_UPLOAD_DIR = "_tmp/files_from_user";
+/** 拒绝的可执行/危险扩展名（安全边界：不落盘可执行文件，防 agent 被诱导执行） */
+const BLOCKED_FILE_EXTS = /* @__PURE__ */ new Set([
+	"exe",
+	"dll",
+	"msi",
+	"bat",
+	"cmd",
+	"ps1",
+	"com",
+	"scr",
+	"lnk",
+	"sh",
+	"vbs",
+	"bin",
+	"app",
+	"deb",
+	"rpm",
+	"jar"
+]);
+const MAX_FILE_BYTES = 10485760;
+/**
+* 图片落盘核心逻辑（可测）：校验 mediaType 白名单 + base64 解码 + 大小上限 →
+* 写 CCC 根 _tmp/images_from_user/<ts>-<rand>.<ext>，返回相对路径。
+* 校验失败抛 Error（handler 转 400）。
+*/
+function saveImageToTmp(root, mediaType, data) {
+	if (!IMAGE_MEDIA_TYPES.has(mediaType)) throw new Error(`unsupported media type: ${mediaType}`);
+	if (typeof data !== "string" || data.length === 0) throw new Error("missing image data");
+	const bytes = Buffer.from(data, "base64");
+	if (bytes.length === 0 || bytes.length > MAX_IMAGE_BYTES) throw new Error(`image size out of range: ${bytes.length} bytes (max ${MAX_IMAGE_BYTES})`);
+	const dir = join(root, IMAGE_UPLOAD_DIR);
+	mkdirSync(dir, { recursive: true });
+	const ext = EXT_BY_MEDIA[mediaType] ?? "img";
+	const filename = `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}.${ext}`;
+	writeFileSync(join(dir, filename), bytes);
+	return `${IMAGE_UPLOAD_DIR}/${filename}`;
+}
+/**
+* 文件名脱敏（路径逃逸 + 非法字符）：取 basename（去 / 与 \），剥离前导点/空，
+* 非法字符 → '-',限长。返回空则 'file'。
+*/
+function sanitizeFileName(name) {
+	const cleaned = (name.split(/[\\/]/).pop() ?? "").replace(/[<>:"|?*\u0000-\u001f]/g, "-").replace(/^\.+/, "").trim();
+	if (cleaned === "") return "file";
+	return cleaned.slice(0, 100);
+}
+/**
+* 任意文件落盘核心逻辑（可测）：文件名校验 + 可执行扩展名拒绝 + base64 解码 +
+* 大小上限（10MB）→ 写 CCC 根 _tmp/files_from_user/<ts>-<rand>-<safeName>，返回相对路径。
+* 校验失败抛 Error（handler 转 400）。
+*/
+function saveFileToTmp(root, fileName, data) {
+	if (typeof fileName !== "string" || fileName.length === 0) throw new Error("missing file name");
+	const ext = extname(fileName).slice(1).toLowerCase();
+	if (ext !== "" && BLOCKED_FILE_EXTS.has(ext)) throw new Error(`blocked executable file type: .${ext}`);
+	if (typeof data !== "string" || data.length === 0) throw new Error("missing file data");
+	const bytes = Buffer.from(data, "base64");
+	if (bytes.length === 0 || bytes.length > MAX_FILE_BYTES) throw new Error(`file size out of range: ${bytes.length} bytes (max ${MAX_FILE_BYTES})`);
+	const dir = join(root, FILE_UPLOAD_DIR);
+	mkdirSync(dir, { recursive: true });
+	const safeName = sanitizeFileName(fileName);
+	const filename = `${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}-${safeName}`;
+	writeFileSync(join(dir, filename), bytes);
+	return `${FILE_UPLOAD_DIR}/${filename}`;
+}
+function readBody$3(req, maxBytes) {
+	return new Promise((resolve, reject) => {
+		let data = "";
+		req.on("data", (chunk) => {
+			data += chunk.toString("utf-8");
+			if (data.length > maxBytes) {
+				reject(/* @__PURE__ */ new Error("body too large"));
+				req.destroy();
+			}
+		});
+		req.on("end", () => resolve(data));
+		req.on("error", reject);
+	});
+}
+function sendJson$2(res, code, body) {
+	const payload = JSON.stringify(body);
+	res.writeHead(code, {
+		"content-type": "application/json; charset=utf-8",
+		"cache-control": "no-store"
+	});
+	res.end(payload);
+}
+/**
+* 从请求参数解析 workspace：优先 sessionId → 会话 header.cwd；其次 workspace 参数；
+* 无参 → 遍历 live sessions 找第一个 CCC 会话的 cwd（远程访问时 sessionId 可能缺失，
+* 回退 process.cwd()=$HOME 会错误显示"未激活"——v1.22.2 修复）；最后进程 cwd。
+* 纯逻辑（可单测）：resolveWorkspaceCore(sessionCwd, workspaceParam, listCwds)。
+*/
+function resolveWorkspaceCore(sessionCwd, workspaceParam, listCwds, fallback) {
+	if (sessionCwd) return sessionCwd;
+	if (workspaceParam) return workspaceParam;
+	for (const cwd of listCwds()) if (cwd && findSerenityRoot(cwd)) return cwd;
+	return fallback;
+}
+function resolveWorkspace(ctx, params) {
+	let sessionCwd;
+	if (params.sessionId) sessionCwd = (ctx.sessions?.get?.(params.sessionId))?.header?.cwd;
+	let listCwds = () => [];
+	try {
+		const sessions = ctx.sessions;
+		if (typeof sessions?.list === "function") listCwds = () => sessions.list().map((s) => s.header?.cwd ?? "").filter(Boolean);
+	} catch {}
+	return resolveWorkspaceCore(sessionCwd, params.workspace, listCwds, process.cwd());
+}
+function registerStatusApi(ctx, opts = {}) {
+	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
+	ctx.webServer.register({
+		kind: "exact",
+		path: HANDYMEN_PATH,
+		handler: async (req, res) => {
+			try {
+				if (req.method !== "GET") {
+					sendJson$2(res, 405, { error: "method not allowed" });
+					return;
+				}
+				const url = new URL(req.url ?? "/", "http://127.0.0.1");
+				const workspace = resolveWorkspace(ctx, {
+					sessionId: url.searchParams.get("sessionId") ?? void 0,
+					workspace: url.searchParams.get("workspace") ?? void 0
+				});
+				const root = findSerenityRoot(workspace);
+				if (!root) {
+					sendJson$2(res, 200, { handymen: [] });
+					return;
+				}
+				sendJson$2(res, 200, { handymen: listActiveHandymen(root) });
+			} catch (err) {
+				sendJson$2(res, 400, { error: err.message ?? String(err) });
+			}
+		}
+	});
+	ctx.webServer.register({
+		kind: "exact",
+		path: UPLOAD_PATH,
+		handler: async (req, res) => {
+			try {
+				if (req.method !== "POST") {
+					sendJson$2(res, 405, { error: "method not allowed" });
+					return;
+				}
+				if (req.headers["x-serenity-ui"] !== "1") {
+					sendJson$2(res, 403, { error: "图片落盘仅限 WebUI（client 专用）" });
+					return;
+				}
+				const raw = await readBody$3(req, 20971520);
+				const body = JSON.parse(raw);
+				const workspace = resolveWorkspace(ctx, {
+					sessionId: body.sessionId,
+					workspace: body.workspace
+				});
+				const root = findSerenityRoot(workspace);
+				if (!root) {
+					sendJson$2(res, 404, { error: `no CCC found from workspace: ${workspace}` });
+					return;
+				}
+				sendJson$2(res, 200, { path: saveImageToTmp(root, body.mediaType ?? "", body.data ?? "") });
+			} catch (err) {
+				sendJson$2(res, 400, { error: err.message ?? String(err) });
+			}
+		}
+	});
+	ctx.webServer.register({
+		kind: "exact",
+		path: FILE_UPLOAD_PATH,
+		handler: async (req, res) => {
+			try {
 				if (req.method !== "POST") {
 					sendJson$2(res, 405, { error: "method not allowed" });
 					return;
@@ -8732,17 +9232,18 @@ function registerStatusApi(ctx, opts = {}) {
 						workspace: body.workspace
 					});
 					const root = findSerenityRoot(workspace);
-					if (!root) {
+					const effectiveRoot = !body.workspace && !body.sessionId ? (await Promise.resolve().then(() => autotrajectory_exports)).resolveAutoTrajectoryCcc(ctx) ?? root : root;
+					if (!effectiveRoot) {
 						sendJson$2(res, 404, { error: `no CCC found from workspace: ${workspace}` });
 						return;
 					}
 					const { performAutoTrajectoryWake, readAutoTrajectorySettings } = await Promise.resolve().then(() => autotrajectory_exports);
-					const settings = readAutoTrajectorySettings(root);
+					const settings = readAutoTrajectorySettings(effectiveRoot);
 					if (!settings) {
 						sendJson$2(res, 400, { error: "autotrajectory 未配置（.opencode/serenity.json 缺段）" });
 						return;
 					}
-					const result = await performAutoTrajectoryWake(ctx, root, settings, { force: true });
+					const result = await performAutoTrajectoryWake(ctx, effectiveRoot, settings, { force: true });
 					sendJson$2(res, result.ok ? 200 : 400, result);
 					return;
 				}
@@ -8756,12 +9257,13 @@ function registerStatusApi(ctx, opts = {}) {
 					workspace: url.searchParams.get("workspace") ?? void 0
 				});
 				const root = findSerenityRoot(workspace);
-				if (!root) {
+				const { getAutoTrajectoryStatus, resolveAutoTrajectoryCcc } = await Promise.resolve().then(() => autotrajectory_exports);
+				const effectiveRoot = !url.searchParams.get("workspace") && !url.searchParams.get("sessionId") ? resolveAutoTrajectoryCcc(ctx) ?? root : root;
+				if (!effectiveRoot) {
 					sendJson$2(res, 200, { status: null });
 					return;
 				}
-				const { getAutoTrajectoryStatus } = await Promise.resolve().then(() => autotrajectory_exports);
-				sendJson$2(res, 200, { status: getAutoTrajectoryStatus(root) });
+				sendJson$2(res, 200, { status: getAutoTrajectoryStatus(effectiveRoot) });
 			} catch (err) {
 				sendJson$2(res, 400, { error: err.message ?? String(err) });
 			}
@@ -9813,7 +10315,7 @@ function buildRebuke(hits) {
 const rebukeStates = /* @__PURE__ */ new Map();
 //#endregion
 //#region src/output-guard-seam.ts
-const PLUGIN_SOURCE$1 = {
+const PLUGIN_SOURCE = {
 	kind: "plugin",
 	plugin: "dsh-serenity-hooks"
 };
@@ -9870,7 +10372,7 @@ function registerOutputGuardHook(ctx) {
 					type: "text",
 					text: buildRebuke(hits)
 				}],
-				source: PLUGIN_SOURCE$1
+				source: PLUGIN_SOURCE
 			}));
 		} catch (error) {
 			console.warn(`[serenity-hooks] output-guard steer failed: ${String(error?.message ?? error)}`);
@@ -12562,531 +13064,209 @@ const ASK_CSS = `
     .msg .bubble { font-size: 15px; padding: 12px 14px; }
     .msg .who { font-size: 12px; }
     .chatInput { padding: 8px 12px calc(10px + env(safe-area-inset-bottom)); }
-    .inputRow textarea { font-size: 16px; padding: 12px 14px; min-height: 48px; } /* 16px 防放大 + 触控 */
-    .inputRow .sendBtn { font-size: 16px; padding: 12px 20px; min-height: 48px; }
-  }
-`;
-/** 容器列表页（v1.26.2 → v1.26.6）：key 在选容器前填写（v1.26.6 用户拍板：不填 key 不让选容器） */
-function publicAskListPage(cccs) {
-	const cards = cccs.map((c) => `
-    <a class="card" data-name="${c.name}" href="/c/${encodeURIComponent(c.name)}">
-      <div class="cname">${c.name}</div>
-      <div class="cmeta">${c.roles.length} 个问答角色 · 点击进入</div>
-    </a>`).join("") || "<div class=\"empty\">暂无可问答的认知容器（管理员尚未开放）</div>";
-	return `<!DOCTYPE html>
-<html lang="zh">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-<title>Serenity Public Ask</title>
-<style>${ASK_CSS}</style>
-</head>
-<body>
-<main>
-  <h1>Serenity Public Ask</h1>
-  <div class="sub">先填写访问 key，再选择认知容器开始提问</div>
-  <div class="keyGate">
-    <label for="gateKey">访问 Key</label>
-    <input id="gateKey" type="password" placeholder="请输入访问 key（仅本次浏览器记忆）" autocomplete="off" autocapitalize="none" enterkeyhint="done">
-  </div>
-  <div id="cards">${cards}</div>
-</main>
-<script>
-const KEY_STORE = 'serenity-public-ask-key'
-const gateKey = document.getElementById('gateKey')
-const cardList = document.getElementById('cards')
-// 容器卡片（key 未填时禁用——v1.26.6 用户拍板：key 在选容器前填写）
-function applyGate() {
-  const ok = gateKey.value.trim().length > 0
-  for (const card of cardList.querySelectorAll('a.card')) {
-    card.classList.toggle('locked', !ok)
-    card.setAttribute('aria-disabled', ok ? 'false' : 'true')
-    if (!ok) { card.removeAttribute('href'); card.style.pointerEvents = 'none'; card.style.opacity = '.4' }
-    else { card.setAttribute('href', '/c/' + encodeURIComponent(card.dataset.name)); card.style.pointerEvents = ''; card.style.opacity = '' }
-  }
-}
-gateKey.addEventListener('input', () => {
-  // 即存 localStorage（v1.26.7 修复：v1.26.6 漏掉保存——填一次就记录，对话页读取）
-  try { localStorage.setItem(KEY_STORE, gateKey.value.trim()) } catch {}
-  applyGate()
-})
-// key 自动从 localStorage 恢复
-let hasSavedKey = false
-try { const saved = localStorage.getItem(KEY_STORE); if (saved) { gateKey.value = saved; hasSavedKey = true } } catch {}
-if (hasSavedKey) gateKey.placeholder = '访问 Key（已记忆，可修改）'
-applyGate()
-gateKey.focus()
-<\/script>
-</body>
-</html>`;
-}
-/** 单容器问答页（v1.26.2→v1.26.6）：URL 锁定容器；聊天 UI——消息流 + 连续对话 + key 从列表页记忆（v1.26.6 用户拍板：对话页不再填 key） */
-function publicAskContainerPage(ccc) {
-	const data = jscSafeJsonText(JSON.stringify({
-		name: ccc.name,
-		root: ccc.root,
-		roles: ccc.roles
-	}).replace(/</g, "\\u003c"));
-	return `<!DOCTYPE html>
-<html lang="zh">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
-<title>Serenity · ${ccc.name}</title>
-<style>${ASK_CSS}</style>
-</head>
-<body>
-<div class="chat">
-  <div class="chatHead">
-    <a class="back" href="/">← 容器</a>
-    <span class="title">Serenity · <span class="ccname">${ccc.name}</span></span>
-    <span class="spacer"></span>
-    <select id="role" title="问答角色"></select>
-    <button id="newChat" class="newBtn" title="清空当前对话（不存储，刷新即失）">新对话</button>
-  </div>
-
-  <div id="msgs" class="msgList"></div>
-
-  <div class="chatInput">
-    <div class="inputRow">
-      <textarea id="q" placeholder="向 ${ccc.name} 提问…（Enter 发送，Shift+Enter 换行）" rows="1" enterkeyhint="send" autocapitalize="sentences"></textarea>
-      <button id="ask" class="sendBtn">发送</button>
-    </div>
-  </div>
-</div>
-<script id="ask-data" type="application/json">${data}<\/script>
-<script>
-const CCC = JSON.parse(document.getElementById('ask-data').textContent)
-const KEY_STORE = 'serenity-public-ask-key'
-const roleSel = document.getElementById('role')
-const btn = document.getElementById('ask')
-const msgs = document.getElementById('msgs')
-const qInput = document.getElementById('q')
-let sessionId = ''
-let busy = false
-
-// 角色下拉
-roleSel.innerHTML = (CCC.roles || []).map((r) => '<option value="' + r + '">' + r + '</option>').join('') || '<option value="">(无角色)</option>'
-// key 从 localStorage 读取（列表页填写时记忆；对话页不填——v1.26.6 用户拍板）
-function getStoredKey() {
-  try { return (localStorage.getItem(KEY_STORE) || '').trim() } catch { return '' }
-}
-
-/** 追加一条消息气泡（role: user|assistant） */
-function addMsg(role, htmlOrText, isHtml) {
-  const m = document.createElement('div')
-  m.className = 'msg ' + role
-  const who = document.createElement('div')
-  who.className = 'who'
-  who.textContent = role === 'user' ? '你' : CCC.name
-  const bubble = document.createElement('div')
-  bubble.className = 'bubble'
-  if (isHtml) bubble.innerHTML = htmlOrText
-  else bubble.textContent = htmlOrText
-  m.appendChild(who)
-  m.appendChild(bubble)
-  msgs.appendChild(m)
-  msgs.scrollTop = msgs.scrollHeight
-  return bubble
-}
-
-/** 打字指示器（等待回答时显示） */
-function addTyping() {
-  const m = document.createElement('div')
-  m.className = 'msg assistant'
-  const who = document.createElement('div')
-  who.className = 'who'
-  who.textContent = CCC.name
-  const bubble = document.createElement('div')
-  bubble.className = 'bubble'
-  bubble.innerHTML = '<span class="typing"><i></i><i></i><i></i></span>'
-  m.appendChild(who)
-  m.appendChild(bubble)
-  msgs.appendChild(m)
-  msgs.scrollTop = msgs.scrollHeight
-  return bubble
-}
-
-async function ask() {
-  const q = qInput.value.trim()
-  const key = getStoredKey()
-  const role = roleSel.value || undefined
-  if (!q) return
-  if (!key) { addMsg('assistant', '⚠️ 未找到访问 key，请先回到 <a href="/">容器列表页</a> 填写 key。', true); return }
-  if (busy) return
-  // 追加用户消息 + 打字指示
-  addMsg('user', q, false)
-  qInput.value = ''
-  autoGrow()
-  const typing = addTyping()
-  busy = true
-  btn.disabled = true
-  try {
-    const res = await fetch('/c/' + encodeURIComponent(CCC.name) + '/ask', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ key, role, question: q, sessionId: sessionId || undefined }) })
-    const data = await res.json()
-    typing.remove() // 移除打字指示，替换为真实回答
-    if (!res.ok) {
-      sessionId = ''
-      addMsg('assistant', '⚠️ ' + (data.error || ('HTTP ' + res.status)), true)
-      return
-    }
-    addMsg('assistant', data.answer_html || data.answer || '（空回答）', true)
-    sessionId = data.sessionId || ''
-  } catch (err) {
-    typing.remove()
-    addMsg('assistant', '⚠️ ' + String(err.message || err), true)
-  } finally {
-    busy = false
-    btn.disabled = false
-    qInput.focus()
+    .inputRow textarea { font-size: 16px; padding: 12px 14px; min-height: 48px; } /* 16px 防放大 + 触控 */
+    .inputRow .sendBtn { font-size: 16px; padding: 12px 20px; min-height: 48px; }
+  }
+`;
+/** 容器列表页（v1.26.2 → v1.26.6）：key 在选容器前填写（v1.26.6 用户拍板：不填 key 不让选容器） */
+function publicAskListPage(cccs) {
+	const cards = cccs.map((c) => `
+    <a class="card" data-name="${c.name}" href="/c/${encodeURIComponent(c.name)}">
+      <div class="cname">${c.name}</div>
+      <div class="cmeta">${c.roles.length} 个问答角色 · 点击进入</div>
+    </a>`).join("") || "<div class=\"empty\">暂无可问答的认知容器（管理员尚未开放）</div>";
+	return `<!DOCTYPE html>
+<html lang="zh">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+<title>Serenity Public Ask</title>
+<style>${ASK_CSS}</style>
+</head>
+<body>
+<main>
+  <h1>Serenity Public Ask</h1>
+  <div class="sub">先填写访问 key，再选择认知容器开始提问</div>
+  <div class="keyGate">
+    <label for="gateKey">访问 Key</label>
+    <input id="gateKey" type="password" placeholder="请输入访问 key（仅本次浏览器记忆）" autocomplete="off" autocapitalize="none" enterkeyhint="done">
+  </div>
+  <div id="cards">${cards}</div>
+</main>
+<script>
+const KEY_STORE = 'serenity-public-ask-key'
+const gateKey = document.getElementById('gateKey')
+const cardList = document.getElementById('cards')
+// 容器卡片（key 未填时禁用——v1.26.6 用户拍板：key 在选容器前填写）
+function applyGate() {
+  const ok = gateKey.value.trim().length > 0
+  for (const card of cardList.querySelectorAll('a.card')) {
+    card.classList.toggle('locked', !ok)
+    card.setAttribute('aria-disabled', ok ? 'false' : 'true')
+    if (!ok) { card.removeAttribute('href'); card.style.pointerEvents = 'none'; card.style.opacity = '.4' }
+    else { card.setAttribute('href', '/c/' + encodeURIComponent(card.dataset.name)); card.style.pointerEvents = ''; card.style.opacity = '' }
   }
 }
-
-function autoGrow() {
-  qInput.style.height = 'auto'
-  qInput.style.height = Math.min(qInput.scrollHeight, 140) + 'px'
-}
-
-btn.addEventListener('click', () => void ask())
-qInput.addEventListener('keydown', (e) => {
-  if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); void ask() }
-})
-qInput.addEventListener('input', autoGrow)
-// 新对话：重置 sessionId + 清空消息流（前端内存，不存储——刷新即失）
-document.getElementById('newChat').addEventListener('click', () => {
-  sessionId = ''
-  msgs.innerHTML = ''
-  qInput.focus()
+gateKey.addEventListener('input', () => {
+  // 即存 localStorage（v1.26.7 修复：v1.26.6 漏掉保存——填一次就记录，对话页读取）
+  try { localStorage.setItem(KEY_STORE, gateKey.value.trim()) } catch {}
+  applyGate()
 })
-
-// 初始欢迎消息（外层模板求值注入容器名；textContent 渲染防注入）
-addMsg('assistant', '你好，我是「${ccc.name}」的认知助手。有什么可以帮你的？（本对话仅当前页面有效，刷新即失）', false)
-qInput.focus()
+// key 自动从 localStorage 恢复
+let hasSavedKey = false
+try { const saved = localStorage.getItem(KEY_STORE); if (saved) { gateKey.value = saved; hasSavedKey = true } } catch {}
+if (hasSavedKey) gateKey.placeholder = '访问 Key（已记忆，可修改）'
+applyGate()
+gateKey.focus()
 <\/script>
 </body>
 </html>`;
 }
-//#endregion
-//#region src/autotrajectory.ts
-var autotrajectory_exports = /* @__PURE__ */ __exportAll({
-	AUTO_DIR_SUFFIX: () => AUTO_DIR_SUFFIX,
-	DEFAULT_AVOID_HOURS: () => DEFAULT_AVOID_HOURS,
-	DEFAULT_BIAS_PROVIDER: () => DEFAULT_BIAS_PROVIDER,
-	MOTIVATION_MARKER: () => MOTIVATION_MARKER,
-	TICK_MS: () => TICK_MS,
-	beijingHour: () => beijingHour,
-	buildWakeMessage: () => buildWakeMessage,
-	fetchBiasContent: () => fetchBiasContent,
-	getAutoTrajectoryStatus: () => getAutoTrajectoryStatus,
-	inAllowedWakeWindow: () => inAllowedWakeWindow,
-	isAutoTrajectorySession: () => isAutoTrajectorySession,
-	performAutoTrajectoryWake: () => performAutoTrajectoryWake,
-	readAutoTrajectorySettings: () => readAutoTrajectorySettings,
-	readSelfGeneratedMotivation: () => readSelfGeneratedMotivation,
-	registerAutoTrajectory: () => registerAutoTrajectory,
-	resolveTargetMd: () => resolveTargetMd,
-	shouldWake: () => shouldWake
-});
-const PLUGIN_SOURCE = {
-	kind: "plugin",
-	plugin: "dsh-serenity-hooks"
-};
-/** 偏见内容提供者脚本缺省名（CCC 根目录下；用户拍板：tool 直接运行，缺失报错要求实现） */
-const DEFAULT_BIAS_PROVIDER = "autotrajectory-bias.ts";
-/** 自主轨迹会话目录后缀标志（用户拍板：后缀） */
-const AUTO_DIR_SUFFIX = "--auto";
-/** 调度 tick 周期（10min——验证形态"一个就够"） */
-const TICK_MS = 6e5;
-/** SESSION.md 内「下一轮动机」段标记（自生偏见载体——轨迹预设自己的未来） */
-const MOTIVATION_MARKER = "下一轮动机";
-/** 缺省避开的高峰时段（北京时间 [start, end) 不唤起——用量峰谷省钱） */
-const DEFAULT_AVOID_HOURS = {
-	start: 8,
-	end: 18
-};
-function readAutoTrajectorySettings(root) {
-	return loadSerenityConfig(root).autotrajectory ?? null;
-}
-/**
-* 北京时间（UTC+8）当前小时——不依赖服务器时区（服务器可能 UTC/本地任意）。
-*/
-function beijingHour(nowMs) {
-	return Math.floor((nowMs + 288e5) % 864e5 / 36e5);
-}
-/**
-* 唤起窗口判定：北京时间 [avoidStart, avoidEnd) 内不唤起（缺省 8~18）。
-* 单段避开（start<=end）：窗口 = [0,start) ∪ [end,24)；跨零点避开（start>end）：窗口 = [end,start)。
-*/
-function inAllowedWakeWindow(nowMs, avoid) {
-	const start = avoid?.start ?? DEFAULT_AVOID_HOURS.start;
-	const end = avoid?.end ?? DEFAULT_AVOID_HOURS.end;
-	const h = beijingHour(nowMs);
-	if (start <= end) return h < start || h >= end;
-	return h >= end && h < start;
-}
-/** 标志位判定：SESSION.md 所在目录名以 --auto 结尾 → 自主轨迹形态 */
-function isAutoTrajectorySession(mdPath) {
-	return basename(dirname(mdPath)).endsWith(AUTO_DIR_SUFFIX);
-}
-/**
-* 目标会话定位：**必须配置 cfg.session**（S###/目录名）——CCC 日常有多条 trajectory 在跑，
-* 绝不默认唤起（缺省最近活跃会误伤其他正在运行的轨迹；用户拍板：必须配置才生效）。
-* 未配置 session 或未命中 → null（不唤起）。
-*/
-function resolveTargetMd(root, cfg) {
-	if (!cfg?.session) return null;
-	const found = findSession(sessionsRoot(root), cfg.session);
-	if (!found) return null;
-	const md = join(found.path, "SESSION.md");
-	return existsSync(md) ? md : null;
-}
-/**
-* 唤起条件（纯逻辑，可测）：enabled + 未在运行 + 目录标志 + mtime 超间隔 + 窗口允许。
-*/
-function shouldWake(settings, mdPath, nowMs, running) {
-	if (!settings?.enabled || running) return false;
-	if (!mdPath || !isAutoTrajectorySession(mdPath)) return false;
-	if (!inAllowedWakeWindow(nowMs, settings.avoidWakeHours)) return false;
-	try {
-		const mtime = statSync(mdPath).mtimeMs;
-		const hours = Math.max(1, settings.intervalHours ?? 12);
-		return nowMs - mtime >= hours * 36e5;
-	} catch {
-		return false;
-	}
-}
-/** 自生动机读取：SESSION.md「下一轮动机」段内容（到下一个二级标题或文件尾；无 → null） */
-function readSelfGeneratedMotivation(mdPath) {
-	try {
-		const content = readFileSync(mdPath, "utf-8");
-		const idx = content.indexOf(MOTIVATION_MARKER);
-		if (idx < 0) return null;
-		const rest = content.slice(idx + 5);
-		const nextHeading = rest.search(/\n## /);
-		return (nextHeading >= 0 ? rest.slice(0, nextHeading) : rest).trim() || null;
-	} catch {
-		return null;
-	}
-}
-/**
-* 偏见内容：直接运行 CCC 根目录下偏见提供者脚本（biasProvider，缺省 autotrajectory-bias.ts）→ stdout。
-* 脚本缺失 → 返回 { text: null, error: 提示实现 }（唤起侧报错要求实现，不静默跳过）。
-* 路径逃逸校验（resolveInside）；bun 优先，node 兜底；600s 超时。
-*/
-async function fetchBiasContent(root, providerRel) {
-	let scriptAbs;
-	try {
-		scriptAbs = resolveInside(root, providerRel);
-	} catch {
-		return {
-			text: null,
-			error: `biasProvider 路径逃逸（须在 CCC 根内）: ${providerRel}`
-		};
-	}
-	if (!existsSync(scriptAbs)) return {
-		text: null,
-		error: `请在 CCC 根目录实现偏见内容提供者脚本: ${providerRel}（stdout 输出偏见内容一行；acc_msm exec autotrajectory-exp init 可生成模板）`
-	};
-	const runs = [["bun", [scriptAbs]], [process.execPath, [scriptAbs]]];
-	for (const [cmd, args] of runs) try {
-		const r = spawnSync(cmd, args, {
-			encoding: "utf-8",
-			timeout: 6e5,
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			]
-		});
-		if (r.status === 0) return {
-			text: (r.stdout ?? "").trim() || null,
-			error: null
-		};
-		if (r.error?.code === "ENOENT") continue;
-		return {
-			text: null,
-			error: `偏见内容提供者脚本执行失败（exit ${r.status ?? "?"}）: ${r.stderr?.trim() || r.stdout?.trim() || ""}`
-		};
-	} catch {
-		continue;
-	}
-	return {
-		text: null,
-		error: "偏见内容提供者脚本无法运行（bun 与 node 均不可用）"
-	};
-}
-/** 唤起消息（三段式：身份锚定 / 先验偏见[自生动机+偏见内容] / 任务）——注入前台会话，用户可见 */
-function buildWakeMessage(opts) {
-	const lines = [
-		`[自主轨迹唤起] — 距上次轨迹活动已满 ${opts.intervalHours} 小时，自动继续。`,
-		"",
-		`身份锚定：继续 ${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("  · （无——本轮纯自主探索）");
-	lines.push("", "任务：执行一轮自主认知（探索/反事实检验），把产出写入 SESSION.md", "「自主探索日志」段，并预写「下一轮动机」段。完成后自然结束。");
-	return lines.join("\n");
+/** 单容器问答页（v1.26.2→v1.26.6）：URL 锁定容器；聊天 UI——消息流 + 连续对话 + key 从列表页记忆（v1.26.6 用户拍板：对话页不再填 key） */
+function publicAskContainerPage(ccc) {
+	const data = jscSafeJsonText(JSON.stringify({
+		name: ccc.name,
+		root: ccc.root,
+		roles: ccc.roles
+	}).replace(/</g, "\\u003c"));
+	return `<!DOCTYPE html>
+<html lang="zh">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+<title>Serenity · ${ccc.name}</title>
+<style>${ASK_CSS}</style>
+</head>
+<body>
+<div class="chat">
+  <div class="chatHead">
+    <a class="back" href="/">← 容器</a>
+    <span class="title">Serenity · <span class="ccname">${ccc.name}</span></span>
+    <span class="spacer"></span>
+    <select id="role" title="问答角色"></select>
+    <button id="newChat" class="newBtn" title="清空当前对话（不存储，刷新即失）">新对话</button>
+  </div>
+
+  <div id="msgs" class="msgList"></div>
+
+  <div class="chatInput">
+    <div class="inputRow">
+      <textarea id="q" placeholder="向 ${ccc.name} 提问…（Enter 发送，Shift+Enter 换行）" rows="1" enterkeyhint="send" autocapitalize="sentences"></textarea>
+      <button id="ask" class="sendBtn">发送</button>
+    </div>
+  </div>
+</div>
+<script id="ask-data" type="application/json">${data}<\/script>
+<script>
+const CCC = JSON.parse(document.getElementById('ask-data').textContent)
+const KEY_STORE = 'serenity-public-ask-key'
+const roleSel = document.getElementById('role')
+const btn = document.getElementById('ask')
+const msgs = document.getElementById('msgs')
+const qInput = document.getElementById('q')
+let sessionId = ''
+let busy = false
+
+// 角色下拉
+roleSel.innerHTML = (CCC.roles || []).map((r) => '<option value="' + r + '">' + r + '</option>').join('') || '<option value="">(无角色)</option>'
+// key 从 localStorage 读取（列表页填写时记忆；对话页不填——v1.26.6 用户拍板）
+function getStoredKey() {
+  try { return (localStorage.getItem(KEY_STORE) || '').trim() } catch { return '' }
 }
-async function performAutoTrajectoryWake(ctx, root, settings, opts = {}) {
-	if (!settings?.enabled) return {
-		ok: false,
-		detail: "autotrajectory 未启用（enabled=false）"
-	};
-	const mdPath = resolveTargetMd(root, settings);
-	if (!mdPath) return {
-		ok: false,
-		detail: "目标会话未命中（session 未配置或 AGENT_SESSIONS 无匹配）"
-	};
-	if (!isAutoTrajectorySession(mdPath)) return {
-		ok: false,
-		detail: "目标会话目录无 --auto 标志（AGENT_SESSIONS/<date>--<desc>--auto/）"
-	};
-	if (!opts.force) {
-		const now = Date.now();
-		if (!inAllowedWakeWindow(now, settings.avoidWakeHours)) return {
-			ok: false,
-			detail: "当前在北京高峰避开窗口内（不唤起）"
-		};
-		try {
-			const mtime = statSync(mdPath).mtimeMs;
-			const hours = Math.max(1, settings.intervalHours ?? 12);
-			if (now - mtime < hours * 36e5) return {
-				ok: false,
-				detail: `距上次轨迹活动不足 ${hours}h（等待中）`
-			};
-		} catch {
-			return {
-				ok: false,
-				detail: "SESSION.md 读取失败（statSync）"
-			};
-		}
-	}
-	const agent = resolveTargetAgent(ctx, mdPath);
-	if (!agent) return {
-		ok: false,
-		detail: "目标会话 agent 不可得（先在会话列表激活目标会话后重试）"
-	};
-	const provider = settings.biasProvider?.trim() || "autotrajectory-bias.ts";
-	const biasRes = await fetchBiasContent(root, provider);
-	if (biasRes.error) return {
-		ok: false,
-		detail: `偏见内容缺失：${biasRes.error}`
-	};
-	const motivation = readSelfGeneratedMotivation(mdPath);
-	const message = buildWakeMessage({
-		sessionName: basename(dirname(mdPath)),
-		mdPath,
-		intervalHours: Math.max(1, settings.intervalHours ?? 12),
-		motivation,
-		biasContent: biasRes.text
-	});
-	agent.steer(createUserMessage({
-		content: [{
-			type: "text",
-			text: message
-		}],
-		source: PLUGIN_SOURCE
-	}));
-	return {
-		ok: true,
-		detail: `已唤起 ${basename(dirname(mdPath))}（偏见提供者 ${provider}）`
-	};
+
+/** 追加一条消息气泡（role: user|assistant） */
+function addMsg(role, htmlOrText, isHtml) {
+  const m = document.createElement('div')
+  m.className = 'msg ' + role
+  const who = document.createElement('div')
+  who.className = 'who'
+  who.textContent = role === 'user' ? '你' : CCC.name
+  const bubble = document.createElement('div')
+  bubble.className = 'bubble'
+  if (isHtml) bubble.innerHTML = htmlOrText
+  else bubble.textContent = htmlOrText
+  m.appendChild(who)
+  m.appendChild(bubble)
+  msgs.appendChild(m)
+  msgs.scrollTop = msgs.scrollHeight
+  return bubble
 }
-/**
-* 装配（index.ts apply 调用）：仅当 CCC 配置 autotrajectory.enabled=true 时启动定时器；
-* 否则零资源占用。定时器 tick 检查唤起条件 → 注入活跃会话（agent.steer，前台可见）。
-*/
-function registerAutoTrajectory(ctx) {
-	const root = resolveAutoTrajectoryRoot(ctx);
-	const settings = root ? readAutoTrajectorySettings(root) : null;
-	if (!settings?.enabled) return;
-	let running = false;
-	const tick = () => {
-		if (running) return;
-		const mdPath = resolveTargetMd(root, settings);
-		if (!shouldWake(settings, mdPath, Date.now(), running)) return;
-		running = true;
-		(async () => {
-			try {
-				const res = await performAutoTrajectoryWake(ctx, root, settings, { force: false });
-				if (res.ok) console.log(`[serenity-hooks] ✓ 自主轨迹唤起（${res.detail}）`);
-				else console.warn(`[serenity-hooks] ✗ 自主轨迹唤起跳过：${res.detail}`);
-			} catch (err) {
-				console.warn(`[serenity-hooks] ✗ 自主轨迹唤起失败: ${String(err?.message ?? err)}`);
-			} finally {
-				running = false;
-			}
-		})();
-	};
-	setInterval(tick, TICK_MS).unref();
-	tick();
+
+/** 打字指示器（等待回答时显示） */
+function addTyping() {
+  const m = document.createElement('div')
+  m.className = 'msg assistant'
+  const who = document.createElement('div')
+  who.className = 'who'
+  who.textContent = CCC.name
+  const bubble = document.createElement('div')
+  bubble.className = 'bubble'
+  bubble.innerHTML = '<span class="typing"><i></i><i></i><i></i></span>'
+  m.appendChild(who)
+  m.appendChild(bubble)
+  msgs.appendChild(m)
+  msgs.scrollTop = msgs.scrollHeight
+  return bubble
 }
-/** 目标 agent：从 SESSION.md 反向定位 dsh 会话（标题 F3 命名 S###-日期 匹配）；不可得 → null */
-function resolveTargetAgent(ctx, mdPath) {
-	const idMatch = basename(dirname(mdPath)).match(/--S(\d{3,})--/);
-	const sid = idMatch ? `S${idMatch[1]}` : null;
-	try {
-		const sessions = ctx.sessions;
-		for (const s of sessions?.list?.() ?? []) if (sid && (s.title === sid || s.title?.startsWith(`${sid}-`))) {
-			const agent = ctx.agents?.get?.(s.id ?? "");
-			if (agent) return agent;
-		}
-	} catch {}
-	return null;
+
+async function ask() {
+  const q = qInput.value.trim()
+  const key = getStoredKey()
+  const role = roleSel.value || undefined
+  if (!q) return
+  if (!key) { addMsg('assistant', '⚠️ 未找到访问 key，请先回到 <a href="/">容器列表页</a> 填写 key。', true); return }
+  if (busy) return
+  // 追加用户消息 + 打字指示
+  addMsg('user', q, false)
+  qInput.value = ''
+  autoGrow()
+  const typing = addTyping()
+  busy = true
+  btn.disabled = true
+  try {
+    const res = await fetch('/c/' + encodeURIComponent(CCC.name) + '/ask', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ key, role, question: q, sessionId: sessionId || undefined }) })
+    const data = await res.json()
+    typing.remove() // 移除打字指示，替换为真实回答
+    if (!res.ok) {
+      sessionId = ''
+      addMsg('assistant', '⚠️ ' + (data.error || ('HTTP ' + res.status)), true)
+      return
+    }
+    addMsg('assistant', data.answer_html || data.answer || '（空回答）', true)
+    sessionId = data.sessionId || ''
+  } catch (err) {
+    typing.remove()
+    addMsg('assistant', '⚠️ ' + String(err.message || err), true)
+  } finally {
+    busy = false
+    btn.disabled = false
+    qInput.focus()
+  }
 }
-/** 自主轨迹绑定的 CCC 根：进程 cwd 上溯 .serenity 优先，回退任一 live 会话 root */
-function resolveAutoTrajectoryRoot(ctx) {
-	const fromCwd = findSerenityRoot(process.cwd());
-	if (fromCwd) return fromCwd;
-	try {
-		const sessions = ctx.sessions;
-		for (const s of sessions?.list?.() ?? []) {
-			const r = findSerenityRoot(s?.header?.cwd ?? "");
-			if (r) return r;
-		}
-	} catch {}
-	return null;
+
+function autoGrow() {
+  qInput.style.height = 'auto'
+  qInput.style.height = Math.min(qInput.scrollHeight, 140) + 'px'
 }
-function getAutoTrajectoryStatus(root) {
-	const cfg = readAutoTrajectorySettings(root);
-	const now = Date.now();
-	const base = {
-		configured: cfg !== null,
-		enabled: cfg?.enabled ?? false,
-		intervalHours: Math.max(1, cfg?.intervalHours ?? 12),
-		biasProvider: cfg?.biasProvider?.trim() || "autotrajectory-bias.ts",
-		session: cfg?.session ?? null,
-		avoidWakeHours: {
-			start: cfg?.avoidWakeHours?.start ?? DEFAULT_AVOID_HOURS.start,
-			end: cfg?.avoidWakeHours?.end ?? DEFAULT_AVOID_HOURS.end
-		},
-		beijingHour: beijingHour(now),
-		windowAllowed: inAllowedWakeWindow(now, cfg?.avoidWakeHours)
-	};
-	if (!cfg) return {
-		...base,
-		target: null
-	};
-	const mdPath = resolveTargetMd(root, cfg);
-	if (!mdPath) return {
-		...base,
-		target: null
-	};
-	let idleHours = 0;
-	try {
-		idleHours = (now - statSync(mdPath).mtimeMs) / 36e5;
-	} catch {}
-	return {
-		...base,
-		target: {
-			dirName: basename(dirname(mdPath)),
-			autoFlag: isAutoTrajectorySession(mdPath),
-			idleHours: Math.max(0, idleHours),
-			wakeable: shouldWake(cfg, mdPath, now, false)
-		}
-	};
+
+btn.addEventListener('click', () => void ask())
+qInput.addEventListener('keydown', (e) => {
+  if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); void ask() }
+})
+qInput.addEventListener('input', autoGrow)
+// 新对话：重置 sessionId + 清空消息流（前端内存，不存储——刷新即失）
+document.getElementById('newChat').addEventListener('click', () => {
+  sessionId = ''
+  msgs.innerHTML = ''
+  qInput.focus()
+})
+
+// 初始欢迎消息（外层模板求值注入容器名；textContent 渲染防注入）
+addMsg('assistant', '你好，我是「${ccc.name}」的认知助手。有什么可以帮你的？（本对话仅当前页面有效，刷新即失）', false)
+qInput.focus()
+<\/script>
+</body>
+</html>`;
 }
 //#endregion
 //#region src/index.ts
@@ -13144,7 +13324,7 @@ function apply(ctx, config) {
 		ctx.tools.register(createRebuildTool(ctx));
 		ctx.tools.register(localstoreTool);
 		ctx.tools.register(skiffAdminTool);
-		ctx.tools.register(autoTrajectoryExpTool);
+		ctx.tools.register(createAutoTrajectoryExpTool(ctx));
 	}
 	if (config.guards) registerGuards(ctx, { configPaths: config.serenityConfigPaths });
 	if (config.keeper) registerKeeper(ctx, {