@@ -24,15 +24,52 @@ export type ModelOption = {
2424 readonly providerDriver : string ;
2525 readonly supportedRuntimeModes ?: ReadonlyArray < RuntimeMode > ;
2626 readonly providerIconUrl ?: string | undefined ;
27- /** Set when the instance needs the account badge, by the rule the thread rows use . */
28- readonly providerBadge ?: { readonly displayName : string ; readonly accentColor ?: string } ;
27+ /** Set when the instance needs the account badge. */
28+ readonly providerBadge ?: ProviderBadge ;
2929 readonly isDefault : boolean ;
3030 readonly isLegacy : boolean ;
3131 readonly isUnavailable ?: boolean ;
3232 readonly capabilities : ModelCapabilities | null ;
3333 readonly selection : ModelSelection ;
3434} ;
3535
36+ /** The account badge an instance's glyph carries. */
37+ export type ProviderBadge = { readonly displayName : string ; readonly accentColor ?: string } ;
38+
39+ type ServerProvider = T3ServerConfig [ "providers" ] [ number ] ;
40+
41+ /**
42+ * The badge an instance needs by the shared rule: an accent colour, or another
43+ * instance of the same provider. Settings carry each ACP instance's agent,
44+ * whose own glyph already tells it apart.
45+ */
46+ export function resolveProviderBadge (
47+ config : T3ServerConfig | null | undefined ,
48+ provider : ServerProvider ,
49+ ) : ProviderBadge | undefined {
50+ const badgeEntry = ( candidate : ServerProvider ) => {
51+ const settings = config ?. settings ?. providerInstances [ candidate . instanceId ] ?. config ;
52+ const agentId =
53+ typeof settings === "object" && settings ? Reflect . get ( settings , "agentId" ) : null ;
54+ return {
55+ driverKind : candidate . driver ,
56+ ...( typeof agentId === "string" && agentId . trim ( )
57+ ? { acpRegistryAgentId : agentId . trim ( ) }
58+ : { } ) ,
59+ } ;
60+ } ;
61+ const accentColor = normalizeProviderAccentColor ( provider . accentColor ) ;
62+ return shouldShowInstanceBadge (
63+ { ...badgeEntry ( provider ) , accentColor } ,
64+ ( config ?. providers ?? [ ] ) . map ( badgeEntry ) ,
65+ )
66+ ? {
67+ displayName : resolveProviderInstanceDisplayName ( provider ) ,
68+ ...( accentColor ? { accentColor } : { } ) ,
69+ }
70+ : undefined ;
71+ }
72+
3673export type ProviderGroup = {
3774 readonly providerKey : string ;
3875 readonly providerLabel : string ;
@@ -168,25 +205,6 @@ export function buildModelOptions(
168205 providerInstanceId ?: ModelSelection [ "instanceId" ] ,
169206) : ReadonlyArray < ModelOption > {
170207 const options = new Map < string , ModelOption > ( ) ;
171- // Settings carry each ACP instance's agent, whose own glyph already tells it apart.
172- const badgeEntry = ( provider : T3ServerConfig [ "providers" ] [ number ] ) => {
173- const settings = config ?. settings ?. providerInstances [ provider . instanceId ] ?. config ;
174- const agentId = typeof settings === "object" && settings ? Reflect . get ( settings , "agentId" ) : null ;
175- return {
176- driverKind : provider . driver ,
177- ...( typeof agentId === "string" && agentId . trim ( ) ? { acpRegistryAgentId : agentId . trim ( ) } : { } ) ,
178- } ;
179- } ;
180- const badgeEntries = ( config ?. providers ?? [ ] ) . map ( badgeEntry ) ;
181- const providerBadgeFor = ( provider : T3ServerConfig [ "providers" ] [ number ] ) => {
182- const accentColor = normalizeProviderAccentColor ( provider . accentColor ) ;
183- return shouldShowInstanceBadge ( { ...badgeEntry ( provider ) , accentColor } , badgeEntries )
184- ? {
185- displayName : resolveProviderInstanceDisplayName ( provider ) ,
186- ...( accentColor ? { accentColor } : { } ) ,
187- }
188- : undefined ;
189- } ;
190208
191209 for ( const provider of config ?. providers ?? [ ] ) {
192210 if (
@@ -200,7 +218,7 @@ export function buildModelOptions(
200218 }
201219
202220 const providerLabel = providerDisplayLabel ( provider ) ;
203- const providerBadge = providerBadgeFor ( provider ) ;
221+ const providerBadge = resolveProviderBadge ( config , provider ) ;
204222 for ( const model of provider . models ) {
205223 const key = `${ provider . instanceId } :${ model . slug } ` ;
206224 options . set ( key , {
@@ -258,7 +276,7 @@ export function buildModelOptions(
258276 displayName : provider ?. displayName ?? instanceConfig ?. displayName ,
259277 instanceId : fallbackModelSelection . instanceId ,
260278 } ) ;
261- const providerBadge = provider ? providerBadgeFor ( provider ) : undefined ;
279+ const providerBadge = provider ? resolveProviderBadge ( config , provider ) : undefined ;
262280 options . set ( key , {
263281 key,
264282 label : model ?. name ?? fallbackModelSelection . model ,
0 commit comments