diff --git a/frontend/src/lib/components/copilot/chat/ChatCollapsibleCard.svelte b/frontend/src/lib/components/copilot/chat/ChatCollapsibleCard.svelte index e5a9989365..ac8127dd50 100644 --- a/frontend/src/lib/components/copilot/chat/ChatCollapsibleCard.svelte +++ b/frontend/src/lib/components/copilot/chat/ChatCollapsibleCard.svelte @@ -17,6 +17,8 @@ labelMore?: string[] expanded: boolean onToggle: () => void + /** Called once the body has finished opening, when its contents have their final position. */ + onContentShown?: () => void // A card with nothing to reveal keeps the header inert (no chevron, no // hover affordance implying a toggle). toggleable?: boolean @@ -49,6 +51,7 @@ labelMore, expanded, onToggle, + onContentShown, toggleable = true, shimmer = false, settleLabel = false, @@ -161,6 +164,7 @@ {#if expanded && children}
{@render children()} diff --git a/frontend/src/lib/components/copilot/chat/ToolGroupDisplay.svelte b/frontend/src/lib/components/copilot/chat/ToolGroupDisplay.svelte index 77f58438da..a77a7bd691 100644 --- a/frontend/src/lib/components/copilot/chat/ToolGroupDisplay.svelte +++ b/frontend/src/lib/components/copilot/chat/ToolGroupDisplay.svelte @@ -6,6 +6,8 @@ import { callFailed, groupHeader, type ToolGroup } from './toolGroups' import McpServerIcon from '$lib/components/mcp/McpServerIcon.svelte' import { resolveMcpServerMark } from '$lib/components/mcp/serverMark' + import { Button } from '$lib/components/common' + import { getChatViewHost } from './chatViewHost' interface Props { group: ToolGroup @@ -14,7 +16,30 @@ let { group, entry }: Props = $props() + const chatHost = getChatViewHost() + let expanded = $state(false) + const rows: Record = {} + let scrollOnceOpen = false + + function scrollToFailedCall() { + const failed = group.entries.find((e) => e.message.role === 'tool' && callFailed(e.message)) + if (failed) { + // Here rather than at the click: while the group opens above a chat pinned to its end, + // scroll anchoring keeps it at the end, and that scroll turns automatic scroll back on. + chatHost.disableAutomaticScroll() + rows[failed.index]?.scrollIntoView({ block: 'center' }) + } + } + + function revealFailedCall() { + if (expanded) { + scrollToFailedCall() + } else { + scrollOnceOpen = true + expanded = true + } + } const calls = $derived( group.entries.map((e) => e.message).filter((m): m is ToolDisplayMessage => m.role === 'tool') @@ -59,7 +84,16 @@ {#snippet status()}
{#if failedCount > 0} - {failedCount} failed + {/if} {#if previewCard} @@ -72,7 +106,16 @@ label={header.label} labelMore={header.more} {expanded} - onToggle={() => (expanded = !expanded)} + onToggle={() => { + scrollOnceOpen = false + expanded = !expanded + }} + onContentShown={() => { + if (scrollOnceOpen) { + scrollOnceOpen = false + scrollToFailedCall() + } + }} shimmer={running} settleLabel {liveLine} @@ -83,6 +126,8 @@ contentClass="border-0 border-l rounded-none bg-transparent p-0 pl-2 ml-1.5 mt-0.5" > {#each group.entries as { message, index } (index)} - {@render entry(message, index)} +
+ {@render entry(message, index)} +
{/each}