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

package/lib/index.js

@@ -962,7 +962,7 @@ let SearchRoutingController = (() => {
 //#endregion
 //#region package.json
 var name$1 = "dsh-github-copilot";
-var version = "0.4.0-alpha.28";
+var version = "0.4.0-alpha.30";
 //#endregion
 //#region lib/types/probe.js
 /**
@@ -6371,39 +6371,54 @@ function activate(ctx, config) {
 			return false;
 		}
 	}
-	function createPlan(candidates, cfg, route, plans) {
+	function createPlan(candidates, cfg, provider, plans, operation) {
 		const startedAt = generation;
-		const signal = plans === void 0 ? proofCancellation.signal : AbortSignal.any([proofCancellation.signal, plans.cancellation.signal]);
-		const provider = route?.provider;
-		function bind(candidate) {
+		const signal = AbortSignal.any([proofCancellation.signal, ...plans === void 0 ? [] : [plans.cancellation.signal]]);
+		const probeSignal = operation?.signal === void 0 ? signal : AbortSignal.any([signal, operation.signal]);
+		function bind(candidate, lifetime) {
 			candidateGenerations.set(candidate, startedAt);
-			candidateSignals.set(candidate, signal);
+			candidateSignals.set(candidate, lifetime);
 			if (provider !== void 0) candidateProviders.set(candidate, provider);
 		}
-		for (const candidate of candidates) bind(candidate);
-		const nextPlan = new SearchPlan(candidates, (candidate) => probeCandidate(candidate, hooks.resolveApiKey, cfg.probeTimeoutMs, signal), cfg.probe, signal);
+		for (const candidate of candidates) bind(candidate, cfg.probe ? probeSignal : signal);
+		const nextPlan = new SearchPlan(candidates, (candidate) => probeCandidate(candidate, async (selected) => {
+			operation?.assertCurrent();
+			const auth = await hooks.resolveApiKey(selected);
+			operation?.assertCurrent();
+			return auth;
+		}, cfg.probeTimeoutMs, probeSignal), cfg.probe, signal);
 		nextPlan.settled.then(() => {
 			const chosen = nextPlan.chosenCandidate();
-			if (chosen !== void 0) bind(chosen);
+			if (chosen !== void 0) bind(chosen, signal);
 		});
 		return nextPlan;
 	}
 	function matches(cached, route, candidates, cfg) {
-		return cached !== void 0 && cached.generation === generation && sameRoute(route, cached.route) && cached.probe.enabled === cfg.probe && cached.probe.timeoutMs === cfg.probeTimeoutMs && sameCandidates(candidates, cached.plan.candidates);
+		try {
+			cached?.assertProof?.();
+		} catch {
+			return false;
+		}
+		if (cached?.assertProof !== void 0 && cached.plan.chosenCandidate() === void 0 && (cached.plan.available() || cached.probeSignal?.aborted === true)) return false;
+		return cached !== void 0 && cached.generation === generation && cached.plan.signal?.aborted !== true && sameRoute(route, cached.route) && cached.probe.enabled === cfg.probe && cached.probe.timeoutMs === cfg.probeTimeoutMs && sameCandidates(candidates, cached.plan.candidates);
 	}
-	function plan(route, cfg, owner, surface) {
+	function plan(route, cfg, owner, surface, operation) {
 		const plans = owner === void 0 ? void 0 : plansFor(owner);
-		const candidates = surface === "inline" ? candidatesForRoute(route) : surface === "configured" ? configuredCandidates(route, cfg) : traditionalCandidates(route, cfg);
+		const candidates = surface === "inline" ? candidatesForRoute(route) : surface === "configured" ? configuredCandidates(cfg) : traditionalCandidates(route, cfg);
 		const cached = plans?.[surface];
 		if (matches(cached, route, candidates, cfg)) return cached.plan;
 		const startedAt = generation;
-		const nextPlan = createPlan(candidates, cfg, route, plans);
+		const nextPlan = createPlan(candidates, cfg, surface === "configured" ? GITHUB_COPILOT_PREVIEW_PROVIDER_ID : route?.provider, plans, operation);
 		if (generation === startedAt && active && plans?.cancellation.signal.aborted !== true) {
 			if (plans !== void 0) plans[surface] = {
 				plan: nextPlan,
 				route,
 				probe: probeSettings(cfg),
-				generation: startedAt
+				generation: startedAt,
+				...operation === void 0 ? {} : {
+					assertProof: operation.assertProof,
+					...operation.signal === void 0 ? {} : { probeSignal: operation.signal }
+				}
 			};
 		}
 		if (surface === "inline") {
@@ -6439,13 +6454,13 @@ function activate(ctx, config) {
 			model
 		};
 	}
-	/** Build a Copilot search plan from the provider-owned search model, not the chat route. */
-	async function configuredWebPlan(signal) {
+	/** Resolve provider-owned candidates only on an actual search, never from Chat defaults. */
+	async function configuredWebPlan(assertCurrent, assertProof, signal) {
 		const owner = currentSearchInitiator(ctx);
 		const cfg = current();
 		const selection = configuredSearchSelection(cfg);
 		const startedAt = generation;
-		if (owner === void 0 || disposedOwners.has(owner) || selection === void 0) throw new Error("github-copilot: independent hosted search requires an initiating Agent and github-copilot.searchModel");
+		if (owner === void 0 || disposedOwners.has(owner) || !configuredAllowed(cfg)) throw new Error("github-copilot: independent hosted search requires an initiating Agent and an allowed Copilot provider");
 		const plans = plansFor(owner);
 		const signals = [proofCancellation.signal, plans.cancellation.signal];
 		if (signal !== void 0) signals.push(signal);
@@ -6453,18 +6468,39 @@ function activate(ctx, config) {
 			force: false,
 			signal: AbortSignal.any(signals)
 		});
+		assertCurrent();
 		if (!active || startedAt !== generation || plans.cancellation.signal.aborted || signal?.aborted === true) throw new Error("github-copilot: configured search proof invalidated during route resolution");
-		return plan(currentChatRoute(ctx, selection), cfg, owner, "configured");
+		return plan(selection === void 0 ? void 0 : currentChatRoute(ctx, selection), cfg, owner, "configured", {
+			assertCurrent,
+			assertProof,
+			...signal === void 0 ? {} : { signal }
+		});
 	}
 	function traditionalCandidates(route, cfg) {
 		if (!cfg.enabled || route === void 0) return [];
 		if (cfg.providers.length > 0 && !cfg.providers.includes(route.provider)) return [];
 		return candidatesForRoute(route).filter((candidate) => candidate.protocol === "openai-responses");
 	}
-	function configuredCandidates(route, cfg) {
-		if (!cfg.enabled || route === void 0) return [];
-		if (!(cfg.providers.length === 0 || cfg.providers.includes("github-copilot") || cfg.providers.includes("github-copilot-preview"))) return [];
-		return candidatesForRoute(route).filter((candidate) => candidate.protocol === "openai-responses");
+	function configuredAllowed(cfg) {
+		return cfg.enabled && (cfg.providers.length === 0 || cfg.providers.includes("github-copilot") || cfg.providers.includes("github-copilot-preview"));
+	}
+	function configuredCandidates(cfg) {
+		if (!configuredAllowed(cfg)) return [];
+		const selection = configuredSearchSelection(cfg);
+		if (selection !== void 0) return candidatesForRoute(currentChatRoute(ctx, selection)).filter((candidate) => candidate.protocol === "openai-responses");
+		const preview = ctx.get("githubCopilotPreview");
+		const ids = [...new Set(preview?.getView().models.map((model) => model.id) ?? [])].sort();
+		const candidates = [];
+		for (const model of ids) {
+			const route = currentChatRoute(ctx, {
+				provider: GITHUB_COPILOT_PREVIEW_PROVIDER_ID,
+				model
+			});
+			if (route?.api !== "openai-responses") continue;
+			candidates.push(...candidatesForRoute(route));
+			if (candidates.length === 3) break;
+		}
+		return candidates;
 	}
 	/** Local checks only; availability must never start a credential lookup or probe. */
 	function traditionalAvailable() {
@@ -6486,13 +6522,13 @@ function activate(ctx, config) {
 		const owner = currentSearchInitiator(ctx);
 		if (owner === void 0 || disposedOwners.has(owner)) return false;
 		const cfg = current();
+		if (!configuredAllowed(cfg)) return false;
 		const selection = configuredSearchSelection(cfg);
-		if (selection === void 0) return false;
-		const route = currentChatRoute(ctx, selection);
-		const candidates = configuredCandidates(route, cfg);
+		const route = selection === void 0 ? void 0 : currentChatRoute(ctx, selection);
+		const candidates = configuredCandidates(cfg);
 		if (candidates.length === 0) {
-			const allowed = cfg.providers.length === 0 || cfg.providers.includes("github-copilot") || cfg.providers.includes("github-copilot-preview");
-			return cfg.enabled && allowed && route?.provider === "github-copilot-preview" && route.api === void 0 && ctx.get("githubCopilotPreview")?.getView().configured === true;
+			const view = ctx.get("githubCopilotPreview")?.getView();
+			return view?.configured === true && (selection === void 0 ? view.state !== "ready" : route?.provider === "github-copilot-preview" && route.api === void 0);
 		}
 		const cached = ownerPlans.get(owner)?.configured;
 		return !matches(cached, route, candidates, cfg) || cached.plan.available();
@@ -6504,14 +6540,17 @@ function activate(ctx, config) {
 		const cfg = current();
 		const preview = ctx.get("githubCopilotPreview");
 		const proof = preview?.captureSearchProof();
+		const assertProof = () => {
+			if (!active || generation !== startedGeneration || owner === void 0 || disposedOwners.has(owner) || preview === void 0 || ctx.get("githubCopilotPreview") !== preview || proof?.() !== true) throw new ConfiguredSearchProofInvalidated();
+		};
 		const assertCurrent = () => {
 			if (signal?.aborted) throw new WebError("web search aborted", "WEB_ABORTED");
-			if (!active || generation !== startedGeneration || owner === void 0 || disposedOwners.has(owner) || preview === void 0 || ctx.get("githubCopilotPreview") !== preview || proof?.() !== true) throw new ConfiguredSearchProofInvalidated();
+			assertProof();
 		};
 		assertCurrent();
 		const provider = createTraditionalSearchProvider(configuredAvailable, async (requestSignal) => {
 			assertCurrent();
-			const searchPlan = await configuredWebPlan(requestSignal);
+			const searchPlan = await configuredWebPlan(assertCurrent, assertProof, requestSignal);
 			assertCurrent();
 			return searchPlan;
 		}, {
@@ -6522,7 +6561,7 @@ function activate(ctx, config) {
 				assertCurrent();
 				return auth;
 			}
-		}, () => cfg, "github-copilot-hosted requires github-copilot.searchModel selecting an account-authorized OpenAI Responses model");
+		}, () => cfg, "github-copilot-hosted requires an eligible account-authorized Responses search candidate; an explicit searchModel override must also be eligible");
 		try {
 			const result = await provider.search(request, signal);
 			assertCurrent();

package/lib/types/config.d.ts

@@ -39,7 +39,7 @@ export interface InlineConfig {
     routeWebSearch?: boolean;
     /** Automatic fallback, disclosed in results; no per-search approval dialog. */
     searchFallback?: 'none' | 'deepseek';
-    /** Copilot model used when `github-copilot-hosted` serves independently of the initiating chat model. */
+    /** Optional authoritative legacy override; otherwise hosted search resolves bounded account-owned candidates independently of Chat. */
     searchModel?: string;
     /** Internal JSON backup of route leaves temporarily owned by the GPT-6 overlay. */
     temporaryRouteBackup?: string;

package/lib/types/web-search-routing-card.d.ts

@@ -2,10 +2,9 @@ import type { Context as ClientContext } from '@deepseek-ai/cordis';
 import type { ReactElement } from 'react';
 interface SearchRoutingCardProps {
     readonly settings: ClientContext['remote']['settings'];
-    readonly copilot: ClientContext['remote']['githubCopilot'];
     readonly routing: ClientContext['remote']['githubCopilotSearchRouting'];
 }
-/** Provider-level primary and final fallback; model choice stays with each provider. */
+/** Save provider routing independently of account discovery and provider-specific model settings. */
 export declare function WebSearchRoutingCard(props: SearchRoutingCardProps): ReactElement;
 export {};
 //# sourceMappingURL=web-search-routing-card.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-github-copilot",
   "description": "DSH companion for GitHub Copilot sign-in, account-aware model profiles, tool compatibility, and provider-hosted search.",
-  "version": "0.4.0-alpha.28",
+  "version": "0.4.0-alpha.30",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/",