dsh-web-search-plugin 0.3.1 → 0.4.1

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 本项目的重要变更都记录在此。格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/)。
 
+## [0.4.1] - 2026-09-10
+
+### 变更
+
+- **适配 DeepSeek Harness `0.1.5-rc.1`**：四个 DSH peerDependencies 提升到 `^0.1.5-rc.1`，Node.js 运行要求对齐为 `^22.19.0 || >=24.0.0`。
+- 浏览器端显式注入 `remote.credentials`，避免 API remote 尚未挂载时访问凭据服务的启动顺序竞态。
+- Bundle 覆盖 `web.config` 时保留上游 `fetchProvider: http`，不再因切换搜索 provider 而隐式清除抓取 provider。
+- Brave 的 `proxy` 仅作为 provider 级显式覆盖；留空时继承 DSH 的全局代理分发器，统一支持 `HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY` / `NO_PROXY`。
+- 版本号及 `User-Agent` 更新为 `0.4.1`。
+
+## [0.4.0] - 2026-09-02
+
+### 变更
+
+- **适配 DeepSeek Harness 最新 main（`0.1.2-alpha.4`）**：`@deepseek-ai/dsh-settings` 已移除顶层 `installSettingsSection` / `settingsNamespace`，Host 侧改为在 `ctx.inject(['settings'])` 后调用 `settingsCtx.settings.installSection(ctx, ...)`；settings namespace 直接使用普通字符串。
+- **浏览器端移除对 `@deepseek-ai/dsh-client-runtime` / 旧 `connection` 的依赖**：该包已不在最新 Harness workspace / 客户端模块表中。`createSnapshotStore` 改从平台常驻模块 `@deepseek-ai/dsh-client-store` 导入；`dsh.client.inject` 与客户端 `inject` 对齐为 `slots` / `locale` / `remote` / `settingsScope`。
+- **凭据远端接口迁移到 `ctx.remote`**：`credentials.describe(refs[])` / `set(ref, value)` 使用最新 Remote 参数与响应形状（`{ ok, value }`）；凭据变更事件从 `credentials/updated` 改为 `credentials/reference-updated`；不再经旧 `connection.api` 调用。
+- peerDependencies 中 dsh 包版本从 `0.1.0-rc.7` 提升到 `0.1.2-alpha.4`；`@deepseek-ai/cordis` / `@deepseek-ai/schemastery` 分别对齐 `^4.0.2` / `^3.18.2`；版本号升至 `0.4.0`，`User-Agent` 同步。
+
 ## [0.3.1] - 2026-08-30
 
 ### 修复
@@ -99,7 +118,7 @@
 
 ### 修复
 
-- **客户端 bundle 缺少 `exports.inject`**（`lib/client.js`）。浏览器插件原先只导出 `apply`，cordis 的 `fiber.inject` 为空，访问 `ctx.locale` 等服务会抛 `cannot get property "locale" without inject`。现在导出 `inject = ["slots", "locale", "connection", "remote", "settingsScope"]`。
+- **客户端 bundle 缺少 `exports.inject`**（`lib/client.js`）。浏览器插件原先只导出 `apply`，cordis 的 `fiber.inject` 为空，访问 `ctx.locale` 等服务会抛 `cannot get property "locale" without inject`。现在导出 `inject = ["slots", "locale", "remote", "settingsScope"]`。
 - **插件卡片的 slot 注册**（`lib/client.js`）。卡片按 rc.6 的 `id`/`order` 形状注册进 `settings.plugin.item`；该 slot 从 rc.6+ 起是 keyed 的，必须带 `key: "dsh-web-search-plugin"`。
 - **`CardForm.field("apiKey")` 崩溃**（`lib/client.js`）。只写凭据字段没有 section spec，对 `undefined` 调用 `spec.format(...)` 会在卡片投影时抛 `Cannot read properties of undefined (reading 'format')`。已加上 secret 字段分支（对齐官方 `CardForm`）。
 - **`dsh.client.inject` 补上 `@deepseek-ai/dsh-client-ui-slots`**（`package.json`），与社区插件的加载集合一致。

