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
feat(chat): collapse AI activity groups (#4800)
Eric Hayesea40b4b11676
diff --git a/apps/web/src/lib/core/component/AI/component/message/AssistantActivityGroup.tsx b/apps/web/src/lib/core/component/AI/component/message/AssistantActivityGroup.tsxnew file mode 100644index 0000000000..872153219d--- /dev/null+++ b/apps/web/src/lib/core/component/AI/component/message/AssistantActivityGroup.tsx@@ -0,0 +1,69 @@+import CaretRight from '@phosphor/caret-right.svg?component-solid';+import { Layer } from '@ui';+import type { JSX } from 'solid-js';+import { createMemo, createSignal, Show } from 'solid-js';++export function AssistantActivityGroup(props: {+ children: JSX.Element;+ itemCount: number;+ preview?: string;+}) {+ const [expanded, setExpanded] = createSignal(false);+ const isGrouped = createMemo(() => props.itemCount > 1);+ const stepLabel = () =>+ `${props.itemCount} ${props.itemCount === 1 ? 'step' : 'steps'}`;++ return (+ <Layer depth={0}>+ <div+ class="text-xs leading-5 text-ink-extra-muted"+ classList={{+ 'overflow-hidden rounded-lg border border-edge-muted bg-surface':+ isGrouped(),+ }}+ >+ <Show when={isGrouped()}>+ <button+ type="button"+ data-testid="activity-toggle"+ class="flex min-h-9 w-full items-center gap-2 px-3 py-2 text-left hover:text-ink-muted"+ aria-expanded={expanded()}+ onClick={() => setExpanded((previous) => !previous)}+ >+ <CaretRight+ class="size-4 shrink-0 transition-transform"+ classList={{ 'rotate-90': expanded() }}+ />+ <span class="shrink-0">{stepLabel()}</span>+ <Show when={!expanded() && props.preview}>+ {(preview) => (+ <span+ data-testid="activity-preview"+ class="min-w-0 flex-1 truncate text-right text-ink-extra-muted transition-opacity"+ style={{+ '-webkit-mask-image':+ 'linear-gradient(to right, transparent, black 25%)',+ 'mask-image':+ 'linear-gradient(to right, transparent, black 25%)',+ }}+ >+ {preview()}+ </span>+ )}+ </Show>+ </button>+ </Show>+ <div+ data-testid="activity-content"+ classList={{+ 'border-t border-edge-muted divide-y divide-edge-muted':+ isGrouped(),+ hidden: isGrouped() && !expanded(),+ }}+ >+ {props.children}+ </div>+ </div>+ </Layer>+ );+}diff --git a/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.test.tsx b/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.test.tsxindex ff82246028..05283d092d 100644--- a/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.test.tsx+++ b/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.test.tsx@@ -5,7 +5,7 @@import { asChatMessage } from '@core/component/AI/util/message';import type { ChatStream } from '@service-cognition/generated/schemas';import type { AssistantMessagePart } from '@service-cognition/generated/schemas/assistantMessagePart';-import { render, waitFor } from '@solidjs/testing-library';+import { fireEvent, render, waitFor } from '@solidjs/testing-library';import { createMemo, createRoot, createSignal, type JSX, Show } from 'solid-js';import { beforeEach, describe, expect, it, vi } from 'vitest';import { AssistantMessageParts } from './AssistantMessageParts';@@ -192,10 +192,11 @@ describe('AssistantMessageParts streaming identity', () => {return items;});- render(() => <StreamedAssistantParts data={data} />);+ const rendered = render(() => <StreamedAssistantParts data={data} />);append(response({ thinking: 'Need', type: 'thinking' }));await waitFor(() => expect(lifecycle.thinkingMounts).toBe(1));+ expect(rendered.queryByTestId('activity-toggle')).toBeNull();append(response({ thinking: ' context', type: 'thinking' }));await waitFor(() => {@@ -212,6 +213,12 @@ describe('AssistantMessageParts streaming identity', () => {}));await waitFor(() => expect(lifecycle.toolMounts.get('tool-1')).toBe(1));+ expect(rendered.getByTestId('activity-toggle').textContent).toContain(+ '2 steps'+ );+ expect(rendered.getByTestId('activity-content').classList).toContain(+ 'hidden'+ );expect(lifecycle.thinkingMounts).toBe(1);expect(lifecycle.thinkingCleanups).toBe(0);@@ -262,6 +269,155 @@ describe('AssistantMessageParts streaming identity', () => {disposeStream();});+ it('collapses heterogeneous activity until the user expands it', async () => {+ const parts: AssistantMessagePart[] = [+ { thinking: 'Check the channel', type: 'thinking' },+ {+ id: 'tool-1',+ json: { channelId: 'channel-1' },+ name: 'ReadChannelMessages',+ type: 'toolCall',+ },+ {+ id: 'tool-1',+ json: { messages: [] },+ name: 'ReadChannelMessages',+ type: 'toolCallResponseJson',+ },+ {+ display_name: 'Search issues',+ id: 'mcp-1',+ json: { query: 'streaming' },+ name: 'search',+ service: 'linear',+ type: 'mcpToolCall',+ },+ { text: 'Done', type: 'text' },+ ];+ const rendered = render(() => (+ <AssistantMessageParts+ parts={parts}+ message={{+ attachments: [],+ content: parts,+ id: 'message-1',+ role: 'assistant',+ }}+ isStreaming={false}+ />+ ));++ const toggle = rendered.getByTestId('activity-toggle');+ expect(toggle.getAttribute('aria-expanded')).toBe('false');+ expect(rendered.getByTestId('activity-content').classList).toContain(+ 'hidden'+ );+ expect(rendered.getByTestId('thinking')).toBeTruthy();+ expect(rendered.getByTestId('tool')).toBeTruthy();+ expect(rendered.getByTestId('mcp-tool')).toBeTruthy();++ fireEvent.click(toggle);++ expect(toggle.getAttribute('aria-expanded')).toBe('true');+ expect(rendered.getByTestId('activity-content').classList).not.toContain(+ 'hidden'+ );+ expect(rendered.getByTestId('thinking').textContent).toBe(+ 'Check the channel'+ );+ expect(rendered.getByTestId('tool').textContent).toBe('tool-1');+ expect(rendered.getByTestId('mcp-tool').textContent).toBe('search');+ expect(rendered.getByTestId('markdown').textContent).toBe('Done');+ });++ it('does not group isolated activity separated by visible answer text', () => {+ const parts: AssistantMessagePart[] = [+ { thinking: 'First thought', type: 'thinking' },+ { text: 'Interim answer', type: 'text' },+ {+ id: 'tool-1',+ json: { query: 'mentions' },+ name: 'Search',+ type: 'toolCall',+ },+ ];+ const rendered = render(() => (+ <AssistantMessageParts+ parts={parts}+ message={{+ attachments: [],+ content: parts,+ id: 'message-1',+ role: 'assistant',+ }}+ isStreaming={false}+ />+ ));++ expect(rendered.queryByTestId('activity-toggle')).toBeNull();+ expect(rendered.getByTestId('thinking').textContent).toBe('First thought');+ expect(rendered.getByTestId('tool').textContent).toBe('tool-1');+ expect(rendered.getByTestId('markdown').textContent).toBe('Interim answer');+ });++ it('previews only the latest activity group while streaming', async () => {+ let append!: (item: ChatStream) => void;+ let disposeStream!: () => void;+ const data = createRoot((dispose) => {+ disposeStream = dispose;+ const [items, setItems] = createSignal<ChatStream[]>([]);+ append = (item) => setItems((prev) => [...prev, item]);+ return items;+ });+ const rendered = render(() => <StreamedAssistantParts data={data} />);++ append(response({ thinking: 'Need some context', type: 'thinking' }));+ await waitFor(() =>+ expect(rendered.queryByTestId('activity-preview')).toBeNull()+ );++ append(+ response({+ id: 'tool-1',+ json: { query: 'mentions' },+ name: 'Search',+ type: 'toolCall',+ })+ );+ await waitFor(() =>+ expect(rendered.getByTestId('activity-preview').textContent).toBe(+ 'Search'+ )+ );++ append(response({ text: 'Interim answer', type: 'text' }));+ await waitFor(() =>+ expect(rendered.queryByTestId('activity-preview')).toBeNull()+ );++ append(+ response({+ display_name: 'Search issues',+ id: 'mcp-1',+ json: { query: 'streaming' },+ name: 'search',+ service: 'linear',+ type: 'mcpToolCall',+ })+ );+ await waitFor(() =>+ expect(rendered.queryByTestId('activity-preview')).toBeNull()+ );++ append(response({ thinking: 'Review the results', type: 'thinking' }));+ await waitFor(() =>+ expect(rendered.getByTestId('activity-preview').textContent).toBe(+ 'Review the results'+ )+ );+ disposeStream();+ });+it('registers resumed markdown as the stream tail after a hidden tool response', async () => {let append!: (item: ChatStream) => void;let disposeStream!: () => void;diff --git a/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.tsx b/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.tsxindex 0270638b46..d6148aa7fd 100644--- a/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.tsx+++ b/apps/web/src/lib/core/component/AI/component/message/AssistantMessageParts.tsx@@ -1,8 +1,8 @@+import { AssistantActivityGroup } from '@core/component/AI/component/message/AssistantActivityGroup';import { ChatMessageMarkdown } from '@core/component/AI/component/message/ChatMessageMarkdown';import { ThinkingBlock } from '@core/component/AI/component/message/ThinkingBlock';import { RenderTool } from '@core/component/AI/component/tool/handler';import { McpToolCall } from '@core/component/AI/component/tool/McpToolCall';-import { Tool } from '@core/component/AI/component/tool/Tool';import { useChatContext } from '@core/component/AI/context';import type { AssistantMessagePart } from '@service-cognition/generated/schemas/assistantMessagePart';import type { ChatMessageWithAttachments } from '@service-cognition/generated/schemas/chatMessageWithAttachments';@@ -34,17 +34,20 @@ function getAssistantPartKey(return `${part.type}:${count}`;}-type ToolGroupEntry = {+type ActivityGroupEntry = {key: string;- part: Extract<AssistantMessagePart, { type: 'toolCall' | 'mcpToolCall' }>;+ part: Extract<+ AssistantMessagePart,+ { type: 'thinking' | 'toolCall' | 'mcpToolCall' }+ >;index: number;};type RenderItem =| {- type: 'toolGroup';+ type: 'activityGroup';key: string;- entries: ToolGroupEntry[];+ entries: ActivityGroupEntry[];}| {type: 'part';@@ -60,9 +63,8 @@ type RenderItem =};/**- * Tools rendered OUTSIDE the standard grouped tool chrome (no `Tool.Group`- * background) — they own their full presentation. The dashboard renders as a- * full-bleed view, not a tool row.+ * Tools rendered outside the standard grouped activity chrome own their full+ * presentation. The dashboard renders as a full-bleed view, not a tool row.*/const STANDALONE_TOOLS: ReadonlySet<string> = new Set(['DisplayResults']);@@ -106,7 +108,9 @@ export function AssistantMessageParts(props: {const parts = createMemo(() => {return props.parts.filter((part) =>- part.type !== 'toolCallResponseJson' && part.type !== 'toolCallErr'+ part.type !== 'toolCallResponseJson' &&+ part.type !== 'toolCallErr' &&+ (part.type !== 'thinking' || part.thinking.trim().length > 0));});const streamingTailTextIndex = createMemo(() => {@@ -124,12 +128,6 @@ export function AssistantMessageParts(props: {}});- const isThinkingDone = createMemo(() => {- if (!props.isStreaming) return true;- const p = parts();- return p.some((part) => part.type !== 'thinking');- });-const keyedParts = createMemo(() => {const counts = new Map<AssistantMessagePart['type'], number>();const partsByKey = new Map<string, AssistantMessagePart>();@@ -147,18 +145,18 @@ export function AssistantMessageParts(props: {const groupedParts = createMemo(() => {const itemByKey = new Map<string, RenderItem>();const orderedKeys: string[] = [];- let pendingToolEntries: ToolGroupEntry[] = [];+ let pendingActivityEntries: ActivityGroupEntry[] = [];- const flushToolGroup = () => {- if (pendingToolEntries.length === 0) return;- const key = `toolGroup:${pendingToolEntries[0].key}`;+ const flushActivityGroup = () => {+ if (pendingActivityEntries.length === 0) return;+ const key = `activityGroup:${pendingActivityEntries[0].key}`;orderedKeys.push(key);itemByKey.set(key, {- type: 'toolGroup',+ type: 'activityGroup',key,- entries: pendingToolEntries,+ entries: pendingActivityEntries,});- pendingToolEntries = [];+ pendingActivityEntries = [];};keyedParts().orderedKeys.forEach((key, index) => {@@ -168,7 +166,7 @@ export function AssistantMessageParts(props: {// Standalone tools (e.g. the dashboard) break out of the tool group and// render full-bleed on their own.if (part.type === 'toolCall' && STANDALONE_TOOLS.has(part.name)) {- flushToolGroup();+ flushActivityGroup();orderedKeys.push(key);itemByKey.set(key, {type: 'standaloneTool',@@ -179,12 +177,16 @@ export function AssistantMessageParts(props: {return;}- if (part.type === 'toolCall' || part.type === 'mcpToolCall') {- pendingToolEntries.push({ key, part, index });+ if (+ part.type === 'thinking' ||+ part.type === 'toolCall' ||+ part.type === 'mcpToolCall'+ ) {+ pendingActivityEntries.push({ key, part, index });return;}- flushToolGroup();+ flushActivityGroup();orderedKeys.push(key);itemByKey.set(key, {type: 'part',@@ -194,7 +196,7 @@ export function AssistantMessageParts(props: {});});- flushToolGroup();+ flushActivityGroup();return { orderedKeys, itemByKey };});@@ -206,15 +208,43 @@ export function AssistantMessageParts(props: {});- function ToolEntry(props: { entry: Accessor<ToolGroupEntry> }) {- const toolPart = () => props.entry().part;+ function ActivityEntry(props: {+ entry: Accessor<ActivityGroupEntry>;+ grouped: Accessor<boolean>;+ }) {+ const activityPart = () => props.entry().part;return (<Switch>- <Match when={toolPart().type === 'toolCall'}>+ <Match when={activityPart().type === 'thinking'}>+ {(() => {+ const thinking = () => {+ const part = activityPart();+ return part.type === 'thinking' ? part.thinking : '';+ };++ return (+ <Show when={thinking().trim().length > 0}>+ <div classList={{ 'px-3': props.grouped() }}>+ <ThinkingBlock+ thinking={thinking()}+ isStreaming={+ outer.isStreaming &&+ props.entry().index === parts().length - 1+ }+ />+ </div>+ </Show>+ );+ })()}+ </Match>+ <Match when={activityPart().type === 'toolCall'}>{(() => {const part = () =>- toolPart() as Extract<AssistantMessagePart, { type: 'toolCall' }>;+ activityPart() as Extract<+ AssistantMessagePart,+ { type: 'toolCall' }+ >;return (<RenderTool@@ -229,17 +259,17 @@ export function AssistantMessageParts(props: {renderContext={{renderContext: {isStreaming: outer.isStreaming,- grouped: true,+ grouped: props.grouped(),},}}/>);})()}</Match>- <Match when={toolPart().type === 'mcpToolCall'}>+ <Match when={activityPart().type === 'mcpToolCall'}>{(() => {const part = () =>- toolPart() as Extract<+ activityPart() as Extract<AssistantMessagePart,{ type: 'mcpToolCall' }>;@@ -253,7 +283,7 @@ export function AssistantMessageParts(props: {renderContext={{renderContext: {isStreaming: outer.isStreaming,- grouped: true,+ grouped: props.grouped(),},}}/>@@ -264,26 +294,52 @@ export function AssistantMessageParts(props: {);}- function ToolGroupView(props: {- item: Accessor<Extract<RenderItem, { type: 'toolGroup' }>>;+ function ActivityGroupView(props: {+ item: Accessor<Extract<RenderItem, { type: 'activityGroup' }>>;}) {const entriesByKey = createMemo(() => {- const map = new Map<string, ToolGroupEntry>();+ const map = new Map<string, ActivityGroupEntry>();for (const entry of props.item().entries) {map.set(entry.key, entry);}return map;});+ const isGrouped = () => props.item().entries.length > 1;const entries = mapArray(() => props.item().entries.map((entry) => entry.key),(key) => {const entry = createMemo(() => entriesByKey().get(key)!);- return <ToolEntry entry={entry} />;+ return <ActivityEntry entry={entry} grouped={isGrouped} />;});- return <Tool.Group>{entries()}</Tool.Group>;+ const isLatestStreamingGroup = createMemo(() => {+ if (!outer.isStreaming) return false;+ return groupedParts().orderedKeys.at(-1) === props.item().key;+ });+ const preview = createMemo(() => {+ if (!isLatestStreamingGroup()) return;+ const part = props.item().entries.at(-1)?.part;+ if (!part) return;+ if (part.type === 'thinking') {+ const normalized = part.thinking.replace(/\s+/g, ' ').trim();+ return normalized.slice(-160);+ }+ if (part.type === 'mcpToolCall') {+ return part.display_name ?? `${part.service} / ${part.name}`;+ }+ return part.name;+ });++ return (+ <AssistantActivityGroup+ itemCount={props.item().entries.length}+ preview={preview()}+ >+ {entries()}+ </AssistantActivityGroup>+ );}/** Renders a standalone tool (e.g. the dashboard) with no group chrome. */@@ -341,22 +397,6 @@ export function AssistantMessageParts(props: {);})()}</Match>- <Match when={part().type === 'thinking'}>- {(() => {- const thinking = () => {- const p = part();- return p.type === 'thinking' ? p.thinking : '';- };- return (- <Show when={thinking().trim().length > 0}>- <ThinkingBlock- thinking={thinking()}- isStreaming={!isThinkingDone()}- />- </Show>- );- })()}- </Match></Switch>);}@@ -366,10 +406,12 @@ export function AssistantMessageParts(props: {return (<Switch>- <Match when={type() === 'toolGroup'}>- <ToolGroupView+ <Match when={type() === 'activityGroup'}>+ <ActivityGroupViewitem={- props.item as Accessor<Extract<RenderItem, { type: 'toolGroup' }>>+ props.item as Accessor<+ Extract<RenderItem, { type: 'activityGroup' }>+ >}/></Match>