dsh-github-copilot 0.4.0-alpha.28 → 0.4.0-alpha.29

package/lib/client.js

@@ -5927,7 +5927,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		//#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 cardStyle$1 = {
@@ -5945,17 +5944,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			gap: "6px",
 			minWidth: 0
 		};
-		const controlStyle = {
-			width: "100%",
-			minWidth: 0,
-			boxSizing: "border-box",
-			padding: "9px 11px",
-			borderRadius: "9px",
-			color: "inherit",
-			border: "1px solid color-mix(in srgb, currentColor 24%, transparent)",
-			background: "color-mix(in srgb, currentColor 3%, transparent)",
-			font: "inherit"
-		};
 		const buttonStyle$1 = {
 			justifySelf: "start",
 			padding: "9px 16px",
@@ -5970,7 +5958,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			opacity: .8,
 			fontSize: "12px",
 			lineHeight: 1.5,
-			overflowWrap: "anywhere"
+			overflowWrap: "anywhere",
+			margin: 0
 		};
 		function record(value) {
 			return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
@@ -5978,22 +5967,29 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		function revisionOf(value) {
 			return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
 		}
-		/** Provider-level primary and final fallback; model choice stays with each provider. */
+		function providerLabel(id) {
+			return id === GITHUB_COPILOT_SEARCH_PROVIDER ? "GitHub Copilot" : id === DEEPSEEK_SEARCH_PROVIDER ? "DeepSeek" : id;
+		}
+		function saveFailure(error) {
+			const code = record(error).code;
+			if (code === "settings-conflict") return "Search settings changed since you opened this page. Reload settings, then review and save your choices again.";
+			if (code === "settings-rejected") return "The settings service rejected this change. Reload settings to check whether editing is available, then try again.";
+			return "Could not confirm the save. Reload settings to check saved values before retrying. Your current choices have been kept.";
+		}
+		/** Save provider routing independently of account discovery and provider-specific model settings. */
 		function WebSearchRoutingCard(props) {
 			const [draft, setDraft] = (0, react.useState)({
 				primary: "auto",
 				provider: DEEPSEEK_SEARCH_PROVIDER,
-				model: "",
 				legacy: true
 			});
-			const [models, setModels] = (0, react.useState)([]);
+			const [override, setOverride] = (0, react.useState)({ model: "" });
 			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 [saving, setSaving] = (0, react.useState)();
 			const [writable, setWritable] = (0, react.useState)(false);
 			const [message, setMessage] = (0, react.useState)("");
-			const [modelNotice, setModelNotice] = (0, react.useState)("");
 			const lifecycle = (0, react.useRef)({
 				active: false,
 				generation: 0,
@@ -6006,29 +6002,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				const current = () => owner.active && owner.generation === generation;
 				owner.busy = true;
 				setLoading(true);
-				setSaving(false);
+				setSaving(void 0);
 				setWritable(false);
 				setCatalogReady(false);
 				setMessage("");
-				setModels([]);
 				setProviders([]);
-				setModelNotice("");
-				const loadModels = async () => {
-					try {
-						const result = await props.copilot.status();
-						if (!current()) return;
-						const parsed = result.ok ? GitHubCopilotAuthorizationViewSchema.safeParse(result.value) : void 0;
-						if (!parsed?.success) {
-							setModelNotice("Model suggestions are unavailable. Enter a model id or reload settings to retry.");
-							return;
-						}
-						const ids = parsed.data.accountModels?.models.filter((item) => item.api === "openai-responses").map((item) => item.id) ?? [];
-						setModels([...new Set(ids)].sort());
-					} catch {
-						if (current()) setModelNotice("Model suggestions are unavailable. Enter a model id or reload settings to retry.");
-					}
-				};
-				loadModels();
 				try {
 					const [result, catalog] = await Promise.all([props.settings.describe(), Promise.resolve().then(() => props.routing.providers()).catch(() => void 0)]);
 					if (!current()) return;
@@ -6048,9 +6026,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						primary: normalized.primaryProvider,
 						provider: normalized.defaultProvider,
 						legacy: normalized.legacy,
-						model: typeof copilotValue.searchModel === "string" ? copilotValue.searchModel : "",
-						routingRevision: revisionOf(routing?.revision),
-						copilotRevision: revisionOf(copilot?.revision)
+						routingRevision: revisionOf(routing?.revision)
+					});
+					setOverride({
+						model: typeof copilotValue.searchModel === "string" ? copilotValue.searchModel.trim() : "",
+						revision: revisionOf(copilot?.revision)
 					});
 					const parsed = catalog?.ok ? SearchProviderCatalogSchema.safeParse(catalog.value) : void 0;
 					const ids = parsed?.success ? parsed.data.providers.map((entry) => entry.id) : [];
@@ -6064,21 +6044,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					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 {
-					setMessageIfCurrent("Could not load search settings. Reload settings to retry.");
+					if (current()) setMessage("Could not load search settings. Reload settings to retry.");
 				} finally {
 					if (current()) {
 						owner.busy = false;
 						setLoading(false);
 					}
 				}
-				function setMessageIfCurrent(value) {
-					if (current()) setMessage(value);
-				}
-			}, [
-				props.copilot,
-				props.settings,
-				props.routing
-			]);
+			}, [props.settings, props.routing]);
 			(0, react.useEffect)(() => {
 				const owner = lifecycle.current;
 				owner.active = true;
@@ -6090,55 +6063,25 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 			}, [load]);
 			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 disabled = loading || saving !== void 0 || !writable || draft.routingRevision === void 0 || !catalogReady;
 			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;
