The best way to control Claude Code, Codex and more from any computer or phone
feat: model labels show the name you'd say out loud (#24205)
Co-authored-by: Claude Opus 5.5 (Claude Code) <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
oliver committed
Oct 27, 2026 at 02:04 UTC
56695ae3ec2aad931030af1e7e43852f741b9eef
31 files changed
+267
-182
apps/mobile/package.json
-8
@@ -73,14 +73,6 @@
73
"@t3tools/mobile-review-diff-native": "file:./modules/t3-review-diff",
74
"@t3tools/mobile-source-text": "file:./modules/t3-source-text",
75
"@t3tools/mobile-terminal-native": "file:./modules/t3-terminal",
76
- "@t3tools/provider-acp-registry": "workspace:*",
77
- "@t3tools/provider-core": "workspace:*",
78
- "@t3tools/provider-cursor": "workspace:*",
79
- "@t3tools/provider-fx": "workspace:*",
80
- "@t3tools/provider-grok": "workspace:*",
81
- "@t3tools/provider-muse": "workspace:*",
82
- "@t3tools/provider-opencode": "workspace:*",
83
- "@t3tools/provider-pi": "workspace:*",
76
"@t3tools/shared": "workspace:*",
77
"@tabler/icons-react-native": "^3.44.0",
78
"clsx": "^2.1.1",
apps/mobile/src/components/ComposerModelControl.tsx
+1
-1
@@ -70,7 +70,7 @@ export function ComposerModelControl(props: {
70
/>
71
)
72
}
73
- label={label}
73
+ label={props.modelOption?.shortName ?? label}
74
iconOnly={props.iconOnly}
75
suffix={
76
summary ? (
apps/mobile/src/components/ProviderIcon.tsx
+1
-1
@@ -10,7 +10,7 @@ import { useId, useState } from "react";
10
import { resolveOfficialAcpRegistryIconUrl } from "@t3tools/contracts";
11
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
12
import { AppText as Text } from "./ui/AppText";
13
-import { getProviderClient } from "../lib/providerClients";
13
+import { getProviderClient } from "@t3tools/client-runtime/provider-clients";
14
15
type ProviderIconProps = {
16
readonly provider: string | null | undefined;
apps/mobile/src/features/threads/thread-handoff-row.tsx
+2
-1
@@ -2,6 +2,7 @@ import * as Dialog from "../../components/ui/Dialog";
2
import { useAtomValue } from "@effect/atom-react";
3
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
4
import { resolveHandoffEndpoints, type HandoffEndpoints } from "@t3tools/client-runtime/handoff";
5
+import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
6
import {
7
normalizeProviderAccentColor,
8
resolveProviderInstanceDisplayName,
@@ -136,7 +137,7 @@ function HandoffEndpoint(props: {
137
const provider = props.providers.find((candidate) => candidate.instanceId === props.instanceId);
138
const model = provider?.models.find((candidate) => candidate.slug === props.model);
139
const label =
139
- model?.shortName ??
140
+ (model ? resolveModelShortName(model, provider?.driver) : undefined) ??
141
model?.name ??
142
props.model ??
143
(provider ? resolveProviderInstanceDisplayName(provider) : props.instanceId);
apps/mobile/src/lib/modelOptions.ts
+9
-1
@@ -11,15 +11,17 @@ import type {
11
RuntimeMode,
12
ServerConfig as T3ServerConfig,
13
} from "@t3tools/contracts";
14
-import { resolveProjectProviderInstanceEnabled } from "@t3tools/contracts";
14
+import { isProviderDriverKind, resolveProjectProviderInstanceEnabled } from "@t3tools/contracts";
15
import {
16
buildExplicitProviderOptionSelectionsFromDescriptors,
17
getProviderOptionDescriptors,
18
} from "@t3tools/shared/model";
19
+import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
20
21
export type ModelOption = {
22
readonly key: string;
23
readonly label: string;
24
+ readonly shortName?: string;
25
readonly subtitle: string;
26
readonly providerKey: string;
27
readonly providerLabel: string;
@@ -319,9 +321,11 @@ export function buildModelOptions(
321
models.sort((a, b) => (order.get(a.slug) ?? Infinity) - (order.get(b.slug) ?? Infinity));
322
for (const model of models) {
323
const key = `${provider.instanceId}:${model.slug}`;
324
+ const shortName = resolveModelShortName(model, provider.driver);
325
options.set(key, {
326
key,
327
label: model.name,
328
+ ...(shortName ? { shortName } : {}),
329
subtitle: model.subProvider ?? "",
330
providerKey: provider.instanceId,
331
providerLabel,
@@ -384,9 +388,13 @@ export function buildModelOptions(
388
displayName: provider?.displayName ?? instanceConfig?.displayName,
389
instanceId: fallbackModelSelection.instanceId,
390
});
391
+ const shortName = model
392
+ ? resolveModelShortName(model, isProviderDriverKind(providerDriver) ? providerDriver : null)
393
+ : undefined;
394
options.set(key, {
395
key,
396
label: model?.name ?? fallbackModelSelection.model,
397
+ ...(shortName ? { shortName } : {}),
398
subtitle: model?.subProvider ?? "",
399
providerKey: fallbackModelSelection.instanceId,
400
providerLabel,
apps/mobile/src/lib/providerClients.ts
deleted
-23
@@ -1,23 +0,0 @@
1
-import { isProviderDriverKind } from "@t3tools/contracts";
2
-import { acpRegistryClient } from "@t3tools/provider-acp-registry/client";
3
-import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
4
-import { cursorClient } from "@t3tools/provider-cursor/client";
5
-import { fxClient } from "@t3tools/provider-fx/client";
6
-import { grokClient } from "@t3tools/provider-grok/client";
7
-import { museClient } from "@t3tools/provider-muse/client";
8
-import { openCodeClient } from "@t3tools/provider-opencode/client";
9
-import { piClient } from "@t3tools/provider-pi/client";
10
-
11
-const providerClients = makeProviderClientRegistry([
12
- cursorClient,
13
- grokClient,
14
- fxClient,
15
- museClient,
16
- openCodeClient,
17
- piClient,
18
- acpRegistryClient,
19
-]);
20
-
21
-export function getProviderClient(driver: string | null | undefined) {
22
- return isProviderDriverKind(driver) ? providerClients.get(driver) : undefined;
23
-}
apps/web/package.json
-7
@@ -34,14 +34,7 @@
34
"@pierre/trees": "1.0.0-beta.6",
35
"@t3tools/client-runtime": "workspace:*",
36
"@t3tools/contracts": "workspace:*",
37
- "@t3tools/provider-acp-registry": "workspace:*",
37
"@t3tools/provider-core": "workspace:*",
39
- "@t3tools/provider-cursor": "workspace:*",
40
- "@t3tools/provider-fx": "workspace:*",
41
- "@t3tools/provider-grok": "workspace:*",
42
- "@t3tools/provider-muse": "workspace:*",
43
- "@t3tools/provider-opencode": "workspace:*",
44
- "@t3tools/provider-pi": "workspace:*",
38
"@t3tools/shared": "workspace:*",
39
"@tanstack/react-pacer": "^0.19.4",
40
"@tanstack/react-router": "^1.160.2",
apps/web/src/components/ChatView.tsx
+1
-1
@@ -1628,7 +1628,7 @@ export default function ChatView(props: ChatViewProps) {
1628
(model) => model.slug === providerSubagentModelSlug,
1629
);
1630
const providerSubagentModelLabel = providerSubagentCatalogModel
1631
- ? getTriggerDisplayModelName(providerSubagentCatalogModel)
1631
+ ? getTriggerDisplayModelName(providerSubagentCatalogModel, selectedProviderEntry?.driverKind)
1632
: formatModelSlugName(activeThread?.modelSelection.model ?? "");
1633
const providerSubagentEffortLabel =
1634
activeThread === undefined
apps/web/src/components/chat/ContextWindowMeter.logic.test.ts
+1
-1
@@ -99,7 +99,7 @@ describe("resolveContextWindowModelDisplayName", () => {
99
},
100
modelOptionsByInstance,
101
),
102
- ).toBe("5.6 Sol");
102
+ ).toBe("GPT-5.6 Sol");
103
});
104
});
105
apps/web/src/components/chat/ContextWindowMeter.logic.ts
+2
-2
@@ -8,7 +8,7 @@ import {
8
resolveSelectableProviderInstanceEntry,
9
type ProviderInstanceEntry,
10
} from "../../providerInstances";
11
-import { getTriggerDisplayModelName, type ModelEsque } from "./providerIconUtils";
11
+import { getDisplayModelName, type ModelEsque } from "./providerIconUtils";
12
13
// Fallback TTL: Claude's 1h cache plus slack.
14
const CLAUDE_RESUME_COMPACTION_FALLBACK_MS = 70 * 60_000;
@@ -96,7 +96,7 @@ export function resolveContextWindowModelDisplayName(
96
.get(selection.instanceId)
97
?.find((model) => model.slug === selection.model);
98
99
- return selectedModel ? getTriggerDisplayModelName(selectedModel) : selection.model;
99
+ return selectedModel ? getDisplayModelName(selectedModel) : selection.model;
100
}
101
102
export function formatContextWindowCompactionMessage(
apps/web/src/components/chat/ModelListRow.tsx
+2
-15
@@ -1,11 +1,7 @@
1
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
2
import { memo } from "react";
3
import { CheckIcon, StarIcon } from "lucide-react";
4
-import {
5
- getDisplayModelName,
6
- getProviderRowLabel,
7
- getTriggerDisplayModelLabel,
8
-} from "./providerIconUtils";
4
+import { getDisplayModelName, getProviderRowLabel } from "./providerIconUtils";
5
import { ComboboxItem } from "../ui/combobox";
6
import { Button } from "../ui/button";
7
import { Badge } from "../ui/badge";
@@ -19,7 +15,6 @@ export const ModelListRow = memo(function ModelListRow(props: {
15
index: number;
16
slug: string;
17
name: string;
22
- shortName?: string | undefined;
18
subProvider?: string | undefined;
19
instanceId: ProviderInstanceId;
20
driverKind: ProviderDriverKind;
@@ -30,8 +25,6 @@ export const ModelListRow = memo(function ModelListRow(props: {
25
isFavorite: boolean;
26
isSelected: boolean;
27
showProvider: boolean;
33
- preferShortName?: boolean;
34
- useTriggerLabel?: boolean;
28
showNewBadge?: boolean;
29
unavailable?: boolean;
30
jumpLabel?: string | null;
@@ -41,7 +34,6 @@ export const ModelListRow = memo(function ModelListRow(props: {
34
const model = {
35
slug: props.slug,
36
name: props.name,
44
- shortName: props.shortName,
37
subProvider: props.subProvider,
38
};
39
const providerLabel = getProviderRowLabel(props.providerDisplayName, props.subProvider);
@@ -61,12 +53,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
53
<div className="min-w-0 flex-1 text-left">
54
<div className="flex min-w-0 items-center gap-2">
55
<div className="min-w-0 truncate text-sm font-normal leading-snug">
64
- {props.useTriggerLabel
65
- ? getTriggerDisplayModelLabel(model)
66
- : getDisplayModelName(
67
- model,
68
- props.preferShortName ? { preferShortName: true } : undefined,
69
- )}
56
+ {getDisplayModelName(model)}
57
</div>
58
{props.showNewBadge ? (
59
<span
apps/web/src/components/chat/ModelPickerContent.tsx
-3
@@ -999,7 +999,6 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
999
index={index}
1000
slug={model.slug}
1001
name={model.name}
1002
- shortName={model.shortName}
1002
subProvider={model.subProvider}
1003
instanceId={model.instanceId}
1004
driverKind={model.driverKind}
@@ -1014,8 +1013,6 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
1013
: modelKey === activeModelKey
1014
}
1015
showProvider={rowsMixProviders || Boolean(model.subProvider)}
1017
- preferShortName={!isLocked}
1018
- useTriggerLabel={false}
1016
showNewBadge={model.badge === "new"}
1017
unavailable={model.isUnavailable === true}
1018
jumpLabel={modelJumpLabelByKey.get(modelKey) ?? null}
apps/web/src/components/chat/ProviderModelPicker.tsx
+10
-10
@@ -13,11 +13,7 @@ import { cn } from "~/lib/utils";
13
import { ModelPickerContent, resolveModelPickerSelectedModel } from "./ModelPickerContent";
14
import { ChatGptSharingControl } from "./ChatGptSharingControl";
15
import { ProviderInstanceIcon } from "./ProviderInstanceIcon";
16
-import {
17
- ModelEsque,
18
- getTriggerDisplayModelLabel,
19
- getTriggerDisplayModelName,
20
-} from "./providerIconUtils";
16
+import { ModelEsque, getDisplayModelName, getTriggerDisplayModelName } from "./providerIconUtils";
17
import { shouldShowInstanceBadge, type ProviderInstanceEntry } from "../../providerInstances";
18
import {
19
ComposerControl,
@@ -121,12 +117,12 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
117
? undefined
118
: selectedInstanceOptions[0]);
119
const triggerTitle = selectedModel
124
- ? getTriggerDisplayModelName(selectedModel)
120
+ ? getTriggerDisplayModelName(selectedModel, activeEntry?.driverKind)
121
: props.model === ANTIGRAVITY_DEFAULT_MODEL
122
? "Choose model"
123
: props.model || "Choose model";
124
const triggerLabel = selectedModel
129
- ? `${getTriggerDisplayModelLabel(selectedModel)}${selectedModel.isUnavailable ? " (Unavailable)" : ""}`
125
+ ? `${getDisplayModelName(selectedModel)}${selectedModel.isUnavailable ? " (Unavailable)" : ""}`
126
: triggerTitle;
127
const showInstanceBadge =
128
activeEntry !== null && shouldShowInstanceBadge(activeEntry, props.instanceEntries);
@@ -156,12 +152,14 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
152
model: selection.model,
153
options: props.modelOptionsByInstance.get(selection.instanceId) ?? [],
154
});
155
+ const unavailable = model?.isUnavailable ? " (Unavailable)" : "";
156
return {
157
...selection,
158
entry,
159
label: model
163
- ? `${getTriggerDisplayModelName(model)}${model.isUnavailable ? " (Unavailable)" : ""}`
160
+ ? `${getTriggerDisplayModelName(model, entry?.driverKind)}${unavailable}`
161
: selection.model,
162
+ fullLabel: model ? `${getDisplayModelName(model)}${unavailable}` : selection.model,
163
};
164
});
165
const multipleLabel = selectedEntries
@@ -173,7 +171,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
171
.join(", ")}${selectedEntries.length > 2 ? `, ${selectedEntries.length - 2} more` : ""}`
172
: undefined;
173
const allModelNames = selectedEntries
176
- ? selectedEntries.map((selection) => selection.label).join(", ") || "Choose models"
174
+ ? selectedEntries.map((selection) => selection.fullLabel).join(", ") || "Choose models"
175
: undefined;
176
const triggerTooltipContent = shortcutLabel
177
? `${props.triggerLabel ?? allModelNames ?? triggerLabel} · ${shortcutLabel}`
@@ -193,7 +191,9 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
191
<PopoverTrigger
192
render={
193
<ComposerControl
196
- aria-label={props.triggerAriaLabel ?? allModelNames}
194
+ aria-label={
195
+ props.triggerAriaLabel ?? props.triggerLabel ?? allModelNames ?? triggerLabel
196
+ }
197
size={size}
198
data-chat-provider-model-picker="true"
199
className={cn(
apps/web/src/components/chat/V2LifecycleRow.tsx
+1
-1
@@ -625,7 +625,7 @@ function HandoffEndpoint(props: {
625
: entry?.models.find((candidate) => candidate.slug === model);
626
const label =
627
providerModel !== undefined
628
- ? getTriggerDisplayModelName(providerModel)
628
+ ? getTriggerDisplayModelName(providerModel, entry?.driverKind)
629
: model !== undefined && model.length > 0
630
? model
631
: (entry?.displayName ?? props.instanceId);
apps/web/src/components/chat/providerIconUtils.ts
+9
-6
@@ -1,3 +1,6 @@
1
+import type { ProviderDriverKind } from "@t3tools/contracts";
2
+import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
3
+
4
export type ModelEsque = {
5
slug: string;
6
name: string;
@@ -47,10 +50,10 @@ export function getProviderRowLabel(
50
return `${providerDisplayName} · ${sub}`;
51
}
52
50
-export function getTriggerDisplayModelName(model: ModelEsque): string {
51
- return getDisplayModelName(model, { preferShortName: true });
52
-}
53
-
54
-export function getTriggerDisplayModelLabel(model: ModelEsque): string {
55
- return getTriggerDisplayModelName(model);
53
+export function getTriggerDisplayModelName(
54
+ model: ModelEsque,
55
+ driverKind: ProviderDriverKind | null | undefined,
56
+): string {
57
+ const shortName = resolveModelShortName(model, driverKind);
58
+ return getDisplayModelName({ ...model, shortName }, { preferShortName: true });
59
}
apps/web/src/components/guest/GuestPage.browser.test.tsx
+1
-1
@@ -246,7 +246,7 @@ describe("GuestPage", () => {
246
expect(screen.container.querySelector('[aria-label="Fork from this response"]')).toBeNull();
247
expect(socket).not.toHaveBeenCalled();
248
// The composer names the thread's model, as the owner's does, with nothing to pick.
249
- await expect.element(screen.getByLabelText("Model: 5.4")).toBeVisible();
249
+ await expect.element(screen.getByLabelText("Model: GPT-5.4")).toBeVisible();
250
});
251
252
it("sends attached files with the message, as form data", async () => {
apps/web/src/components/guest/GuestPage.tsx
+4
-3
@@ -49,7 +49,7 @@ import { PierreEntryIcon } from "../chat/PierreEntryIcon";
49
import { GuestMessageName, guestBubbleClassName } from "../chat/guestMessageStyle";
50
import { MessagesTimeline } from "../chat/MessagesTimeline";
51
import { ProviderInstanceIcon } from "../chat/ProviderInstanceIcon";
52
-import { getTriggerDisplayModelName } from "../chat/providerIconUtils";
52
+import { getDisplayModelName, getTriggerDisplayModelName } from "../chat/providerIconUtils";
53
import { ScrollToEndButton } from "../chat/TimelineOverlays";
54
import type { TimelineRow } from "../chat/timelineRowContext";
55
import { useTimelineFollow } from "../chat/useTimelineFollow";
@@ -557,11 +557,12 @@ function UnplacedGuestMessage({
557
558
/** The thread's model, labeled as the owner's composer labels it, with no way to change it. */
559
function GuestModelLabel({ model }: { readonly model: GuestThreadModel }) {
560
- const label = getTriggerDisplayModelName({ slug: model.name, ...model });
560
+ const label = getTriggerDisplayModelName({ slug: model.name, ...model }, model.driver);
561
+ const fullLabel = getDisplayModelName({ slug: model.name, ...model });
562
return (
563
<ComposerControl
564
render={<span />}
564
- aria-label={`Model: ${label}`}
565
+ aria-label={`Model: ${fullLabel}`}
566
className="pointer-events-none min-w-0 shrink"
567
>
568
{model.driver === null ? null : (
apps/web/src/components/settings/providerDriverMeta.ts
+1
-42
@@ -1,42 +1 @@
1
-import {
2
- AntigravitySettings,
3
- ClaudeSettings,
4
- CodexSettings,
5
- ProviderDriverKind,
6
-} from "@t3tools/contracts";
7
-import { acpRegistryClient } from "@t3tools/provider-acp-registry/client";
8
-import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
9
-import { cursorClient } from "@t3tools/provider-cursor/client";
10
-import { fxClient } from "@t3tools/provider-fx/client";
11
-import { grokClient } from "@t3tools/provider-grok/client";
12
-import { museClient } from "@t3tools/provider-muse/client";
13
-import { openCodeClient } from "@t3tools/provider-opencode/client";
14
-import { piClient } from "@t3tools/provider-pi/client";
15
-
16
-export const providerClients = makeProviderClientRegistry([
17
- {
18
- driverKind: ProviderDriverKind.make("codex"),
19
- label: "Codex",
20
- acpRegistryAgentIds: ["codex-acp"],
21
- settingsSchema: CodexSettings,
22
- },
23
- {
24
- driverKind: ProviderDriverKind.make("claudeAgent"),
25
- label: "Claude",
26
- acpRegistryAgentIds: ["claude-acp"],
27
- settingsSchema: ClaudeSettings,
28
- },
29
- cursorClient,
30
- grokClient,
31
- fxClient,
32
- openCodeClient,
33
- {
34
- driverKind: ProviderDriverKind.make("antigravity"),
35
- label: "Antigravity",
36
- acpRegistryAgentIds: ["antigravity-acp"],
37
- settingsSchema: AntigravitySettings,
38
- },
39
- museClient,
40
- piClient,
41
- acpRegistryClient,
42
-]);
1
+export { providerClients } from "@t3tools/client-runtime/provider-clients";
apps/web/src/components/sidebar/SidebarThreadRow.tsx
+3
-3
@@ -104,7 +104,7 @@ import { ProjectFavicon, type ProjectFaviconProject } from "../ProjectFavicon";
104
import { ThreadSearchMatchExcerpt } from "../ThreadSearchMatch";
105
import { makeWorkspaceFileDropHandlers } from "../chat/workspaceFileDrop";
106
import { ProviderInstanceIcon } from "../chat/ProviderInstanceIcon";
107
-import { getTriggerDisplayModelLabel } from "../chat/providerIconUtils";
107
+import { getTriggerDisplayModelName } from "../chat/providerIconUtils";
108
import { shouldShowInstanceBadge, type ProviderInstanceEntry } from "../../providerInstances";
109
import { useThreadRunningTerminalIds } from "../../state/terminalSessions";
110
import { InlineButton } from "../ui/button";
@@ -771,7 +771,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
771
(model) => model.slug === thread.modelSelection.model,
772
);
773
const modelLabel = selectedModel
774
- ? getTriggerDisplayModelLabel(selectedModel)
774
+ ? getTriggerDisplayModelName(selectedModel, providerEntry?.driverKind)
775
: thread.modelSelection.model;
776
777
const isRemote = thread.environmentId !== props.currentEnvironmentId;
@@ -1602,7 +1602,7 @@ export const SidebarSearchResultRow = memo(function SidebarSearchResultRow(props
1602
(model) => model.slug === thread.modelSelection.model,
1603
);
1604
const modelLabel = selectedModel
1605
- ? getTriggerDisplayModelLabel(selectedModel)
1605
+ ? getTriggerDisplayModelName(selectedModel, providerEntry?.driverKind)
1606
: thread.modelSelection.model;
1607
const runningTerminalIds = useThreadRunningTerminalIds({
1608
environmentId: thread.environmentId,
apps/web/src/modelSelection.ts
+23
-6
@@ -31,6 +31,7 @@ import {
31
NO_PROVIDER_MODEL_SELECTION,
32
} from "./providerInstances";
33
import { sortModelsForProviderInstance } from "./modelOrdering";
34
+import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
35
36
export const MAX_CUSTOM_MODEL_LENGTH = 256;
37
const DEFAULT_TEXT_GENERATION_INSTANCE_ID = ProviderInstanceId.make("codex");
@@ -85,13 +86,17 @@ function appendUnavailableDynamicModelSelection(
86
return [...options, { slug, name: slug, isCustom: false, isUnavailable: true }];
87
}
88
88
-function toAppModelOption(model: ServerProvider["models"][number]): AppModelOption {
89
+function toAppModelOption(
90
+ model: ServerProvider["models"][number],
91
+ driverKind: ProviderDriverKind,
92
+): AppModelOption {
93
const option: AppModelOption = {
94
slug: model.slug,
95
name: model.name,
96
isCustom: model.isCustom,
97
};
94
- if (model.shortName) option.shortName = model.shortName;
98
+ const shortName = resolveModelShortName(model, driverKind);
99
+ if (shortName) option.shortName = shortName;
100
if (model.subProvider) option.subProvider = model.subProvider;
101
if (model.aliases) option.aliases = model.aliases;
102
if (model.badge) option.badge = model.badge;
@@ -159,7 +164,7 @@ function getAppModelOptions(
164
// Server custom-model snapshots can lag removals; rebuild custom rows from settings.
165
const options: AppModelOption[] = rawModels
166
.filter((model) => !model.isCustom)
162
- .map(toAppModelOption);
167
+ .map((model) => toAppModelOption(model, provider));
168
const seen = new Set(options.map((option) => option.slug));
169
const builtInModelSlugs = new Set(
170
Arr.filterMap(getProviderModels(providers, provider), (model) =>
@@ -175,7 +180,13 @@ function getAppModelOptions(
180
}
181
182
seen.add(entry.slug);
178
- options.push({ slug: entry.slug, name: entry.name, isCustom: true });
183
+ const shortName = resolveModelShortName(entry, provider);
184
+ options.push({
185
+ slug: entry.slug,
186
+ name: entry.name,
187
+ isCustom: true,
188
+ ...(shortName ? { shortName } : {}),
189
+ });
190
}
191
192
const preferences = readInstanceModelPreferences(settings, defaultInstanceId);
@@ -195,7 +206,7 @@ export function getAppModelOptionsForInstance(
206
): AppModelOption[] {
207
const options: AppModelOption[] = entry.models
208
.filter((model) => !model.isCustom)
198
- .map(toAppModelOption);
209
+ .map((model) => toAppModelOption(model, entry.driverKind));
210
const seen = new Set(options.map((option) => option.slug));
211
const builtInModelSlugs = new Set(
212
Arr.filterMap(entry.models, (model) =>
@@ -210,7 +221,13 @@ export function getAppModelOptionsForInstance(
221
}
222
223
seen.add(custom.slug);
213
- options.push({ slug: custom.slug, name: custom.name, isCustom: true });
224
+ const shortName = resolveModelShortName(custom, entry.driverKind);
225
+ options.push({
226
+ slug: custom.slug,
227
+ name: custom.name,
228
+ isCustom: true,
229
+ ...(shortName ? { shortName } : {}),
230
+ });
231
}
232
233
const preferences = readInstanceModelPreferences(settings, entry.instanceId);
packages/client-runtime/package.json
+12
@@ -478,6 +478,10 @@
478
"./model-traits": {
479
"types": "./src/modelTraits.ts",
480
"default": "./src/modelTraits.ts"
481
+ },
482
+ "./provider-clients": {
483
+ "types": "./src/providerClients.ts",
484
+ "default": "./src/providerClients.ts"
485
}
486
},
487
"scripts": {
@@ -487,6 +491,14 @@
491
"dependencies": {
492
"@pierre/diffs": "catalog:",
493
"@t3tools/contracts": "workspace:*",
494
+ "@t3tools/provider-acp-registry": "workspace:*",
495
+ "@t3tools/provider-core": "workspace:*",
496
+ "@t3tools/provider-cursor": "workspace:*",
497
+ "@t3tools/provider-fx": "workspace:*",
498
+ "@t3tools/provider-grok": "workspace:*",
499
+ "@t3tools/provider-muse": "workspace:*",
500
+ "@t3tools/provider-opencode": "workspace:*",
501
+ "@t3tools/provider-pi": "workspace:*",
502
"@t3tools/shared": "workspace:*",
503
"@t3tools/source-control-core": "workspace:*",
504
"@t3tools/source-control-definitions": "workspace:*",
packages/client-runtime/src/providerClients.ts
new
+60
@@ -0,0 +1,60 @@
1
+import {
2
+ AntigravitySettings,
3
+ ClaudeSettings,
4
+ CodexSettings,
5
+ isProviderDriverKind,
6
+ ProviderDriverKind,
7
+} from "@t3tools/contracts";
8
+import { acpRegistryClient } from "@t3tools/provider-acp-registry/client";
9
+import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
10
+import { modelShortName } from "@t3tools/provider-core/modelShortName";
11
+import { cursorClient } from "@t3tools/provider-cursor/client";
12
+import { fxClient } from "@t3tools/provider-fx/client";
13
+import { grokClient } from "@t3tools/provider-grok/client";
14
+import { museClient } from "@t3tools/provider-muse/client";
15
+import { openCodeClient } from "@t3tools/provider-opencode/client";
16
+import { piClient } from "@t3tools/provider-pi/client";
17
+
18
+export const providerClients = makeProviderClientRegistry([
19
+ {
20
+ driverKind: ProviderDriverKind.make("codex"),
21
+ label: "Codex",
22
+ modelFamilies: ["GPT-", "GPT "],
23
+ acpRegistryAgentIds: ["codex-acp"],
24
+ settingsSchema: CodexSettings,
25
+ },
26
+ {
27
+ driverKind: ProviderDriverKind.make("claudeAgent"),
28
+ label: "Claude",
29
+ modelFamilies: ["Claude "],
30
+ acpRegistryAgentIds: ["claude-acp"],
31
+ settingsSchema: ClaudeSettings,
32
+ },
33
+ cursorClient,
34
+ grokClient,
35
+ fxClient,
36
+ openCodeClient,
37
+ {
38
+ driverKind: ProviderDriverKind.make("antigravity"),
39
+ label: "Antigravity",
40
+ modelFamilies: ["Gemini "],
41
+ acpRegistryAgentIds: ["antigravity-acp"],
42
+ settingsSchema: AntigravitySettings,
43
+ },
44
+ museClient,
45
+ piClient,
46
+ acpRegistryClient,
47
+]);
48
+
49
+export function getProviderClient(driver: string | null | undefined) {
50
+ return isProviderDriverKind(driver) ? providerClients.get(driver) : undefined;
51
+}
52
+
53
+export function resolveModelShortName(
54
+ model: { readonly name: string; readonly shortName?: string | undefined },
55
+ driverKind: ProviderDriverKind | null | undefined,
56
+): string | undefined {
57
+ if (model.shortName) return model.shortName;
58
+ const families = driverKind ? providerClients.get(driverKind)?.modelFamilies : undefined;
59
+ return modelShortName(model.name, families ?? []);
60
+}
packages/client-runtime/src/state/subagentDisplay.ts
+2
-1
@@ -6,6 +6,7 @@ import type {
6
} from "@t3tools/contracts";
7
import { formatModelSlugName, resolveSelectableModel } from "@t3tools/shared/model";
8
import { fileBasename } from "@t3tools/shared/path";
9
+import { resolveModelShortName } from "../providerClients.ts";
10
import { isTerminalSubagentStatus } from "./subagentRuntime.ts";
11
12
export function subagentGroupSummary(
@@ -70,7 +71,7 @@ export function resolveSubagentMetadata(input: {
71
: model;
72
const catalogModel = input.provider?.models.find((candidate) => candidate.slug === slug);
73
const reportedLabel = catalogModel
73
- ? catalogModel.shortName || catalogModel.name
74
+ ? (resolveModelShortName(catalogModel, input.provider?.driver) ?? catalogModel.name)
75
: model
76
? formatModelSlugName(model)
77
: "Not reported";
packages/provider-core/package.json
+4
@@ -7,6 +7,10 @@
7
"types": "./src/client.ts",
8
"import": "./src/client.ts"
9
},
10
+ "./modelShortName": {
11
+ "types": "./src/modelShortName.ts",
12
+ "import": "./src/modelShortName.ts"
13
+ },
14
"./server/adapterDriver": {
15
"types": "./src/server/adapterDriver.ts",
16
"import": "./src/server/adapterDriver.ts"
packages/provider-core/src/client.ts
+2
@@ -36,6 +36,8 @@ export interface ProviderClientDefinition {
36
readonly driverKind: ProviderDriverKind;
37
readonly label: string;
38
readonly icon?: ProviderIcon;
39
+ /** Model-name family prefixes the provider's own icon already shows, e.g. "Claude ". */
40
+ readonly modelFamilies?: ReadonlyArray<string>;
41
readonly settingsSchema: ProviderSettingsSchema;
42
readonly environmentFields?: ReadonlyArray<ProviderEnvironmentField>;
43
readonly hasDefaultInstance?: boolean;
packages/provider-core/src/modelShortName.test.ts
new
+18
@@ -0,0 +1,18 @@
1
+import { describe, expect, it } from "vite-plus/test";
2
+
3
+import { modelShortName } from "./modelShortName.ts";
4
+
5
+describe("modelShortName", () => {
6
+ it.each([
7
+ ["Claude Opus 5.5", ["Claude "], "Opus 5.5"],
8
+ ["GPT-6.1-Sol", ["GPT-"], "6.1 Sol"],
9
+ ["GPT 6.0 Astra", ["GPT-", "GPT "], "6.0 Astra"],
10
+ ["Grok 4 Pro", [], undefined],
11
+ ["Claude Opus 5.5", [], "Opus 5.5"],
12
+ ["NVIDIA: Nemotron 3 Super", [], "Nemotron 3 Super"],
13
+ ["GPT-5.5", ["GPT-"], undefined],
14
+ ["Gemini 3.1 Pro", ["Gemini "], "3.1 Pro"],
15
+ ] as const)("gives %s on families %j the short name %s", (name, families, expected) => {
16
+ expect(modelShortName(name, families)).toBe(expected);
17
+ });
18
+});
packages/provider-core/src/modelShortName.ts
new
+71
@@ -0,0 +1,71 @@
1
+const FAMILY_PREFIXES = ["Claude ", "GPT-", "GPT ", "Gemini ", "Muse ", "Grok "] as const;
2
+
3
+// Words that describe a variant within a family rather than name a model. Off the
4
+// family's native provider there is no icon saying which family "4 Pro" belongs to.
5
+const VARIANT_WORDS = new Set([
6
+ "pro",
7
+ "flash",
8
+ "mini",
9
+ "max",
10
+ "lite",
11
+ "nano",
12
+ "ultra",
13
+ "plus",
14
+ "fast",
15
+ "turbo",
16
+ "preview",
17
+ "latest",
18
+ "thinking",
19
+ "reasoning",
20
+ "build",
21
+ "code",
22
+ "image",
23
+ "vision",
24
+ "audio",
25
+ "live",
26
+ "custom",
27
+ "tools",
28
+ "exp",
29
+ "experimental",
30
+ "chat",
31
+ "tts",
32
+ "stt",
33
+ "non",
34
+ "transcribe",
35
+]);
36
+
37
+const VERSION = /^v?\d+(?:\.\d+)*[a-z]?$/i;
38
+
39
+const VENDOR_PREFIX = /^[A-Z][\w.&\- ]{0,24}: (?=\S)/;
40
+
41
+export function modelShortName(
42
+ name: string,
43
+ nativeFamilies: ReadonlyArray<string>,
44
+): string | undefined {
45
+ const unprefixed = name.replace(VENDOR_PREFIX, "");
46
+ const short =
47
+ withoutFamily(unprefixed, nativeFamilies) ?? (namesModel(unprefixed) ? unprefixed : name);
48
+ return short === name ? undefined : short;
49
+}
50
+
51
+function withoutFamily(name: string, nativeFamilies: ReadonlyArray<string>): string | undefined {
52
+ const prefix = FAMILY_PREFIXES.find((candidate) => name.startsWith(candidate));
53
+ if (!prefix) return undefined;
54
+ const rest = name.slice(prefix.length).trim();
55
+ const keep = nativeFamilies.includes(prefix)
56
+ ? nonVersionWords(rest).length > 0
57
+ : namesModel(rest);
58
+ if (!keep) return undefined;
59
+ return /\s/.test(rest) ? rest : rest.replaceAll("-", " ");
60
+}
61
+
62
+function nonVersionWords(text: string): ReadonlyArray<string> {
63
+ return text
64
+ .replace(/\(.*?\)/g, " ")
65
+ .split(/[\s-]+/)
66
+ .filter((word) => word.length > 0 && !VERSION.test(word));
67
+}
68
+
69
+function namesModel(text: string): boolean {
70
+ return nonVersionWords(text).some((word) => !VARIANT_WORDS.has(word.toLowerCase()));
71
+}
packages/provider-cursor/src/client.ts
+1
@@ -6,6 +6,7 @@ import { CursorSettings } from "./settings.ts";
6
export const cursorClient = defineProviderClient({
7
driverKind: ProviderDriverKind.make("cursor"),
8
label: "Cursor",
9
+ modelFamilies: ["Grok "],
10
acpRegistryAgentIds: ["cursor"],
11
settingsSchema: CursorSettings,
12
environmentFields: [
packages/provider-grok/src/client.ts
+1
@@ -6,6 +6,7 @@ import { GrokSettings } from "./settings.ts";
6
export const grokClient = defineProviderClient({
7
driverKind: ProviderDriverKind.make("grok"),
8
label: "Grok",
9
+ modelFamilies: ["Grok "],
10
acpRegistryAgentIds: ["grok-build"],
11
settingsSchema: GrokSettings,
12
icon: {
packages/provider-muse/src/client.ts
+1
@@ -6,6 +6,7 @@ import { MuseSettings } from "./settings.ts";
6
export const museClient = defineProviderClient({
7
driverKind: ProviderDriverKind.make("muse"),
8
label: "Muse Code",
9
+ modelFamilies: ["Muse "],
10
settingsSchema: MuseSettings,
11
icon: {
12
viewBox: "0 0 287.56 191",
pnpm-lock.yaml
+24
-45
@@ -579,30 +579,6 @@ importers:
579
'@t3tools/mobile-terminal-native':
580
specifier: file:./modules/t3-terminal
581
version: file:apps/mobile/modules/t3-terminal
582
- '@t3tools/provider-acp-registry':
583
- specifier: workspace:*
584
- version: link:../../packages/provider-acp-registry
585
- '@t3tools/provider-core':
586
- specifier: workspace:*
587
- version: link:../../packages/provider-core
588
- '@t3tools/provider-cursor':
589
- specifier: workspace:*
590
- version: link:../../packages/provider-cursor
591
- '@t3tools/provider-fx':
592
- specifier: workspace:*
593
- version: link:../../packages/provider-fx
594
- '@t3tools/provider-grok':
595
- specifier: workspace:*
596
- version: link:../../packages/provider-grok
597
- '@t3tools/provider-muse':
598
- specifier: workspace:*
599
- version: link:../../packages/provider-muse
600
- '@t3tools/provider-opencode':
601
- specifier: workspace:*
602
- version: link:../../packages/provider-opencode
603
- '@t3tools/provider-pi':
604
- specifier: workspace:*
605
- version: link:../../packages/provider-pi
582
'@t3tools/shared':
583
specifier: workspace:*
584
version: link:../../packages/shared
@@ -1061,30 +1037,9 @@ importers:
1037
'@t3tools/contracts':
1038
specifier: workspace:*
1039
version: link:../../packages/contracts
1064
- '@t3tools/provider-acp-registry':
1065
- specifier: workspace:*
1066
- version: link:../../packages/provider-acp-registry
1040
'@t3tools/provider-core':
1041
specifier: workspace:*
1042
version: link:../../packages/provider-core
1070
- '@t3tools/provider-cursor':
1071
- specifier: workspace:*
1072
- version: link:../../packages/provider-cursor
1073
- '@t3tools/provider-fx':
1074
- specifier: workspace:*
1075
- version: link:../../packages/provider-fx
1076
- '@t3tools/provider-grok':
1077
- specifier: workspace:*
1078
- version: link:../../packages/provider-grok
1079
- '@t3tools/provider-muse':
1080
- specifier: workspace:*
1081
- version: link:../../packages/provider-muse
1082
- '@t3tools/provider-opencode':
1083
- specifier: workspace:*
1084
- version: link:../../packages/provider-opencode
1085
- '@t3tools/provider-pi':
1086
- specifier: workspace:*
1087
- version: link:../../packages/provider-pi
1043
'@t3tools/shared':
1044
specifier: workspace:*
1045
version: link:../../packages/shared
@@ -1444,6 +1399,30 @@ importers:
1399
'@t3tools/contracts':
1400
specifier: workspace:*
1401
version: link:../contracts
1402
+ '@t3tools/provider-acp-registry':
1403
+ specifier: workspace:*
1404
+ version: link:../provider-acp-registry
1405
+ '@t3tools/provider-core':
1406
+ specifier: workspace:*
1407
+ version: link:../provider-core
1408
+ '@t3tools/provider-cursor':
1409
+ specifier: workspace:*
1410
+ version: link:../provider-cursor
1411
+ '@t3tools/provider-fx':
1412
+ specifier: workspace:*
1413
+ version: link:../provider-fx
1414
+ '@t3tools/provider-grok':
1415
+ specifier: workspace:*
1416
+ version: link:../provider-grok
1417
+ '@t3tools/provider-muse':
1418
+ specifier: workspace:*
1419
+ version: link:../provider-muse
1420
+ '@t3tools/provider-opencode':
1421
+ specifier: workspace:*
1422
+ version: link:../provider-opencode
1423
+ '@t3tools/provider-pi':
1424
+ specifier: workspace:*
1425
+ version: link:../provider-pi
1426
'@t3tools/shared':
1427
specifier: workspace:*
1428
version: link:../shared