@shgroup/dsh-serenity-hooks 1.30.11 → 1.30.12

package/cordis.patch.yml

@@ -1,8 +1,28 @@
 # dsh-serenity-hooks bundle 层（经 package.json `dsh.bundle.patch` 声明）
 # 装入 profile（`dsh plugin --profile <name> add @shgroup/dsh-serenity-hooks`）
 # 后由 profile-boot 组合：行 name 即包名，Loader 从 profile node_modules 解析。
+#
+# patch 语义（宿主 app-boot `applyEntryPatches` 实证，0.1.2-rc.1）：
+#   - `insert:` 追加条目；无 id 追加到根，有 id 追加到该 group 的 config
+#   - 无 insert 的行按 id 定向覆盖字段（`config` 为**整体替换**，非深合并）
+#   - 未命中的 patch 只告警跳过（宿主换版本时不会炸）
+#   - 各 bundle 的 patch 与本 profile 的 cordis.patch.yml 被**展平成一个列表**按序应用
+#     （本包在 bundles 末尾 → 其 patch 在所有宿主 bundle 之后生效）
 - insert:
     - id: serenity-hooks
       name: '@shgroup/dsh-serenity-hooks'
       config:
         serenityConfigPaths: ['.dsh/serenity.json', '.opencode/serenity.json']
+
+# ── v1.30.12（S142 用户拍板 L3）：web_fetch 在 fake-ip/TUN 网络下恒失败 ────────────
+# 宿主内置 provider `@deepseek-ai/dsh-web-fetch-http` 用 ipaddr.js 判「公网单播」，
+# 而本网络 DNS 走 Clash fake-ip（域名→198.18.0.0/15，实证 cdn.jsdelivr.net→198.18.1.85）
+# → 恒抛 WEB_BLOCKED_URL，且该包 Config 无开关（只有 5 个配额字段）。
+# 屏蔽：禁用宿主内置 provider，改由本插件注册的 provider 接管**同一 id**（`http`，
+# HttpFetchProvider 的实例字段 LOCAL_FETCH_PROVIDER_ID）——宿主 `web` 的既有配置
+# `fetchProvider: http` 因此无需改动（也就不会覆盖 searchProvider）。
+# 需要恢复宿主原行为：把下面两行删除或改 `disabled: false`，并同时关掉插件配置
+# `serenity-hooks.webFetch.enabled`（否则会 WEB_DUPLICATE_PROVIDER）。
+- id: web-fetch-http
+  name: '@deepseek-ai/dsh-web-fetch-http'
+  disabled: true

package/dsh.plugin.json

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

package/lib/{access-CdL6BAYj.js → access-dU_vG1q8.js}

