dsh-web-search-enhanced 0.2.1 → 0.2.3

package/README.md

@@ -9,7 +9,7 @@ row `web-search-enhanced` and selects its provider in the shared `web` row.
 | Row id | `web-search-enhanced` |
 | Provider id in `ctx.web` | `search-enhanced` |
 | Model surface | DSH's own `web_search` (tool-web), unchanged; with the row's Enhanced tools switch on, also `web_search_enhanced` and `list_web_search_providers` |
-| Per conversation | one connection or Off, from the composer menu or `/setup-search` |
+| Per conversation | one connection or Off, from the composer menu or the Host command `/setup-search` (Web GUI and dsh-TUI) |
 | Settings | row settings page on the Plugins page (`plugins.row.config`) |
 
 ## What it does
@@ -19,17 +19,31 @@ Choose a search connection per conversation from the composer menu or
 the next model request step. Operators decide which connections exist: DSH's
 own DeepSeek search (the default) and DeepSeek Search API, the conversation's
 own model (`builtin:session-model`), Exa, Firecrawl, Tavily, Tinyfish,
-OpenAlex and Semantic Scholar, plus custom adapter connections and fixed-model
+AnySearch, OpenAlex and Semantic Scholar, plus custom adapter connections and fixed-model
 connections over Anthropic Messages, OpenAI Responses or OpenAI Chat
 Completions. Native connections keep the behaviour of DSH's own providers;
 only their error messages are restated.
 
 - **Remote services start off.** DeepSeek Search API, Exa, Firecrawl, Tavily,
-  Tinyfish, OpenAlex and Semantic Scholar must be turned on in the row
+  Tinyfish, AnySearch, OpenAlex and Semantic Scholar must be turned on in the row
   settings before a conversation can choose them; turning one on agrees that
   queries go to it. DeepSeek Messages (the default) and the conversation model
   stay on; custom connections are on when created. When every remote service
   is off, the composer menu says more services can be turned on in settings.
