@240xu/dsh-websearch 2.0.2 → 2.0.4

package/README.md

@@ -1,5 +1,8 @@
 # @240xu/dsh-websearch
 
+[![npm version](https://img.shields.io/npm/v/@240xu/dsh-websearch.svg)](https://www.npmjs.com/package/@240xu/dsh-websearch)
+[![license](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
+
 > Aggregated web search provider for [DeepSeek Harness](https://github.com/deepseek-ai/dsh) — one plugin id `unified` that fans out to eleven backends concurrently, merges + URL-dedups results, and stays usable even when some backends go down.
 
 A pure-Cordis drop-in: registers ONE provider at `ctx.web` so the `dsh-web` selection rule never fires `WEB_PROVIDER_AMBIGUOUS`. Zero-config search out of the box (Exa + Parallel + DuckDuckGo + SearXNG are keyless); API-key backends (DeepSeek / Anthropic / OpenAI / Brave / Tavily / Serper / Mojeek) auto-activate once their key is supplied via the credentials service or env.
@@ -57,6 +60,10 @@ pnpm install
 
 ## Settings | 配置
 
+> v2.0.3 起，配置界面位于 **Settings → 左侧栏「搜索 / Web Search」**（顶级分区，与通用/模型/插件同级）。
+> 每个 API Key 字段旁有 **「获取 Key ↗」** 直达对应平台控制台；保存即写入凭证库并立即生效。
+
+
 插件向 DSH 设置面板注册 `unified-search` namespace（Settings → Unified Search），全部字段扁平化、开箱可编辑：
 
 **全局**

package/examples/cordis.patch.yml

@@ -1,17 +1,25 @@
-# ── dsh-websearch v2.0: unified free web search ───────────────────────
-# Registers provider id "unified" that fans out to 11 backends concurrently:
-#   keyless:    exa, parallel, ddg, searxng
-#   key-gated:  deepseek, anthropic, openai, brave, tavily, serper, mojeek
-#               (activate when their API key is set via Settings > Unified Search)
+# dsh-websearch v2.0.3 — user-side profile patch example
 #
-# web-search-deepseek stays disabled because the unified plugin supersedes it.
-# web.searchProvider pins the built-in web_search tool onto the unified provider.
-- id: unified-search
-  name: "@deepseek-ai/dsh-websearch"
+# The plugin itself is registered by its own bundle manifest
+# (dsh.bundle in package.json + cordis.patch.yml at the repo root),
+# so after installing it there is NOTHING to add for the plugin row.
+#
+# What you DO need in your profile patch: pin the built-in web_search
+# tool onto the unified provider and disable the superseded official one.
+
 - id: web-search-deepseek
-  name: "@deepseek-ai/dsh-web-search-deepseek"
+  name: '@deepseek-ai/dsh-web-search-deepseek'
   disabled: true
 - id: web
-  name: "@deepseek-ai/dsh-web"
+  name: '@deepseek-ai/dsh-web'
   config:
     searchProvider: unified
+
+# Install:
+#   dsh plugin --profile web add github:240xu/dsh-websearch
+# or (after npm publish):
+#   dsh plugin --profile web add @240xu/dsh-websearch
+#
+# Then open Settings -> Web Search to toggle backends, store API keys
+# (each field links straight to the provider's key dashboard), and tune
+# concurrency / timeouts.

package/lib/client.js

@@ -26,7 +26,19 @@ window.__ModuleLoader__.load({
 		];
 		const GLOBAL_FIELDS = ["numResults", "concurrency", "backendTimeoutMs"];
 
+		/** Where the user goes to get/rotate each key. */
+		const KEY_URLS = {
+			brave: "https://api-dashboard.search.brave.com/app/keys",
+			tavily: "https://app.tavily.com/home",
+			serper: "https://serper.dev/api-key",
+			mojeek: "https://www.mojeek.com/services/search/web-search-api/",
+			deepseek: "https://platform.deepseek.com/api_keys",
+			anthropic: "https://console.anthropic.com/settings/keys",
+			openai: "https://platform.openai.com/api-keys",
+		};
+
 		const zh = {
+			nav: "搜索",
 			title: "统一搜索 (Unified Search)",
 			description: "聚合网络搜索：11 个后端并发 fan-out、URL 去重合并。开关后端、填 API Key、调参数，保存即生效。",
 			save: "保存",
@@ -38,6 +50,7 @@ window.__ModuleLoader__.load({
 			reset: "重置",
 			overridden: "已自定义",
 			keyLabel: "{id} API Key",
+			getKey: "获取 Key ↗",
 			keyHint: "填入后保存到凭证库（对应环境变量引用）；留空表示不修改",
 			keySet: "已配置",
 			keyUnset: "未配置",
@@ -45,6 +58,7 @@ window.__ModuleLoader__.load({
 			globalsTitle: "全局参数",
 		};
 		const en = {
+			nav: "Web Search",
 			title: "Unified Search",
 			description: "Aggregated web search: 11 backends fan out concurrently, URL-deduped. Toggle backends, set API keys, tune globals — saves apply immediately.",
 			save: "Save",
@@ -56,6 +70,7 @@ window.__ModuleLoader__.load({
 			reset: "Reset",
 			overridden: "customized",
 			keyLabel: "{id} API Key",
+			getKey: "Get key ↗",
 			keyHint: "Stored into the credential store on save; leave blank to keep current",
 			keySet: "configured",
 			keyUnset: "not set",
@@ -170,8 +185,15 @@ window.__ModuleLoader__.load({
 						if (staged.clear || staged.text === "") { await this.scope.unset(field); doneFields.push(field); continue; }
 						if (GLOBAL_FIELDS.includes(field)) {
 							const num = Number(staged.text);
-							// Non-numeric input: keep the draft so the user can correct it.
-							if (Number.isNaN(num)) { this.failed = true; continue; }
+							// Mirror the server schema bounds client-side so bad input is
+							// caught in the UI instead of a failed Host round-trip.
+							const BOUNDS = {
+								numResults: [1, 50],
+								concurrency: [1, 10],
+								backendTimeoutMs: [1000, 120000],
+							};
+							const [lo, hi] = BOUNDS[field] ?? [-Infinity, Infinity];
+							if (Number.isNaN(num) || num < lo || num > hi) { this.failed = true; continue; }
 							await this.scope.set(field, num);
 							doneFields.push(field);
 						} else {
@@ -226,17 +248,17 @@ window.__ModuleLoader__.load({
 		}
 
 		/** The card root. */
-		function UnifiedSearchCard(props) {
+		function UnifiedSearchSection(props) {
 			const state = props.useUnifiedSearchCard((snapshot) => snapshot);
 			const card = { edit: props.edit, setToggle: props.setToggle, reset: props.reset, editKey: props.editKey, save: props.save, discard: props.discard };
 			// Occupants of settings.plugin.item render inside the tab's <ul>; use <li>.
 			if (!state.ready) {
-				return react_jsx_runtime.jsx("li", { className: "wsc-card", style: { fontSize: 12, opacity: .6 }, children: "…" });
+				return react_jsx_runtime.jsx("div", { className: "wsc-card", style: { fontSize: 12, opacity: .6 }, children: "…" });
 			}
 
 			const toggleField = (id) => "enable" + id.charAt(0).toUpperCase() + id.slice(1);
 
-			return react_jsx_runtime.jsxs("li", { className: "wsc-card", children: [
+			return react_jsx_runtime.jsxs("div", { className: "wsc-card", children: [
 				react_jsx_runtime.jsx("p", { style: { margin: 0, fontSize: 12, opacity: .65 }, children: props.t("description") }),
 				react_jsx_runtime.jsx("h4", { className: "wsc-sectionTitle", children: props.t("togglesTitle") }),
 				react_jsx_runtime.jsx("div", { className: "wsc-toggles", children: BACKENDS.map((b) =>
@@ -266,7 +288,14 @@ window.__ModuleLoader__.load({
 					react_jsx_runtime.jsxs("div", { children: [
 						react_jsx_runtime.jsxs("div", { className: "wsc-fieldHead", children: [
 							react_jsx_runtime.jsx("span", { className: "wsc-label", children: props.t("keyLabel", { id: b.id }) }),
-							react_jsx_runtime.jsx("span", { className: "wsc-badge" + (state.keyState[b.keyEnv]?.configured ? " wsc-badgeOn" : ""), children: state.keyState[b.keyEnv]?.configured ? props.t("keySet") : props.t("keyUnset") }),
+							react_jsx_runtime.jsxs("span", { className: "wsc-badges", style: { display: "flex", gap: 6, alignItems: "center" }, children: [
+								KEY_URLS[b.id] && react_jsx_runtime.jsx("a", {
+									href: KEY_URLS[b.id], target: "_blank", rel: "noreferrer",
+									style: { fontSize: 11, color: "var(--dsw-alias-accent-primary)", textDecoration: "none" },
+									children: props.t("getKey"),
+								}),
+								react_jsx_runtime.jsx("span", { className: "wsc-badge" + (state.keyState[b.keyEnv]?.configured ? " wsc-badgeOn" : ""), children: state.keyState[b.keyEnv]?.configured ? props.t("keySet") : props.t("keyUnset") }),
+							] }),
 						] }),
 						react_jsx_runtime.jsx("input", {
 							className: "wsc-keyInput", type: "password", autoComplete: "off",
@@ -295,14 +324,14 @@ window.__ModuleLoader__.load({
 				ctx.get("remote"),
 			);
 			ctx.effect(() => ctx.remote.$on("credentials/updated", () => controller.refreshAllCredentials()), "websearch: credential invalidations");
-			ctx.slots.inject("settings.plugin.item", function* () {
-				yield ctx.slots.register({
-					name: "settings.plugin.item",
-					key: PLUGIN_NS,
-					locale: NS,
-					inject: () => controller.inject(),
-				}, UnifiedSearchCard);
-			});
+			ctx.slots.inject("settings.section", () => ctx.slots.register({
+				name: "settings.section",
+				id: "websearch",
+				order: 16,
+				label: () => t("nav"),
+				locale: NS,
+				inject: () => controller.inject(),
+			}, UnifiedSearchSection));
 			controller.refreshAllCredentials();
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@240xu/dsh-websearch",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Unified web search provider for DeepSeek Harness (ctx.web): 11 backends — Exa + Parallel + DDG + SearXNG (keyless), DeepSeek + Anthropic + OpenAI + Brave + Tavily + Serper + Mojeek (key-gated via Settings credentials). Registers provider id \"unified\" for zero-config web_search tool.",
   "type": "module",
   "main": "lib/index.js",