Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion apps/mobile/src/lib/modelOptions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
5 changes: 4 additions & 1 deletion apps/mobile/src/lib/modelOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -592,6 +594,7 @@ export function groupByProvider(options: ReadonlyArray<ModelOption>): ReadonlyAr
}
>();
for (const option of options) {
if (option.isUnavailable) continue;
const existing = groups.get(option.providerKey);
if (existing) {
existing.models.push(option);
Expand Down
8 changes: 1 addition & 7 deletions apps/server/src/inference/providerHealth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/provider/ProviderRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 1 addition & 8 deletions apps/web/src/components/chat/ModelListRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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;
Expand All @@ -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 &&
Expand Down Expand Up @@ -93,11 +91,6 @@ export const ModelListRow = memo(function ModelListRow(props: {
New
</span>
) : null}
{props.unavailable ? (
<Badge variant="outline" size="sm">
Unavailable
</Badge>
) : null}
</div>

<div className="flex shrink-0 items-center gap-1.5">
Expand Down
133 changes: 49 additions & 84 deletions apps/web/src/components/chat/ModelPickerContent.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useLegendListRef } from "~/hooks/useLegendListRef";
import {
ANTIGRAVITY_DEFAULT_MODEL,
providerLimitedUntilMs,
type ProviderInstanceId,
type EnvironmentId,
type ProviderDriverKind,
Expand Down Expand Up @@ -66,7 +67,6 @@ import {
type ProviderInstanceEntry,
} from "../../providerInstances";
import { providerModelKey, sortProviderModelItems } from "../../modelOrdering";
import { hasRuntimeModelCatalog } from "../../providerModels";

type ModelPickerItem = {
slug: string;
Expand All @@ -82,7 +82,6 @@ type ModelPickerItem = {
acpRegistryIconUrl?: string | undefined;
continuationGroupKey?: string | undefined;
isLegacy?: boolean | undefined;
isUnavailable?: boolean | undefined;
};

export function resolveModelPickerSelectedModel(input: {
Expand All @@ -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)
);
}

Expand All @@ -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)))))
);
}

Expand Down Expand Up @@ -394,31 +384,39 @@ 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<ProviderInstanceEntry, "driverKind" | "continuationGroupKey">,
): 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 &&
shouldOfferModelPickerSetup(
activeEntry,
modelOptionsByInstance.get(props.activeInstanceId) ?? [],
);
const [selectedInstanceId, setSelectedInstanceId] = useState<ProviderInstanceId | "favorites">(
const [requestedInstanceId, setSelectedInstanceId] = useState<ProviderInstanceId | "favorites">(
() => {
if (
props.lockedProvider !== null ||
activeInstanceHasSelectableUnavailableModel ||
activeInstanceNeedsSetup
) {
if (props.lockedProvider !== null || activeInstanceNeedsSetup) {
return props.activeInstanceId;
}
const hasPickableFavorite = favorites.some((favorite) => {
Expand All @@ -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,
Expand Down Expand Up @@ -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);
Expand All @@ -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<ProviderInstanceEntry, "driverKind" | "continuationGroupKey">,
): 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<ProviderInstanceId>();
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);
}
}
Expand All @@ -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);
Expand All @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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[] => [
Expand Down Expand Up @@ -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}
Expand Down
Loading
Loading