@@ -45,5 +45,9 @@ function hostWebServer(ctx) {
 function hostSettings(ctx) {
 	return hostInjected(ctx, "settings");
 }
+/** `ctx.web`（injected；v1.30.12 web_fetch provider 注册通道） */
+function hostWeb(ctx) {
+	return hostInjected(ctx, "web");
+}
 //#endregion
-export { hostSettings as a, hostSessions as i, hostInjected as n, hostWebServer as o, hostService as r, hostAgents as t };
+export { hostSettings as a, hostSessions as i, hostInjected as n, hostWeb as o, hostService as r, hostWebServer as s, hostAgents as t };

package/lib/host/access.d.ts

@@ -41,6 +41,11 @@ export interface HostWebServer {
 export interface HostSettings {
     installSection?: (...args: unknown[]) => unknown;
 }
+/** `ctx.web`（injected；v1.30.12：fetch provider 注册通道） */
+export interface HostWeb {
+    registerFetchProvider?: (provider: unknown) => unknown;
+    registerSearchProvider?: (provider: unknown) => unknown;
+}
 /** `ctx.sessions`（injected） */
 export declare function hostSessions(ctx: unknown): HostSessions | undefined;
 /** `ctx.agents`（injected） */
@@ -49,5 +54,7 @@ export declare function hostAgents(ctx: unknown): HostAgents | undefined;
 export declare function hostWebServer(ctx: unknown): HostWebServer | undefined;
 /** `ctx.settings`（injected；提供 settings 面板装配通道） */
 export declare function hostSettings(ctx: unknown): HostSettings | undefined;
+/** `ctx.web`（injected；v1.30.12 web_fetch provider 注册通道） */
+export declare function hostWeb(ctx: unknown): HostWeb | undefined;
 /** 会话 cwd 列表（live 会话；形状不符时返回空数组而非抛错） */
 export declare function hostSessionCwds(ctx: unknown): string[];

package/lib/index.d.ts

@@ -60,6 +60,10 @@ export interface Config {
         enabled?: boolean;
         httpPort?: number;
     };
+    /** v1.30.12 web_fetch provider 接管（fake-ip / TUN 网络：宿主内置 provider 判「非公网」恒拒） */
+    webFetch?: {
+        enabled?: boolean;
+    };
 }
 export declare const Config: z<Config>;
 export declare function apply(ctx: Context, config: Config): void;

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 resolveRoleSystemPrompt, i as readSkiffRoles, l as systemPromptSource, r as isSkiffSessionId, s as roleToolWhitelist } from "./skiff-role-DlrbHPLD.js";
-import { C as newStopToken, D as writeFailedStatus, E as splitModel, O as writeProgress, S as listActiveHandymen, T as requireWhitelistedModel, _ as workspaceTrajectoryLine, a as startSkiffDebugServer, b as buildRoundPrompt, c as askSkiff, d as getSkiffAgent, f as skiffMsmGate, g as unregisterSkiffSession, h as skiffTrajectoryEnabled, k as skiffRoleFor, l as createSkiffAgent, m as skiffSessionSnapshot, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffSessionInfo, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as ensureSkiffSession, v as waitAgentIdle, w as readProgress, x as handymanProgressPaths, y as HANDYMAN_GUIDE } from "./skiff-debug-TONJlpgF.js";
-import { i as hostSessions, n as hostInjected, o as hostWebServer, r as hostService, t as hostAgents } from "./access-CdL6BAYj.js";
+import { C as newStopToken, D as writeFailedStatus, E as splitModel, O as writeProgress, S as listActiveHandymen, T as requireWhitelistedModel, _ as workspaceTrajectoryLine, a as startSkiffDebugServer, b as buildRoundPrompt, c as askSkiff, d as getSkiffAgent, f as skiffMsmGate, g as unregisterSkiffSession, h as skiffTrajectoryEnabled, k as skiffRoleFor, l as createSkiffAgent, m as skiffSessionSnapshot, n as jscSafeJsonText, o as stopSkiffDebugServer, p as skiffSessionInfo, r as renderSkiffMarkdown, s as stripThink, t as discoverCccs, u as ensureSkiffSession, v as waitAgentIdle, w as readProgress, x as handymanProgressPaths, y as HANDYMAN_GUIDE } from "./skiff-debug-CizJBLeZ.js";
+import { i as hostSessions, n as hostInjected, o as hostWeb, r as hostService, s as hostWebServer, t as hostAgents } from "./access-dU_vG1q8.js";
 import { a as readWeixinCredential, c as weixinInboundDir, d as LOCALSTORE_SCOPES, f as checkLocalstoreGitCompliance, h as runLocalStore, 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-BD_yYAZz.js";
 import { C as summarize, S as showSession, _ as readActiveSessionMd, a as archiveSessions, b as sessionsRoot, c as createSession, d as findSession, f as getActiveSessionInfo, g as qaCheck, h as parseSessionContextFromEvents, i as SESSION_ACTIONS, l as extractSessionMdPathFromText, m as listSessions, n as readLastBound, o as clearActiveSessionInfo, p as healthCheck, r as DEFAULT_SESSION_SCOPE, s as closeSession, t as appendBound, u as findLatestActiveSessionMd, v as resolveSessionByTitle, w as useSession, x as setActiveSessionInfo, y as sessionEvents } from "./session-bound-D2ANqVn-.js";
-import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-BPk0e1du.js";
+import { n as registerSettingsSection, t as readSimpleSettings } from "./settings-section-CP4uMJf_.js";
 import { a as markdownToPlainText, c as sniffImageExt, i as getUpdates, n as downloadMedia, o as sendTextMessage, r as getConfig, s as sendTyping, t as TypingStatus } from "./weixin-api-BMpljodH.js";
 import z from "@deepseek-ai/schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
@@ -21,6 +21,8 @@ import { createHmac, randomBytes, randomUUID, scryptSync, timingSafeEqual } from
 import { createServer, request } from "node:http";
 import * as zlib from "node:zlib";
 import { deriveEventMessage } from "@deepseek-ai/dsh-session";
+import { lookup } from "node:dns/promises";
+import { isIP } from "node:net";
 //#region src/fs-ops.ts
 /**
 * fs-ops.ts — container_fs 纯操作层（cc_fs → container_fs，v1.30；零 DSH 依赖，可独立单测）
@@ -914,6 +916,17 @@ const HOST_SERVICES = [
 		impact: "设置面板不安装 → 所有开关静默 no-op",
 		required: true
 	},
+	{
+		id: "web",
+		name: "web",
+		access: "injected",
+		members: [{
+			name: "registerFetchProvider",
+			kind: "function"
+		}],
+		impact: "web_fetch provider 无法注册 → fake-ip 网络下 web_fetch 不可用",
+		required: false
+	},
 	{
 		id: "systemPrompt",
 		name: "systemPrompt",
@@ -6465,7 +6478,7 @@ function registerStatusApi(ctx, opts = {}) {
 					workspace: url.searchParams.get("workspace") ?? void 0
 				});
 				const root = findSerenityRoot(workspace) ?? "";
-				const { discoverCccs } = await import("./skiff-debug-TONJlpgF.js").then((n) => n.i);
+				const { discoverCccs } = await import("./skiff-debug-CizJBLeZ.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) });
@@ -6495,7 +6508,7 @@ function registerStatusApi(ctx, opts = {}) {
 					return;
 				}
 				const settings = readAdvancedSettings();
-				const { readSimpleSettings } = await import("./settings-section-BPk0e1du.js").then((n) => n.r);
+				const { readSimpleSettings } = await import("./settings-section-CP4uMJf_.js").then((n) => n.r);
 				const simple = readSimpleSettings();
 				const allowed = settings.publicAsk.allowed;
 				const port = simple.acpHttpPort ?? 3100;
@@ -9872,7 +9885,7 @@ function matchCcc(input, candidates) {
 }
 /** 组装候选列表（discoverCccs 投影 + `.serenity` 名；动态 import 保持本模块静态依赖轻量） */
 async function collectCandidates(ctx) {
-	const { discoverCccs } = await import("./skiff-debug-TONJlpgF.js").then((n) => n.i);
+	const { discoverCccs } = await import("./skiff-debug-CizJBLeZ.js").then((n) => n.i);
 	const entries = await discoverCccs(ctx, process.cwd());
 	const seen = /* @__PURE__ */ new Set();
 	const out = [];
@@ -10145,6 +10158,197 @@ function registerLifecycle(ctx) {
 	registerDisposer(ctx, "self-started resources (skiff-debug/acp/weixin)", disposeAll);
 }
 //#endregion
+//#region src/web-fetch-provider.ts
+/**
+* web-fetch-provider.ts — fake-ip / TUN 网络下的 web_fetch provider（v1.30.12，S142）
+*
+* 问题（用户报告 + 实证）：`web_fetch` 在本机恒失败，报
+*   `URL hostname "X" resolves to a non-public IP address`（`WEB_BLOCKED_URL`）。
+* 根因不是 DSH 误判，而是**本地 DNS 在说谎**：Clash/mihomo 的 fake-ip 让所有域名解析到
+* 198.18.0.0/15（实证 `cdn.jsdelivr.net → 198.18.1.85`），而宿主的
+* `@deepseek-ai/dsh-web-fetch-http` 用 `ipaddr.js` 判定 `range() === "unicast"`，
+* 该段属 reserved → 无条件 throw（其 Config 只有 5 个配额字段，**没有开关**）。
+*
+* 方案（用户拍板 L3）：ACC 自己注册一个 fetch provider——**复用宿主的 HttpFetchProvider**
+* （重定向策略/字节与字符配额/字符集解码/连接固定全部继承），只替换 `resolveAddresses`：
+* 「必须公网单播」→「公网单播 **或** fake-ip 段」。其余私网段（loopback / link-local /
+* RFC1918 / CGNAT / 云元数据 169.254.169.254 / ULA / 组播）**依旧拒绝**。
+*
+* 屏蔽（用户要求「屏蔽掉 dsh 自身注册的」）：宿主内置的 `web-fetch-http` 插件由本包的
+* `cordis.patch.yml`（bundle patch 层）`disabled: true` 关闭——两者都注册 id `http`
+* （`LOCAL_FETCH_PROVIDER_ID`，HttpFetchProvider 的实例字段），同时存在会
+* `WEB_DUPLICATE_PROVIDER`；禁用后由本模块的实例接管同一 id，宿主 `web` 的既有
+* 配置 `fetchProvider: http` 无需改动（**不改宿主的 web 配置对象**，避免覆盖 searchProvider）。
+*
+* 边界：本模块只放宽「地址可达性」一条判据；URL 校验（协议/凭据/长度）、同源重定向、
+* 配额、二进制拒绝全部仍由宿主实现执行。
+*/
+/**
+* 与宿主 `WebError` 同形的最小错误（带机器可路由的 `code`）。
+*
+* 为什么不 import 宿主的 WebError：宿主 peer 包在测试环境不可解析（现有测试全部
+* `vi.mock('@deepseek-ai/dsh-tools')` 同因），而 `dsh-tool-web` 只渲染 `error.message`、
+* 不判 `instanceof`——因此本地错误对象足以满足契约，且让本模块零运行时宿主依赖。
+*/
+function fetchError(message, code) {
+	const error = new Error(message);
+	error.code = code;
+	return error;
+}
+/**
+* 传输与配额上限。
+*
+* 值镜像 `@deepseek-ai/dsh-web-fetch-http` 的 Config 默认值（该包 README 的字段表；
+* 它不导出解析后的默认值，`Config` 是 schemastery schema 而非结果）。`userAgent`
+* 运行时取该包导出的 `DEFAULT_USER_AGENT`（单一真相源，不复制字符串）。
+*/
+const FETCH_LIMIT_DEFAULTS = {
+	maxResponseBytes: 5e6,
+	maxBodyChars: 1e5,
+	timeoutMs: 3e4,
+	maxRedirects: 5
+};
+/** Clash/mihomo fake-ip 默认段 198.18.0.0/15（可配 fake-ip-range；改配置需同步此常量） */
+const FAKE_IP_OCTET_A = 198;
+const FAKE_IP_OCTET_B_MIN = 18;
+const FAKE_IP_OCTET_B_MAX = 19;
+/** 去掉 IPv6 字面量的方括号（`[::1]` → `::1`） */
+function stripBrackets(hostname) {
+	return hostname.startsWith("[") && hostname.endsWith("]") ? hostname.slice(1, -1) : hostname;
+}
+function octets(address) {
+	const parts = address.split(".");
+	if (parts.length !== 4) return null;
+	const nums = parts.map((p) => /^\d{1,3}$/.test(p) ? Number(p) : NaN);
+	const [a, b, c, d] = nums;
+	if (a === void 0 || b === void 0 || c === void 0 || d === void 0) return null;
+	if (nums.some((n) => !Number.isInteger(n) || n < 0 || n > 255)) return null;
+	return [
+		a,
+		b,
+		c,
+		d
+	];
+}
+/** 公网单播 IPv4（拒绝全部保留/私网段——与宿主判定口径一致，只额外放行 fake-ip） */
+function isPublicV4(address) {
+	const parsed = octets(address);
+	if (parsed === null) return false;
+	const [a, b] = parsed;
+	if (a === 0 || a === 10 || a === 127) return false;
+	if (a === 100 && b >= 64 && b <= 127) return false;
+	if (a === 169 && b === 254) return false;
+	if (a === 172 && b >= 16 && b <= 31) return false;
+	if (a === 192 && b === 168) return false;
+	if (a === 192 && b === 0) return false;
+	if (a === 198 && (b === 18 || b === 19)) return false;
+	if (a === 198 && b === 51) return false;
+	if (a === 203 && b === 0) return false;
+	if (a >= 224) return false;
+	return true;
+}
+/** fake-ip 段判定（198.18.0.0/15） */
+function isFakeIpV4(address) {
+	const parsed = octets(address);
+	if (parsed === null) return false;
+	const [a, b] = parsed;
+	return a === FAKE_IP_OCTET_A && b >= FAKE_IP_OCTET_B_MIN && b <= FAKE_IP_OCTET_B_MAX;
+}
+/**
+* 公网单播 IPv6：只接受全局单播 2000::/3；IPv4-mapped（`::ffff:a.b.c.d`）按内嵌 IPv4 判定。
+* 其余（`::1` / `::` / ULA fc00::/7 / link-local fe80::/10 / 组播 ff00::/8 / v4-translated）一律拒绝。
+*/
+function isPublicV6(address) {
+	const lower = address.toLowerCase();
+	const mapped = /^::ffff:(\d{1,3}(?:\.\d{1,3}){3})$/.exec(lower);
+	if (mapped?.[1] !== void 0) return isPublicV4(mapped[1]);
+	const first = lower.split(":")[0] ?? "";
+	if (first === "") return false;
+	const value = Number.parseInt(first, 16);
+	if (!Number.isInteger(value)) return false;
+	return value >= 8192 && value <= 16383;
+}
+/** 该地址是否允许被抓取：公网单播 **或** fake-ip 段 */
+function isAllowedFetchAddress(address) {
+	const bare = stripBrackets(address);
+	const family = isIP(bare);
+	if (family === 4) return isPublicV4(bare) || isFakeIpV4(bare);
+	if (family === 6) return isPublicV6(bare);
+	return false;
+}
+/**
+* 解析并校验地址集合（宿主 `HttpFetchResolver` 契约）。
+*
+* 语义与宿主 `resolvePublicAddresses` 一致——**任一地址不合法即整体拒绝**（防 DNS 重绑定），
+* 仅判据从「公网单播」放宽为 `isAllowedFetchAddress`。
+*/
+const resolveAllowedAddresses = async (hostname, signal) => {
+	const bare = stripBrackets(hostname);
+	const literalFamily = isIP(bare);
+	let resolved;
+	if (literalFamily === 0) resolved = await lookupAll(bare, signal);
+	else resolved = [{
+		address: bare,
+		family: literalFamily
+	}];
+	if (resolved.length === 0) throw fetchError(`hostname "${hostname}" resolved to no addresses`, "WEB_PROVIDER_ERROR");
+	const addresses = [];
+	for (const entry of resolved) {
+		if (entry.family !== 4 && entry.family !== 6) throw fetchError(`hostname "${hostname}" resolved to an invalid IP address`, "WEB_PROVIDER_ERROR");
+		if (isIP(entry.address) !== entry.family) throw fetchError(`hostname "${hostname}" resolved to an invalid IP address`, "WEB_PROVIDER_ERROR");
+		if (!isAllowedFetchAddress(entry.address)) throw fetchError(`URL hostname "${hostname}" resolves to a non-public IP address`, "WEB_BLOCKED_URL");
+		addresses.push({
+			address: entry.address,
+			family: entry.family
+		});
+	}
+	return addresses;
+};
+/** `dns.lookup` 的 `all` 形态 + 信号中断（宿主同款语义：OS 查询可能无谓完成） */
+async function lookupAll(hostname, signal) {
+	if (signal.aborted) throw fetchError("web fetch aborted", "WEB_ABORTED");
+	const lookupPromise = lookup(hostname, {
+		all: true,
+		order: "verbatim"
+	});
+	const aborted = new Promise((_, reject) => {
+		signal.addEventListener("abort", () => reject(fetchError("web fetch aborted", "WEB_ABORTED")), { once: true });
+	});
+	try {
+		return (await Promise.race([lookupPromise, aborted])).map((e) => ({
+			address: e.address,
+			family: e.family
+		}));
+	} finally {
+		lookupPromise.catch(() => void 0);
+	}
+}
+/**
+* 注册接管 `http` id 的 fetch provider（宿主内置 provider 由本包 bundle patch 禁用）。
+*
+* 后端包 `@deepseek-ai/dsh-web-fetch-http` 用**动态 import**：宿主版本里若没有该包，
+* 只降级为一条告警（绝不因缺一个可选后端而让整机启动失败——apply 抛错 = dsh 启动失败）。
+* 失败一律响亮但不抛错。
+*/
+async function registerWebFetchProvider(ctx) {
+	const web = hostWeb(ctx);
+	if (typeof web?.registerFetchProvider !== "function") {
+		console.warn("[serenity-hooks] ✗ web fetch provider 未注册：宿主 web 服务不可用（web_fetch 退回宿主默认实现）");
+		return;
+	}
+	try {
+		const backend = await import("@deepseek-ai/dsh-web-fetch-http");
+		const limits = {
+			...FETCH_LIMIT_DEFAULTS,
+			userAgent: backend.DEFAULT_USER_AGENT
+		};
+		web.registerFetchProvider(new backend.HttpFetchProvider(limits, resolveAllowedAddresses));
+		console.log(`[serenity-hooks] ✓ web fetch provider 已接管（id=${backend.LOCAL_FETCH_PROVIDER_ID}，额外放行 fake-ip 段 198.18.0.0/15）`);
+	} catch (error) {
+		console.error(`[serenity-hooks] ✗ web fetch provider 注册失败（web_fetch 将不可用）: ${String(error?.message ?? error)}`);
+	}
+}
+//#endregion
 //#region src/index.ts
 const name = "dsh-serenity-hooks";
 /** 主动调用的服务；其余（agent 事件）随 harness 装配必然存在
@@ -10159,7 +10363,8 @@ const inject = [
 	"agents",
 	"systemPrompt",
 	"sessionProjections",
-	"settings"
+	"settings",
+	"web"
 ];
 const Config = z.object({
 	serenityConfigPaths: z.array(z.string()).default([...DEFAULT_SERENITY_CONFIG_PATHS]),
@@ -10185,7 +10390,8 @@ const Config = z.object({
 	acp: z.object({
 		enabled: z.boolean().default(false),
 		httpPort: z.number().min(1024).max(65535).default(3100)
-	})
+	}),
+	webFetch: z.object({ enabled: z.boolean().default(true) })
 });
 function apply(ctx, config) {
 	try {
@@ -10232,6 +10438,7 @@ function apply(ctx, config) {
 	registerWeixinBridge(ctx);
 	registerWeixinSendApi(ctx);
 	registerLifecycle(ctx);
+	if (config.webFetch?.enabled !== false) registerWebFetchProvider(ctx);
 }
 /**
 * F4 Skiff 调试服务装配：启停 = 人工（设置面板 Skiff 区块开关，settings 持久化）。

package/lib/{settings-section-BPk0e1du.js → settings-section-CP4uMJf_.js}

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

package/lib/{skiff-debug-TONJlpgF.js → skiff-debug-CizJBLeZ.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 resolveRoleSystemPrompt, i as readSkiffRoles, n as buildSkiffBasePrompt, o as roleMsmWhitelist, r as isSkiffSessionId, u as trajectorySubset } from "./skiff-role-DlrbHPLD.js";
-import { i as hostSessions, r as hostService, t as hostAgents } from "./access-CdL6BAYj.js";
+import { i as hostSessions, r as hostService, t as hostAgents } from "./access-dU_vG1q8.js";
 import { c as createSession, f as getActiveSessionInfo, n as readLastBound, t as appendBound, x as setActiveSessionInfo } from "./session-bound-D2ANqVn-.js";
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { basename, join } from "node:path";

package/lib/web-fetch-provider.d.ts

@@ -0,0 +1,73 @@
+/**
+ * web-fetch-provider.ts — fake-ip / TUN 网络下的 web_fetch provider（v1.30.12，S142）
+ *
+ * 问题（用户报告 + 实证）：`web_fetch` 在本机恒失败，报
+ *   `URL hostname "X" resolves to a non-public IP address`（`WEB_BLOCKED_URL`）。
+ * 根因不是 DSH 误判，而是**本地 DNS 在说谎**：Clash/mihomo 的 fake-ip 让所有域名解析到
+ * 198.18.0.0/15（实证 `cdn.jsdelivr.net → 198.18.1.85`），而宿主的
+ * `@deepseek-ai/dsh-web-fetch-http` 用 `ipaddr.js` 判定 `range() === "unicast"`，
+ * 该段属 reserved → 无条件 throw（其 Config 只有 5 个配额字段，**没有开关**）。
+ *
+ * 方案（用户拍板 L3）：ACC 自己注册一个 fetch provider——**复用宿主的 HttpFetchProvider**
+ * （重定向策略/字节与字符配额/字符集解码/连接固定全部继承），只替换 `resolveAddresses`：
+ * 「必须公网单播」→「公网单播 **或** fake-ip 段」。其余私网段（loopback / link-local /
+ * RFC1918 / CGNAT / 云元数据 169.254.169.254 / ULA / 组播）**依旧拒绝**。
+ *
+ * 屏蔽（用户要求「屏蔽掉 dsh 自身注册的」）：宿主内置的 `web-fetch-http` 插件由本包的
+ * `cordis.patch.yml`（bundle patch 层）`disabled: true` 关闭——两者都注册 id `http`
+ * （`LOCAL_FETCH_PROVIDER_ID`，HttpFetchProvider 的实例字段），同时存在会
+ * `WEB_DUPLICATE_PROVIDER`；禁用后由本模块的实例接管同一 id，宿主 `web` 的既有
+ * 配置 `fetchProvider: http` 无需改动（**不改宿主的 web 配置对象**，避免覆盖 searchProvider）。
+ *
+ * 边界：本模块只放宽「地址可达性」一条判据；URL 校验（协议/凭据/长度）、同源重定向、
+ * 配额、二进制拒绝全部仍由宿主实现执行。
+ */
+import type { Context } from 'cordis';
+import type { HttpFetchResolver } from '@deepseek-ai/dsh-web-fetch-http';
+/**
+ * 与宿主 `WebError` 同形的最小错误（带机器可路由的 `code`）。
+ *
+ * 为什么不 import 宿主的 WebError：宿主 peer 包在测试环境不可解析（现有测试全部
+ * `vi.mock('@deepseek-ai/dsh-tools')` 同因），而 `dsh-tool-web` 只渲染 `error.message`、
+ * 不判 `instanceof`——因此本地错误对象足以满足契约，且让本模块零运行时宿主依赖。
+ */
+export declare function fetchError(message: string, code: string): Error;
+/**
+ * 传输与配额上限。
+ *
+ * 值镜像 `@deepseek-ai/dsh-web-fetch-http` 的 Config 默认值（该包 README 的字段表；
+ * 它不导出解析后的默认值，`Config` 是 schemastery schema 而非结果）。`userAgent`
+ * 运行时取该包导出的 `DEFAULT_USER_AGENT`（单一真相源，不复制字符串）。
+ */
+export declare const FETCH_LIMIT_DEFAULTS: {
+    readonly maxResponseBytes: 5000000;
+    readonly maxBodyChars: 100000;
+    readonly timeoutMs: 30000;
+    readonly maxRedirects: 5;
+};
+/** 公网单播 IPv4（拒绝全部保留/私网段——与宿主判定口径一致，只额外放行 fake-ip） */
+export declare function isPublicV4(address: string): boolean;
+/** fake-ip 段判定（198.18.0.0/15） */
+export declare function isFakeIpV4(address: string): boolean;
+/**
+ * 公网单播 IPv6：只接受全局单播 2000::/3；IPv4-mapped（`::ffff:a.b.c.d`）按内嵌 IPv4 判定。
+ * 其余（`::1` / `::` / ULA fc00::/7 / link-local fe80::/10 / 组播 ff00::/8 / v4-translated）一律拒绝。
+ */
+export declare function isPublicV6(address: string): boolean;
+/** 该地址是否允许被抓取：公网单播 **或** fake-ip 段 */
+export declare function isAllowedFetchAddress(address: string): boolean;
+/**
+ * 解析并校验地址集合（宿主 `HttpFetchResolver` 契约）。
+ *
+ * 语义与宿主 `resolvePublicAddresses` 一致——**任一地址不合法即整体拒绝**（防 DNS 重绑定），
+ * 仅判据从「公网单播」放宽为 `isAllowedFetchAddress`。
+ */
+export declare const resolveAllowedAddresses: HttpFetchResolver;
+/**
+ * 注册接管 `http` id 的 fetch provider（宿主内置 provider 由本包 bundle patch 禁用）。
+ *
+ * 后端包 `@deepseek-ai/dsh-web-fetch-http` 用**动态 import**：宿主版本里若没有该包，
+ * 只降级为一条告警（绝不因缺一个可选后端而让整机启动失败——apply 抛错 = dsh 启动失败）。
+ * 失败一律响亮但不抛错。
+ */
+export declare function registerWebFetchProvider(ctx: Context): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shgroup/dsh-serenity-hooks",
-  "version": "1.30.11",
+  "version": "1.30.12",
   "description": "宁静号 ACC harness（Native Cordis 插件）——给 DeepSeek Harness 装一个「AI 工作区」：10 个工具（container_fs/logbook/dashboard/container_git/msm/praxis/handyman/localstore/container_admin/autopilot-trajectory）+ 机械约束（安全模式/工作区围墙/密钥守卫/对外输出守卫）+ 工作日志与原地重建 + 网页登录入口/微信桥/子角色/对外问答页/自主巡航。适配 DSH 0.1.2-rc.1。",
   "license": "MIT",
   "repository": {
@@ -65,6 +65,8 @@
     "@deepseek-ai/dsh-skill": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-system-prompt": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-tools": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-web": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-web-fetch-http": "^0.1.2-rc.1",
     "@deepseek-ai/schemastery": "^3.18.1",
     "cordis": "^4.0.0-rc.7",
     "@deepseek-ai/cordis": "^4.0.0-rc.7"
@@ -87,6 +89,9 @@
     },
     "@deepseek-ai/dsh-compaction": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-web-fetch-http": {
+      "optional": true
     }
   },
   "devDependencies": {