@shgroup/dsh-serenity-hooks 1.31.3 → 1.31.4

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-serenity-hooks",
-  "version": "1.31.3",
+  "version": "1.31.4",
   "main": "lib/index.js",
   "description": "宁静号 ACC harness（Native Cordis 插件）：给 DSH 装一个「AI 工作区」——11 个工具（container_fs/logbook/dashboard/container_git/msm/praxis/handyman/localstore/container_admin/autopilot-trajectory/im-bridge）+ 机械约束（安全模式/工作区围墙/密钥守卫）+ 工作日志与原地重建 + 网页登录入口/微信桥/子角色/对外问答页/自主巡航。适配 DSH 0.1.2-rc.1（deepseek-ai/deepseek-harness）。",
   "engines": {

package/lib/{access-BqtkTl9M.js → access-fiehjxV6.js}

@@ -23,10 +23,30 @@ function hostService(ctx, name) {
 		return;
 	}
 }
-/** 直接属性读取（injected 服务：`ctx.<name>`），属性缺失时回落 `ctx.get` */
+/**
+* 直接属性读取（injected 服务：`ctx.<name>`），属性缺失**或读取抛错**时回落 `ctx.get`。
+*
+* v1.31.4 修复（R↓，实证 v1.31.3 真机首测）：cordis 的 Context 是 Proxy，
+* `ReflectService.handler.get`（`vendor/cordis/src/reflect.ts`）对**未经 `inject` 声明**
+* 的服务名会沿 fiber 链查找，找不到时**抛错**而非返回 undefined：
+*
+*   cannot get property "<name>" without inject
+*
+* 于是"先直接属性读、失败回落 ctx.get"的写法在**真实 cordis** 下永远走不到回落分支——
+* 异常直接逃逸（`hostService` 的 try/catch 被绕过）。v1.31.3 的 `hostSubagents`
+* 正是这样炸的：`subagents` 是 lazy 服务（不在插件 `inject` 列表内）。
+* 现有 fake ctx 单测（普通对象无 getter）复现不了 → 真 cordis 用例见
+* `tests/host/cordis-access.test.ts`。
+*
+* 为什么吞掉异常而不是让它冒泡：本模块的契约是"服务缺失一律返回 undefined，**不抛错**"
+* （宿主对插件 apply 抛错 = 整个 dsh 启动失败）。读取失败 = 服务不可用，等价于缺失。
+*/
 function hostInjected(ctx, name) {
-	const direct = ctx?.[name];
-	if (direct !== void 0) return direct;
+	const c = ctx;
+	try {
+		const direct = c?.[name];
+		if (direct !== void 0) return direct;
+	} catch {}
 	return hostService(ctx, name);
 }
 /** `ctx.sessions`（injected） */

package/lib/host/access.d.ts

@@ -14,7 +14,24 @@
  */
 /** 通用读取：`ctx.get(name)`（含异常吞掉——服务 getter 抛错视为不可用） */
 export declare function hostService<T = unknown>(ctx: unknown, name: string): T | undefined;
