diff --git a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx index c5bef1a9c7..f7a38cb4c2 100644 --- a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx @@ -14,8 +14,11 @@ import { subagentProgressKey, useSubagentProgress, } from '~/components/Chat/Subagents/state'; +import { useParentSubagents } from '~/components/Chat/Subagents/ParentSubagentsProvider'; +import { isSelfSpawn as isSelfSpawnType } from '~/components/Chat/Subagents/author'; import { adaptLivePersistedActivity } from '~/components/Chat/Subagents/adapters'; import { resolveSubagentAgentId } from '~/components/Chat/Subagents/identity'; +import { subagentStatusLabelKey } from '~/components/Chat/Subagents/status'; import { useOpenSubagentPanel } from '~/components/Chat/Subagents/surface'; import { MessageContext } from '~/Providers/MessageContext'; import { useShareContext } from '~/Providers/ShareContext'; @@ -193,7 +196,10 @@ export default function SubagentCall({ isSharedConvo !== true && backgroundHandle != null && parentConversationId !== ''; const subagentType = progress?.subagentType ?? extractSubagentType(args); - const isSelfSpawn = subagentType === 'self'; + const isSelfSpawn = isSelfSpawnType( + subagentType, + progress?.subagentKind ?? subagentIdentity?.subagentKind, + ); const subagentAgentId = resolveSubagentAgentId(progress, subagentIdentity); const subagentAgent = subagentAgentId ? agentsMap?.[subagentAgentId] : undefined; /** @@ -280,12 +286,14 @@ export default function SubagentCall({ return localize('com_ui_subagent_complete'); }; const headerText = getHeaderText(); - /** Muted sub-label shown to the right of the base label: the - * configured agent name for named subagents. Self-spawns omit it - * (redundant — the header already says "agent") as do cases where - * the name isn't resolvable (agent map miss). */ + /** A named subagent leads with its own name and face, the way its turns read + * in main chat, and the verb or status follows it muted. Self-spawns keep + * the verb alone — the name would be the agent this card already sits + * under — as do agents the map cannot resolve. */ const subagentNameLabel = !isSelfSpawn && subagentAgent?.name ? subagentAgent.name : ''; + const cardLabel = subagentNameLabel ? `${subagentNameLabel}: ${headerText}` : headerText; + const canOpenDetails = useMemo(() => { const fallbackActivity = adaptLivePersistedActivity({ title: '', @@ -410,9 +418,9 @@ export default function SubagentCall({ canOpenDetails ? 'group' : 'cursor-default opacity-80', running && !detachedStatusUnknown && 'animate-pulse-slow', )} - aria-label={headerText} + aria-label={detachedStatusUnknown ? undefined : cardLabel} > -
{MESSAGE_BODY}