Skip to content

Commit 56695ae

Browse files
flambohclaudemaria-rcksjuliusmarminge
authored
feat: model labels show the name you'd say out loud (#24205)
Co-authored-by: Claude Opus 5.5 (Claude Code) <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent e5f2e5d commit 56695ae

31 files changed

Lines changed: 267 additions & 182 deletions

‎apps/mobile/package.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@
7373
"@t3tools/mobile-review-diff-native": "file:./modules/t3-review-diff",
7474
"@t3tools/mobile-source-text": "file:./modules/t3-source-text",
7575
"@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:*",
8476
"@t3tools/shared": "workspace:*",
8577
"@tabler/icons-react-native": "^3.44.0",
8678
"clsx": "^2.1.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function ComposerModelControl(props: {
7070
/>
7171
)
7272
}
73-
label={label}
73+
label={props.modelOption?.shortName ?? label}
7474
iconOnly={props.iconOnly}
7575
suffix={
7676
summary ? (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useId, useState } from "react";
1010
import { resolveOfficialAcpRegistryIconUrl } from "@t3tools/contracts";
1111
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
1212
import { AppText as Text } from "./ui/AppText";
13-
import { getProviderClient } from "../lib/providerClients";
13+
import { getProviderClient } from "@t3tools/client-runtime/provider-clients";
1414

1515
type ProviderIconProps = {
1616
readonly provider: string | null | undefined;

‎apps/mobile/src/features/threads/thread-handoff-row.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as Dialog from "../../components/ui/Dialog";
22
import { useAtomValue } from "@effect/atom-react";
33
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
44
import { resolveHandoffEndpoints, type HandoffEndpoints } from "@t3tools/client-runtime/handoff";
5+
import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
56
import {
67
normalizeProviderAccentColor,
78
resolveProviderInstanceDisplayName,
@@ -136,7 +137,7 @@ function HandoffEndpoint(props: {
136137
const provider = props.providers.find((candidate) => candidate.instanceId === props.instanceId);
137138
const model = provider?.models.find((candidate) => candidate.slug === props.model);
138139
const label =
139-
model?.shortName ??
140+
(model ? resolveModelShortName(model, provider?.driver) : undefined) ??
140141
model?.name ??
141142
props.model ??
142143
(provider ? resolveProviderInstanceDisplayName(provider) : props.instanceId);

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ import type {
1111
RuntimeMode,
1212
ServerConfig as T3ServerConfig,
1313
} from "@t3tools/contracts";
14-
import { resolveProjectProviderInstanceEnabled } from "@t3tools/contracts";
14+
import { isProviderDriverKind, resolveProjectProviderInstanceEnabled } from "@t3tools/contracts";
1515
import {
1616
buildExplicitProviderOptionSelectionsFromDescriptors,
1717
getProviderOptionDescriptors,
1818
} from "@t3tools/shared/model";
19+
import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
1920

2021
export type ModelOption = {
2122
readonly key: string;
2223
readonly label: string;
24+
readonly shortName?: string;
2325
readonly subtitle: string;
2426
readonly providerKey: string;
2527
readonly providerLabel: string;
@@ -319,9 +321,11 @@ export function buildModelOptions(
319321
models.sort((a, b) => (order.get(a.slug) ?? Infinity) - (order.get(b.slug) ?? Infinity));
320322
for (const model of models) {
321323
const key = `${provider.instanceId}:${model.slug}`;
324+
const shortName = resolveModelShortName(model, provider.driver);
322325
options.set(key, {
323326
key,
324327
label: model.name,
328+
...(shortName ? { shortName } : {}),
325329
subtitle: model.subProvider ?? "",
326330
providerKey: provider.instanceId,
327331
providerLabel,
@@ -384,9 +388,13 @@ export function buildModelOptions(
384388
displayName: provider?.displayName ?? instanceConfig?.displayName,
385389
instanceId: fallbackModelSelection.instanceId,
386390
});
391+
const shortName = model
392+
? resolveModelShortName(model, isProviderDriverKind(providerDriver) ? providerDriver : null)
393+
: undefined;
387394
options.set(key, {
388395
key,
389396
label: model?.name ?? fallbackModelSelection.model,
397+
...(shortName ? { shortName } : {}),
390398
subtitle: model?.subProvider ?? "",
391399
providerKey: fallbackModelSelection.instanceId,
392400
providerLabel,

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎apps/web/package.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@
3434
"@pierre/trees": "1.0.0-beta.6",
3535
"@t3tools/client-runtime": "workspace:*",
3636
"@t3tools/contracts": "workspace:*",
37-
"@t3tools/provider-acp-registry": "workspace:*",
3837
"@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:*",
4538
"@t3tools/shared": "workspace:*",
4639
"@tanstack/react-pacer": "^0.19.4",
4740
"@tanstack/react-router": "^1.160.2",

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ export default function ChatView(props: ChatViewProps) {
16281628
(model) => model.slug === providerSubagentModelSlug,
16291629
);
16301630
const providerSubagentModelLabel = providerSubagentCatalogModel
1631-
? getTriggerDisplayModelName(providerSubagentCatalogModel)
1631+
? getTriggerDisplayModelName(providerSubagentCatalogModel, selectedProviderEntry?.driverKind)
16321632
: formatModelSlugName(activeThread?.modelSelection.model ?? "");
16331633
const providerSubagentEffortLabel =
16341634
activeThread === undefined

‎apps/web/src/components/chat/ContextWindowMeter.logic.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe("resolveContextWindowModelDisplayName", () => {
9999
},
100100
modelOptionsByInstance,
101101
),
102-
).toBe("5.6 Sol");
102+
).toBe("GPT-5.6 Sol");
103103
});
104104
});
105105

‎apps/web/src/components/chat/ContextWindowMeter.logic.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
resolveSelectableProviderInstanceEntry,
99
type ProviderInstanceEntry,
1010
} from "../../providerInstances";
11-
import { getTriggerDisplayModelName, type ModelEsque } from "./providerIconUtils";
11+
import { getDisplayModelName, type ModelEsque } from "./providerIconUtils";
1212

1313
// Fallback TTL: Claude's 1h cache plus slack.
1414
const CLAUDE_RESUME_COMPACTION_FALLBACK_MS = 70 * 60_000;
@@ -96,7 +96,7 @@ export function resolveContextWindowModelDisplayName(
9696
.get(selection.instanceId)
9797
?.find((model) => model.slug === selection.model);
9898

99-
return selectedModel ? getTriggerDisplayModelName(selectedModel) : selection.model;
99+
return selectedModel ? getDisplayModelName(selectedModel) : selection.model;
100100
}
101101

102102
export function formatContextWindowCompactionMessage(

0 commit comments

Comments
 (0)