@shgroup/dsh-serenity-hooks 1.104.0 → 1.105.0

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.104.0",
+  "version": "1.105.0",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：给 DSH 装一个「AI 工作区」——13 个工具（container_fs/cognitive_trajectory/dashboard/container_git/msm/praxis/ontology/serenity-skill-creator/localstore/container_admin；另三个 im-bridge/acc-diag/diagram 按配置条件出现）+ 机械约束（安全模式/工作区围墙/密钥守卫）+ 认知轨迹日志与原地重建 + 网页登录入口/IM 桥/认知轨迹唤醒注册表。轨迹声明 = 轨迹目录下的 trajectory.json（约束面 + 旧标识 uid + CRO 机器绑定 cro.host；旧名 trajectory-constraint.json / skiff.json 仍在读取族里）；轨迹提示词 = 轨迹目录下的 PROMPT.md（一条轨迹「是谁、按什么章程工作」，所有轨迹通用，追加在容器层与质量层之后，不替换它们）。适配 DSH 0.1.7-rc.1 / 0.2.0-rc.1 / 0.2.1-rc.1（三档，deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/{ccc-roots-BIdg0EyM.js → ccc-roots-BPicjCsj.js}

@@ -73,6 +73,18 @@ function hostSettings(ctx) {
 function hostWeb(ctx) {
 	return hostInjected(ctx, "web");
 }
+/**
+* 宿主默认模型选择（**没显式指定模型时**该用的那个）。
+*
+* 🔴 为什么需要这个读取器（v1.105.0，P0 回归修复）：
+* `agents.create` **不传** `agentOptions` ⇒ `agent.options.model === undefined`
+* ⇒ 宿主的 persona 模板 `powered by the {{model}} model` **严格插值抛错** ⇒ 整轮失败。
+* ⇒ 「不传」不等于「安全」：**下游有依赖方要求这个值必须存在**。
+* 详见 `trajectory/session.ts` 的 `resolveAgentModel`。
+*/
+function hostAgentDefaultModel(ctx) {
+	return hostInjected(ctx, "agentDefaultModel");
+}
 //#endregion
 //#region src/kernel/ccc-roots.ts
 /**
@@ -239,4 +251,4 @@ async function listCccs(ctx, opts = {}) {
 	}));
 }
 //#endregion
-export { ccc_roots_exports as a, hostInjected as c, hostSettings as d, hostWeb as f, cccRootForExec as i, hostService as l, agentCwdFor as n, listCccs as o, hostWebServer as p, cccRootForCwd as r, hostAgents as s, NO_CCC_FROM_AGENT_CWD as t, hostSessions as u };
+export { ccc_roots_exports as a, hostAgents as c, hostSessions as d, hostSettings as f, cccRootForExec as i, hostInjected as l, hostWebServer as m, agentCwdFor as n, listCccs as o, hostWeb as p, cccRootForCwd as r, hostAgentDefaultModel as s, NO_CCC_FROM_AGENT_CWD as t, hostService as u };

package/lib/{channels-BItMJUO8.js → channels-bAiZlY07.js}

@@ -1,4 +1,4 @@
-import { d as hostSettings } from "./ccc-roots-BIdg0EyM.js";
+import { f as hostSettings } from "./ccc-roots-BPicjCsj.js";
 import { c as readWeixinSettings, o as readImSettings } from "./route-CmEoKp9w.js";
 import { isAbsolute, join, relative, resolve } from "node:path";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";

package/lib/host/access.d.ts

@@ -96,6 +96,36 @@ export declare function hostWeb(ctx: unknown): HostWeb | undefined;
  * （0.2.1-rc.1 起 `start` 消失、改由 `startActivation` 承担）。将来若再有委派需求，
  * 这份对照仍是唯一说明书 ⇒ **知识移到 `host/contract.ts` 的契约条目里，代码不留。**
  */
+/**
+ * `ctx.agentDefaultModel`（**刻意不进 `inject`**，v1.105.0）。
+ *
+ * 契约原文（`dsh-agent-default-model/lib/types/index.d.ts` 逐字）：
+ *   *"Default model selection for Agents created **without an explicit model**."*
+ * ⇒ **这正是「没指定时该用什么」的权威出处**，不该由我们另造一份真相源。
+ *
+ * 为什么不进 `inject`：它是**可选**服务 —— 进了 inject 就把"可选"变"必需"，
+ * 服务缺失会让整个 fiber 挂起（同 ACP 面 `resolveAcpSelection` 的既有裁决）。
+ * 本仓先例：`host/access.ts` 的教训 —— cordis 对未声明 inject 的服务名
+ * **直接属性读会抛错**，故必须走 `hostInjected`（先属性读、抛错回落 `ctx.get`）。
+ */
+interface HostAgentDefaultModel {
+    /** 返回 `{ provider, model, reasoningEffort? }`（detached） */
+    currentSelection?: () => {
+        provider?: string;
+        model?: string;
+        reasoningEffort?: string;
+    } | undefined;
+}
+/**
+ * 宿主默认模型选择（**没显式指定模型时**该用的那个）。
+ *
+ * 🔴 为什么需要这个读取器（v1.105.0，P0 回归修复）：
+ * `agents.create` **不传** `agentOptions` ⇒ `agent.options.model === undefined`
+ * ⇒ 宿主的 persona 模板 `powered by the {{model}} model` **严格插值抛错** ⇒ 整轮失败。
+ * ⇒ 「不传」不等于「安全」：**下游有依赖方要求这个值必须存在**。
+ * 详见 `trajectory/session.ts` 的 `resolveAgentModel`。
+ */
+export declare function hostAgentDefaultModel(ctx: unknown): HostAgentDefaultModel | undefined;
 /**
  * 会话 cwd 列表（live 会话；形状不符时返回空数组而非抛错）
  */

package/lib/index.js

@@ -1,12 +1,12 @@
 import { i as __toESM, n as __exportAll } from "./rolldown-runtime-B4iAMlE-.js";
-import { c as hostInjected, d as hostSettings, f as hostWeb, i as cccRootForExec, l as hostService, n as agentCwdFor, o as listCccs, p as hostWebServer, r as cccRootForCwd, s as hostAgents, t as NO_CCC_FROM_AGENT_CWD, u as hostSessions } from "./ccc-roots-BIdg0EyM.js";
+import { c as hostAgents, d as hostSessions, f as hostSettings, i as cccRootForExec, l as hostInjected, m as hostWebServer, n as agentCwdFor, o as listCccs, p as hostWeb, r as cccRootForCwd, t as NO_CCC_FROM_AGENT_CWD, u as hostService } from "./ccc-roots-BPicjCsj.js";
 import { a as findSerenityRoot$1, c as matchBlacklist, d as readCccName$1, g as resolveInside, i as findGitRoot, l as pathInside, m as readSafeModeHiddenTools, n as SAFE_MODE_MARKER, o as isSafeModeOn, p as readExclusiveTools, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-B-h_A7uc.js";
 import { A as namingTitleFor, B as summarize, C as createSession, E as getActiveSessionInfo, F as resolveSessionByTitle, G as readTrajectoryFile, H as useSession, I as sessionEvents, J as localHuman, K as isoLocal, L as sessionsRoot, M as parseTrajectoryCode, O as listActiveTrajectories, P as readTrajectoryUid, R as setActiveSessionInfo, S as clearActiveSessionInfo, T as findSession, U as TRAJECTORY_FILENAME, V as trajectoryDescOf, W as TRAJECTORY_LEGACY_FILENAMES, Y as localIdStamp, b as UID_FILENAME, c as replacesDefaultIdentity, i as listTrajectoryConstraints, j as parseSessionContextFromEvents, k as listSessions, l as trajectoryCodeForSession, n as findDirNameByCode, o as readTrajectoryConstraintAt, q as localFileStamp, r as isTrajectoryConstrained, s as readTrajectoryConstraintByCode, t as TRAJECTORY_CONSTRAINT_FILENAME, u as trajectoryConstraintForSession, v as COGNITIVE_TRAJECTORY_ACTIONS, w as extractSessionMdPathFromText, x as archiveSession, z as showSession } from "./profile-Dpg3wYO5.js";
 import { n as checkLocalstoreGitCompliance, o as readStore, s as runLocalStore, t as LOCALSTORE_SCOPES } from "./service-Cndtf7q4.js";
-import { _ as resolveConstraintSystemPrompt, a as listBoundSessionIds, d as constraintCognitiveTrajectory, f as constraintSystemPromptSource, g as profileWriteWhitelist, h as profileToolWhitelist, i as carrierState, l as TRAJECTORY_CONSTRAINT_HINT, n as PLUGIN_SOURCE, o as readLastBound, r as appendBound, s as resolveSessionCognitiveTrajectoryLabel, t as ACC_MESSAGE_KIND, v as ACC_VERSION, y as findPackageRoot } from "./message-source-CKJPJCzc.js";
-import { A as truncateContent, C as verifyTotpCode, D as buildResourceIndex, E as SKILL_ONTOLOGY_FILE, M as hasTrajectoryPrompt, O as buildResourceNameSuffix, S as MECHANISM_PORTS, T as REFERENCE_DIR, _ as projectKnownWorkspaces, a as trajectoryConstraintFor, b as verifyPassword, c as trajectoryWorkspaceMdPath, d as splitModel, f as registerCognitiveTrajectorySkillSection, g as migrateLegacyLocalstore, h as applyWirePatch, i as getTrajectoryAgent, j as TRAJECTORY_PROMPT_FILENAME, k as isSafeSkillName, l as unregisterTrajectorySession, m as registerEntrySkillSectionGlobal, n as deliverToTrajectory, o as trajectoryConstraintMsmGate, p as registerEntrySkillSection, r as ensureWorkspacePromptSection, s as trajectoryConstraintParticipates, t as createTrajectoryAgent, u as workspaceCognitiveTrajectoryLine, v as readAdvancedSettings, w as recordToolUsage, x as FACE_PORTS, y as toWire } from "./session-CaNqSHVB.js";
+import { _ as resolveConstraintSystemPrompt, a as listBoundSessionIds, d as constraintCognitiveTrajectory, f as constraintSystemPromptSource, g as profileWriteWhitelist, h as profileToolWhitelist, i as carrierState, l as TRAJECTORY_CONSTRAINT_HINT, n as PLUGIN_SOURCE, o as readLastBound, r as appendBound, s as resolveSessionCognitiveTrajectoryLabel, t as ACC_MESSAGE_KIND, v as ACC_VERSION, y as findPackageRoot } from "./message-source-DoVtXnoe.js";
+import { A as truncateContent, C as verifyTotpCode, D as buildResourceIndex, E as SKILL_ONTOLOGY_FILE, M as hasTrajectoryPrompt, O as buildResourceNameSuffix, S as MECHANISM_PORTS, T as REFERENCE_DIR, _ as projectKnownWorkspaces, a as trajectoryConstraintFor, b as verifyPassword, c as trajectoryWorkspaceMdPath, d as splitModel, f as registerCognitiveTrajectorySkillSection, g as migrateLegacyLocalstore, h as applyWirePatch, i as getTrajectoryAgent, j as TRAJECTORY_PROMPT_FILENAME, k as isSafeSkillName, l as unregisterTrajectorySession, m as registerEntrySkillSectionGlobal, n as deliverToTrajectory, o as trajectoryConstraintMsmGate, p as registerEntrySkillSection, r as ensureWorkspacePromptSection, s as trajectoryConstraintParticipates, t as createTrajectoryAgent, u as workspaceCognitiveTrajectoryLine, v as readAdvancedSettings, w as recordToolUsage, x as FACE_PORTS, y as toWire } from "./session-CYqyod3z.js";
 import { i as sessionsRootDir, n as findSessionLog, r as hasSessionLogById } from "./cleanup-CPl1SSaK.js";
-import { i as runImBridge, n as isImWiredTrajectory, o as readSimpleSettings, r as registerImChannel, s as registerSettingsSection, t as imChannelIds } from "./channels-BItMJUO8.js";
+import { i as runImBridge, n as isImWiredTrajectory, o as readSimpleSettings, r as registerImChannel, s as registerSettingsSection, t as imChannelIds } from "./channels-bAiZlY07.js";
 import { a as readFeishuCredential, c as readWeixinSettings, d as weixinInboundDir, f as weixinSessionIdForTrajectory, i as matchWeixinRoute, n as extractWeixinText, r as hasVoiceItem, s as readWeixinCredential, t as extractWeixinMedia, u as sanitizeFileName$1 } from "./route-CmEoKp9w.js";
 import { REGISTERED_TOOLS } from "./invariant.js";
 import { c as sendTextMessage, i as getUpdates, l as sendTyping, n as downloadMedia, o as markdownToPlainText, r as getConfig, s as sendFileMessage, t as TypingStatus, u as sniffImageExt } from "./ilink-CsZ-f64q.js";
@@ -19939,7 +19939,7 @@ const MEDIA_MAX_BYTES = 20971520;
 */
 async function resolveCccRootByAlias(ctx, alias) {
 	try {
-		const { listCccs } = await import("./ccc-roots-BIdg0EyM.js").then((n) => n.a);
+		const { listCccs } = await import("./ccc-roots-BPicjCsj.js").then((n) => n.a);
 		const entries = await listCccs(ctx);
 		const byName = entries.find((e) => e.name === alias);
 		if (byName) return byName.root;
@@ -20969,7 +20969,7 @@ function syncHumanChannel(ctx) {
 	(async () => {
 		try {
 			stopMachineLoops();
-			const { listCccs } = await import("./ccc-roots-BIdg0EyM.js").then((n) => n.a);
+			const { listCccs } = await import("./ccc-roots-BPicjCsj.js").then((n) => n.a);
 			for (const entry of await listCccs(ctx)) syncCccBridge(ctx, entry.root);
 		} catch {}
 	})();
@@ -21262,7 +21262,7 @@ function matchCcc(input, candidates) {
 }
 /** 组装候选列表（`ccc-roots.listCccs` 投影 + `.serenity` 名；动态 import 保持本模块静态依赖轻量） */
 async function collectCandidates(ctx) {
-	const { listCccs } = await import("./ccc-roots-BIdg0EyM.js").then((n) => n.a);
+	const { listCccs } = await import("./ccc-roots-BPicjCsj.js").then((n) => n.a);
 	const entries = await listCccs(ctx, { defaultRoot: process.cwd() });
 	const seen = /* @__PURE__ */ new Set();
 	const out = [];

package/lib/{message-source-CKJPJCzc.js → message-source-DoVtXnoe.js}

@@ -1,4 +1,4 @@
-import { r as cccRootForCwd } from "./ccc-roots-BIdg0EyM.js";
+import { r as cccRootForCwd } from "./ccc-roots-BPicjCsj.js";
 import { g as resolveInside, h as readUtf8 } from "./ccc-B-h_A7uc.js";
 import { D as getLastActiveSessionInfo, E as getActiveSessionInfo, I as sessionEvents, L as sessionsRoot, M as parseTrajectoryCode, _ as readBindDeclaration, g as listBindDeclarations, h as isBindUsable, m as claimBinding } from "./profile-Dpg3wYO5.js";
 import { dirname, join } from "node:path";

package/lib/{session-CaNqSHVB.js → session-CYqyod3z.js}

@@ -1,8 +1,8 @@
-import { n as agentCwdFor, r as cccRootForCwd, s as hostAgents } from "./ccc-roots-BIdg0EyM.js";
+import { c as hostAgents, n as agentCwdFor, r as cccRootForCwd, s as hostAgentDefaultModel } from "./ccc-roots-BPicjCsj.js";
 import { f as readCognitiveTrajectorySkills, h as readUtf8, o as isSafeModeOn, u as readBlacklist } from "./ccc-B-h_A7uc.js";
 import { K as isoLocal, L as sessionsRoot, N as readActiveSessionMd, d as registerTrajectorySession$1, f as trajectoryDirNameForSession, o as readTrajectoryConstraintAt, p as unregisterTrajectorySession$1, u as trajectoryConstraintForSession, y as DEFAULT_SESSION_SCOPE } from "./profile-Dpg3wYO5.js";
 import { a as readGitTrack, i as localstorePath } from "./service-Cndtf7q4.js";
-import { d as constraintCognitiveTrajectory, m as profileMsmWhitelist, n as PLUGIN_SOURCE, o as readLastBound, p as createProfilePromptReader, u as buildTrajectoryBasePrompt, v as ACC_VERSION } from "./message-source-CKJPJCzc.js";
+import { d as constraintCognitiveTrajectory, m as profileMsmWhitelist, n as PLUGIN_SOURCE, o as readLastBound, p as createProfilePromptReader, u as buildTrajectoryBasePrompt, v as ACC_VERSION } from "./message-source-DoVtXnoe.js";
 import { basename, dirname, join, resolve } from "node:path";
 import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
@@ -2228,6 +2228,52 @@ function ensureWorkspacePromptSection(agent, scope, root) {
 /** 轨迹约束 agent 挂载的 DSH preset（平台工具面由 preset 决定；白名单再按轨迹过滤） */
 const TRAJECTORY_PRESET = "standard";
 /**
+* 解析「这条轨迹的载体该用哪个模型」—— **不能只返回 `''`**（v1.105.0，P0 回归修复）。
+*
+* ## 上一版错在哪（v1.102.0 → v1.104.0 之间的真实故障）
+*
+* v1.102.0 我删掉了「未声明 model ⇒ 回落到全局默认模型」这条回落，理由是它会让轨迹
+* **静默跑在别人的模型上**（真机实证：两条 IM 路由都没声明 model，却跑在 minimax 上）。
+* 修法写成「没声明 ⇒ 不传 `agentOptions` ⇒ 交给宿主」。
+*
+* 🔴 **「不传」不等于「安全」** —— 这是当时的判断错误：
+*   宿主 `system-prompt` 的 persona 模板是 `You are a coding agent powered by the {{model}} model.`
+*   （`dsh-web-app/cordis.patch.yml` 逐字），而 `{{model}}` 是 **`agent.options.model`**
+*   （`dsh-agent-loop/lib/index.js:1592`）；
+*   **插值是严格的** —— `dsh-system-prompt/lib/index.js:177`：
+*     `if (value === void 0) throw new Error('prompt variable "{{model}}" has no value for this assembly')`
+*   ⇒ `agent.options.model === undefined` ⇒ **每一轮装配都抛错 ⇒ 该轨迹完全不可用**。
+*
+* 我当时只验了"`agents.create` 不传 `agentOptions` 是合法的"，
+* **没验下游有没有人要求这个值必须存在**（D256 同族：删之前先核谁在依赖）。
+*
+* ## 正确修法 = 回落到**宿主权威的默认值**，而不是回落到我们自己的某个配置
+*
+* 宿主契约逐字（`dsh-agent-default-model/lib/types/index.d.ts`）：
+*   *"Default model selection for Agents created **without an explicit model**."*
+* ⇒ 这正是「没指定时该用什么」的**权威出处** —— 拿它显式传下去，不是另造一份真相源
+* （这与 v1.58.1 修 ACP 面同一个报错时的做法一致：`resolveAcpSelection()`）。
+*
+* 与旧回落的关键区别（这是本次判断成立的依据）：
+*   · 旧回落读的是 **CCC 里某个工具段的配置**（`cheap-worker.defaultModel`）—— 那是**我们的**猜测，
+*     而且读的是**已退役**的段；
+*   · 新回落读的是 **宿主自己承认的默认** —— 用户在界面换模型它跟着变，**不是第二个真相源**。
+*
+* @returns `provider/model` 串；拿不到宿主默认时返回 `''`（此时仍不传 agentOptions —— 那种宿主
+*          自己也没有默认模型，结果是宿主自己的问题，不该由我们编一个值出来）。
+*/
+function resolveAgentModel(ctx, profile) {
+	const declared = profile.model?.trim();
+	if (declared) return declared;
+	try {
+		const sel = hostAgentDefaultModel(ctx)?.currentSelection?.();
+		const provider = typeof sel?.provider === "string" ? sel.provider.trim() : "";
+		const model = typeof sel?.model === "string" ? sel.model.trim() : "";
+		if (provider && model) return `${provider}/${model}`;
+	} catch {}
+	return "";
+}
+/**
 * 创建（或复用）一个 轨迹约束会话。
 *
 * **固定 sessionId 的 resume-or-create**（v1.27.2）：指定 sessionId 且磁盘已有持久化 log →
@@ -2239,7 +2285,7 @@ const TRAJECTORY_PRESET = "standard";
 */
 async function createTrajectoryAgent(ctx, root, profile, sessionId) {
 	if (!ctx.agents) throw new Error("trajectory constraint: ctx.agents unavailable");
-	const model = profile.model?.trim() ?? "";
+	const model = resolveAgentModel(ctx, profile);
 	const id = sessionId ?? `轨迹约束-${profile.code}-${randomUUID()}`;
 	const setup = async (agentCtx) => {
 		try {
@@ -2248,6 +2294,7 @@ async function createTrajectoryAgent(ctx, root, profile, sessionId) {
 	};
 	const handle = await createOrResumeAgent(ctx, id, root, model, setup, sessionId !== void 0);
 	const agent = handle.agent;
+	if (model === "") console.warn(`[serenity-hooks] ✗ 轨迹「${profile.code}」的载体没有可用模型：trajectory.json 未声明 model，宿主 agentDefaultModel 也取不到选择（服务缺失或 currentSelection() 返回空）⇒ 该轨迹每一轮都会以 prompt variable "{{model}}" has no value 失败。 修法：在 trajectory.json 里给这条轨迹写一个 model（provider/model），或修好宿主 agent-default-model 那一行的配置。`);
 	let readerPath = profile.systemPromptFile?.trim();
 	let reader = createProfilePromptReader(root, profile);
 	const livePrompt = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.104.0",
+  "version": "1.105.0",
   "description": "宁静号 ACC harness（Native Cordis 插件）——给 DeepSeek Harness 装一个「AI 工作区」：13 个工具（container_fs/cognitive_trajectory/dashboard/container_git/msm/praxis/ontology/serenity-skill-creator/localstore/container_admin；另三个 im-bridge/acc-diag/diagram 按配置条件出现）+ 机械约束（安全模式/工作区围墙/密钥守卫/对外输出守卫）+ 认知轨迹日志与原地重建 + 网页登录入口/IM 桥/认知轨迹唤醒注册表。轨迹声明 = 轨迹目录下的 trajectory.json（约束面 + 旧标识 uid + CRO 机器绑定 cro.host；旧名 trajectory-constraint.json / skiff.json 仍在读取族里）；轨迹提示词 = 轨迹目录下的 PROMPT.md（一条轨迹「是谁、按什么章程工作」，所有轨迹通用，追加在容器层与质量层之后，不替换它们）。适配 DSH 0.1.7-rc.1 / 0.2.0-rc.1 / 0.2.1-rc.1（三档）。",
   "license": "MIT",
   "repository": {