fix(chat): retain answered browser handoffs

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group.test.ts

@@ -160,6 +160,46 @@ describe('AgentGroup inline main activity', () => {
     expect(container.querySelector('button, svg, [data-state], .pl-6')).toBeNull()
   })
 
+  it('keeps a browser question and answer after the main agent resumes tool activity', () => {
+    const takeover = browserTakeover('Choose a result.')
+    const items: AgentGroupItem[] = [
+      {
+        ...takeover,
+        data: {
+          ...takeover.data,
+          status: 'success',
+          result: { success: true, output: { userInstruction: 'Open the second result.' } },
+        },
+      },
+      {
+        type: 'tool',
+        data: {
+          id: 'resumed',
+          toolName: 'grep',
+          displayTitle: 'Searching files',
+          status: 'success',
+        },
+      },
+    ]
+
+    act(() => {
+      root.render(
+        createElement(AgentGroup, {
+          agentName: 'mothership',
+          agentLabel: 'Sim',
+          items,
+          isStreaming: false,
+        })
+      )
+    })
+
+    expect(container.querySelector('[data-takeover-answer="true"]')?.textContent).toBe(
+      'Choose a result.: Open the second result.'
+    )
+    expect(container.textContent).toContain('Searched files')
+    expect(container.querySelector('button, svg, [data-state], .pl-6')).toBeNull()
+  })
+
   it('keeps pending permissions and terminal handoffs visible when newer tools arrive', () => {
     const items: AgentGroupItem[] = [
       {

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/main-agent-activity.ts

@@ -1,4 +1,5 @@
 import { Terminal as TerminalTool } from '@/lib/copilot/generated/tool-catalog-v1'
+import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/copilot/tools/retired-tools'
 import type { AgentGroupItem } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-view'
 import { ToolCallStatus } from '@/app/workspace/[workspaceId]/home/types'
 
@@ -9,7 +10,7 @@ export function getLatestToolId(items: AgentGroupItem[]): string | undefined {
   }
 }
 
-/** Keep blocking controls visible even when a newer tool replaces the activity text. */
+/** Keep interaction controls and answers when a newer tool replaces the activity text. */
 export function getVisibleMainAgentItems(
   items: AgentGroupItem[],
   latestToolId = getLatestToolId(items)
@@ -19,6 +20,8 @@ export function getVisibleMainAgentItems(
       item.type !== 'tool' ||
       item.data.id === latestToolId ||
       item.data.status === ToolCallStatus.awaiting_approval ||
+      (item.data.toolName === RETIRED_BROWSER_REQUEST_TAKEOVER_ID &&
+        item.data.status === ToolCallStatus.success) ||
       (item.data.status === ToolCallStatus.executing &&
         item.data.toolName === TerminalTool.id &&
         item.data.params?.operation === 'handoff')

apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.test.ts

@@ -846,7 +846,7 @@ describe('assistantMessageHasVisibleExecutingTool', () => {
 
 describe('parseBlocks main activity controls', () => {
   it.each([undefined, 'main'])(
-    'retains blocking controls across prose and completion with spanId=%s',
+    'retains interaction controls and answers across prose and completion with spanId=%s',
     (spanId) => {
       const blocks: ContentBlock[] = [
         {
@@ -866,6 +866,17 @@ describe('parseBlocks main activity controls', () => {
           },
           timestamp: 2,
         },
+        {
+          type: 'tool_call',
+          toolCall: {
+            id: 'answered-takeover',
+            name: 'browser_request_takeover',
+            status: 'success',
+            params: { reason: 'Choose a result.' },
+            result: { success: true, output: { userInstruction: 'Open the second result.' } },
+          },
+          timestamp: 2,
+        },
         mainToolCall('older', 'grep'),
         mainText('Checking another source.'),
         {
@@ -885,6 +896,7 @@ describe('parseBlocks main activity controls', () => {
       expect(visibleTools(blocks).map((tool) => tool.id)).toEqual([
         'permission',
         'handoff',
+        'answered-takeover',
         'latest',
       ])
       const completed = blocks.map((block) =>
@@ -895,6 +907,7 @@ describe('parseBlocks main activity controls', () => {
       expect(visibleTools(completed).map((tool) => tool.id)).toEqual([
         'permission',
         'handoff',
+        'answered-takeover',
         'latest',
       ])
       expect(visibleTools(completed).at(-1)?.status).toBe('success')