@vertesia/ui 1.4.0-dev.20260615.051508Z → 1.4.0-dev.20260629.130134Z

package/src/features/agent/chat/ModernAgentOutput/AllMessagesMixed.test.tsx

@@ -100,6 +100,70 @@ describe('AllMessagesMixed summary view', () => {
         vi.useRealTimers();
     });
 
+    it('renders delivery status on user bubbles in summary view', () => {
+        renderSummary([
+            makeMessage({
+                timestamp: 1_000,
+                type: AgentMessageType.QUESTION,
+                message: 'Find Japan news.',
+                details: {
+                    _deliveryStatus: 'consumed',
+                    ack: 'message-1',
+                },
+            }),
+        ]);
+
+        expect(screen.getByLabelText('Message consumed')).not.toBeNull();
+    });
+
+    it('renders delivery status on user messages in stacked view', () => {
+        renderStacked([
+            makeMessage({
+                timestamp: 1_000,
+                type: AgentMessageType.QUESTION,
+                message: 'Find Japan news.',
+                details: {
+                    _deliveryStatus: 'sending',
+                    _messageId: 'message-1',
+                },
+            }),
+        ]);
+
+        expect(screen.getByLabelText('Sending message')).not.toBeNull();
+    });
+
+    it('renders an acked stop marker as a right-aligned consumed status row', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'Searching',
+                    details: {
+                        tool: 'web_search',
+                        tool_status: 'running',
+                        tool_run_id: 'tool-1',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 77_000,
+                    type: AgentMessageType.IDLE,
+                    message: 'Stopped. Waiting for your command...',
+                    details: {
+                        ack: 'stop-1',
+                        status_reason: 'user_stopped',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.getByTestId('summary-stopped-message')).not.toBeNull();
+        expect(screen.getByText('You stopped after 1m 15s')).not.toBeNull();
+        expect(screen.getByLabelText('Message consumed')).not.toBeNull();
+        expect(screen.queryByText('Stopped. Waiting for your command...')).toBeNull();
+    });
+
     it('renders completed tool activity as a collapsed Worked row that expands to tool details', () => {
         renderSummary(
             [
@@ -138,16 +202,111 @@ describe('AllMessagesMixed summary view', () => {
         fireEvent.click(workedRow);
 
         expect(workedRow.getAttribute('aria-expanded')).toBe('true');
-        expect(screen.getByText('Search')).not.toBeNull();
+        expect(screen.queryByText('Search')).toBeNull();
         expect(screen.getByText('Japan news')).not.toBeNull();
 
-        const toolRow = screen.getByRole('button', { name: /Search\s*Japan news/ });
+        const toolRow = screen.getByRole('button', { name: /Japan news/ });
         expect(toolRow.getAttribute('aria-expanded')).toBe('false');
         fireEvent.click(toolRow);
 
+        expect(screen.getByText('Tool')).not.toBeNull();
+        expect(screen.getByText('web_search_serper')).not.toBeNull();
+        expect(screen.getByText('Time')).not.toBeNull();
         expect(screen.getByText('Found 5 results')).not.toBeNull();
     });
 
+    it('keeps same-iteration tool detail panels matched to their own tool identity', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Launch France and Japan news workstreams.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message:
+                        'Updating the project plan to mark both workstream launches as completed and the monitoring phase as in-progress...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'update_plan',
+                        tool_run_id: 'update_plan',
+                        tool_use_id: 'update_plan',
+                        tool_iteration: 7,
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        activity_group_id: 'activity-7',
+                        message_to_human:
+                            'Updating the project plan to mark both workstream launches as completed and the monitoring phase as in-progress...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 2_500,
+                    message: 'Launching the Japan news headline gathering workstream...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'launch_workstream',
+                        tool_run_id: 'launch_workstream',
+                        tool_use_id: 'launch_workstream',
+                        tool_iteration: 7,
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        activity_group_id: 'activity-7',
+                        message_to_human: 'Launching the Japan news headline gathering workstream...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.UPDATE,
+                    message: 'Updating 3 tasks of our plan.',
+                    details: {
+                        updates: [
+                            { task_id: 1, status: 'completed' },
+                            { task_id: 2, status: 'completed' },
+                            { task_id: 3, status: 'in_progress' },
+                        ],
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_001,
+                    type: AgentMessageType.PLAN,
+                    message:
+                        'Both news workstreams (France and Japan) have been successfully launched. We are now entering the monitoring phase.',
+                    details: {
+                        plan: [
+                            { id: 1, status: 'completed', goal: 'Launch France workstream' },
+                            { id: 2, status: 'completed', goal: 'Launch Japan workstream' },
+                            { id: 3, status: 'in_progress', goal: 'Monitor both workstreams' },
+                        ],
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.ANSWER,
+                    message: 'Done.',
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for\s*2s/ }));
+
+        const updatePlanRow = screen.getByRole('button', { name: /Updating the project plan/ });
+        expect(screen.queryByRole('button', { name: /Updating 3 tasks/ })).toBeNull();
+        expect(screen.queryByRole('button', { name: /Both news workstreams/ })).toBeNull();
+
+        fireEvent.click(updatePlanRow);
+
+        expect(screen.getByText('update_plan')).not.toBeNull();
+        expect(screen.queryByText('launch_workstream')).toBeNull();
+        expect(screen.getByText(/"updates"/)).not.toBeNull();
+
+        const launchWorkstreamRow = screen.getByRole('button', { name: /Launching the Japan news/ });
+        fireEvent.click(launchWorkstreamRow);
+
+        expect(screen.getByText('launch_workstream')).not.toBeNull();
+    });
+
     it('renders active tool activity as an expanded Working row', () => {
         renderSummary([
             makeMessage({
@@ -169,11 +328,11 @@ describe('AllMessagesMixed summary view', () => {
 
         const workingRow = screen.getByRole('button', { name: /Working\s*for\s*1s/ });
         expect(workingRow.getAttribute('aria-expanded')).toBe('true');
-        expect(screen.getByText('Bash')).not.toBeNull();
+        expect(screen.queryByText('Bash')).toBeNull();
         expect(screen.getByText('Running build')).not.toBeNull();
         expect(screen.queryByText('$ pnpm run build')).toBeNull();
 
-        const toolRow = screen.getByRole('button', { name: /Bash\s*Running build/ });
+        const toolRow = screen.getByRole('button', { name: /Running build/ });
         fireEvent.click(toolRow);
 
         expect(screen.queryByText('Shell')).toBeNull();
@@ -181,6 +340,164 @@ describe('AllMessagesMixed summary view', () => {
         expect(screen.queryByText('Running')).toBeNull();
     });
 
+    it('keeps a pending tool approval prompt inside the active work row', () => {
+        const onSendMessage = vi.fn();
+
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: Date.now() - 4_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Create a news report.',
+                }),
+                makeMessage({
+                    timestamp: Date.now() - 3_000,
+                    message: 'Creating document from artifact...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'create_document',
+                        tool_run_id: 'create_document',
+                        tool_use_id: 'create_document',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        activity_group_id: 'activity-approval',
+                        message_to_human: 'Creating document from artifact...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: Date.now() - 1_000,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Create Document: name News Headlines Today?',
+                    details: {
+                        tool_approval: {
+                            approval_key: 'create_document:name:News Headlines Today',
+                            tool_name: 'create_document',
+                            tool_title: 'Create Document',
+                            target: 'name:News Headlines Today',
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                        },
+                    },
+                }),
+            ],
+            false,
+            new Map(),
+            { onSendMessage },
+        );
+
+        expect(screen.queryByRole('button', { name: /Worked\s*for/ })).toBeNull();
+        const workingRow = screen.getByRole('button', { name: /Working\s*for/ });
+        expect(workingRow.getAttribute('aria-expanded')).toBe('true');
+        expect(screen.getByText('Creating document from artifact...')).not.toBeNull();
+        expect(screen.getByText('Approve Create Document: News Headlines Today?')).not.toBeNull();
+        expect(screen.queryByText('Approve Create Document: name News Headlines Today?')).toBeNull();
+
+        fireEvent.click(screen.getByRole('button', { name: /Allow once/ }));
+
+        expect(onSendMessage).toHaveBeenCalledWith('allow_once');
+    });
+
+    it('keeps an approved tool approval continuation in the same active work row', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Create a news report.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: 'Creating the permanent news report document in the project repository...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'create_document',
+                        tool_run_id: 'create_document',
+                        tool_use_id: 'create_document',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        activity_group_id: 'activity-approval',
+                        message_to_human: 'Creating the permanent news report document in the project repository...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Create Document: Japan Daily News Report - June 22, 2026?',
+                    details: {
+                        tool_approval: {
+                            approval_key: 'create_document:name:Japan Daily News Report - June 22, 2026',
+                            tool_name: 'create_document',
+                            tool_title: 'Create Document',
+                            target: 'name:Japan Daily News Report - June 22, 2026',
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'allow_for_run',
+                }),
+            ],
+            false,
+        );
+
+        expect(screen.queryByRole('button', { name: /Worked\s*for/ })).toBeNull();
+        expect(screen.getAllByRole('button', { name: /Working\s*for/ })).toHaveLength(1);
+        expect(
+            screen.getByText('Creating the permanent news report document in the project repository...'),
+        ).not.toBeNull();
+        expect(screen.queryByText('Approve Create Document: Japan Daily News Report - June 22, 2026?')).toBeNull();
+        expect(screen.queryByText('allow_for_run')).toBeNull();
+    });
+
+    it('expands tool rows that only have metadata', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Warm the cache.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: 'Loading cache',
+                    details: {
+                        tool: 'cache_loader',
+                        tool_status: 'completed',
+                        tool_run_id: 'tool-cache',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        const toolRow = screen.getByRole('button', { name: /Loading cache/ });
+        expect(toolRow.getAttribute('aria-expanded')).toBe('false');
+        expect(screen.queryByText('cache_loader')).toBeNull();
+
+        fireEvent.click(toolRow);
+
+        expect(toolRow.getAttribute('aria-expanded')).toBe('true');
+        expect(screen.getByText('Tool')).not.toBeNull();
+        expect(screen.getByText('cache_loader')).not.toBeNull();
+        expect(screen.getByText('Time')).not.toBeNull();
+        expect(screen.queryByRole('button', { name: 'Copy tool details' })).toBeNull();
+    });
+
     it('renders workstream launch events as inline workstream rows', () => {
         renderSummary(
             [
@@ -205,6 +522,17 @@ describe('AllMessagesMixed summary view', () => {
                         child_workflow_run_id: 'run-qa-tasks',
                     },
                 }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.ANSWER,
+                    message: 'Main agent response.',
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.ANSWER,
+                    message: 'Workstream-only result.',
+                    workstream_id: 'qa_tasks',
+                }),
             ],
             true,
         );
@@ -212,87 +540,188 @@ describe('AllMessagesMixed summary view', () => {
         expect(screen.getByText('Workstreams')).not.toBeNull();
         expect(screen.getByText('QA Tasks')).not.toBeNull();
         expect(screen.getByText('Browser Agent')).not.toBeNull();
+        expect(screen.queryByText('Workstream-only result.')).toBeNull();
+
+        fireEvent.click(screen.getByRole('button', { name: /QA Tasks/ }));
+
+        expect(screen.getByRole('button', { name: 'Back to main agent' })).not.toBeNull();
+        expect(screen.getByText('Workstream-only result.')).not.toBeNull();
+        expect(screen.queryByText('Main agent response.')).toBeNull();
+        expect(screen.queryByText('Workstreams')).toBeNull();
+
+        fireEvent.click(screen.getByRole('button', { name: 'Back to main agent' }));
+
+        expect(screen.getByText('Main agent response.')).not.toBeNull();
     });
 
-    it('suppresses JSON-only child workstream results in summary view', () => {
+    it('renders first child workflow activity as a workstream row when the launch event is missing', () => {
         renderSummary(
             [
                 makeMessage({
                     timestamp: 1_000,
                     type: AgentMessageType.QUESTION,
-                    message: 'Generate a picture.',
+                    message: 'Check the app.',
                 }),
                 makeMessage({
                     timestamp: 2_000,
-                    type: AgentMessageType.THOUGHT,
-                    message: 'I am generating the image with a specialist agent.',
-                    details: {
-                        streamed: true,
-                    },
-                }),
-                makeMessage({
-                    timestamp: 3_000,
                     type: AgentMessageType.UPDATE,
-                    message: 'Workstream "ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6" launched',
-                    workstream_id: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
+                    message: 'Browser agent started.',
+                    workstream_id: 'legacy_browser',
                     details: {
                         event_class: 'activity',
-                        workstream_event: 'launched',
-                        launch_id: 'launch-1',
-                        workstream_id: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
-                        kind: 'agent',
-                        interaction: 'ImageGeneratorAgent',
+                        workstream_id: 'legacy_browser',
+                        interaction: 'sys:BrowserAgent',
+                        child_workflow_id: 'workstream:legacy_browser',
+                        child_workflow_run_id: 'run-legacy-browser',
                     },
                 }),
                 makeMessage({
-                    timestamp: 4_000,
+                    timestamp: 3_000,
                     type: AgentMessageType.ANSWER,
-                    message: '{"generated_images":["store:object-1"]}',
-                    workstream_id: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
-                    details: {
-                        event_class: 'user_content',
-                        streamed: true,
-                    },
+                    message: 'Main agent response.',
                 }),
                 makeMessage({
-                    timestamp: 5_000,
+                    timestamp: 4_000,
                     type: AgentMessageType.ANSWER,
-                    message: 'I saved the generated image as a content object.',
-                    workstream_id: 'main',
+                    message: 'Legacy workstream-only result.',
+                    workstream_id: 'legacy_browser',
                 }),
             ],
             true,
-            new Map([
-                [
-                    'stream-json',
-                    {
-                        text: '{"generated_images":["store:object-2"]}',
-                        workstreamId: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
-                        isComplete: true,
-                        startTimestamp: 4_500,
-                    },
-                ],
-            ]),
         );
 
-        expect(screen.getByText('Generate a picture.')).not.toBeNull();
-        expect(screen.getByText('Image Generator Agent')).not.toBeNull();
-        expect(screen.getByText('I saved the generated image as a content object.')).not.toBeNull();
-        expect(screen.queryByText(/generated_images/)).toBeNull();
-        expect(screen.queryByText(/store:object/)).toBeNull();
+        expect(screen.getByText('Workstreams')).not.toBeNull();
+        expect(screen.getByText('Legacy Browser')).not.toBeNull();
+        expect(screen.getByText('Browser Agent')).not.toBeNull();
+        expect(screen.queryByText('Legacy workstream-only result.')).toBeNull();
+
+        fireEvent.click(screen.getByRole('button', { name: /Legacy Browser/ }));
+
+        expect(screen.getByRole('button', { name: 'Back to main agent' })).not.toBeNull();
+        expect(screen.getByText('Legacy workstream-only result.')).not.toBeNull();
+        expect(screen.queryByText('Main agent response.')).toBeNull();
+        expect(screen.queryByText('Workstreams')).toBeNull();
     });
 
-    it('renders question attachment markdown as a store object link in summary view', () => {
+    it('does not render a failed pre-launch workstream activity as a clickable workstream row', () => {
         renderSummary(
             [
                 makeMessage({
                     timestamp: 1_000,
                     type: AgentMessageType.QUESTION,
-                    message: [
-                        'what is in this image?',
-                        '',
-                        'Attachments:',
-                        '[tokyo-tower_1 (1).jpg](/store/objects/6a17fc9544c9629943624589)',
+                    message: 'Create a bookmark.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.UPDATE,
+                    message: 'Provisioning browser sandbox for "Create Bookmark"...',
+                    workstream_id: 'create_bookmark',
+                    details: {
+                        event_class: 'activity',
+                        workstream_id: 'create_bookmark',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.ERROR,
+                    message: 'Failed to provision browser sandbox: Request failed with status code 502',
+                    workstream_id: 'create_bookmark',
+                    details: {
+                        event_class: 'activity',
+                        workstream_id: 'create_bookmark',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.queryByText('Workstreams')).toBeNull();
+        expect(screen.queryByText('Create Bookmark')).toBeNull();
+        expect(screen.queryByText('Error')).toBeNull();
+        expect(screen.queryByRole('button', { name: /Work needs attention/ })).toBeNull();
+        expect(screen.getByRole('button', { name: /Working/ })).not.toBeNull();
+        expect(screen.getByText(/Failed to provision browser sandbox/)).not.toBeNull();
+    });
+
+    it('suppresses JSON-only child workstream results in summary view', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Generate a picture.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'I am generating the image with a specialist agent.',
+                    details: {
+                        streamed: true,
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.UPDATE,
+                    message: 'Workstream "ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6" launched',
+                    workstream_id: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
+                    details: {
+                        event_class: 'activity',
+                        workstream_event: 'launched',
+                        launch_id: 'launch-1',
+                        workstream_id: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
+                        kind: 'agent',
+                        interaction: 'ImageGeneratorAgent',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.ANSWER,
+                    message: '{"generated_images":["store:object-1"]}',
+                    workstream_id: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
+                    details: {
+                        event_class: 'user_content',
+                        streamed: true,
+                    },
+                }),
+                makeMessage({
+                    timestamp: 5_000,
+                    type: AgentMessageType.ANSWER,
+                    message: 'I saved the generated image as a content object.',
+                    workstream_id: 'main',
+                }),
+            ],
+            true,
+            new Map([
+                [
+                    'stream-json',
+                    {
+                        text: '{"generated_images":["store:object-2"]}',
+                        workstreamId: 'ImageGeneratorAgent-16b7f73a-8e8e-40b7-b891-cb47a78c38c6',
+                        isComplete: true,
+                        startTimestamp: 4_500,
+                    },
+                ],
+            ]),
+        );
+
+        expect(screen.getByText('Generate a picture.')).not.toBeNull();
+        expect(screen.getByText('Image Generator Agent')).not.toBeNull();
+        expect(screen.getByText('I saved the generated image as a content object.')).not.toBeNull();
+        expect(screen.queryByText(/generated_images/)).toBeNull();
+        expect(screen.queryByText(/store:object/)).toBeNull();
+    });
+
+    it('renders question attachment markdown as a store object link in summary view', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: [
+                        'what is in this image?',
+                        '',
+                        'Attachments:',
+                        '[tokyo-tower_1 (1).jpg](/store/objects/6a17fc9544c9629943624589)',
                     ].join('\n'),
                 }),
             ],
@@ -429,16 +858,82 @@ describe('AllMessagesMixed summary view', () => {
         const workedRow = screen.getByRole('button', { name: /Worked\s*for\s*1s/ });
         fireEvent.click(workedRow);
 
-        expect(screen.getByRole('button', { name: /Bash\s*Running production build preflight/ })).not.toBeNull();
+        expect(screen.getByRole('button', { name: /Running production build preflight/ })).not.toBeNull();
         expect(screen.queryByRole('button', { name: /\$ cd \/home\/daytona\/src/ })).toBeNull();
 
-        fireEvent.click(screen.getByRole('button', { name: /Bash\s*Running production build preflight/ }));
+        fireEvent.click(screen.getByRole('button', { name: /Running production build preflight/ }));
 
         expect(screen.getByText('$ cd /home/daytona/src && pnpm run build completed successfully')).not.toBeNull();
         expect(screen.getByText('Build output')).not.toBeNull();
         expect(screen.queryByText('Success')).toBeNull();
     });
 
+    it('merges legacy plan update rows with the preceding update_plan tool row', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'What are the news headlines in France today?',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: "Updating the plan and performing a Google web search for today's headlines in France.",
+                    details: {
+                        event_class: 'activity',
+                        tool: 'update_plan',
+                        tool_run_id: 'update_plan',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        activity_group_id: 'activity-4',
+                        message_to_human:
+                            "Updating the plan and performing a Google web search for today's headlines in France.",
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.UPDATE,
+                    message: 'Updating 2 tasks of our plan.',
+                    details: {
+                        updates: [
+                            { task_id: 1, status: 'completed' },
+                            { task_id: 2, status: 'in_progress' },
+                        ],
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.PLAN,
+                    message:
+                        'Task 1 (Learn the web search skill) has been completed successfully. Now commencing Task 2.',
+                    details: {
+                        plan: [
+                            { id: 1, goal: 'Learn the web search skill', status: 'completed' },
+                            { id: 2, goal: "Search for today's headlines in France", status: 'in_progress' },
+                        ],
+                    },
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        const planRow = screen.getByRole('button', {
+            name: /Updating the plan and performing a Google web search/,
+        });
+        expect(planRow).not.toBeNull();
+        expect(screen.queryByRole('button', { name: /Updating 2 tasks of our plan/ })).toBeNull();
+        expect(screen.queryByRole('button', { name: /Task 1 \(Learn the web search skill\)/ })).toBeNull();
+
+        fireEvent.click(planRow);
+
+        expect(screen.getByText('update_plan')).not.toBeNull();
+        expect(screen.getByText('Started')).not.toBeNull();
+        expect(screen.getByText('Ended')).not.toBeNull();
+        expect(screen.getByText('Duration')).not.toBeNull();
+    });
+
     it('copies expanded tool details without requiring the parent row click target', () => {
         const writeText = vi.fn().mockResolvedValue(undefined);
         Object.defineProperty(navigator, 'clipboard', {
@@ -454,105 +949,610 @@ describe('AllMessagesMixed summary view', () => {
                     message: 'Find Japan news.',
                 }),
                 makeMessage({
-                    timestamp: 2_000,
-                    message: 'Searching for Japan news',
+                    timestamp: 2_000,
+                    message: 'Searching for Japan news',
+                    details: {
+                        tool: 'web_search_serper',
+                        tool_status: 'completed',
+                        tool_run_id: 'tool-1',
+                        query: 'Japan news',
+                        output: 'Found 5 results',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+        fireEvent.click(screen.getByRole('button', { name: /Japan news/ }));
+        fireEvent.click(screen.getByRole('button', { name: 'Copy tool details' }));
+
+        expect(writeText).toHaveBeenCalledWith(expect.stringContaining('Tool: web_search_serper'));
+        expect(writeText).toHaveBeenCalledWith(expect.stringContaining('Found 5 results'));
+    });
+
+    it('does not expand tool error details by default', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Publish the app.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: 'Publishing app...',
+                    details: {
+                        activity_group_id: 'activity-10',
+                        tool: 'app_publish',
+                        tool_run_id: 'publish-wrapper',
+                        tool_status: 'running',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.ERROR,
+                    message: 'App publish blocked until preview validation passes',
+                    details: {
+                        activity_group_id: 'activity-10',
+                        tool: 'app_publish',
+                        tool_run_id: 'publish-progress',
+                        tool_status: 'error',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.queryByRole('button', { name: /Work needs attention/ })).toBeNull();
+        const workRow = screen.getByRole('button', { name: /Worked\s*for\s*1s/ });
+        fireEvent.click(workRow);
+
+        const toolRow = screen.getByRole('button', { name: /Publishing app/ });
+        expect(toolRow.getAttribute('aria-expanded')).toBe('false');
+        expect(screen.queryByText('App publish blocked until preview validation passes')).toBeNull();
+
+        fireEvent.click(toolRow);
+
+        expect(screen.getByText('App publish blocked until preview validation passes')).not.toBeNull();
+    });
+
+    it('marks denied tool approvals as error rows with expandable approval details', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Create a document.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: 'Writing the document to a temporary markdown file...',
+                    details: {
+                        event_class: 'activity',
+                        activity_group_id: 'activity-approval-1',
+                        tool: 'write_artifact',
+                        tool_run_id: 'write-1',
+                        tool_use_id: 'write-1',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        message_to_human: 'Writing the document to a temporary markdown file...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    message: 'User declined to use Write Artifact.',
+                    details: {
+                        event_class: 'activity',
+                        activity_group_id: 'activity-approval-1',
+                        tool: 'write_artifact',
+                        tool_run_id: 'write-1',
+                        tool_use_id: 'write-1',
+                        tool_status: 'error',
+                        tool_event: 'failed',
+                        approval_decision: 'denied',
+                        approval_request: {
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:quotes.md',
+                            approval_key: 'write_artifact:name:quotes.md',
+                        },
+                        input: {
+                            name: 'quotes.md',
+                            type: 'file',
+                        },
+                        observation: 'The user declined this tool action.',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.queryByRole('button', { name: /Work needs attention\s*for/ })).toBeNull();
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        expect(screen.queryByRole('button', { name: /User declined to use Write Artifact/ })).toBeNull();
+        const deniedRow = screen.getByRole('button', { name: /Writing the document.*Declined by user/ });
+        expect(deniedRow.getAttribute('aria-expanded')).toBe('false');
+
+        fireEvent.click(deniedRow);
+
+        expect(screen.queryByText('Decision')).toBeNull();
+        expect(screen.queryByText('denied')).toBeNull();
+        expect(screen.queryByText('Approval request')).toBeNull();
+        expect(screen.getAllByText(/quotes\.md/).length).toBeGreaterThan(0);
+        const deniedMessage = screen.getByText('The user declined this tool action.');
+        expect(deniedMessage.className).toContain('text-destructive');
+    });
+
+    it('does not split a denied approval into separate worked and attention rows', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Create a document.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: 'Writing the document to a temporary markdown file...',
+                    details: {
+                        event_class: 'activity',
+                        activity_group_id: 'activity-approval-2',
+                        tool: 'write_artifact',
+                        tool_run_id: 'write-2',
+                        tool_use_id: 'write-2',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        message_to_human: 'Writing the document to a temporary markdown file...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Write Artifact: quotes.md?',
+                    details: {
+                        tool_approval: {
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            action_summary: 'Write Artifact: quotes.md',
+                            target: 'name:quotes.md',
+                            approval_key: 'write_artifact:name:quotes.md',
+                            input: {
+                                name: 'quotes.md',
+                                type: 'file',
+                            },
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'deny',
+                }),
+                makeMessage({
+                    timestamp: 5_000,
+                    message: 'User declined to use Write Artifact.',
+                    details: {
+                        event_class: 'activity',
+                        activity_group_id: 'activity-approval-2',
+                        tool: 'write_artifact',
+                        tool_run_id: 'write-2',
+                        tool_use_id: 'write-2',
+                        tool_status: 'error',
+                        tool_event: 'failed',
+                        approval_decision: 'denied',
+                        approval_request: {
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:quotes.md',
+                            approval_key: 'write_artifact:name:quotes.md',
+                        },
+                        input: {
+                            name: 'quotes.md',
+                            type: 'file',
+                        },
+                        observation: 'The user declined this tool action.',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.queryByText('Approve Write Artifact: quotes.md?')).toBeNull();
+        expect(screen.queryByText('deny')).toBeNull();
+        expect(screen.queryByRole('button', { name: /Work needs attention\s*for/ })).toBeNull();
+
+        const workRows = screen.getAllByRole('button', { name: /Worked\s*for/ });
+        expect(workRows).toHaveLength(1);
+        fireEvent.click(workRows[0]);
+
+        expect(screen.queryByRole('button', { name: /User declined to use Write Artifact/ })).toBeNull();
+        expect(screen.getByRole('button', { name: /Writing the document.*Declined by user/ })).not.toBeNull();
+    });
+
+    it('renders a compact denied tool row for legacy approvals without lifecycle events', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Create a document.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    message: 'Writing the document to a temporary markdown file...',
+                    details: {
+                        event_class: 'activity',
+                        activity_group_id: 'activity-legacy-approval',
+                        tool: 'write_artifact',
+                        tool_run_id: 'write-legacy-1',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Write Artifact: quotes.md?',
+                    details: {
+                        tool_approval: {
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            action_summary: 'Write Artifact: quotes.md',
+                            target: 'name:quotes.md',
+                            approval_key: 'write_artifact:name:quotes.md',
+                            input: {
+                                name: 'quotes.md',
+                                type: 'file',
+                            },
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'deny',
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.queryByText('Approve Write Artifact: quotes.md?')).toBeNull();
+        expect(screen.queryByText('deny')).toBeNull();
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+        const deniedRow = screen.getByRole('button', { name: /Write Artifact.*Declined by user/ });
+        fireEvent.click(deniedRow);
+
+        expect(screen.queryByText('Decision')).toBeNull();
+        expect(screen.queryByText('denied')).toBeNull();
+        expect(screen.queryByText('Approval request')).toBeNull();
+        expect(screen.getAllByText(/quotes\.md/).length).toBeGreaterThan(0);
+    });
+
+    it('renders pending ask options compactly in summary view', () => {
+        renderSummary([
+            makeMessage({
+                timestamp: 1_000,
+                type: AgentMessageType.REQUEST_INPUT,
+                message: 'What is your favorite color?',
+                details: {
+                    ux: {
+                        options: [
+                            { id: 'red', label: 'Red', description: 'The color of fire and passion' },
+                            { id: 'blue', label: 'Blue', description: 'The color of the sky and ocean' },
+                        ],
+                    },
+                },
+            }),
+        ]);
+
+        expect(screen.getByText('What is your favorite color?')).not.toBeNull();
+        expect(screen.getByRole('button', { name: /Blue\s*The color of the sky and ocean/ })).not.toBeNull();
+    });
+
+    it('renders legacy field-prefixed tool approval prompts with a friendly target in summary view', () => {
+        renderSummary([
+            makeMessage({
+                timestamp: 1_000,
+                type: AgentMessageType.REQUEST_INPUT,
+                message: 'Approve Create Document: name News Headlines Today?',
+                details: {
+                    tool_approval: {
+                        approval_key: 'create_document:name:News Headlines Today',
+                        tool_name: 'create_document',
+                        tool_title: 'Create Document',
+                        target: 'name:News Headlines Today',
+                    },
+                    ux: {
+                        options: [
+                            { id: 'allow_once', label: 'Allow once' },
+                            { id: 'allow_for_run', label: 'Allow this action for this run' },
+                            { id: 'deny', label: 'Deny' },
+                        ],
+                    },
+                },
+            }),
+        ]);
+
+        expect(screen.getByText('Approve Create Document: News Headlines Today?')).not.toBeNull();
+        expect(screen.queryByText('Approve Create Document: name News Headlines Today?')).toBeNull();
+    });
+
+    it('keeps only the ask question after the user answers in summary view', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'What is your favorite color?',
+                    details: {
+                        ux: {
+                            options: [
+                                { id: 'red', label: 'Red', description: 'The color of fire and passion' },
+                                { id: 'blue', label: 'Blue', description: 'The color of the sky and ocean' },
+                            ],
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'blue',
+                }),
+            ],
+            true,
+        );
+
+        expect(screen.getByText('What is your favorite color?')).not.toBeNull();
+        expect(screen.getByText('blue')).not.toBeNull();
+        expect(screen.queryByText('The color of the sky and ocean')).toBeNull();
+        expect(screen.queryByRole('button', { name: /Blue/ })).toBeNull();
+    });
+
+    it('hides denied tool approval prompts when the stream contains a denied tool event', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Write Artifact for japan_news_2026_06_21.md?',
+                    details: {
+                        tool_approval: {
+                            approval_key: 'write_artifact:name:japan_news_2026_06_21.md',
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:japan_news_2026_06_21.md',
+                            input: {
+                                name: 'japan_news_2026_06_21.md',
+                                content_ref: {
+                                    display_ref: 'artifact:tool-inputs/write_artifact/write_artifact.txt',
+                                },
+                            },
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'deny',
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'User declined to use Write Artifact.',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'write_artifact',
+                        tool_run_id: 'tool-run-1',
+                        tool_use_id: 'tool-use-1',
+                        tool_status: 'error',
+                        tool_event: 'failed',
+                        activity_group_id: 'activity-1',
+                        observation: 'User declined to use Write Artifact.',
+                        approval_decision: 'denied',
+                        approval_request: {
+                            approval_key: 'write_artifact:name:japan_news_2026_06_21.md',
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:japan_news_2026_06_21.md',
+                        },
+                        input: {
+                            name: 'japan_news_2026_06_21.md',
+                            content_ref: {
+                                display_ref: 'artifact:tool-inputs/write_artifact/write_artifact.txt',
+                            },
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_500,
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Create Document: Japan News Headlines?',
+                    details: {
+                        tool_approval: {
+                            approval_key: 'create_document:name:Japan News Headlines',
+                            tool_name: 'create_document',
+                            tool_title: 'Create Document',
+                            target: 'name:Japan News Headlines',
+                            input: {
+                                name: 'Japan News Headlines',
+                                source: 'artifact:files/japan_news_2026_06_21.md',
+                            },
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                        },
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'Cancelled Create Document after denial.',
                     details: {
-                        tool: 'web_search_serper',
-                        tool_status: 'completed',
-                        tool_run_id: 'tool-1',
-                        query: 'Japan news',
-                        output: 'Found 5 results',
+                        event_class: 'activity',
+                        tool: 'create_document',
+                        tool_run_id: 'tool-run-2',
+                        tool_use_id: 'tool-use-2',
+                        tool_status: 'error',
+                        tool_event: 'failed',
+                        activity_group_id: 'activity-1',
+                        observation: 'Tool execution was cancelled because another tool action was denied.',
+                        approval_decision: 'cancelled_after_denial',
+                        approval_request: {
+                            approval_key: 'create_document:name:Japan News Headlines',
+                            tool_name: 'create_document',
+                            tool_title: 'Create Document',
+                            target: 'name:Japan News Headlines',
+                        },
+                        input: {
+                            name: 'Japan News Headlines',
+                            source: 'artifact:files/japan_news_2026_06_21.md',
+                        },
                     },
                 }),
             ],
             true,
         );
 
-        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
-        fireEvent.click(screen.getByRole('button', { name: /Search\s*Japan news/ }));
-        fireEvent.click(screen.getByRole('button', { name: 'Copy tool details' }));
+        expect(screen.queryByText('Approve Write Artifact for japan_news_2026_06_21.md?')).toBeNull();
+        expect(screen.queryByText('Approve Create Document: Japan News Headlines?')).toBeNull();
+        expect(screen.queryByText('deny')).toBeNull();
 
-        expect(writeText).toHaveBeenCalledWith(expect.stringContaining('Found 5 results'));
+        expect(screen.queryByRole('button', { name: /Work needs attention/ })).toBeNull();
+        fireEvent.click(screen.getByRole('button', { name: /Worked/ }));
+        fireEvent.click(screen.getByRole('button', { name: /Write Artifact/ }));
+
+        expect(screen.getByText('Declined by user')).not.toBeNull();
+        expect(screen.getAllByText(/japan_news_2026_06_21\.md/).length).toBeGreaterThan(0);
+        expect(screen.getByText('Cancelled after denial')).not.toBeNull();
+        fireEvent.click(screen.getByRole('button', { name: /Create Document.*Cancelled after denial/ }));
+        expect(screen.getAllByText(/Japan News Headlines/).length).toBeGreaterThan(0);
     });
 
-    it('does not expand tool error details by default', () => {
+    it('hides a commented approval denial prompt while keeping the user comment visible', () => {
         renderSummary(
             [
                 makeMessage({
                     timestamp: 1_000,
-                    type: AgentMessageType.QUESTION,
-                    message: 'Publish the app.',
+                    type: AgentMessageType.REQUEST_INPUT,
+                    message: 'Approve Write Artifact: quotes.md?',
+                    details: {
+                        tool_approval: {
+                            approval_key: 'write_artifact:name:quotes.md',
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:quotes.md',
+                            input: {
+                                name: 'quotes.md',
+                                type: 'file',
+                            },
+                        },
+                        ux: {
+                            options: [
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
+                            ],
+                            free_response: {
+                                placeholder: 'No, and tell the agent what to do differently',
+                                submit_label: 'Submit',
+                                metadata: {
+                                    tool_approval_response: {
+                                        decision: 'deny_with_feedback',
+                                        approval_key: 'write_artifact:name:quotes.md',
+                                    },
+                                },
+                            },
+                        },
+                    },
                 }),
                 makeMessage({
                     timestamp: 2_000,
-                    message: 'Publishing app...',
-                    details: {
-                        activity_group_id: 'activity-10',
-                        tool: 'app_publish',
-                        tool_run_id: 'publish-wrapper',
-                        tool_status: 'running',
-                    },
+                    type: AgentMessageType.QUESTION,
+                    message: 'Do not write a file. Put the summary in chat.',
                 }),
                 makeMessage({
                     timestamp: 3_000,
-                    type: AgentMessageType.ERROR,
-                    message: 'App publish blocked until preview validation passes',
+                    type: AgentMessageType.THOUGHT,
+                    message: 'User declined to use Write Artifact.',
                     details: {
-                        activity_group_id: 'activity-10',
-                        tool: 'app_publish',
-                        tool_run_id: 'publish-progress',
+                        event_class: 'activity',
+                        tool: 'write_artifact',
+                        tool_run_id: 'tool-run-1',
+                        tool_use_id: 'tool-use-1',
                         tool_status: 'error',
+                        tool_event: 'failed',
+                        activity_group_id: 'activity-1',
+                        observation: 'User declined to use Write Artifact and provided new instructions.',
+                        approval_decision: 'denied_with_feedback',
+                        approval_request: {
+                            approval_key: 'write_artifact:name:quotes.md',
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:quotes.md',
+                        },
+                        input: {
+                            name: 'quotes.md',
+                            type: 'file',
+                        },
                     },
                 }),
             ],
             true,
         );
 
-        const workRow = screen.getByRole('button', { name: /Work needs attention\s*for\s*1s/ });
-        fireEvent.click(workRow);
-
-        const toolRow = screen.getByRole('button', { name: /Tool\s*Publishing app/ });
-        expect(toolRow.getAttribute('aria-expanded')).toBe('false');
-        expect(screen.queryByText('App publish blocked until preview validation passes')).toBeNull();
-
-        fireEvent.click(toolRow);
-
-        expect(screen.getByText('App publish blocked until preview validation passes')).not.toBeNull();
-    });
-
-    it('renders pending ask options compactly in summary view', () => {
-        renderSummary([
-            makeMessage({
-                timestamp: 1_000,
-                type: AgentMessageType.REQUEST_INPUT,
-                message: 'What is your favorite color?',
-                details: {
-                    ux: {
-                        options: [
-                            { id: 'red', label: 'Red', description: 'The color of fire and passion' },
-                            { id: 'blue', label: 'Blue', description: 'The color of the sky and ocean' },
-                        ],
-                    },
-                },
-            }),
-        ]);
-
-        expect(screen.getByText('What is your favorite color?')).not.toBeNull();
-        expect(screen.getByRole('button', { name: /Blue\s*The color of the sky and ocean/ })).not.toBeNull();
+        expect(screen.queryByText('Approve Write Artifact: quotes.md?')).toBeNull();
+        expect(screen.getByText('Do not write a file. Put the summary in chat.')).not.toBeNull();
+        fireEvent.click(screen.getByRole('button', { name: /Worked/ }));
+        expect(screen.getByRole('button', { name: /Write Artifact.*Declined by user/ })).not.toBeNull();
     });
 
-    it('keeps only the ask question after the user answers in summary view', () => {
+    it('hides a commented approval denial prompt immediately from response metadata', () => {
         renderSummary(
             [
                 makeMessage({
                     timestamp: 1_000,
                     type: AgentMessageType.REQUEST_INPUT,
-                    message: 'What is your favorite color?',
+                    message: 'Approve Write Artifact: quotes.md?',
                     details: {
+                        tool_approval: {
+                            approval_key: 'write_artifact:name:quotes.md',
+                            tool_name: 'write_artifact',
+                            tool_title: 'Write Artifact',
+                            target: 'name:quotes.md',
+                        },
                         ux: {
                             options: [
-                                { id: 'red', label: 'Red', description: 'The color of fire and passion' },
-                                { id: 'blue', label: 'Blue', description: 'The color of the sky and ocean' },
+                                { id: 'allow_once', label: 'Allow once' },
+                                { id: 'allow_for_run', label: 'Allow this action for this run' },
+                                { id: 'deny', label: 'Deny' },
                             ],
                         },
                     },
@@ -560,16 +1560,20 @@ describe('AllMessagesMixed summary view', () => {
                 makeMessage({
                     timestamp: 2_000,
                     type: AgentMessageType.QUESTION,
-                    message: 'blue',
+                    message: 'Do not write a file. Put the summary in chat.',
+                    details: {
+                        tool_approval_response: {
+                            decision: 'deny_with_feedback',
+                            approval_key: 'write_artifact:name:quotes.md',
+                        },
+                    },
                 }),
             ],
-            true,
+            false,
         );
 
-        expect(screen.getByText('What is your favorite color?')).not.toBeNull();
-        expect(screen.getByText('blue')).not.toBeNull();
-        expect(screen.queryByText('The color of the sky and ocean')).toBeNull();
-        expect(screen.queryByRole('button', { name: /Blue/ })).toBeNull();
+        expect(screen.queryByText('Approve Write Artifact: quotes.md?')).toBeNull();
+        expect(screen.getByText('Do not write a file. Put the summary in chat.')).not.toBeNull();
     });
 
     it('does not duplicate the initial request once the persisted user prompt is present', () => {
@@ -625,7 +1629,7 @@ describe('AllMessagesMixed summary view', () => {
         expect(screen.queryByRole('button', { name: /Blue/ })).toBeNull();
     });
 
-    it('renders thought prose between tool rows inside expanded work details', () => {
+    it('renders thought prose as a collapsed subsection inside expanded work details', () => {
         renderSummary(
             [
                 makeMessage({
@@ -670,7 +1674,7 @@ describe('AllMessagesMixed summary view', () => {
         const workedRow = screen.getByRole('button', { name: /Worked\s*for\s*3s/ });
         fireEvent.click(workedRow);
 
-        expect(screen.queryByText('Thought')).toBeNull();
+        expect(screen.queryByRole('button', { name: /Thought: The form source is better than the UI/ })).toBeNull();
         expect(
             screen.getByText('The form source is better than the UI, so I will inspect the serialization path.'),
         ).not.toBeNull();
@@ -678,7 +1682,74 @@ describe('AllMessagesMixed summary view', () => {
         expect(screen.getByText('allowed_scopes')).not.toBeNull();
     });
 
-    it('renders legacy think tool rows as thought prose in expanded summary work details', () => {
+    it('collapses very long thought prose inside expanded work details', () => {
+        const longThought = [
+            'Thinking through the best approach for this complex multi-repo release note generation problem...',
+            '',
+            'Grant is asking me to help design a prompt strategy for release notes from GitHub repos.',
+            'This is a meta-task, so I need to help him think through the best approach and craft effective prompts.',
+            '',
+            'Key challenges:',
+            '',
+            '1. Multi-repo complexity: 3 repos with a dependency chain.',
+            '2. Filtering logic: exclude chores and infrastructure changes unless user-facing.',
+            '3. Deduplication: fixes and improvements should roll into the relevant feature.',
+            '4. Progressive document building: preserve context without overloading a single step.',
+            '5. Review loop: make sure final release notes are concise and audience-ready.',
+            '',
+            'Daily changelog approach has natural organization by time, but it creates rework.',
+            'Feature list approach is more aligned with release notes, but needs stronger discovery.',
+            'The best option is likely a hybrid: gather structured daily facts, then synthesize by feature.',
+        ].join('\n');
+
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Plan release notes.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: longThought,
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    message: 'Reading commits',
+                    details: {
+                        tool: 'read_file',
+                        tool_status: 'completed',
+                        tool_run_id: 'tool-1',
+                        path: 'CHANGELOG.md',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        const showMoreButton = screen.getByRole('button', { name: /Show more/ });
+        const prose = screen.getByTestId('summary-thought-prose');
+        expect(showMoreButton.getAttribute('aria-expanded')).toBe('false');
+        expect(prose.getAttribute('class') ?? '').toContain('[-webkit-line-clamp:6]');
+        expect(showMoreButton.getAttribute('class') ?? '').not.toContain('focus-visible:underline');
+        expect(showMoreButton.getAttribute('class') ?? '').not.toContain('underline-offset');
+        expect(Boolean(prose.compareDocumentPosition(showMoreButton) & Node.DOCUMENT_POSITION_FOLLOWING)).toBe(true);
+        expect(screen.getByText(/Thinking through the best approach/)).not.toBeNull();
+        expect(screen.getByText('CHANGELOG.md')).not.toBeNull();
+
+        fireEvent.click(showMoreButton);
+
+        const showLessButton = screen.getByRole('button', { name: /Show less/ });
+        expect(showLessButton.getAttribute('aria-expanded')).toBe('true');
+        expect(showLessButton.getAttribute('class') ?? '').not.toContain('sticky');
+        expect(prose.getAttribute('class') ?? '').not.toContain('[-webkit-line-clamp:6]');
+        expect(screen.getByText(/Feature list approach is more aligned/)).not.toBeNull();
+    });
+
+    it('renders legacy think tool rows as plain preamble prose in expanded summary work details', () => {
         renderSummary(
             [
                 makeMessage({
@@ -720,8 +1791,121 @@ describe('AllMessagesMixed summary view', () => {
         fireEvent.click(workedRow);
 
         expect(screen.getByText('Searching for the latest news headlines from Japan...')).not.toBeNull();
+        expect(
+            screen.queryByRole('button', { name: /Thought: Searching for the latest news headlines from Japan/ }),
+        ).toBeNull();
         expect(screen.queryByRole('button', { name: /Tool\s+Searching for/ })).toBeNull();
-        expect(screen.getByRole('button', { name: /Tool\s*Updating 1 tasks of our plan/ })).not.toBeNull();
+        expect(screen.getByRole('button', { name: /Updating 1 tasks of our plan/ })).not.toBeNull();
+    });
+
+    it('renders long tool preambles as plain prose with show more inside expanded summary work details', () => {
+        const longPreamble = [
+            'I will now activate the web search skill so that I can look up live French news headlines.',
+            'Then I will update the plan and proceed to search for current news headlines in France.',
+            'After that I will compare French and international sources before giving a concise summary.',
+            'This should keep the tool work visible without turning this preamble into a tool row.',
+            'I will also keep the answer scoped to the current date and avoid stale coverage.',
+            'Next I will verify that the sources are current enough for the requested headline summary.',
+            'Finally I will present the findings as regular assistant prose instead of another tool row.',
+        ].join('\n');
+
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'What are the news headlines in France today?',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: longPreamble,
+                    details: {
+                        display_role: 'tool_preamble',
+                        tools: ['learn_web_search'],
+                        activity_group_id: 'activity-1',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    message: 'Activating the web search tool...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'learn_web_search',
+                        tool_run_id: 'tool-1',
+                        tool_status: 'completed',
+                        activity_group_id: 'activity-1',
+                    },
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        expect(screen.queryByText('Thought')).toBeNull();
+        expect(screen.queryByRole('button', { name: /Thought:/ })).toBeNull();
+        expect(screen.getByText(/I will now activate the web search skill/)).not.toBeNull();
+
+        const showMoreButton = screen.getByRole('button', { name: /Show more/ });
+        const prose = screen.getByTestId('summary-thought-prose');
+        expect(showMoreButton.getAttribute('aria-expanded')).toBe('false');
+        expect(prose.getAttribute('class') ?? '').toContain('[-webkit-line-clamp:6]');
+        expect(Boolean(prose.compareDocumentPosition(showMoreButton) & Node.DOCUMENT_POSITION_FOLLOWING)).toBe(true);
+        fireEvent.click(showMoreButton);
+
+        const showLessButton = screen.getByRole('button', { name: /Show less/ });
+        expect(showLessButton.getAttribute('aria-expanded')).toBe('true');
+        expect(screen.getByText(/This should keep the tool work visible/)).not.toBeNull();
+    });
+
+    it('does not collapse long tool preambles while the summary work row is active', () => {
+        const longPreamble = [
+            'I will now create a plan to retrieve the latest news headlines from France today.',
+            'To do this, I will first activate the web search skill.',
+            'Then I will search for current French news from multiple sources.',
+            'After that I will retrieve and summarize the results.',
+            'I will compare the current reports before answering.',
+            'I will keep this setup visible while the work is still running.',
+            'Finally I will produce a concise answer when the search completes.',
+        ].join('\n');
+
+        renderSummary([
+            makeMessage({
+                timestamp: Date.now() - 2_000,
+                type: AgentMessageType.QUESTION,
+                message: 'What are the news headlines in France today?',
+            }),
+            makeMessage({
+                timestamp: Date.now() - 1_500,
+                type: AgentMessageType.THOUGHT,
+                message: longPreamble,
+                details: {
+                    display_role: 'tool_preamble',
+                    tools: ['learn_web_search'],
+                    activity_group_id: 'activity-1',
+                },
+            }),
+            makeMessage({
+                timestamp: Date.now() - 1_000,
+                message: 'Creating a step-by-step plan to search for the latest headlines.',
+                details: {
+                    event_class: 'activity',
+                    tool: 'update_plan',
+                    tool_run_id: 'tool-1',
+                    tool_status: 'running',
+                    activity_group_id: 'activity-1',
+                },
+            }),
+        ]);
+
+        expect(screen.getByRole('button', { name: /Working\s*for/ }).getAttribute('aria-expanded')).toBe('true');
+        expect(screen.queryByRole('button', { name: /Show more/ })).toBeNull();
+        expect(screen.queryByRole('button', { name: /Show less/ })).toBeNull();
+        expect(screen.getByText(/Finally I will produce a concise answer/)).not.toBeNull();
+
+        const prose = screen.getByTestId('summary-thought-prose');
+        expect(prose.getAttribute('class') ?? '').not.toContain('[-webkit-line-clamp:6]');
     });
 
     it('renders completed streaming answers as visible summary prose before later tool activity', () => {
@@ -943,4 +2127,114 @@ describe('AllMessagesMixed summary view', () => {
         expect(screen.getByText('Found 3 relevant docs.')).not.toBeNull();
         expect(screen.getByText('completed')).not.toBeNull();
     });
+
+    it('does not render document panel events as duplicate create document tool rows', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Create a Japan news report.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'Creating document from artifact:files/japan_news_report.md...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'create_document',
+                        tool_run_id: 'create_document',
+                        tool_status: 'running',
+                        activity_group_id: 'activity-5',
+                        source: 'artifact:files/japan_news_report.md',
+                        name: 'Japan News Headlines Today',
+                        tool_event: 'progress',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 2_600,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'Document [Japan News Headlines Today](store:doc-1) has been successfully created',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'create_document',
+                        tool_run_id: 'create_document',
+                        tool_status: 'completed',
+                        activity_group_id: 'activity-5',
+                        tool_event: 'progress',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 2_650,
+                    type: AgentMessageType.UPDATE,
+                    message: 'Created document "Japan News Headlines Today"',
+                    details: {
+                        event_class: 'document_created',
+                        document_id: 'doc-1',
+                        title: 'Japan News Headlines Today',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 4_000,
+                    type: AgentMessageType.ANSWER,
+                    message: 'The report has been created.',
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        expect(screen.getAllByRole('button', { name: /Japan News Headlines Today/ })).toHaveLength(1);
+        expect(screen.queryByText('Created document "Japan News Headlines Today"')).toBeNull();
+    });
+
+    it('groups artifact completion updates into the write artifact tool row', () => {
+        renderSummary(
+            [
+                makeMessage({
+                    timestamp: 1_000,
+                    type: AgentMessageType.QUESTION,
+                    message: 'Write the report to an artifact.',
+                }),
+                makeMessage({
+                    timestamp: 2_000,
+                    type: AgentMessageType.THOUGHT,
+                    message: 'Writing the compiled news report to the temporary workspace artifact...',
+                    details: {
+                        event_class: 'activity',
+                        tool: 'write_artifact',
+                        tool_run_id: 'write_artifact',
+                        tool_use_id: 'write_artifact',
+                        tool_status: 'running',
+                        tool_event: 'started',
+                        activity_group_id: 'activity-write',
+                        message_to_human: 'Writing the compiled news report to the temporary workspace artifact...',
+                    },
+                }),
+                makeMessage({
+                    timestamp: 3_000,
+                    type: AgentMessageType.UPDATE,
+                    message: 'Prepared and saved artifact to files/US_News_Report_2026-06-22.md',
+                    details: {
+                        path: 'files/US_News_Report_2026-06-22.md',
+                        size: 4426,
+                    },
+                }),
+            ],
+            true,
+        );
+
+        fireEvent.click(screen.getByRole('button', { name: /Worked\s*for/ }));
+
+        const writeRow = screen.getByRole('button', {
+            name: /Writing the compiled news report to the temporary workspace artifact/,
+        });
+        expect(writeRow).not.toBeNull();
+        expect(screen.queryByRole('button', { name: /files\/US_News_Report_2026-06-22\.md/ })).toBeNull();
+
+        fireEvent.click(writeRow);
+
+        expect(screen.getByText('Prepared and saved artifact to files/US_News_Report_2026-06-22.md')).not.toBeNull();
+    });
 });