Skip to content

Commit b5edddf

Browse files
fix(web,mobile): subagent avatars show the provider account badge
Subagent avatars rendered only the provider icon, so with two accounts for the same provider you could not tell which account a subagent ran on. They now use the same instance badge rule as the sidebar, composer and handoff row, scoped to the environment the subagent runs in. The status dot moves to the top-left when the badge shows, and earlier header avatars stack on top so overlapping badges stay visible. Fixes #24896 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent b762372 commit b5edddf

5 files changed

Lines changed: 117 additions & 45 deletions

File tree

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ import { scopeThreadRef } from "@t3tools/client-runtime/environment";
44
import { resolveHandoffEndpoints, type HandoffEndpoints } from "@t3tools/client-runtime/handoff";
55
import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
66
import {
7-
normalizeProviderAccentColor,
87
resolveProviderInstanceDisplayName,
98
shouldShowInstanceBadge,
109
} from "@t3tools/client-runtime/state/provider-instance-display";
1110
import type {
1211
EnvironmentId,
1312
OrchestrationV2ProjectedTurnItem,
1413
ProviderInstanceId,
15-
ServerProvider,
1614
} from "@t3tools/contracts";
1715
import { Atom } from "effect/reactivity";
1816
import { useMemo } from "react";
@@ -23,11 +21,7 @@ import { ProviderIcon, ProviderInstanceIcon } from "../../components/ProviderIco
2321
import { environmentThreadDetails } from "../../state/threads";
2422
import { serverEnvironment } from "../../state/server";
2523
import { ThreadContextDivider } from "./thread-context-divider";
26-
27-
type HandoffProvider = ServerProvider & {
28-
readonly driverKind: ServerProvider["driver"];
29-
readonly acpRegistryAgentId: string | undefined;
30-
};
24+
import { resolveBadgeProviders, type BadgeProvider } from "./thread-provider-instance";
3125