package/README.md

@@ -17,19 +17,20 @@
 
 ## 特性
 
-- 与官方 `@deepseek-ai/dsh-web-search-deepseek` 相同的提供方约定：`inject: ['web']` + `installSettingsSection` + `ctx.web.registerSearchProvider`。
+- 与官方 `@deepseek-ai/dsh-web-search-deepseek` 相同的提供方约定：`inject: ['web']` + `ctx.settings.installSection` + `ctx.web.registerSearchProvider`。
 - 顶层 **设置 → 网页搜索** 分区：两列布局、未保存草稿、保存 toast；结果数量为 1–20 下拉。
 - **默认引擎为 DeepSeek（官方）**：新装 / 未显式改动时，搜索直接走 `deepseek-official`，不再依赖 keyless 的 Tavily。
 - 纯 REST 后端由**静态元数据表 + 通用后端**驱动，新增 provider 即"表里加一行 + 官方跳转链接"，无定制执行代码。
 - Tavily keyless 无需密钥即可用；Brave 需要订阅 token（若本机已有 `BRAVE_API_KEY` 凭据，可直接复用）。
 - Tavily keyed / Brave 在设置卡展示额度进度条（DeepSeek 官方与 Tavily keyless / 其余 REST 后端不展示）。
 - 各引擎结果都规范化为接缝的 `WebSearchResult`（可选 `content` + `sources[]`），按 URL 去重。
-- 设置段 `dsh-web-search-plugin` 通过 rc.7 的 `settings.describe()` 动态暴露，不需要宿主白名单补丁，也不需要自建回环 settings 桥。
+- 设置段 `dsh-web-search-plugin` 通过 dsh 的 `settings.installSection` 注册、由 `settings.describe()` 动态暴露，不需要宿主白名单补丁，也不需要自建回环 settings 桥。
 - 错误映射为 `WEB_PROVIDER_ERROR` / `WEB_ABORTED` / `WEB_PROVIDER_CREDENTIAL_MISSING`。
 
 ## 运行要求
 
-- DeepSeek Harness `0.1.0-rc.7` 或更新
+- DeepSeek Harness `0.1.5-rc.1` 或兼容版本
+- Node.js `^22.19.0` 或 `>=24.0.0`
 - pnpm，用于通过 `dsh plugin` 把插件装进 profile
 
 ## 安装
@@ -72,7 +73,7 @@ dsh plugin --profile web add dsh-web-search-plugin
 | `country` | — | Brave 的 `country`（ISO 两位码，如 `cn`）；留空使用 Brave 默认 |
 | `searchLang` | — | Brave 的 `search_lang`（如 `zh-hans`）；留空使用 Brave 默认 |
 | `freshness` | — | Brave 的 `freshness`：`pd` / `pw` / `pm` / `py` |
-| `proxy` | — | Brave 使用的 HTTP(S) 代理；留空回退 `HTTPS_PROXY` / `HTTP_PROXY` |
+| `proxy` | — | Brave 使用的 HTTP(S) 代理覆盖；留空继承 DSH 的全局 `HTTP_PROXY` / `HTTPS_PROXY` / `ALL_PROXY` / `NO_PROXY` 策略 |
 | `serperApiKey` / `serperApiKeyEnv` / `serperBaseURL` | — / `SERPER_API_KEY` / — | Serper 的 key 字面量 / 凭据引用名 / 端点覆盖 |
 | `serpapiApiKey` / `serpapiApiKeyEnv` / `serpapiBaseURL` | — / `SERPAPI_API_KEY` / — | SerpApi 的 key 字面量 / 凭据引用名 / 端点覆盖 |
 | `exaApiKey` / `exaApiKeyEnv` / `exaBaseURL` | — / `EXA_API_KEY` / — | Exa 的 key 字面量 / 凭据引用名 / 端点覆盖 |
