@240xu/dsh-websearch 2.0.3 → 2.0.5

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

@@ -39,6 +39,10 @@ window.__ModuleLoader__.load({
 
 		const zh = {
 			nav: "搜索",
+			statusEnabled: "已启用后端",
+			statusKeys: "已配置密钥",
+			keyMissing: "缺密钥",
+			unsavedHint: "有未保存的修改", savedOk: "已保存 ✓",
 			title: "统一搜索 (Unified Search)",
 			description: "聚合网络搜索：11 个后端并发 fan-out、URL 去重合并。开关后端、填 API Key、调参数，保存即生效。",
 			save: "保存",
@@ -56,9 +60,14 @@ window.__ModuleLoader__.load({
 			keyUnset: "未配置",
 			togglesTitle: "启用后端",
 			globalsTitle: "全局参数",
+			keysTitle: "API 密钥（保存后写入凭证库，立即生效）",
 		};
 		const en = {
 			nav: "Web Search",
+			statusEnabled: "Backends enabled",
+			statusKeys: "Keys configured",
+			keyMissing: "key missing",
+			unsavedHint: "You have unsaved changes", savedOk: "Saved ✓",
 			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",
@@ -76,6 +85,7 @@ window.__ModuleLoader__.load({
 			keyUnset: "not set",
 			togglesTitle: "Enabled backends",
 			globalsTitle: "Global parameters",
+			keysTitle: "API keys (saved to the credential store, effective immediately)",
 		};
 
 		//#region styles
@@ -114,6 +124,7 @@ window.__ModuleLoader__.load({
 				this.keyState = new Map();    // envRef -> {configured}
 				this.saving = false;
 				this.failed = false;
+				this.savedAt = 0;
 				this.store = createStore(this.projection());
 				this.scope.subscribe(() => this.republish());
 			}
@@ -138,6 +149,7 @@ window.__ModuleLoader__.load({
 					keyState: Object.fromEntries(this.keyState),
 					stagedKeys: Object.fromEntries([...this.stagedKeys].map(([k, v]) => [k, v.text])),
 					stagedCount: this.staged.size + this.stagedKeys.size,
+					savedAt: this.savedAt,
 					stagedText: (field) => {
 						const s = this.staged.get(field);
 						return s ? (s.clear ? "" : s.text) : undefined;
@@ -150,13 +162,14 @@ window.__ModuleLoader__.load({
 
 			republish() { this.store.set(this.projection()); }
 
-			edit(field, text) { this.staged.set(field, { text }); this.republish(); }
+			edit(field, text) { this.savedAt = 0; this.staged.set(field, { text }); this.republish(); }
 			reset(field) { this.staged.delete(field); this.republish(); }
-			editKey(envRef, text) { this.stagedKeys.set(envRef, { text }); this.republish(); }
+			editKey(envRef, text) { this.savedAt = 0; this.stagedKeys.set(envRef, { text }); this.republish(); }
 
 			/** Toggles write immediately (no staging); globals/keys stage + save. */
 			async setToggle(id, checked) {
 				await this.scope.set("enable" + id.charAt(0).toUpperCase() + id.slice(1), checked);
+				
 				this.republish();
 			}
 
@@ -185,8 +198,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 {
@@ -204,6 +224,7 @@ window.__ModuleLoader__.load({
 					}
 					for (const f of doneFields) this.staged.delete(f);
 					for (const k of doneKeys) this.stagedKeys.delete(k);
+					if (!this.failed && (doneFields.length > 0 || doneKeys.length > 0)) this.savedAt = Date.now();
 				} catch { this.failed = true; }
 				this.saving = false;
 				this.republish();
@@ -230,13 +251,18 @@ window.__ModuleLoader__.load({
 			// The Host serves schema-resolved values, so defaults arrive materialized;
 			// no client-side default list to drift against the server.
 			const checked = props.value === true;
-			return react_jsx_runtime.jsxs("label", { className: "wsc-toggle", children: [
+			// Status dot: green keyless-or-keyed, amber enabled-but-key-missing.
+			const needsKey = !!b.keyEnv && !props.keyConfigured;
+			const dotColor = needsKey ? (checked ? "#e6a700" : "#888") : "#2ea043";
+			return react_jsx_runtime.jsxs("label", { className: "wsc-toggle", style: { display: "flex", alignItems: "center", gap: 8, cursor: "pointer" }, children: [
 				react_jsx_runtime.jsx("input", {
 					type: "checkbox",
 					checked,
 					onChange: (e) => props.onChange(e.target.checked),
 				}),
+				react_jsx_runtime.jsx("span", { style: { width: 8, height: 8, borderRadius: "50%", background: dotColor, display: "inline-block" } }),
 				react_jsx_runtime.jsx("span", { children: b.label }),
+				needsKey && checked && react_jsx_runtime.jsx("span", { style: { fontSize: 10, opacity: .65 }, children: props.t("keyMissing") }),
 			] });
 		}
 
@@ -251,13 +277,23 @@ window.__ModuleLoader__.load({
 
 			const toggleField = (id) => "enable" + id.charAt(0).toUpperCase() + id.slice(1);
 
+			// Status summary: enabled backends + configured keys at a glance.
+			const enabledCount = BACKENDS.filter((b) => state.value[toggleField(b.id)] === true).length;
+			const keyedBackends = BACKENDS.filter((b) => b.keyEnv);
+			const keysReady = keyedBackends.filter((b) => state.keyState[b.keyEnv]?.configured).length;
+
 			return react_jsx_runtime.jsxs("div", { className: "wsc-card", children: [
+				react_jsx_runtime.jsx("div", { style: { display: "flex", gap: 14, alignItems: "center", padding: "10px 12px", marginBottom: 10, borderRadius: 8, background: "rgba(127,127,127,.08)", fontSize: 13 }, children: [
+					react_jsx_runtime.jsxs("span", { children: [props.t("statusEnabled"), ": ", react_jsx_runtime.jsx("b", { children: enabledCount + "/" + BACKENDS.length })] }),
+					react_jsx_runtime.jsxs("span", { children: [props.t("statusKeys"), ": ", react_jsx_runtime.jsx("b", { children: keysReady + "/" + keyedBackends.length })] }),
+				] }),
 				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) =>
 					react_jsx_runtime.jsx(ToggleRow, {
 						backend: b,
 						value: state.value[toggleField(b.id)],
+						keyConfigured: !b.keyEnv || !!state.keyState[b.keyEnv]?.configured,
 						onChange: (checked) => card.setToggle(b.id, checked),
 					}, b.id)
 				) }),
@@ -276,7 +312,7 @@ window.__ModuleLoader__.load({
 						react_jsx_runtime.jsx("input", { className: "wsc-input", value: state.stagedText("backendTimeoutMs") ?? String(state.value.backendTimeoutMs ?? ""), onChange: e => card.edit("backendTimeoutMs", e.target.value), inputMode: "numeric" }),
 					] }),
 				] }),
-				react_jsx_runtime.jsx("h4", { className: "wsc-sectionTitle", children: "API Keys" }),
+				react_jsx_runtime.jsx("h4", { className: "wsc-sectionTitle", children: props.t("keysTitle") }),
 				react_jsx_runtime.jsx("div", { className: "wsc-grid", children: BACKENDS.filter((b) => b.keyEnv).map((b) =>
 					react_jsx_runtime.jsxs("div", { children: [
 						react_jsx_runtime.jsxs("div", { className: "wsc-fieldHead", children: [
@@ -299,10 +335,12 @@ window.__ModuleLoader__.load({
 						react_jsx_runtime.jsx("p", { className: "wsc-hint", children: props.t("keyHint") }),
 					] }, b.id)
 				) }),
+				state.stagedCount > 0 && react_jsx_runtime.jsx("p", { style: { margin: 0, fontSize: 12, opacity: .6 }, children: props.t("unsavedHint") }),
 				react_jsx_runtime.jsxs("div", { className: "wsc-actions", children: [
-					react_jsx_runtime.jsx("button", { className: "wsc-btn", disabled: state.saving, onClick: () => card.save(), children: state.saving ? props.t("saving") : props.t("save") }),
+					react_jsx_runtime.jsx("button", { className: "wsc-btn", disabled: state.saving || state.stagedCount === 0, onClick: () => card.save(), children: state.saving ? props.t("saving") : props.t("save") }),
 					(state.stagedCount > 0) && react_jsx_runtime.jsx("button", { className: "wsc-btn wsc-btnGhost", onClick: () => card.discard(), children: props.t("discard") }),
-					state.failed && react_jsx_runtime.jsx("span", { className: "wsc-status", children: props.t("failed") }),
+					state.failed && react_jsx_runtime.jsx("span", { className: "wsc-status", style: { color: "#e5534b" }, children: props.t("failed") }),
+					!state.failed && !state.saving && state.savedAt > 0 && react_jsx_runtime.jsx("span", { className: "wsc-status", style: { color: "#2ea043" }, children: props.t("savedOk") }),
 				] }),
 			] });
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@240xu/dsh-websearch",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "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",