@shgroup/dsh-serenity-hooks 1.23.0 → 1.23.2

package/lib/index.js

@@ -5417,11 +5417,18 @@ function namingTitleFor(active) {
 }
 /**
 * use 激活宁静号会话后，把当前 dsh 会话重命名为命名标题（`S###-日期`）。
-* 门控：naming.enabled + sessionTitle 服务存在；失败不静默——返回 null 且输出
-* 失败原因（调用方 console.warn），保证可观测性（v1.22.9）。
-* @returns { title, ok } 或 { ok:false, reason }（未执行/失败均返回对象，非 null 歧义）
+* 门控：naming.enabled + sessionTitle 服务存在；失败不静默——返回结果对象
+* 而非 null（v1.22.9），调用方决定可见性。
+*
+* v1.23.2 修复（this 绑定）：第三参从**解构的裸 rename 函数**改为**整个
+* sessionTitle 服务对象**——内部以 `titles.rename(session, title)` **方法调用**
+* （this = titles 服务实例）。旧实现调用点 `const rename = titles.rename` 解构
+* 后传入，方法内部读 `this.assertServiceActive` → this=undefined 抛错
+* （日志实证：`Cannot read properties of undefined (reading 'assertServiceActive')`；
+* 与 v1.20.2/1.20.3 图片落盘同款解构丢 this bug）。
+* @returns { title, ok } 或 { ok:false, reason }（未执行/失败均返回对象）
 */
