dsh-web-fetch-enhanced 0.0.1 → 0.0.3

package/README.en.md

@@ -53,7 +53,7 @@ dsh plugin --profile web add link:/absolute/path/to/dsh-web-fetch-enhanced
 
 Open DSH Web and go to:
 
-**Settings → Plugins → Configurable plugins → Enhanced web fetch allowlist**
+**Settings → Plugins → Configurable plugins → Web Fetch Enhanced**
 
 Expand the card and enter one network per line under **Allowed CIDRs**. For a typical Clash / Mihomo fake-IP setup:
 
@@ -178,7 +178,7 @@ Most users only need the two allowlists exposed in DSH Web. Manage other values
 | `maxRedirects` | `5` | Maximum same-origin redirect hops; `0` disables following |
 | `userAgent` | `dsh-web-fetch-enhanced/0.1.0` | User-Agent sent with each request |
 
-The default bundle uses the separate `http-enhanced` provider ID and leaves the native `http` provider installed. For manual composition or drop-in replacement, see:
+The default bundle uses the separate `http-enhanced` provider ID and explicitly disables the native `web-fetch-http` provider to avoid `WEB_PROVIDER_AMBIGUOUS` when subsequent Web plugins (such as search plugins) overwrite `id: web` configuration and unpin `fetchProvider`. For manual composition or drop-in replacement, see:
 
 - [coexisting provider example](examples/coexist.cordis.yml)
 - [drop-in replacement example](examples/drop-in.cordis.yml)

package/README.md

@@ -53,7 +53,7 @@ dsh plugin --profile web add link:/absolute/path/to/dsh-web-fetch-enhanced
 
 打开 DSH Web，进入：
 
-**设置 → 插件 → 可配置插件 → WebFetch白名单**
+**设置 → 插件 → 可配置插件 → Web Fetch Enhanced**
 
 展开卡片，在“允许的 CIDR”中每行填写一个网段。例如 Clash / Mihomo 的常见 Fake-IP 配置：
 
@@ -178,7 +178,7 @@ wiki.corp.example
 | `maxRedirects` | `5` | 同源重定向最大跳数；`0` 表示不跟随 |
 | `userAgent` | `dsh-web-fetch-enhanced/0.1.0` | 每个请求使用的 User-Agent |
 
-默认安装采用独立的 `http-enhanced` provider ID，并保留原生 `http` provider。需要手动组合或 drop-in 替换时，参考：
+默认安装（通过 bundle `cordis.patch.yml`）采用独立的 `http-enhanced` provider ID，并显式禁用原生的 `web-fetch-http`，以避免后续其他 Web 插件（如 search 插件）覆盖 `id: web` 的 config 时因 `fetchProvider` 变成未指定而触发 `WEB_PROVIDER_AMBIGUOUS`。需要自定义组合或 drop-in 替换时，参考：
 
 - [独立 provider 示例](examples/coexist.cordis.yml)
 - [drop-in 替换示例](examples/drop-in.cordis.yml)

package/cordis.patch.yml

@@ -1,9 +1,10 @@
 # Optional Profile Bundle: select the enhanced HTTP fetch provider on the Host plane.
-# This layer is applied after @deepseek-ai/dsh-base. A patch replaces a row's
-# entire config, so both WebRuntime selector fields are restated here.
+# Disable the native HTTP fetch provider to avoid WEB_PROVIDER_AMBIGUOUS when fetchProvider is unpinned by later bundles.
+- id: web-fetch-http
+  disabled: true
+
 - id: web
   config:
-    searchProvider: deepseek-official
     fetchProvider: http-enhanced
 
 - insert:

package/docs/design.zh-CN.md

@@ -47,13 +47,13 @@ flowchart LR
 <code>ctx.web</code> 的选择是 ID 驱动而不是注册顺序驱动：
 
 - 配置 <code>fetchProvider: http-enhanced</code> 时只选择本插件默认 ID；
