@shgroup/dsh-serenity-hooks 1.27.14 → 1.28.0

package/lib/index.js

@@ -1,9 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as findSerenityRoot, c as matchBlacklist, d as readHandymanConfig, i as findGitRoot, l as pathInside, n as SAFE_MODE_MARKER, o as isSafeModeOn, p as resolveInside, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-CfDrlfA7.js";
-import { a as resolveRoleSystemPrompt, i as readSkiffRoles, l as systemPromptSource, r as isSkiffSessionId, s as roleToolWhitelist } from "./skiff-role-Dw7UKCUm.js";
-import { C as splitModel, E as skiffRoleFor, S as requireWhitelistedModel, T as writeProgress, _ as buildRoundPrompt, a as startSkiffDebugServer, b as newStopToken, c as askSkiff, d as skiffMsmGate, f as skiffSessionInfo, g as HANDYMAN_GUIDE, h as unregisterSkiffSession, l as createSkiffAgent, m as skiffTrajectoryEnabled, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffSessionSnapshot, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as getSkiffAgent, v as handymanProgressPaths, w as writeFailedStatus, x as readProgress, y as listActiveHandymen } from "./skiff-debug-BRlc17GU.js";
-import { a as readWeixinCredential, c as weixinInboundDir, d as LOCALSTORE_SCOPES, f as checkLocalstoreGitCompliance, h as runLocalStore, i as matchWeixinRoute, l as weixinSessionIdFor, m as readGitTrack, n as extractWeixinText, o as readWeixinSettings, p as localstorePath, r as hasVoiceItem, s as sanitizeFileName$1, t as extractWeixinMedia } from "./weixin-route-BUJLsCGS.js";
-import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-PzeHStWP.js";
+import { a as findSerenityRoot, c as matchBlacklist, d as readCccName$2, f as readHandymanConfig, i as findGitRoot, l as pathInside, m as resolveInside, n as SAFE_MODE_MARKER, o as isSafeModeOn, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-CX48YNUL.js";
+import { a as resolveRoleSystemPrompt, i as readSkiffRoles, l as systemPromptSource, r as isSkiffSessionId, s as roleToolWhitelist } from "./skiff-role-BTdBHyOQ.js";
+import { C as splitModel, E as skiffRoleFor, S as requireWhitelistedModel, T as writeProgress, _ as buildRoundPrompt, a as startSkiffDebugServer, b as newStopToken, c as askSkiff, d as skiffMsmGate, f as skiffSessionInfo, g as HANDYMAN_GUIDE, h as unregisterSkiffSession, l as createSkiffAgent, m as skiffTrajectoryEnabled, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffSessionSnapshot, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as getSkiffAgent, v as handymanProgressPaths, w as writeFailedStatus, x as readProgress, y as listActiveHandymen } from "./skiff-debug-DIf_Uenr.js";
+import { a as readWeixinCredential, c as weixinInboundDir, d as LOCALSTORE_SCOPES, f as checkLocalstoreGitCompliance, h as runLocalStore, i as matchWeixinRoute, l as weixinSessionIdFor, m as readGitTrack, n as extractWeixinText, o as readWeixinSettings, p as localstorePath, r as hasVoiceItem, s as sanitizeFileName$1, t as extractWeixinMedia } from "./weixin-route-DFkRf9ou.js";
+import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-DnX9TJxt.js";
 import { a as markdownToPlainText, c as sniffImageExt, i as getUpdates, n as downloadMedia, o as sendTextMessage, r as getConfig, s as sendTyping, t as TypingStatus } from "./weixin-api-OUCuw0Ws.js";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -81,12 +81,43 @@ function getFileInfo(absPath, name) {
 function safeRel(root, abs) {
 	return relative(root, abs) || ".";
 }
+/**
+* 受保护注册表聚合档的路径集合（review P2-2：精确文件保护可被 `rm -r 父目录` / `mv 父目录`
+* 绕过——删掉 references/ 目录等于删掉注册表。保护对象 = 聚合档文件 + 其全部祖先目录）。
+* @returns null = 无 cccName（无法定位 → 不保护）；否则 { fileRel, ancestorDirs } 相对根的正斜杠 rel
+*/
+function protectedRegistryTargets(root) {
+	const cccName = readCccName$2(root);
+	if (!cccName) return null;
+	const fileRel = `.opencode/skills/${cccName}/references/mech-registry.json`;
+	const segs = fileRel.split("/");
+	const ancestorDirs = [];
+	if (segs.length >= 3) ancestorDirs.push(segs.slice(0, segs.length - 1).join("/"));
+	return {
+		fileRel,
+		ancestorDirs
+	};
+}
+function isProtectedRegistryTarget(root, relCi) {
+	const protectedTargets = protectedRegistryTargets(root);
+	if (!protectedTargets) return null;
+	const lower = (s) => process.platform === "win32" ? s.toLowerCase() : s;
+	if (relCi === lower(protectedTargets.fileRel)) return { hit: "file" };
+	for (const ancestor of protectedTargets.ancestorDirs) if (relCi === lower(ancestor)) return { hit: "ancestor" };
+	return null;
+}
+function assertNotProtectedRegistry(root, absPath, targetLabel) {
+	const rel = relative(root, absPath).split("\\").join("/");
+	const lower = (s) => process.platform === "win32" ? s.toLowerCase() : s;
+	const hit = isProtectedRegistryTarget(root, lower(rel));
+	if (hit === null) return;
+	if (hit.hit === "file") throw new Error(`cc-fs: refusing to directly modify mech-registry.json — use acc_msm register/deregister instead`);
+	throw new Error(`cc-fs: refusing to ${/rm|delete|remove/i.test(targetLabel) ? "remove" : "move"} "${rel}" — it is an ancestor of the ACC-managed mech-registry.json (${protectedRegistryTargets(root)?.fileRel}); the registry is managed by acc_msm register/deregister`);
+}
 function validateWritePath(root, target) {
 	const absPath = target.startsWith("/") ? resolve(target) : resolveInside(root, target);
 	if (!pathInside(resolve(root), absPath)) throw new Error(`cc-fs: path "${target}" resolves to "${absPath}" which is outside serenity root "${root}"`);
-	const rel = relative(root, absPath).split("\\").join("/");
-	const relCi = process.platform === "win32" ? rel.toLowerCase() : rel;
-	if (relCi.endsWith("/mech-registry.json") && /(^|\/)(opencode|\.opencode)\/skills\//.test(relCi)) throw new Error(`cc-fs: refusing to directly modify mech-registry.json — use acc_msm register/deregister instead`);
+	assertNotProtectedRegistry(root, absPath, `modify ${target}`);
 	if (existsSync(absPath)) try {
 		const real = realpathSync(absPath);
 		if (!pathInside(resolve(root), real)) throw new Error(`cc-fs: path "${target}" resolves via symlink to "${real}" outside serenity root "${root}"`);
@@ -187,7 +218,13 @@ function runCcFs(root, args) {
 			const recursive = args.recursive ?? false;
 			const results = [];
 			for (const target of targets) {
-				const absPath = validateWritePath(root, target);
+				let absPath;
+				try {
+					absPath = validateWritePath(root, target);
+				} catch (e) {
+					results.push(`[SKIP] ${e.message}`);
+					continue;
+				}
 				if (!existsSync(absPath)) {
 					results.push(`[SKIP] not found: ${target}`);
 					continue;
@@ -518,6 +555,34 @@ const CC_FS_WRITE_ACTIONS = /* @__PURE__ */ new Set([
 *   含 API keys/tokens/SSH 密码，即使 prompt 纪律失败也无值可吐（机械保证）。
 */
 const SENSITIVE_CREDENTIAL_FILES = /* @__PURE__ */ new Set(["localstore.json"]);
+/**
+* MSM 注册表写保护（需求⑤b S142 用户拍板："msm注册的文件需要写保护起来，避免CCC意外写坏搞崩自己"）：
+* mech-registry.json 是 CCC 执行层地基（坏 → loadMsmEntries 抛 → acc_msm/skiff/output-guard 全崩，
+* register 也崩 → 自锁）。**写 deny、读 allow**（与 localstore 读 deny 语义区分 R6——注册表是
+* 结构核心不是秘密，需被 output-guard/skiff-admin 读取建 MSM 词表）。
+*
+* 单级化（需求⑤a）后**唯一合法注册表 = cccName 聚合档**
+* `.opencode/skills/<cccName>/references/mech-registry.json`（cccName = .serenity 首行）。
+* 历史 root 级 `mech-registry.json` 与各 skill 分散注册表已废弃：**不再保护**
+* （review P1：保护一个永不被读的文件 = 死锁——MSM 既不可见又不可删/迁移）。
+* 写工具命中聚合档 → deny（唯一合法写通道 = acc_msm register/deregister 内部 writeRegistry，
+* 走工具实现不经 pre-execute → 天然豁免）；读工具放行。
+*/
+function isProtectedRegistryRel(root, rel) {
+	const lower = (s) => process.platform === "win32" ? s.toLowerCase() : s;
+	const relCi = lower(rel);
+	try {
+		const marker = resolve(root, ".serenity");
+		if (existsSync(marker)) {
+			const line = readCccName$2(root);
+			if (line) {
+				if (relCi === lower(`.opencode/skills/${line}/references/mech-registry.json`)) return true;
+				if (relCi === lower(`.opencode/skills/${line}/references`)) return true;
+			}
+		}
+	} catch {}
+	return false;
+}
 /** 判定工具是否为写类：普通工具按名；cc_fs 复合工具按子命令 action */
 function isWriteTool(toolName, action) {
 	if (!WRITE_TOOLS.has(toolName)) return false;
@@ -561,6 +626,10 @@ function decideGuard(input) {
 				deny: `CCC governance file "${rel}" is reserved for the user — agent must not write`,
 				kind: "deny"
 			};
+			if (isProtectedRegistryRel(root, rel)) return {
+				deny: rel.endsWith("/mech-registry.json") ? `mech-registry.json is ACC-managed (${rel}) — use acc_msm register/deregister instead of writing it directly` : `"${rel}" is an ancestor of the ACC-managed mech-registry.json — removing/moving it would destroy the registry; the registry is managed by acc_msm register/deregister`,
+				kind: "deny"
+			};
 			const hit = matchBlacklist(rel, blacklist);
 			if (hit) return {
 				deny: hit.message ?? `blacklist blocked: "${pathArg}" matches rule "${hit.pattern}"`,
@@ -780,14 +849,83 @@ const KIT_ACTIONS = [
 	"time",
 	"wait"
 ];
-/** CCC 名：从 .serenity 首行解析（对齐 osp readSerenityCccName） */
+/** CCC 名（review P2-2：统一收口到 ccc.ts readCccName——跳 # 注释/空行首非空行；此处保留 null 容错） */
 function readCccName$1(root) {
-	if (!root) return null;
+	return root ? readCccName$2(root) : null;
+}
+function checkRegistryHealth(root) {
+	const cccName = readCccName$1(root);
+	if (!cccName) return {
+		path: null,
+		ok: true,
+		present: false,
+		issues: []
+	};
+	const rel = `.opencode/skills/${cccName}/references/mech-registry.json`;
+	const abs = resolve(root, rel);
+	if (!existsSync(abs)) return {
+		path: rel,
+		ok: true,
+		present: false,
+		issues: []
+	};
+	const issues = [];
+	let raw = "";
 	try {
-		return readFileSync(resolve(root, ".serenity"), "utf-8").trim().split("\n")[0]?.trim() || null;
-	} catch {
-		return null;
+		raw = readFileSync(abs, "utf-8");
+	} catch (err) {
+		return {
+			path: rel,
+			ok: false,
+			present: true,
+			issues: [`registry unreadable: ${String(err?.message ?? err)}`]
+		};
+	}
+	let data;
+	try {
+		data = JSON.parse(raw.replace(/^\uFEFF/, ""));
+	} catch (err) {
+		return {
+			path: rel,
+			ok: false,
+			present: true,
+			issues: [`registry JSON is broken: ${String(err?.message ?? err)}`, `Fix: restore from git — register/deregister auto-commits the registry (git checkout -- ${rel}; or git restore ${rel})`]
+		};
+	}
+	const entries = Array.isArray(data) ? data : data?.entries;
+	if (!Array.isArray(entries)) return {
+		path: rel,
+		ok: false,
+		present: true,
+		issues: ["registry top-level is neither an array nor a v1 wrapper with entries[]", `Fix: restore from git (git checkout -- ${rel}; or git restore ${rel})`]
+	};
+	const names = /* @__PURE__ */ new Set();
+	for (let i = 0; i < entries.length; i++) {
+		const e = entries[i];
+		if (typeof e !== "object" || e === null) {
+			issues.push(`entry[${i}] is not an object`);
+			continue;
+		}
+		if (typeof e.name !== "string" || e.name === "") issues.push(`entry[${i}]: name missing or not a string`);
+		if (typeof e.path !== "string" || e.path === "") issues.push(`entry[${i}] (${String(e.name ?? "?")}): path missing or not a string`);
+		if (e.skill !== void 0 && typeof e.skill !== "string") issues.push(`entry[${i}] (${String(e.name ?? "?")}): skill not a string`);
+		if (e.category !== void 0 && typeof e.category !== "string") issues.push(`entry[${i}] (${String(e.name ?? "?")}): category not a string`);
+		if (typeof e.name === "string" && e.name !== "") {
+			if (names.has(e.name)) issues.push(`duplicate MSM name: "${e.name}" (entry[${i}]) — loadMsmEntries dedups by name, ambiguity`);
+			names.add(e.name);
+		}
+		if (typeof e.path === "string" && e.path !== "") {
+			const scriptAbs = resolve(root, e.path);
+			if (!pathInside(resolve(root), scriptAbs)) issues.push(`entry[${i}] (${String(e.name ?? "?")}): path "${e.path}" escapes CCC root`);
+			else if (!existsSync(scriptAbs)) issues.push(`entry[${i}] (${String(e.name ?? "?")}): script not found at "${e.path}"`);
+		}
 	}
+	return {
+		path: rel,
+		ok: issues.length === 0,
+		present: true,
+		issues
+	};
 }
 async function runKit(root, args) {
 	switch (args.action) {
@@ -825,6 +963,7 @@ async function runKit(root, args) {
 					}
 				}
 			};
+			if (root) report.registry = checkRegistryHealth(root);
 			if (root) report.config = loadSerenityConfig(root);
 			report.accVersion = ACC_VERSION;
 			report.dshVersion = readDshVersion();
@@ -863,7 +1002,7 @@ function renderText$11(value) {
 }
 const kitTool = defineTool({
 	name: "acc_kit",
-	description: "ACC general-purpose utility kit: health (CCC three-principle check P1/P2/config, healthy/degraded report) / time (now_iso/now_local/epoch_ms) / wait (wait N seconds, default 1). Routine self-check before entering a CCC.",
+	description: "ACC general-purpose utility kit: health (CCC three-principle check P1/P2/config + MSM registry integrity report, healthy/degraded) / time (now_iso/now_local/epoch_ms) / wait (wait N seconds, default 1). Routine self-check before entering a CCC.",
 	parameters: {
 		action: {
 			type: "string",
@@ -1150,13 +1289,9 @@ function bunExecutablePath() {
 	bunExeCache = null;
 	return null;
 }
-/** CCC 名：从 .serenity 首行解析（对齐 osp readSerenityCccName） */
+/** CCC 名：从 .serenity 解析（review P2-2 统一收口到 ccc.ts readCccName——跳 # 注释/空行首非空行；此处保留导出名兼容内部调用） */
 function readCccName(root) {
-	try {
-		return readFileSync(resolve(root, ".serenity"), "utf-8").trim().split("\n")[0]?.trim() || null;
-	} catch {
-		return null;
-	}
+	return readCccName$2(root);
 }
 /**
 * path-arg 逃逸校验：根内 + symlink 防御（对齐 osp validatePathArgsFromTokens）。
@@ -1194,8 +1329,34 @@ const MSM_ACTIONS = [
 	"deregister",
 	"check",
 	"guide",
-	"ccc-config"
+	"ccc-config",
+	"catalog"
 ];
+/**
+* ACC 能力目录（需求④ S142 用户拍板："acc 配置各自做 guide 越来越多，整合成目录式使用指南"）。
+* 目录在前、详情各归各——**单一真相源**：本目录只索引"去哪个工具/子命令看详情"，不复制详情
+* （避免 skiff_admin/weixin-doctor 等 guide 全文重复 → 多真相源 → 失同步）。
+* 后续新增功能只需在此加一行（低熵可演进）。
+*/
+const ACC_CATALOG = `═══ ACC Usage Catalog ═══
+Directory of ACC capabilities — each area lists where to go for details (guides live with their feature; this catalog only points).
+
+  ① 会话与轨迹        → session tool（list/show/create/use/close/health/qa/archive/summary/hook-develop-guide）
+                         session_rebuild（超限重建；阈值 K 见 ccc-config / 设置面板重建阈值K）
+  ② 认知质量框架      → eap（E↑/R↓/S↑）/ neat（Neat 协议）/ cce（认知连续性工程）——渐进披露，无参即全文
+  ③ 工具与执行        → cc_fs（文件系统 15 子命令）/ cc_git（git）/ acc_kit（health 含注册表检查/time/wait）
+                         acc_msm（MSM 框架：本工具 list/exec/register/deregister/check/guide/ccc-config/catalog）
+                         handyman（杂工 agent 编排——guide 子命令：acc_msm exec handyman guide）
+  ④ 角色与对外面      → skiff_admin（Skiff 认知子集角色：guide/validate/apply/list——acc_msm exec skiff_admin guide）
+                         ACP（程序化 JSON-RPC 3100）/ Skiff 问答页（公网 ask）——面板「外部能力」组
+  ⑤ 自主与接入        → autopilot-trajectory（Autopilot 一站式：all/init/random/diag/doc/check/status/guide）
+                         weixin 微信桥（配置/扫码/路由/消息 hook——CCC 侧 weixin-doctor MSM：acc_msm exec weixin-doctor guide）
+  ⑥ CCC 配置总览      → acc_msm ccc-config（8 段：handyman/sessionKeeper/localstore/hooks/safeMode/skiff/autopilotTrajectory/weixin）
+  ⑦ 注册表与安全      → mech-registry.json 由 acc_msm register/deregister 管理（写保护——不可直接编辑）
+                         acc_kit health 输出 registry 完整性检查；损坏恢复指引见 health registry.issues
+
+每区：一句话定位 + 详细入口（工具名 / guide 子命令）。详情永远以对应工具的 guide/ccc-config 为单一真相源。
+`;
 const MSM_GUIDE = `MSM Development Manual (Mech & Semi-Mech framework)
 
 ## What it is
@@ -1380,16 +1541,18 @@ function parseRegistry(raw) {
 	if (!Array.isArray(entries)) throw new Error("invalid registry: missing entries[]");
 	return entries;
 }
+/**
+* 注册表单级化（需求⑤a S142 用户拍板：注册表只有一级——对齐 osp cccName 单聚合档）：
+* 所有 entry 集中写入 `.opencode/skills/<cccName>/references/mech-registry.json`
+* （cccName = .serenity 首行，即顶层入口 skill 目录），skill 只作 entry 字段。
+* 不再扫描/写入各 skill 目录的分散注册表（历史形态 v1.14~v1.27，register --skill
+* 曾写入各自 skill 目录 —— 多真相源，废弃）。
+*/
 function findRegistries(root) {
-	const out = [];
-	const skillsDir = join(root, ".opencode", "skills");
-	if (existsSync(skillsDir)) for (const skill of readdirSync(skillsDir)) {
-		const p = join(skillsDir, skill, "references", "mech-registry.json");
-		if (existsSync(p)) out.push(p);
-	}
-	const rootRegistry = join(root, "mech-registry.json");
-	if (existsSync(rootRegistry)) out.push(rootRegistry);
-	return out;
+	const cccName = readCccName(root);
+	if (!cccName) return [];
+	const aggregate = join(root, ".opencode", "skills", cccName, "references", "mech-registry.json");
+	return existsSync(aggregate) ? [aggregate] : [];
 }
 function loadMsmEntries(root) {
 	const byName = /* @__PURE__ */ new Map();
@@ -1411,8 +1574,13 @@ function scanSkillScripts(root) {
 	}
 	return out.sort();
 }
-function registryPathFor(root, skill) {
-	return skill ? join(root, ".opencode", "skills", skill, "references", "mech-registry.json") : join(root, "mech-registry.json");
+/**
+* 注册表写入路径（需求⑤a 单级化）：永远返回 cccName 聚合档。
+* skill 参数保留签名（兼容调用方）但只进 entry 字段，不决定写入位置。
+*/
+function registryPathFor(root, _skill) {
+	const cccName = readCccName(root) ?? "unknown";
+	return join(root, ".opencode", "skills", cccName, "references", "mech-registry.json");
 }
 function writeRegistry(path, entries, isV1Wrapped = true) {
 	mkdirSync(dirname(path), { recursive: true });
@@ -1438,6 +1606,7 @@ function runMsm(root, args) {
 			return `${header}\n` + lines.join("\n");
 		}
 		case "guide": return { guide: MSM_GUIDE };
+		case "catalog": return { catalog: ACC_CATALOG };
 		case "exec": {
 			const { entry, businessArgs, fmtJson, hasHelp, protocol } = prepareExec(root, args);
 			const p = protocolResult(protocol);
@@ -1483,7 +1652,7 @@ function runMsm(root, args) {
 			if (loadMsmEntries(root).some((e) => e.name === name)) throw new Error(`MSM already registered: "${name}"`);
 			const regPath = registryPathFor(root, skill);
 			const raw = existsSync(regPath) ? readFileSync(regPath, "utf-8").replace(/^\uFEFF/, "") : "";
-			const isV1Wrapped = raw !== "" && !Array.isArray(JSON.parse(raw));
+			const isV1Wrapped = raw === "" ? true : !Array.isArray(JSON.parse(raw));
 			const entries = existsSync(regPath) ? parseRegistry(readFileSync(regPath, "utf-8")) : [];
 			let flags;
 			if (args.flags) try {
@@ -1776,13 +1945,13 @@ function renderText$9(value) {
 }
 const msmTool = defineTool({
 	name: "acc_msm",
-	description: "MSM (Mech & Semi-Mech) framework: list lists registered MSMs (header+flags display); exec executes (600s timeout, path-escape + symlink blocking, injects SERENITY_ROOT/CCC/VERSION env, appends --help TIP on failure; first arg --list/--schema/--format=json is protocol); register/deregister manage the registry (path inside root + script exists + globally unique validation, auto git precision commit); check quality checks DC-M1~M4; guide development manual; ccc-config CCC config reference (all sections: handyman.models / sessionKeeper.threshold / localstore.gitTrack / hooks.autoRestoreSession / safeMode.blacklist / skiff.roles / autopilotTrajectory / weixin incl. message hook full guide). Reuses the CCC mech-registry.json.",
+	description: "MSM (Mech & Semi-Mech) framework: list lists registered MSMs (header+flags display); exec executes (600s timeout, path-escape + symlink blocking, injects SERENITY_ROOT/CCC/VERSION env, appends --help TIP on failure; first arg --list/--schema/--format=json is protocol); register/deregister manage the registry (path inside root + script exists + globally unique validation, auto git precision commit); check quality checks DC-M1~M4; guide development manual; catalog ACC usage directory (all capability areas — points to each feature guide, single source of truth); ccc-config CCC config reference (all sections: handyman.models / sessionKeeper.threshold / localstore.gitTrack / hooks.autoRestoreSession / safeMode.blacklist / skiff.roles / autopilotTrajectory / weixin incl. message hook full guide). Reuses the CCC mech-registry.json.",
 	parameters: {
 		action: {
 			type: "string",
 			enum: [...MSM_ACTIONS],
 			required: true,
-			description: "Subcommand: list/exec/register/deregister/check/guide/ccc-config"
+			description: "Subcommand: list/exec/register/deregister/check/guide/catalog/ccc-config"
 		},
 		name: {
 			type: "string",
@@ -3015,26 +3184,45 @@ function agentScope$2(exec) {
 	return exec.agent?.session?.id ?? "default";
 }
 /**
-* 从激活会话派生命名标题（v1.22.9 格式修正）：
+* 清洗 + 截断会话概括（需求② S142 用户拍板：编号日期后加 ≤20 字内容概括）。
+* 规则（服务端统一，不信任 LLM 输入）：
+*   - 去控制字符/换行/回车/制表（防标题注入/多行污染）
+*   - trim（去首尾空白）
+*   - 截断 ≤20 字符（按 Unicode 码点——中英混排统一；emoji 等代理对按码点保留）
+*   - 去 `/`（防标题被误读为路径分隔）
+* @returns 清洗后的概括（空输入 → 空串；调用方决定是否允许空）
+*/
+function sanitizeSessionSummary(summary) {
+	return [...summary.replace(/[\u0000-\u001f\u007f]/g, "").replace(/\//g, "").trim()].slice(0, 20).join("");
+}
+/**
+* 从激活会话派生命名标题（v1.22.9 格式修正 + 需求② 概括）：
 * F3 原始需求是 **`S###-日期`**（如 `S143-2026-08-26`）——从 `sessionId` 派生，
 * 而非完整目录名（`2026-08-24--S142--...` 超长 + 中文，不符合用户拍板格式）。
+* 需求②（S142 用户拍板）：编号日期后加 ≤20 字内容概括 → `S###-YYYY-MM-DD-<概括>`
+* ——概括来自显式 summary 参数（服务端截断/清洗，可靠不靠猜）；编号日期仍固定派生。
 * 无 S### 编号（issue 会话等）→ 回退目录名。
-* @returns `S143-2026-08-26` 或原目录名
+* @param active 激活会话信息（sessionId + dirName）
+* @param summary 内容概括（≤20 字，服务端清洗截断；空 → 不带概括的 `S###-日期`）
+* @returns `S143-2026-08-26-概括` / `S143-2026-08-26` / 原目录名
 */
-function namingTitleFor(active) {
+function namingTitleFor(active, summary) {
 	const sid = active.sessionId;
 	if (typeof sid === "string" && /^S\d+$/.test(sid)) {
 		const date = active.dirName.match(/^(\d{4}-\d{2}-\d{2})--/)?.[1] ?? "";
-		if (date) return `${sid}-${date}`;
-		return sid;
+		const cleaned = summary ? sanitizeSessionSummary(summary) : "";
+		const base = date ? `${sid}-${date}` : sid;
+		return cleaned ? `${base}-${cleaned}` : base;
 	}
 	return active.dirName;
 }
 /**
-* use 激活宁静号会话后，把当前 dsh 会话重命名为命名标题（`S###-日期`）。
+* use 激活宁静号会话后，把当前 dsh 会话重命名为命名标题（`S###-日期[-概括]`）。
 * v1.27.1：**永远开启**（不再有 naming.enabled 门控）——仅 sessionTitle 服务
 * 存在性守卫；失败不静默——返回结果对象而非 null（v1.22.9），调用方决定可见性。
 *
+* 需求②（S142 用户拍板）：summary 参数（≤20 字概括）→ 标题带概括；编号日期固定派生。
+*
 * v1.23.2 修复（this 绑定）：第三参从**解构的裸 rename 函数**改为**整个
 * sessionTitle 服务对象**——内部以 `titles.rename(session, title)` **方法调用**
 * （this = titles 服务实例）。旧实现调用点 `const rename = titles.rename` 解构
@@ -3043,7 +3231,7 @@ function namingTitleFor(active) {
 * 与 v1.20.2/1.20.3 图片落盘同款解构丢 this bug）。
 * @returns { title, ok } 或 { ok:false, reason }（未执行/失败均返回对象）
 */
-function renameDshSessionOnUse(deps, session, titles, active) {
+function renameDshSessionOnUse(deps, session, titles, active, summary) {
 	if (!deps.sessionTitleAvailable) return {
 		ok: false,
 		reason: "sessionTitle service unavailable"
@@ -3052,7 +3240,7 @@ function renameDshSessionOnUse(deps, session, titles, active) {
 		ok: false,
 		reason: "sessionTitle service unavailable"
 	};
-	const title = namingTitleFor(active);
+	const title = namingTitleFor(active, summary);
 	try {
 		titles.rename(session, title);
 		return {
@@ -3080,12 +3268,13 @@ function activeInfoFromCreate(result) {
 }
 /**
 * 把当前 dsh 会话重命名为指定 SESSION 的命名标题（use/create 共用；v1.25.11）。
+* 需求②：summary 参数（≤20 字概括）透传——标题带概括（编号日期固定派生）。
 * 门控/失败可见性与 renameDshSessionOnUse 一致（不静默：成功 log / 失败 warn）。
 * 调用点（use 分支原内联逻辑提取，create 分支复用）：
 *   - use：激活后从 activeStore 取 info
 *   - create：createSession 结果经 activeInfoFromCreate 构造 info
 */
-function renameDshSessionForActive(ctx, exec, info) {
+function renameDshSessionForActive(ctx, exec, info, summary) {
 	try {
 		const titles = ctx.get?.("sessionTitle");
 		const dshSession = exec.agent?.session;
@@ -3093,7 +3282,7 @@ function renameDshSessionForActive(ctx, exec, info) {
 			console.warn(`[serenity-hooks] dsh 会话重命名未执行: 缺少 agent session（info: ${info.sessionId}）`);
 			return;
 		}
-		const result = renameDshSessionOnUse({ sessionTitleAvailable: true }, dshSession, titles, info);
+		const result = renameDshSessionOnUse({ sessionTitleAvailable: true }, dshSession, titles, info, summary);
 		if (result.ok) console.log(`[serenity-hooks] dsh 会话已重命名: ${String(dshSession.id ?? "?")} → ${result.title}`);
 		else console.warn(`[serenity-hooks] dsh 会话重命名未执行: ${result.reason}`);
 	} catch (err) {
@@ -3199,7 +3388,7 @@ function getHookDevelopGuide(hasSessionTool) {
 function createSessionTool(ctx) {
 	return defineTool({
 		name: "session",
-		description: "Full work-session lifecycle (AGENT_SESSIONS/, home-session convention). list/show/create/use/close/health/qa/archive/summary/hook-develop-guide. create requires --desc <desc> [--goal] or --issue <ticket> (exactly one); close requires --confirm; use activates the session for the current dsh conversation (in-memory + events restore, isolated per dsh session).",
+		description: "Full work-session lifecycle (AGENT_SESSIONS/, home-session convention). list/show/create/use/close/health/qa/archive/summary/hook-develop-guide. create requires --desc <desc> [--goal] or --issue <ticket> (exactly one) plus --summary (≤20 chars, content summary — required, except --dry-run preview and --issue sessions which are exempt); close requires --confirm; use activates the session for the current dsh conversation (in-memory + events restore, isolated per dsh session) and requires --summary (≤20 chars). The summary is appended to the dsh session title (S###-YYYY-MM-DD-<summary>); the S### id and date stay server-derived.",
 		parameters: {
 			action: {
 				type: "string",
@@ -3223,6 +3412,10 @@ function createSessionTool(ctx) {
 				type: "string",
 				description: "create one-sentence goal (optional)"
 			},
+			summary: {
+				type: "string",
+				description: "content summary ≤20 chars (REQUIRED for use and create — create exempts --dry-run preview and --issue sessions) — appended to the dsh session title as S###-YYYY-MM-DD-<summary>; the S### id and date stay server-derived; sanitized/truncated server-side"
+			},
 			confirm: {
 				type: "boolean",
 				description: "close must be true (prevents accidental close)"
@@ -3250,16 +3443,19 @@ function createSessionTool(ctx) {
 					if (!args.name) throw new Error("show requires name (S### or directory name)");
 					return showSession(root, args.name) + extHint;
 				case "create": {
+					const isDryRun = args.dryRun ?? false;
+					const isIssueSession = typeof args.issue === "string" && args.issue !== "";
+					if (!isDryRun && !isIssueSession && (!args.summary || args.summary.trim() === "")) throw new Error("create requires --summary <content summary ≤20 chars> (appended to the dsh session title; the S### id and date stay server-derived)");
 					const result = createSession({
 						root,
 						desc: args.desc,
 						issue: args.issue,
 						goal: args.goal,
-						dryRun: args.dryRun ?? false
+						dryRun: isDryRun
 					});
 					let message = result.message;
-					if (!(args.dryRun ?? false)) renameDshSessionForActive(ctx, exec, activeInfoFromCreate(result));
-					if (!(args.dryRun ?? false) && cccHooks.includes("create-transform")) try {
+					if (!isDryRun) renameDshSessionForActive(ctx, exec, activeInfoFromCreate(result), args.summary ?? args.issue);
+					if (!isDryRun && cccHooks.includes("create-transform")) try {
 						const hookResult = await runMsmAsync(root, {
 							action: "exec",
 							name: "session-tool",
@@ -3274,10 +3470,11 @@ function createSessionTool(ctx) {
 				}
 				case "use": {
 					if (!args.name) throw new Error("use requires name (S### or directory name)");
+					if (!args.summary || args.summary.trim() === "") throw new Error("use requires --summary <content summary ≤20 chars> (appended to the dsh session title as S###-YYYY-MM-DD-<summary>; id and date stay server-derived)");
 					const scope = agentScope$2(exec);
 					const active = useSession(root, args.name, scope);
 					const info = getActiveSessionInfo(scope);
-					if (info) renameDshSessionForActive(ctx, exec, info);
+					if (info) renameDshSessionForActive(ctx, exec, info, args.summary);
 					return active;
 				}
 				case "close":
@@ -3677,6 +3874,32 @@ function resolveSessionMdPath(root, scope, session) {
 const pendingRebuilds = /* @__PURE__ */ new Map();
 /** 陈旧队列存活时长（毫秒）：超过则丢弃（turn 异常结束/agent 崩溃时防残留误清空） */
 const PENDING_TTL_MS = 6e5;
+let diagState = {
+	lastTs: "",
+	lastSessionId: "",
+	lastEvent: "",
+	queueCount: 0,
+	rebuiltCount: 0,
+	droppedCount: 0,
+	failedCount: 0
+};
+function writeRebuildDiag(root, entry) {
+	try {
+		const dir = join(root, "AGENT_SESSIONS");
+		mkdirSync(dir, { recursive: true });
+		const file = join(dir, ".rebuild-diag.json");
+		const s = diagState;
+		if (entry.event === "queued") s.queueCount += 1;
+		if (entry.event === "rebuilt") s.rebuiltCount += 1;
+		if (entry.event === "ttl-dropped") s.droppedCount += 1;
+		if (entry.event === "failed") s.failedCount += 1;
+		s.lastTs = (/* @__PURE__ */ new Date()).toISOString();
+		s.lastSessionId = entry.sessionId;
+		s.lastEvent = entry.event;
+		s.detail = entry.detail;
+		writeFileSync(file, JSON.stringify(s, null, 2) + "\n", "utf-8");
+	} catch {}
+}
 /**
 * 排队一次重建（v1.22.4 定稿语义第一步）：
 * ① 门控校验（rebuild.enabled + 会话定位）
@@ -3686,16 +3909,22 @@ const PENDING_TTL_MS = 6e5;
 */
 async function queueRebuild(ctx, opts) {
 	if (!readSimpleSettings().rebuildEnabled) throw new Error("session_rebuild is disabled (rebuild.enabled=false — enable it in the dsh settings panel)");
-	const { root, note, dshSessionId } = opts;
+	const { root, note, summary, dshSessionId } = opts;
 	const session = ctx.sessions?.get?.(dshSessionId);
 	if (!session) throw new Error(`Unable to locate dsh session ${dshSessionId} (session may be closed)`);
 	const mdPath = resolveSessionMdPath(root, dshSessionId, session);
-	if (!mdPath) throw new Error("Unable to determine the active SESSION.md — no session context found in this conversation. Run \"session use <S###>\" first to activate the trajectory to resume, then retry session_rebuild.");
+	if (!mdPath) throw new Error("Unable to determine the active SESSION.md — no session context found in this conversation. Run \"session use <S###> --summary <内容概括 ≤20 字>\" first to activate the trajectory to resume, then retry session_rebuild.");
 	const anchor = buildRebuildAnchor(root, getActiveSessionInfo(dshSessionId)?.sessionId ?? sessionNameFromMdPath(mdPath), mdPath);
 	pendingRebuilds.set(dshSessionId, {
 		anchor,
+		summary,
+		mdPath,
 		queuedAt: Date.now()
 	});
+	writeRebuildDiag(root, {
+		sessionId: dshSessionId,
+		event: "queued"
+	});
 	return {
 		queued: true,
 		anchor,
@@ -3756,6 +3985,33 @@ function performRebuild(session, pending, meter) {
 	return true;
 }
 /**
+* 重建后重命名 dsh 会话标题（需求② S142 用户拍板：rebuild 后标题带新阶段概括）。
+* 标题 = S###-YYYY-MM-DD-<summary>——S### 与日期从持久轨迹目录名派生（不信任 LLM），
+* 概括来自 queueRebuild 的 summary 参数（服务端清洗截断）。
+* 失败仅 warn 不阻断重建主流程（标题美观非关键路径）。
+*/
+function renameAfterRebuild(ctx, agent, pending) {
+	try {
+		const mdPath = pending.mdPath;
+		const dirName = basename(dirname(mdPath));
+		const idMatch = dirName.match(/--S(\d{3,})--/);
+		const title = namingTitleFor({
+			sessionId: idMatch ? `S${idMatch[1]}` : dirName.replace(/^\d{4}-\d{2}-\d{2}--/, ""),
+			dirName,
+			mdPath
+		}, pending.summary);
+		const titles = ctx.get?.("sessionTitle");
+		if (!titles || typeof titles.rename !== "function") {
+			console.warn("[serenity-hooks] rebuild 后重命名跳过: sessionTitle 服务不可用");
+			return;
+		}
+		titles.rename(agent.session, title);
+		console.log(`[serenity-hooks] rebuild 后会话重命名: ${agent.id} → ${title}`);
+	} catch (error) {
+		console.warn(`[serenity-hooks] rebuild 后重命名失败（不阻断）: ${String(error?.message ?? error)}`);
+	}
+}
+/**
 * 注册 turn-stopping 钩子（index.ts apply 调用）：
 * agent 每轮 turn 结束前（serial）检查 pending 队列——有该会话的重建请求 → 执行清空
 * 并 **steer 自动继续**（v1.22.5：next-step 非空 → turn 不 break → 模型自动读取
@@ -3771,6 +4027,11 @@ function registerRebuildTurnHook(ctx) {
 		if (pending === void 0) return;
 		if (Date.now() - pending.queuedAt > PENDING_TTL_MS) {
 			pendingRebuilds.delete(id);
+			writeRebuildDiag(resolveSerenityRootFor(agent), {
+				sessionId: id,
+				event: "ttl-dropped",
+				detail: `queuedAt=${new Date(pending.queuedAt).toISOString()} older than ${PENDING_TTL_MS / 6e4}min TTL — turn did not end in time`
+			});
 			return;
 		}
 		pendingRebuilds.delete(id);
@@ -3778,6 +4039,7 @@ function registerRebuildTurnHook(ctx) {
 			const tokenMeter = ctx.get?.("tokenMeter");
 			const meter = tokenMeter && typeof tokenMeter.estimateMessage === "function" ? { estimateMessage: (m) => tokenMeter.estimateMessage(m) } : void 0;
 			if (performRebuild(agent.session, pending, meter)) {
+				renameAfterRebuild(ctx, agent, pending);
 				agent.steer(createUserMessage({
 					content: [{
 						type: "text",
@@ -3785,13 +4047,31 @@ function registerRebuildTurnHook(ctx) {
 					}],
 					source: PLUGIN_SOURCE$4
 				}));
+				writeRebuildDiag(resolveSerenityRootFor(agent), {
+					sessionId: id,
+					event: "rebuilt"
+				});
 				console.log(`[serenity-hooks] session_rebuild executed with auto-continue (turn ${payload.turn ?? "?"} ended): ${id}`);
-			}
+			} else writeRebuildDiag(resolveSerenityRootFor(agent), {
+				sessionId: id,
+				event: "empty-surface"
+			});
 		} catch (error) {
-			console.warn(`[serenity-hooks] session_rebuild failed: ${String(error?.message ?? error)}`);
+			const msg = String(error?.message ?? error);
+			writeRebuildDiag(resolveSerenityRootFor(agent), {
+				sessionId: id,
+				event: "failed",
+				detail: msg
+			});
+			console.warn(`[serenity-hooks] session_rebuild failed: ${msg}`);
 		}
 	});
 }
+/** 从 agent 会话 cwd 解析 CCC 根（诊断落盘用）；无则回退进程 cwd */
+function resolveSerenityRootFor(agent) {
+	const cwd = agent.session?.header?.cwd;
+	return findSerenityRoot(cwd ?? process.cwd()) ?? process.cwd();
+}
 //#endregion
 //#region src/tools/rebuild.ts
 /**
@@ -3826,10 +4106,16 @@ function createRebuildTool(ctx) {
 	return defineTool({
 		name: "session_rebuild",
 		description: "Trajectory-tracker overflow rebuild (Ship of Theseus): this session is the rebuildable carrier of a trajectory — the current conversation is discarded and rebuilt in place at the end of this turn with the anchor \"continue the work of {SESSION name}\" (first-anchor protocol body included), then auto-continues. SESSION.md (the trajectory's persistent body) stays in place; identity continues from it. Use when you receive a [TRAJECTORY] reminder (context above threshold), at a natural pause point. After triggering, resume from SESSION.md when this turn ends.",
-		parameters: { note: {
-			type: "string",
-			description: "Optional: one-sentence rebuild background note (for the rebuilt self)"
-		} },
+		parameters: {
+			note: {
+				type: "string",
+				description: "Optional: one-sentence rebuild background note (for the rebuilt self)"
+			},
+			summary: {
+				type: "string",
+				description: "REQUIRED: content summary ≤20 chars of the next work phase — the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after the rebuild (the rebuilt phase gets a fresh summary); sanitized/truncated server-side"
+			}
+		},
 		output: {
 			schema: { type: "json" },
 			render: (args, value) => renderText$3(value)
@@ -3839,9 +4125,11 @@ function createRebuildTool(ctx) {
 			if (!root) throw new Error("No CCC found: no .serenity file from agent cwd");
 			const dshSessionId = agentSessionId(exec);
 			if (!dshSessionId) throw new Error("Unable to determine the current dsh session id");
+			if (!args.summary || args.summary.trim() === "") throw new Error("session_rebuild requires --summary <content summary ≤20 chars> (the dsh session title is renamed after rebuild to S###-YYYY-MM-DD-<summary>)");
 			const result = await queueRebuild(ctx, {
 				root,
 				note: args.note,
+				summary: args.summary,
 				agentCwd: agentCwd$4(exec),
 				dshSessionId
 			});
@@ -4823,12 +5111,13 @@ function reminderText(code, score) {
 *
 * escalated=true（v1.23.3）：连续多轮超阈值仍未 rebuild → 升级强制语气
 * （STOP and rebuild now，持续注入直到调用 session_rebuild）。
+*
+* 需求①（S142 用户拍板）：百分比比例 → K 数值——tokensK = 实际占用（千 token），
+* thresholdK = 配置阈值（千 token）；文案 `Context usage at NNNK (threshold NNNK)`。
 */
-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.`;
+function rebuildReminderText(tokensK, thresholdK, escalated = false) {
+	if (escalated) return `[TRAJECTORY-ESCALATED] Context usage at ${Math.round(tokensK)}K (threshold ${Math.round(thresholdK)}K) — you have been reminded repeatedly and have NOT called session_rebuild. This is now mandatory: STOP at the current task step, preserve valuable cognition into the CCC skills (or write a new-skill proposal into SESSION.md), then call the session_rebuild tool immediately, passing --summary "<content summary ≤20 chars>" (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild). The conversation will be cleared and rebuilt in place; SESSION.md is the persistent trajectory and stays in place — identity continues from it. Do not continue working without rebuilding; this reminder persists until you call session_rebuild.`;
+	return `[TRAJECTORY] Context usage at ${Math.round(tokensK)}K (threshold ${Math.round(thresholdK)}K). This session is the rebuildable carrier of the trajectory: SESSION.md is the persistent body, this conversation is only a temporary work copy. Before rebuilding: if this conversation produced valuable cognition, revise the relevant existing skill of this CCC (structure it with eap); if a new skill is warranted, write a short proposal into SESSION.md for the user to review — do not create it yourself. ACT NOW: at the next natural pause (end of the current task step), call the session_rebuild tool — passing --summary "<content summary ≤20 chars>" describing the next work phase (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild) — to clear and rebuild this conversation: the current copy is discarded, identity continues from SESSION.md. If you are in the middle of an unbreakable step, continue it, then rebuild at its end. Do not ignore this; rebuild is the expected action, not an option.`;
 }
 /** 读取会话 contextPressure 投影（sessionProjections 可选服务；未装配返回 null） */
 function readContextPressure(ctx, session) {
@@ -4889,17 +5178,17 @@ function registerKeeper(ctx, opts = {}) {
 			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) {
+				if (pressure && pressure.projectedTokens > 0) {
+					const tokensK = pressure.projectedTokens / 1e3;
+					const thresholdK = readSimpleSettings().rebuildThresholdK;
+					if (pressure.projectedTokens >= thresholdK * 1e3) {
 						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)
+							text: rebuildReminderText(tokensK, thresholdK, escalated)
 						});
 						rebuildReminderStates.set(key, st);
 					}
@@ -5080,10 +5369,6 @@ function defaultAdvancedSettings() {
 			allowWorkspaceCreate: true,
 			totpEnabled: false
 		},
-		rebuild: {
-			enabled: true,
-			thresholdRatio: .9
-		},
 		persona: {
 			mode: "",
 			overrideText: ""
@@ -5139,7 +5424,6 @@ function mergeWithDefaults(raw) {
 	if (raw === null || typeof raw !== "object") return def;
 	const o = raw;
 	const gateway = o.gateway ?? {};
-	const rebuild = o.rebuild ?? {};
 	const persona = o.persona ?? {};
 	const publicAsk = o.publicAsk ?? {};
 	return {
@@ -5153,10 +5437,6 @@ function mergeWithDefaults(raw) {
 			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
-		},
 		persona: {
 			mode: typeof persona.mode === "string" ? persona.mode : def.persona.mode,
 			overrideText: typeof persona.overrideText === "string" ? persona.overrideText : def.persona.overrideText
@@ -5182,7 +5462,6 @@ function writeAdvancedSettings(settings) {
 function updateAdvancedSettings(patch) {
 	const current = readAdvancedSettings();
 	const gw = patch.gateway;
-	const rb = patch.rebuild;
 	const ps = patch.persona;
 	const next = {
 		gateway: gw !== void 0 ? {
@@ -5195,10 +5474,6 @@ function updateAdvancedSettings(patch) {
 			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,
 		persona: ps !== void 0 ? {
 			mode: typeof ps.mode === "string" ? ps.mode : current.persona.mode,
 			overrideText: typeof ps.overrideText === "string" ? ps.overrideText : current.persona.overrideText
@@ -5323,7 +5598,6 @@ function toWire(settings) {
 			allowWorkspaceCreate: settings.gateway.allowWorkspaceCreate,
 			totpEnabled: settings.gateway.totpEnabled
 		},
-		rebuild: settings.rebuild,
 		persona: settings.persona,
 		publicAsk: { allowed: [...settings.publicAsk.allowed] }
 	};
@@ -5376,12 +5650,6 @@ function applyWirePatch(wire) {
 		}
 		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.persona !== void 0) {
 		const psPatch = { ...current.persona };
 		if (typeof wire.persona.mode === "string") psPatch.mode = wire.persona.mode;
@@ -5417,8 +5685,8 @@ 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) {
+/** 1) 身份块：ACC 身份 + CCC 名 + 平台工具说明（需求③ S142：工具清单移出为独立 toolsBlock 放装配末尾——身份先行、工具参考殿后） */
+function identityBlock(root) {
 	const cccName = basename(root);
 	return [
 		"",
@@ -5428,26 +5696,53 @@ function accBlock(root) {
 		"",
 		"You are running inside a Concrete Cognitive Container (CCC) —",
 		"the runtime instance of an Abstract Cognitive Container (ACC).",
+		"The ACC (this plugin) is a cognitive container harness: it provides",
+		"deterministic tools, mechanical constraints, and session continuity.",
+		"The complete built-in tool list is at the end of this prompt under the",
+		"\"Serenity Tools\" heading — read it before using any ACC tool.",
+		"",
+		"  ℹ️ 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 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");
+}
+/**
+* 工具清单块（需求③ S142 用户拍板：工具列表移装配末尾 + MSM 调用示例）：
+* 原 accBlock 内嵌 13 行工具清单 → 独立成块放装配末尾（SKILL 后、Session 前）。
+* 身份先行（认知轨迹开头不被 13 行清单干扰）、工具参考殿后（需要时再看）。
+* 附带 MSM 调用示例（用户拍板：顶层提示词加调用方式说明，避免偶发调用错误——
+* 模型对 acc_msm 参数面/协议 flag 理解不稳）。
+*/
+function toolsBlock() {
+	return [
+		"",
+		"=== Serenity Tools ===",
 		"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)",
+		"  session   — session lifecycle (list/show/create/use/close/health/qa/archive/summary/hook-develop-guide)",
+		"  acc_kit   — ACC utility kit (health: CCC three principles + MSM registry integrity report / time: now / wait: wait N seconds)",
 		"  cc_git    — git operations (status/commit/push/log)",
-		"  acc_msm   — MSM framework (list/exec/register/deregister/check/guide)",
+		"  acc_msm   — MSM framework (list/exec/register/deregister/check/guide/catalog/ccc-config)",
 		"  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",
+		"  handyman  — delegate a do-everything worker agent (CCC-whitelisted model) to run synchronously in rounds until done; 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)",
+		"  skiff_admin — Skiff (F4, experimental): CCC cognitive-subset roles — guide (definition tutorial) / validate (config check) / apply (validate + confirm live) / list (role summary)",
+		"  autopilot-trajectory — Autopilot Trajectory one-stop management (all/init/random/diag/doc/check/status/guide)",
 		"",
-		"  ℹ️ 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",
+		"First-time in a CCC? Run acc_msm catalog — ACC usage directory (capability areas + where each guide lives).",
 		"",
-		"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.",
+		"MSM call protocol (registered CCC MSMs, deterministic Mech & Semi-Mech):",
+		"  1. Discover:       acc_msm list                    — list all registered MSMs",
+		"  2. Inspect usage:  acc_msm exec <name> --schema 1  — print one MSM's usage/flags (protocol flag, no execution)",
+		"  3. Execute:        acc_msm exec <name> <args...>   — run the MSM with business args (first arg may be --list/--schema/--format=json)",
+		"  Register new MSMs with acc_msm register; deregister with acc_msm deregister (registry is ACC-managed — never edit mech-registry.json directly).",
 		""
 	].join("\n");
 }
@@ -5766,8 +6061,11 @@ function sessionBlock(root, scope = DEFAULT_SESSION_SCOPE) {
 /**
 * 完整系统提示词注入文本（v1.19.8 结构精简，S142 重建视角 R↓）：
 * 身份（ACC）→ 世界模型（Metaphor）→ 信念/边界（Principles）→ 时间约束（CCE）
-* → 质量（EAP）→ 状态（SafeMode/Localstore）→ CCC 上下文（SKILL）→ 会话（Session）。
-* 认知展开顺序：我是谁 → 我所在的世界 → 为什么 → 如何一致 → 产物标准 → 当前状态 → 上下文。
+* → 质量（EAP）→ 状态（SafeMode/Localstore）→ CCC 上下文（SKILL）→ 工具参考（Tools）→ 会话（Session）。
+* 认知展开顺序：我是谁 → 我所在的世界 → 为什么 → 如何一致 → 产物标准 → 当前状态 → 上下文 → 工具参考 → 会话。
+*
+* 需求③（S142 用户拍板）：工具清单从 accBlock 移出为独立 toolsBlock，
+* 放 SKILL 后 Session 前（工具参考殿后，身份先行不被 13 行清单干扰）。
 *
 * v1.23.1 persona（彩蛋）：persona.mode 配置 → EAP 块替换为 Persona 块（输出约束），
 * Principles 剥离 MSM 原则段（指令遵循约束）——用户文本承接两处风格；本体论/关系段/
@@ -5777,7 +6075,7 @@ function serenitySystemPrompt(root, scope = DEFAULT_SESSION_SCOPE) {
 	const persona = readPersonaSettings();
 	const personaOn = persona.mode !== "" && persona.overrideText.trim() !== "";
 	const parts = [
-		accBlock(root),
+		identityBlock(root),
 		metaphorBlock(),
 		principlesBlock(root, personaOn),
 		cceBlock(),
@@ -5787,6 +6085,7 @@ function serenitySystemPrompt(root, scope = DEFAULT_SESSION_SCOPE) {
 	if (state) parts.push(state);
 	const skill = entrySkillSectionText(root);
 	if (skill) parts.push(skill);
+	parts.push(toolsBlock());
 	const session = sessionBlock(root, scope);
 	if (session) parts.push(session);
 	return parts.join("\n\n");
@@ -6369,7 +6668,7 @@ function registerStatusApi(ctx, opts = {}) {
 					workspace: url.searchParams.get("workspace") ?? void 0
 				});
 				const root = findSerenityRoot(workspace) ?? "";
-				const { discoverCccs } = await import("./skiff-debug-BRlc17GU.js").then((n) => n.i);
+				const { discoverCccs } = await import("./skiff-debug-DIf_Uenr.js").then((n) => n.i);
 				sendJson$1(res, 200, { cccs: await discoverCccs(ctx, root) });
 			} catch (err) {
 				sendJson$1(res, 400, { error: err.message ?? String(err) });
@@ -6399,7 +6698,7 @@ function registerStatusApi(ctx, opts = {}) {
 					return;
 				}
 				const settings = readAdvancedSettings();
-				const { readSimpleSettings } = await import("./settings-section-PzeHStWP.js").then((n) => n.r);
+				const { readSimpleSettings } = await import("./settings-section-DnX9TJxt.js").then((n) => n.r);
 				const simple = readSimpleSettings();
 				const allowed = settings.publicAsk.allowed;
 				const port = simple.acpHttpPort ?? 3100;
@@ -6495,11 +6794,11 @@ function registerStatusApi(ctx, opts = {}) {
 						sendJson$1(res, 400, { error: chk.error });
 						return;
 					}
-					const { readWeixinSettings } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+					const { readWeixinSettings } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 					const { weixinBridgeStatus } = await Promise.resolve().then(() => weixin_bridge_exports);
 					const settings = readWeixinSettings(chk.root);
 					const bridge = weixinBridgeStatus().find((b) => b.ccc === chk.root);
-					const { readWeixinCredential } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+					const { readWeixinCredential } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 					const accounts = (settings.accounts ?? []).map((a) => ({
 						accountId: a.accountId,
 						name: a.name ?? void 0,
@@ -6531,7 +6830,7 @@ function registerStatusApi(ctx, opts = {}) {
 					const { fetchQRCode } = await import("./weixin-api-OUCuw0Ws.js").then((n) => n.l);
 					const { randomUUID } = await import("node:crypto");
 					for (const [key, v] of weixinLogins) if (Date.now() - v.startedAt > WEIXIN_LOGIN_TTL_MS) weixinLogins.delete(key);
-					const { readWeixinSettings } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+					const { readWeixinSettings } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 					const qr = await fetchQRCode({ botType: readWeixinSettings(root).botType ?? void 0 });
 					const loginKey = randomUUID();
 					weixinLogins.set(loginKey, {
@@ -6552,7 +6851,7 @@ function registerStatusApi(ctx, opts = {}) {
 						sendJson$1(res, 400, { error: "missing accountId" });
 						return;
 					}
-					const { removeWeixinAccount } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+					const { removeWeixinAccount } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 					const { syncCccBridge } = await Promise.resolve().then(() => weixin_bridge_exports);
 					removeWeixinAccount(root, body.accountId);
 					syncCccBridge(ctx, root);
@@ -6565,8 +6864,8 @@ function registerStatusApi(ctx, opts = {}) {
 						sendJson$1(res, 400, { error: "invalid routes (expected [{user, role}, ...])" });
 						return;
 					}
-					const { saveWeixinRoutes } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
-					const { readSkiffRoles } = await import("./skiff-role-Dw7UKCUm.js").then((n) => n.c);
+					const { saveWeixinRoutes } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
+					const { readSkiffRoles } = await import("./skiff-role-BTdBHyOQ.js").then((n) => n.c);
 					const roles = readSkiffRoles(root);
 					for (const r of routes) if (!roles.has(r.role)) {
 						sendJson$1(res, 400, { error: `unknown role: ${r.role} (not in ${root} skiff.roles)` });
@@ -6578,7 +6877,7 @@ function registerStatusApi(ctx, opts = {}) {
 				}
 				if (body.action === "set-enabled") {
 					const enabled = body.enabled === true;
-					const { readWeixinSettings, setWeixinEnabled } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+					const { readWeixinSettings, setWeixinEnabled } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 					const { syncCccBridge } = await Promise.resolve().then(() => weixin_bridge_exports);
 					const settings = readWeixinSettings(root);
 					if (enabled && (settings.accounts ?? []).length === 0) {
@@ -6625,7 +6924,7 @@ function registerStatusApi(ctx, opts = {}) {
 					return;
 				}
 				const { pollQRStatus } = await import("./weixin-api-OUCuw0Ws.js").then((n) => n.l);
-				const { readWeixinSettings } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+				const { readWeixinSettings } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 				const settings = readWeixinSettings(login.root);
 				const status = await pollQRStatus({
 					baseUrl: void 0,
@@ -6640,7 +6939,7 @@ function registerStatusApi(ctx, opts = {}) {
 							});
 							return;
 						}
-						const { upsertWeixinAccount, writeWeixinCredential, nextWeixinAccountId } = await import("./weixin-route-BUJLsCGS.js").then((n) => n.u);
+						const { upsertWeixinAccount, writeWeixinCredential, nextWeixinAccountId } = await import("./weixin-route-DFkRf9ou.js").then((n) => n.u);
 						const { syncCccBridge } = await Promise.resolve().then(() => weixin_bridge_exports);
 						const accountId = nextWeixinAccountId(settings);
 						upsertWeixinAccount(login.root, {
@@ -9060,7 +9359,7 @@ const Config = z.object({
 	gateway: z.object({ enabled: z.boolean().default(false) }),
 	rebuild: z.object({
 		enabled: z.boolean().default(true),
-		thresholdRatio: z.number().min(.01).max(1).default(.9)
+		thresholdK: z.number().min(50).max(4e3).default(400)
 	}),
 	skiff: z.object({
 		enabled: z.boolean().default(false),