Skip to content

Commit ca802aa

Browse files
samalukclaude
andcommitted
refactor: look up selected models in the full catalog, offer only visible ones
Model options now come from one per-instance catalog that keeps hidden models flagged isHidden. Pickers and new choices filter hidden entries out, while the selected model's label, badge and capabilities are read from the catalog, so a saved hidden selection still renders accurately. Mobile gets the same lookup through getSelectedModelOption, matched by instance and model. Only built-in models can be hidden at this point, so resolution is unchanged. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 61c3794 commit ca802aa

15 files changed

Lines changed: 150 additions & 97 deletions

‎apps/mobile/src/components/ComposerModelControl.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export function ComposerModelControl(props: {
4343
accessibilityLabel={[
4444
"Model and reasoning settings",
4545
label,
46+
props.modelOption?.isHidden ? "Hidden from picker" : null,
4647
badge?.showBadge ? badge.displayName : null,
4748
summary,
4849
]
@@ -70,7 +71,7 @@ export function ComposerModelControl(props: {
7071
/>
7172
)
7273
}
73-
label={props.modelOption?.shortName ?? label}
74+
label={`${props.modelOption?.shortName ?? label}${props.modelOption?.isHidden ? " (Hidden)" : ""}`}
7475
iconOnly={props.iconOnly}
7576
suffix={
7677
summary ? (

‎apps/mobile/src/features/settings/ScheduledTaskPickerScreens.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as Haptics from "expo-haptics";
33
import { useMemo, useState } from "react";
44

55
import { AppText as Text } from "../../components/ui/AppText";
6-
import { buildModelOptions, groupByProvider } from "../../lib/modelOptions";
6+
import { buildModelOptions, getSelectedModelOption, groupByProvider } from "../../lib/modelOptions";
77
import { resolveProviderOptionDescriptors } from "../../lib/providerOptions";
88
import { useEnvironmentServerConfig, useProjects } from "../../state/entities";
99
import { useDebouncedValue, usePaginatedBranches } from "../../state/queries";
@@ -31,11 +31,7 @@ export function ScheduledTaskModelPickerRouteScreen() {
3131
[config, selectedModel, projectId],
3232
);
3333
const providerGroups = useMemo(() => groupByProvider(models), [models]);
34-
const selectedOption = models.find(
35-
(option) =>
36-
option.selection.instanceId === selectedModel?.instanceId &&
37-
option.selection.model === selectedModel.model,
38-
);
34+
const selectedOption = getSelectedModelOption(config, selectedModel, projectId);
3935
const optionDescriptors = useMemo(
4036
() =>
4137
resolveProviderOptionDescriptors({

‎apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import { ThemedSwitch } from "../../components/ui/ThemedSwitch";
5656
import { webhookAddress } from "@t3tools/client-runtime/webhook-address";
5757
import { tryCopyTextWithHaptic } from "../../lib/copyTextWithHaptic";
5858
import { usePreparedConnection } from "../../state/session";
59-
import { buildModelOptions } from "../../lib/modelOptions";
59+
import { buildModelOptions, getSelectedModelOption } from "../../lib/modelOptions";
6060
import { NativeStackScreenOptions } from "../../native/StackHeader";
6161
import { useProjects, useEnvironmentServerConfig } from "../../state/entities";
6262
import { useEnvironmentQuery } from "../../state/query";
@@ -693,6 +693,7 @@ function TaskForm({
693693
.sort((left, right) => Number(right.pinnedAt != null) - Number(left.pinnedAt != null));
694694
const config = useEnvironmentServerConfig(environmentId);
695695
const modelOptions = buildModelOptions(config, null, undefined, draft.projectId);
696+
const selectedModelOption = getSelectedModelOption(config, draft.modelSelection, draft.projectId);
696697
// Existing webhook tasks keep the option so they can still switch to a timer.
697698
const webhookDenial = managedCapabilityDenial(config?.managedPolicy, "webhookTasks");
698699
const canOperate = useAtomValue(
@@ -919,11 +920,9 @@ function TaskForm({
919920
label="Model"
920921
borderTop
921922
value={
922-
modelOptions.find(
923-
(option) =>
924-
option.selection.instanceId === draft.modelSelection?.instanceId &&
925-
option.selection.model === draft.modelSelection?.model,
926-
)?.label ??
923+
(selectedModelOption
924+
? `${selectedModelOption.label}${selectedModelOption.isHidden ? " (Hidden)" : ""}`
925+
: null) ??
927926
draft.modelSelection?.model ??
928927
(modelOptions.length ? "Choose model" : "No models available")
929928
}

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import {
8686
composerStripAttachments,
8787
type DraftComposerFileAttachment,
8888
} from "../../lib/composerImages";
89-
import { buildModelOptions, isModelSelectionUnavailable } from "../../lib/modelOptions";
89+
import { getSelectedModelOption, isModelSelectionUnavailable } from "../../lib/modelOptions";
9090
import { useScaledTextRole, type ScaledTextRole } from "../settings/appearance/useScaledTextRole";
9191
import type { RemoteClientConnectionState } from "../../lib/connection";
9292
import { MOBILE_TYPOGRAPHY } from "../../lib/typography";
@@ -703,21 +703,11 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
703703
});
704704
};
705705

706-
const lockedProviderInstanceId = props.canSwitchProvider
707-
? undefined
708-
: currentModelSelection.instanceId;
709-
const modelOptions = buildModelOptions(
706+
const currentModelOption = getSelectedModelOption(
710707
props.serverConfig,
711708
currentModelSelection,
712-
lockedProviderInstanceId,
713709
props.selectedThread.projectId,
714710
);
715-
const currentModelOption =
716-
modelOptions.find(
717-
(option) =>
718-
option.selection.instanceId === currentModelSelection.instanceId &&
719-
option.selection.model === currentModelSelection.model,
720-
) ?? null;
721711
const openSettings = () => {
722712
settingsSheetPresentation.open();
723713
};

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import { cn } from "../../lib/cn";
6868
import { useReduceMotionEnabled } from "../../lib/appState";
6969
import {
7070
buildModelOptions,
71+
getSelectedModelOption,
7172
groupByProvider,
7273
type ModelOption,
7374
type ProviderGroup,
@@ -311,6 +312,7 @@ type ThreadSettingsSessionValue = {
311312
readonly displayedDescriptors: ReadonlyArray<ProviderOptionDescriptor>;
312313
readonly promptTraits: ReturnType<typeof getPromptControlledTraits>;
313314
readonly displayedModelSelection: ModelSelection | null;
315+
readonly hiddenModelLabel: string | null;
314316
readonly reportedModelSelection: ModelSelection | null;
315317
readonly providerExpansionOverrides: ReadonlySet<string>;
316318
readonly hasLegacyModels: boolean;
@@ -512,6 +514,7 @@ function ThreadSettingsSessionProvider(
512514
const displayedModel =
513515
pendingModel ??
514516
props.providerGroups.flatMap((group) => group.models).find((option) => isApplied(option)) ??
517+
getSelectedModelOption(config, props.selectedModel, props.projectId) ??
515518
null;
516519
const runtimeModeChoices = withManagedRuntimeModeLimits(
517520
runtimeModeChoicesForSupportedModes(displayedModel?.supportedRuntimeModes),
@@ -592,6 +595,7 @@ function ThreadSettingsSessionProvider(
592595
};
593596

594597
const pressModel = (option: ModelOption) => {
598+
if (option.isHidden) return;
595599
void Haptics.selectionAsync();
596600
if (isApplied(option) || option.key !== pendingModel?.key) {
597601
setPendingPrompt(null);
@@ -620,6 +624,15 @@ function ThreadSettingsSessionProvider(
620624
displayedDescriptors,
621625
promptTraits,
622626
displayedModelSelection: pendingModel?.selection ?? props.selectedModel,
627+
hiddenModelLabel:
628+
!pendingModel &&
629+
props.selectedModel &&
630+
settings?.providerModelPreferences?.[props.selectedModel.instanceId]?.hiddenModels.includes(
631+
props.selectedModel.model,
632+
)
633+
? (getSelectedModelOption(config, props.selectedModel, props.projectId)?.label ??
634+
props.selectedModel.model)
635+
: null,
623636
reportedModelSelection: pendingModel ? null : (props.reportedModelSelection ?? null),
624637
favoriteKeys,
625638
favoritesLoaded,
@@ -1030,6 +1043,12 @@ function ThreadSettingsMainContent(props: {
10301043
maintainVisibleContentPosition={THREAD_SETTINGS_MAINTAIN_VISIBLE_CONTENT_POSITION}
10311044
ListHeaderComponent={
10321045
<>
1046+
{session.hiddenModelLabel ? (
1047+
<Text className="px-4 py-3 text-sm text-foreground-muted">
1048+
{session.hiddenModelLabel} is hidden from the picker. Your saved selection still uses
1049+
it.
1050+
</Text>
1051+
) : null}
10331052
{Platform.OS === "android" ? (
10341053
<View className="px-4 pb-2 pt-3">
10351054
<View
@@ -1540,12 +1559,11 @@ export function ExistingThreadSettingsRouteScreen({
15401559
lockedProviderInstanceId,
15411560
selectedThread.projectId,
15421561
);
1543-
const currentModelOption =
1544-
modelOptions.find(
1545-
(option) =>
1546-
option.selection.instanceId === modelSelection.instanceId &&
1547-
option.selection.model === modelSelection.model,
1548-
) ?? null;
1562+
const currentModelOption = getSelectedModelOption(
1563+
serverConfig,
1564+
modelSelection,
1565+
selectedThread.projectId,
1566+
);
15491567
const updateModelSelection = (selection: ModelSelection) =>
15501568
updateThreadDraftModelSelection(threadKey, selection, serverConfig?.providers ?? []);
15511569

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import type { DraftComposerAttachment } from "../../lib/composerImages";
2929
import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
3030
import {
3131
buildModelOptions,
32+
getSelectedModelOption,
3233
groupByProvider,
3334
resolveDefaultableModelSelection,
3435
resolveNewTaskModelSelection,
@@ -471,13 +472,11 @@ export function NewTaskFlowProvider(
471472
? `${selectedModel.instanceId}:${selectedModel.model}`
472473
: null;
473474

474-
const selectedModelOption =
475-
modelOptions.find(
476-
(option) =>
477-
selectedModel &&
478-
option.selection.instanceId === selectedModel.instanceId &&
479-
option.selection.model === selectedModel.model,
480-
) ?? null;
475+
const selectedModelOption = getSelectedModelOption(
476+
selectedEnvironmentServerConfig,
477+
selectedModel,
478+
selectedProject?.id ?? null,
479+
);
481480
const selectedProviderStatus =
482481
selectedEnvironmentServerConfig?.providers.find(
483482
(provider) => provider.instanceId === selectedModel?.instanceId,

‎apps/mobile/src/lib/modelOptions.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
buildModelOptions,
1515
describeUnavailableModelSelection,
1616
groupByProvider,
17+
getSelectedModelOption,
1718
isModelSelectionUnavailable,
1819
resolveDefaultableModelSelection,
1920
resolveNewTaskModelSelection,
@@ -186,6 +187,13 @@ describe("mobile model options", () => {
186187
(option) => option.providerKey,
187188
),
188189
).toEqual(["codex", "codex_work"]);
190+
expect(
191+
getSelectedModelOption(
192+
config,
193+
{ instanceId: ProviderInstanceId.make("codex_work"), model: "test" },
194+
null,
195+
)?.providerKey,
196+
).toBe("codex_work");
189197
});
190198

191199
it("matches the web driver fallback without moving unknown Antigravity history", () => {

‎apps/mobile/src/lib/modelOptions.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,21 @@ export function buildModelOptions(
458458
return [...options.values()];
459459
}
460460

461+
export function getSelectedModelOption(
462+
config: T3ServerConfig | null | undefined,
463+
selection: ModelSelection | null,
464+
projectId: ProjectId | null,
465+
): ModelOption | null {
466+
if (!selection) return null;
467+
return (
468+
buildModelOptions(config, selection, selection.instanceId, projectId, true).find(
469+
(option) =>
470+
option.selection.instanceId === selection.instanceId &&
471+
option.selection.model === selection.model,
472+
) ?? null
473+
);
474+
}
475+
461476
export function groupByProvider(options: ReadonlyArray<ModelOption>): ReadonlyArray<ProviderGroup> {
462477
const groups = new Map<
463478
string,

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ import { Button } from "../ui/button";
237237
import { useManagedPolicy } from "../../state/managedPolicy";
238238
import { proposedPlanTitle } from "@t3tools/shared/proposedPlanText";
239239
import { hasProviderSetup } from "./ProviderStatusBanner";
240-
import { type AppModelOption, getAppModelOptionsForInstance } from "../../modelSelection";
240+
import { type AppModelOption, getAppModelCatalogForInstance } from "../../modelSelection";
241241
import type { UnifiedSettings } from "@t3tools/contracts/settings";
242242
import { isVideoAttachment, type SessionPhase, type Thread, type ThreadShell } from "../../types";
243243
import { type ComposerPromptHistoryPosition } from "./composerPromptHistory";
@@ -978,7 +978,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
978978
for (const entry of providerInstanceEntries) {
979979
modelOptionsByInstance.set(
980980
entry.instanceId,
981-
getAppModelOptionsForInstance(
981+
getAppModelCatalogForInstance(
982982
settings,
983983
entry,
984984
entry.instanceId === selectedInstanceId ? selectedModelForPicker : null,

‎apps/web/src/components/chat/ModelPickerContent.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ export function resolveModelPickerSelectedModel(input: {
8989
}) {
9090
if (input.driverKind === "antigravity" && input.model === ANTIGRAVITY_DEFAULT_MODEL) {
9191
const availableModels = input.options.filter(
92-
(option) => option.slug !== ANTIGRAVITY_DEFAULT_MODEL && !option.isUnavailable,
92+
(option) =>
93+
option.slug !== ANTIGRAVITY_DEFAULT_MODEL && !option.isUnavailable && !option.isHidden,
9394
);
9495
return (
9596
availableModels.find((option) => option.aliases?.includes(ANTIGRAVITY_DEFAULT_MODEL)) ??
@@ -105,6 +106,7 @@ function shouldIncludeModelPickerOption(input: {
105106
readonly activeInstanceId: ProviderInstanceId;
106107
readonly activeModel: string;
107108
}): boolean {
109+
if (input.option.isHidden) return false;
108110
if (input.entry.driverKind === "antigravity" && input.option.slug === ANTIGRAVITY_DEFAULT_MODEL) {
109111
return false;
110112
}
@@ -496,7 +498,11 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
496498
if (!entry) {
497499
return null;
498500
}
499-
const resolvedModel = resolveSelectableModel(entry.driverKind, modelSlug, options);
501+
const resolvedModel = resolveSelectableModel(
502+
entry.driverKind,
503+
modelSlug,
504+
options.filter((option) => !option.isHidden),
505+
);
500506
if (!resolvedModel) return null;
501507
if (additive && onToggleModel) {
502508
onToggleModel(instanceId, resolvedModel);

0 commit comments

Comments
 (0)