@shgroup/dsh-serenity-hooks 1.48.0 → 1.48.1

package/dsh.plugin.json

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

@@ -17031,6 +17031,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 +17075,104 @@ const OPENCODE_GO_NON_COMPLETIONS = /* @__PURE__ */ new Set([
 	"muse-spark-1.2-contributor"
 ]);
 /**
-* 往**已有显式 `models` 列表**的路由里追加目录未收录的模型（**纯函数**）。
+* 把 {@link OPENCODE_EXTRA_MODELS} 落到一个**已有显式 `models` 列表**的路由上（**纯函数**）。
 *
-* 三条拒绝条件（每条都对应一个会让配置变坏的真实形态）：
-*   ① **没有显式 `models` 列表** ⇒ 该路由此刻服务的是 pi-ai 目录本体；
-*      一旦我们写出 `models`，**整个目录会被顶掉**（宿主的 `models` 是"整体替换"语义）
-*      ⇒ 宁可不动。
+* 两种落法（v1.48.1 起）：
+*   · **追加**（模型不在表里）—— 目录里没有它，连条目都得我们造。
+*   · **补规格**（模型已在表里、但缺 `reasoningEfforts`）—— 🔴 **这是"手加过"的形态**：
+*     用户把模型抄进列表了，可没抄推理档 ⇒ 宿主 `resolveModelReasoning` 走 `base?.reasoning ?? false`
+*     ⇒ **能用但永远不出 thinking**。只补"缺失的模型"是补不到这一形态的。
+*
+* 拒绝条件（每条都对应一个会让配置变坏的真实形态；宁可不动也不硬来）：
+*   ① **没有显式 `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 +17180,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 +17264,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 +17323,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.1",
   "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": {