+- **AnySearch takes a personal API key only** (`ANYSEARCH_API_KEY`, the same
+  credential name as AnySearch's own plugin): the service has an anonymous
+  tier, but this plugin does not use it. Its connection options are a region
+  (`zone`: `cn` or `intl`) and a preferred language (`language`, such as
+  `zh-CN` or `en`). Do not install it together with `@anysearch/anysearch-dsh`:
+  that bundle's profile layer writes both fields of the `web` row as
+  `anysearch`, so routing leaves this plugin.
+- **`/setup-search`.** A Host command, so it works in the Web GUI and in
+  dsh-TUI. `off`, a connection id or `freshness auto|fresh|realtime` change
+  the choice from the next model request; dsh-TUI completes these arguments.
+  Without arguments the Web GUI opens the chooser, and dsh-TUI prints the
+  current choice, routing and the enabled connections (0.16.1 shows only the
+  start of that, as a one-line notice). Its description and output are
+  English.
 - **Enhanced tools (optional).** With the row's Enhanced tools switch on (off
   by default; turning it on agrees that the query goes to the service the
   Agent picks), the Agent also gets `web_search_enhanced` (`queries` plus a

package/lib/client.cjs

@@ -37,7 +37,8 @@ window.__ModuleLoader__.load({
 			tools: {
 				action: "web_search_enhanced",
 				list: "list_web_search_providers"
-			}
+			},
+			command: "setup-search"
 		};
 		/**
 		* Key of a row's configuration page on the Plugins page (`plugins.row.config`).
@@ -1050,6 +1051,30 @@ window.__ModuleLoader__.load({
 					}
 				}
 			},
+			anysearch: {
+				label: "AnySearch",
+				endpoint: "https://api.anysearch.com/v1/search",
+				access: {
+					keyless: false,
+					apiKey: { credentialRef: "ANYSEARCH_API_KEY" },
+					account: false
+				},
+				kind: "adapter",
+				remote: true,
+				optIn: true,
+				freshness: [],
+				homepage: "https://www.anysearch.com",
+				options: {
+					zone: {
+						kind: "enum",
+						values: ["cn", "intl"]
+					},
+					language: {
+						kind: "text",
+						pattern: /^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8}){0,2}$/u
+					}
+				}
+			},
 			openalex: {
 				label: "OpenAlex",
 				endpoint: "https://api.openalex.org/works",
@@ -1520,7 +1545,11 @@ window.__ModuleLoader__.load({
 			if (id.startsWith("connection:") && id.length > 11) return { connectionId: id.slice(11) };
 			return parseOptions?.(id);
 		}
-		/** A keyboard entry to the same per-session store the composer menu uses. */
+		/**
+		* The browser's bare invocation of the capability's Host command: a popup over
+		* the same per-session store the composer menu uses. The Host command keeps its
+		* menu row and runs every line with arguments.
+		*/
 		function selectionCommand(selections, spec) {
 			const t = (key) => spec.t(spec.keys[key]);
 			const read = async (sessionId) => {
@@ -1530,9 +1559,6 @@ window.__ModuleLoader__.load({
 			};
 			return {
 				name: spec.name,
-				label: () => t("label"),
-				description: () => t("description"),
-				icon: spec.icon,
 				available: () => true,
 				ui: {
 					kind: "popupSelect",
@@ -1580,6 +1606,19 @@ window.__ModuleLoader__.load({
 				}
 			};
 		}
+		/**
+		* Call `ran` after this browser ran the Host command `name` in a Session. A line
+		* with arguments (`/setup-search off`) writes on the Host without the selection
+		* store, so that Session's views must read again. DSH reports each Host command
+		* this browser executed with `command/executed`, without its arguments, so every
+		* run counts; runs from another browser or the TUI are not reported here.
+		* @returns the listener's disposer; it also ends with `ctx`'s fiber.
+		*/
+		function followHostCommand(ctx, name, ran) {
+			return ctx.on("command/executed", (sessionId, executed) => {
+				if (executed === name) ran(sessionId);
+			});
+		}
 		//#endregion
 		//#region ../core/src/client/selection.ts
 		var ConnectionSelectionStore = class {
@@ -1660,10 +1699,16 @@ window.__ModuleLoader__.load({
 			* read again, the others read on their next load.
 			*/
 			invalidate() {
-				for (const entry of this.entries.values()) {
-					this.outdate(entry);
-					if (entry.observers > 0) this.read(entry);
-				}
+				for (const entry of this.entries.values()) this.reread(entry);
+			}
+			/**
+			* The Session's selection changed without this store (its Host command ran):
+			* its views read again, at once when observed, otherwise on their next load.
+			* A read already in flight reads once more.
+			*/
+			invalidateSession(sessionId) {
+				const entry = this.entries.get(sessionId);
+				if (entry !== void 0) this.reread(entry);
 			}
 			entry(sessionId) {
 				const existing = this.entries.get(sessionId);
@@ -1696,6 +1741,10 @@ window.__ModuleLoader__.load({
 				this.entries.set(sessionId, entry);
 				return entry;
 			}
+			reread(entry) {
+				this.outdate(entry);
+				if (entry.observers > 0) this.read(entry);
+			}
 			outdate(entry) {
 				entry.stale = true;
 				entry.epoch += 1;
@@ -4277,7 +4326,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/command.ts
-		const SEARCH_COMMAND = "setup-search";
+		const SEARCH_COMMAND = SEARCH.command;
 		const FRESHNESS_PREFIX = "freshness:";
 		const parseFreshness = (id) => {
 			const freshness = FRESHNESS.find((mode) => id === FRESHNESS_PREFIX + mode);
@@ -4286,11 +4335,8 @@ window.__ModuleLoader__.load({
 		function searchCommand(selections, t) {
 			return selectionCommand(selections, {
 				name: SEARCH_COMMAND,
-				icon: _deepseek_ai_dsh_client_ui_primitives.IconGlobeOutlineRegular,
 				t,
 				keys: {
-					label: "command.label",
-					description: "command.description",
 					placeholder: "command.placeholder",
 					empty: "command.empty",
 					noResults: "command.noResults",
@@ -4520,6 +4566,9 @@ window.__ModuleLoader__.load({
 			"option.tinyfish.purpose": "Purpose",
 			"option.tinyfish.purpose.placeholder": "What the searches are for",
 			"option.tinyfish.domain_type": "Content type",
+			"option.anysearch.zone": "Region",
+			"option.anysearch.language": "Preferred language",
+			"option.anysearch.language.placeholder": "e.g. zh-CN or en",
 			"option.openalex.sort": "Sort",
 			"option.openalex.sort.placeholder": "e.g. cited_by_count:desc",
 			"option.openalex.filter": "Filter",
@@ -4558,7 +4607,7 @@ window.__ModuleLoader__.load({
 			"status.modelReady": "{access} · model search · sent to {name}",
 			"status.sessionModelNeedsKey": "The conversation model's API key isn't set",
 			"status.sessionModelNeedsSignIn": "Sign in to the DeepSeek account again",
-			"status.reason.no-model": "No model chosen for this conversation yet",
+			"status.reason.no-model": "The model for this conversation's next request isn't known yet",
 			"status.reason.unknown-route": "Can't read the settings of this model's provider",
 			"status.reason.protocol": "Its route declares no supported api",
 			"status.reason.endpoint": "Its route has no fixed endpoint",
@@ -4781,6 +4830,9 @@ window.__ModuleLoader__.load({
 			"option.tinyfish.purpose": "用途说明",
 			"option.tinyfish.purpose.placeholder": "简述搜索目的",
 			"option.tinyfish.domain_type": "内容类型",
+			"option.anysearch.zone": "地区",
+			"option.anysearch.language": "偏好语言",
+			"option.anysearch.language.placeholder": "如 zh-CN 或 en",
 			"option.openalex.sort": "排序",
 			"option.openalex.sort.placeholder": "如 cited_by_count:desc",
 			"option.openalex.filter": "过滤条件",
@@ -4819,7 +4871,7 @@ window.__ModuleLoader__.load({
 			"status.modelReady": "{access} · 模型搜索 · 查询发送给 {name}",
 			"status.sessionModelNeedsKey": "会话模型的 API Key 未设置",
 			"status.sessionModelNeedsSignIn": "请重新登录 DeepSeek 账号",
-			"status.reason.no-model": "本会话还没有选择模型",
+			"status.reason.no-model": "还不知道本会话下一次请求用哪个模型",
 			"status.reason.unknown-route": "无法读取会话模型服务商的设置",
 			"status.reason.protocol": "该路由在模型设置里没有声明支持的 api",
 			"status.reason.endpoint": "该路由在模型设置里没有固定的接口地址",
@@ -4903,11 +4955,11 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(style);
 		}
 		var Section_module_css_default = {
-			"caption": "La6KHG_caption",
-			"container": "La6KHG_container",
 			"segmented": "La6KHG_segmented",
+			"label": "La6KHG_label",
+			"container": "La6KHG_container",
 			"error": "La6KHG_error",
-			"label": "La6KHG_label"
+			"caption": "La6KHG_caption"
 		};
 		//#endregion
 		//#region src/client/section.ts
@@ -4974,73 +5026,73 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(style);
 		}
 		var Settings_module_css_default = {
-			"optionGroup": "o9fCSq_optionGroup",
-			"selectCompact": "o9fCSq_selectCompact",
-			"hint": "o9fCSq_hint",
-			"actions": "o9fCSq_actions",
-			"editorTitle": "o9fCSq_editorTitle",
-			"section": "o9fCSq_section",
-			"prefix": "o9fCSq_prefix",
-			"error": "o9fCSq_error",
-			"disclosure": "o9fCSq_disclosure",
-			"fieldHead": "o9fCSq_fieldHead",
+			"formField": "o9fCSq_formField",
+			"status": "o9fCSq_status",
 			"page": "o9fCSq_page",
-			"rowActions": "o9fCSq_rowActions",
-			"segmented": "o9fCSq_segmented",
+			"textarea": "o9fCSq_textarea",
 			"settingLead": "o9fCSq_settingLead",
-			"optionGroupTitle": "o9fCSq_optionGroupTitle",
-			"rowTitle": "o9fCSq_rowTitle",
-			"formField": "o9fCSq_formField",
-			"intro": "o9fCSq_intro",
-			"settingText": "o9fCSq_settingText",
-			"prefixedDisabled": "o9fCSq_prefixedDisabled",
-			"settingControl": "o9fCSq_settingControl",
-			"trustCheck": "o9fCSq_trustCheck",
-			"prefixed": "o9fCSq_prefixed",
+			"selectAnchor": "o9fCSq_selectAnchor",
+			"success": "o9fCSq_success",
 			"sectionHead": "o9fCSq_sectionHead",
-			"select": "o9fCSq_select",
-			"fieldError": "o9fCSq_fieldError",
-			"inline": "o9fCSq_inline",
-			"link": "o9fCSq_link",
-			"field": "o9fCSq_field",
-			"option": "o9fCSq_option",
-			"textarea": "o9fCSq_textarea",
-			"sectionActions": "o9fCSq_sectionActions",
-			"sectionTitle": "o9fCSq_sectionTitle",
 			"rowMeta": "o9fCSq_rowMeta",
-			"empty": "o9fCSq_empty",
-			"fieldState": "o9fCSq_fieldState",
-			"row": "o9fCSq_row",
 			"note": "o9fCSq_note",
+			"selectValue": "o9fCSq_selectValue",
+			"formGrid": "o9fCSq_formGrid",
+			"prefixedDisabled": "o9fCSq_prefixedDisabled",
+			"sectionActions": "o9fCSq_sectionActions",
+			"panel": "o9fCSq_panel",
+			"prefixed": "o9fCSq_prefixed",
+			"rowLine": "o9fCSq_rowLine",
+			"disclosureIcon": "o9fCSq_disclosureIcon",
+			"rowActions": "o9fCSq_rowActions",
+			"rowMain": "o9fCSq_rowMain",
+			"option": "o9fCSq_option",
+			"intro": "o9fCSq_intro",
+			"optionName": "o9fCSq_optionName",
 			"settingRow": "o9fCSq_settingRow",
-			"selectChevron": "o9fCSq_selectChevron",
+			"settingText": "o9fCSq_settingText",
+			"optionKey": "o9fCSq_optionKey",
+			"link": "o9fCSq_link",
 			"list": "o9fCSq_list",
-			"trust": "o9fCSq_trust",
-			"status": "o9fCSq_status",
-			"input": "o9fCSq_input",
-			"confirmRow": "o9fCSq_confirmRow",
-			"fieldLabel": "o9fCSq_fieldLabel",
+			"field": "o9fCSq_field",
+			"selectCompact": "o9fCSq_selectCompact",
 			"danger": "o9fCSq_danger",
-			"formGrid": "o9fCSq_formGrid",
-			"selectAnchor": "o9fCSq_selectAnchor",
+			"fieldLabel": "o9fCSq_fieldLabel",
+			"empty": "o9fCSq_empty",
+			"prefix": "o9fCSq_prefix",
+			"editorTitle": "o9fCSq_editorTitle",
+			"disclosureOpen": "o9fCSq_disclosureOpen",
 			"formWide": "o9fCSq_formWide",
-			"success": "o9fCSq_success",
+			"confirmText": "o9fCSq_confirmText",
+			"section": "o9fCSq_section",
+			"fieldHead": "o9fCSq_fieldHead",
+			"trustCheck": "o9fCSq_trustCheck",
+			"hint": "o9fCSq_hint",
+			"disclosure": "o9fCSq_disclosure",
+			"optionGroupTitle": "o9fCSq_optionGroupTitle",
+			"fieldError": "o9fCSq_fieldError",
+			"sectionTitle": "o9fCSq_sectionTitle",
+			"row": "o9fCSq_row",
 			"editor": "o9fCSq_editor",
-			"panel": "o9fCSq_panel",
-			"disclosureOpen": "o9fCSq_disclosureOpen",
+			"rowTitle": "o9fCSq_rowTitle",
+			"actions": "o9fCSq_actions",
+			"warning": "o9fCSq_warning",
+			"error": "o9fCSq_error",
 			"reset": "o9fCSq_reset",
-			"prefixedInput": "o9fCSq_prefixedInput",
-			"optionKey": "o9fCSq_optionKey",
-			"optionName": "o9fCSq_optionName",
-			"selectValue": "o9fCSq_selectValue",
-			"rowMain": "o9fCSq_rowMain",
-			"confirmText": "o9fCSq_confirmText",
+			"trust": "o9fCSq_trust",
 			"optionWide": "o9fCSq_optionWide",
-			"warning": "o9fCSq_warning",
-			"settingTitle": "o9fCSq_settingTitle",
-			"rowLine": "o9fCSq_rowLine",
 			"optionGrid": "o9fCSq_optionGrid",
-			"disclosureIcon": "o9fCSq_disclosureIcon"
+			"select": "o9fCSq_select",
+			"inline": "o9fCSq_inline",
+			"segmented": "o9fCSq_segmented",
+			"confirmRow": "o9fCSq_confirmRow",
+			"settingTitle": "o9fCSq_settingTitle",
+			"fieldState": "o9fCSq_fieldState",
+			"input": "o9fCSq_input",
+			"selectChevron": "o9fCSq_selectChevron",
+			"prefixedInput": "o9fCSq_prefixedInput",
+			"optionGroup": "o9fCSq_optionGroup",
+			"settingControl": "o9fCSq_settingControl"
 		};
 		//#endregion
 		//#region src/client/settings/CredentialEditor.tsx
@@ -5222,6 +5274,13 @@ window.__ModuleLoader__.load({
 				},
 				domain_type: { label: "option.tinyfish.domain_type" }
 			},
+			anysearch: {
+				zone: { label: "option.anysearch.zone" },
+				language: {
+					label: "option.anysearch.language",
+					placeholder: "option.anysearch.language.placeholder"
+				}
+			},
 			openalex: {
 				sort: {
 					label: "option.openalex.sort",
@@ -5777,7 +5836,11 @@ window.__ModuleLoader__.load({
 					}, "search: composer section");
 				});
 				scope.inject(["commandUi"], (command) => {
-					command.effect(() => command.commandUi.register(searchCommand(selection, t)), "search: /setup-search");
+					command.effect(() => command.commandUi.decorate(searchCommand(selection, t)), "search: /setup-search");
+					followHostCommand(command, SEARCH.command, (sessionId) => {
+						selection.invalidateSession(sessionId);
+						pairings.invalidate();
+					});
 				});
 				const invalidate = () => {
 					selection.invalidate();