-- 保留原生 <code>http</code> provider 不会产生歧义，因为选择已显式固定；
+- 默认 bundle 会在 Profile 中显式禁用原生的 <code>web-fetch-http</code>，从而在多 Web 插件（如 search 插件）覆盖 <code>id: web</code> config 导致 <code>fetchProvider</code> 未固定时，系统只存在唯一的可用 fetch provider，避免 <code>WEB_PROVIDER_AMBIGUOUS</code>；
 - 未配置 ID 且存在多个可用 provider 时会报 <code>WEB_PROVIDER_AMBIGUOUS</code>；
 - 两个 provider 注册相同 ID 会立即报 <code>WEB_DUPLICATE_PROVIDER</code>。
 
 所以“覆盖原生”有两种明确模式：
 
-1. 推荐模式：本插件使用 <code>http-enhanced</code>，修改现有 web 行的 <code>fetchProvider</code>；
+1. 推荐模式：本插件使用 <code>http-enhanced</code>，修改现有 web 行的 <code>fetchProvider</code> 并禁用原生 <code>web-fetch-http</code>（由随包附带的 <code>cordis.patch.yml</code> 自动处理）；
 2. drop-in 模式：禁用原生 provider，本插件配置 <code>providerId: http</code>。
 
 不存在 last-wins 或自动 fallback。

package/examples/drop-in.cordis.yml

@@ -1,8 +1,6 @@
 # Profile user patch after installing the bundle, retaining fetchProvider: http.
-# A patch replaces a row's whole config, so both WebRuntime fields are restated.
 - id: web
   config:
-    searchProvider: deepseek-official
     fetchProvider: http
 
 # The native provider MUST be disabled to avoid duplicate provider id "http".

package/examples/manual.cordis.patch.yml

@@ -1,8 +1,10 @@
 # Manual Host overlay when the package is resolvable but its dsh.bundle layer
 # is not active. Bundle users should use coexist.cordis.yml instead.
+- id: web-fetch-http
+  disabled: true
+
 - id: web
   config:
-    searchProvider: deepseek-official
     fetchProvider: http-enhanced
 
 - insert:

package/lib/client.js

