fix(#2731): skip unauthenticated providers when resolving subagent model

Background subagents (explore/librarian) failed with auth errors because resolveModelForDelegateTask() always picked the first fallback entry when availableModels was empty — often an unauthenticated provider like xai or opencode-go. Fix: when connectedProvidersCache is populated, iterate fallback chain and pick the first entry whose provider is in the connected set. Legacy behavior preserved when cache is null (not yet populated). - model-selection.ts: use readConnectedProvidersCache to filter fallback chain - test: 4 new tests for connected-provider-aware resolution
2026-03-27 14:37:49 +09:00
parent e65a0ed10d
commit 5765168af4
2 changed files with 107 additions and 6 deletions
@@ -135,6 +135,89 @@ describe("resolveModelForDelegateTask", () => {
 		})
 	})

+	describe("#given provider cache exists and connected providers are known", () => {
+		let readConnectedProvidersSpy: ReturnType<typeof spyOn> | undefined
+
+		beforeEach(() => {
+			hasConnectedProvidersSpy = spyOn(connectedProvidersCache, "hasConnectedProvidersCache").mockReturnValue(true)
+			hasProviderModelsSpy = spyOn(connectedProvidersCache, "hasProviderModelsCache").mockReturnValue(true)
+		})
+
+		afterEach(() => {
+			readConnectedProvidersSpy?.mockRestore()
+		})
+
+		describe("#when availableModels is empty and fallback chain starts with unauthenticated provider", () => {
+			test("#then skips unauthenticated providers and resolves to first connected one", () => {
+				readConnectedProvidersSpy = spyOn(connectedProvidersCache, "readConnectedProvidersCache").mockReturnValue(["openai", "anthropic"])
+
+				const result = resolveModelForDelegateTask({
+					fallbackChain: [
+						{ providers: ["xai"], model: "grok-code-fast-1" },
+						{ providers: ["opencode-go"], model: "minimax-m2.7" },
+						{ providers: ["anthropic", "opencode"], model: "claude-haiku-4-5" },
+						{ providers: ["opencode"], model: "gpt-5-nano" },
+					],
+					availableModels: new Set(),
+				})
+
+				expect(result).toBeDefined()
+				expect(result).not.toHaveProperty("skipped")
+				const resolved = result as { model: string; variant?: string }
+				expect(resolved.model).toBe("anthropic/claude-haiku-4-5")
+			})
+
+			test("#then resolves first provider in entry that is connected", () => {
+				readConnectedProvidersSpy = spyOn(connectedProvidersCache, "readConnectedProvidersCache").mockReturnValue(["openai", "github-copilot"])
+
+				const result = resolveModelForDelegateTask({
+					fallbackChain: [
+						{ providers: ["opencode-go"], model: "minimax-m2.7" },
+						{ providers: ["openai", "github-copilot"], model: "gpt-5.4", variant: "high" },
+					],
+					availableModels: new Set(),
+				})
+
+				expect(result).toBeDefined()
+				const resolved = result as { model: string; variant?: string }
+				expect(resolved.model).toBe("openai/gpt-5.4")
+				expect(resolved.variant).toBe("high")
+			})
+
+			test("#then falls through to system default when no provider in chain is connected", () => {
+				readConnectedProvidersSpy = spyOn(connectedProvidersCache, "readConnectedProvidersCache").mockReturnValue(["anthropic"])
+
+				const result = resolveModelForDelegateTask({
+					fallbackChain: [
+						{ providers: ["xai"], model: "grok-code-fast-1" },
+						{ providers: ["opencode-go"], model: "minimax-m2.7" },
+					],
+					availableModels: new Set(),
+					systemDefaultModel: "anthropic/claude-sonnet-4-6",
+				})
+
+				expect(result).toEqual({ model: "anthropic/claude-sonnet-4-6" })
+			})
+		})
+
+		describe("#when connected providers cache is null (not yet populated)", () => {
+			test("#then falls back to first entry in chain (legacy behavior)", () => {
+				readConnectedProvidersSpy = spyOn(connectedProvidersCache, "readConnectedProvidersCache").mockReturnValue(null)
+
+				const result = resolveModelForDelegateTask({
+					fallbackChain: [
+						{ providers: ["xai"], model: "grok-code-fast-1" },
+					],
+					availableModels: new Set(),
+				})
+
+				expect(result).toBeDefined()
+				const resolved = result as { model: string }
+				expect(resolved.model).toBe("xai/grok-code-fast-1")
+			})
+		})
+	})
+
 	describe("#given only connected providers cache exists (no provider-models cache)", () => {
 		beforeEach(() => {
 			hasConnectedProvidersSpy = spyOn(connectedProvidersCache, "hasConnectedProvidersCache").mockReturnValue(true)