@shgroup/dsh-serenity-hooks 1.59.5 → 1.61.0

package/dsh.plugin.json

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

package/lib/host/contract.d.ts

@@ -23,6 +23,17 @@ type HostAccess = 'injected' | 'lazy';
 interface HostMember {
     name: string;
     kind: 'function' | 'value';
+    /**
+     * 成员所属的「互斥族」标签（可选）。**同族成员满足任一即可**。
+     *
+     * 🔴 为什么需要（v1.61，S151 2026-10-17 报告）：
+     *   宿主会**给同一个能力改名**并保留旧名作回退。`subagents` 就是实例：
+     *   `0.2.1-rc.*+` 的正门叫 `startActivation`，`start` 仅作旧宿主回退
+     *   （`tools/cheap-worker.ts` 的 `resolveSubagentStarter()` 是**双路**的）。
+     *   若契约把某一个具体名字钉成"必须有"，宿主改名后 ⇒ **探针报假故障，而功能是好的**。
+     *   ⇒ 判据必须是「**这一族里至少有一个能用**」，不是「这个名字必须在」。
+     */
+    anyOf?: string;
 }
 interface HostServiceContract {
     /** 稳定标识（报告用） */

package/lib/index.js

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { c as hostInjected, d as hostSessions, f as hostSettings, h as hostWebServer, i as cccRootForExec, l as hostLlm, m as hostWeb, n as agentCwdFor, o as listCccs, p as hostSubagents, r as cccRootForCwd, s as hostAgents, t as NO_CCC_FROM_AGENT_CWD, u as hostService } from "./ccc-roots-GIJ3A_tw.js";
 import { _ as resolveInside, a as findSerenityRoot$1, c as matchBlacklist, d as readCccName$1, f as readCheapWorkerConfig, h as readTrajectorySkills, 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-B0ZGL9lx.js";
-import { A as localIdStamp, C as setActiveSessionInfo, D as isoLocal, E as useSession, O as localFileStamp, S as sessionsRoot, T as summarize, _ as namingTitleFor, a as pruneMissingBindings, b as resolveSessionByTitle, c as setBindingStore, d as clearActiveSessionInfo, f as createSession, g as listSessions, h as getActiveSessionInfo, i as listBoundSessionIds, k as localHuman, l as DEFAULT_SESSION_SCOPE, m as findSession, n as PLUGIN_SOURCE, o as readLastBound, p as extractSessionMdPathFromText, r as appendBound, s as resolveSessionTrajectoryLabel, t as ACC_MESSAGE_KIND, u as TRAJECTORY_ACTIONS, v as parseSessionContextFromEvents, w as showSession, x as sessionEvents$1, y as readActiveSessionMd } from "./message-source-B4P3Uw6D.js";
+import { A as localIdStamp, C as setActiveSessionInfo, D as isoLocal, E as useSession, O as localFileStamp, S as sessionsRoot, T as summarize, _ as namingTitleFor, a as pruneMissingBindings, b as resolveSessionByTitle, c as setBindingStore, d as clearActiveSessionInfo, f as createSession, g as listSessions, h as getActiveSessionInfo, i as listBoundSessionIds, k as localHuman, l as DEFAULT_SESSION_SCOPE, m as findSession, n as PLUGIN_SOURCE, o as readLastBound, p as extractSessionMdPathFromText, r as appendBound, s as resolveSessionTrajectoryLabel, u as TRAJECTORY_ACTIONS, v as parseSessionContextFromEvents, w as showSession, x as sessionEvents$1, y as readActiveSessionMd } from "./message-source-B4P3Uw6D.js";
 import { a as readGitTrack, c as unsetEntry, i as localstorePath, l as writeEntry, n as checkLocalstoreGitCompliance, o as readStore, r as getEntry, s as runLocalStore, t as LOCALSTORE_SCOPES } from "./localstore-ops-DMs_ovHo.js";
 import { a as FACE_PORTS, c as MECHANISM_PORTS, d as registerSkiffSession$1, f as skiffRoleFor$1, h as ACC_VERSION, i as ACP_PORT, l as SKIFF_DEBUG_PORT, m as unregisterSkiffSession$1, n as readSimpleSettings, o as GATEWAY_PORT, p as skiffSessionInfo$1, r as registerSettingsSection, s as MAIN_WEB_PORT, u as WEIXIN_SEND_PORT } from "./settings-section-DGUQZo5j.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-B615L9MV.js";
@@ -14101,6 +14101,88 @@ const DEFAULT_ANCHOR_MESSAGES = ["You are the operator agent of Serenity — a c
 function hasUserMessageHistory(session) {
 	return sessionEvents$1(session).some((event) => event.type === "user/message");
 }
+/** 造出来的 assistant 回复正文。锚定轮要求"只回确认、不做事"。 */
+const ANCHOR_ACK_TEXT = "acknowledge";
+/** 占位 system 文本：宿主 `SystemPromptProjection.project()` 会把它**原地 replace** 成真提示词。 */
+const ANCHOR_SYSTEM_PLACEHOLDER = "<!-- serenity:anchor-placeholder -->";
+/**
+* 把两轮 first-anchor 对话**直接写进会话日志**，取代原来的「真跑两轮」。
+*
+* ## 为什么可以这样（三条取证，全部打在真 `@deepseek-ai/dsh-session` 上）
+*
+* 1. **system 必须是 surface node 0**，而 `agent/pre-step` 跑在宿主提交 system **之前**
+*    ⇒ 若直接写 [anchor…]，system 会被追加到**末尾**（实测：`systemAtIndex: 4`，
+*    且**不报错**、静默走偏）。解法 = **先写一条占位 system**：宿主随后看到 node0
+*    已有 system 且文本不同 ⇒ 走 `replace(head)` 换成真提示词，锚定历史原样留在其后。
+* 2. **`contentGeneration` 只在 replace 时涨，append 不涨**；而 `buildRequest()`
+*    取 generation 快照**晚于** `systemPrompt.project()` ⇒ 那次 replace 不会被
+*    误判成「系列断裂」（不会误触发 `startsSeries`）。
+* 3. **造出来的 `assistant/message` 合法**：`stream: []` 通过校验；整段历史之后
+*    仍可被 compaction 的 `surfaceOp: replace` 整体覆盖（不炸）。
+*
+* ## ⚠️ 为什么不发 turn/start、turn/end
+*
+* 宿主的 turn 计数是**构造时缓存**的：`phase.lastTurn` 在本钩子触发前已读定（0），
+* 之后 `turn()` 恒用 `phase.turn + 1`。我们若自己发 `turn/start{1}{2}`，宿主随后
+* 仍会再发一条 `turn/start{1}` ⇒ **重复编号 ∧ 两个 turn 同时开着**。
+* ⇒ 只给消息打 **turn 标签**（模型可见顺序不依赖 turn 事件，`deriveMessages` 只看
+* surface 节点），**不碰宿主的 turn 账本**。
+*
+* @param session 会话（需有 append）
+* @param provider 当前路由 provider（写入 assistant 消息来源）
+* @param model 当前模型 id
+* @returns 是否成功写入
+*/
+function appendAnchorHistory(session, provider, model, anchorMessages = DEFAULT_ANCHOR_MESSAGES) {
+	const target = session;
+	if (typeof target?.append !== "function") return false;
+	const append = target.append.bind(target);
+	const rid = (prefix) => `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
+	append("system/message", {
+		turn: 1,
+		step: 1,
+		message: {
+			id: rid("anchor-system"),
+			role: "system",
+			content: [{
+				type: "text",
+				text: ANCHOR_SYSTEM_PLACEHOLDER
+			}],
+			source: { kind: "system-prompt" }
+		}
+	}, { surfaceOp: "append" });
+	for (let i = 0; i < anchorMessages.length; i++) {
+		const turn = i + 1;
+		append("user/message", {
+			id: rid(`anchor-user-${turn}`),
+			role: "user",
+			content: [{
+				type: "text",
+				text: anchorMessages[i]
+			}],
+			source: { kind: "user" }
+		}, { surfaceOp: "append" });
+		append("assistant/message", {
+			turn,
+			step: 1,
+			message: {
+				id: rid(`anchor-assistant-${turn}`),
+				role: "assistant",
+				content: [{
+					type: "text",
+					text: ANCHOR_ACK_TEXT
+				}],
+				source: {
+					kind: "model",
+					provider,
+					model
+				}
+			},
+			stream: []
+		}, { surfaceOp: "append" });
+	}
+	return true;
+}
 /**
 * 构建一个 epoch 感知晋升跟踪器（纯逻辑，可单测）。
 * requiredSignals：晋升所需信号数（boundary 后累计；默认 1）。
@@ -14213,9 +14295,16 @@ const PROMOTE_EVENTS = {
 	"assistant-message": /* @__PURE__ */ new Set(["assistant/message"]),
 	either: /* @__PURE__ */ new Set(["tool/call", "assistant/message"])
 };
-/** 协议固有 bootstrap 设置：zeroTools=true（首请求 0 工具纯文字锚定轮）、
-*  晋升信号仅 assistant/message（对齐 zero-anchored-standard）、
-*  requiredSignals = 锚定轮数（2 条消息 → 2 条回复后晋升）。无参——零配置面。 */
+/** 协议固有 bootstrap 设置：**zeroTools=false**（v1.60 起）。
+*
+* 🔴 **为什么从 true 改成 false**（owner 令 2026-10-17，造历史取代真跑）：
+*   锚定历史现在**直接写进日志**，因此 `assistant/message` 晋升信号在首请求前
+*   就已满足 ⇒ `boundary < 0` 分支实际不可达。但**不能依赖"恰好满足"这个副作用**：
+*   若哪天锚定历史没写成（例如非 CCC 会话/异常降级），`zeroTools: true` 会退回到
+*   「首请求 0 工具」，那是**另一种**退化。显式关掉 ⇒ 任何情况下首请求都拿完整目录。
+*
+* ⚠️ 这意味着 `bootstrapTools` 窄化也随之失效 —— 它的作用本来就是"首请求窄目录"，
+*   而造历史的目的正是**取消这个断点**。保留字段只为不破坏旧测试的引用面。 */
 function resolveBootstrapSettings() {
 	return {
 		bootstrapTools: [...DEFAULT_BOOTSTRAP_TOOLS],
@@ -14224,7 +14313,7 @@ function resolveBootstrapSettings() {
 		suppressedSources: new Set(DEFAULT_SUPPRESSED_SOURCES),
 		compactionTools: [...DEFAULT_COMPACTION_TOOLS],
 		anchorMessages: [...DEFAULT_ANCHOR_MESSAGES],
-		zeroTools: true
+		zeroTools: false
 	};
 }
 /**
@@ -14276,23 +14365,11 @@ function registerBootstrap(ctx) {
 				if (hasUserMessageHistory(session)) return;
 			} else if (sid !== void 0 && anchoredSessions.has(sid)) return;
 			if (message?.source?.kind === "plugin:dsh-serenity-hooks") return;
-			const inbox = agent.inbox;
-			if (!inbox?.prepend) return;
-			for (let i = SETTINGS.anchorMessages.length - 1; i >= 0; i--) inbox.prepend("next-turn", {
-				id: `bootstrap-anchor-${Date.now()}-${Math.random().toString(36).slice(2, 8)}-${i}`,
-				role: "user",
-				content: [{
-					type: "text",
-					text: SETTINGS.anchorMessages[i]
-				}],
-				source: {
-					kind: ACC_MESSAGE_KIND,
-					form: "notice",
-					summary: "bootstrap anchor turn"
-				}
-			});
-			if (sid !== void 0) anchoredSessions.add(sid);
-			warnOnce(`anchor turns injected: ${SETTINGS.anchorMessages.length} 条（${SETTINGS.anchorMessages[0].slice(0, 40)}…）`);
+			const route = agent.options;
+			const wrote = appendAnchorHistory(session, typeof route?.provider === "string" ? route.provider : "unknown", typeof route?.model === "string" ? route.model : "unknown");
+			if (wrote && sid !== void 0) anchoredSessions.add(sid);
+			if (wrote) warnOnce(`anchor history fabricated: ${SETTINGS.anchorMessages.length} 轮（不再真跑）`);
+			return;
 		} catch {}
 	});
 	let warned = false;
@@ -14330,11 +14407,11 @@ function registerBootstrap(ctx) {
 					tools: tools.filter((tool) => typeof tool.name === "string" && keep.has(tool.name))
 				};
 			}
-			const keep = new Set(SETTINGS.bootstrapTools);
-			if (status.boundary >= 0) for (const toolName of SETTINGS.compactionTools) keep.add(toolName);
+			if (status.boundary < 0) return assembled;
+			const keep = new Set(SETTINGS.compactionTools);
 			const missing = [...keep].filter((name) => !available.has(name));
 			if (missing.length > 0) {
-				warnOnce(`expected bootstrap tools missing=${JSON.stringify(missing)} — bootstrap disabled, full catalog exposed`);
+				warnOnce(`expected compaction tools missing=${JSON.stringify(missing)} — bootstrap disabled, full catalog exposed`);
 				return assembled;
 			}
 			return {
@@ -16141,8 +16218,13 @@ const HOST_SERVICES = [
 		name: "subagents",
 		access: "lazy",
 		members: [{
+			name: "startActivation",
+			kind: "function",
+			anyOf: "spawn-starter"
+		}, {
 			name: "start",
-			kind: "function"
+			kind: "function",
+			anyOf: "spawn-starter"
 		}],
 		impact: "cheap-worker 委派不可用（前台委派的正门，响亮报错）",
 		required: false
@@ -16388,13 +16470,30 @@ function probeHostContract(ctx, hostVersion = null) {
 		for (const member of svc.members) {
 			checked += 1;
 			const actual = value[member.name];
-			if (!(member.kind === "function" ? typeof actual === "function" : actual !== void 0)) issues.push({
-				id: `${svc.id}.${member.name}`,
-				kind: "member",
-				detail: `service "${svc.name}" is missing ${member.kind} "${member.name}"`,
-				impact: svc.impact,
-				required: svc.required
-			});
+			if (!(member.kind === "function" ? typeof actual === "function" : actual !== void 0)) {
+				if (member.anyOf !== void 0) {
+					const siblings = svc.members.filter((m) => m.anyOf === member.anyOf);
+					if (siblings.some((m) => {
+						const v = value[m.name];
+						return m.kind === "function" ? typeof v === "function" : v !== void 0;
+					})) continue;
+					issues.push({
+						id: `${svc.id}.${member.anyOf}`,
+						kind: "member",
+						detail: `service "${svc.name}" is missing every ${member.kind} of "${member.anyOf}" (${siblings.map((m) => m.name).join(" | ")})`,
+						impact: svc.impact,
+						required: svc.required
+					});
+					continue;
+				}
+				issues.push({
+					id: `${svc.id}.${member.name}`,
+					kind: "member",
+					detail: `service "${svc.name}" is missing ${member.kind} "${member.name}"`,
+					impact: svc.impact,
+					required: svc.required
+				});
+			}
 		}
 	}
 	const version = checkHostVersion(hostVersion);

package/lib/seams/bootstrap.d.ts

@@ -59,6 +59,35 @@ export declare const DEFAULT_ANCHOR_MESSAGES: string[];
  * 统一经 sessionEvents() 读取（snapshotEvents() 优先，.events 兜底）。
  */
 export declare function hasUserMessageHistory(session: unknown): boolean;
+/**
+ * 把两轮 first-anchor 对话**直接写进会话日志**，取代原来的「真跑两轮」。
+ *
+ * ## 为什么可以这样（三条取证，全部打在真 `@deepseek-ai/dsh-session` 上）
+ *
+ * 1. **system 必须是 surface node 0**，而 `agent/pre-step` 跑在宿主提交 system **之前**
+ *    ⇒ 若直接写 [anchor…]，system 会被追加到**末尾**（实测：`systemAtIndex: 4`，
+ *    且**不报错**、静默走偏）。解法 = **先写一条占位 system**：宿主随后看到 node0
+ *    已有 system 且文本不同 ⇒ 走 `replace(head)` 换成真提示词，锚定历史原样留在其后。
+ * 2. **`contentGeneration` 只在 replace 时涨，append 不涨**；而 `buildRequest()`
+ *    取 generation 快照**晚于** `systemPrompt.project()` ⇒ 那次 replace 不会被
+ *    误判成「系列断裂」（不会误触发 `startsSeries`）。
+ * 3. **造出来的 `assistant/message` 合法**：`stream: []` 通过校验；整段历史之后
+ *    仍可被 compaction 的 `surfaceOp: replace` 整体覆盖（不炸）。
+ *
+ * ## ⚠️ 为什么不发 turn/start、turn/end
+ *
+ * 宿主的 turn 计数是**构造时缓存**的：`phase.lastTurn` 在本钩子触发前已读定（0），
+ * 之后 `turn()` 恒用 `phase.turn + 1`。我们若自己发 `turn/start{1}{2}`，宿主随后
+ * 仍会再发一条 `turn/start{1}` ⇒ **重复编号 ∧ 两个 turn 同时开着**。
+ * ⇒ 只给消息打 **turn 标签**（模型可见顺序不依赖 turn 事件，`deriveMessages` 只看
+ * surface 节点），**不碰宿主的 turn 账本**。
+ *
+ * @param session 会话（需有 append）
+ * @param provider 当前路由 provider（写入 assistant 消息来源）
+ * @param model 当前模型 id
+ * @returns 是否成功写入
+ */
+export declare function appendAnchorHistory(session: unknown, provider: string, model: string, anchorMessages?: string[]): boolean;
 interface PromotionStatus {
     /** 最后一次 compaction/end 的 seq（-1 = 未压缩过） */
     boundary: number;
@@ -85,9 +114,16 @@ interface PromotionTracker {
  * 通常 ≤ 2 < 默认兜底 3，不受影响。
  */
 export declare function createEpochPromotion(promoteEvents: Set<'tool/call' | 'assistant/message'>, requiredSignals?: number, maxRoundsFallback?: number): PromotionTracker;
-/** 协议固有 bootstrap 设置：zeroTools=true（首请求 0 工具纯文字锚定轮）、
- *  晋升信号仅 assistant/message（对齐 zero-anchored-standard）、
- *  requiredSignals = 锚定轮数（2 条消息 → 2 条回复后晋升）。无参——零配置面。 */
+/** 协议固有 bootstrap 设置：**zeroTools=false**（v1.60 起）。
+ *
+ * 🔴 **为什么从 true 改成 false**（owner 令 2026-10-17，造历史取代真跑）：
+ *   锚定历史现在**直接写进日志**，因此 `assistant/message` 晋升信号在首请求前
+ *   就已满足 ⇒ `boundary < 0` 分支实际不可达。但**不能依赖"恰好满足"这个副作用**：
+ *   若哪天锚定历史没写成（例如非 CCC 会话/异常降级），`zeroTools: true` 会退回到
+ *   「首请求 0 工具」，那是**另一种**退化。显式关掉 ⇒ 任何情况下首请求都拿完整目录。
+ *
+ * ⚠️ 这意味着 `bootstrapTools` 窄化也随之失效 —— 它的作用本来就是"首请求窄目录"，
+ *   而造历史的目的正是**取消这个断点**。保留字段只为不破坏旧测试的引用面。 */
 export declare function resolveBootstrapSettings(): BootstrapSettings;
 export declare function registerBootstrap(ctx: Context): void;
 export {};

package/package.json

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