@klarkxy/dsh-web-search-manager 0.2.4 → 0.3.0

package/lib/contracts.d.ts

@@ -40,6 +40,7 @@ interface WebSettings {
   searchProvider: string;
   fetchProvider: string;
   searchOrder: string[];
+  fetchOrder: string[];
   maxResults: number;
   maxQueries: number;
   timeoutMs: number;
@@ -54,6 +55,11 @@ declare function migrateSearchOrder(settings: {
   searchOrder?: string[];
   searchProvider?: string;
 }): string[];
+/** Missing order is a legacy single selection; an empty selection never opts in. */
+declare function migrateFetchOrder(settings: {
+  fetchOrder?: string[];
+  fetchProvider?: string;
+}): string[];
 declare function resolveSearchOrder(knownIds: readonly string[], settings: Pick<WebSettings, 'searchOrder' | 'searchProvider'>, _keyed: (id: string) => boolean): string[];
 declare function pickActiveSearch(order: readonly string[], configured: (id: string) => boolean): string;
 interface ProviderView extends ProviderDescriptor {
@@ -76,5 +82,5 @@ declare function providerKey(kind: ProviderKind, id: string): string;
 declare function safeConfigurationUrl(value: unknown): string | undefined;
 declare function validateBaseURL(value: string): string;
 //#endregion
-export { DEFAULT_SEARCH_ORDER, DiscoverableFetchProvider, DiscoverableSearchProvider, FetchProviderFactory, ProviderDescriptor, ProviderKind, ProviderOptions, ProviderView, RpcResult, SearchProviderFactory, WEB_MANAGER_OWNER, WEB_SEARCH_RPC_CHANNEL, WebSettings, WebStatus, defaultSearchOrder, defaultSettings, migrateSearchOrder, pickActiveSearch, providerKey, resolveSearchOrder, safeConfigurationUrl, validateBaseURL };
+export { DEFAULT_SEARCH_ORDER, DiscoverableFetchProvider, DiscoverableSearchProvider, FetchProviderFactory, ProviderDescriptor, ProviderKind, ProviderOptions, ProviderView, RpcResult, SearchProviderFactory, WEB_MANAGER_OWNER, WEB_SEARCH_RPC_CHANNEL, WebSettings, WebStatus, defaultSearchOrder, defaultSettings, migrateFetchOrder, migrateSearchOrder, pickActiveSearch, providerKey, resolveSearchOrder, safeConfigurationUrl, validateBaseURL };
 //# sourceMappingURL=contracts.d.ts.map

package/lib/contracts.js

@@ -9,6 +9,7 @@ const defaultSettings = () => ({
 	searchProvider: "ddg",
 	fetchProvider: "http",
 	searchOrder: [...DEFAULT_SEARCH_ORDER],
+	fetchOrder: ["http"],
 	maxResults: 5,
 	maxQueries: 1,
 	timeoutMs: 3e4,
@@ -22,6 +23,10 @@ function defaultSearchOrder(ids, keyed) {
 function migrateSearchOrder(settings) {
 	return settings.searchOrder ?? (settings.searchProvider ? [settings.searchProvider] : [...DEFAULT_SEARCH_ORDER]);
 }
+/** Missing order is a legacy single selection; an empty selection never opts in. */
+function migrateFetchOrder(settings) {
+	return settings.fetchOrder ?? (settings.fetchProvider ? [settings.fetchProvider] : []);
+}
 function resolveSearchOrder(knownIds, settings, _keyed) {
 	return [...new Set(settings.searchOrder.filter((id) => knownIds.includes(id)))];
 }
@@ -48,6 +53,6 @@ function validateBaseURL(value) {
 	return url.href.replace(/\/+$/, "");
 }
 //#endregion
-export { DEFAULT_SEARCH_ORDER, WEB_MANAGER_OWNER, WEB_SEARCH_RPC_CHANNEL, defaultSearchOrder, defaultSettings, migrateSearchOrder, pickActiveSearch, providerKey, resolveSearchOrder, safeConfigurationUrl, validateBaseURL };
+export { DEFAULT_SEARCH_ORDER, WEB_MANAGER_OWNER, WEB_SEARCH_RPC_CHANNEL, defaultSearchOrder, defaultSettings, migrateFetchOrder, migrateSearchOrder, pickActiveSearch, providerKey, resolveSearchOrder, safeConfigurationUrl, validateBaseURL };
 
 //# sourceMappingURL=contracts.js.map

package/lib/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","names":[],"sources":["../src/contracts.ts"],"sourcesContent":["import type { WebFetchProvider, WebSearchProvider } from '@deepseek-ai/dsh-web'\nimport type { DshWebManagementDescriptor } from '@klarkxy/dsh-plugin-kit/contracts'\n\nexport const WEB_SEARCH_RPC_CHANNEL = '/web-search-manager'\nexport type RpcResult<T = unknown> = { ok: true; value: T } | {\n  ok: false; error: { code: string; message: string; details: Record<string, unknown> }\n}\nexport type ProviderKind = 'search' | 'fetch'\n/** Management metadata only. Field contract lives in plugin-kit; execution stays with ctx.web. */\nexport interface ProviderDescriptor extends DshWebManagementDescriptor {}\nexport const WEB_MANAGER_OWNER = '@klarkxy/dsh-web-search-manager'\n/** Optional display metadata on a provider registered directly with ctx.web. */\nexport type DiscoverableSearchProvider = WebSearchProvider & { readonly dshWebManagement?: ProviderDescriptor }\nexport type DiscoverableFetchProvider = WebFetchProvider & { readonly dshWebManagement?: ProviderDescriptor }\nexport interface ProviderOptions {\n  readonly apiKey?: string\n  readonly baseURL?: string\n  readonly timeoutMs: number\n  readonly maxFetchChars: number\n}\nexport type SearchProviderFactory = (options: ProviderOptions) => WebSearchProvider\nexport type FetchProviderFactory = (options: ProviderOptions) => WebFetchProvider\n/** Never store credential values here. Keys are resolved by reference per call. */\nexport interface WebSettings {\n  revision: number\n  searchEnabled: boolean\n  fetchEnabled: boolean\n  searchProvider: string\n  fetchProvider: string\n  searchOrder: string[]\n  maxResults: number\n  maxQueries: number\n  timeoutMs: number\n  maxFetchChars: number\n  endpoints: Record<string, string>\n}\nexport const DEFAULT_SEARCH_ORDER = ['ddg'] as const\n\nexport const defaultSettings = (): WebSettings => ({\n  revision: 0, searchEnabled: true, fetchEnabled: true,\n  searchProvider: 'ddg', fetchProvider: 'http', searchOrder: [...DEFAULT_SEARCH_ORDER],\n  maxResults: 5, maxQueries: 1,\n  timeoutMs: 30_000, maxFetchChars: 100_000, endpoints: {},\n})\n\n/** Keyed backends first, keyless last — same idea as OpenClaw auto-detect. */\nexport function defaultSearchOrder(ids: readonly string[], keyed: (id: string) => boolean): string[] {\n  return [...ids.filter(keyed), ...ids.filter(id => !keyed(id))]\n}\n\nexport function migrateSearchOrder(settings: { searchOrder?: string[]; searchProvider?: string }): string[] {\n  return settings.searchOrder ?? (settings.searchProvider ? [settings.searchProvider] : [...DEFAULT_SEARCH_ORDER])\n}\n\nexport function resolveSearchOrder(\n  knownIds: readonly string[],\n  settings: Pick<WebSettings, 'searchOrder' | 'searchProvider'>,\n  _keyed: (id: string) => boolean,\n): string[] {\n  return [...new Set(settings.searchOrder.filter(id => knownIds.includes(id)))]\n}\n\nexport function pickActiveSearch(order: readonly string[], configured: (id: string) => boolean): string {\n  return order.find(configured) ?? ''\n}\nexport interface ProviderView extends ProviderDescriptor {\n  kind: ProviderKind\n  configured: boolean\n  /** True only for configuration explicitly owned by this manager bundle. */\n  configurationOwned?: boolean\n  baseURL?: string\n  calls: number\n  failures: number\n}\nexport interface WebStatus {\n  settings: WebSettings\n  providers: ProviderView[]\n  searchActive: boolean\n  fetchActive: boolean\n  storageFailed: boolean\n}\nexport function providerKey(kind: ProviderKind, id: string): string { return `${kind}:${id}` }\nexport function safeConfigurationUrl(value: unknown): string | undefined {\n  if (typeof value !== 'string' || !value || /[\\u0000-\\u0020\\\\]/.test(value)) return\n  try {\n    const url = new URL(value, 'https://dsh.invalid')\n    if (url.username || url.password) return\n    if ((value.startsWith('/') && !value.startsWith('//')) || value.startsWith('#')) {\n      return url.origin === 'https://dsh.invalid' ? value : undefined\n    }\n    return /^https:\\/\\//i.test(value) && url.protocol === 'https:' ? value : undefined\n  } catch { return }\n}\nexport function validateBaseURL(value: string): string {\n  const url = new URL(value)\n  if (url.protocol !== 'https:' || url.username || url.password || url.search || url.hash) {\n    throw new Error('供应商地址必须是 HTTPS，且不能包含用户名、密码、查询参数或片段。')\n  }\n  return url.href.replace(/\\/+$/, '')\n}\n"],"mappings":";AAGA,MAAa,yBAAyB;AAOtC,MAAa,oBAAoB;AA0BjC,MAAa,uBAAuB,CAAC,KAAK;AAE1C,MAAa,yBAAsC;CACjD,UAAU;CAAG,eAAe;CAAM,cAAc;CAChD,gBAAgB;CAAO,eAAe;CAAQ,aAAa,CAAC,GAAG,oBAAoB;CACnF,YAAY;CAAG,YAAY;CAC3B,WAAW;CAAQ,eAAe;CAAS,WAAW,CAAC;AACzD;;AAGA,SAAgB,mBAAmB,KAAwB,OAA0C;CACnG,OAAO,CAAC,GAAG,IAAI,OAAO,KAAK,GAAG,GAAG,IAAI,QAAO,OAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAC/D;AAEA,SAAgB,mBAAmB,UAAyE;CAC1G,OAAO,SAAS,gBAAgB,SAAS,iBAAiB,CAAC,SAAS,cAAc,IAAI,CAAC,GAAG,oBAAoB;AAChH;AAEA,SAAgB,mBACd,UACA,UACA,QACU;CACV,OAAO,CAAC,GAAG,IAAI,IAAI,SAAS,YAAY,QAAO,OAAM,SAAS,SAAS,EAAE,CAAC,CAAC,CAAC;AAC9E;AAEA,SAAgB,iBAAiB,OAA0B,YAA6C;CACtG,OAAO,MAAM,KAAK,UAAU,KAAK;AACnC;AAiBA,SAAgB,YAAY,MAAoB,IAAoB;CAAE,OAAO,GAAG,KAAK,GAAG;AAAK;AAC7F,SAAgB,qBAAqB,OAAoC;CACvE,IAAI,OAAO,UAAU,YAAY,CAAC,SAAS,oBAAoB,KAAK,KAAK,GAAG;CAC5E,IAAI;EACF,MAAM,MAAM,IAAI,IAAI,OAAO,qBAAqB;EAChD,IAAI,IAAI,YAAY,IAAI,UAAU;EAClC,IAAK,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,WAAW,IAAI,KAAM,MAAM,WAAW,GAAG,GAC5E,OAAO,IAAI,WAAW,wBAAwB,QAAQ,KAAA;EAExD,OAAO,eAAe,KAAK,KAAK,KAAK,IAAI,aAAa,WAAW,QAAQ,KAAA;CAC3E,QAAQ;EAAE;CAAO;AACnB;AACA,SAAgB,gBAAgB,OAAuB;CACrD,MAAM,MAAM,IAAI,IAAI,KAAK;CACzB,IAAI,IAAI,aAAa,YAAY,IAAI,YAAY,IAAI,YAAY,IAAI,UAAU,IAAI,MACjF,MAAM,IAAI,MAAM,qCAAqC;CAEvD,OAAO,IAAI,KAAK,QAAQ,QAAQ,EAAE;AACpC"}
+{"version":3,"file":"contracts.js","names":[],"sources":["../src/contracts.ts"],"sourcesContent":["import type { WebFetchProvider, WebSearchProvider } from '@deepseek-ai/dsh-web'\nimport type { DshWebManagementDescriptor } from '@klarkxy/dsh-plugin-kit/contracts'\n\nexport const WEB_SEARCH_RPC_CHANNEL = '/web-search-manager'\nexport type RpcResult<T = unknown> = { ok: true; value: T } | {\n  ok: false; error: { code: string; message: string; details: Record<string, unknown> }\n}\nexport type ProviderKind = 'search' | 'fetch'\n/** Management metadata only. Field contract lives in plugin-kit; execution stays with ctx.web. */\nexport interface ProviderDescriptor extends DshWebManagementDescriptor {}\nexport const WEB_MANAGER_OWNER = '@klarkxy/dsh-web-search-manager'\n/** Optional display metadata on a provider registered directly with ctx.web. */\nexport type DiscoverableSearchProvider = WebSearchProvider & { readonly dshWebManagement?: ProviderDescriptor }\nexport type DiscoverableFetchProvider = WebFetchProvider & { readonly dshWebManagement?: ProviderDescriptor }\nexport interface ProviderOptions {\n  readonly apiKey?: string\n  readonly baseURL?: string\n  readonly timeoutMs: number\n  readonly maxFetchChars: number\n}\nexport type SearchProviderFactory = (options: ProviderOptions) => WebSearchProvider\nexport type FetchProviderFactory = (options: ProviderOptions) => WebFetchProvider\n/** Never store credential values here. Keys are resolved by reference per call. */\nexport interface WebSettings {\n  revision: number\n  searchEnabled: boolean\n  fetchEnabled: boolean\n  searchProvider: string\n  fetchProvider: string\n  searchOrder: string[]\n  fetchOrder: string[]\n  maxResults: number\n  maxQueries: number\n  timeoutMs: number\n  maxFetchChars: number\n  endpoints: Record<string, string>\n}\nexport const DEFAULT_SEARCH_ORDER = ['ddg'] as const\n\nexport const defaultSettings = (): WebSettings => ({\n  revision: 0, searchEnabled: true, fetchEnabled: true,\n  searchProvider: 'ddg', fetchProvider: 'http', searchOrder: [...DEFAULT_SEARCH_ORDER], fetchOrder: ['http'],\n  maxResults: 5, maxQueries: 1,\n  timeoutMs: 30_000, maxFetchChars: 100_000, endpoints: {},\n})\n\n/** Keyed backends first, keyless last — same idea as OpenClaw auto-detect. */\nexport function defaultSearchOrder(ids: readonly string[], keyed: (id: string) => boolean): string[] {\n  return [...ids.filter(keyed), ...ids.filter(id => !keyed(id))]\n}\n\nexport function migrateSearchOrder(settings: { searchOrder?: string[]; searchProvider?: string }): string[] {\n  return settings.searchOrder ?? (settings.searchProvider ? [settings.searchProvider] : [...DEFAULT_SEARCH_ORDER])\n}\n\n/** Missing order is a legacy single selection; an empty selection never opts in. */\nexport function migrateFetchOrder(settings: { fetchOrder?: string[]; fetchProvider?: string }): string[] {\n  return settings.fetchOrder ?? (settings.fetchProvider ? [settings.fetchProvider] : [])\n}\n\nexport function resolveSearchOrder(\n  knownIds: readonly string[],\n  settings: Pick<WebSettings, 'searchOrder' | 'searchProvider'>,\n  _keyed: (id: string) => boolean,\n): string[] {\n  return [...new Set(settings.searchOrder.filter(id => knownIds.includes(id)))]\n}\n\nexport function pickActiveSearch(order: readonly string[], configured: (id: string) => boolean): string {\n  return order.find(configured) ?? ''\n}\nexport interface ProviderView extends ProviderDescriptor {\n  kind: ProviderKind\n  configured: boolean\n  /** True only for configuration explicitly owned by this manager bundle. */\n  configurationOwned?: boolean\n  baseURL?: string\n  calls: number\n  failures: number\n}\nexport interface WebStatus {\n  settings: WebSettings\n  providers: ProviderView[]\n  searchActive: boolean\n  fetchActive: boolean\n  storageFailed: boolean\n}\nexport function providerKey(kind: ProviderKind, id: string): string { return `${kind}:${id}` }\nexport function safeConfigurationUrl(value: unknown): string | undefined {\n  if (typeof value !== 'string' || !value || /[\\u0000-\\u0020\\\\]/.test(value)) return\n  try {\n    const url = new URL(value, 'https://dsh.invalid')\n    if (url.username || url.password) return\n    if ((value.startsWith('/') && !value.startsWith('//')) || value.startsWith('#')) {\n      return url.origin === 'https://dsh.invalid' ? value : undefined\n    }\n    return /^https:\\/\\//i.test(value) && url.protocol === 'https:' ? value : undefined\n  } catch { return }\n}\nexport function validateBaseURL(value: string): string {\n  const url = new URL(value)\n  if (url.protocol !== 'https:' || url.username || url.password || url.search || url.hash) {\n    throw new Error('供应商地址必须是 HTTPS，且不能包含用户名、密码、查询参数或片段。')\n  }\n  return url.href.replace(/\\/+$/, '')\n}\n"],"mappings":";AAGA,MAAa,yBAAyB;AAOtC,MAAa,oBAAoB;AA2BjC,MAAa,uBAAuB,CAAC,KAAK;AAE1C,MAAa,yBAAsC;CACjD,UAAU;CAAG,eAAe;CAAM,cAAc;CAChD,gBAAgB;CAAO,eAAe;CAAQ,aAAa,CAAC,GAAG,oBAAoB;CAAG,YAAY,CAAC,MAAM;CACzG,YAAY;CAAG,YAAY;CAC3B,WAAW;CAAQ,eAAe;CAAS,WAAW,CAAC;AACzD;;AAGA,SAAgB,mBAAmB,KAAwB,OAA0C;CACnG,OAAO,CAAC,GAAG,IAAI,OAAO,KAAK,GAAG,GAAG,IAAI,QAAO,OAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAC/D;AAEA,SAAgB,mBAAmB,UAAyE;CAC1G,OAAO,SAAS,gBAAgB,SAAS,iBAAiB,CAAC,SAAS,cAAc,IAAI,CAAC,GAAG,oBAAoB;AAChH;;AAGA,SAAgB,kBAAkB,UAAuE;CACvG,OAAO,SAAS,eAAe,SAAS,gBAAgB,CAAC,SAAS,aAAa,IAAI,CAAC;AACtF;AAEA,SAAgB,mBACd,UACA,UACA,QACU;CACV,OAAO,CAAC,GAAG,IAAI,IAAI,SAAS,YAAY,QAAO,OAAM,SAAS,SAAS,EAAE,CAAC,CAAC,CAAC;AAC9E;AAEA,SAAgB,iBAAiB,OAA0B,YAA6C;CACtG,OAAO,MAAM,KAAK,UAAU,KAAK;AACnC;AAiBA,SAAgB,YAAY,MAAoB,IAAoB;CAAE,OAAO,GAAG,KAAK,GAAG;AAAK;AAC7F,SAAgB,qBAAqB,OAAoC;CACvE,IAAI,OAAO,UAAU,YAAY,CAAC,SAAS,oBAAoB,KAAK,KAAK,GAAG;CAC5E,IAAI;EACF,MAAM,MAAM,IAAI,IAAI,OAAO,qBAAqB;EAChD,IAAI,IAAI,YAAY,IAAI,UAAU;EAClC,IAAK,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,WAAW,IAAI,KAAM,MAAM,WAAW,GAAG,GAC5E,OAAO,IAAI,WAAW,wBAAwB,QAAQ,KAAA;EAExD,OAAO,eAAe,KAAK,KAAK,KAAK,IAAI,aAAa,WAAW,QAAQ,KAAA;CAC3E,QAAQ;EAAE;CAAO;AACnB;AACA,SAAgB,gBAAgB,OAAuB;CACrD,MAAM,MAAM,IAAI,IAAI,KAAK;CACzB,IAAI,IAAI,aAAa,YAAY,IAAI,YAAY,IAAI,YAAY,IAAI,UAAU,IAAI,MACjF,MAAM,IAAI,MAAM,qCAAqC;CAEvD,OAAO,IAAI,KAAK,QAAQ,QAAQ,EAAE;AACpC"}

package/lib/index.d.ts

@@ -11,8 +11,9 @@ interface WebRegistry {
 //#region src/manager.d.ts
 interface ManagerOptions {
   web: WebRegistry;
-  initial?: Omit<WebSettings, 'searchOrder'> & {
+  initial?: Omit<WebSettings, 'searchOrder' | 'fetchOrder'> & {
     searchOrder?: string[];
+    fetchOrder?: string[];
   };
   resolveCredential(ref: string): Promise<string | undefined>;
   save(settings: WebSettings): Promise<void>;
@@ -31,6 +32,7 @@ declare class WebSearchManager {
   private refreshRevision;
   private detach;
   private legacyRegistrations;
+  private work;
   constructor(options: ManagerOptions);
   subscribe(listener: () => void): () => void;
   private notify;
@@ -40,6 +42,7 @@ declare class WebSearchManager {
   private ready;
   private searchOrder;
   private activeSearchId;
+  private activeFetchId;
   private selected;
   status(): WebStatus;
   refresh(): Promise<WebStatus>;
@@ -52,7 +55,9 @@ declare class WebSearchManager {
   private providerConfiguration;
   private legacyRegistration;
   private execute;
-  update(next: Omit<WebSettings, 'revision'>, expectedRevision: number): Promise<WebStatus>;
+  update(next: Omit<WebSettings, 'revision' | 'fetchOrder'> & {
+    fetchOrder?: string[];
+  }, expectedRevision: number): Promise<WebStatus>;
   dispose(): Promise<void>;
 }
 //#endregion

package/lib/index.js

@@ -1,4 +1,4 @@
-import { WEB_MANAGER_OWNER, WEB_SEARCH_RPC_CHANNEL, defaultSettings, migrateSearchOrder, pickActiveSearch, providerKey, resolveSearchOrder, safeConfigurationUrl, validateBaseURL } from "./contracts.js";
+import { WEB_MANAGER_OWNER, WEB_SEARCH_RPC_CHANNEL, defaultSettings, migrateFetchOrder, migrateSearchOrder, pickActiveSearch, providerKey, resolveSearchOrder, safeConfigurationUrl, validateBaseURL } from "./contracts.js";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { WebError } from "@deepseek-ai/dsh-web";
 import { WEB_PROVIDER_AVAILABILITY_EVENT } from "@klarkxy/dsh-plugin-kit/contracts";
@@ -40,26 +40,19 @@ function readerContent(result) {
 	if (!marker || /^Warning:/im.test(content.slice(0, marker.index))) return void 0;
 	return content.slice(marker.index + marker[0].length).trim() ? content : void 0;
 }
-/** Bound the Reader stage even if a provider fails to honour its cooperative signal. */
+/** Abort the Reader deadline and wait for its transport to release resources before fallback. */
 async function readWithTimeout(read, timeoutMs, parent) {
 	parent?.throwIfAborted();
 	const controller = new AbortController();
 	const signal = parent ? AbortSignal.any([parent, controller.signal]) : controller.signal;
 	const timer = setTimeout(() => controller.abort(), timeoutMs);
-	let off = () => {};
-	const aborted = new Promise((_, reject) => {
-		const onAbort = () => reject(signal.reason);
-		signal.addEventListener("abort", onAbort, { once: true });
-		off = () => signal.removeEventListener("abort", onAbort);
-	});
 	try {
-		return await Promise.race([Promise.resolve().then(() => {
-			signal.throwIfAborted();
-			return read(signal);
-		}), aborted]);
+		signal.throwIfAborted();
+		const result = await read(signal);
+		signal.throwIfAborted();
+		return result;
 	} finally {
 		clearTimeout(timer);
-		off();
 	}
 }
 /** One managed fetch route: anonymous Jina Reader first, existing safe HTTP transport second. */
@@ -417,6 +410,57 @@ const SerperSearchProvider = createRestSearch({
 		return Array.isArray(organic) ? organic.flatMap((row) => sourceFrom(row, "link", "title", "snippet") ?? []) : [];
 	}
 });
+const PerplexitySearchProvider = createRestSearch({
+	id: "perplexity",
+	fallback: "https://api.perplexity.ai",
+	path: "/search",
+	method: "POST",
+	headers: (apiKey) => ({
+		authorization: `Bearer ${apiKey}`,
+		"content-type": "application/json"
+	}),
+	body: ({ query, count }) => ({
+		query,
+		max_results: count,
+		search_type: "web"
+	}),
+	parse(payload) {
+		const results = record(payload)?.results;
+		if (!Array.isArray(results)) throw new Error("Perplexity returned no results array.");
+		return results.flatMap((row) => sourceFrom(row, "url", "title", "snippet") ?? []);
+	}
+});
+const YouSearchProvider = createRestSearch({
+	id: "you",
+	fallback: "https://ydc-index.io",
+	path: "/v1/search",
+	method: "POST",
+	headers: (apiKey) => ({
+		"x-api-key": apiKey,
+		"content-type": "application/json"
+	}),
+	body: ({ query, count }) => ({
+		query,
+		count
+	}),
+	parse(payload) {
+		const results = record(record(payload)?.results);
+		if (!results || !Array.isArray(results.web) && !Array.isArray(results.news)) throw new Error("You.com returned no search results arrays.");
+		const rows = [...Array.isArray(results.web) ? results.web : [], ...Array.isArray(results.news) ? results.news : []];
+		const seen = /* @__PURE__ */ new Set();
+		return rows.flatMap((raw) => {
+			const row = record(raw);
+			const snippets = Array.isArray(row?.snippets) ? row.snippets.filter((value) => typeof value === "string").join("\n") : "";
+			const source = sourceFrom({
+				...row,
+				snippet: snippets || row?.description
+			}, "url", "title", "snippet");
+			if (!source || seen.has(source.url)) return [];
+			seen.add(source.url);
+			return [source];
+		});
+	}
+});
 const FirecrawlSearchProvider = createRestSearch({
 	id: "firecrawl",
 	fallback: "https://api.firecrawl.dev",
@@ -436,6 +480,76 @@ const FirecrawlSearchProvider = createRestSearch({
 	}
 });
 //#endregion
+//#region src/firecrawl-fetch.ts
+function pageURL(value) {
+	if (typeof value !== "string") throw new WebError("Firecrawl 未返回最终网页地址。", "WEB_PROVIDER_ERROR");
+	const url = new URL(value);
+	if (!["http:", "https:"].includes(url.protocol) || url.username || url.password) throw new WebError("网页地址无效。", "WEB_INVALID_URL");
+	return url.href;
+}
+/** https://docs.firecrawl.dev/api-reference/endpoint/scrape — API HTTP status is not the page status. */
+var FirecrawlFetchProvider = class {
+	options;
+	id = "firecrawl";
+	constructor(options) {
+		this.options = options;
+	}
+	available() {
+		try {
+			httpsEndpoint(this.options.baseURL ?? "https://api.firecrawl.dev", "/v2/scrape");
+			return Boolean(this.options.apiKey.trim());
+		} catch {
+			return false;
+		}
+	}
+	async fetch(request, signal) {
+		if (!this.available()) throw new WebError("Firecrawl 配置不可用。", "WEB_CREDENTIAL_MISSING");
+		try {
+			signal?.throwIfAborted();
+			const url = pageURL(request.url);
+			const response = await (this.options.fetch ?? fetch)(httpsEndpoint(this.options.baseURL ?? "https://api.firecrawl.dev", "/v2/scrape"), {
+				method: "POST",
+				redirect: "error",
+				signal,
+				headers: {
+					accept: "application/json",
+					authorization: `Bearer ${this.options.apiKey}`,
+					"content-type": "application/json"
+				},
+				body: JSON.stringify({
+					url,
+					formats: ["markdown"],
+					onlyMainContent: true,
+					skipTlsVerification: false
+				})
+			});
+			if (!response.ok) {
+				await response.body?.cancel().catch(() => {});
+				throw new HttpStatusError(response.status);
+			}
+			const payload = record(await readJSON(response, signal));
+			signal?.throwIfAborted();
+			const data = record(payload?.data), metadata = record(data?.metadata);
+			const statusCode = metadata?.statusCode;
+			if (payload?.success !== true || typeof data?.markdown !== "string" || typeof statusCode !== "number" || !Number.isInteger(statusCode) || statusCode < 100 || statusCode > 599) throw new WebError("Firecrawl 未返回正文和真实网页状态码。", "WEB_PROVIDER_ERROR");
+			const finalURL = pageURL(metadata?.url);
+			const limit = this.options.maxFetchChars ?? 1e5;
+			return {
+				url: finalURL,
+				statusCode,
+				body: {
+					kind: "text",
+					content: data.markdown.slice(0, limit)
+				},
+				truncated: data.markdown.length > limit
+			};
+		} catch (error) {
+			if (signal?.aborted) throw new WebError("网页读取已取消。", "WEB_ABORTED");
+			throw providerError(error, [this.options.apiKey]);
+		}
+	}
+};
+//#endregion
 //#region src/tavily.ts
 /** Direct REST adapter. No auxiliary LLM, retries, anonymous fallback or auto-depth. */
 var TavilySearchProvider = class {
@@ -577,18 +691,81 @@ function registerNativeFetch(web, configuration, descriptor, factory) {
 //#endregion
 //#region src/web-registry.ts
 const owner = Symbol.for("@klarkxy/dsh-web-search-manager/registry-owner");
-/** The only private-host boundary. Verified against DSH 0.2.0-rc.2.
-* Keep the actual Maps: Cordis effects capture them for automatic unregistration.
-* Replace this bridge when the host exposes enumeration/selection publicly.
+/** The only private-host boundary. Public ctx.web has no selection API.
+* Old hosts snapshot config/env into own searchProviderId/fetchProviderId.
+* Current hosts read config.searchProvider.get() ?? searchProviderEnv on each call
+* (fetch uses the matching pair). Keep the actual Maps: Cordis effects capture them.
 */
 function runtimeOf(web) {
 	const runtime = web;
-	if (!(runtime.searchProviders instanceof Map) || !(runtime.fetchProviders instanceof Map) || !Object.hasOwn(runtime, "searchProviderId") || !Object.hasOwn(runtime, "fetchProviderId")) throw new WebError("当前 ctx.web 不支持注册表管理，请使用兼容的 DSH 版本。", "WEB_REGISTRY_UNSUPPORTED");
+	const maps = runtime.searchProviders instanceof Map && runtime.fetchProviders instanceof Map;
+	const legacy = Object.hasOwn(runtime, "searchProviderId") && Object.hasOwn(runtime, "fetchProviderId");
+	const current = Object.hasOwn(runtime, "searchProviderEnv") && Object.hasOwn(runtime, "fetchProviderEnv") && typeof runtime.config?.searchProvider?.get === "function" && typeof runtime.config?.fetchProvider?.get === "function";
+	if (!maps || !legacy && !current) throw new WebError("当前 ctx.web 不支持注册表管理，请使用兼容的 DSH 版本。", "WEB_REGISTRY_UNSUPPORTED");
 	return runtime;
 }
 function hasWebProvider(web, kind, id) {
 	return runtimeOf(web)[kind === "search" ? "searchProviders" : "fetchProviders"].has(id);
 }
+/** Hide one volatile selection field without replacing the object the settings UI reads.
+* The host builds these with cosmokit's createVolatile and freezes them, so `get` is an own
+* non-configurable data property that a get trap may not answer differently. Return a standalone
+* facade instead of wrapping the cell: the call path reads one thing from it, config.<field>.get().
+*/
+function selectionView(field) {
+	if (!field || typeof field !== "object" && typeof field !== "function") return field;
+	return Object.freeze({ get: () => void 0 });
+}
+/** One call sees no host selection. Config, its volatile source, and env stay on the real runtime.
+* Cordis reads own data properties from the service and ignores an Object.create overlay, so this
+* has to be a get trap. Other reads go to the traced receiver and keep that call's context. Config
+* is proxied over an empty target for the same reason as the cell: a host that froze it would make
+* the two selection fields non-configurable own properties, which no get trap may replace.
+*/
+function unmanagedView(runtime, callReceiver) {
+	return new Proxy(runtime, { get(target, key, receiver) {
+		if (key === "searchProviderId" || key === "fetchProviderId" || key === "searchProviderEnv" || key === "fetchProviderEnv") return void 0;
+		if (key === "config") {
+			const config = Reflect.get(target, "config", target) ?? {};
+			return new Proxy({}, { get(_view, configKey) {
+				if (configKey === "searchProvider" || configKey === "fetchProvider") return selectionView(Reflect.get(config, configKey, config));
+				return Reflect.get(config, configKey, config);
+			} });
+		}
+		if (callReceiver !== target && callReceiver !== receiver) return Reflect.get(callReceiver, key, callReceiver);
+		return Reflect.get(target, key, target);
+	} });
+}
+function isThisRuntime(runtime, receiver) {
+	if (receiver === runtime) return true;
+	try {
+		return Reflect.get(receiver, "searchProviders", receiver) === runtime.searchProviders && Reflect.get(receiver, "fetchProviders", receiver) === runtime.fetchProviders;
+	} catch {
+		return false;
+	}
+}
+function installCallView(runtime, key, undo) {
+	if (Object.hasOwn(runtime, key)) throw new TypeError(`ctx.web.${key} is already owned by this runtime`);
+	let prototype = Object.getPrototypeOf(runtime);
+	while (prototype && !Object.hasOwn(prototype, key)) prototype = Object.getPrototypeOf(prototype);
+	const inherited = prototype ? Object.getOwnPropertyDescriptor(prototype, key) : void 0;
+	if (!inherited || !("value" in inherited) || typeof inherited.value !== "function") throw new TypeError(`ctx.web.${key} is not a replaceable method`);
+	const original = inherited.value;
+	const wrapped = function(...args) {
+		const receiver = isThisRuntime(runtime, this) ? unmanagedView(runtime, this) : this;
+		return original.call(receiver, ...args);
+	};
+	Object.defineProperty(runtime, key, {
+		value: wrapped,
+		writable: true,
+		configurable: true,
+		enumerable: false
+	});
+	undo.push(() => {
+		if (Object.getOwnPropertyDescriptor(runtime, key)?.value !== wrapped) return;
+		delete runtime[key];
+	});
+}
 function observeWebRegistry(web, hooks) {
 	const runtime = runtimeOf(web);
 	const maps = [runtime.searchProviders, runtime.fetchProviders];
@@ -656,16 +833,8 @@ function observeWebRegistry(web, hooks) {
 				});
 			}
 		}
-		for (const key of ["searchProviderId", "fetchProviderId"]) {
-			const before = Object.getOwnPropertyDescriptor(runtime, key);
-			Object.defineProperty(runtime, key, {
-				...before,
-				value: void 0
-			});
-			undo.push(() => {
-				if (runtime[key] === void 0) Object.defineProperty(runtime, key, before);
-			});
-		}
+		installCallView(runtime, "search", undo);
+		installCallView(runtime, "fetch", undo);
 	} catch (error) {
 		for (const restore of undo.reverse()) restore();
 		throw new WebError("无法接管 ctx.web 注册表，已恢复原状。", "WEB_REGISTRY_UNSUPPORTED", { cause: error });
@@ -778,6 +947,8 @@ function registerBuiltins(web, configuration) {
 			defaultBaseURL: "https://api.firecrawl.dev",
 			credentialRef: "DSH_EDITOR_WEB_FIRECRAWL_API_KEY",
 			billing: "request",
+			credentialShared: true,
+			credentialHint: "与 Firecrawl 网页读取共用 Key",
 			signupUrl: "https://www.firecrawl.dev"
 		}, (options) => new FirecrawlSearchProvider({
 			apiKey: options.apiKey ?? "",
@@ -795,6 +966,30 @@ function registerBuiltins(web, configuration) {
 			apiKey: options.apiKey ?? "",
 			baseURL: options.baseURL
 		}));
+		registerSearch({
+			id: "perplexity",
+			label: "Perplexity",
+			description: "Search API；返回网页来源，不生成回答。",
+			defaultBaseURL: "https://api.perplexity.ai",
+			credentialRef: "DSH_EDITOR_WEB_PERPLEXITY_API_KEY",
+			billing: "request",
+			signupUrl: "https://console.perplexity.ai"
+		}, (options) => new PerplexitySearchProvider({
+			apiKey: options.apiKey ?? "",
+			baseURL: options.baseURL
+		}));
+		registerSearch({
+			id: "you",
+			label: "You.com",
+			description: "网页与新闻搜索；不额外提取全文。",
+			defaultBaseURL: "https://ydc-index.io",
+			credentialRef: "DSH_EDITOR_WEB_YOU_API_KEY",
+			billing: "request",
+			signupUrl: "https://you.com/platform"
+		}, (options) => new YouSearchProvider({
+			apiKey: options.apiKey ?? "",
+			baseURL: options.baseURL
+		}));
 		registerFetch({
 			id: "http-managed",
 			legacyId: "http",
@@ -820,6 +1015,21 @@ function registerBuiltins(web, configuration) {
 				readerTimeoutMs
 			});
 		});
+		registerFetch({
+			id: "firecrawl",
+			label: "Firecrawl",
+			description: "读取网页 Markdown；与 Firecrawl 搜索共用 Key。",
+			defaultBaseURL: "https://api.firecrawl.dev",
+			credentialRef: "DSH_EDITOR_WEB_FIRECRAWL_API_KEY",
+			billing: "request",
+			credentialShared: true,
+			credentialHint: "与 Firecrawl 搜索共用 Key",
+			signupUrl: "https://www.firecrawl.dev"
+		}, (options) => new FirecrawlFetchProvider({
+			apiKey: options.apiKey ?? "",
+			baseURL: options.baseURL,
+			maxFetchChars: options.maxFetchChars
+		}));
 	} catch (error) {
 		for (const off of registered.reverse()) off();
 		throw error;
@@ -843,24 +1053,6 @@ function bounded(value, min, max, label) {
 	if (!Number.isInteger(value) || value < min || value > max) fail("WEB_INVALID_CONFIG", `${label}须为 ${min} 至 ${max} 的整数。`);
 	return value;
 }
-/** Enforce cancellation even when an extension ignores its cooperative signal. */
-async function abortable(work, signal) {
-	signal.throwIfAborted();
-	let off = () => {};
-	const aborted = new Promise((_, reject) => {
-		const onAbort = () => reject(new WebError("网络请求已取消或超时。", "WEB_ABORTED"));
-		signal.addEventListener("abort", onAbort, { once: true });
-		off = () => signal.removeEventListener("abort", onAbort);
-	});
-	try {
-		return await Promise.race([Promise.resolve().then(() => {
-			signal.throwIfAborted();
-			return work();
-		}), aborted]);
-	} finally {
-		off();
-	}
-}
 /** Manages consent and provider lifecycle. Selection and execution stay in ctx.web. */
 var WebSearchManager = class {
 	options;
@@ -875,13 +1067,15 @@ var WebSearchManager = class {
 	refreshRevision = 0;
 	detach;
 	legacyRegistrations = /* @__PURE__ */ new Set();
+	work = /* @__PURE__ */ new Map();
 	constructor(options) {
 		this.options = options;
 		const initial = structuredClone(options.initial ?? defaultSettings());
 		this.settings = {
 			...defaultSettings(),
 			...initial,
-			searchOrder: migrateSearchOrder(initial)
+			searchOrder: migrateSearchOrder(initial),
+			fetchOrder: migrateFetchOrder(initial)
 		};
 		this.detach = observeWebRegistry(options.web, {
 			add: (kind, provider) => this.discover(kind, provider),
@@ -930,16 +1124,25 @@ var WebSearchManager = class {
 	activeSearchId(settings = this.settings) {
 		return pickActiveSearch(this.searchOrder(settings), (id) => this.configured(id));
 	}
+	activeFetchId(settings = this.settings) {
+		return settings.fetchOrder.find((id) => {
+			const entry = this.entries.get(providerKey("fetch", id));
+			return entry !== void 0 && this.ready(entry);
+		}) ?? "";
+	}
 	selected(entry) {
 		if (this.disposed || this.suspended || !this.ready(entry)) return false;
 		if (this.entries.get(providerKey(entry.kind, entry.descriptor.id)) !== entry) return false;
-		if (entry.kind === "fetch") return this.settings.fetchEnabled && this.settings.fetchProvider === entry.descriptor.id && this.entries.get(providerKey("fetch", entry.descriptor.id)) === entry;
+		if (entry.kind === "fetch") return this.settings.fetchEnabled && this.activeFetchId() === entry.descriptor.id;
 		return this.settings.searchEnabled && this.activeSearchId() === entry.descriptor.id;
 	}
 	status() {
 		const entries = [...this.entries.values()];
 		return {
-			settings: structuredClone(this.settings),
+			settings: {
+				...structuredClone(this.settings),
+				fetchProvider: this.activeFetchId()
+			},
 			storageFailed: this.storageFailed,
 			searchActive: entries.some((entry) => entry.kind === "search" && this.selected(entry)),
 			fetchActive: entries.some((entry) => entry.kind === "fetch" && this.selected(entry)),
@@ -975,6 +1178,7 @@ var WebSearchManager = class {
 		return this.status();
 	}
 	abort(entry) {
+		if (!entry) for (const controller of this.work.values()) controller.abort();
 		for (const target of entry ? [entry] : this.entries.values()) for (const controller of target.active) controller.abort();
 	}
 	discover(kind, provider) {
@@ -1021,7 +1225,10 @@ var WebSearchManager = class {
 			if (kind === "search") {
 				this.settings.searchOrder = this.settings.searchOrder.map((id) => id === legacy ? provider.id : id);
 				if (this.settings.searchProvider === legacy) this.settings.searchProvider = provider.id;
-			} else if (this.settings.fetchProvider === legacy) this.settings.fetchProvider = provider.id;
+			} else {
+				this.settings.fetchOrder = this.settings.fetchOrder.map((id) => id === legacy ? provider.id : id);
+				if (this.settings.fetchProvider === legacy) this.settings.fetchProvider = provider.id;
+			}
 			const legacyKey = providerKey(kind, legacy);
 			if (this.settings.endpoints[legacyKey] && !this.settings.endpoints[key]) this.settings.endpoints[key] = this.settings.endpoints[legacyKey];
 		}
@@ -1112,6 +1319,7 @@ var WebSearchManager = class {
 		const epoch = this.epoch;
 		entry.active.add(controller);
 		let started = false;
+		let work;
 		try {
 			if (epoch !== this.epoch || !this.selected(entry)) fail("WEB_DISABLED", "网络访问设置已改变，请重新发起请求。");
 			const options = {
@@ -1121,8 +1329,13 @@ var WebSearchManager = class {
 			};
 			started = true;
 			entry.calls += 1;
-			const result = await abortable(() => run(options, combined), combined);
-			if (epoch !== this.epoch || !this.selected(entry)) fail("WEB_ABORTED", "网络请求已取消。");
+			work = Promise.resolve().then(() => {
+				combined.throwIfAborted();
+				return run(options, combined);
+			});
+			this.work.set(work, controller);
+			const result = await work;
+			if (combined.aborted || epoch !== this.epoch || !this.selected(entry)) fail("WEB_ABORTED", "网络请求已取消。");
 			return result;
 		} catch (error) {
 			if (started) entry.failures += 1;
@@ -1137,14 +1350,18 @@ var WebSearchManager = class {
 		} finally {
 			clearTimeout(timeout);
 			entry.active.delete(controller);
+			if (work) this.work.delete(work);
 		}
 	}
 	update(next, expectedRevision) {
 		const task = this.pending.then(async () => {
 			if (this.disposed) fail("WEB_DISABLED", "网络搜索插件已停止。");
 			if (expectedRevision !== this.settings.revision) fail("WEB_CONFIG_CONFLICT", "设置已被其他页面修改，请刷新后重试。");
+			const input = structuredClone(next);
+			const fetchOrder = input.fetchOrder ?? (input.fetchProvider === this.activeFetchId() ? [...this.settings.fetchOrder] : migrateFetchOrder(input));
 			const proposed = {
-				...structuredClone(next),
+				...input,
+				fetchOrder,
 				revision: expectedRevision + 1
 			};
 			bounded(proposed.maxResults, 1, 20, "结果上限");
@@ -1165,10 +1382,10 @@ var WebSearchManager = class {
 			proposed.searchProvider = this.activeSearchId(proposed);
 			const activatingSearch = !this.settings.searchEnabled || JSON.stringify(proposed.searchOrder) !== JSON.stringify(this.settings.searchOrder);
 			if (proposed.searchEnabled && !proposed.searchProvider && activatingSearch) fail("WEB_CREDENTIAL_MISSING", "需选择已安装的供应商并填写有效凭据。");
-			if (proposed.fetchEnabled) {
-				const entry = this.entries.get(providerKey("fetch", proposed.fetchProvider));
-				if ((!this.settings.fetchEnabled || proposed.fetchProvider !== this.settings.fetchProvider) && (!entry || !this.ready(entry))) fail("WEB_CREDENTIAL_MISSING", "需选择已安装的供应商并填写有效凭据。");
-			}
+			proposed.fetchOrder = [...new Set(proposed.fetchOrder)];
+			proposed.fetchProvider = this.activeFetchId(proposed);
+			const activatingFetch = !this.settings.fetchEnabled || JSON.stringify(proposed.fetchOrder) !== JSON.stringify(this.settings.fetchOrder);
+			if (proposed.fetchEnabled && !proposed.fetchProvider && activatingFetch) fail("WEB_CREDENTIAL_MISSING", "需选择已安装的供应商并填写有效凭据。");
 			this.suspended = true;
 			this.epoch += 1;
 			this.abort();
@@ -1194,8 +1411,9 @@ var WebSearchManager = class {
 		this.epoch += 1;
 		this.abort();
 		this.notify();
-		for (const off of [...this.legacyRegistrations]) off();
 		await this.pending;
+		await Promise.allSettled([...this.work.keys()]);
+		for (const off of [...this.legacyRegistrations]) off();
 		this.detach();
 		this.entries.clear();
 		this.listeners.clear();
@@ -1210,6 +1428,7 @@ const settingsSchema = z.object({
 	searchProvider: z.string().max(64),
 	fetchProvider: z.string().max(64),
 	searchOrder: z.array(z.string().min(1).max(64)).max(32),
+	fetchOrder: z.array(z.string().min(1).max(64)).max(32),
 	maxResults: z.number().int().min(1).max(20),
 	maxQueries: z.number().int().min(1).max(5),
 	timeoutMs: z.number().int().min(1e3).max(12e4),
@@ -1218,11 +1437,15 @@ const settingsSchema = z.object({
 }).strict();
 const updateSchema = z.object({
 	expectedRevision: z.number().int().nonnegative(),
-	settings: settingsSchema.omit({ revision: true })
+	settings: settingsSchema.omit({ revision: true }).extend({ fetchOrder: settingsSchema.shape.fetchOrder.optional() })
 }).strict();
-const storedSettingsSchema = settingsSchema.extend({ searchOrder: settingsSchema.shape.searchOrder.optional() }).transform((settings) => ({
+const storedSettingsSchema = settingsSchema.extend({
+	searchOrder: settingsSchema.shape.searchOrder.optional(),
+	fetchOrder: settingsSchema.shape.fetchOrder.optional()
+}).transform((settings) => ({
 	...settings,
-	searchOrder: migrateSearchOrder(settings)
+	searchOrder: migrateSearchOrder(settings),
+	fetchOrder: migrateFetchOrder(settings)
 }));
 const webSettingsDomain = defineDomain({
 	name: "dsh_editor_web_search",
@@ -1243,8 +1466,10 @@ async function apply(ctx) {
 	const host = ctx;
 	const domain = await ctx.storageDomain.open(webSettingsDomain);
 	let managed;
+	let unregisterBuiltins;
 	ctx.effect(() => async () => {
 		await managed?.dispose();
+		unregisterBuiltins?.();
 		await domain.close();
 	}, "web-search-manager.dispose");
 	const table = domain.table("settings");
@@ -1261,10 +1486,10 @@ async function apply(ctx) {
 	ctx.on(WEB_PROVIDER_AVAILABILITY_EVENT, () => {
 		manager.refresh();
 	});
-	ctx.effect(() => registerBuiltins(ctx.web, {
+	unregisterBuiltins = registerBuiltins(ctx.web, {
 		settings: () => manager.status().settings,
 		resolveCredential: async (ref) => (await host.credentials.resolve(credentialRef(ref)))?.value
-	}), "web-search-manager.providers");
+	});
 	ctx.effect(() => registerHostRpc$1(host, WEB_SEARCH_RPC_CHANNEL, async (endpoint, payload, signal) => {
 		try {
 			signal.throwIfAborted();