fix(mothership): show sequential activity intent and concrete tools

Author: Sg312

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

@@ -110,9 +110,9 @@ describe.each(['mothership', 'workflow', 'browser', 'deploy'])('%s activity', (a
     act(() => trigger.dispatchEvent(event))
     expect(event.defaultPrevented).toBe(true)
     expect(trigger.getAttribute('aria-expanded')).toBe('true')
-    expect(header()?.textContent).toBe('Tool activity')
+    expect(header()?.textContent).toBe('Reading second')
     render([tool('first', 'success'), tool('second', 'success'), tool('third')])
-    expect(header()?.textContent).toBe('Tool activity')
+    expect(header()?.textContent).toBe('Reading third')
     expect(container.querySelector('[data-state="open"]')?.textContent).toBe(
       'Read firstRead secondReading third'
     )
@@ -148,9 +148,7 @@ describe.each(['mothership', 'workflow', 'browser', 'deploy'])('%s activity', (a
       advance(1500)
       expect(header()?.textContent).toBe(label)
       render([tool('first', 'success'), tool('second', status)], false)
-      expect(header()?.textContent).toBe(
-        agentName === 'mothership' ? 'Read first + 1' : 'Read files'
-      )
+      expect(header()?.textContent).toBe('Read first')
       act(() => container.querySelector<HTMLElement>('[role="button"]')?.click())
       expect(container.querySelector('[data-state="open"]')?.textContent).toContain(
         'Failed reading second'
@@ -163,7 +161,7 @@ describe.each(['mothership', 'workflow', 'browser', 'deploy'])('%s activity', (a
     advance(100)
     render([tool('first', 'success'), tool('second')])
     render([tool('first', 'success'), tool('second', 'success')], false)
-    const completed = agentName === 'mothership' ? 'Read second + 1' : 'Read files'
+    const completed = 'Read second + 1'
     expect(header()?.textContent).toBe(completed)
     expect(container.querySelector('[class*="shimmer"]')).toBeNull()
     advance(2000)
@@ -241,9 +239,78 @@ describe.each(['mothership', 'workflow', 'browser', 'deploy'])('%s activity', (a
     expect(header()?.textContent).toBe(agentName === 'mothership' ? 'Read first' : 'Reading first')
   })
 
+  it('keeps the present-tense intent when expanded while completed collapse uses past tense', () => {
+    const activity = {
+      id: 'inputs',
+      title: 'Checking invoice inputs',
+      completedTitle: 'Checked invoice inputs',
+    }
+    const renderActivity = (status: ToolCallStatus, active: boolean) =>
+      act(() =>
+        root.render(
+          <AgentGroup
+            agentName={agentName}
+            agentLabel='Input review'
+            activity={activity}
+            items={items([
+              { ...tool('first', status), params: { activity } },
+              tool('second', status),
+            ])}
+            isStreaming={active}
+            isLaneOpen={active}
+          />
+        )
+      )
+    renderActivity('executing', true)
+    expect(header()?.textContent).toBe('Reading second + 1')
+    act(() => container.querySelector<HTMLElement>('[role="button"]')!.click())
+    expect(header()?.textContent).toBe(activity.title)
+    renderActivity('success', false)
+    expect(header()?.textContent).toBe(activity.title)
+    expect(container.querySelector('[data-state="open"]')?.textContent).toBe(
+      'Read firstRead second'
+    )
+    act(() => container.querySelector<HTMLElement>('[role="button"]')!.click())
+    expect(header()?.textContent).toBe(activity.completedTitle)
+  })
+
   if (agentName === 'mothership') {
+    it('does not claim a merged activity completed when its unlabelled validation failed', () => {
+      const activity = {
+        id: 'review',
+        title: 'Reviewing invoices',
+        completedTitle: 'Reviewed invoices',
+      }
+      act(() =>
+        root.render(
+          <AgentGroup
+            agentName='mothership'
+            agentLabel='Sim'
+            activity={activity}
+            completedGroupCount={2}
+            items={items([
+              { ...tool('read', 'success'), params: { activity: { id: 'first' } } },
+              { ...tool('configure', 'success'), params: { activity } },
+              tool('validation', 'error'),
+            ])}
+          />
+        )
+      )
+      expect(header()?.textContent).toBe('Read configure + 1')
+      expect(header()?.textContent).not.toContain(activity.completedTitle)
+      act(() => container.querySelector<HTMLElement>('[role="button"]')!.click())
+      expect(header()?.textContent).toBe(activity.title)
+      expect(container.querySelector('[data-state="open"]')?.textContent).toContain(
+        'Failed reading validation'
+      )
+    })
+
     it('shows active tool names and count, reserving the grouped completed title for lane closure', () => {
-      const activity: ToolActivity = { id: 'research', completedTitle: 'Compared files' }
+      const activity: ToolActivity = {
+        id: 'research',
+        title: 'Comparing files',
+        completedTitle: 'Compared files',
+      }
       const renderActivity = (tools: ToolCallData[], open: boolean) =>
         act(() =>
           root.render(
@@ -269,7 +336,11 @@ describe.each(['mothership', 'workflow', 'browser', 'deploy'])('%s activity', (a
     })
 
     it('closes the prior activity at normal text while keeping the trailing activity open', () => {
-      const activity: ToolActivity = { id: 'research', completedTitle: 'Compared files' }
+      const activity: ToolActivity = {
+        id: 'research',
+        title: 'Comparing files',
+        completedTitle: 'Compared files',
+      }
       const renderActivity = (open: boolean) =>
         act(() =>
           root.render(

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

@@ -12,6 +12,7 @@ const ACTIVITY_UPDATE_INTERVAL_MS = 1000
 interface ActivityStreamProps extends Omit<ActivityDisclosureProps, 'header'> {
   activity: ActivityStatusProps
   activityKey?: string
+  expandedLabel?: string
   attentionKey: string
   collapsible: boolean
 }
@@ -20,6 +21,7 @@ interface ActivityStreamProps extends Omit<ActivityDisclosureProps, 'header'> {
 export function ActivityStream({
   activity,
   activityKey,
+  expandedLabel,
   attentionKey,
   expanded,
   collapsible,
@@ -60,7 +62,7 @@ export function ActivityStream({
   const header = (
     <ActivityStatus
       {...displayed}
-      label={isExpanded && activity.isActive ? 'Tool activity' : displayed.label}
+      label={isExpanded ? (expandedLabel ?? displayed.label) : displayed.label}
       isActive={activity.isActive}
     />
   )

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

@@ -5,6 +5,7 @@ import { ThinkingLoader } from '@/components/ui/thinking-loader'
 import { isBrowserAgentAvailable } from '@/lib/browser-agent/transport'
 import type { ToolActivity } from '@/lib/mothership/generated/protocol'
 import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/mothership/tools/retired-tools'
+import { readToolActivity } from '@/lib/mothership/tools/tool-activity'
 import { getToolDisplayTitle, getToolStatusDisplayTitle } from '@/lib/mothership/tools/tool-display'
 import { ActivityStream } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/activity-stream'
 import {
@@ -162,6 +163,13 @@ export function AgentGroupView({
   const isMainAgent = agentName === 'mothership'
   const tools = isMainAgent ? [] : collectGroupTools(items)
   const statusTool = getActivityStatusTool(tools)
+  const activityDescriptor =
+    groupActivity ??
+    tools
+      .map((tool) => readToolActivity(tool.params, tool.streamingArgs))
+      .reverse()
+      .find((entry) => entry?.title || entry?.completedTitle)
+  const runningCount = tools.filter((tool) => !isToolDone(tool.status)).length
   const resolved = isAgentGroupResolved(items)
   const browserAgentAvailable = isBrowserAgentAvailable()
   const activeBrowserTakeover =
@@ -256,14 +264,21 @@ export function AgentGroupView({
     <div className='flex min-w-0 flex-col gap-1.5 py-0.5 pl-6'>{items.map(renderItem)}</div>
   )
   const headerText = error
-    ? `${agentLabel} — Failed`
+    ? agentLabel
     : isWorking
       ? statusTool
-        ? getActiveToolActivityTitle(activeToolTitle(statusTool), statusTool, tools)
+        ? getActiveToolActivityTitle(
+            `${activeToolTitle(statusTool)}${runningCount > 1 ? ` + ${runningCount - 1}` : ''}`,
+            statusTool,
+            tools
+          )
         : 'Thinking'
-      : tools.length > 0
-        ? getToolActivitySummary(tools)
-        : 'Tool activity'
+      : activityDescriptor?.completedTitle &&
+          tools.every((tool) => tool.status === ToolCallStatus.success)
+        ? activityDescriptor.completedTitle
+        : tools.length > 0
+          ? getToolActivitySummary(tools)
+          : agentLabel
   const headerActive =
     !error &&
     isWorking &&
@@ -289,6 +304,7 @@ export function AgentGroupView({
         <ActivityStream
           activity={{ label: headerText, isActive: headerActive, icon: agentIcon }}
           activityKey={statusTool?.id}
+          expandedLabel={pendingInteraction ? undefined : activityDescriptor?.title}
           attentionKey={`${getActivityAttentionKey(tools)}:${activeBrowserTakeover?.id ?? ''}`}
           collapsible={collapsible}
           expanded={expanded}

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

@@ -418,7 +418,7 @@ describe('AgentGroup inline main activity', () => {
         })
       )
     )
-    expect(container.querySelector('[role="status"]')?.textContent).toBe('Checked inputs + 1')
+    expect(container.querySelector('[role="status"]')?.textContent).toBe('Read second document')
     act(() => container.querySelector<HTMLElement>('[role="button"]')?.click())
     expect(container.textContent).toContain('Failed reading first document')
   })
@@ -494,7 +494,7 @@ describe('AgentGroup inline main activity', () => {
         )
       )
       expect(container.textContent).toBe(
-        status === 'executing' ? 'Viewing image.png' : 'Viewed image.png + 2'
+        status === 'executing' ? 'Viewing image.png' : 'Viewed image.png'
       )
       act(() => container.querySelector<HTMLElement>('[role="button"]')?.click())
       expect(container.textContent).toContain('Failed reading image.png')
@@ -650,8 +650,8 @@ describe('AgentGroup inline main activity', () => {
       const header = container.querySelector<HTMLElement>('[role="button"]')
       act(() => header?.click())
       expect(header?.hasAttribute('aria-label')).toBe(false)
-      expect(header?.textContent).toBe('Tool activity')
-      expect(header).toHaveAccessibleName('Tool activity')
+      expect(header?.textContent).toBe('Waiting 1s')
+      expect(header).toHaveAccessibleName('Waiting 1s')
       expect(container.querySelector('[data-state="open"]')?.textContent).toBe(
         'Waiting 1sRead notes'
       )
@@ -667,8 +667,8 @@ describe('AgentGroup inline main activity', () => {
         read,
         { ...wait, data: { ...wait.data, id: 'wait-second' } },
       ])
-      expect(header?.textContent).toBe('Tool activity')
-      expect(header).toHaveAccessibleName('Tool activity')
+      expect(header?.textContent).toBe('Waiting 3s')
+      expect(header).toHaveAccessibleName('Waiting 3s')
       expect(container.querySelector('.overflow-y-auto')).toBe(viewport)
       expect(container.querySelector('[data-state="open"]')?.textContent).toBe(
         'WaitedRead notesWaiting 3s'
@@ -721,8 +721,8 @@ describe('AgentGroup inline main activity', () => {
         )
       )
       const header = container.querySelector<HTMLElement>('[role="button"]')
-      expect(header?.textContent).toBe('Read files, ran commands')
-      expect(header).toHaveAccessibleName('Read files, ran commands')
+      expect(header?.textContent).toBe('Ran checks + 1')
+      expect(header).toHaveAccessibleName('Ran checks + 1')
       expect(container.querySelectorAll('[data-tool-call-id]')).toHaveLength(0)
       act(() => header?.click())
       expect(

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

@@ -268,7 +268,9 @@ describe('BrowserAgentIcon', () => {
       expect(container.querySelector('[role="status"]')?.textContent).toBe('Opening first page')
       expect(container.querySelector('[role="button"]')).not.toBeNull()
       act(() => vi.advanceTimersByTime(900))
-      expect(container.querySelector('[role="status"]')?.textContent).toBe('Opening second page')
+      expect(container.querySelector('[role="status"]')?.textContent).toBe(
+        'Opening second page + 1'
+      )
       const nextImage = container.querySelector('img')!
       expect(nextImage).not.toBe(img)
       expect(nextImage.src).toBe('https://example.org/favicon.ico')