dsh-github-copilot 0.4.0-alpha.22 → 0.4.0-alpha.24

package/lib/client.js

@@ -5399,7 +5399,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			expectedRevision: revision
 		}).strict();
 		const DualModelCreateResultSchema = object({ sessionId: id }).strict();
-		const contribution$1 = {
+		const contribution$2 = {
 			package: "dsh-github-copilot",
 			descriptors: [
 				{
@@ -5462,6 +5462,28 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			]
 		};
 		//#endregion
+		//#region lib/types/search-routing-remote.js
+		const SearchProviderCatalogSchema = object({
+			supported: boolean(),
+			providers: array(object({ id: string().min(1).max(512) }).strict()).max(512)
+		}).strict();
+		const contribution$1 = {
+			package: "dsh-github-copilot",
+			descriptors: [{
+				id: "dsh-github-copilot:githubCopilotSearchRouting.providers",
+				namespace: "githubCopilotSearchRouting",
+				service: "githubCopilotSearchRouting",
+				method: "providers",
+				invocation: { kind: "direct" },
+				parameters: [],
+				result: {
+					mode: "strict",
+					typeSymbol: "dsh-github-copilot#SearchProviderCatalog",
+					schema: SearchProviderCatalogSchema
+				}
+			}]
+		};
+		//#endregion
 		//#region lib/types/remote.js
 		/**
 		* Client-safe Remote contribution for the plugin-owned authorization bridge.
@@ -5622,6 +5644,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						schema: GitHubCopilotMigrationStatusSchema
 					}
 				},
+				...contribution$2.descriptors,
 				...contribution$1.descriptors
 			]
 		};
@@ -5880,29 +5903,43 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			};
 		}
 		//#endregion
+		//#region lib/types/search-routing-policy.js
+		/** Resolve old and new settings without guessing registered providers or dropping unknown ids. */
+		function normalizeWebSearchRouting(config) {
+			const defaultProvider = config.defaultSearchProvider?.trim() || "deepseek-official";
+			const legacy = config.searchProvider === void 0;
+			return {
+				primaryProvider: legacy ? config.searchMode === "fixed" ? defaultProvider : "auto" : config.searchProvider?.trim() || "auto",
+				defaultProvider,
+				legacy
+			};
+		}
+		//#endregion
 		//#region lib/types/web-search-routing-card.js
 		const GITHUB_COPILOT_SETTINGS_NAMESPACE = "github-copilot";
 		const WEB_SEARCH_ROUTING_SETTINGS_NAMESPACE = "github-copilot-search-routing";
 		const NO_DEFAULT_SEARCH_PROVIDER = "none";
 		const GITHUB_COPILOT_SEARCH_PROVIDER = "github-copilot-hosted";
 		const DEEPSEEK_SEARCH_PROVIDER = "deepseek-official";
-		const EXA_SEARCH_PROVIDER = "exa";
-		const PERPLEXITY_SEARCH_PROVIDER = "perplexity";
 		const cardStyle$1 = {
 			display: "grid",
 			gap: "14px",
 			padding: "18px",
 			marginTop: "16px",
+			minWidth: 0,
 			border: "1px solid color-mix(in srgb, currentColor 20%, transparent)",
 			borderRadius: "14px",
 			background: "color-mix(in srgb, currentColor 4%, transparent)"
 		};
 		const fieldStyle$1 = {
 			display: "grid",
-			gap: "6px"
+			gap: "6px",
+			minWidth: 0
 		};
 		const controlStyle$1 = {
 			width: "100%",
+			minWidth: 0,
+			boxSizing: "border-box",
 			padding: "9px 11px",
 			borderRadius: "9px",
 			color: "inherit",
@@ -5920,20 +5957,29 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			color: "inherit",
 			font: "inherit"
 		};
+		const hintStyle = {
+			opacity: .8,
+			fontSize: "12px",
+			lineHeight: 1.5,
+			overflowWrap: "anywhere"
+		};
 		function record(value) {
 			return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
 		}
 		function revisionOf(value) {
 			return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
 		}
-		/** Models-page card for plugin-owned cross-provider search routing. */
+		/** Provider-level primary and final fallback; model choice stays with each provider. */
 		function WebSearchRoutingCard(props) {
 			const [draft, setDraft] = (0, react.useState)({
-				mode: "auto",
+				primary: "auto",
 				provider: DEEPSEEK_SEARCH_PROVIDER,
-				model: ""
+				model: "",
+				legacy: true
 			});
 			const [models, setModels] = (0, react.useState)([]);
+			const [providers, setProviders] = (0, react.useState)([]);
+			const [catalogReady, setCatalogReady] = (0, react.useState)(false);
 			const [loading, setLoading] = (0, react.useState)(true);
 			const [saving, setSaving] = (0, react.useState)(false);
 			const [writable, setWritable] = (0, react.useState)(false);
@@ -5953,8 +5999,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				setLoading(true);
 				setSaving(false);
 				setWritable(false);
+				setCatalogReady(false);
 				setMessage("");
 				setModels([]);
+				setProviders([]);
 				setModelNotice("");
 				const loadModels = async () => {
 					try {
@@ -5973,7 +6021,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 				loadModels();
 				try {
-					const result = await props.settings.describe();
+					const [result, catalog] = await Promise.all([props.settings.describe(), Promise.resolve().then(() => props.routing.providers()).catch(() => void 0)]);
 					if (!current()) return;
 					if (!result.ok) {
 						setMessage("Could not load search settings. Reload settings to retry.");
@@ -5981,27 +6029,47 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					}
 					const routing = result.value.namespaces.find((entry) => entry.ns === WEB_SEARCH_ROUTING_SETTINGS_NAMESPACE);
 					const copilot = result.value.namespaces.find((entry) => entry.ns === GITHUB_COPILOT_SETTINGS_NAMESPACE);
-					const routingValue = record(routing?.value);
-					const copilotValue = record(copilot?.value);
+					const routingValue = record(routing?.value), copilotValue = record(copilot?.value);
+					const normalized = normalizeWebSearchRouting({
+						searchProvider: typeof routingValue.searchProvider === "string" ? routingValue.searchProvider : void 0,
+						searchMode: routingValue.searchMode === "fixed" ? "fixed" : "auto",
+						defaultSearchProvider: typeof routingValue.defaultSearchProvider === "string" ? routingValue.defaultSearchProvider : void 0
+					});
 					setDraft({
-						mode: routingValue.searchMode === "fixed" ? "fixed" : "auto",
-						provider: typeof routingValue.defaultSearchProvider === "string" ? routingValue.defaultSearchProvider : DEEPSEEK_SEARCH_PROVIDER,
+						primary: normalized.primaryProvider,
+						provider: normalized.defaultProvider,
+						legacy: normalized.legacy,
 						model: typeof copilotValue.searchModel === "string" ? copilotValue.searchModel : "",
 						routingRevision: revisionOf(routing?.revision),
 						copilotRevision: revisionOf(copilot?.revision)
 					});
+					const parsed = catalog?.ok ? SearchProviderCatalogSchema.safeParse(catalog.value) : void 0;
+					const ids = parsed?.success ? parsed.data.providers.map((entry) => entry.id) : [];
+					if (!parsed?.success || !parsed.data.supported || new Set(ids).size !== ids.length || ids.includes("auto") || ids.includes("none")) {
+						setMessage("Search provider list is unavailable. Reload after the routed search service is active.");
+						return;
+					}
+					setProviders(ids.toSorted());
+					setCatalogReady(true);
 					setWritable(result.value.writable === true);
 					if (!routing || revisionOf(routing.revision) === void 0) setMessage("Web search routing settings are unavailable. Reload after the routing namespace is registered.");
 					else if (!result.value.writable) setMessage("Search settings are read-only in this deployment.");
 				} catch {
-					if (current()) setMessage("Could not load search settings. Reload settings to retry.");
+					setMessageIfCurrent("Could not load search settings. Reload settings to retry.");
 				} finally {
 					if (current()) {
 						owner.busy = false;
 						setLoading(false);
 					}
 				}
-			}, [props.copilot, props.settings]);
+				function setMessageIfCurrent(value) {
+					if (current()) setMessage(value);
+				}
+			}, [
+				props.copilot,
+				props.settings,
+				props.routing
+			]);
 			(0, react.useEffect)(() => {
 				const owner = lifecycle.current;
 				owner.active = true;
@@ -6012,27 +6080,22 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					owner.busy = false;
 				};
 			}, [load]);