+				if (!owner.active || owner.busy || disabled) return;
 				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;
-				}
+				const provider = draft.provider, primary = draft.primary;
 				owner.busy = true;
-				setSaving(true);
+				setSaving("routing");
 				setMessage("");
-				let modelSaved = false;
-				const saveFailure = () => modelSaved ? "Copilot search model was saved, but routing was not confirmed. Retry Save, or reload settings to review current values. The two namespaces are not saved atomically." : "Search settings could not be saved or confirmed. Retry Save, or reload settings to review current values before retrying.";
 				try {
-					if (usesCopilot) {
-						const modelWrite = await props.settings.mutate(GITHUB_COPILOT_SETTINGS_NAMESPACE, [{
-							op: "set",
-							path: ["searchModel"],
-							value: model
-						}], draft.copilotRevision);
-						if (!current()) return;
-						if (!modelWrite.ok) {
-							setMessage(saveFailure());
-							return;
-						}
-						modelSaved = true;
-						const revision = revisionOf(modelWrite.value.revision);
-						setDraft((value) => current() ? {
-							...value,
-							model,
-							copilotRevision: revision
-						} : value);
-						if (revision === void 0) {
-							setMessage(saveFailure());
-							return;
-						}
-					}
-					const routingWrite = await props.settings.mutate(WEB_SEARCH_ROUTING_SETTINGS_NAMESPACE, [{
+					const result = await props.settings.mutate(WEB_SEARCH_ROUTING_SETTINGS_NAMESPACE, [{
 						op: "set",
 						path: ["searchProvider"],
 						value: primary
@@ -6148,11 +6091,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						value: provider
 					}], draft.routingRevision);
 					if (!current()) return;
-					if (!routingWrite.ok) {
-						setMessage(saveFailure());
+					if (!result.ok) {
+						setMessage(saveFailure(result.error));
 						return;
 					}
-					const revision = revisionOf(routingWrite.value.revision);
+					const revision = revisionOf(result.value.revision);
 					setDraft((value) => current() ? {
 						...value,
 						primary,
@@ -6160,28 +6103,72 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						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 {
-					if (current()) setMessage(saveFailure());
+					setMessage(revision === void 0 ? "Save returned no revision. Reload settings before editing again." : "Saved. New searches use this routing. Search availability is checked when you search.");
+				} catch (error) {
+					if (current()) setMessage(saveFailure(error));
 				} finally {
 					if (current()) {
 						owner.busy = false;
-						setSaving(false);
+						setSaving(void 0);
 					}
 				}
 			}, [
 				disabled,
 				draft,
-				missingCopilot,
 				missingProvider,
-				props.settings,
-				usesCopilot
+				props.settings
+			]);
+			const clearOverride = (0, react.useCallback)(async () => {
+				const owner = lifecycle.current;
+				if (!owner.active || owner.busy || disabled || override.revision === void 0) return;
+				const generation = owner.generation;
+				const current = () => owner.active && owner.generation === generation;
+				owner.busy = true;
+				setSaving("override");
+				setMessage("");
+				try {
+					const result = await props.settings.mutate(GITHUB_COPILOT_SETTINGS_NAMESPACE, [{
+						op: "set",
+						path: ["searchModel"],
+						value: ""
+					}], override.revision);
+					if (!current()) return;
+					if (!result.ok) {
+						setMessage(saveFailure(result.error));
+						return;
+					}
+					const revision = revisionOf(result.value.revision);
+					if (revision === void 0) {
+						setOverride((value) => ({
+							...value,
+							revision: void 0
+						}));
+						setMessage("Save returned no revision. Reload settings before editing again.");
+						return;
+					}
+					setOverride({
+						model: "",
+						revision
+					});
+					setMessage("Copilot model selection is now automatic. Unsaved provider choices have not been applied.");
+				} catch (error) {
+					if (current()) setMessage(saveFailure(error));
+				} finally {
+					if (current()) {
+						owner.busy = false;
+						setSaving(void 0);
+					}
+				}
+			}, [
+				disabled,
+				override,
+				props.settings
 			]);
 			const providerOptions = () => providers.map((id) => (0, react.createElement)("option", {
 				key: id,
 				value: id,
 				style: nativeOptionStyle()
-			}, id));
+			}, providerLabel(id)));
 			const unavailableOption = (id, known) => known ? null : (0, react.createElement)("option", {
 				value: id,
 				disabled: true,
@@ -6189,7 +6176,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}, `${id || "(empty)"} — unavailable`);
 			return (0, react.createElement)("section", {
 				style: cardStyle$1,
-				"data-dsh-web-search-routing": true
+				"data-dsh-web-search-routing": true,
+				"aria-busy": loading || saving !== void 0
 			}, (0, react.createElement)("div", null, (0, react.createElement)("h3", { style: {
 				margin: 0,
 				fontSize: "16px"
@@ -6198,7 +6186,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				opacity: .8,
 				fontSize: "13px",
 				lineHeight: 1.5
-			} }, "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: {
+			} }, "Choose who runs web searches. This does not change your Chat model.")), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
 				fontSize: "13px",
 				fontWeight: 600
 			} }, "Search provider"), (0, react.createElement)("select", {
@@ -6208,6 +6196,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				"data-dsh-web-search-mode": true,
 				onChange: (event) => {
 					const primary = event.currentTarget.value;
+					setMessage("");
 					setDraft((current) => ({
 						...current,
 						primary
@@ -6219,54 +6208,46 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}, "Auto — follow Chat"), draft.primary === "none" ? (0, react.createElement)("option", {
 				value: "none",
 				style: nativeOptionStyle()
-			}, "Disabled — saved configuration") : null, ...providerOptions(), unavailableOption(draft.primary, primaryKnown))), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
+			}, "Disabled — saved configuration") : null, ...providerOptions(), unavailableOption(draft.primary, primaryKnown)), (0, react.createElement)("span", { style: hintStyle }, "Auto follows the Chat provider when it supports search. A selected provider stays fixed when you switch Chat models.")), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
 				fontSize: "13px",
 				fontWeight: 600
