Skip to content

Commit 7d55681

Browse files
authored
Merge 6007c0f into 16918b5
2 parents 16918b5 + 6007c0f commit 7d55681

52 files changed

Lines changed: 1280 additions & 155 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
11
import { Image } from "expo-image";
22
import { Defs, LinearGradient, Path, Stop, Svg } from "react-native-svg";
33
import { View } from "react-native";
4-
import { providerInstanceInitials } from "@t3tools/client-runtime/state/provider-instance-display";
4+
import {
5+
isProviderInstanceInitialsIcon,
6+
providerInstanceInitialsGlyphScale,
7+
resolveProviderInstanceBadgeLabel,
8+
resolveProviderInstanceGlyphDriver,
9+
} from "@t3tools/client-runtime/state/provider-instance-display";
10+
import type { ProviderDriverKind } from "@t3tools/contracts";
511
import { useId, useState } from "react";
612
import { resolveOfficialAcpRegistryIconUrl } from "@t3tools/contracts";
713
import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
814
import { AppText as Text } from "./ui/AppText";
915
import { getProviderClient } from "../lib/providerClients";
1016

17+
/** What a configured instance chose to look like; a `ServerProvider` satisfies it. */
18+
export interface ProviderGlyphAppearance {
19+
readonly icon?: string | undefined;
20+
readonly badgeLabel?: string | undefined;
21+
readonly displayName?: string | undefined;
22+
readonly accentColor?: string | undefined;
23+
}
24+
1125
type ProviderIconProps = {
1226
readonly provider: string | null | undefined;
1327
readonly iconUrl?: string | null | undefined;
1428
readonly size?: number;
29+
readonly appearance?: ProviderGlyphAppearance | undefined;
1530
};
1631

