@shgroup/dsh-serenity-hooks 1.48.1 → 1.49.0

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.48.1",
+  "version": "1.49.0",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：给 DSH 装一个「AI 工作区」——11 个工具（container_fs/container_trajectory/dashboard/container_git/msm/praxis/handyman/localstore/container_admin/im-bridge/acc-diag；后两个按配置条件出现）+ 机械约束（安全模式/工作区围墙/密钥守卫）+ 轨迹日志与原地重建 + 网页登录入口/微信桥/子角色/对外问答页/trajectory 唤醒注册表。适配 DSH 0.1.5-rc.2（deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/client.js

@@ -4741,7 +4741,7 @@ Instruction-following style:
 							})
 						]
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					control !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "ss-rowControl",
 						children: control
 					}),
@@ -4804,7 +4804,6 @@ Instruction-following style:
 				set("acpHttpPort", Math.min(65535, Math.max(1024, Math.round(v))));
 			};
 			const gatewayOn = value?.gatewayEnabled ?? false;
-			const rebuildOn = value?.rebuildEnabled ?? true;
 			const thresholdK = value?.rebuildThresholdK ?? 400;
 			const skiffOn = value?.skiffEnabled ?? false;
 			const skiffPort = value?.skiffDebugPort ?? 3099;
@@ -4862,19 +4861,15 @@ Instruction-following style:
 							open: openRebuild,
 							onToggle: setOpenRebuild,
 							expandHint: "配置",
-							control: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Toggle, {
-								checked: rebuildOn,
-								onChange: (on) => toggle("rebuildEnabled", on)
-							}),
 							detail: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "ss-detailStack",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 									className: "ss-detailIntro",
-									children: "上下文超限自动重建（container_trajectory rebuild，v1.33 起 logbook 并入 trajectory）：\n· 机制：agent 上下文占用达到阈值时，由 LLM 主动调用重建\n· 语义：完全丢弃当前 dsh 会话 + 自动新建 + 注入「继续原 SESSION 的工作」\n· 效果：SESSION.md 原位不动，认知轨迹延续，上下文归零\n· 关闭后：上下文超限时不再提示，可能导致会话卡顿或丢失"
+									children: "上下文超限自动重建（container_trajectory rebuild，v1.33 起 logbook 并入 trajectory）：\n· 机制：agent 上下文占用达到阈值时，由 LLM 主动调用重建\n· 语义：完全丢弃当前 dsh 会话 + 自动新建 + 注入「继续原 SESSION 的工作」\n· 效果：SESSION.md 原位不动，认知轨迹延续，上下文归零\n· 无总开关（v1.49.0 砍掉）：长期验证下它已能很好地代替上下文压缩；\n  要调敏感度就改下面的阈值"
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RowCard, {
 									title: "重建阈值",
 									desc: "上下文占用达到该 K 数值时提示（单位 K token，默认 400）",
-									help: "重建触发阈值（需求①：K 数值，默认 400K，范围 50~4000K）：\n· 含义：上下文 projected tokens 达到 thresholdK × 1000 时触发提醒\n· 纯绝对数值（不再依赖窗口比例）\n· 迁移：旧版 0~1 比例（settings.yaml rebuildThreshold）已废弃被忽略\n· 调低更早触发 / 调高更晚触发；仅「超限重建」开启时有意义",
+									help: "重建触发阈值（需求①：K 数值，默认 400K，范围 50~4000K）：\n· 含义：上下文 projected tokens 达到 thresholdK × 1000 时触发提醒\n· 纯绝对数值（不再依赖窗口比例）\n· 迁移：旧版 0~1 比例（settings.yaml rebuildThreshold）已废弃被忽略\n· 调低更早触发 / 调高更晚触发（v1.49.0 起无总开关，它恒生效）",
 									control: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 										className: "ss-portInput",
 										type: "number",
@@ -4882,7 +4877,6 @@ Instruction-following style:
 										max: 4e3,
 										step: 50,
 										value: thresholdK,
-										disabled: !rebuildOn,
 										title: "重建阈值（K token，默认 400）",
 										onChange: (e) => setThreshold(Number(e.target.value))
 									})

package/lib/git-ops.d.ts

@@ -2,13 +2,23 @@
  * git-ops.ts — container_git 纯操作层（cc_git → container_git，v1.30；零 DSH 依赖）
  *
  * 行为对齐 osp（opencode-serenity-plugin/src/git/cc-git-tool.ts）——osp 是 ACC 工具 spec：
- *   - status：JSON {clean, files:[{status,file}], summary}
- *   - commit：git add -A + commit -m；clean 返回 '(nothing to commit — working tree clean)'
- *   - push：无 remote 报错；非快进 → [REJECTED] + 操作建议（绝不自动 force）
+ *   - status：JSON {clean, files:[{status,file}], summary, ahead, behind}
+ *   - commit：默认「只提交指定 paths」；未给 paths ⇒ 整仓 add -A（并在回执里显式告知）
+ *   - commit：**默认随后 push**（`noPush` 可关）；push 结果如实附在回执里
+ *   - push：成功判据 = **`git push --porcelain` 的 stdout 里读到 ref 行**（绝不采信"stderr 为空"）
  *   - pull：git fetch + merge --ff-only；up-to-date / [REJECTED] 建议
  *   - log：--oneline [-n <count>]
  *   - diff：git diff [--cached] [<ref>] [-- <path>]
  * 保留 dsp 增强：localstore git 合规联动（S134：deny 且 .gitignore 未覆盖 → status 提示 / commit 拒绝）。
+ *
+ * 🔴 2026-09-26 修（tiangong-serenity 报障）：**push 曾把"超时被杀"报成成功**。
+ *   机制（**实测**，非推断）：`spawnSync` 超时**不设 `err.killed`**（实测 `code=ETIMEDOUT` /
+ *   `signal=SIGTERM` / `status=null` / `stderr` 长度 0），而 `execFileSync` **成功时丢弃 stderr**；
+ *   于是"超时被杀"与"真成功"都交出 `{stdout:'', stderr:''}` —— 旧判据 `if (!stderr) → 成功`
+ *   把两者判成同一件事，回显 `Pushed to origin/<branch>` 而远程 ref 从未变。
+ *   ⇒ 本版三处硬修：① `git()` 交出**结构化结果**（ok/timedOut/status），守卫一律看它，不再看
+ *   "stderr 是否为空"；② push 的成功判据改为**可核验事实**（`--porcelain` 的 ref 行）；
+ *   ③ 超时/未确认一律**不报成功**，并给出 `git ls-remote` 核验指令。
  */
 import type { JsonValue } from './json.js';
 type GitAction = 'status' | 'commit' | 'push' | 'log' | 'pull' | 'diff';
@@ -16,6 +26,10 @@ export declare const GIT_ACTIONS: readonly GitAction[];
 interface GitArgs {
     action: GitAction;
     message?: string;
+    /** commit：只提交这些路径（不传 ⇒ 整仓 `add -A`） */
+    paths?: string[];
+    /** commit：只提交到本地、不随后推送（默认提交后自动推送） */
+    noPush?: boolean;
     /** log 条数（对齐 osp 参数 n，默认 10，max 100） */
     count?: number;
     /** diff: 显示暂存区变更（--cached） */

package/lib/index.d.ts

@@ -121,10 +121,8 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
         enabled: z<boolean, boolean, "defined">;
     }>>, "plain">;
     rebuild: z<Schemastery.ObjectS<NoInfer<{
-        enabled: z<boolean, boolean, "defined">;
         thresholdK: z<number, number, "defined">;
     }>>, Schemastery.ObjectT<NoInfer<{
-        enabled: z<boolean, boolean, "defined">;
         thresholdK: z<number, number, "defined">;
     }>>, "plain">;
     skiff: z<Schemastery.ObjectS<NoInfer<{
@@ -157,7 +155,6 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
         enabled: z<boolean, boolean, "defined">;
     }>>, "plain">;
     gatewayEnabled: z<boolean, boolean, "volatile">;
