11import { useAtomValue } from "@effect/atom-react" ;
22import { StackActions , useNavigation } from "@react-navigation/native" ;
33import { scopeThreadRef } from "@t3tools/client-runtime/environment" ;
4+ import {
5+ resolveProviderInstanceDisplayName ,
6+ shouldShowInstanceBadge ,
7+ } from "@t3tools/client-runtime/state/provider-instance-display" ;
48import { summarizeSubagentStatuses } from "@t3tools/client-runtime/state/subagent-display" ;
59import { isActiveSubagentStatus } from "@t3tools/client-runtime/state/subagentRuntime" ;
610import type {
711 EnvironmentId ,
812 OrchestrationV2Subagent ,
913 OrchestrationV2TurnItem ,
10- ServerProvider ,
1114} from "@t3tools/contracts" ;
1215import { Pressable , View , type ColorValue } from "react-native" ;
1316
1417import { AppText as Text } from "../../components/ui/AppText" ;
1518import { SymbolView } from "../../components/ui/AppSymbol" ;
16- import { ProviderIcon } from "../../components/ProviderIcon" ;
19+ import { ProviderIcon , ProviderInstanceIcon } from "../../components/ProviderIcon" ;
1720import { cn } from "../../lib/cn" ;
1821import type { ThreadFeedActivity } from "../../lib/threadActivity" ;
1922import { serverEnvironment } from "../../state/server" ;
2023import { environmentThreadDetails } from "../../state/threads" ;
2124import { subagentCardElapsed } from "./subagent-card-presentation" ;
2225import { useEnvironments } from "../../state/environments" ;
2326import { useServerConfigs } from "../../state/entities" ;
27+ import { resolveBadgeProviders , type BadgeProvider } from "./thread-provider-instance" ;
2428import { SubagentRow } from "./SubagentRow" ;
2529import { useVisibleSecondClock } from "./use-visible-second-clock" ;
2630import { subagentThreadTarget } from "./threadAgentsPresentation" ;
@@ -42,21 +46,34 @@ function SubagentElapsed({ agents }: { readonly agents: ReadonlyArray<AgentTimin
4246
4347function SubagentAvatar ( props : {
4448 readonly item : SubagentItem ;
45- readonly provider : ServerProvider | undefined ;
49+ readonly providers : ReadonlyArray < BadgeProvider > ;
50+ readonly surfaceColor : string ;
4651} ) {
52+ const provider = props . providers . find (
53+ ( candidate ) => candidate . instanceId === props . item . providerInstanceId ,
54+ ) ;
4755 // A remote task's own driver is only a "remote" label.
4856 const driver =
49- props . provider ?. driver ??
50- ( props . item . remoteChild === undefined ? props . item . driver : undefined ) ;
57+ provider ?. driver ?? ( props . item . remoteChild === undefined ? props . item . driver : undefined ) ;
5158 return (
5259 < View
5360 accessible = { false }
5461 className = "h-7 w-7 shrink-0 items-center justify-center rounded-full border border-border bg-card"
5562 >
5663 { driver === undefined ? (
5764 < SymbolView name = "sparkles" size = { 13 } tintColorClassName = "accent-icon-muted" />
65+ ) : provider !== undefined && shouldShowInstanceBadge ( provider , props . providers ) ? (
66+ < ProviderInstanceIcon
67+ provider = { driver }
68+ iconUrl = { provider . iconUrl }
69+ size = { 15 }
70+ displayName = { resolveProviderInstanceDisplayName ( provider ) }
71+ accentColor = { provider . accentColor }
72+ showBadge
73+ surfaceColor = { props . surfaceColor }
74+ />
5875 ) : (
59- < ProviderIcon provider = { driver } iconUrl = { props . provider ?. iconUrl } size = { 15 } />
76+ < ProviderIcon provider = { driver } iconUrl = { provider ?. iconUrl } size = { 15 } />
6077 ) }
6178 </ View >
6279 ) ;
@@ -68,6 +85,7 @@ export function ThreadSubagentGroup(props: {
6885 readonly anchorKey : string ;
6986 readonly expandedRows : Readonly < Record < string , boolean > > ;
7087 readonly iconSubtleColor : ColorValue ;
88+ readonly edgeFadeColor : string ;
7189 readonly onToggleRow : ( rowId : string , anchorKey : string ) => void ;
7290} ) {
7391 const config = useAtomValue ( serverEnvironment . configValueAtom ( props . environmentId ) ) ;
@@ -100,11 +118,10 @@ export function ThreadSubagentGroup(props: {
100118 const expanded = props . expandedRows [ props . anchorKey ] ?? false ;
101119 const serverConfigs = useServerConfigs ( ) ;
102120 // A task in a linked environment runs a provider instance of that environment.
103- const providerOf = ( item : SubagentItem ) =>
104- ( item . remoteChild === undefined
105- ? config
106- : serverConfigs . get ( item . remoteChild . environmentId )
107- ) ?. providers . find ( ( provider ) => provider . instanceId === item . providerInstanceId ) ;
121+ const providersOf = ( item : SubagentItem ) =>
122+ resolveBadgeProviders (
123+ item . remoteChild === undefined ? config : serverConfigs . get ( item . remoteChild . environmentId ) ,
124+ ) ;
108125 return (
109126 < WorkLogBlock >
110127 { grouped ? (
@@ -117,8 +134,16 @@ export function ThreadSubagentGroup(props: {
117134 >
118135 < View className = "flex-row items-center" >
119136 { agents . slice ( 0 , 3 ) . map ( ( agent , index ) => (
120- < View key = { agent . item . id } style = { { marginLeft : index === 0 ? 0 : - 7 } } >
121- < SubagentAvatar item = { agent . item } provider = { providerOf ( agent . item ) } />
137+ // Earlier avatars stack on top so each bottom-right account badge stays visible.
138+ < View
139+ key = { agent . item . id }
140+ style = { { marginLeft : index === 0 ? 0 : - 7 , zIndex : 3 - index } }
141+ >
142+ < SubagentAvatar
143+ item = { agent . item }
144+ providers = { providersOf ( agent . item ) }
145+ surfaceColor = { props . edgeFadeColor }
146+ />
122147 </ View >
123148 ) ) }
124149 { agents . length > 3 ? (
0 commit comments