@@ -256,7 +256,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region lib/types/client/locales.js
 		const en = {
-			title: "Enhanced web fetch allowlist",
+			title: "Web Fetch Enhanced",
 			description: "Allow selected non-public destinations for web_fetch. Public addresses remain available by default.",
 			expand: "Expand",
 			collapse: "Collapse",
@@ -279,7 +279,7 @@ window.__ModuleLoader__.load({
 			blank: "Blank entries are ignored."
 		};
 		const zh = {
-			title: "WebFetch白名单",
+			title: "Web Fetch Enhanced",
 			description: "允许 web_fetch 访问指定的非公网目标；公网地址默认仍可正常访问。",
 			expand: "展开",
 			collapse: "折叠",

package/lib/index.js

@@ -1,5 +1,4 @@
 import z from "@deepseek-ai/schemastery";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { isIP } from "node:net";
 import ipaddr from "ipaddr.js";
 import { WebError } from "@deepseek-ai/dsh-web";
@@ -552,12 +551,14 @@ function translateAbortOrNetwork(error, signal) {
 * @module dsh-web-fetch-enhanced
 */
 const MAX_NODE_TIMER_DELAY_MS = 2147483647;
+const FIBER_DISPOSED = 4;
+const FIBER_UNLOADING = 5;
 /** Explicit product User-Agent used by default. */
 const DEFAULT_USER_AGENT = "dsh-web-fetch-enhanced/0.1.0";
 /** Default provider id; select it in the dsh-web row with fetchProvider. */
 const DEFAULT_PROVIDER_ID = "http-enhanced";
 /** Settings namespace paired with the Web Profile configuration card. */
-const SETTINGS_NAMESPACE = settingsNamespace("web-fetch-enhanced");
+const SETTINGS_NAMESPACE = "web-fetch-enhanced";
 /** Cordis plugin name used by loader diagnostics. */
 const name = "web-fetch-enhanced";
 /** The web seam this provider contributes to. */
@@ -593,19 +594,41 @@ function createProvider(config = {}) {
 	};
 	return new EnhancedHttpFetchProvider(resolved.providerId, limits, createAllowlistResolver(policy));
 }
+function isUnloading(ctx) {
+	const state = ctx.fiber?.state;
+	return state === FIBER_UNLOADING || state === FIBER_DISPOSED;
+}
 /** Register the enhanced fetch provider and its live Web Profile settings section. */
 function apply(ctx, config) {
 	const providerId = resolveConfig(config).providerId;
 	let current = () => config;
-	installSettingsSection(ctx, SETTINGS_NAMESPACE, Config, config, {
-		setSource: (source) => {
-			current = source;
-		},
-		onChange: () => {},
-		validate: (value) => {
-			if (resolveConfig(value).providerId !== providerId) throw new Error("web-fetch-enhanced: providerId cannot be changed through live settings");
-			createProvider(value);
+	ctx.inject(["settings"], (settingsCtx) => {
+		const settings = settingsCtx.settings;
+		if (typeof settings.installSection === "function") {
+			settings.installSection(ctx, SETTINGS_NAMESPACE, Config, config, {
+				setSource: (source) => {
+					current = source;
+				},
+				onChange: () => {},
+				validate: (value) => {
+					if (resolveConfig(value).providerId !== providerId) throw new Error("web-fetch-enhanced: providerId cannot be changed through live settings");
+					createProvider(value);
+				}
+			});
+			return;
 		}
+		const scope = settings.register(SETTINGS_NAMESPACE, Config, {
+			base: config,
+			validate: (value) => {
+				if (resolveConfig(value).providerId !== providerId) throw new Error("web-fetch-enhanced: providerId cannot be changed through live settings");
+				createProvider(value);
+			}
+		});
+		current = () => scope.get();
+		settingsCtx.effect(() => () => {
+			if (isUnloading(ctx)) return;
+			current = () => config;
+		});
 	});
 	const dynamicProvider = {
 		id: providerId,

package/lib/types/client/locales.d.ts

@@ -1,5 +1,5 @@
 export declare const en: {
-    readonly title: "Enhanced web fetch allowlist";
+    readonly title: "Web Fetch Enhanced";
     readonly description: "Allow selected non-public destinations for web_fetch. Public addresses remain available by default.";
     readonly expand: "Expand";
     readonly collapse: "Collapse";

package/lib/types/index.d.ts

@@ -6,13 +6,14 @@
  */
 import type { Context } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
+import type { SettingsNamespace } from '@deepseek-ai/dsh-settings';
 import { EnhancedHttpFetchProvider } from './provider.ts';
 /** Explicit product User-Agent used by default. */
 export declare const DEFAULT_USER_AGENT = "dsh-web-fetch-enhanced/0.1.0";
 /** Default provider id; select it in the dsh-web row with fetchProvider. */
 export declare const DEFAULT_PROVIDER_ID = "http-enhanced";
 /** Settings namespace paired with the Web Profile configuration card. */
-export declare const SETTINGS_NAMESPACE: import("@deepseek-ai/dsh-settings").SettingsNamespace;
+export declare const SETTINGS_NAMESPACE: SettingsNamespace;
 /** Cordis plugin name used by loader diagnostics. */
 export declare const name = "web-fetch-enhanced";
 /** The web seam this provider contributes to. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-web-fetch-enhanced",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Configurable non-public address allowlists for DeepSeek Harness web_fetch",
   "type": "module",
   "main": "./lib/index.js",
@@ -68,19 +68,19 @@
     "node": "^22.19.0 || >=24.0.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-timeout": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.2 || ^0.1.2-alpha.1",
-    "@deepseek-ai/dsh-web": "^0.1.1-rc.2 || ^0.1.2-alpha.1"
+    "@deepseek-ai/cordis": "^4.0.1 || ^4.0.2",
+    "@deepseek-ai/dsh-timeout": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-web": "^0.1.1-rc.2 || ^0.1.2-alpha.1 || ^0.1.2-alpha.2"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
+    "@deepseek-ai/schemastery": "^3.18.1 || ^3.18.2",
     "ipaddr.js": "^2.5.0",
     "undici": "^8.10.0"
   },