-    rebuildEnabled: z<boolean, boolean, "volatile">;
     rebuildThresholdK: z<number, number, "volatile">;
     skiffEnabled: z<boolean, boolean, "volatile">;
     skiffDebugPort: z<number, number, "volatile">;
@@ -184,10 +181,8 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
         enabled: z<boolean, boolean, "defined">;
     }>>, "plain">;
     rebuild: z<Schemastery.ObjectS<NoInfer<{
-        enabled: z<boolean, boolean, "defined">;
         thresholdK: z<number, number, "defined">;
     }>>, Schemastery.ObjectT<NoInfer<{
-        enabled: z<boolean, boolean, "defined">;
         thresholdK: z<number, number, "defined">;
     }>>, "plain">;
     skiff: z<Schemastery.ObjectS<NoInfer<{
@@ -220,7 +215,6 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
         enabled: z<boolean, boolean, "defined">;
     }>>, "plain">;
     gatewayEnabled: z<boolean, boolean, "volatile">;
-    rebuildEnabled: z<boolean, boolean, "volatile">;
     rebuildThresholdK: z<number, number, "volatile">;
     skiffEnabled: z<boolean, boolean, "volatile">;
     skiffDebugPort: z<number, number, "volatile">;

package/lib/index.js

@@ -6,7 +6,7 @@ import { A as localIdStamp, C as setActiveSessionInfo, D as isoLocal, E as useSe
 import { a as readWeixinCredential, c as weixinInboundDir, d as LOCALSTORE_SCOPES, f as checkLocalstoreGitCompliance, g as runLocalStore, h as readStore, 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-CWMRa36W.js";
 import { a as unregisterSkiffSession$1, i as skiffSessionSnapshot$1, n as skiffRoleFor$1, o as ACC_VERSION, r as skiffSessionInfo$1, t as registerSkiffSession$1 } from "./skiff-registry-BjIX_KD1.js";
 import { a as readSkiffRoles, c as roleMsmWhitelist, d as systemPromptSource, f as trajectorySubset, i as isSkiffSessionId, l as roleToolWhitelist, n as buildSkiffBasePrompt, o as resolveRoleSystemPrompt, r as createRolePromptReader, s as resolveSkiffKind } from "./skiff-role-KqQA6pkr.js";
-import { a as FACE_PORTS, c as MECHANISM_PORTS, i as ACP_HTTP_PORT, l as SKIFF_DEBUG_PORT, n as registerSettingsSection, o as GATEWAY_PORT, s as MAIN_WEB_PORT, t as readSimpleSettings, u as WEIXIN_SEND_PORT } from "./settings-section-DxMwlCv9.js";
+import { a as FACE_PORTS, c as MECHANISM_PORTS, i as ACP_HTTP_PORT, l as SKIFF_DEBUG_PORT, n as registerSettingsSection, o as GATEWAY_PORT, s as MAIN_WEB_PORT, t as readSimpleSettings, u as WEIXIN_SEND_PORT } from "./settings-section-B-KOyOYn.js";
 import { a as markdownToPlainText, c as sendTyping, i as getUpdates, l as sniffImageExt, n as downloadMedia, o as sendFileMessage, r as getConfig, s as sendTextMessage, t as TypingStatus } from "./weixin-api-CtFYm53S.js";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -611,13 +611,23 @@ function createKitTool(ctx) {
 * git-ops.ts — container_git 纯操作层（cc_git → container_git，v1.30；零 DSH 依赖）
 *
 * 行为对齐 osp（opencode-serenity-plugin/src/git/cc-git-tool.ts）——osp 是 ACC 工具 spec：
-*   - status：JSON {clean, files:[{status,file}], summary}
-*   - commit：git add -A + commit -m；clean 返回 '(nothing to commit — working tree clean)'
-*   - push：无 remote 报错；非快进 → [REJECTED] + 操作建议（绝不自动 force）
+*   - status：JSON {clean, files:[{status,file}], summary, ahead, behind}
+*   - commit：默认「只提交指定 paths」；未给 paths ⇒ 整仓 add -A（并在回执里显式告知）
+*   - commit：**默认随后 push**（`noPush` 可关）；push 结果如实附在回执里
+*   - push：成功判据 = **`git push --porcelain` 的 stdout 里读到 ref 行**（绝不采信"stderr 为空"）
 *   - pull：git fetch + merge --ff-only；up-to-date / [REJECTED] 建议
 *   - log：--oneline [-n <count>]
 *   - diff：git diff [--cached] [<ref>] [-- <path>]
 * 保留 dsp 增强：localstore git 合规联动（S134：deny 且 .gitignore 未覆盖 → status 提示 / commit 拒绝）。
+*
+* 🔴 2026-09-26 修（tiangong-serenity 报障）：**push 曾把"超时被杀"报成成功**。
+*   机制（**实测**，非推断）：`spawnSync` 超时**不设 `err.killed`**（实测 `code=ETIMEDOUT` /
+*   `signal=SIGTERM` / `status=null` / `stderr` 长度 0），而 `execFileSync` **成功时丢弃 stderr**；
+*   于是"超时被杀"与"真成功"都交出 `{stdout:'', stderr:''}` —— 旧判据 `if (!stderr) → 成功`
+*   把两者判成同一件事，回显 `Pushed to origin/<branch>` 而远程 ref 从未变。
+*   ⇒ 本版三处硬修：① `git()` 交出**结构化结果**（ok/timedOut/status），守卫一律看它，不再看
+*   "stderr 是否为空"；② push 的成功判据改为**可核验事实**（`--porcelain` 的 ref 行）；
+*   ③ 超时/未确认一律**不报成功**，并给出 `git ls-remote` 核验指令。
 */
 const GIT_ACTIONS = [
 	"status",
@@ -627,48 +637,132 @@ const GIT_ACTIONS = [
 	"pull",
 	"diff"
 ];
-/** git 操作超时（ms）——网络路径（push/pull/fetch）可能挂起（GCM 弹认证框等），
-*  无 timeout 会冻结 Node 事件循环 / DSH 3080 server（Windows 审计问题 12） */
-const GIT_TIMEOUT_MS = 3e4;
-function git(root, args) {
+/** 本地动作超时（ms） */
+const DEFAULT_LOCAL_TIMEOUT_MS = 3e4;
+/** 网络动作（fetch/push/pull）超时（ms）——大体量推送可能远超 30s（tiangong 实例：>60s） */
+const DEFAULT_NET_TIMEOUT_MS = 18e4;
+/**
+* 超时可覆盖（`DSH_localTimeout()` / `DSH_netTimeout()`）。
+* 🔵 两个用途：① 慢远端／大体量推送的用户可自行放宽 ② 测试可在**不真等 180s** 的前提下
+*    驱动"超时"这条路径（本仓对它的回归测试就靠这个缝）。
+* ⚠️ **每次调用现读**（不在模块加载时固化）——否则测试改了 env 也影响不到已加载的模块。
+*/
+function timeoutMs(envName, dflt) {
+	const v = Number(process.env[envName] ?? "");
+	return Number.isFinite(v) && v > 0 ? v : dflt;
+}
+const localTimeout = () => timeoutMs("DSH_GIT_TIMEOUT_MS", DEFAULT_LOCAL_TIMEOUT_MS);
+const netTimeout = () => timeoutMs("DSH_GIT_NET_TIMEOUT_MS", DEFAULT_NET_TIMEOUT_MS);
+/**
+* 执行 git 并交出**结构化结果**。
+* 🔴 超时判据必须用 `code==='ETIMEDOUT' || signal!=null && status==null`——
+*    `spawnSync` 超时**不设 `err.killed`**（2026-09-26 实测；旧守卫 `err.killed ? … : err.stderr`
+*    因此是死代码，超时被当成"stderr 为空 = 成功"）。
+*/
+function git(root, args, timeoutMs = localTimeout()) {
 	try {
+		const stdout = execFileSync("git", args, {
+			cwd: root,
+			encoding: "utf8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
+			maxBuffer: 1048576,
+			timeout: timeoutMs
+		});
 		return {
-			stdout: execFileSync("git", args, {
-				cwd: root,
-				encoding: "utf8",
-				stdio: [
-					"ignore",
-					"pipe",
-					"pipe"
-				],
-				maxBuffer: 1048576,
-				timeout: GIT_TIMEOUT_MS
-			}).trimEnd(),
-			stderr: ""
+			ok: true,
+			stdout: String(stdout).trimEnd(),
+			stderr: "",
+			timedOut: false,
+			status: 0
 		};
 	} catch (err) {
+		const timedOut = err?.killed === true || err?.code === "ETIMEDOUT" || err?.signal != null && err?.status == null;
 		return {
-			stdout: (err.stdout?.toString() ?? "").trimEnd(),
-			stderr: err.killed ? `git operation timed out (${GIT_TIMEOUT_MS / 1e3}s)` : (err.stderr?.toString() ?? "").trimEnd()
+			ok: false,
+			stdout: (err?.stdout?.toString() ?? "").trimEnd(),
+			stderr: (err?.stderr?.toString() ?? "").trimEnd(),
+			timedOut,
+			status: typeof err?.status === "number" ? err.status : null
 		};
 	}
 }
 function getCurrentBranch(root) {
-	const { stdout } = git(root, [
+	const r = git(root, [
 		"rev-parse",
 		"--abbrev-ref",
 		"HEAD"
 	]);
-	if (!stdout) throw new Error("container_git: cannot determine current branch");
-	return stdout;
+	if (!r.ok || !r.stdout) throw new Error("container_git: cannot determine current branch");
+	return r.stdout;
 }
 function hasChanges(root) {
-	const { stdout } = git(root, ["status", "--porcelain"]);
-	return stdout.length > 0;
+	return git(root, [
+		"-c",
+		"core.quotepath=false",
+		"status",
+		"--porcelain"
+	]).stdout.length > 0;
 }
 function hasRemote(root) {
-	const { stdout } = git(root, ["remote"]);
-	return stdout.length > 0;
+	return git(root, ["remote"]).stdout.length > 0;
+}
+/** 推送成功与否的**唯一**核验指令（给使用者，也写进回执） */
+function verifyHint(branch) {
+	return `🔴 核验（唯一判据）：git ls-remote origin ${branch}，或 git fetch && git rev-parse origin/${branch} —— 与本地 HEAD 比对。**不要采信任何回执。**`;
+}
+const REJECTED_TEXT = (branch) => `[REJECTED] Push to origin/${branch} was rejected (non-fast-forward).\n\nRemote has new commits and your local branch is behind. Suggested actions:\n  1. Use bash: git fetch origin ${branch}\n  2. Inspect remote changes: git log HEAD..origin/${branch}\n  3. Merge or rebase: git merge origin/${branch} or git rebase origin/${branch}\n  4. Resolve conflicts manually if any: git add ... && git commit\n  5. Push again: container_git push`;
+/**
+* 推送并把结果**如实**翻成文本（`hard` = 作为独立动作时应抛错）。
+* 🔴 成功判据 = `--porcelain` 的 **stdout 里有 ref 行**；退出码 0 但读不到 ref 行 ⇒ **不视为成功**。
+*/
+function pushCore(root) {
+	if (!hasRemote(root)) return {
+		text: "⚠️ 未配置 remote ⇒ **未推送**（本地提交不受影响）。加 remote: git remote add origin <url>",
+		hard: true
+	};
+	const branch = getCurrentBranch(root);
+	git(root, [
+		"fetch",
+		"origin",
+		branch
+	], netTimeout());
+	const r = git(root, [
+		"push",
+		"--porcelain",
+		"origin",
+		branch
+	], netTimeout());
+	if (r.timedOut) return {
+		text: `[TIMEOUT] git push 在 ${netTimeout() / 1e3}s 内未结束 —— 🔴 **推送是否成功【未确认】**（既未成功也未失败）。\n原始输出: ${r.stdout || "(空)"}\n${r.stderr ? `stderr: ${r.stderr}\n` : ""}${verifyHint(branch)}`,
+		hard: true
+	};
+	const refLines = r.stdout.split("\n").filter((l) => /^[ =*+!-]\t/.test(l));
+	if (refLines.some((l) => l.startsWith("!"))) return {
+		text: REJECTED_TEXT(branch),
+		hard: false
+	};
+	const updated = refLines.filter((l) => /^[ *+-]/.test(l));
+	const upToDate = refLines.length > 0 && refLines.every((l) => l.startsWith("="));
+	if (updated.length > 0 && !upToDate) return {
+		text: `✅ 已推送 origin/${branch}\n${updated.join("\n")}`,
+		hard: false
+	};
+	if (upToDate) return {
+		text: `origin/${branch} 已是最新（无可推送的新提交）\n${refLines.join("\n")}`,
+		hard: false
+	};
+	if (!r.ok) return {
+		text: `[FAILED] git push 退出码 ${r.status ?? "未知"} —— **未推送**\n${r.stderr || r.stdout || "(无输出)"}\n${verifyHint(branch)}`,
+		hard: true
+	};
+	return {
+		text: `[UNVERIFIED] git push 退出码 0，但**未从 --porcelain 读到 ref 行** ⇒ 🔴 **不视为成功**。\n原始输出: ${r.stdout || "(空)"}\n${verifyHint(branch)}`,
+		hard: true
+	};
 }
 function runGit(root, args) {
 	switch (args.action) {
@@ -679,7 +773,8 @@ function runGit(root, args) {
 				"status",
 				"--porcelain"
 			]);
-			if (r.stderr) throw new Error(`status failed: ${r.stderr.trim()}`);
+			if (r.timedOut) throw new Error(`status timed out (${localTimeout() / 1e3}s)`);
+			if (!r.ok) throw new Error(`status failed: ${r.stderr || r.stdout || "(no output)"}`);
 			const files = (r.stdout ? r.stdout.split("\n") : []).map((line) => {
 				return {
 					status: line.slice(0, 2).trim() || "??",
@@ -691,6 +786,21 @@ function runGit(root, args) {
 				files,
 				summary: files.length === 0 ? "(clean)" : `${files.length} file(s) with changes`
 			};
+			if (hasRemote(root)) try {
+				const branch = getCurrentBranch(root);
+				const rr = git(root, [
+					"rev-list",
+					"--left-right",
+					"--count",
+					`origin/${branch}...HEAD`
+				]);
+				if (rr.ok && /^\d+\s+\d+$/.test(rr.stdout)) {
+					const [behind, ahead] = rr.stdout.split(/\s+/).map(Number);
+					out.ahead = ahead;
+					out.behind = behind;
+					if (ahead > 0) out.summary = `${out.summary} ｜ 🔴 本地领先 origin/${branch} **${ahead} 笔未推送**`;
+				}
+			} catch {}
 			const ls = checkLocalstoreGitCompliance(root);
 			if (!ls.ok) out.warning = ls.reason;
 			return out;
@@ -699,36 +809,44 @@ function runGit(root, args) {
 			const ls = checkLocalstoreGitCompliance(root);
 			if (!ls.ok) throw new Error(ls.reason);
 			if (!args.message || args.message.trim() === "") throw new Error("container_git commit: missing required arg \"message\"");
-			if (!hasChanges(root)) return "(nothing to commit — working tree clean)";
-			const addResult = git(root, ["add", "-A"]);
-			if (addResult.stderr) throw new Error(`container_git commit: git add failed\n${addResult.stderr}`);
-			const commitResult = git(root, [
+			const paths = (args.paths ?? []).map((p) => p.trim()).filter((p) => p !== "");
+			const scoped = paths.length > 0;
+			if (!scoped && !hasChanges(root)) return "(nothing to commit — working tree clean)";
+			const addR = git(root, scoped ? [
+				"add",
+				"--",
+				...paths
+			] : ["add", "-A"]);
+			if (addR.timedOut) throw new Error(`container_git commit: git add timed out (${localTimeout() / 1e3}s)`);
+			if (!addR.ok) throw new Error(`container_git commit: git add failed\n${addR.stderr || addR.stdout}`);
+			const commitR = git(root, scoped ? [
+				"commit",
+				"-m",
+				args.message,
+				"--",
+				...paths
+			] : [
 				"commit",
 				"-m",
 				args.message
 			]);
-			if (commitResult.stderr && commitResult.stderr.includes("nothing to commit")) return "(nothing to commit — working tree clean)";
-			if (commitResult.stderr && !commitResult.stdout) throw new Error(`container_git commit: git commit failed\n${commitResult.stderr}`);
-			return (commitResult.stdout || commitResult.stderr || "committed").trimEnd();
+			if (commitR.timedOut) throw new Error(`container_git commit: git commit timed out (${localTimeout() / 1e3}s)`);
+			if (`${commitR.stdout}\n${commitR.stderr}`.includes("nothing to commit")) return "(nothing to commit — working tree clean)";
+			if (!commitR.ok) throw new Error(`container_git commit: git commit failed\n${commitR.stderr || commitR.stdout}`);
+			const lines = [(commitR.stdout || commitR.stderr || "committed").trimEnd()];
+			if (!scoped) lines.push("ℹ️ 本次是**整仓**提交（未传 `paths`）—— 包含工作树里**所有**改动，可能含其它轨迹的在途文件。要只提交指定路径 ⇒ 传 `paths`。");
+			if (args.noPush) {
+				lines.push("⚠️ 按 `noPush` 只提交到**本地** —— 尚未推送到 origin。推送：container_git push");
+				return lines.join("\n");
+			}
+			const p = pushCore(root);
+			lines.push(p.hard ? `🔴 **已本地提交，但未推送** ——\n${p.text}` : p.text);
+			return lines.join("\n");
 		}
 		case "push": {
-			if (!hasRemote(root)) throw new Error("container_git push: no remote configured. Add one with:\n  git remote add origin <url>");
-			const branch = getCurrentBranch(root);
-			try {
-				git(root, [
-					"fetch",
-					"origin",
-					branch
-				]);
-			} catch {}
-			const { stdout, stderr } = git(root, [
-				"push",
-				"origin",
-				branch
-			]);
-			if (stderr.includes("non-fast-forward") || stderr.includes("rejected") || stderr.includes("[rejected]")) return `[REJECTED] Push to origin/${branch} was rejected (non-fast-forward).\n\nRemote has new commits and your local branch is behind. Suggested actions:\n  1. Use bash: git fetch origin ${branch}\n  2. Inspect remote changes: git log HEAD..origin/${branch}\n  3. Merge or rebase: git merge origin/${branch} or git rebase origin/${branch}\n  4. Resolve conflicts manually if any: git add ... && git commit\n  5. Push again: container_git push`;
-			if (!stderr || stderr.includes("->") || stderr === "") return stdout || `Pushed to origin/${branch}`;
-			throw new Error(`container_git push failed:\n${stderr}`);
+			const p = pushCore(root);
+			if (p.hard) throw new Error(p.text);
+			return p.text;
 		}
 		case "pull": {
 			if (!hasRemote(root)) throw new Error("container_git pull: no remote configured. Add one with:\n  git remote add origin <url>");
@@ -737,26 +855,29 @@ function runGit(root, args) {
 				"fetch",
 				"origin",
 				branch
-			]);
-			if (fetchResult.stderr) return `[WARN] fetch had stderr:\n${fetchResult.stderr}`;
+			], netTimeout());
+			if (fetchResult.timedOut) return `[TIMEOUT] git fetch 在 ${netTimeout() / 1e3}s 内未结束 —— **是否已拉到【未确认】**；未做合并。`;
+			if (!fetchResult.ok) return `[WARN] fetch failed:\n${fetchResult.stderr || fetchResult.stdout}`;
 			const revResult = git(root, [
 				"rev-list",
 				"--count",
 				"HEAD..FETCH_HEAD"
 			]);
-			if (revResult.stderr) return `[WARN] cannot check ahead count:\n${revResult.stderr}`;
+			if (!revResult.ok) return `[WARN] cannot check ahead count:\n${revResult.stderr || revResult.stdout}`;
 			if (revResult.stdout === "0" || revResult.stdout === "") return "Already up to date.";
 			const mergeResult = git(root, [
 				"merge",
 				"--ff-only",
 				"FETCH_HEAD"
 			]);
-			if (!mergeResult.stderr) {
+			if (mergeResult.timedOut) return `[TIMEOUT] git merge 在 ${localTimeout() / 1e3}s 内未结束 —— **合并是否完成【未确认】**。`;
+			if (mergeResult.ok) {
 				const msg = mergeResult.stdout || "Pulled successfully.";
 				return msg.endsWith("\n") ? msg.trimEnd() : msg;
 			}
-			if (mergeResult.stderr.includes("non-fast-forward") || mergeResult.stderr.includes("Not possible to fast-forward") || mergeResult.stderr.includes("rejected") || mergeResult.stderr.includes("could not be applied")) return `[REJECTED] Pull from origin/${branch} was rejected (non-fast-forward).\n\nRemote has new commits and your local history diverged from remote (non-fast-forward). Suggested actions:\n  1. Inspect differences: container_git log HEAD..origin/${branch}\n  2. Merge manually with bash: git merge origin/${branch}\n  3. Or rebase: git rebase origin/${branch}\n  4. Resolve conflicts manually if any: git add <file> && git commit\n  5. Push: container_git push`;
-			throw new Error(`container_git pull failed:\n${mergeResult.stderr}`);
+			const mErr = `${mergeResult.stderr}\n${mergeResult.stdout}`;
+			if (mErr.includes("non-fast-forward") || mErr.includes("Not possible to fast-forward") || mErr.includes("rejected") || mErr.includes("could not be applied")) return `[REJECTED] Pull from origin/${branch} was rejected (non-fast-forward).\n\nRemote has new commits and your local history diverged from remote (non-fast-forward). Suggested actions:\n  1. Inspect differences: container_git log HEAD..origin/${branch}\n  2. Merge manually with bash: git merge origin/${branch}\n  3. Or rebase: git rebase origin/${branch}\n  4. Resolve conflicts manually if any: git add <file> && git commit\n  5. Push: container_git push`;
+			throw new Error(`container_git pull failed:\n${mergeResult.stderr || mergeResult.stdout}`);
 		}
 		case "log": {
 			const n = Math.min(Math.max(args.count ?? 10, 1), 100);
@@ -768,7 +889,8 @@ function runGit(root, args) {
 				"-n",
 				String(n)
 			]);
-			if (r.stderr) throw new Error(`git log failed: ${r.stderr.trim()}`);
+			if (r.timedOut) throw new Error(`git log timed out (${localTimeout() / 1e3}s)`);
+			if (!r.ok) throw new Error(`git log failed: ${r.stderr || r.stdout || "(no output)"}`);
 			if (!r.stdout) return "(no commits)";
 			return r.stdout;
 		}
@@ -777,10 +899,11 @@ function runGit(root, args) {
 			if (args.staged) diffArgs.push("--cached");
 			if (args.ref) diffArgs.push(args.ref);
 			if (args.path) diffArgs.push("--", args.path);
-			const { stdout, stderr } = git(root, diffArgs);
-			if (stderr) return `[WARN] git diff had stderr:\n${stderr}`;
-			if (!stdout) return "(no diff)";
-			return stdout;
+			const r = git(root, diffArgs);
+			if (r.timedOut) throw new Error(`git diff timed out (${localTimeout() / 1e3}s)`);
+			if (!r.ok) return `[WARN] git diff failed:\n${r.stderr || r.stdout || "(no output)"}`;
+			if (!r.stdout) return "(no diff)";
+			return r.stdout;
 		}
 		default: throw new Error(`Unknown action: ${args.action}`);
 	}
@@ -798,7 +921,7 @@ function renderText$7(value) {
 }
 const gitTool = defineTool({
 	name: "container_git",
-	description: "CCC git operations (cc-git semantics, aligned with osp). status/commit/push/log/pull/diff; non-fast-forward push/pull outputs [REJECTED] + suggested actions (never auto-force). merge/rebase/conflict resolution go through bash.",
+	description: "CCC git operations (cc-git semantics, aligned with osp). status/commit/push/log/pull/diff. commit 默认**随后自动 push**（noPush 可关）；commit 传 paths ⇒ 只提交这些路径（不传=整仓 add -A，回执会显式告知）。push 成功判据 = --porcelain 的 ref 行（**超时/未确认一律不报成功**，回执给 `git ls-remote` 核验指令）；非快进 push/pull 输出 [REJECTED] + 建议（never auto-force）。merge/rebase/conflict resolution go through bash.",
 	parameters: {
 		action: {
 			type: "string",
@@ -810,6 +933,15 @@ const gitTool = defineTool({
 			type: "string",
 			description: "Commit message (required for commit)"
 		},
+		paths: {
+			type: "array",
+			items: { type: "string" },
+			description: "commit: 只提交这些路径（如 [\"docs/a.md\",\"src/b.ts\"]）。不传 = 整仓 `git add -A`（会吸走其它轨迹的在途文件，回执会显式提示）"
+		},
+		noPush: {
+			type: "boolean",
+			description: "commit: 只提交到本地，不随后推送（默认提交后自动推送）"
+		},
 		count: {
 			type: "integer",
 			description: "Log count (default 10, max 100; runtime clamp 1-100)"
@@ -9103,7 +9235,12 @@ const EVENT_LABEL = {
 	/** 敏感输出边界守卫（原 SERENITY OUTPUT GUARD） */
 	guard: "BOUNDARY GUARD",
 	/** SESSION.md 体积超限重写提醒（v1.31.1，S142 用户需求） */
-	compaction: "LOGBOOK COMPACTION"
+	compaction: "LOGBOOK COMPACTION",
+	/** **交界便签（REBUILD-TODO.md）体积超限清理提醒**（v1.49.0，owner 2026-09-26 需求）。
+	*
+	*  🔴 **刻意与 `compaction` 分开**：那条要求"**重写 SESSION.md 并保留 EAP 骨架**"，
+	*  本条只要求"**清理便签**"——共用一个 token 会让模型误以为要动 SESSION.md。 */
+	scratchPrune: "SCRATCH PRUNE"
 };
 /** 家族标识（所有动态注入统一前缀） */
 const ASSISTANT_PREFIX = "TRAJECTORY-ASSISTANT";
@@ -9114,16 +9251,24 @@ function eventToken(event) {
 /** ACK 确认码前缀（recorded/skipped 语义不变，仅家族名更新） */
 const ACK_PREFIX = `${ASSISTANT_PREFIX}-recorded`;
 /**
-* rebuild 交接区块标题（v1.31.1，S142 用户需求）。
+* rebuild 交界便签的**文件名**（v1.49.0；owner 2026-09-26 需求）。
+*
+* ## 它取代了什么（owner 原话：*"砍掉 in-flight，这正是目的"*）
+* v1.31.1 的交界协议要求把手头事项写进 **SESSION.md 末尾**的 `## In-flight (rebuild handover)` 段。
+* 实测的代价（S142 自身取证）：In-flight 段曾积 **12 块**（含多份**已被取代**的交接），
+* 而 SESSION.md 是**有格式义务**的持久文件（7 段固定 ＋ 粒度受 EAP 约束）⇒
+* ① 持久文件被临时物污染 ② 每次整理都要付"压缩＋归档＋保真"三件套（该文件曾达 292 KB）。
 *
-* 用途：rebuild 提醒要求模型把**当前手头事项**写到 SESSION.md **末尾**的这个小标题之下；
-* rebuild 锚点随后要求重建后的自己去读这一段并处理。两侧引用**同一个常量**——
-* 标题一旦漂移，读侧就找不到写侧写的东西（单一真相源）。
+* ⇒ 分家：**只用一次的交界材料**写进这份**临时便签**（无格式义务、无留档义务、可随时丢弃）。
 *
-* 形态（用户拍板 Q2）：**固定英文标题行**（不是 HTML 注释锚）——人读友好；ACC 写死英文，
-* 因为 SESSION.md 的正文语言归 CCC，但两侧的**机械锚点**必须逐字一致。
+* ## 🔴 三处引用同一常量（单一真相源）
+* **写侧** = `seams/keeper.ts` 的 `rebuildReminderText()`｜**读侧** = `rebuild.ts` 的重建锚点｜
+* **体积提醒** = `seams/keeper.ts` 的 `rebuildTodoReminderText()`。
+* 文件名一旦漂移，写侧写的东西读侧就找不到 —— **且没有任何机械信号会报警**。
+*
+* 🔴 **不得改名**（owner 已具名）。形态 = **固定文件名**（人读友好；比照旧 IN_FLIGHT_HEADING 的取舍）。
 */
-const IN_FLIGHT_HEADING = "## In-flight (rebuild handover)";
+const REBUILD_TODO_FILENAME = "REBUILD-TODO.md";
 //#endregion
 //#region src/seams/keeper.ts
 const SCORES = {
@@ -9196,12 +9341,15 @@ function reminderText(code) {
 *   使用者若要查看当前占用/阈值：看面板（`rebuildThresholdK` 滑块 + 状态显示）——那是给人看的。
 *
 * v1.31.1 交接协议（S142 用户需求"要求 LLM 将当前手头事项写在 SESSION.md 尾部，并要求
-* rebuild 后去读并处理"）：**写侧** = 这里（两条文案都要求把 in-flight 事项写在
-* SESSION.md 末尾的 `IN_FLIGHT_HEADING` 之下）；**读侧** = rebuild 锚点（rebuild.ts）。
-* 两侧共用 trajectory-assistant 的标题常量（单一真相源）。
+* rebuild 后去读并处理"）：**写侧** = 这里；**读侧** = rebuild 锚点（rebuild.ts）。
+* 两侧共用 trajectory-assistant 的常量（单一真相源）。
+*
+* 🔴 **v1.49.0（owner 2026-09-26 裁决："砍掉 in-flight，这正是目的"）**：写侧**不再**指向
+* SESSION.md 末尾的段，改指**独立便签文件** `REBUILD-TODO_FILENAME`（轨迹目录下）——
+* 理由见该常量的头注（持久文件 vs 只用一次的交界材料必须分家）。
 */
 function rebuildReminderText(escalated = false) {
-	const handover = ` Before rebuilding, write your current in-flight items (the exact step you are in the middle of, what is not finished yet, and what the next action is) at the very end of SESSION.md under the heading "${IN_FLIGHT_HEADING}" — the rebuilt conversation reads that section first and continues from it.`;
+	const handover = ` Before rebuilding, write your current in-flight items (the exact step you are in the middle of, what is not finished yet, and what the next action is) into "${REBUILD_TODO_FILENAME}" in this trajectory's directory — create it if it does not exist. That file is a scratch note for the handover only: no format obligation, no archival duty, safe to discard at any time. The rebuilt conversation reads it first and continues from it.`;
 	if (escalated) return `${eventToken("limitMandatory")} Context usage has reached the configured rebuild threshold — you have been reminded repeatedly and have NOT called the container_trajectory rebuild action. 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 container_trajectory rebuild immediately, passing --summary "<content summary ≤20 chars>" (required; the dsh session title is renamed to S###-YYYY-MM-DD-<summary> after rebuild).${handover} 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 container_trajectory rebuild.`;
 	return `${eventToken("limit")} Context usage has reached the configured rebuild threshold. 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.${handover} ACT NOW: at the next natural pause (end of the current task step), call the container_trajectory rebuild action — 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.`;
 }
@@ -9311,6 +9459,37 @@ function trajectoryCompactionReminderText(input) {
 	if (escalated) return `${eventToken("compaction")} ${facts} — you have been reminded repeatedly and have NOT compacted SESSION.md. This is now mandatory: STOP the current task step, load eap (praxis eap), rewrite SESSION.md, then resume. ${principles} ${frontmatterGuard} This reminder persists until the file is under the limit.`;
 	return `${eventToken("compaction")} ${facts}. Pause the current work and compact this trajectory's log (SESSION.md) before continuing — that log is the persistent body of this trajectory, and its size is operational entropy (H_op) the container pays on every read. ${principles} ${frontmatterGuard} After rewriting, resume the paused work; this reminder stops once the file is under the limit.`;
 }
+/** 连续超限轮数达此值 → 语气升级（对齐 COMPACTION_ESCALATE_AFTER / REBUILD_ESCALATE_AFTER） */
+const REBUILD_TODO_ESCALATE_AFTER = 3;
+const rebuildTodoStates = /* @__PURE__ */ new Map();
+/**
+* 交界便签超限提醒文案（v1.49.0）。
+*
+* ## 与 SESSION.md 档的**语义差别**（刻意，不是疏漏）
+*
+* | | SESSION.md 超限（`trajectoryCompactionReminderText`） | 便签超限（本条） |
+* |---|---|---|
+* | 动作 | **重写**（compaction） | **清理／丢弃**（prune） |
+* | 结构义务 | 保 EAP 骨架 ＋ 4 条重写原则 ＋ frontmatter 护栏 | **无** |
+* | 强度 | 升级后**强制**（"STOP…必须先重写"） | 升级后**语气加重，但动作仍只是"清理"** |
+* | 授权 | — | 🔴 **明确授权整份删除** |
+*
+* ## 归属（D23）
+* 机制（文件名 ／ 上限 ／ 注入时机）归 **ACC**；**写什么、怎么组织、何时丢**归 **CCC**。
+* 🔴 owner 裁决（逐字）：*"rebuild 提示 Agent 去写，清空我们就不干涉了，只管最大量"* ⇒
+* **ACC 只提醒，不做任何写／删／归档操作**（自动删 = 数据丢失风险：rebuild 时序上新我还没读就被删）。
+*
+* ## 为什么要求"参照 eap"
+* owner 裁决（逐字）：*"不规定，但要求参照 eap 来编写（这样质量会好点）"* ⇒
+* **不规定内部结构**（不给骨架），但**要求按 EAP 写**（显式 ／ 可重建 ／ 稳定）。
+*/
+function rebuildTodoReminderText(input) {
+	const { sizeKB, limitKB, mdPath, escalated = false } = input;
+	const facts = `${REBUILD_TODO_FILENAME} is ${sizeKB} KB (limit ${limitKB} KB): ${mdPath}`;
+	const action = "This file is a scratch note for the rebuild handover — it carries no archival duty and you may discard it wholesale at any time. Prune it now, writing in the spirit of eap (praxis eap): (1) delete what is already done; (2) delete what has been superseded; (3) delete what is already recorded in SESSION.md — that file is the trajectory's persistent body, this one only carries what the next self needs once. Do not restructure it into a formal document: the only mechanical constraint on this file is its size.";
+	if (escalated) return `${eventToken("scratchPrune")} ${facts} — you have been reminded repeatedly and have NOT pruned it. Prune it now. ${action} This reminder persists until the file is under the limit.`;
+	return `${eventToken("scratchPrune")} ${facts}. ${action} This reminder stops once the file is under the limit.`;
+}
 /** 每 agent 一个跟踪器（进程内存态，agent token 维度） */
 const trackers = /* @__PURE__ */ new Map();
 /** 连续超阈值轮数达此值 → 升级为 [TRAJECTORY-ESCALATED] 强制语气（此后持续升级催，直到 rebuild） */
@@ -9350,7 +9529,7 @@ function registerKeeper(ctx, opts = {}) {
 				text: reminderText(code)
 			});
 		}
-		if (skiffRebuild && readSimpleSettings().rebuildEnabled) {
+		if (skiffRebuild) {
 			const session = exec.agent?.session;
 			if (session) {
 				const pressure = readContextPressure(ctx, session);
@@ -9393,6 +9572,27 @@ function registerKeeper(ctx, opts = {}) {
 				} else compactionStates.delete(scope);
 			}
 		}
+		if (skiffTrajectoryEnabled(root, sessionId, "session")) {
+			const scope = sessionId ?? "global";
+			const session = exec.agent?.session;
+			const mdPath = resolveActiveSessionMdPath(root, scope, session);
+			const todoPath = mdPath ? join(dirname(mdPath), REBUILD_TODO_FILENAME) : null;
+			const size = todoPath ? readFileSize(todoPath) : null;
+			if (todoPath && size !== null && size > 10240) {
+				const st = rebuildTodoStates.get(scope) ?? { consecutive: 0 };
+				st.consecutive += 1;
+				blocks.push({
+					type: "text",
+					text: rebuildTodoReminderText({
+						sizeKB: Math.round(size / 1024),
+						limitKB: 10,
+						mdPath: todoPath,
+						escalated: st.consecutive >= REBUILD_TODO_ESCALATE_AFTER
+					})
+				});
+				rebuildTodoStates.set(scope, st);
+			} else rebuildTodoStates.delete(scope);
+		}
 		if (blocks.length === 0) return downstream;
 		const reminderAll = createUserMessage({
 			content: blocks,
@@ -10049,7 +10249,7 @@ function registerStatusApi(ctx, opts = {}) {
 					return;
 				}
 				const settings = readAdvancedSettings();
-				const { readSimpleSettings } = await import("./settings-section-DxMwlCv9.js").then((n) => n.r);
+				const { readSimpleSettings } = await import("./settings-section-B-KOyOYn.js").then((n) => n.r);
 				const simple = readSimpleSettings();
 				const allowed = settings.publicAsk.allowed;
 				const port = simple.acpHttpPort ?? ACP_HTTP_PORT;
@@ -12040,6 +12240,8 @@ function stripAckSuffix(text) {
 */
 function buildRebuildAnchor(root, sessionName, activeMdPath, anchorMessages = DEFAULT_ANCHOR_MESSAGES, focus) {
 	const rel = activeMdPath.startsWith(root) ? activeMdPath.slice(root.length + 1) : activeMdPath;
+	const todoAbs = join(dirname(activeMdPath), REBUILD_TODO_FILENAME);
+	const todoRel = todoAbs.startsWith(root) ? todoAbs.slice(root.length + 1) : todoAbs;
 	const sessionDir = basename(dirname(activeMdPath));
 	const sessionLine = sessionDir !== "AGENT_SESSIONS" ? `- Serenity session: ${sessionName !== "" ? `${sessionName} (${sessionDir})` : sessionDir}` : null;
 	const focusLine = sanitizeFocusLine(focus);
@@ -12052,7 +12254,7 @@ function buildRebuildAnchor(root, sessionName, activeMdPath, anchorMessages = DE
 		`- Persistent trajectory — SESSION.md path: ${rel}`,
 		`  (the trajectory's persistent body — stays in place through rebuilds)`,
 		`- Read that SESSION.md first (goal/decisions/progress/unresolved), then continue from the last checkpoint.`,
-		`- Then read the "${IN_FLIGHT_HEADING}" section at the very end of SESSION.md and work through those in-flight items (the previous self paused mid-task and handed them over). If that section is missing, infer the in-flight items from the latest progress entries.`,
+		`- Then read the handover scratch note: ${todoRel} (path: ${todoAbs}) — the previous self paused mid-task and left its in-flight items there. That file carries no format obligation and may be discarded at any time; it is NOT the authoritative state. If it is missing, infer the in-flight items from SESSION.md's latest progress entries.`,
 		...focusLine ? [`- Task focus: ${focusLine}`] : []
 	].join("\n");
 }
@@ -12158,7 +12360,6 @@ function writeRebuildDiag(root, entry) {
 * @returns 排队结果；rebuild.enabled=false 或非 CCC 抛错
 */
 async function queueRebuild(ctx, opts) {
-	if (!readSimpleSettings().rebuildEnabled) throw new Error("container_trajectory rebuild is disabled (rebuild.enabled=false — enable it in the dsh settings panel)");
 	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)`);
@@ -18567,10 +18768,7 @@ const Config = z.object({
 	env: z.boolean().default(true),
 	opencodeSkills: z.boolean().default(true),
 	gateway: z.object({ enabled: z.boolean().default(false) }),
-	rebuild: z.object({
-		enabled: z.boolean().default(true),
-		thresholdK: z.number().min(50).max(4e3).default(400)
-	}),
+	rebuild: z.object({ thresholdK: z.number().min(50).max(4e3).default(400) }),
 	skiff: z.object({
 		enabled: z.boolean().default(false),
 		debugPort: z.number().min(1024).max(65535).default(SKIFF_DEBUG_PORT)
@@ -18583,7 +18781,6 @@ const Config = z.object({
 	opencodeProvider: z.object({ autoConfigure: z.boolean().default(true) }),
 	visionPatch: z.object({ enabled: z.boolean().default(true) }),
 	gatewayEnabled: z.boolean().volatile(),
-	rebuildEnabled: z.boolean().volatile(),
 	rebuildThresholdK: z.number().min(50).max(4e3).volatile(),
 	skiffEnabled: z.boolean().volatile(),
 	skiffDebugPort: z.number().min(1024).max(65535).volatile(),

package/lib/seams/keeper.d.ts

@@ -48,9 +48,12 @@ export declare function reminderText(code: string): string;
  *   使用者若要查看当前占用/阈值：看面板（`rebuildThresholdK` 滑块 + 状态显示）——那是给人看的。
  *
  * v1.31.1 交接协议（S142 用户需求"要求 LLM 将当前手头事项写在 SESSION.md 尾部，并要求
- * rebuild 后去读并处理"）：**写侧** = 这里（两条文案都要求把 in-flight 事项写在
- * SESSION.md 末尾的 `IN_FLIGHT_HEADING` 之下）；**读侧** = rebuild 锚点（rebuild.ts）。
- * 两侧共用 trajectory-assistant 的标题常量（单一真相源）。
+ * rebuild 后去读并处理"）：**写侧** = 这里；**读侧** = rebuild 锚点（rebuild.ts）。
+ * 两侧共用 trajectory-assistant 的常量（单一真相源）。
+ *
+ * 🔴 **v1.49.0（owner 2026-09-26 裁决："砍掉 in-flight，这正是目的"）**：写侧**不再**指向
+ * SESSION.md 末尾的段，改指**独立便签文件** `REBUILD-TODO_FILENAME`（轨迹目录下）——
+ * 理由见该常量的头注（持久文件 vs 只用一次的交界材料必须分家）。
  */
 export declare function rebuildReminderText(escalated?: boolean): string;
 /** 读取会话 contextPressure 投影（sessionProjections 可选服务；未装配返回 null） */
@@ -110,6 +113,51 @@ export declare function trajectoryCompactionReminderText(input: {
     mdPath: string;
     escalated?: boolean;
 }): string;
+/**
+ * 交界便签体积上限（KB）—— **硬编码，刻意不设配置键**。
+ *
+ * 🔴 owner 2026-09-26 裁决（逐字）：*"不需要设定，很多设定项我想砍掉了，好的功能用久了就发现
+ * 离不开，就不需要了"* ⇒ **不提供 `sessionKeeper.rebuildTodoMaxKB`**（设计件 Q4 的原倾向被否）。
+ * 对照：SESSION.md 的上限**保留可配置**（既有面，本版不动）。
+ */
+export declare const DEFAULT_REBUILD_TODO_MAX_KB = 10;
+interface RebuildTodoState {
+    /** 连续超限轮数（文件降回限内即清零 → 清理完成后提醒自动停止） */
+    consecutive: number;
+}
+/** 测试/调试：查看交界便签超限提醒状态 */
+export declare function rebuildTodoStateSnapshot(): ReadonlyMap<string, RebuildTodoState>;
+/** 会话销毁/测试重置：清理超限计数（防 per-会话 Map 无界增长） */
+export declare function forgetRebuildTodoState(scope: string): void;
+/** 测试辅助：清空交界便签提醒状态 */
+export declare function __resetRebuildTodoForTest(): void;
+/**
+ * 交界便签超限提醒文案（v1.49.0）。
+ *
+ * ## 与 SESSION.md 档的**语义差别**（刻意，不是疏漏）
+ *
+ * | | SESSION.md 超限（`trajectoryCompactionReminderText`） | 便签超限（本条） |
+ * |---|---|---|
+ * | 动作 | **重写**（compaction） | **清理／丢弃**（prune） |
+ * | 结构义务 | 保 EAP 骨架 ＋ 4 条重写原则 ＋ frontmatter 护栏 | **无** |
+ * | 强度 | 升级后**强制**（"STOP…必须先重写"） | 升级后**语气加重，但动作仍只是"清理"** |
+ * | 授权 | — | 🔴 **明确授权整份删除** |
+ *
+ * ## 归属（D23）
+ * 机制（文件名 ／ 上限 ／ 注入时机）归 **ACC**；**写什么、怎么组织、何时丢**归 **CCC**。
+ * 🔴 owner 裁决（逐字）：*"rebuild 提示 Agent 去写，清空我们就不干涉了，只管最大量"* ⇒
+ * **ACC 只提醒，不做任何写／删／归档操作**（自动删 = 数据丢失风险：rebuild 时序上新我还没读就被删）。
+ *
+ * ## 为什么要求"参照 eap"
+ * owner 裁决（逐字）：*"不规定，但要求参照 eap 来编写（这样质量会好点）"* ⇒
+ * **不规定内部结构**（不给骨架），但**要求按 EAP 写**（显式 ／ 可重建 ／ 稳定）。
+ */
+export declare function rebuildTodoReminderText(input: {
+    sizeKB: number;
+    limitKB: number;
+    mdPath: string;
+    escalated?: boolean;
+}): string;
 interface KeeperRegistration {
     /** 缺省阈值（serenity.json sessionKeeper.threshold 优先，其次此值） */
     defaultThreshold?: number;

package/lib/{settings-section-DxMwlCv9.js → settings-section-B-KOyOYn.js}

@@ -70,7 +70,6 @@ var settings_section_exports = /* @__PURE__ */ __exportAll({
 function defaultSimpleSettings() {
 	return {
 		gatewayEnabled: false,
-		rebuildEnabled: true,
 		rebuildThresholdK: 400,
 		skiffEnabled: false,
 		skiffDebugPort: SKIFF_DEBUG_PORT,
@@ -116,7 +115,6 @@ function simpleSettingsFromConfig(config) {
 	const d = defaultSimpleSettings();
 	return {
 		gatewayEnabled: unwrapVolatile(config.gatewayEnabled) ?? config.gateway?.enabled ?? d.gatewayEnabled,
-		rebuildEnabled: unwrapVolatile(config.rebuildEnabled) ?? config.rebuild?.enabled ?? d.rebuildEnabled,
 		rebuildThresholdK: unwrapVolatile(config.rebuildThresholdK) ?? config.rebuild?.thresholdK ?? d.rebuildThresholdK,
 		skiffEnabled: unwrapVolatile(config.skiffEnabled) ?? config.skiff?.enabled ?? d.skiffEnabled,
 		skiffDebugPort: unwrapVolatile(config.skiffDebugPort) ?? config.skiff?.debugPort ?? d.skiffDebugPort,

package/lib/settings-section.d.ts

@@ -49,7 +49,6 @@ interface SimpleConfigFragment {
         enabled?: boolean;
     };
     rebuild?: {
-        enabled?: boolean;
         thresholdK?: number;
     };
     /** F4 Skiff（实验性）：调试服务启停（人工） */
@@ -63,7 +62,6 @@ interface SimpleConfigFragment {
         httpPort?: number;
     };
     gatewayEnabled?: PanelBoolean;
-    rebuildEnabled?: PanelBoolean;
     rebuildThresholdK?: PanelNumber;
     skiffEnabled?: PanelBoolean;
     skiffDebugPort?: PanelNumber;
@@ -81,8 +79,6 @@ export declare const SERENITY_SETTINGS_NS = "serenity-hooks";
 interface SerenitySimpleSettings {
     /** F1 双端口网关总开关 */
     gatewayEnabled: boolean;
-    /** F2 超限重建总开关 */
-    rebuildEnabled: boolean;
     /** F2 触发阈值（需求① S142 用户拍板：百分比比例 → K 数值；projectedTokens ≥ thresholdK*1000 触发） */
     rebuildThresholdK: number;
     /** F4 Skiff 调试服务总开关（实验性；默认关——不随插件加载自动启动，人工开启） */

package/lib/trajectory-assistant.d.ts

@@ -33,6 +33,11 @@ export declare const EVENT_LABEL: {
     readonly guard: "BOUNDARY GUARD";
     /** SESSION.md 体积超限重写提醒（v1.31.1，S142 用户需求） */
     readonly compaction: "LOGBOOK COMPACTION";
+    /** **交界便签（REBUILD-TODO.md）体积超限清理提醒**（v1.49.0，owner 2026-09-26 需求）。
+     *
+     *  🔴 **刻意与 `compaction` 分开**：那条要求"**重写 SESSION.md 并保留 EAP 骨架**"，
+     *  本条只要求"**清理便签**"——共用一个 token 会让模型误以为要动 SESSION.md。 */
+    readonly scratchPrune: "SCRATCH PRUNE";
 };
 /** 家族标识（所有动态注入统一前缀） */
 export declare const ASSISTANT_PREFIX = "TRAJECTORY-ASSISTANT";
@@ -42,16 +47,24 @@ export declare function eventToken(event: keyof typeof EVENT_LABEL): string;
 export declare const ACK_PREFIX = "TRAJECTORY-ASSISTANT-recorded";
 export declare const ACK_SKIP_PREFIX = "TRAJECTORY-ASSISTANT-skipped";
 /**
- * rebuild 交接区块标题（v1.31.1，S142 用户需求）。
+ * rebuild 交界便签的**文件名**（v1.49.0；owner 2026-09-26 需求）。
  *
- * 用途：rebuild 提醒要求模型把**当前手头事项**写到 SESSION.md **末尾**的这个小标题之下；
- * rebuild 锚点随后要求重建后的自己去读这一段并处理。两侧引用**同一个常量**——
- * 标题一旦漂移，读侧就找不到写侧写的东西（单一真相源）。
+ * ## 它取代了什么（owner 原话：*"砍掉 in-flight，这正是目的"*）
+ * v1.31.1 的交界协议要求把手头事项写进 **SESSION.md 末尾**的 `## In-flight (rebuild handover)` 段。
+ * 实测的代价（S142 自身取证）：In-flight 段曾积 **12 块**（含多份**已被取代**的交接），
+ * 而 SESSION.md 是**有格式义务**的持久文件（7 段固定 ＋ 粒度受 EAP 约束）⇒
+ * ① 持久文件被临时物污染 ② 每次整理都要付"压缩＋归档＋保真"三件套（该文件曾达 292 KB）。
  *
- * 形态（用户拍板 Q2）：**固定英文标题行**（不是 HTML 注释锚）——人读友好；ACC 写死英文，
- * 因为 SESSION.md 的正文语言归 CCC，但两侧的**机械锚点**必须逐字一致。
+ * ⇒ 分家：**只用一次的交界材料**写进这份**临时便签**（无格式义务、无留档义务、可随时丢弃）。
+ *
+ * ## 🔴 三处引用同一常量（单一真相源）
+ * **写侧** = `seams/keeper.ts` 的 `rebuildReminderText()`｜**读侧** = `rebuild.ts` 的重建锚点｜
+ * **体积提醒** = `seams/keeper.ts` 的 `rebuildTodoReminderText()`。
+ * 文件名一旦漂移，写侧写的东西读侧就找不到 —— **且没有任何机械信号会报警**。
+ *
+ * 🔴 **不得改名**（owner 已具名）。形态 = **固定文件名**（人读友好；比照旧 IN_FLIGHT_HEADING 的取舍）。
  */
-export declare const IN_FLIGHT_HEADING = "## In-flight (rebuild handover)";
+export declare const REBUILD_TODO_FILENAME = "REBUILD-TODO.md";
 /** 风格档位：plain（默认，精确文本）/ metaphor（借星舰词——产品隐喻非游戏词） */
 type TrajectoryStyle = 'plain' | 'metaphor';
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.48.1",
+  "version": "1.49.0",
   "description": "宁静号 ACC harness（Native Cordis 插件）——给 DeepSeek Harness 装一个「AI 工作区」：11 个工具（container_fs/container_trajectory/dashboard/container_git/msm/praxis/handyman/localstore/container_admin/im-bridge/acc-diag）+ 机械约束（安全模式/工作区围墙/密钥守卫/对外输出守卫）+ 工作日志与原地重建 + 网页登录入口/微信桥/子角色/对外问答页/trajectory 唤醒注册表。适配 DSH 0.1.7-rc.1。",
   "license": "MIT",
   "repository": {