diff --git a/apps/mobile/src/lib/modelOptions.test.ts b/apps/mobile/src/lib/modelOptions.test.ts index 6348d6cc19c51..e722ba3482e70 100644 --- a/apps/mobile/src/lib/modelOptions.test.ts +++ b/apps/mobile/src/lib/modelOptions.test.ts @@ -460,11 +460,21 @@ describe("mobile model options", () => { }; expect(isModelSelectionUnavailable(cooling, usable, null)).toBe(true); expect(resolveSelectableModelSelection(cooling, usable, null)).toBe(usable); - expect(buildModelOptions(cooling, usable, undefined, null)[0]).toMatchObject({ + expect(resolveDefaultableModelSelection(cooling, usable, null)).toBeNull(); + const options = buildModelOptions(cooling, usable, undefined, null); + expect(options[0]).toMatchObject({ selection: usable, label: "GPT-5.6-Sol", isUnavailable: true, }); + expect(groupByProvider(options)).toEqual([]); + const healthy = { + ...options[0]!, + key: "codex:gpt-other", + isUnavailable: false, + selection: { ...usable, model: "gpt-other" }, + }; + expect(groupByProvider([...options, healthy])).toMatchObject([{ models: [healthy] }]); }); describe("Antigravity selections", () => { diff --git a/apps/mobile/src/lib/modelOptions.ts b/apps/mobile/src/lib/modelOptions.ts index d17abeaa02c6c..f66878c230d70 100644 --- a/apps/mobile/src/lib/modelOptions.ts +++ b/apps/mobile/src/lib/modelOptions.ts @@ -345,7 +345,9 @@ export function resolveDefaultableModelSelection( } const provider = config.providers.find((candidate) => candidate.instanceId === usable.instanceId); const model = provider?.models.find((candidate) => candidate.slug === usable.model); - return provider?.driver !== "antigravity" && model?.isLegacy === true ? null : usable; + return model?.isUnavailable || (provider?.driver !== "antigravity" && model?.isLegacy) + ? null + : usable; } export function resolveNewTaskModelSelection(input: { @@ -592,6 +594,7 @@ export function groupByProvider(options: ReadonlyArray): ReadonlyAr } >(); for (const option of options) { + if (option.isUnavailable) continue; const existing = groups.get(option.providerKey); if (existing) { existing.models.push(option); diff --git a/apps/server/src/inference/providerHealth.ts b/apps/server/src/inference/providerHealth.ts index dde586c6c7787..ee6320b3c99ac 100644 --- a/apps/server/src/inference/providerHealth.ts +++ b/apps/server/src/inference/providerHealth.ts @@ -114,15 +114,9 @@ export const makeInferenceProviderHealth = Effect.fn("makeInferenceProviderHealt }; } if (problem === undefined) return { ...provider, models }; - if (models.some((model) => model.isUnavailable)) - return { - ...provider, - models, - status: provider.status === "ready" ? ("warning" as const) : provider.status, - message: problem, - }; return { ...provider, + models: models.length ? models : provider.models, availability: "unavailable" as const, unavailableReason: problem, status: "error" as const, diff --git a/apps/server/src/provider/ProviderRegistry.test.ts b/apps/server/src/provider/ProviderRegistry.test.ts index c391aeec18dd4..5fea56da78d9d 100644 --- a/apps/server/src/provider/ProviderRegistry.test.ts +++ b/apps/server/src/provider/ProviderRegistry.test.ts @@ -1315,7 +1315,7 @@ it.layer( poolAvailable = false; yield* TestClock.adjust("16 seconds"); const coolingPool = (yield* registry.getProviders)[0]!; - expect(coolingPool.availability).toBeUndefined(); + expect(coolingPool.availability).toBe(mixedCatalog ? undefined : "unavailable"); expect( coolingPool.models.find((model) => model.slug === offlineSlug)?.isUnavailable, ).toBe(true); diff --git a/apps/web/src/components/chat/ModelListRow.tsx b/apps/web/src/components/chat/ModelListRow.tsx index 6df6dd249f788..e34412d238539 100644 --- a/apps/web/src/components/chat/ModelListRow.tsx +++ b/apps/web/src/components/chat/ModelListRow.tsx @@ -4,7 +4,6 @@ import { CheckIcon, StarIcon } from "lucide-react"; import { getDisplayModelName } from "./providerIconUtils"; import { ComboboxItem } from "../ui/combobox"; import { Button } from "../ui/button"; -import { Badge } from "../ui/badge"; import { Kbd } from "../ui/kbd"; import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; import { cn } from "~/lib/utils"; @@ -29,7 +28,6 @@ export const ModelListRow = memo(function ModelListRow(props: { /** Marks this instance apart from another of the same provider. */ showInstanceBadge: boolean; showNewBadge?: boolean; - unavailable?: boolean; jumpLabel?: string | null; disabledReason?: string | null; onToggleFavorite: (instanceId: ProviderInstanceId, slug: string) => void; @@ -46,7 +44,7 @@ export const ModelListRow = memo(function ModelListRow(props: { selectedFill={false} index={props.index} value={modelPickerModelKey(props.instanceId, props.slug)} - disabled={props.unavailable || Boolean(props.disabledReason)} + disabled={Boolean(props.disabledReason)} className={cn( "group relative w-full !min-w-0 max-w-full cursor-pointer", props.disabledReason && @@ -93,11 +91,6 @@ export const ModelListRow = memo(function ModelListRow(props: { New ) : null} - {props.unavailable ? ( - - Unavailable - - ) : null}
diff --git a/apps/web/src/components/chat/ModelPickerContent.tsx b/apps/web/src/components/chat/ModelPickerContent.tsx index 0e374a915f5d5..2702c58164a3f 100644 --- a/apps/web/src/components/chat/ModelPickerContent.tsx +++ b/apps/web/src/components/chat/ModelPickerContent.tsx @@ -1,6 +1,7 @@ import { useLegendListRef } from "~/hooks/useLegendListRef"; import { ANTIGRAVITY_DEFAULT_MODEL, + providerLimitedUntilMs, type ProviderInstanceId, type EnvironmentId, type ProviderDriverKind, @@ -66,7 +67,6 @@ import { type ProviderInstanceEntry, } from "../../providerInstances"; import { providerModelKey, sortProviderModelItems } from "../../modelOrdering"; -import { hasRuntimeModelCatalog } from "../../providerModels"; type ModelPickerItem = { slug: string; @@ -82,7 +82,6 @@ type ModelPickerItem = { acpRegistryIconUrl?: string | undefined; continuationGroupKey?: string | undefined; isLegacy?: boolean | undefined; - isUnavailable?: boolean | undefined; }; export function resolveModelPickerSelectedModel(input: { @@ -102,23 +101,11 @@ export function resolveModelPickerSelectedModel(input: { return input.options.find((option) => option.slug === input.model); } -function shouldIncludeModelPickerOption(input: { - readonly entry: ProviderInstanceEntry; - readonly option: ModelEsque; - readonly activeInstanceId: ProviderInstanceId; - readonly activeModel: string; -}): boolean { - if (input.entry.driverKind === "antigravity" && input.option.slug === ANTIGRAVITY_DEFAULT_MODEL) { - return false; - } - if (isProviderInstancePickerReady(input.entry)) return true; - if (input.option.isUnavailable && isProviderInstancePickerVisible(input.entry)) return true; +function shouldIncludeModelPickerOption(entry: ProviderInstanceEntry, option: ModelEsque): boolean { return ( - input.entry.enabled && - hasRuntimeModelCatalog(input.entry.driverKind) && - input.entry.instanceId === input.activeInstanceId && - input.option.slug === input.activeModel && - input.option.isUnavailable === true + isProviderInstancePickerReady(entry) && + !option.isUnavailable && + !(entry.driverKind === "antigravity" && option.slug === ANTIGRAVITY_DEFAULT_MODEL) ); } @@ -130,10 +117,13 @@ function shouldOfferModelPickerSetup( entry.enabled && entry.status !== "disabled" && hasProviderSetup(entry.snapshot) && - (!isProviderInstancePickerReady(entry) || - !entry.installed || + (!entry.installed || entry.snapshot.auth.status === "unauthenticated" || - !options.some((option) => !option.isUnavailable)) + (entry.isAvailable && + providerLimitedUntilMs(entry.snapshot, Date.now()) === null && + (options.length === 0 || + (!isProviderInstancePickerReady(entry) && + options.some((option) => !option.isUnavailable))))) ); } @@ -394,17 +384,29 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { const selectedModelKeySet = new Set( selectedModelKeys ?? (activeModelKey ? [activeModelKey] : []), ); - const activeInstanceHasSelectableUnavailableModel = - activeEntry !== undefined && - (modelOptionsByInstance.get(props.activeInstanceId) ?? []).some((option) => - shouldIncludeModelPickerOption({ - entry: activeEntry, - option, - activeInstanceId: props.activeInstanceId, - activeModel: activeModelSlug, - }), - ) && - !isProviderInstancePickerReady(activeEntry); + const lockedProvider = props.lockedProvider; + const lockedContinuationGroupKey = props.lockedContinuationGroupKey; + const canOpenProviderSetup = onOpenProviderSetup !== undefined; + + const entryByInstanceId = new Map(instanceEntries.map((entry) => [entry.instanceId, entry])); + const matchesLockedProvider = ( + entry: Pick, + ): boolean => { + if (lockedProvider === null) return true; + if (entry.driverKind !== lockedProvider) return false; + if (!lockedContinuationGroupKey) return true; + return entry.continuationGroupKey === lockedContinuationGroupKey; + }; + + const visibleEntries = instanceEntries.filter((entry) => { + const options = modelOptionsByInstance.get(entry.instanceId); + return ( + isProviderInstancePickerVisible(entry) && + (!options?.length || + options.some((option) => !option.isUnavailable) || + (onOpenProviderSetup !== undefined && shouldOfferModelPickerSetup(entry, options))) + ); + }); const activeInstanceNeedsSetup = onOpenProviderSetup !== undefined && activeEntry !== undefined && @@ -412,13 +414,9 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { activeEntry, modelOptionsByInstance.get(props.activeInstanceId) ?? [], ); - const [selectedInstanceId, setSelectedInstanceId] = useState( + const [requestedInstanceId, setSelectedInstanceId] = useState( () => { - if ( - props.lockedProvider !== null || - activeInstanceHasSelectableUnavailableModel || - activeInstanceNeedsSetup - ) { + if (props.lockedProvider !== null || activeInstanceNeedsSetup) { return props.activeInstanceId; } const hasPickableFavorite = favorites.some((favorite) => { @@ -427,19 +425,19 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { entry !== undefined && (modelOptionsByInstance.get(favorite.provider) ?? []).some( (option) => - option.slug === favorite.model && - shouldIncludeModelPickerOption({ - entry, - option, - activeInstanceId: props.activeInstanceId, - activeModel: activeModelSlug, - }), + option.slug === favorite.model && shouldIncludeModelPickerOption(entry, option), ) ); }); return hasPickableFavorite ? "favorites" : props.activeInstanceId; }, ); + const selectedInstanceId = + requestedInstanceId === "favorites" || + (requestedInstanceId === props.activeInstanceId && activeInstanceNeedsSetup) || + visibleEntries.some((entry) => entry.instanceId === requestedInstanceId) + ? requestedInstanceId + : (visibleEntries.find(matchesLockedProvider)?.instanceId ?? "favorites"); const { scanning: workspaceModelsScanning } = useProviderWorkspaceSnapshotRefresh({ environmentId: props.environmentId, gitCwd: props.workspaceCwd ?? null, @@ -498,7 +496,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { return null; } const entry = instanceEntries.find((candidate) => candidate.instanceId === instanceId); - if (!entry) { + if (!entry || !isProviderInstancePickerReady(entry)) { return null; } const resolvedModel = resolveSelectableModel(entry.driverKind, modelSlug, options); @@ -517,31 +515,11 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { terminalOpen: props.terminalOpen, modelPickerOpen: true, } as const; - const lockedProvider = props.lockedProvider; - const lockedContinuationGroupKey = props.lockedContinuationGroupKey; - const canOpenProviderSetup = onOpenProviderSetup !== undefined; - - const entryByInstanceId = new Map(instanceEntries.map((entry) => [entry.instanceId, entry])); - const matchesLockedProvider = ( - entry: Pick, - ): boolean => { - if (lockedProvider === null) return true; - if (entry.driverKind !== lockedProvider) return false; - if (!lockedContinuationGroupKey) return true; - return entry.continuationGroupKey === lockedContinuationGroupKey; - }; - const selectableUnavailableInstanceIds = (() => { const instanceIds = new Set(); - if (activeInstanceHasSelectableUnavailableModel) { - instanceIds.add(props.activeInstanceId); - } for (const entry of instanceEntries) { const models = modelOptionsByInstance.get(entry.instanceId) ?? []; - if ( - (canOpenProviderSetup && shouldOfferModelPickerSetup(entry, models)) || - (entry.status === "warning" && models.some((model) => model.isUnavailable)) - ) { + if (canOpenProviderSetup && shouldOfferModelPickerSetup(entry, models)) { instanceIds.add(entry.instanceId); } } @@ -558,15 +536,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { } for (const model of models) { const key = modelPickerModelKey(instanceId, model.slug); - if ( - seenKeys.has(key) || - !shouldIncludeModelPickerOption({ - entry, - option: model, - activeInstanceId: props.activeInstanceId, - activeModel: activeModelSlug, - }) - ) { + if (seenKeys.has(key) || !shouldIncludeModelPickerOption(entry, model)) { continue; } seenKeys.add(key); @@ -577,7 +547,6 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { ...(model.subProvider ? { subProvider: model.subProvider } : {}), ...(model.badge ? { badge: model.badge } : {}), ...(model.isLegacy ? { isLegacy: true } : {}), - ...(model.isUnavailable ? { isUnavailable: true } : {}), instanceId, driverKind: entry.driverKind, instanceDisplayName: entry.displayName, @@ -632,13 +601,12 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { return disabled; })(); const sidebarInstanceEntries = (() => { - const enabledEntries = instanceEntries.filter(isProviderInstancePickerVisible); if (!isLocked) { - return enabledEntries; + return visibleEntries; } const available: ProviderInstanceEntry[] = []; const disabled: ProviderInstanceEntry[] = []; - for (const entry of enabledEntries) { + for (const entry of visibleEntries) { if (matchesLockedProvider(entry)) { available.push(entry); } else { @@ -744,9 +712,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { }); const modelJumpModelKeys = visibleModels - .filter( - (model) => !model.isUnavailable && !getModelDisabledReason?.(model.instanceId, model.slug), - ) + .filter((model) => !getModelDisabledReason?.(model.instanceId, model.slug)) .slice(0, MODEL_PICKER_JUMP_KEYBINDING_COMMANDS.length) .map((model) => modelPickerModelKey(model.instanceId, model.slug)); const allItemKeys = ((): string[] => [ @@ -1068,7 +1034,6 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: { favoriteStarOnHover={selectedInstanceId === "favorites" && !isSearching} showInstanceBadge={badgedInstanceIds.has(model.instanceId)} showNewBadge={model.badge === "new"} - unavailable={model.isUnavailable === true} jumpLabel={modelJumpLabelByKey.get(modelKey) ?? null} disabledReason={disabledReason} onToggleFavorite={toggleFavorite} diff --git a/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx b/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx index 96a12b3389b94..28fe70f8ef958 100644 --- a/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx +++ b/apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx @@ -204,9 +204,10 @@ it("lists a model reported twice by one provider once, with contiguous jump shor const options = new Map([ [ instanceId, - ["a", "b", "c", "c", "d", "d"].map((slug) => ({ + ["a", "b", "c", "c", "d", "d", "e"].map((slug) => ({ slug, name: `Model ${slug.toUpperCase()}`, + isUnavailable: slug === "e", })), ], ]); @@ -222,7 +223,7 @@ it("lists a model reported twice by one provider once, with contiguous jump shor {}} />, ); - await screen.getByRole("button", { name: "Choose model" }).click(); + const trigger = screen.getByRole("button", { name: "Choose model" }); + await expect.element(trigger.getByText("Unavailable", { exact: true })).toBeVisible(); + await trigger.click(); await expect.element(page.getByRole("option", { name: /Model A/ })).toBeVisible(); await vi.waitFor(() => expect( @@ -253,17 +256,24 @@ it("lists a model reported twice by one provider once, with contiguous jump shor it("opens on the active provider when every favorite belongs to a disabled provider", async () => { const entries = deriveProviderInstanceEntries( - ["Codex", "Claude"].map((name) => ({ + ["Codex", "Claude", "OpenCode"].map((name) => ({ instanceId: ProviderInstanceId.make(name.toLowerCase()), driver: ProviderDriverKind.make(name.toLowerCase()), - enabled: name === "Codex", + displayName: name, + enabled: name !== "Claude", installed: true, version: null, status: "ready" as const, auth: { status: "authenticated" as const }, checkedAt: "2026-01-01T00:00:00.000Z", models: [ - { slug: name.toLowerCase(), name: `${name} model`, isCustom: false, capabilities: {} }, + { + slug: name.toLowerCase(), + name: `${name} model`, + isCustom: false, + capabilities: {}, + isUnavailable: name === "OpenCode", + }, ], slashCommands: [], skills: [], @@ -278,20 +288,35 @@ it("opens on the active provider when every favorite belongs to a disabled provi [Symbol.dispose]: () => __setClientSettingsForTests(DEFAULT_CLIENT_SETTINGS), }; - await using screen = await render( + const picker = (providers: typeof entries) => ( [entry.instanceId, entry.models]))} + instanceEntries={providers} + modelOptionsByInstance={new Map(providers.map((entry) => [entry.instanceId, entry.models]))} triggerAriaLabel="Choose model" onInstanceModelChange={() => {}} - />, + /> ); + await using screen = await render(picker(entries)); await screen.getByRole("button", { name: "Choose model" }).click(); await expect.element(page.getByRole("option", { name: /Codex model/ })).toBeVisible(); + await expect.element(page.getByRole("button", { name: /OpenCode/ })).not.toBeInTheDocument(); + await screen.rerender( + picker( + entries.map((entry) => ({ + ...entry, + isAvailable: entry !== codex, + models: entry.models.map((model) => ({ ...model, isUnavailable: false })), + })), + ), + ); + await expect.element(page.getByRole("option", { name: /OpenCode model/ })).toBeVisible(); + await expect + .element(page.getByRole("button", { name: "Codex", exact: true })) + .not.toBeInTheDocument(); }); it("keeps the touch keyboard down while choosing a provider", async () => { diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx index b618b7a830f2d..4a59d1b97fc9b 100644 --- a/apps/web/src/components/chat/ProviderModelPicker.tsx +++ b/apps/web/src/components/chat/ProviderModelPicker.tsx @@ -26,7 +26,11 @@ import { retainedModelWhileProviderLocked } from "./ProviderModelPicker.logic"; import { ChatGptSharingControl } from "./ChatGptSharingControl"; import { ProviderInstanceIcon } from "./ProviderInstanceIcon"; import { ModelEsque, getDisplayModelName, getTriggerDisplayModelName } from "./providerIconUtils"; -import { shouldShowInstanceBadge, type ProviderInstanceEntry } from "../../providerInstances"; +import { + isProviderInstancePickerVisible, + shouldShowInstanceBadge, + type ProviderInstanceEntry, +} from "../../providerInstances"; import { ComposerControl, type ComposerControlSize } from "./ComposerControl"; import { takeOpenTarget, useComposerMenuProps } from "./composerEventScope"; import { shortcutLabelForCommand } from "../../keybindings"; @@ -175,9 +179,9 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: { : props.model === ANTIGRAVITY_DEFAULT_MODEL ? "Choose model" : props.model || "Choose model"; - const triggerLabel = selectedModel - ? `${getDisplayModelName(selectedModel)}${selectedModel.isUnavailable ? " (Unavailable)" : ""}` - : triggerTitle; + const selectedUnavailable = + selectedModel?.isUnavailable || (activeEntry && !isProviderInstancePickerVisible(activeEntry)); + const triggerLabel = `${selectedModel ? getDisplayModelName(selectedModel) : triggerTitle}${selectedUnavailable ? " (Unavailable)" : ""}`; const showInstanceBadge = activeEntry !== null && shouldShowInstanceBadge(activeEntry, props.instanceEntries); @@ -241,14 +245,15 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: { model: selection.model, options: props.modelOptionsByInstance.get(selection.instanceId) ?? [], }); - const unavailable = model?.isUnavailable ? " (Unavailable)" : ""; + const unavailable = + model?.isUnavailable || (entry && !isProviderInstancePickerVisible(entry)) + ? " (Unavailable)" + : ""; return { ...selection, entry, - label: model - ? `${getTriggerDisplayModelName(model, entry?.driverKind)}${unavailable}` - : selection.model, - fullLabel: model ? `${getDisplayModelName(model)}${unavailable}` : selection.model, + label: `${model ? getTriggerDisplayModelName(model, entry?.driverKind) : selection.model}${unavailable}`, + fullLabel: `${model ? getDisplayModelName(model) : selection.model}${unavailable}`, }; }); const multipleLabel = selectedEntries @@ -431,7 +436,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: { )} {props.triggerSuffix} - {selectedModel?.isUnavailable && !selectedEntries && props.triggerLabel === undefined ? ( + {selectedUnavailable && !selectedEntries && props.triggerLabel === undefined ? ( Unavailable diff --git a/docs/user/providers-claude.md b/docs/user/providers-claude.md index 6b5df76e86261..8be04edb7e3f0 100644 --- a/docs/user/providers-claude.md +++ b/docs/user/providers-claude.md @@ -64,8 +64,8 @@ The host receives the model request, including its prompt and tool results. The agent runs tools and stores files and thread history on its executing environment. Choosing another host in Settings changes the same provider. Local inference is labeled **Claude** or **Codex**. Open the model picker or refresh provider status in Settings to update the model list. -When every route serving a model reports a cooldown, the model stays visible as unavailable. -You can choose another model or keep your selection until the host can serve it again. +The picker hides a model when every route serving it is unavailable. If a provider has no usable models, the picker hides the provider too. +A thread keeps its selected model and shows when it is unavailable. You can choose another model or wait for it to recover. While a client is connected to the executing environment and other shared inference hosts, T3 discovers hosts that serve the same provider and saves them as fallback routes. If the selected host is unreachable, rejects authentication, or reaches a temporary limit, a new diff --git a/scripts/scenarios/inference-routing-discovers-hosted-models.e2e.ts b/scripts/scenarios/inference-routing-discovers-hosted-models.e2e.ts index 54cd5b9572f20..86a9afa210842 100644 --- a/scripts/scenarios/inference-routing-discovers-hosted-models.e2e.ts +++ b/scripts/scenarios/inference-routing-discovers-hosted-models.e2e.ts @@ -117,7 +117,7 @@ async function prepare(home: string) { } test( - "Hosted Codex models get display names and stay visible during a cooldown", + "Hosted Codex models get display names and leave the picker during a cooldown", WEB, async ({ t3, app, browser, screen }) => { await t3.project("demo"); @@ -157,14 +157,17 @@ test( await astraRow.scrollIntoView(); await app.screenshot("hosted-models-after-refresh"); - await app.open("/"); + await browser.keyboard.press("Escape"); await screen.getByRole("button", "New thread", { exact: true }).tap(); await screen.getByRole("option", /Hosted models/).tap(); await expect(browser).toHaveURL(/\/draft\//); + await expect(browser.locator("[data-command-palette]")).toHaveCount(0); const draft = await browser.evaluate(() => window.location.pathname); const picker = browser.locator("[data-chat-provider-model-picker]"); const astraOption = screen.getByRole("option", /gpt-6\.2-astra/i); const openPicker = async () => { + await expect(picker).toBeVisible(); + await expect(screen.getByRole("button", "Environment disconnected")).toBeHidden(); await picker.tap(); await screen.getByPlaceholder("Search models...").fill("6.2"); }; @@ -182,7 +185,7 @@ test( }; await updateCatalog(astra); await app.screenshot("astra-during-cooldown"); - await expect(astraOption).toBeDisabled(); + await expect(astraOption).toBeHidden(); await expect(picker).toHaveAttribute("aria-label", /GPT-6\.2-Astra.*Unavailable/); await expect(screen.getByRole("option", /gpt-6\.2-sol/i)).toBeEnabled(); await updateCatalog();