@240xu/dsh-websearch 2.0.4 → 2.0.6

package/lib/client.js

@@ -25,6 +25,8 @@ window.__ModuleLoader__.load({
 			{ id: "openai", keyEnv: "OPENAI_API_KEY", label: "OpenAI" },
 		];
 		const GLOBAL_FIELDS = ["numResults", "concurrency", "backendTimeoutMs"];
+		const KEYLESS = BACKENDS.filter((b) => !b.keyEnv);
+		const KEYED = BACKENDS.filter((b) => b.keyEnv);
 
 		/** Where the user goes to get/rotate each key. */
 		const KEY_URLS = {
@@ -39,6 +41,12 @@ window.__ModuleLoader__.load({
 
 		const zh = {
 			nav: "搜索",
+			groupFree: "免密钥（开箱即用）",
+			groupKeyed: "需要 API Key",
+			statusEnabled: "已启用后端",
+			statusKeys: "已配置密钥",
+			keyMissing: "缺密钥",
+			unsavedHint: "有未保存的修改", savedOk: "已保存 ✓",
 			title: "统一搜索 (Unified Search)",
 			description: "聚合网络搜索：11 个后端并发 fan-out、URL 去重合并。开关后端、填 API Key、调参数，保存即生效。",
 			save: "保存",
@@ -56,9 +64,16 @@ window.__ModuleLoader__.load({
 			keyUnset: "未配置",
 			togglesTitle: "启用后端",
 			globalsTitle: "全局参数",
+			keysTitle: "API 密钥（保存后写入凭证库，立即生效）",
 		};
 		const en = {
 			nav: "Web Search",
+			groupFree: "Keyless (ready to use)",
+			groupKeyed: "Requires API key",
+			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 +91,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 +130,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 +155,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 +168,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();
 			}
 
@@ -211,6 +230,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();
@@ -237,13 +257,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") }),
 			] });
 		}
 
@@ -258,13 +283,32 @@ 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("h5", { className: "wsc-sectionTitle", children: props.t("groupFree") }),
+				react_jsx_runtime.jsx("div", { className: "wsc-toggles", children: KEYLESS.map((b) =>
+					react_jsx_runtime.jsx(ToggleRow, {
+						backend: b,
+						value: state.value[toggleField(b.id)],
+						keyConfigured: true,
+						onChange: (checked) => card.setToggle(b.id, checked),
+					}, b.id)
+				) }),
+				react_jsx_runtime.jsx("h5", { className: "wsc-sectionTitle", children: props.t("groupKeyed") }),
+				react_jsx_runtime.jsx("div", { className: "wsc-toggles", children: KEYED.map((b) =>
 					react_jsx_runtime.jsx(ToggleRow, {
 						backend: b,
 						value: state.value[toggleField(b.id)],
+						keyConfigured: !!state.keyState[b.keyEnv]?.configured,
 						onChange: (checked) => card.setToggle(b.id, checked),
 					}, b.id)
 				) }),
@@ -283,7 +327,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: [
@@ -306,10 +350,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") }),
 				] }),
 			] });
 		}
@@ -328,7 +374,7 @@ window.__ModuleLoader__.load({
 				name: "settings.section",
 				id: "websearch",
 				order: 16,
-				label: () => t("nav"),
+				label: () => ctx.locale.bind(NS)("nav"),
 				locale: NS,
 				inject: () => controller.inject(),
 			}, UnifiedSearchSection));

package/package.json

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