@@ -189,7 +190,7 @@ dsh plugin --profile web remove @dsh-ltctfer/dsh-web-search-brave
 npm run check
 ```
 
-客户端 bundle 必须保持 `window.__ModuleLoader__.load({ id, factory })` 线格式 — 由 `dsh-client-modules` 加载，不是打包器。必须同时导出 `apply` 和 `inject`（`slots`、`locale`、`connection`、`remote`、`settingsScope`），并把分区注册进 `settings.section`（`id: "web-search"`）。
+客户端 bundle 必须保持 `window.__ModuleLoader__.load({ id, factory })` 线格式 — 由 `dsh-client-modules` 加载，不是打包器。必须同时导出 `apply` 和 `inject`（`slots`、`locale`、`remote`、`settingsScope`），并把分区注册进 `settings.section`（`id: "web-search"`）。
 
 ## 发布
 

package/cordis.patch.yml

@@ -3,14 +3,16 @@
 # installs the package as a plain library: no loader row, no Host apply, no
 # `/plugins/<name>/client.js`.
 #
-# `searchProvider` is restated in full because a Cordis patch replaces the
-# targeted row's whole `config`. The profile's own cordis.patch.yml still
-# wins if it later overrides `web`. The seam id is `dsh-web-search`; the
-# backend (DeepSeek / Tavily / Brave) is the plugin's own `provider` setting.
+# `searchProvider` and the upstream `fetchProvider` are restated in full
+# because a Cordis patch replaces the targeted row's whole `config`. The
+# profile's own cordis.patch.yml still wins if it later overrides `web`. The
+# seam id is `dsh-web-search`; the backend (DeepSeek / Tavily / Brave) is the
+# plugin's own `provider` setting.
 - id: web
   name: '@deepseek-ai/dsh-web'
   config:
     searchProvider: dsh-web-search
+    fetchProvider: http
 
 # This plugin re-hosts the DeepSeek backend, so the in-box DeepSeek host
 # plugin is redundant: disabling it removes its `deepseek-official` provider

package/lib/brave.js

@@ -12,7 +12,6 @@
  */
 import { ProxyAgent } from "undici";
 import { WebError } from "@deepseek-ai/dsh-web";
-import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
 import { MAX_RESULTS_CAP, USER_AGENT, isAbortError, isPositiveInteger, resolveApiKey, resolveSecret, searchAborted, throwIfSearchAborted } from "./shared.js";
 
 /** Default Brave Search API web-results endpoint. */
@@ -123,9 +122,9 @@ export class BraveSearchProvider {
 	}
 
 	/**
-	 * Cached undici ProxyAgent for the current proxy URL. Node's fetch does not
-	 * read `HTTPS_PROXY` itself; a configured proxy (or the launch-environment
-	 * fallback) is how DNS for api.search.brave.com can go through a tunnel.
+	 * Cached undici ProxyAgent for an explicit provider-level proxy override.
+	 * With no override, fetch inherits the dispatcher installed by DSH so its
+	 * HTTP_PROXY / HTTPS_PROXY / ALL_PROXY / NO_PROXY policy remains intact.
 	 */
 	dispatcher(options) {
 		const proxy = options.proxy;
@@ -142,7 +141,6 @@ export class BraveSearchProvider {
 
 /** Project the plugin section into Brave backend options. */
 export function resolveBraveOptions(ctx, config) {
-	const environment = launchEnvironmentOf(ctx);
 	return {
 		...resolveSecret(ctx, {
 			literal: config.braveApiKey,
@@ -153,6 +151,6 @@ export function resolveBraveOptions(ctx, config) {
 		country: config.country,
 		searchLang: config.searchLang,
 		freshness: config.freshness,
-		proxy: config.proxy ?? environment.get("HTTPS_PROXY")?.value ?? environment.get("HTTP_PROXY")?.value
+		proxy: config.proxy
 	};
 }

package/lib/client.js

@@ -21,7 +21,7 @@ window.__ModuleLoader__.load({
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let react = require("react");
-		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
+		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
 
 		/** Settings namespace of this plugin. */
 		const NS = "dsh-web-search-plugin";
@@ -132,7 +132,7 @@ window.__ModuleLoader__.load({
 			freshnessMonth: "Past month",
 			freshnessYear: "Past year",
 			proxy: "Proxy",
-			proxyPlaceholder: "Leave blank to use HTTPS_PROXY / HTTP_PROXY.",
+			proxyPlaceholder: "Leave blank to inherit the DSH proxy settings.",
 			deepseekApiKeyEnv: "Credential reference",
 			deepseekApiKeyEnvHint: "Name of the credential/env var resolved for DeepSeek search.",
 			deepseekBaseURL: "Endpoint",
@@ -228,7 +228,7 @@ window.__ModuleLoader__.load({
 			freshnessMonth: "过去一月",
 			freshnessYear: "过去一年",
 			proxy: "代理",
-			proxyPlaceholder: "留空使用 HTTPS_PROXY / HTTP_PROXY环境变量",
+			proxyPlaceholder: "留空继承 DSH 全局代理设置",
 			deepseekApiKeyEnv: "凭据引用名",
 			deepseekApiKeyEnvHint: "DeepSeek 搜索解析的凭据/环境变量名。",
 			deepseekBaseURL: "接口地址",
@@ -334,9 +334,9 @@ window.__ModuleLoader__.load({
 		 * spec and are written through the credentials domain.
 		 */
 		var SearchCardForm = class {
-			constructor(scope, api) {
+			constructor(scope, remote) {
 				this.scope = scope;
-				this.api = api;
+				this.remote = remote;
 				this.specs = new Map([
 					choiceField("provider"),
 					choiceField("mode"),
@@ -391,7 +391,7 @@ window.__ModuleLoader__.load({
 				this.readCredential();
 			}
 			bind(project) {
-				const store = (0, _deepseek_ai_dsh_client_runtime_client.createSnapshotStore)(project());
+				const store = (0, _deepseek_ai_dsh_client_store.createSnapshotStore)(project());
 				this.listeners.add(() => {
 					store.set(project());
 				});
@@ -591,12 +591,12 @@ window.__ModuleLoader__.load({
 				}
 				let response;
 				try {
-					response = await this.api.credentials.describe({ refs: [ref] });
+					response = await this.remote.credentials.describe([ref]);
 				} catch (_credentialReadFailure) {
 					return;
 				}
-				if (!response.result.ok || ref !== this.refOf()) return;
-				const view = response.result.value.credentials[ref];
+				if (!response.ok || ref !== this.refOf()) return;
+				const view = response.value[ref];
 				const next = {
 					ref,
 					configured: view?.configured ?? false,
@@ -619,7 +619,8 @@ window.__ModuleLoader__.load({
 					ref = rest !== void 0 ? this.restKeyRef(rest) : this.tavilyRef();
 				}
 				try {
-					await this.api.credentials.set({ ref, value });
+					const response = await this.remote.credentials.set(ref, value);
+					if (!response.ok) return false;
 				} catch (_credentialWriteFailure) {}
 				await this.readCredential();
 				return this.credential.ref === ref ? this.credential.configured : true;
@@ -628,10 +629,10 @@ window.__ModuleLoader__.load({
 
 		/** Bridges the plugin scope and the credentials domain onto the card. */
 		var SearchCardController = class {
-			constructor(scope, api) {
+			constructor(scope, remote) {
 				this.scope = scope;
-				this.api = api;
-				this.form = new SearchCardForm(scope, api);
+				this.remote = remote;
+				this.form = new SearchCardForm(scope, remote);
 				this.store = this.form.bind(() => this.projection());
 				scope.subscribe(() => {
 					this.form.readCredential();
@@ -1150,11 +1151,10 @@ window.__ModuleLoader__.load({
 
 		/** Mount the top-level "Web search" settings section. */
 		function apply(ctx) {
-			const { api } = ctx.get("connection");
 			const t = ctx.locale.bind(NS);
 			ctx.effect(() => ctx.locale.register(NS, { zh, en }), "dsh-web-search-plugin: card dictionaries");
-			const controller = new SearchCardController(ctx.settingsScope.bind({ namespace: NS }), api);
-			ctx.effect(() => ctx.remote.$on("credentials/updated", (ref) => {
+			const controller = new SearchCardController(ctx.settingsScope.bind({ namespace: NS }), ctx.remote);
+			ctx.effect(() => ctx.remote.$on("credentials/reference-updated", (ref) => {
 				controller.form.refreshCredential(ref);
 			}), "dsh-web-search-plugin: credential invalidations");
 			ctx.effect(() => usageStore.start(), "dsh-web-search-plugin: usage poll");
@@ -1168,7 +1168,7 @@ window.__ModuleLoader__.load({
 			}, makeSection(ctx, controller)));
 		}
 
-		const inject = ["slots", "locale", "connection", "remote", "settingsScope"];
+		const inject = ["slots", "locale", "remote", "remote.credentials", "settingsScope"];
 
 		exports.apply = apply;
 		exports.inject = inject;

package/lib/index.js

@@ -17,8 +17,6 @@
  * @module dsh-web-search-plugin
  */
 import z from "@deepseek-ai/schemastery";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
-import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
 import { MAX_RESULTS_CAP } from "./shared.js";
 import { TAVILY_DEFAULT_API_KEY_ENV, TAVILY_DEFAULT_BASE_URL, TavilySearchProvider, resolveTavilyOptions } from "./tavily.js";
 import { BRAVE_DEFAULT_API_KEY_ENV, BRAVE_DEFAULT_BASE_URL, BraveSearchProvider, resolveBraveOptions } from "./brave.js";
@@ -34,6 +32,8 @@ const SEARCH_PROVIDER_ID = "dsh-web-search";
 const name = "dsh-web-search-plugin";
 /** The web seam this provider registers into. */
 const inject = ["web"];
+/** Settings namespace carrying this plugin's backend switch and options. */
+const WEB_SEARCH_SETTINGS_NAMESPACE = "dsh-web-search-plugin";
 
 /** Plugin config (all optional — `apply` fills defaults). */
 const Config = z.object({
@@ -67,7 +67,7 @@ const Config = z.object({
 	searchLang: z.string().default(""),
 	/** Optional Brave `freshness` (`pd` / `pw` / `pm` / `py`). */
 	freshness: z.string().default(""),
-	/** Optional HTTP(S) proxy URL for Brave (falls back to HTTPS_PROXY / HTTP_PROXY). */
+	/** Optional HTTP(S) proxy URL for Brave; blank inherits DSH's global proxy policy. */
 	proxy: z.string().default(""),
 	/** Literal Serper API key; prefer {@link serperApiKeyEnv}. */
 	serperApiKey: z.string().role("secret").default(""),
@@ -117,11 +117,6 @@ const Config = z.object({
 	maxUses: z.number().step(1).min(1).default(5)
 });
 
-/** Settings namespace carrying this plugin's backend switch and options. */
-const WEB_SEARCH_SETTINGS_NAMESPACE = settingsNamespace("dsh-web-search-plugin");
-/** @deprecated Use {@link WEB_SEARCH_SETTINGS_NAMESPACE}. */
-const WEB_SEARCH_TAVILY_SETTINGS_NAMESPACE = WEB_SEARCH_SETTINGS_NAMESPACE;
-
 /**
  * One seam-facing provider whose `id` stays `dsh-web-search`. The active
  * backend is read from the live settings section on every `available` /
@@ -177,7 +172,7 @@ function resolveOptions(ctx, config) {
 	// metadata row's default is not enough (self-hosted SearXNG, proxied
 	// providers, custom key refs).
 	const keySourceByProvider = {
-		brave: { literal: config.braveApiKey, envName: config.braveApiKeyEnv ?? BRAVE_DEFAULT_API_KEY_ENV, baseURL: config.braveBaseURL ?? "", proxy: config.proxy || launchEnvironmentOf(ctx).get("HTTPS_PROXY")?.value || launchEnvironmentOf(ctx).get("HTTP_PROXY")?.value || "" },
+		brave: { literal: config.braveApiKey, envName: config.braveApiKeyEnv ?? BRAVE_DEFAULT_API_KEY_ENV, baseURL: config.braveBaseURL ?? "", proxy: config.proxy ?? "" },
 		tavily: { literal: config.apiKey, envName: config.apiKeyEnv ?? TAVILY_DEFAULT_API_KEY_ENV, baseURL: config.baseURL ?? "" },
 		serper: { literal: config.serperApiKey, envName: config.serperApiKeyEnv ?? "SERPER_API_KEY", baseURL: config.serperBaseURL ?? "" },
 		serpapi: { literal: config.serpapiApiKey, envName: config.serpapiApiKeyEnv ?? "SERPAPI_API_KEY", baseURL: config.serpapiBaseURL ?? "" },
@@ -254,11 +249,13 @@ function sendJson(res, statusCode, data) {
 /** Register the dispatched search provider with `ctx.web`. */
 function apply(ctx, config) {
 	let current = () => config;
-	installSettingsSection(ctx, WEB_SEARCH_SETTINGS_NAMESPACE, Config, config, {
-		setSource: (source) => {
-			current = source;
-		},
-		onChange: () => {}
+	ctx.inject(["settings"], (settingsCtx) => {
+		settingsCtx.settings.installSection(ctx, WEB_SEARCH_SETTINGS_NAMESPACE, Config, config, {
+			setSource: (source) => {
+				current = source;
+			},
+			onChange: () => {}
+		});
 	});
 	const live = () => resolveOptions(ctx, current());
 	const usage = new UsageTracker({
@@ -335,7 +332,6 @@ export {
 	TavilySearchProvider,
 	UsageTracker,
 	WEB_SEARCH_SETTINGS_NAMESPACE,
-	WEB_SEARCH_TAVILY_SETTINGS_NAMESPACE,
 	apply,
 	findProvider,
 	inject,

package/lib/shared.js

@@ -7,7 +7,7 @@ import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
 import { WebError } from "@deepseek-ai/dsh-web";
 
 /** Attribution header sent on every request. */
-export const USER_AGENT = "dsh-web-search-plugin/0.3.1";
+export const USER_AGENT = "dsh-web-search-plugin/0.4.1";
 /** Shared cap: Tavily `max_results` and Brave `count` both accept 1..20. */
 export const MAX_RESULTS_CAP = 20;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-web-search-plugin",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Unified web search for the DeepSeek Harness seam (ctx.web): DeepSeek (official), Tavily, Brave, Serper, SerpApi, Exa, SearXNG, Scavio, and Firecrawl backends",
   "keywords": [
     "dsh-plugin",
@@ -24,7 +24,7 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=18"
+    "node": "^22.19.0 || >=24.0.0"
   },
   "exports": {
     ".": {
@@ -43,9 +43,7 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-api-remotes"
@@ -59,12 +57,12 @@
     "undici": "^6.21.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-web": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-launch-environment": "^0.1.0-rc.7",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/cordis": "^4.0.1"
+    "@deepseek-ai/dsh-web": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-credentials": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.5-rc.1",
+    "@deepseek-ai/dsh-launch-environment": "^0.1.5-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.2",
+    "@deepseek-ai/cordis": "^4.0.2"
   },
   "license": "MIT",
   "repository": {