@240xu/dsh-websearch 2.0.1 → 2.0.3

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",
@@ -85,10 +100,6 @@ window.__ModuleLoader__.load({
 			};
 		}
 
-		function useStore(store, selector = (s) => s) {
-			return react.useSyncExternalStore(store.subscribe, () => selector(store.getSnapshot()));
-		}
-
 		/**
 		 * Card state machine: reads the bound settings scope snapshot, stages edits,
 		 * writes section fields through scope.set/unset and secrets via credentials.
@@ -199,16 +210,16 @@ window.__ModuleLoader__.load({
 			}
 
 			inject() {
+				// Slot contract: hooks.{name} must be an observable store; the renderer
+				// converts it into props.use{Name} (observableHook). Actions go top-level.
 				return {
-					hooks: {
-						useCard: () => useStore(this.store),
-						edit: (f, t) => this.edit(f, t),
-						setToggle: (id, checked) => this.setToggle(id, checked),
-						reset: (f) => this.reset(f),
-						editKey: (r, t) => this.editKey(r, t),
-						save: () => this.save(),
-						discard: () => { this.staged.clear(); this.stagedKeys.clear(); this.failed = false; this.republish(); },
-					},
+					hooks: { unifiedSearchCard: this.store },
+					edit: (f, t) => this.edit(f, t),
+					setToggle: (id, checked) => this.setToggle(id, checked),
+					reset: (f) => this.reset(f),
+					editKey: (r, t) => this.editKey(r, t),
+					save: () => this.save(),
+					discard: () => { this.staged.clear(); this.stagedKeys.clear(); this.failed = false; this.republish(); },
 				};
 			}
 		}
@@ -230,17 +241,17 @@ window.__ModuleLoader__.load({
 		}
 
 		/** The card root. */
-		function UnifiedSearchCard(props) {
-			const card = props.card;
-			const state = card.useCard();
+		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) =>
@@ -270,7 +281,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",
@@ -299,14 +317,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.1",
+  "version": "2.0.3",
   "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",