-			const usesCopilot = draft.provider.trim() === GITHUB_COPILOT_SEARCH_PROVIDER;
-			const disabled = loading || saving || !writable || draft.routingRevision === void 0;
+			const usesCopilot = draft.primary === GITHUB_COPILOT_SEARCH_PROVIDER || draft.provider === GITHUB_COPILOT_SEARCH_PROVIDER;
+			const disabled = loading || saving || !writable || draft.routingRevision === void 0 || !catalogReady;
 			const missingCopilot = usesCopilot && draft.copilotRevision === void 0;
-			const providerOptions = [
-				DEEPSEEK_SEARCH_PROVIDER,
-				GITHUB_COPILOT_SEARCH_PROVIDER,
-				EXA_SEARCH_PROVIDER,
-				PERPLEXITY_SEARCH_PROVIDER,
-				NO_DEFAULT_SEARCH_PROVIDER
-			];
+			const primaryKnown = draft.primary === "auto" || draft.primary === "none" || providers.includes(draft.primary);
+			const fallbackKnown = draft.provider === "none" || providers.includes(draft.provider);
+			const missingProvider = !primaryKnown || !fallbackKnown;
 			const save = (0, react.useCallback)(async () => {
 				const owner = lifecycle.current;
 				if (!owner.active || owner.busy || disabled || missingCopilot) return;
-				const generation = owner.generation;
-				const current = () => owner.active && owner.generation === generation;
-				const provider = draft.provider.trim();
-				const model = draft.model.trim();
-				if (provider.length === 0) {
-					setMessage("Enter a registered search provider id, or use none.");
+				if (missingProvider) {
+					setMessage("Choose a registered search provider, or disable the fallback with None.");
 					return;
 				}
+				const generation = owner.generation;
+				const current = () => owner.active && owner.generation === generation;
+				const provider = draft.provider, primary = draft.primary, model = draft.model.trim();
 				if (usesCopilot && model.length === 0) {
 					setMessage("Enter a Copilot Responses model before using GitHub Copilot search.");
 					return;
@@ -6068,8 +6131,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					}
 					const routingWrite = await props.settings.mutate(WEB_SEARCH_ROUTING_SETTINGS_NAMESPACE, [{
 						op: "set",
-						path: ["searchMode"],
-						value: draft.mode
+						path: ["searchProvider"],
+						value: primary
 					}, {
 						op: "set",
 						path: ["defaultSearchProvider"],
@@ -6083,8 +6146,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					const revision = revisionOf(routingWrite.value.revision);
 					setDraft((value) => current() ? {
 						...value,
+						primary,
 						provider,
-						routingRevision: revision
+						routingRevision: revision,
+						legacy: false
 					} : value);
 					setMessage(revision === void 0 ? "Save returned no revision. Reload settings before editing again." : "Saved. New searches use this routing immediately.");
 				} catch {
@@ -6099,9 +6164,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				disabled,
 				draft,
 				missingCopilot,
+				missingProvider,
 				props.settings,
 				usesCopilot
 			]);
+			const providerOptions = () => providers.map((id) => (0, react.createElement)("option", {
+				key: id,
+				value: id
+			}, id));
+			const unavailableOption = (id, known) => known ? null : (0, react.createElement)("option", {
+				value: id,
+				disabled: true
+			}, `${id || "(empty)"} — unavailable`);
 			return (0, react.createElement)("section", {
 				style: cardStyle$1,
 				"data-dsh-web-search-routing": true
@@ -6110,33 +6184,31 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				fontSize: "16px"
 			} }, "Web search"), (0, react.createElement)("p", { style: {
 				margin: "5px 0 0",
-				opacity: .72,
+				opacity: .8,
 				fontSize: "13px",
 				lineHeight: 1.5
-			} }, "Auto tries native search for the initiating Copilot model, then the default provider when unavailable. Other model providers use the default directly. Fixed always uses the default. Chat remains available when search is unavailable.")), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
+			} }, "Auto follows the Chat provider when a matching search provider exists. Choose a provider to keep search fixed, independently of Chat.")), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
 				fontSize: "13px",
 				fontWeight: 600