3226
function handoffEndpointsAtom(
3327
environmentId: EnvironmentId,
@@ -82,20 +76,7 @@ export function ThreadHandoffDivider(props: {
8276
const config = useAtomValue(serverEnvironment.configValueAtom(props.environmentId));
8377
const { endpoints } = props;
8478
const endpointProps = {
85-
providers: (config?.providers ?? []).map((provider) => {
86-
const rawConfig = config?.settings.providerInstances[provider.instanceId]?.config;
87-
const instanceConfig =
88-
rawConfig !== null && typeof rawConfig === "object"
89-
? (rawConfig as Readonly<Record<string, unknown>>)
90-
: null;
91-
const agentId = instanceConfig?.source === "local" ? undefined : instanceConfig?.agentId;
92-
return {
93-
...provider,
94-
driverKind: provider.driver,
95-
accentColor: normalizeProviderAccentColor(provider.accentColor),
96-
acpRegistryAgentId: typeof agentId === "string" ? agentId.trim() || undefined : undefined,
97-
};
98-
}),
79+
providers: resolveBadgeProviders(config),
9980
surfaceColor: props.surfaceColor,
10081
};
10182
return (
@@ -131,7 +112,7 @@ export function ThreadHandoffDivider(props: {
131112
function HandoffEndpoint(props: {
132113
instanceId: ProviderInstanceId;
133114
model?: string | undefined;
134-
providers: ReadonlyArray<HandoffProvider>;
115+
providers: ReadonlyArray<BadgeProvider>;
135116
surfaceColor: string;
136117
}) {
137118
const provider = props.providers.find((candidate) => candidate.instanceId === props.instanceId);

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

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ import {
66
resolveProviderInstanceDisplayName,
77
shouldShowInstanceBadge,
88
} from "@t3tools/client-runtime/state/provider-instance-display";
9-
import type { EnvironmentId, ProviderDriverKind } from "@t3tools/contracts";
9+
import type {
10+
EnvironmentId,
11+
ProviderDriverKind,
12+
ServerConfig,
13+
ServerProvider,
14+
} from "@t3tools/contracts";
1015

1116
import type { ThreadListProvider } from "../../state/thread-list-environments";
1217
export interface ThreadRowProviderInstance {
@@ -16,6 +21,31 @@ export interface ThreadRowProviderInstance {
1621
readonly showBadge: boolean;
1722
}
1823

24+
export type BadgeProvider = ServerProvider & {
25+
readonly driverKind: ServerProvider["driver"];
26+
readonly acpRegistryAgentId: string | undefined;
27+
};
28+
29+
/** Badge eligibility needs each ACP instance's registry agent, which only settings carry. */
30+
export function resolveBadgeProviders(
31+
config: Pick<ServerConfig, "providers" | "settings"> | null | undefined,
32+
): ReadonlyArray<BadgeProvider> {
33+
return (config?.providers ?? []).map((provider) => {
34+
const rawConfig = config?.settings.providerInstances[provider.instanceId]?.config;
35+
const instanceConfig =
36+
rawConfig !== null && typeof rawConfig === "object"
37+
? (rawConfig as Readonly<Record<string, unknown>>)
38+
: null;
39+
const agentId = instanceConfig?.source === "local" ? undefined : instanceConfig?.agentId;
40+
return {
41+
...provider,
42+
driverKind: provider.driver,
43+
accentColor: normalizeProviderAccentColor(provider.accentColor),
44+
acpRegistryAgentId: typeof agentId === "string" ? agentId.trim() || undefined : undefined,
45+
};
46+
});
47+
}
48+
1949
/** Scope by environment; default instance ids name different accounts on different servers. */
2050
export function resolveThreadProviderInstance(
2151
providers: ReadonlyArray<ThreadListProvider> | undefined,

‎apps/mobile/src/features/threads/thread-subagent-group.tsx‎

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
import { useAtomValue } from "@effect/atom-react";
22
import { StackActions, useNavigation } from "@react-navigation/native";
33
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
4+
import {
5+
resolveProviderInstanceDisplayName,
6+
shouldShowInstanceBadge,
7+
} from "@t3tools/client-runtime/state/provider-instance-display";
48
import { summarizeSubagentStatuses } from "@t3tools/client-runtime/state/subagent-display";
59
import { isActiveSubagentStatus } from "@t3tools/client-runtime/state/subagentRuntime";
610
import type {
711
EnvironmentId,
812
OrchestrationV2Subagent,
913
OrchestrationV2TurnItem,
10-
ServerProvider,
1114
} from "@t3tools/contracts";
1215
import { Pressable, View, type ColorValue } from "react-native";
1316

1417
import { AppText as Text } from "../../components/ui/AppText";
1518
import { SymbolView } from "../../components/ui/AppSymbol";
16-
import { ProviderIcon } from "../../components/ProviderIcon";
19+
import { ProviderIcon, ProviderInstanceIcon } from "../../components/ProviderIcon";
1720
import { cn } from "../../lib/cn";
1821
import type { ThreadFeedActivity } from "../../lib/threadActivity";
1922
import { serverEnvironment } from "../../state/server";
2023
import { environmentThreadDetails } from "../../state/threads";
2124
import { subagentCardElapsed } from "./subagent-card-presentation";
2225
import { useEnvironments } from "../../state/environments";
2326
import { useServerConfigs } from "../../state/entities";
27+
import { resolveBadgeProviders, type BadgeProvider } from "./thread-provider-instance";
2428
import { SubagentRow } from "./SubagentRow";
2529
import { useVisibleSecondClock } from "./use-visible-second-clock";
2630
import { subagentThreadTarget } from "./threadAgentsPresentation";
@@ -42,21 +46,34 @@ function SubagentElapsed({ agents }: { readonly agents: ReadonlyArray<AgentTimin
4246

4347
function 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 ? (

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ export function V2EventTimelineRow({ row }: { row: Extract<TimelineRow, { kind:
5151
);
5252
}
5353

54+
// Earlier avatars stack on top so each bottom-right account badge stays visible.
55+
const STACKED_AVATAR_Z_INDEX = ["z-3", "z-2", "z-1"];
56+
5457
const V2SubagentGroup = memo(function V2SubagentGroup({
5558
row,
5659
}: {
@@ -103,14 +106,15 @@ const V2SubagentGroup = memo(function V2SubagentGroup({
103106
)}
104107
>
105108
<span className="flex shrink-0 items-center -space-x-1.5" aria-hidden>
106-
{agents.slice(0, 3).map(({ item, status }) => (
109+
{agents.slice(0, 3).map(({ item, status }, index) => (
107110
<EnvironmentSubagentAvatar
108111
key={item.id}
109112
environmentId={ctx.activeThreadEnvironmentId}
110113
providerInstanceId={item.providerInstanceId}
111114
driver={item.driver}
112115
remote={item.remoteChild}
113116
status={agents.length === 1 ? status : undefined}
117+
className={STACKED_AVATAR_Z_INDEX[index]}
114118
/>
115119
))}
116120
{agents.length > 3 ? (

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

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import {
2828
type OrchestrationV2Subagent,
2929
type ProviderInstanceId,
3030
type ServerProvider,
31+
type ServerSettings,
3132
type ThreadId,
3233
type EnvironmentId,
3334
type NodeId,
@@ -206,14 +207,18 @@ function SubagentAvatar({
206207
driver,
207208
displayName,
208209
iconUrl,
210+
accentColor,
211+
showBadge = false,
209212
status,
210213
className,
211214
}: {
212215
driver?: ProviderDriverKind | undefined;
213216
displayName?: string | undefined;
214217
iconUrl?: string | undefined;
218+
accentColor?: string | undefined;
219+
showBadge?: boolean;
215220
status?: OrchestrationV2TurnItem["status"] | undefined;
216-
className?: string;
221+
className?: string | undefined;
217222
}) {
218223
return (
219224
<span
@@ -227,17 +232,21 @@ function SubagentAvatar({
227232
<ProviderInstanceIcon
228233
driverKind={driver}
229234
displayName={displayName ?? driver}
235+
accentColor={accentColor}
230236
acpRegistryIconUrl={iconUrl}
237+
showBadge={showBadge}
238+
size="compact"
231239
className="z-auto"
232-
iconClassName="size-3.5"
240+
indicatorBackground="var(--background)"
233241
/>
234242
) : (
235243
<BotIcon className="size-3.5 text-muted-foreground" />
236244
)}
237245
{status ? (
238246
<span
239247
className={cn(
240-
"absolute -right-px -bottom-px size-2 rounded-full ring-2 ring-background",
248+
"absolute size-2 rounded-full ring-2 ring-background",
249+
showBadge ? "-top-px -left-px" : "-right-px -bottom-px",
241250
subagentStatusVisual(status).dotClass,
242251
)}
243252
/>
@@ -246,7 +255,19 @@ function SubagentAvatar({
246255
);
247256
}
248257

249-
// Select strings; status pushes replace providers even when avatar fields are unchanged.
258+
// Same entries and badge rule as the handoff row.
259+
function subagentProviderBadge(
260+
providers: ReadonlyArray<ServerProvider> | null | undefined,
261+
settings: ServerSettings | null,
262+
instanceId: ProviderInstanceId,
263+
) {
264+
const derived = deriveProviderInstanceEntries(providers ?? EMPTY_SERVER_PROVIDERS);
265+
const entries = settings ? applyProviderInstanceSettings(derived, settings, null) : derived;
266+
const entry = entries.find((candidate) => candidate.instanceId === instanceId);
267+
return entry !== undefined && shouldShowInstanceBadge(entry, entries) ? entry : undefined;
268+
}
269+
270+
// Select primitives; status pushes replace providers even when avatar fields are unchanged.
250271
export function EnvironmentSubagentAvatar({
251272
environmentId,
252273
providerInstanceId,
@@ -260,10 +281,11 @@ export function EnvironmentSubagentAvatar({
260281
/** A task in a linked environment runs a provider instance there; its driver here is only a label. */
261282
remote?: OrchestrationV2RemoteTaskChild | undefined;
262283
status?: OrchestrationV2TurnItem["status"] | undefined;
284+
className?: string | undefined;
263285
}) {
264-
const providersAtom = serverEnvironment.providersValueAtom(
265-
remote?.environmentId ?? environmentId,
266-
);
286+
const providerEnvironmentId = remote?.environmentId ?? environmentId;
287+
const providersAtom = serverEnvironment.providersValueAtom(providerEnvironmentId);
288+
const settings = useAtomValue(serverEnvironment.settingsValueAtom(providerEnvironmentId));
267289
const providerDriver = useAtomValue(
268290
providersAtom,
269291
(providers) =>
@@ -279,12 +301,22 @@ export function EnvironmentSubagentAvatar({
279301
(providers) =>
280302
providers?.find((provider) => provider.instanceId === providerInstanceId)?.iconUrl,
281303
);
304+
const badgeLabel = useAtomValue(
305+
providersAtom,
306+
(providers) => subagentProviderBadge(providers, settings, providerInstanceId)?.displayName,
307+
);
308+
const accentColor = useAtomValue(
309+
providersAtom,
310+
(providers) => subagentProviderBadge(providers, settings, providerInstanceId)?.accentColor,
311+
);
282312
return (
283313
<SubagentAvatar
284314
{...props}
285315
driver={providerDriver ?? (remote === undefined ? driver : undefined)}
286-
displayName={displayName}
316+
displayName={badgeLabel ?? displayName}
287317
iconUrl={iconUrl}
318+
accentColor={accentColor}
319+
showBadge={badgeLabel !== undefined}
288320
/>
289321
);
290322
}

0 commit comments

Comments
 (0)