Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(agents): show a failed tool call with its own label, icon and reason (#8741)
gbirmanf1f5f974889b
diff --git a/apps/web/src/features/block-agent/component/parts/MacroToolCall.test.tsx b/apps/web/src/features/block-agent/component/parts/MacroToolCall.test.tsxnew file mode 100644index 0000000000..ae0d9f816d--- /dev/null+++ b/apps/web/src/features/block-agent/component/parts/MacroToolCall.test.tsx@@ -0,0 +1,53 @@+/**+ * @vitest-environment jsdom+ */++import { fireEvent, render, screen } from '@solidjs/testing-library';+import { describe, expect, it, vi } from 'vitest';+import { MacroToolCall } from './MacroToolCall';+import type { ToolCallContext } from './shared';++vi.mock('@app/lib/analytics/posthog', () => ({+ useFeatureFlag: () => () => ({ enabled: false }),+}));++const context: ToolCallContext = {+ sessionId: 'session',+ messageId: 'session:0:agent',+ partIndex: 0,+ inFlight: false,+ followedBy: () => false,+};++describe('MacroToolCall failures', () => {+ it('shows a failed call on its own card and reveals the reason on request', () => {+ const reason =+ 'The calendar event no longer exists: it was deleted or cancelled, or the id is not a calendar event.';+ render(() => (+ <MacroToolCall+ detail={{+ kind: 'macro',+ input: { eventId: '01a16cb6-0000-7000-8000-00000000dead' },+ output: reason,+ error: reason,+ }}+ common={{+ id: 'call-1',+ label: 'ReadCalendarEvent',+ status: 'failed',+ muted: true,+ trailing: 'Failed',+ }}+ context={context}+ />+ ));++ expect(screen.getByText('Read calendar event')).toBeTruthy();+ expect(screen.queryByText('ReadCalendarEvent')).toBeNull();+ expect(screen.queryByText(reason)).toBeNull();++ fireEvent.click(screen.getByRole('button', { name: 'Failed' }));++ expect(screen.getByText(reason)).toBeTruthy();+ });+});diff --git a/apps/web/src/features/block-agent/component/parts/MacroToolCall.tsx b/apps/web/src/features/block-agent/component/parts/MacroToolCall.tsxindex 5a8ec23238..24ca8025e0 100644--- a/apps/web/src/features/block-agent/component/parts/MacroToolCall.tsx+++ b/apps/web/src/features/block-agent/component/parts/MacroToolCall.tsx@@ -3,7 +3,9 @@* server, or called natively by Macro's own agent.** Successful calls reuse their registered result renderer and its disclosure.- * Running, stopped, failed, and unsupported calls keep a summary-only row.+ * Failed calls reuse the same renderer, so they keep the tool's own label and+ * icon, with the tool's reason in place of a result.+ * Running, stopped, and unsupported calls keep a summary-only row.* Only registered result renderers supply disclosures; raw payloads stay hidden.*/@@ -85,7 +87,7 @@ export function MacroToolCall(props: {return undefined;};const error = () => props.detail.error ?? responseError(response());- const failure = () => error() != null;+ const failure = () => props.common.status === 'failed' || error() != null;const fallback = () => (<ToolCard@@ -109,19 +111,32 @@ export function MacroToolCall(props: {!props.common.muted &&props.common.trailing == null &&!failure() &&- call() !== undefined &&- (response() !== undefined || legacyImage() !== undefined) &&- hasToolRenderer(props.common.label);+ (response() !== undefined || legacyImage() !== undefined);+ const canRenderFailure = () =>+ (props.common.status === 'completed' || props.common.status === 'failed') &&+ failure();return (- <Show when={canRenderResults()} fallback={fallback()}>+ <Show+ when={+ (canRenderResults() || canRenderFailure()) &&+ call() !== undefined &&+ hasToolRenderer(props.common.label)+ }+ fallback={fallback()}+ ><ErrorBoundary fallback={fallback()}><Suspense fallback={fallback()}><RenderTooltool_id={props.common.id}name={props.common.label}json={props.detail.input}- response={{ json: props.detail.output, name: props.common.label }}+ response={+ failure()+ ? undefined+ : { json: props.detail.output, name: props.common.label }+ }+ error={failure() ? error() : undefined}chat_id={props.context.sessionId}message_id={props.context.messageId}part_index={props.context.partIndex}diff --git a/apps/web/src/features/block-agent/component/parts/ToolCallPart.test.tsx b/apps/web/src/features/block-agent/component/parts/ToolCallPart.test.tsxindex 027d6aeb3c..6a019aefb0 100644--- a/apps/web/src/features/block-agent/component/parts/ToolCallPart.test.tsx+++ b/apps/web/src/features/block-agent/component/parts/ToolCallPart.test.tsx@@ -49,6 +49,7 @@ vi.mock('@core/component/AI/component/tool/handler', () => ({name: string;json: unknown;response?: { json: unknown };+ error?: string;isComplete: boolean;renderContext: {renderContext: { grouped?: boolean; isStreaming: boolean };@@ -57,6 +58,7 @@ vi.mock('@core/component/AI/component/tool/handler', () => ({<divdata-testid="macro-tool"data-response={JSON.stringify(props.response?.json)}+ data-error={props.error}data-grouped={String(props.renderContext.renderContext.grouped)}data-streaming={String(props.renderContext.renderContext.isStreaming)}>@@ -530,24 +532,75 @@ describe('ToolCallPart Macro tools', () => {expect(rendered.getByTestId('tool-card')).not.toBeNull();});- it('shows a failed Macro tool as a faded summary', () => {+ it('shows a failed Macro tool through its renderer with the reason and no result', () => {const rendered = render(() => (<ToolCallPartpart={toolUse({kind: 'macro',input: { limit: 5 },- output: null,- error: 'permission denied',+ output: 'Failed to list entities: permission denied',+ error: 'Failed to list entities: permission denied',},{ name: 'ListEntities', status: 'failed' })}context={context(false)}/>));+ const richTool = rendered.getByTestId('macro-tool');+ expect(richTool.textContent).toBe('ListEntities');+ expect(richTool.dataset.error).toBe(+ 'Failed to list entities: permission denied'+ );+ expect(richTool.dataset.response).toBeUndefined();+ expect(rendered.queryByTestId('tool-card')).toBeNull();+ });++ it('treats a result that reports no success as a failure with its message', () => {+ const rendered = render(() => (+ <ToolCallPart+ part={toolUse(+ {+ kind: 'macro',+ input: {+ documentId: '4a4886d8-9f4b-4f7e-a5a3-3f5c8b6c0e46',+ documentName: 'Plan',+ },+ output: {+ success: false,+ documentId: '4a4886d8-9f4b-4f7e-a5a3-3f5c8b6c0e46',+ message: 'Only the owner can rename',+ },+ error: null,+ },+ { name: 'RenameDocument' }+ )}+ context={context(false)}+ />+ ));+ const richTool = rendered.getByTestId('macro-tool');+ expect(richTool.dataset.error).toBe('Only the owner can rename');+ expect(richTool.dataset.response).toBeUndefined();+ });++ it('keeps a failed call whose arguments do not fit its schema on the card', () => {+ const rendered = render(() => (+ <ToolCallPart+ part={readContent({+ status: 'failed',+ detail: {+ kind: 'macro',+ input: { documentId: 'not-a-uuid' },+ output: null,+ error: 'not found',+ },+ })}+ context={context(false)}+ />+ ));+ expect(rendered.queryByTestId('macro-tool')).toBeNull();expect(rendered.getByTestId('tool-card').dataset.muted).toBe('true');expect(rendered.getByTestId('trailing').textContent).toBe('Failed');- expect(rendered.getByTestId('tool-card').dataset.expandable).toBe('false');});});@@ -1137,8 +1190,12 @@ describe('ToolCallPart result summaries', () => {it.each([{name: 'MoveToProject',- input: {},+ input: {+ entityType: 'document',+ entityId: '4a4886d8-9f4b-4f7e-a5a3-3f5c8b6c0e46',+ },output: { success: false, message: 'Denied' },+ reason: 'Denied',},{name: 'WebFetch',@@ -1150,6 +1207,7 @@ describe('ToolCallPart result summaries', () => {error_code: 'url_not_accessible',},},+ reason: 'url_not_accessible',},{name: 'WebSearch',@@ -1161,10 +1219,11 @@ describe('ToolCallPart result summaries', () => {error_code: 'unavailable',},},+ reason: 'unavailable',},])('shows a validated $name response failure even if the call completed',- ({ name, input, output }) => {+ ({ name, input, output, reason }) => {const rendered = render(() => (<ToolCallPartpart={toolUse(@@ -1174,9 +1233,10 @@ describe('ToolCallPart result summaries', () => {context={context(false)}/>));- expect(rendered.getByTestId('trailing').textContent).toBe('Failed');- expect(rendered.getByTestId('tool-card').dataset.muted).toBe('true');- expect(rendered.queryByTestId('macro-tool')).toBeNull();+ const richTool = rendered.getByTestId('macro-tool');+ expect(richTool.dataset.error).toBe(reason);+ expect(richTool.dataset.response).toBeUndefined();+ expect(rendered.queryByTestId('tool-card')).toBeNull();});diff --git a/apps/web/src/lib/core/component/AI/component/tool/AgentSessionActions.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/AgentSessionActions.test.tsxindex c5794622e7..cf0d106fc0 100644--- a/apps/web/src/lib/core/component/AI/component/tool/AgentSessionActions.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/AgentSessionActions.test.tsx@@ -44,7 +44,7 @@ it('links the created session instead of showing its raw response', () => {it('does not present an uncertain prompt as completed work', () => {const view = render(() => (- <ToolErrorContext.Provider value={() => 'delivery unknown'}>+ <ToolErrorContext.Provider value={() => ({ reason: 'delivery unknown' })}><manageAgentSessionHandler.render{...context}tool={{diff --git a/apps/web/src/lib/core/component/AI/component/tool/BaseTool.tsx b/apps/web/src/lib/core/component/AI/component/tool/BaseTool.tsxindex c0eded8baf..7f18f04c25 100644--- a/apps/web/src/lib/core/component/AI/component/tool/BaseTool.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/BaseTool.tsx@@ -1,5 +1,5 @@import type { Component, JSX } from 'solid-js';-import { Show } from 'solid-js';+import { createSignal, Show } from 'solid-js';import { Tool } from './Tool';import { type RenderContext, useToolError } from './ToolRenderer';@@ -18,22 +18,43 @@ type ToolResponseProps = {};function BaseToolCall(props: ToolCallProps) {- const error = () => useToolError();+ const failure = () => useToolError();+ const reason = () => failure()?.reason?.trim() || undefined;+ const [showReason, setShowReason] = createSignal(false);const grouped = () => props.renderContext.grouped === true;return (- <Tool.Root grouped={grouped()} muted={!!error()}>+ <Tool.Root grouped={grouped()} muted={!!failure()}><Tool.Rowalign={props.align}grouped={grouped()}icon={props.icon}- trailing={error() ? <span class="text-ink">Failed</span> : undefined}+ trailing={+ failure() ? (+ <Tool.ResultToggle+ expanded={showReason()}+ onToggle={() => setShowReason((shown) => !shown)}+ showToggle={reason() !== undefined}+ status={<span class="text-ink">Failed</span>}+ />+ ) : undefined+ }>{props.children}</Tool.Row><Show when={props.response}><Tool.Response>{props.response}</Tool.Response></Show>+ <Show when={showReason() && reason()}>+ {(text) => (+ <p+ class="whitespace-pre-wrap break-words pb-2"+ classList={{ 'pl-6': grouped(), 'pl-9 pr-3': !grouped() }}+ >+ {text()}+ </p>+ )}+ </Show></Tool.Root>);}diff --git a/apps/web/src/lib/core/component/AI/component/tool/BookingLinks.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/BookingLinks.test.tsxindex b592b64978..2ef0e0c3cc 100644--- a/apps/web/src/lib/core/component/AI/component/tool/BookingLinks.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/BookingLinks.test.tsx@@ -36,7 +36,7 @@ const context = {};it('never opens an editable review when saving fails', () => {const view = render(() => (- <ToolErrorContext.Provider value={() => 'failed'}>+ <ToolErrorContext.Provider value={() => ({ reason: 'failed' })}><createBookingLinkHandler.render {...context} /></ToolErrorContext.Provider>));diff --git a/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.test.tsxindex 5f47f5ba96..c31060cd62 100644--- a/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.test.tsx@@ -3,9 +3,12 @@ import type { Component, JSX, ParentProps } from 'solid-js';import { Dynamic } from 'solid-js/web';import { afterEach, expect, it, vi } from 'vitest';import {+ addSharedCalendarEventHandler,createCalendarEventHandler,createConfirmedCalendarEventHandler,+ readCalendarEventHandler,} from './CalendarTools';+import { ToolErrorContext, type ToolFailure } from './ToolRenderer';const openToolCalendarEvent = vi.hoisted(() => vi.fn());vi.mock('./calendar/open-tool-event', () => ({@@ -33,8 +36,10 @@ afterEach(() => {});const handlers = {+ AddSharedCalendarEvent: addSharedCalendarEventHandler,CreateCalendarEvent: createCalendarEventHandler,CreateConfirmedCalendarEvent: createConfirmedCalendarEventHandler,+ ReadCalendarEvent: readCalendarEventHandler,};const draft = {@@ -88,6 +93,24 @@ function tool(name: keyof typeof handlers, data: unknown, response?: unknown) {));}+function failedTool(+ name: keyof typeof handlers,+ data: unknown,+ failure: ToolFailure+) {+ return render(() => (+ <ToolErrorContext.Provider value={() => failure}>+ <Dynamic+ component={handlers[name].render as Component<Record<string, unknown>>}+ tool={{ id: 'call-1', name, data }}+ renderContext={{ isStreaming: false, grouped: true }}+ chat_id="chat-1"+ message_id="message-1"+ />+ </ToolErrorContext.Provider>+ ));+}+it('shows a confirmed create in flight as the plain create card', () => {tool('CreateConfirmedCalendarEvent', {...draft,@@ -121,3 +144,32 @@ it('still defers the plain create to the composer', () => {tool('CreateCalendarEvent', draft, 'PendingUserExecution');expect(screen.getByText('calendar composer')).toBeTruthy();});++it('keeps a failed call on its own card and reveals the reason on request', () => {+ const reason =+ "Adding a shared event to the user's calendar is not enabled for this deployment.";+ failedTool(+ 'AddSharedCalendarEvent',+ { eventId: '01992d2f-8444-7000-8000-000000000001' },+ { reason }+ );+ expect(screen.getByText('Add to calendar')).toBeTruthy();+ expect(screen.queryByText(reason)).toBeNull();++ fireEvent.click(screen.getByRole('button', { name: 'Failed' }));+ expect(screen.getByText(reason)).toBeTruthy();++ fireEvent.click(screen.getByRole('button', { name: 'Failed' }));+ expect(screen.queryByText(reason)).toBeNull();+});++it('offers nothing to open on a failed call without a reason', () => {+ failedTool(+ 'ReadCalendarEvent',+ { eventId: '01992d2f-8444-7000-8000-000000000001' },+ {}+ );+ expect(screen.getByText('Read calendar event')).toBeTruthy();+ expect(screen.getByText('Failed')).toBeTruthy();+ expect(screen.queryByRole('button')).toBeNull();+});diff --git a/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.tsx b/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.tsxindex fb17547074..e79d68f851 100644--- a/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/CalendarTools.tsx@@ -307,7 +307,7 @@ export const readCalendarEventHandler = createToolRenderer({render: (ctx) => (<BaseTool icon={CalendarDots} renderContext={ctx.renderContext} type="call"><div class="flex min-w-0 flex-1 items-center justify-between gap-3 overflow-hidden">- <span class="min-w-0 truncate">Read calendar event</span>+ <span class="shrink-0">Read calendar event</span><Show when={ctx.response?.data}>{(event) => (<Tooltip label={event().title} as="span" class="min-w-0">diff --git a/apps/web/src/lib/core/component/AI/component/tool/Canvas.tsx b/apps/web/src/lib/core/component/AI/component/tool/Canvas.tsxindex 8d5718df95..65367b65b0 100644--- a/apps/web/src/lib/core/component/AI/component/tool/Canvas.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/Canvas.tsx@@ -81,7 +81,7 @@ export const renderCanvasHandler = createToolRenderer({name: 'RenderCanvas',render: (ctx) => (<CanvasToolRow- verb="Rendered"+ verb={ctx.response ? 'Rendered' : 'Render'}documentId={ctx.tool.data.document_id}summary={ctx.responsediff --git a/apps/web/src/lib/core/component/AI/component/tool/CodingAgents.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/CodingAgents.test.tsxindex 4422e1928d..bb812bd044 100644--- a/apps/web/src/lib/core/component/AI/component/tool/CodingAgents.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/CodingAgents.test.tsx@@ -7,7 +7,7 @@ import {dispatchCodingAgentHandler,listCodingAgentsHandler,} from './CodingAgents';-import { ToolErrorContext } from './ToolRenderer';+import { ToolErrorContext, type ToolFailure } from './ToolRenderer';vi.mock('../../../LexicalMarkdown/component/decorator/MagicChip', () => ({MagicChip: (props: MagicChipData) => (@@ -69,7 +69,7 @@ describe('coding agent dispatch', () => {});it('shows a dispatch error without leaving a starting indicator or session card', () => {- const [error, setError] = createSignal<string>();+ const [error, setError] = createSignal<ToolFailure>();const view = render(() => (<ToolErrorContext.Provider value={error}><dispatchCodingAgentHandler.render@@ -89,7 +89,7 @@ describe('coding agent dispatch', () => {/></ToolErrorContext.Provider>));- setError('failed');+ setError({ reason: 'failed' });expect(view.getByRole('status').textContent).toContain('Could not confirm coding agent dispatch');@@ -102,7 +102,7 @@ describe('available coding agents', () => {it.each([false, true])('updates an already mounted row when listing fails (grouped: %s)',(grouped) => {- const [error, setError] = createSignal<string>();+ const [error, setError] = createSignal<ToolFailure>();const view = render(() => (<ToolErrorContext.Provider value={error}><listCodingAgentsHandler.render@@ -123,7 +123,7 @@ describe('available coding agents', () => {expect(view.queryByText('Failed')).toBeNull();expect(label.closest('.opacity-50')).toBeNull();- setError('failed');+ setError({ reason: 'failed' });expect(view.getByText('Failed')).toBeTruthy();expect(label.closest('.opacity-50')).toBeTruthy();expect(view.getByText('Available coding agents')).toBe(label);diff --git a/apps/web/src/lib/core/component/AI/component/tool/Forms.tsx b/apps/web/src/lib/core/component/AI/component/tool/Forms.tsxindex ef9ac147bb..18945a307c 100644--- a/apps/web/src/lib/core/component/AI/component/tool/Forms.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/Forms.tsx@@ -29,7 +29,7 @@ function Card(props: {<Tool.ResultToggleexpanded={expanded()}onToggle={() => setExpanded((value) => !value)}- showToggle={props.children !== undefined}+ showToggle={props.status !== undefined}status={props.status}/></div>diff --git a/apps/web/src/lib/core/component/AI/component/tool/GenerateImage.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/GenerateImage.test.tsxindex 15c07dff12..a1ce876471 100644--- a/apps/web/src/lib/core/component/AI/component/tool/GenerateImage.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/GenerateImage.test.tsx@@ -20,7 +20,10 @@ function imageTool(error?: string | (() => string | undefined),data: GenerateImageResponse = result) {- const failure = () => (typeof error === 'function' ? error() : error);+ const failure = () => {+ const reason = typeof error === 'function' ? error() : error;+ return reason === undefined ? undefined : { reason };+ };return render(() => (<ToolErrorContext.Provider value={failure}><generateImageHandler.renderdiff --git a/apps/web/src/lib/core/component/AI/component/tool/ImportTools.tsx b/apps/web/src/lib/core/component/AI/component/tool/ImportTools.tsxindex 5bfbdf4a20..27a8a61c39 100644--- a/apps/web/src/lib/core/component/AI/component/tool/ImportTools.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/ImportTools.tsx@@ -4,7 +4,7 @@ import { createSignal, Show } from 'solid-js';import { match } from 'ts-pattern';import { BaseTool } from './BaseTool';import { Tool } from './Tool';-import { createToolRenderer } from './ToolRenderer';+import { createToolRenderer, useToolError } from './ToolRenderer';/** Renderers for the import-ledger tools the chat agent can call@@ -105,6 +105,7 @@ export const importFromNotionHandler = createToolRenderer({render: (ctx) => {const [isExpanded, setIsExpanded] = createSignal(false);const hasResponse = () => ctx.response !== undefined;+ const error = () => useToolError();const label = () =>match(ctx.tool.data.action).with('plan', () => 'Plan a Notion import')@@ -126,7 +127,9 @@ export const importFromNotionHandler = createToolRenderer({><div class="flex min-w-0 flex-1 items-center justify-between gap-3 overflow-hidden"><div class="min-w-0 flex-1 truncate">{label()}</div>- <Show when={ctx.tool.data.action === 'plan' && !hasResponse()}>+ <Show+ when={ctx.tool.data.action === 'plan' && !hasResponse() && !error()}+ ><NotionScanProgress /></Show><Tool.ResultTogglediff --git a/apps/web/src/lib/core/component/AI/component/tool/LoadTools.tsx b/apps/web/src/lib/core/component/AI/component/tool/LoadTools.tsxindex 9edd24da40..9224858dca 100644--- a/apps/web/src/lib/core/component/AI/component/tool/LoadTools.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/LoadTools.tsx@@ -16,7 +16,9 @@ const handler = createToolRenderer({return (<BaseTool icon={Plus} renderContext={ctx.renderContext} type="call"><div class="flex min-w-0 flex-1 items-center justify-between gap-3 overflow-hidden">- <span class="min-w-0 truncate">Loaded tools</span>+ <span class="min-w-0 truncate">+ {ctx.response ? 'Loaded tools' : 'Load tools'}+ </span><Show when={ctx.response}><span class="shrink-0 text-ink-extra-muted">{countText()}</span></Show>diff --git a/apps/web/src/lib/core/component/AI/component/tool/Presentation.tsx b/apps/web/src/lib/core/component/AI/component/tool/Presentation.tsxindex e0b2d49666..c041578ee9 100644--- a/apps/web/src/lib/core/component/AI/component/tool/Presentation.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/Presentation.tsx@@ -102,7 +102,7 @@ export const editPresentationHandler = createToolRenderer({};return (<PresentationToolRow- verb={copy() ? 'Created' : 'Edit'}+ verb={copy() ? (ctx.response ? 'Created' : 'Create') : 'Edit'}documentId={ctx.response?.data.documentId ?? ctx.tool.data.documentId}summary={summary()}details={ctx.response?.data.changedSlides || undefined}diff --git a/apps/web/src/lib/core/component/AI/component/tool/SearchTools.tsx b/apps/web/src/lib/core/component/AI/component/tool/SearchTools.tsxindex f95225920e..fffad360c1 100644--- a/apps/web/src/lib/core/component/AI/component/tool/SearchTools.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/SearchTools.tsx@@ -21,7 +21,7 @@ const handler = createToolRenderer({><div class="flex min-w-0 flex-1 items-center justify-between gap-3 overflow-hidden"><span class="min-w-0 truncate">- Searched tools for{' '}+ {ctx.response ? 'Searched tools for' : 'Search tools for'}{' '}<span class="text-ink">{ctx.tool.data.query}</span></span><Show when={ctx.response}>diff --git a/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.test.tsxnew file mode 100644index 0000000000..3fb403e024--- /dev/null+++ b/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.test.tsx@@ -0,0 +1,54 @@+import type { NamedTool } from '@service-cognition/generated/tools/tool';+import { render, screen } from '@solidjs/testing-library';+import { createSignal, type ParentProps } from 'solid-js';+import { expect, it, vi } from 'vitest';+import { sendConfirmedEmailHandler } from './SendConfirmedEmail';++vi.mock('@core/component/ItemPreview', () => ({+ ItemPreview: () => null,+}));+vi.mock('./email/ChatCompose', () => ({+ ComposeTool: () => null,+}));+vi.mock('@ui', () => ({+ Layer: (props: ParentProps) => props.children,+ cn: (...classes: string[]) => classes.join(' '),+}));++const send = {+ subject: 'Q3 plan',+ body: 'Attached.',+ to: [{ email: '[email protected]', name: 'Ada Lovelace' }],+ userConfirmation: 'yes, send it',+};++it('shows the send once its result arrives after the row mounted', () => {+ const [response, setResponse] =+ createSignal<NamedTool<'SendConfirmedEmail', 'response'>>();+ render(() => (+ <sendConfirmedEmailHandler.render+ tool={{ id: 'call-1', name: 'SendConfirmedEmail', data: send }}+ response={response()}+ chat_id="chat-1"+ message_id="message-1"+ part_index={0}+ isComplete={response() !== undefined}+ renderContext={{ isStreaming: false, followedBy: () => false }}+ />+ ));+ expect(screen.getByText('Ada Lovelace')).toBeTruthy();+ expect(screen.queryByText(/Email sent to/)).toBeNull();++ setResponse({+ id: 'call-1',+ name: 'SendConfirmedEmail',+ data: {+ sent: {+ message_id: '01a16cb6-0000-7000-8000-000000000001',+ thread_id: '01a16cb6-0000-7000-8000-000000000002',+ },+ },+ });++ expect(screen.getByText(/Email sent to/)).toBeTruthy();+});diff --git a/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.tsx b/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.tsxindex 39955c4d82..84a4b2554d 100644--- a/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/SendConfirmedEmail.tsx@@ -1,7 +1,11 @@import type { NamedTool } from '@service-cognition/generated/tools/tool';import { Match, Show, Switch } from 'solid-js';import { BaseTool } from './BaseTool';-import { DraftEmailResponse, SentEmailResponse } from './SendEmail';+import {+ DraftEmailResponse,+ SendEmailCall,+ SentEmailResponse,+} from './SendEmail';import { createToolRenderer } from './ToolRenderer';type SendConfirmedEmailResponse = NamedTool<@@ -38,28 +42,37 @@ const handler = createToolRenderer({render: (ctx) => {const response = () => ctx.response?.data;const args = ctx.tool.data;- const sentResponse = getSentResponse(response());- const draftResponse = getDraftResponse(response());+ const sentResponse = () => getSentResponse(response());+ const draftResponse = () => getDraftResponse(response());return (- <Show when={ctx.response}>+ <Show+ when={ctx.response}+ fallback={+ <SendEmailCall args={args} renderContext={ctx.renderContext} />+ }+ ><Switch>- <Match when={sentResponse}>- <SentEmailResponse- args={args}- chatId={ctx.chat_id}- messageId={ctx.message_id}- renderContext={ctx.renderContext}- threadId={sentResponse!.thread_id}- toolCallId={ctx.tool.id}- />+ <Match when={sentResponse()}>+ {(sent) => (+ <SentEmailResponse+ args={args}+ chatId={ctx.chat_id}+ messageId={ctx.message_id}+ renderContext={ctx.renderContext}+ threadId={sent().thread_id}+ toolCallId={ctx.tool.id}+ />+ )}</Match>- <Match when={draftResponse}>- <DraftEmailResponse- args={args}- draftId={draftResponse!.draft_id}- renderContext={ctx.renderContext}- />+ <Match when={draftResponse()}>+ {(draft) => (+ <DraftEmailResponse+ args={args}+ draftId={draft().draft_id}+ renderContext={ctx.renderContext}+ />+ )}</Match><Match when={response() === 'userEdited'}><BaseTool renderContext={ctx.renderContext} type="response">diff --git a/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx b/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsxindex 2523503c50..2418d98d6f 100644--- a/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/SendEmail.tsx@@ -2,6 +2,7 @@ import { useSplitLayout } from '@components/app/split-layout/layout';import { EntityIcon } from '@core/component/EntityIcon';import { ItemPreview } from '@core/component/ItemPreview';import CaretRight from '@phosphor/caret-right.svg';+import PaperPlaneTilt from '@phosphor-icons/core/regular/paper-plane-tilt.svg';import type { NamedTool } from '@service-cognition/generated/tools/tool';import type { SendEmail } from '@service-cognition/generated/tools/types';import { cn } from '@ui';@@ -178,6 +179,25 @@ export function SentEmailResponse(props: {);}+/** A send with no result: still in flight, or failed. */+export function SendEmailCall(props: {+ args: SendEmail;+ renderContext: Parameters<typeof BaseTool>[0]['renderContext'];+}) {+ return (+ <BaseTool+ icon={PaperPlaneTilt}+ renderContext={props.renderContext}+ type="call"+ >+ <span class="min-w-0 truncate">+ Send email to{' '}+ <span class="text-ink">{getRecipientsLabel(props.args)}</span>+ </span>+ </BaseTool>+ );+}+export function DraftEmailResponse(props: {args: SendEmail;draftId: string;diff --git a/apps/web/src/lib/core/component/AI/component/tool/Spreadsheet.test.tsx b/apps/web/src/lib/core/component/AI/component/tool/Spreadsheet.test.tsxindex 3be772a718..0c29ed9daa 100644--- a/apps/web/src/lib/core/component/AI/component/tool/Spreadsheet.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/Spreadsheet.test.tsx@@ -35,7 +35,9 @@ function renderTool(error?: string) {return render(() => (- <ToolErrorContext.Provider value={() => error}>+ <ToolErrorContext.Provider+ value={() => (error === undefined ? undefined : { reason: error })}+ ><Dynamiccomponent={handler.render as Component<Record<string, unknown>>}response={result ? { data: result } : undefined}diff --git a/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx b/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsxindex d145d66f24..543c69696b 100644--- a/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/TextEditorCodeExecution.tsx@@ -209,7 +209,9 @@ const handler = createToolRenderer({render: (ctx) => (<BaseTool icon={Terminal} renderContext={ctx.renderContext} type="call"><div class="flex min-w-0 flex-1 items-center justify-between gap-3 overflow-hidden">- <span class="min-w-0 truncate">Uploaded code</span>+ <span class="min-w-0 truncate">+ {ctx.response ? 'Uploaded code' : 'Upload code'}+ </span><Show when={ctx.response}>{(response) => (<div class="shrink-0">diff --git a/apps/web/src/lib/core/component/AI/component/tool/ToolRenderer.tsx b/apps/web/src/lib/core/component/AI/component/tool/ToolRenderer.tsxindex 0b63beb617..0709a5eeac 100644--- a/apps/web/src/lib/core/component/AI/component/tool/ToolRenderer.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/ToolRenderer.tsx@@ -4,8 +4,11 @@ import type {} from '@service-cognition/generated/tools/tool';import { type Component, createContext, useContext } from 'solid-js';+/** A finished call that failed, with the tool's own reason when it gave one. */+export type ToolFailure = { reason?: string };+export const ToolErrorContext = createContext<- (() => string | undefined) | undefined+ (() => ToolFailure | undefined) | undefined>();export const useToolError = () => {const accessor = useContext(ToolErrorContext);diff --git a/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx b/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsxindex 5582d1de6b..b41e078808 100644--- a/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/WebFetch.tsx@@ -7,7 +7,7 @@ const handler = createToolRenderer({name: 'WebFetch',render: (ctx) => (<BaseTool icon={Globe} renderContext={ctx.renderContext} type="call">- Fetched{' '}+ {ctx.response ? 'Fetched' : 'Fetch'}{' '}<ahref={ctx.tool.data.input}target="_blank"diff --git a/apps/web/src/lib/core/component/AI/component/tool/WebSearch.tsx b/apps/web/src/lib/core/component/AI/component/tool/WebSearch.tsxindex efe4a84113..d8393d8e2f 100644--- a/apps/web/src/lib/core/component/AI/component/tool/WebSearch.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/WebSearch.tsx@@ -47,7 +47,8 @@ const handler = createToolRenderer({<div class="flex min-w-0 flex-1 items-center justify-between gap-3 overflow-hidden"><div class="flex min-w-0 flex-1 items-center gap-2 overflow-hidden"><span class="min-w-0 truncate">- Searched for <span class="text-ink">{ctx.tool.data.input}</span>+ {ctx.response ? 'Searched for' : 'Search for'}{' '}+ <span class="text-ink">{ctx.tool.data.input}</span></span></div><Tool.ResultTogglediff --git a/apps/web/src/lib/core/component/AI/component/tool/handler.tsx b/apps/web/src/lib/core/component/AI/component/tool/handler.tsxindex 608b1660ae..6e4b49189b 100644--- a/apps/web/src/lib/core/component/AI/component/tool/handler.tsx+++ b/apps/web/src/lib/core/component/AI/component/tool/handler.tsx@@ -362,6 +362,8 @@ type ToolProps = {json: unknown;name: string;};+ /** The tool's reason for a call that failed. */+ error?: string;part_index: number;chat_id: string;message_id: string;@@ -453,7 +455,13 @@ export function RenderTool(props: ToolProps) {}><ToolErrorContext.Provider- value={() => (props.isComplete && !response() ? 'failed' : undefined)}+ value={() =>+ props.error !== undefined+ ? { reason: props.error }+ : props.isComplete && !response()+ ? {}+ : undefined+ }><Showwhen={isToolShown(tool.name, databasesEnabled().enabled)}diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.mdindex 4ab9de8d41..0c2d4af179 100644--- a/docs/agent-guide/ai-chat.md+++ b/docs/agent-guide/ai-chat.md@@ -1378,7 +1378,11 @@ collapsed. Existing rich result views retain their own content and controls;when a result view provides its own disclosure, use that control rather thanadding a second nested disclosure. Counts come from structured responses,edits show additions/deletions, and other tools show their outcome. A call cut-off when its turn ends reads **Stopped**.+off when its turn ends reads **Stopped**. A failed Macro tool call keeps the+same label and icon as its successful row, faded, with **Failed** on the right+(for example **Add to calendar · Failed**, never the tool's code name); when the+tool gave a reason, **Failed** carries a caret that opens it. Labels stay in+the present tense (**Fetch**, **Load tools**) until a result arrives.Only tools with a supported result view can expand. Unknown tools, unsupporteddrafts, and payloads that do not fit their renderer stay as summary rows with