-/** 直接属性读取（injected 服务：`ctx.<name>`），属性缺失时回落 `ctx.get` */
+/**
+ * 直接属性读取（injected 服务：`ctx.<name>`），属性缺失**或读取抛错**时回落 `ctx.get`。
+ *
+ * v1.31.4 修复（R↓，实证 v1.31.3 真机首测）：cordis 的 Context 是 Proxy，
+ * `ReflectService.handler.get`（`vendor/cordis/src/reflect.ts`）对**未经 `inject` 声明**
+ * 的服务名会沿 fiber 链查找，找不到时**抛错**而非返回 undefined：
+ *
+ *   cannot get property "<name>" without inject
+ *
+ * 于是"先直接属性读、失败回落 ctx.get"的写法在**真实 cordis** 下永远走不到回落分支——
+ * 异常直接逃逸（`hostService` 的 try/catch 被绕过）。v1.31.3 的 `hostSubagents`
+ * 正是这样炸的：`subagents` 是 lazy 服务（不在插件 `inject` 列表内）。
+ * 现有 fake ctx 单测（普通对象无 getter）复现不了 → 真 cordis 用例见
+ * `tests/host/cordis-access.test.ts`。
+ *
+ * 为什么吞掉异常而不是让它冒泡：本模块的契约是"服务缺失一律返回 undefined，**不抛错**"
+ * （宿主对插件 apply 抛错 = 整个 dsh 启动失败）。读取失败 = 服务不可用，等价于缺失。
+ */
 export declare function hostInjected<T = unknown>(ctx: unknown, name: string): T | undefined;
 export interface HostSessionLike {
     id?: string;
@@ -61,6 +78,9 @@ export declare function hostWeb(ctx: unknown): HostWeb | undefined;
  *
  * 形状对照宿主 rc.1：`SubagentRuntime.start(name, request)` → `SubagentRun`
  * （`result` / `dispose` / `id`）。本模块只做形状收口；语义与错误处理归调用方。
+ *
+ * 注（v1.31.4）：本服务**不在** dsp 的 `inject` 列表内，因此走 `hostInjected` 的
+ * 回落分支（`ctx.get`）——见 `hostInjected` 的 v1.31.4 说明与真实 cordis 用例。
  */
 export interface HostSubagents {
     start?: (name: string, request: unknown) => Promise<unknown>;

package/lib/index.js

@@ -1,11 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as findSerenityRoot, c as matchBlacklist, d as readCccName$2, f as readHandymanConfig, i as findGitRoot, l as pathInside, m as resolveInside, n as SAFE_MODE_MARKER, o as isSafeModeOn, r as classifyPath, s as loadSerenityConfig, t as DEFAULT_SERENITY_CONFIG_PATHS, u as readBlacklist } from "./ccc-DAsSHsub.js";
 import { a as readSkiffRoles, d as systemPromptSource, i as isSkiffSessionId, l as roleToolWhitelist, o as resolveRoleSystemPrompt } from "./skiff-role-BYvNnwv1.js";
-import { A as skiffRoleFor, C as listActiveHandymen, D as splitModel, E as requireWhitelistedModel, O as writeFailedStatus, S as handymanProgressPaths, T as readProgress, _ as unregisterSkiffSession, a as startSkiffDebugServer, b as HANDYMAN_GUIDE, c as askSkiff, d as ensureWorkspacePromptSection, f as getSkiffAgent, g as skiffTrajectoryEnabled, h as skiffSessionSnapshot, k as writeProgress, l as createSkiffAgent, m as skiffSessionInfo, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffMsmGate, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as ensureSkiffSession, v as workspaceTrajectoryLine, w as newStopToken, x as buildRoundPrompt, y as waitAgentIdle } from "./skiff-debug-sdGryydE.js";
-import { c as hostWebServer, i as hostSessions, n as hostInjected, o as hostSubagents, r as hostService, s as hostWeb, t as hostAgents } from "./access-BqtkTl9M.js";
+import { A as skiffRoleFor, C as listActiveHandymen, D as splitModel, E as requireWhitelistedModel, O as writeFailedStatus, S as handymanProgressPaths, T as readProgress, _ as unregisterSkiffSession, a as startSkiffDebugServer, b as HANDYMAN_GUIDE, c as askSkiff, d as ensureWorkspacePromptSection, f as getSkiffAgent, g as skiffTrajectoryEnabled, h as skiffSessionSnapshot, k as writeProgress, l as createSkiffAgent, m as skiffSessionInfo, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffMsmGate, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as ensureSkiffSession, v as workspaceTrajectoryLine, w as newStopToken, x as buildRoundPrompt, y as waitAgentIdle } from "./skiff-debug-B445WY23.js";
+import { c as hostWebServer, i as hostSessions, n as hostInjected, o as hostSubagents, r as hostService, s as hostWeb, t as hostAgents } from "./access-fiehjxV6.js";
 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-wWk4AIwV.js";
 import { C as useSession, S as summarize, _ as resolveSessionByTitle, a as archiveSessions, b as setActiveSessionInfo, c as createSession, d as getActiveSessionInfo, f as healthCheck, g as readActiveSessionMd, h as qaCheck, i as SESSION_ACTIONS, l as extractSessionMdPathFromText, m as parseSessionContextFromEvents, n as readLastBound, o as clearActiveSessionInfo, p as listSessions, r as DEFAULT_SESSION_SCOPE, s as closeSession, t as appendBound, u as findSession, v as sessionEvents, x as showSession, y as sessionsRoot } from "./session-bound-BpTayaIS.js";
-import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-BxoNXUqk.js";
+import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-01rTVq6v.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-PjEhmjlZ.js";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -3070,7 +3070,7 @@ async function runForegroundJob(ctx, opts) {
 	const { task, label, model, models, parent, signal } = opts;
 	requireWhitelistedModel(model, models);
 	const subagents = hostSubagents(ctx);
-	if (!subagents?.start) throw new Error("handyman foreground: host subagents service unavailable (ctx.subagents.start missing) — use mode=\"background\" (does not need this service) or check the host-contract report");
+	if (!subagents?.start) throw new Error("handyman foreground: host subagents service unavailable — neither ctx.subagents nor ctx.get(\"subagents\") yielded a start() function. Check `dashboard health` (host-contract section, service \"subagents\"); mode=\"background\" does not need this service and still works.");
 	if (!parent) throw new Error("handyman foreground: requires a calling agent (exec.agent was undefined)");
 	const { provider, model: modelName } = splitModel(model);
 	const run = await subagents.start("spawn", {
@@ -6999,7 +6999,7 @@ function registerStatusApi(ctx, opts = {}) {
 					workspace: url.searchParams.get("workspace") ?? void 0
 				});
 				const root = findSerenityRoot(workspace) ?? "";
-				const { discoverCccs } = await import("./skiff-debug-sdGryydE.js").then((n) => n.i);
+				const { discoverCccs } = await import("./skiff-debug-B445WY23.js").then((n) => n.i);
 				sendJson$2(res, 200, { cccs: await discoverCccs(ctx, root) });
 			} catch (err) {
 				sendJson$2(res, 400, { error: err.message ?? String(err) });
@@ -7029,7 +7029,7 @@ function registerStatusApi(ctx, opts = {}) {
 					return;
 				}
 				const settings = readAdvancedSettings();
-				const { readSimpleSettings } = await import("./settings-section-BxoNXUqk.js").then((n) => n.r);
+				const { readSimpleSettings } = await import("./settings-section-01rTVq6v.js").then((n) => n.r);
 				const simple = readSimpleSettings();
 				const allowed = settings.publicAsk.allowed;
 				const port = simple.acpHttpPort ?? 3100;
@@ -10604,7 +10604,7 @@ function matchCcc(input, candidates) {
 }
 /** 组装候选列表（discoverCccs 投影 + `.serenity` 名；动态 import 保持本模块静态依赖轻量） */
 async function collectCandidates(ctx) {
-	const { discoverCccs } = await import("./skiff-debug-sdGryydE.js").then((n) => n.i);
+	const { discoverCccs } = await import("./skiff-debug-B445WY23.js").then((n) => n.i);
 	const entries = await discoverCccs(ctx, process.cwd());
 	const seen = /* @__PURE__ */ new Set();
 	const out = [];

package/lib/{settings-section-BxoNXUqk.js → settings-section-01rTVq6v.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as hostSettings } from "./access-BqtkTl9M.js";
+import { a as hostSettings } from "./access-fiehjxV6.js";
 import z from "@deepseek-ai/schemastery";
 //#region src/settings-section.ts
 var settings_section_exports = /* @__PURE__ */ __exportAll({

package/lib/{skiff-debug-sdGryydE.js → skiff-debug-B445WY23.js}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as findSerenityRoot, f as readHandymanConfig } from "./ccc-DAsSHsub.js";
 import { a as readSkiffRoles, c as roleMsmWhitelist, f as trajectorySubset, i as isSkiffSessionId, n as buildSkiffBasePrompt, o as resolveRoleSystemPrompt, r as createRolePromptReader, s as resolveSkiffKind } from "./skiff-role-BYvNnwv1.js";
-import { i as hostSessions, r as hostService, t as hostAgents } from "./access-BqtkTl9M.js";
+import { i as hostSessions, r as hostService, t as hostAgents } from "./access-fiehjxV6.js";
 import { b as setActiveSessionInfo, c as createSession, d as getActiveSessionInfo, n as readLastBound, t as appendBound } from "./session-bound-BpTayaIS.js";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";

package/package.json

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