1732
function AcpRegistryFallbackIcon(props: { readonly color: string; readonly size: number }) {
@@ -69,8 +84,39 @@ export function ProviderIcon(props: ProviderIconProps) {
6984
const gradientId = useId();
7085
const size = props.size ?? 16;
7186
const mono = isDarkMode ? "#e5e5e5" : "#171717";
87+
const appearance = props.appearance;
88+
if (isProviderInstanceInitialsIcon(appearance?.icon)) {
89+
const label = resolveProviderInstanceBadgeLabel({
90+
displayName: appearance?.displayName ?? "",
91+
badgeLabel: appearance?.badgeLabel,
92+
});
93+
const fontSize = size * providerInstanceInitialsGlyphScale(label);
94+
return (
95+
<View style={{ width: size, height: size, alignItems: "center", justifyContent: "center" }}>
96+
<Text
97+
numberOfLines={1}
98+
adjustsFontSizeToFit
99+
className={appearance?.accentColor ? undefined : "text-foreground-muted"}
100+
style={{
101+
fontSize,
102+
fontWeight: "700",
103+
lineHeight: fontSize * 1.15,
104+
color: appearance?.accentColor,
105+
}}
106+
>
107+
{label}
108+
</Text>
109+
</View>
110+
);
111+
}
112+
const provider = props.provider
113+
? resolveProviderInstanceGlyphDriver({
114+
driverKind: props.provider as ProviderDriverKind,
115+
icon: appearance?.icon,
116+
})
117+
: props.provider;
72118

73-
if (props.provider?.trim().toLowerCase() === "antigravity") {
119+
if (provider?.trim().toLowerCase() === "antigravity") {
74120
return (
75121
<Image
76122
source={require("../../assets/antigravity.png")}
@@ -79,11 +125,11 @@ export function ProviderIcon(props: ProviderIconProps) {
79125
/>
80126
);
81127
}
82-
if (props.provider === "acpRegistry") {
128+
if (provider === "acpRegistry") {
83129
return <AcpRegistryProviderIcon color={mono} iconUrl={props.iconUrl} size={size} />;
84130
}
85131

86-
if (props.provider === "claudeAgent") {
132+
if (provider === "claudeAgent") {
87133
return (
88134
<Svg width={size} height={size} viewBox="0 0 256 257" fill="none">
89135
<Path
@@ -94,7 +140,7 @@ export function ProviderIcon(props: ProviderIconProps) {
94140
);
95141
}
96142

97-
const packageIcon = getProviderClient(props.provider)?.icon;
143+
const packageIcon = getProviderClient(provider)?.icon;
98144
if (packageIcon) {
99145
const themeFill = (fill: { readonly light: string; readonly dark: string }) =>
100146
isDarkMode ? fill.dark : fill.light;
@@ -153,13 +199,21 @@ export function ProviderInstanceIcon(props: {
153199
readonly size?: number;
154200
readonly displayName: string;
155201
readonly accentColor?: string;
202+
/** Chosen glyph: a driver slug with a logo, or the initials icon. */
203+
readonly icon?: string;
204+
readonly badgeLabel?: string;
156205
readonly showBadge?: boolean;
157206
readonly surfaceColor: string;
158207
}) {
159208
return (
160209
<View style={{ position: "relative" }}>
161210
<View style={{ opacity: 0.6 }}>
162-
<ProviderIcon iconUrl={props.iconUrl} provider={props.provider} size={props.size} />
211+
<ProviderIcon
212+
iconUrl={props.iconUrl}
213+
provider={props.provider}
214+
size={props.size}
215+
appearance={props}
216+
/>
163217
</View>
164218
{props.showBadge ? (
165219
<View
@@ -188,7 +242,7 @@ export function ProviderInstanceIcon(props: {
188242
color: props.accentColor ? "#ffffff" : undefined,
189243
}}
190244
>
191-
{providerInstanceInitials(props.displayName)}
245+
{resolveProviderInstanceBadgeLabel(props)}
192246
</Text>
193247
</View>
194248
) : null}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,11 @@ function EnvironmentDetail({ environmentId }: { readonly environmentId: Environm
318318
<View key={provider.instanceId}>
319319
<View className="gap-1 p-4">
320320
<View className="flex-row items-center gap-2">
321-
<ProviderIcon provider={provider.driver} size={18} />
321+
<ProviderIcon
322+
provider={provider.driver}
323+
appearance={provider}
324+
size={18}
325+
/>
322326
<Text className="min-w-0 flex-1 text-base font-t3-medium text-foreground">
323327
{provider.displayName ?? provider.driver}
324328
</Text>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export function ComposerUsageLimits({
4747
dense
4848
first={index === 0}
4949
driver={account.driver}
50+
appearance={account}
5051
label={driverLabel}
5152
instanceLabel={
5253
account.instanceId

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,6 +1727,7 @@ export function NewTaskDraftScreen(props: {
17271727
<ProviderIcon
17281728
iconUrl={flow.selectedModelOption?.providerIconUrl}
17291729
provider={flow.selectedModelOption?.providerDriver}
1730+
appearance={flow.selectedModelOption?.providerAppearance}
17301731
size={size}
17311732
/>
17321733
)}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ import { isOrchestrationV2WorkActive } from "@t3tools/contracts";
66
import { View } from "react-native";
77

88
import { AppText as Text } from "../../components/ui/AppText";
9-
import { ProviderIcon } from "../../components/ProviderIcon";
9+
import { ProviderIcon, type ProviderGlyphAppearance } from "../../components/ProviderIcon";
1010
import { RequestActionButton } from "./RequestActionButton";
1111
import { useVisibleSecondClock } from "./use-visible-second-clock";
1212

1313
export function ProviderSubagentBar(props: {
14-
readonly provider: { readonly driver: string; readonly iconUrl?: string | undefined } | null;
14+
/** Driver and catalog icon of the provider running the subagent. */
15+
readonly provider:
16+
| (ProviderGlyphAppearance & { readonly driver: string; readonly iconUrl?: string | undefined })
17+
| null;
1518
readonly modelLabel: string;
1619
readonly effortLabel: string | null;
1720
readonly status: ProviderSubagentStatus | null;
@@ -36,6 +39,7 @@ export function ProviderSubagentBar(props: {
3639
<ProviderIcon
3740
iconUrl={props.provider.iconUrl}
3841
provider={props.provider.driver}
42+
appearance={props.provider}
3943
size={16}
4044
/>
4145
) : null}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
10881088
<ProviderIcon
10891089
iconUrl={currentModelOption?.providerIconUrl}
10901090
provider={currentModelOption?.providerDriver}
1091+
appearance={currentModelOption?.providerAppearance}
10911092
size={size}
10921093
/>
10931094
)}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ const FAVORITES_PROVIDER_FILTER = "@favorites";
125125
function ProviderHeader(props: {
126126
readonly driver: string | undefined;
127127
readonly iconUrl: string | undefined;
128+
readonly appearance: ModelOption["providerAppearance"] | undefined;
128129
readonly label: string;
129130
readonly collapsible: boolean;
130131
readonly collapsed: boolean;
@@ -133,7 +134,12 @@ function ProviderHeader(props: {
133134
}) {
134135
const content = (
135136
<>
136-
<ProviderIcon iconUrl={props.iconUrl} provider={props.driver} size={15} />
137+
<ProviderIcon
138+
iconUrl={props.iconUrl}
139+
provider={props.driver}
140+
appearance={props.appearance}
141+
size={15}
142+
/>
137143
<Text className="text-sm font-t3-medium text-foreground-muted">{props.label}</Text>
138144
{props.collapsible ? (
139145
<>
@@ -675,6 +681,7 @@ type ThreadSettingsProviderCatalog = {
675681
readonly key: string;
676682
readonly driver: string | undefined;
677683
readonly iconUrl: string | undefined;
684+
readonly appearance: ModelOption["providerAppearance"] | undefined;
678685
readonly label: string;
679686
readonly collapsible: boolean;
680687
readonly collapsed: boolean;
@@ -755,6 +762,7 @@ function ThreadSettingsProviderListHeader(props: {
755762
collapsed={props.provider.collapsed}
756763
driver={props.provider.driver}
757764
iconUrl={props.provider.iconUrl}
765+
appearance={props.provider.appearance}
758766
label={props.provider.label}
759767
modelCount={props.provider.modelCount}
760768
onToggle={onToggle}
@@ -820,6 +828,7 @@ function useThreadSettingsCatalogItems(
820828
key: group.providerKey,
821829
driver,
822830
iconUrl: group.models[0]?.providerIconUrl,
831+
appearance: group.models[0]?.providerAppearance,
823832
label: group.providerLabel,
824833
collapsible,
825834
collapsed,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ function HandoffEndpoint(props: {
127127
<ProviderIcon
128128
provider={provider?.driver ?? props.instanceId}
129129
iconUrl={provider?.iconUrl}
130+
appearance={provider}
130131
size={12}
131132
/>
132133
<Text numberOfLines={1} className="shrink text-xs text-foreground-muted">

‎apps/mobile/src/features/threads/thread-list-v2-items.tsx‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import {
4747
resolveThreadListV2SnoozeMenuSelection,
4848
threadHasUnseenCompletion,
4949
resolveThreadListV2Status,
50-
resolveThreadListV2ProviderDrivers,
50+
resolveThreadListV2ProviderStack,
5151
resolveThreadListV2SwipeActions,
5252
type ThreadListV2Status,
5353
} from "./threadListV2";
@@ -539,14 +539,14 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
539539
const pinnedRow = props.pinned === true;
540540
const dormant = useSwipeRowDormant(props.activationKey);
541541

542-
const { providerDrivers, providerIconUrl } = useMemo(() => {
542+
const { providerStack, providerIconUrl } = useMemo(() => {
543543
const provider = props.providers?.find(
544544
(candidate) =>
545545
candidate.instanceId ===
546546
(thread.runtime?.providerInstanceId ?? thread.modelSelection.instanceId),
547547
);
548548
return {
549-
providerDrivers: resolveThreadListV2ProviderDrivers(thread, props.providers),
549+
providerStack: resolveThreadListV2ProviderStack(thread, props.providers),
550550
providerIconUrl: provider?.iconUrl,
551551
};
552552
}, [thread, props.providers]);
@@ -1065,9 +1065,14 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
10651065
) : null}
10661066
{providerInstance ? (
10671067
<View className="flex-row items-center">
1068-
{providerDrivers.slice(0, -1).map((driver, index) => (
1069-
<View key={`${driver}:${index}`} className="-mr-1 opacity-30">
1070-
<ProviderIcon provider={driver} size={12} />
1068+
{providerStack.slice(0, -1).map((owner, index) => (
1069+
<View key={`${owner.instanceId}:${index}`} className="-mr-1 opacity-30">
1070+
<ProviderIcon
1071+
provider={owner.driver}
1072+
iconUrl={owner.iconUrl}
1073+
appearance={owner}
1074+
size={12}
1075+
/>
10711076
</View>
10721077
))}
10731078
<ProviderInstanceIcon
@@ -1076,6 +1081,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
10761081
size={14}
10771082
displayName={providerInstance.displayName}
10781083
accentColor={providerInstance.accentColor}
1084+
icon={providerInstance.icon}
1085+
badgeLabel={providerInstance.badgeLabel}
10791086
showBadge={providerInstance.showBadge}
10801087
surfaceColor={rowAppearance.providerIconSurfaceColor}
10811088
/>

‎apps/mobile/src/features/threads/thread-provider-instance.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ export interface ThreadRowProviderInstance {
1313
readonly driverKind: ProviderDriverKind;
1414
readonly displayName: string;
1515
readonly accentColor?: string | undefined;
16+
readonly icon?: string | undefined;
17+
readonly badgeLabel?: string | undefined;
1618
readonly showBadge: boolean;
1719
}
1820

@@ -33,12 +35,14 @@ export function resolveThreadProviderInstance(
3335
driverKind: snapshot.driver,
3436
displayName: resolveProviderInstanceDisplayName(snapshot),
3537
accentColor: normalizeProviderAccentColor(snapshot.accentColor),
38+
icon: snapshot.icon,
39+
badgeLabel: snapshot.badgeLabel,
3640
};
3741
return {
3842
...entry,
3943
showBadge: shouldShowInstanceBadge(
4044
entry,
41-
providers.map((provider) => ({ driverKind: provider.driver })),
45+
providers.map((provider) => ({ driverKind: provider.driver, icon: provider.icon })),
4246
),
4347
};
4448
}

0 commit comments

Comments
 (0)