-			} }, "Search mode"), (0, react.createElement)("select", {
+			} }, "Search provider"), (0, react.createElement)("select", {
 				style: controlStyle$1,
 				disabled,
-				value: draft.mode,
+				value: draft.primary,
 				"data-dsh-web-search-mode": true,
 				onChange: (event) => {
-					const mode = event.currentTarget.value === "fixed" ? "fixed" : "auto";
+					const primary = event.currentTarget.value;
 					setDraft((current) => ({
 						...current,
-						mode
+						primary
 					}));
 				}
-			}, (0, react.createElement)("option", { value: "auto" }, "Auto — native Copilot search first, then default provider"), (0, react.createElement)("option", { value: "fixed" }, "Fixed — always use the default provider"))), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
+			}, (0, react.createElement)("option", { value: "auto" }, "Auto — follow Chat"), draft.primary === "none" ? (0, react.createElement)("option", { value: "none" }, "Disabled — saved configuration") : null, ...providerOptions(), unavailableOption(draft.primary, primaryKnown))), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
 				fontSize: "13px",
 				fontWeight: 600
-			} }, "Default search provider"), (0, react.createElement)("input", {
+			} }, "Default search provider"), (0, react.createElement)("select", {
 				style: controlStyle$1,
-				list: "dsh-search-provider-options",
 				disabled,
 				value: draft.provider,
-				placeholder: "registered provider id",
 				"data-dsh-web-search-provider": true,
 				onChange: (event) => {
 					const provider = event.currentTarget.value;
@@ -6145,14 +6217,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						provider
 					}));
 				}
