@shgroup/dsh-serenity-hooks 1.48.0 → 1.48.2

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.48.0",
+  "version": "1.48.2",
   "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/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.js

@@ -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)"
@@ -17031,6 +17163,7 @@ function opencodeRouteHeaders() {
 const OPENCODE_EXTRA_MODELS = { "deepseek-v4.1-flash": {
 	name: "DeepSeek V4.1 Flash",
 	api: "openai-completions",
+	baseUrl: "https://opencode.ai/zen/go/v1",
 	contextWindow: 1e6,
 	maxTokens: 384e3,
 	input: ["text"],
@@ -17074,41 +17207,104 @@ const OPENCODE_GO_NON_COMPLETIONS = /* @__PURE__ */ new Set([
 	"muse-spark-1.2-contributor"
 ]);
 /**
-* 往**已有显式 `models` 列表**的路由里追加目录未收录的模型（**纯函数**）。
+* 把 {@link OPENCODE_EXTRA_MODELS} 落到一个**已有显式 `models` 列表**的路由上（**纯函数**）。
+*
+* 两种落法（v1.48.1 起）：
+*   · **追加**（模型不在表里）—— 目录里没有它，连条目都得我们造。
+*   · **补规格**（模型已在表里、但缺 `reasoningEfforts`）—— 🔴 **这是"手加过"的形态**：
+*     用户把模型抄进列表了，可没抄推理档 ⇒ 宿主 `resolveModelReasoning` 走 `base?.reasoning ?? false`
+*     ⇒ **能用但永远不出 thinking**。只补"缺失的模型"是补不到这一形态的。
 *
-* 三条拒绝条件（每条都对应一个会让配置变坏的真实形态）：
-*   ① **没有显式 `models` 列表** ⇒ 该路由此刻服务的是 pi-ai 目录本体；
-*      一旦我们写出 `models`，**整个目录会被顶掉**（宿主的 `models` 是"整体替换"语义）
-*      ⇒ 宁可不动。
+* 拒绝条件（每条都对应一个会让配置变坏的真实形态；宁可不动也不硬来）：
+*   ① **没有显式 `models` 列表**（含空表）⇒ 该路由此刻服务的是 pi-ai 目录本体；
+*      一旦我们写出 `models`，**整个目录会被顶掉**（宿主的 `models` 是"整体替换"语义）。
 *   ② **列表里出现已知异协议模型** ⇒ 设路由级 `api` 会覆盖它们的 `base.api`，把它们配坏。
 *   ③ **路由已显式设了别的 `api`** ⇒ 同上，且那是用户的显式选择，不覆盖。
+*   ④ **要补规格却判不出协议**（路由没写 `api`，又不追加任何模型）⇒ 无法保证 compat 合法。
 */
 function planExtraModels(profile) {
 	const raw = profile.models;
 	if (!Array.isArray(raw) || raw.length === 0) return {
 		addedIds: [],
+		enrichedIds: [],
 		skip: "catalog-served"
 	};
-	const ids = /* @__PURE__ */ new Set();
-	for (const entry of raw) if (isPlainObject$1(entry) && typeof entry.id === "string") ids.add(entry.id);
-	const missing = Object.entries(OPENCODE_EXTRA_MODELS).filter(([id]) => !ids.has(id));
-	if (missing.length === 0) return { addedIds: [] };
-	for (const id of ids) if (OPENCODE_GO_NON_COMPLETIONS.has(id)) return {
+	const byId = /* @__PURE__ */ new Map();
+	for (const entry of raw) if (isPlainObject$1(entry) && typeof entry.id === "string") byId.set(entry.id, entry);
+	for (const id of byId.keys()) if (OPENCODE_GO_NON_COMPLETIONS.has(id)) return {
 		addedIds: [],
+		enrichedIds: [],
 		skip: "mixed-protocol"
 	};
-	const apis = new Set(missing.map(([, model]) => model.api));
-	if (apis.size !== 1) return {
+	const missing = Object.entries(OPENCODE_EXTRA_MODELS).filter(([id]) => !byId.has(id));
+	const existingApi = typeof profile.api === "string" && profile.api !== "" ? profile.api : void 0;
+	let pendingApi;
+	if (missing.length > 0) {
+		const apis = new Set(missing.map(([, model]) => model.api));
+		if (apis.size !== 1) return {
+			addedIds: [],
+			enrichedIds: [],
+			skip: "mixed-protocol"
+		};
+		pendingApi = [...apis][0];
+	}
+	if (existingApi !== void 0 && pendingApi !== void 0 && existingApi !== pendingApi) return {
 		addedIds: [],
-		skip: "mixed-protocol"
+		enrichedIds: [],
+		skip: "api-conflict"
 	};
-	const api = [...apis][0];
-	const existingApi = profile.api;
-	if (typeof existingApi === "string" && existingApi !== api) return {
+	/** 写完之后该路由的**有效协议**（第三方条目也会按它解析） */
+	const effectiveApi = existingApi ?? pendingApi;
+	const toEnrich = [];
+	for (const [id, model] of Object.entries(OPENCODE_EXTRA_MODELS)) {
+		const entry = byId.get(id);
+		if (entry === void 0) continue;
+		if (entry.reasoningEfforts !== void 0) continue;
+		if (effectiveApi === void 0) return {
+			addedIds: [],
+			enrichedIds: [],
+			skip: "api-missing"
+		};
+		if (effectiveApi !== model.api) return {
+			addedIds: [],
+			enrichedIds: [],
+			skip: "api-conflict"
+		};
+		toEnrich.push([
+			id,
+			model,
+			entry
+		]);
+	}
+	if (missing.length === 0 && toEnrich.length === 0) return {
 		addedIds: [],
-		skip: "api-conflict"
+		enrichedIds: []
 	};
-	const appended = missing.map(([id, model]) => ({
+	let baseUrl;
+	if (!(typeof profile.baseURL === "string" && profile.baseURL !== "")) {
+		const want = new Set([...missing.map(([, m]) => m), ...toEnrich.map(([, m]) => m)].map((m) => m.baseUrl));
+		if (want.size !== 1) return {
+			addedIds: [],
+			enrichedIds: [],
+			skip: "mixed-protocol"
+		};
+		baseUrl = [...want][0];
+	}
+	const enrichById = new Map(toEnrich.map(([id, model]) => [id, model]));
+	const models = raw.map((entry) => {
+		if (!isPlainObject$1(entry) || typeof entry.id !== "string") return entry;
+		const model = enrichById.get(entry.id);
+		if (model === void 0) return entry;
+		return {
+			...entry,
+			reasoningEfforts: { ...model.reasoningEfforts },
+			compat: {
+				...model.compat,
+				...isPlainObject$1(entry.compat) ? entry.compat : {}
+			}
+		};
+	});
+	for (const [id, model] of missing) models.push({
 		id,
 		name: model.name,
 		contextWindow: model.contextWindow,
@@ -17116,11 +17312,13 @@ function planExtraModels(profile) {
 		input: [...model.input],
 		reasoningEfforts: { ...model.reasoningEfforts },
 		compat: { ...model.compat }
-	}));
+	});
 	return {
-		models: [...raw, ...appended],
-		...existingApi === api ? {} : { api },
-		addedIds: missing.map(([id]) => id)
+		models,
+		...pendingApi !== void 0 && existingApi === void 0 ? { api: pendingApi } : {},
+		...baseUrl === void 0 ? {} : { baseUrl },
+		addedIds: missing.map(([id]) => id),
+		enrichedIds: toEnrich.map(([id]) => id)
 	};
 }
 function isPlainObject$1(value) {
@@ -17198,16 +17396,24 @@ function planOpencodeAutoConfig(input) {
 			route,
 			reason: extra.skip
 		});
-		else if (extra.addedIds.length > 0) actions.push({
-			kind: "add-models",
-			route,
-			ids: extra.addedIds,
-			api: extra.api ?? null
-		});
+		else {
+			if (extra.addedIds.length > 0) actions.push({
+				kind: "add-models",
+				route,
+				ids: extra.addedIds,
+				api: extra.api ?? null
+			});
+			if (extra.enrichedIds.length > 0) actions.push({
+				kind: "enrich-models",
+				route,
+				ids: extra.enrichedIds
+			});
+		}
 		const routePatch = {};
 		if (keys.length > 0) routePatch.headers = missing;
 		if (extra.models !== void 0) routePatch.models = extra.models;
 		if (extra.api !== void 0) routePatch.api = extra.api;
+		if (extra.baseUrl !== void 0) routePatch.baseURL = extra.baseUrl;
 		if (keys.length === 0 && Object.keys(routePatch).length === 0) {
 			actions.push({
 				kind: "skip-route",
@@ -17249,7 +17455,8 @@ function describeOpencodeAction(action) {
 		case "create-route": return `创建 ${action.route} 路由（检测到 ${OPENCODE_API_KEY_ENV}）+ 路由头`;
 		case "skip-route": return `${action.route} 路由头已齐备（跳过）`;
 		case "add-models": return `为 ${action.route} 补目录未收录的模型：${action.ids.join(", ")}` + (action.api === null ? "" : `（并设路由 api=${action.api}）`);
-		case "skip-models": return `${action.route} 未补模型（${action.reason === "catalog-served" ? "该路由未声明 models 列表，补 models 会顶掉整个目录" : action.reason === "mixed-protocol" ? "该路由含异协议模型，设路由 api 会把它们配坏" : "该路由已显式设了别的 api"}）`;
+		case "enrich-models": return `为 ${action.route} 已列出的模型补推理档：${action.ids.join(", ")}（此前「能用但没 thinking」）`;
+		case "skip-models": return `${action.route} 未补模型（${action.reason === "catalog-served" ? "该路由未声明 models 列表，补 models 会顶掉整个目录" : action.reason === "mixed-protocol" ? "该路由含异协议模型，设路由 api 会把它们配坏" : action.reason === "api-missing" ? "该模型已列出但缺推理档，而路由没写 api ⇒ 判不出该用哪套 compat" : "该路由的 api 与本表规格不一致"}）`;
 		case "idle": return `无需动作（${action.reason}）`;
 	}
 }

package/lib/opencode-provider.d.ts

@@ -94,6 +94,16 @@ export interface OpencodeExtraModel {
     readonly name: string;
     /** 该模型说的 wire 协议；见 {@link OPENCODE_GO_NON_COMPLETIONS} 的安全闸 */
     readonly api: string;
+    /**
+     * 该模型的端点基址 —— 🔴 **目录外模型的必需品**（v1.48.1 补）。
+     *
+     * 宿主 `resolveRouteModels` 的兜底链是 `request.baseURL ?? base?.baseUrl ?? providerBaseUrl`；
+     * 目录里没有它 ⇒ `base` 为 undefined，而 pi-ai 的 `opencodeGoProvider()` **也没有 provider 级
+     * baseUrl** ⇒ 三级全空 ⇒ 宿主**严格写入直接把整条补丁拒掉**（v1.48.0 真机实测原文：
+     * `model "deepseek-v4.1-flash" needs a baseURL; the installed catalog does not describe this route`）。
+     * 故本字段是**唯一可控的那一环**：路由自身没写 `baseURL` 时，必须由我们补上。
+     */
+    readonly baseUrl: string;
     readonly contextWindow: number;
     readonly maxTokens: number;
     readonly input: readonly string[];
@@ -135,10 +145,14 @@ type OpencodeAutoConfigAction = {
     route: string;
     ids: readonly string[];
     api: string | null;
+} | {
+    kind: 'enrich-models';
+    route: string;
+    ids: readonly string[];
 } | {
     kind: 'skip-models';
     route: string;
-    reason: 'catalog-served' | 'mixed-protocol' | 'api-conflict';
+    reason: 'catalog-served' | 'mixed-protocol' | 'api-conflict' | 'api-missing';
 } | {
     kind: 'idle';
     reason: 'namespace-unregistered' | 'no-route';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.48.0",
+  "version": "1.48.2",
   "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": {