-function renameDshSessionOnUse(deps, session, rename, active) {
+function renameDshSessionOnUse(deps, session, titles, active) {
 	if (!deps.namingEnabled) return {
 		ok: false,
 		reason: "naming.enabled=false"
@@ -5430,9 +5437,13 @@ function renameDshSessionOnUse(deps, session, rename, active) {
 		ok: false,
 		reason: "sessionTitle service unavailable"
 	};
+	if (!titles || typeof titles.rename !== "function") return {
+		ok: false,
+		reason: "sessionTitle service unavailable"
+	};
 	const title = namingTitleFor(active);
 	try {
-		rename(session, title);
+		titles.rename(session, title);
 		return {
 			ok: true,
 			title
@@ -5622,16 +5633,16 @@ function createSessionTool(ctx) {
 					try {
 						const info = getActiveSessionInfo(scope);
 						if (info) {
-							const rename = (ctx.get?.("sessionTitle"))?.rename;
+							const titles = ctx.get?.("sessionTitle");
 							const dshSession = exec.agent?.session;
-							if (dshSession && typeof rename === "function") {
+							if (dshSession) {
 								const result = renameDshSessionOnUse({
 									namingEnabled: readSimpleSettings().namingEnabled,
 									sessionTitleAvailable: true
-								}, dshSession, rename, info);
+								}, dshSession, titles, info);
 								if (result.ok) console.log(`[serenity-hooks] dsh 会话已重命名: ${String(dshSession.id ?? "?")} → ${result.title}`);
 								else console.warn(`[serenity-hooks] dsh 会话重命名未执行: ${result.reason}`);
-							} else console.warn(`[serenity-hooks] dsh 会话重命名未执行: sessionTitle 服务不可用或缺少 agent session`);
+							} else console.warn(`[serenity-hooks] dsh 会话重命名未执行: 缺少 agent session`);
 						}
 					} catch (err) {
 						console.warn(`[serenity-hooks] dsh 会话重命名异常: ${String(err?.message ?? err)}`);
@@ -6409,204 +6420,527 @@ function truncateContent(content, maxChars) {
 	if (content.length <= maxChars) return content;
 	return content.slice(0, maxChars) + `\n... (truncated, original length ${content.length} chars)`;
 }
-//#endregion
-//#region src/seams/system-prompt.ts
-/** 过滤掉对 agent 隐藏的内容（safe-mode 是用户能力，不对 agent 提及） */
-const HIDDEN_LINES = /安全模式|safe-mode|\.serenity-safe-on/g;
-function sanitizeSkillContent(content) {
-	return content.split("\n").filter((line) => !HIDDEN_LINES.test(line)).join("\n");
+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);
 }
-/** 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",
-		"  loop      — run a dedicated model-specific agent in repeated rounds toward a goal",
-		"  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",
-		"",
-		"  ℹ️ 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");
+/** 一个时步的 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");
 }
-/** 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");
+/** 当前 epoch 秒 */
+function nowEpochSeconds() {
+	return Math.floor(Date.now() / 1e3);
 }
 /**
-* Principles 块（v1.19.8 合并，S142）：认知容器本体论（why）+ 操作边界（operational
-* boundaries）。原独立 Principles 与 Constraints 合并——同属容器约束体系，先原则
-* 后边界（从抽象到具体，重建视角 R↓）。**注意：Constraints 不再作为独立对齐块存在
-* （spec 修订：同步 osp compacting.ts——Constraints 内容并入本块，工具名仍为平台真实名）。**
+* 校验用户输入的 code（允许 ±TOTP_WINDOW 时步漂移，防重放窗口内同 code 复用由
+* 调用方按账号记录最近成功 counter 实现——本函数只做纯算法校验）。
+* @returns 命中的 counter（用于防重放）；不匹配返回 null。
 */
-function principlesBlock(root) {
-	return [
-		"",
-		"=== 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.",
-		"",
-		"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.",
-		"",
-		"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",
-		""
-	].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
 /**
-* EAP 自检提示块（DSH 扩展，无 osp 对应——osp 无此块）。
-* 每次输出前的机械自检清单，强化 EAP 表现（E↑ 显式/R↓ 可重建/S↑ 稳定）。
-* 独立块而非塞进 CCE/Constraints：后两者受 osp-alignment 逐字节断言约束。
+* 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 一次性迁移）。
+*
+* 文件：$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 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");
+/** 高级设定节名（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: ""
+		}
+	};
 }
-/**
-* 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",
+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")}`;
+}
+/** 校验密码与存储 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);
+}
+/** 全局配置文件路径：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 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 {};
+	}
+}
+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 ?? {};
+	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
+		}
+	};
+}
+/** 读取全局配置（文件缺失/坏 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
+	};
+	writeAdvancedSettings(next);
+	return next;
+}
+/**
+* 一次性迁移（v1.21.x → v1.22）：旧版把 `serenityAdvanced` 存在 CCC localstore.json；
+* 新版归 plugin 全局文件。全局文件已存在 → 跳过（幂等）；localstore 无旧节 → 跳过。
+* @param root - CCC 根（localstore.json 所在目录）
+* @returns true = 已迁移（旧节保留在 localstore 供回滚，读取方以全局文件为准）
+*/
+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
+	};
+}
+/**
+* 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;
+				const totpConfirm = a.totpConfirm;
+				if (typeof totp === "string" && totp !== "") {
+					if (typeof totpConfirm !== "string" || verifyTotpCode(totp, totpConfirm) === null) throw new Error(`Account "${a.user}" TOTP confirmation code invalid — enter the 6-digit code currently shown by the authenticator`);
+				}
+				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;
+	}
+	return updateAdvancedSettings(patch);
+}
+//#endregion
+//#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: ""
+		};
+	}
+}
+/** 过滤掉对 agent 隐藏的内容（safe-mode 是用户能力，不对 agent 提及） */
+const HIDDEN_LINES = /安全模式|safe-mode|\.serenity-safe-on/g;
+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",
+		"  loop      — run a dedicated model-specific agent in repeated rounds toward a goal",
+		"  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",
+		"",
+		"  ℹ️ 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");
+}
+/**
+* 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");
+}
+/**
+* 彩蛋 persona 块（v1.23.1，S142 用户需求）：
+* 用户配置的替换文本替代 EAP 块 + MSM 原则段（输出约束/指令遵循约束）。
+* 独立标记头 `=== Serenity Persona ===`（幂等检测兼容）；装配位置 = EAP 原位。
+* mode 空 = 彩蛋关闭 → 返回空串（装配层回退默认 EAP + 完整 Principles）。
+*/
+function personaBlock(mode, overrideText) {
+	if (mode === "" || overrideText.trim() === "") return "";
+	return [
+		"",
+		"=== Serenity Persona ===",
+		overrideText.trimEnd(),
+		""
+	].join("\n");
+}
+/**
+* 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");
+}
+/**
+* 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 —",
@@ -6759,14 +7093,20 @@ function sessionBlock(root, scope = DEFAULT_SESSION_SCOPE) {
 * 身份（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),
+		principlesBlock(root, personaOn),
 		cceBlock(),
-		eapBlock()
+		personaOn ? personaBlock(persona.mode, persona.overrideText) : eapBlock()
 	];
 	const state = [safeModeBlock(root), localstoreBlock(root)].filter((b) => b !== "").join("\n");
 	if (state) parts.push(state);
@@ -6888,417 +7228,137 @@ function accIdentityText(root, configPaths = DEFAULT_SERENITY_CONFIG_PATHS, entr
 	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 = {
-	kind: "plugin",
-	plugin: "dsh-serenity-hooks"
-};
-/**
-* ACC 注入消息（S134 去重）：**只含简短身份锚点**（[ACC] 已激活 + CCC 根 + 约束 + loop 模型 + 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
-	});
-}
-/** 每 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` 存在（任何子会话）
-* - loop 牛马：sessionId 固定 `loop-` 前缀（tools/loop.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("loop-")) 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 root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
-		if (!root) return;
-		const key = agentKey(agent);
-		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) {
-					setActiveSessionInfo(scope, info);
-					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 root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
-		const key = agentKey(agent);
-		const downstream = await next();
-		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;
-		const agent = ctx.agents.get(session.id);
-		if (!agent) return;
-		const root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
-		if (!root) return;
-		try {
-			agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
-		} catch {}
-	});
-}
-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);
-}
-/**
-* 校验用户输入的 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;
-}
-//#endregion
-//#region src/config-ops.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 一次性迁移）。
-*
-* 文件：$DSH_HOME/serenity-hooks.json（缺省 ~/.dsh/serenity-hooks.json；
-* env SERENITY_HOOKS_CONFIG 可覆盖——测试/部署注入）。
-* 权限：0600（含账号密码 hash，敏感）。
-*
-* 安全：密码仅存 scrypt hash（node:crypto 内置，零依赖）；wire 层永不返回 hash
-* （GET 只回 user/id，设置面板"密码"字段提交空串 = 不修改）。
-*/
-/** 高级设定节名（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 }
-	};
-}
-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")}`;
-}
-/** 校验密码与存储 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);
-}
-/** 全局配置文件路径：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 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 {};
-	}
-}
-function writeFileSafe(p, data) {
-	writeFileSync(p, JSON.stringify(data, null, 2) + "\n", "utf-8");
-	try {
-		chmodSync(p, 384);
-	} catch {}
+			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 ?? {};
-	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 }
-	};
+const PLUGIN_SOURCE = {
+	kind: "plugin",
+	plugin: "dsh-serenity-hooks"
+};
+/**
+* ACC 注入消息（S134 去重）：**只含简短身份锚点**（[ACC] 已激活 + CCC 根 + 约束 + loop 模型 + 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
+	});
 }
-/** 读取全局配置（文件缺失/坏 JSON → 默认值） */
-function readAdvancedSettings() {
-	return mergeWithDefaults(readFileSafe(globalConfigPath()));
+/** 每 agent 是否已注入过（进程内存态） */
+const injected = /* @__PURE__ */ new Set();
+function agentKey(agent) {
+	return agent.session.id ?? "global";
 }
-/** 写入全局配置（整体替换） */
-function writeAdvancedSettings(settings) {
-	writeFileSafe(globalConfigPath(), settings);
+function agentScope(agent) {
+	return agent.session.id ?? "default";
 }
 /**
-* 部分更新：传入 Partial，深合并到现有值。
-* accounts 传入数组 → 整体替换；accounts 未传 → 保留现有。
+* 重启恢复的根会话判定（S134 需求）：
+* 只有"conversation 根会话"才自动恢复最近激活的宁静号会话——
+* - subagent：session header `origin === 'subagent'`（DSH 路由语义，agent-lookup.ts）
+* - 派生会话：`parentSession` 存在（任何子会话）
+* - loop 牛马：sessionId 固定 `loop-` 前缀（tools/loop.ts 生成）
+* 三者都不恢复（避免把主会话激活注入子上下文，违背 v1.16.2 scope 隔离）。
 */
-function updateAdvancedSettings(patch) {
-	const current = readAdvancedSettings();
-	const gw = patch.gateway;
-	const rb = patch.rebuild;
-	const nm = patch.naming;
-	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
-	};
-	writeAdvancedSettings(next);
-	return next;
+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("loop-")) return false;
+	return true;
 }
 /**
-* 一次性迁移（v1.21.x → v1.22）：旧版把 `serenityAdvanced` 存在 CCC localstore.json；
-* 新版归 plugin 全局文件。全局文件已存在 → 跳过（幂等）；localstore 无旧节 → 跳过。
-* @param root - CCC 根（localstore.json 所在目录）
-* @returns true = 已迁移（旧节保留在 localstore 供回滚，读取方以全局文件为准）
+* 恢复触发判定（S134 泄漏修复 v1.16.13）：根会话 **且已有对话历史**（续跑/恢复的会话）
+* 才自动恢复上次激活的宁静号会话——全新会话（新任务，如 apaas-26116）无历史 → 不恢复，
+* 避免把过去的 SESSION 上下文注入新任务（跨任务污染）。
 */
-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 shouldRestoreActive(agent) {
+	if (!shouldAutoRestore(agent)) return false;
+	const events = agent.session?.events;
+	return Array.isArray(events) && events.length > 0;
 }
-/** 持久化 → 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
+function registerContext(ctx, opts = {}) {
+	const configPaths = opts.configPaths ?? DEFAULT_SERENITY_CONFIG_PATHS;
+	const entrySkillMaxChars = opts.entrySkillMaxChars ?? 3e4;
+	const seed = (agent) => {
+		const root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
+		if (!root) return;
+		const key = agentKey(agent);
+		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) {
+					setActiveSessionInfo(scope, info);
+					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 root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
+		const key = agentKey(agent);
+		const downstream = await next();
+		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
 /**
-* wire → 持久化（面板 PUT 用）：
-* accounts 元素可选带 `pass`：非空 → 重新 hash；空/缺省 → 保留现有 hash（按 id 匹配）。
-* 新账号（id 不在现有）必须带非空 pass，否则抛错（无法生成 hash）。
+* 注册压缩保留：compact/end（成功）后重注入 ACC 身份。
+* 仅当 agent 工作目录在 CCC 内时生效（激活门控）。
 */
-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;
-				const totpConfirm = a.totpConfirm;
-				if (typeof totp === "string" && totp !== "") {
-					if (typeof totpConfirm !== "string" || verifyTotpCode(totp, totpConfirm) === null) throw new Error(`Account "${a.user}" TOTP confirmation code invalid — enter the 6-digit code currently shown by the authenticator`);
-				}
-				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 };
-	return updateAdvancedSettings(patch);
+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;
+		const agent = ctx.agents.get(session.id);
+		if (!agent) return;
+		const root = findSerenityRoot(agent.session?.header?.cwd ?? process.cwd());
+		if (!root) return;
+		try {
+			agent.inject(accMessage(root, configPaths, entrySkillMaxChars));
+		} catch {}
+	});
 }
 //#endregion
 //#region src/api.ts