-			}), (0, react.createElement)("datalist", { id: "dsh-search-provider-options" }, ...providerOptions.map((id) => (0, react.createElement)("option", {
-				key: id,
-				value: id,
-				label: id === NO_DEFAULT_SEARCH_PROVIDER ? "None — no default search provider" : `${id} (suggestion)`
-			}))), (0, react.createElement)("span", { style: {
-				opacity: .66,
-				fontSize: "12px"
-			} }, "Suggestions are examples, not installed-provider or capability checks. Enter any registered search provider id, or none; unavailable providers fail without affecting chat.")), !usesCopilot ? null : (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
+			}, (0, react.createElement)("option", { value: NO_DEFAULT_SEARCH_PROVIDER }, "None — no fallback"), ...providerOptions(), unavailableOption(draft.provider, fallbackKnown)), (0, react.createElement)("span", { style: hintStyle }, "Final fallback only: used when Auto has no matching provider or the primary search fails. The same provider is never retried as its own fallback.")), catalogReady && providers.length === 0 ? (0, react.createElement)("p", {
+				role: "status",
+				style: hintStyle
+			}, "No search providers are registered. Enable a search provider, then reload settings.") : null, catalogReady && missingProvider ? (0, react.createElement)("p", {
+				role: "status",
+				style: hintStyle
+			}, "A saved provider is no longer registered. Choose an available entry; it has not been replaced automatically.") : null, draft.legacy && catalogReady ? (0, react.createElement)("p", { style: hintStyle }, "Your existing choices are preserved. Saving adopts the selected Default as the final fallback, which may incur that provider’s API charges. Cancellation and captured account-proof invalidation never trigger fallback.") : null, !usesCopilot ? null : (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
 				fontSize: "13px",
 				fontWeight: 600
 			} }, "Copilot search model"), (0, react.createElement)("input", {
@@ -6172,12 +6243,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}), (0, react.createElement)("datalist", { id: "dsh-copilot-search-models" }, ...models.map((id) => (0, react.createElement)("option", {
 				key: id,
 				value: id
-			}))), (0, react.createElement)("span", { style: {
-				opacity: .66,
-				fontSize: "12px"
-			} }, "Account Responses models are suggestions, not hosted-search capability proof. The model must be account-authorized and pass the configured search checks. It does not change the chat model."), missingCopilot ? (0, react.createElement)("span", { role: "status" }, "Copilot search settings are unavailable. Reload after the github-copilot namespace is registered, or choose another provider.") : null, modelNotice ? (0, react.createElement)("span", {
+			}))), (0, react.createElement)("span", { style: hintStyle }, "Used when Copilot is selected explicitly or as the fallback. Account Responses models are suggestions, not hosted-search capability proof. This does not change the Chat model."), missingCopilot ? (0, react.createElement)("span", { role: "status" }, "Copilot search settings are unavailable. Reload after the github-copilot namespace is registered, or choose another provider.") : null, modelNotice ? (0, react.createElement)("span", {
 				role: "status",
-				style: { fontSize: "12px" }
+				style: hintStyle
 			}, modelNotice) : null), (0, react.createElement)("div", { style: {
 				display: "flex",
 				alignItems: "center",
@@ -6186,7 +6254,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			} }, (0, react.createElement)("button", {
 				type: "button",
 				style: buttonStyle$1,
-				disabled: disabled || missingCopilot,
+				disabled: disabled || missingCopilot || missingProvider,
 				"data-dsh-web-search-save": true,
 				onClick: () => {
 					save();
@@ -6202,10 +6270,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				}
 			}, "Reload settings"), message.length === 0 ? null : (0, react.createElement)("span", {
 				role: "status",
-				style: {
-					fontSize: "13px",
-					opacity: .8
-				}
+				style: hintStyle
 			}, message)));
 		}
 		//#endregion
@@ -7713,7 +7778,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			let fallback;
 			const render = () => (0, react.createElement)(WebSearchRoutingCard, {
 				settings: ctx.remote.settings,
-				copilot: ctx.remote.githubCopilot
+				copilot: ctx.remote.githubCopilot,
+				routing: ctx.remote.githubCopilotSearchRouting
 			});
 			const syncFallback = () => {
 				if (active && sectionActive && !footerActive) fallback ??= ctx.slots.register({
@@ -7786,6 +7852,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const searchUi = ctx.inject([
 				"remote.githubCopilot",
 				"remote.settings",
+				"remote.githubCopilotSearchRouting",
 				"slots"
 			], registerSearchUi);
 			const dualModelUi = ctx.inject(["remote.githubCopilotDualModel", "slots"], registerDualModelUi);