-			} }, "Default search provider"), (0, react.createElement)("select", {
+			} }, "Fallback provider"), (0, react.createElement)("select", {
 				style: nativeSelectStyle(disabled),
 				disabled,
 				value: draft.provider,
 				"data-dsh-web-search-provider": true,
 				onChange: (event) => {
 					const provider = event.currentTarget.value;
+					setMessage("");
 					setDraft((current) => ({
 						...current,
 						provider
 					}));
 				}
 			}, (0, react.createElement)("option", {
-				value: NO_DEFAULT_SEARCH_PROVIDER,
+				value: "none",
 				style: nativeOptionStyle()
-			}, "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", {
+			}, "None — no fallback"), ...providerOptions(), unavailableOption(draft.provider, fallbackKnown)), (0, react.createElement)("span", { style: hintStyle }, "Used if Auto has no matching provider or the primary search fails. May incur the fallback provider’s charges. The same provider is not tried twice.")), 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", {
-				style: controlStyle,
-				list: "dsh-copilot-search-models",
-				disabled: disabled || missingCopilot,
-				value: draft.model,
-				placeholder: "account-authorized Responses model id",
-				"data-dsh-copilot-search-model": true,
-				onChange: (event) => {
-					const model = event.currentTarget.value;
-					setDraft((current) => ({
-						...current,
-						model
-					}));
+			}, "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 }, "Saving adopts the selected fallback for new searches. Cancellation and account-proof invalidation never trigger fallback.") : null, usesCopilot ? (0, react.createElement)("p", { style: hintStyle }, "Copilot handles search model selection. No model setup is needed here. A signed-in account and a model with verified search support are required when searching.") : null, usesCopilot && override.model ? (0, react.createElement)("details", { "data-dsh-copilot-search-override": true }, (0, react.createElement)("summary", { style: {
+				cursor: "pointer",
+				fontSize: "13px"
+			} }, "Existing Copilot model override"), (0, react.createElement)("div", { style: {
+				...fieldStyle$1,
+				marginTop: "8px"
+			} }, (0, react.createElement)("p", { style: hintStyle }, "Your saved override ", (0, react.createElement)("code", null, override.model), " is preserved. Saving providers does not change it."), (0, react.createElement)("button", {
+				type: "button",
+				style: buttonStyle$1,
+				disabled: disabled || override.revision === void 0,
+				"data-dsh-copilot-search-reset": true,
+				onClick: () => {
+					clearOverride();
 				}
-			}), (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: 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: hintStyle
-			}, modelNotice) : null), (0, react.createElement)("div", { style: {
+			}, saving === "override" ? "Updating…" : "Use automatic model selection"))) : null, (0, react.createElement)("div", { style: {
 				display: "flex",
 				alignItems: "center",
 				gap: "12px",
@@ -6274,24 +6255,29 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			} }, (0, react.createElement)("button", {
 				type: "button",
 				style: buttonStyle$1,
-				disabled: disabled || missingCopilot || missingProvider,
+				disabled: disabled || missingProvider,
 				"data-dsh-web-search-save": true,
 				onClick: () => {
 					save();
 				}
-			}, loading ? "Loading…" : saving ? "Saving…" : "Save search routing"), (0, react.createElement)("button", {
+			}, loading ? "Loading…" : saving === "routing" ? "Saving…" : "Save search routing"), (0, react.createElement)("button", {
 				type: "button",
 				style: buttonStyle$1,
-				disabled: loading || saving,
+				disabled: loading || saving !== void 0,
 				title: "Reload saved values and discard unsaved edits",
 				"data-dsh-web-search-reload": true,
 				onClick: () => {
 					load();
 				}
-			}, "Reload settings"), message.length === 0 ? null : (0, react.createElement)("span", {
+			}, "Reload settings")), (0, react.createElement)("p", {
 				role: "status",
-				style: hintStyle
-			}, message)));
+				"aria-live": "polite",
+				"aria-atomic": true,
+				style: {
+					...hintStyle,
+					...message ? {} : { display: "none" }
+				}
+			}, message));
 		}
 		//#endregion
 		//#region lib/types/dual-model-card.js
@@ -7898,10 +7884,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			let footerActive = false;
 			let sectionActive = false;
 			let fallback;
+			const settings = ctx.remote.settings;
+			const routing = ctx.remote.githubCopilotSearchRouting;
 			const render = () => (0, react.createElement)(WebSearchRoutingCard, {
-				settings: ctx.remote.settings,
-				copilot: ctx.remote.githubCopilot,
-				routing: ctx.remote.githubCopilotSearchRouting
+				settings,
+				routing
 			});
 			const syncFallback = () => {
 				if (active && sectionActive && !footerActive) fallback ??= ctx.slots.register({
@@ -7972,7 +7959,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				throw error;
 			}
 			const searchUi = ctx.inject([
-				"remote.githubCopilot",
 				"remote.settings",
 				"remote.githubCopilotSearchRouting",
 				"slots"