Keep Mothership resource panels and activity groups in sync

Author: Sg312

apps/sim/app/api/mothership/sandbox/[token]/api/v2/[...path]/route.ts

@@ -0,0 +1,27 @@
+import type { NextRequest } from 'next/server'
+import {
+  type MothershipSandboxParams,
+  mothershipSandboxParamsSchema,
+} from '@/lib/api/contracts/mothership-sandbox'
+import { validationErrorResponse } from '@/lib/api/server'
+import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
+import { proxySandboxResourceRequest } from '@/lib/mothership/tools/sandbox-resource-transport'
+
+export const dynamic = 'force-dynamic'
+
+/** Raw transport boundary preserves v2 JSON, multipart and binary bodies; v2 owns operation authorization. */
+const handler = withRouteHandler(
+  async (request: NextRequest, context: { params: Promise<MothershipSandboxParams> }) => {
+    const params = mothershipSandboxParamsSchema.safeParse(await context.params)
+    if (!params.success) return validationErrorResponse(params.error)
+    return proxySandboxResourceRequest(request, params.data.token)
+  }
+)
+
+export const GET = handler
+export const HEAD = handler
+export const POST = handler
+export const PUT = handler
+export const PATCH = handler
+export const DELETE = handler
+export const OPTIONS = handler

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

@@ -317,7 +317,12 @@ describe('AgentGroup main tool summary', () => {
 
   afterEach(() => act(() => root.unmount()))
 
-  const render = (items: AgentGroupItem[], isStreaming = true, completedGroupCount = 0) => {
+  const render = (
+    items: AgentGroupItem[],
+    isStreaming = true,
+    completedGroupCount = 0,
+    isLaneOpen = isStreaming
+  ) => {
     act(() => {
       root.render(
         createElement(AgentGroup, {
@@ -326,7 +331,7 @@ describe('AgentGroup main tool summary', () => {
           items,
           completedGroupCount,
           isStreaming,
-          isLaneOpen: isStreaming,
+          isLaneOpen,
         })
       )
     })
@@ -382,7 +387,7 @@ describe('AgentGroup main tool summary', () => {
       call('Start', 'success', 'Checking start inputs'),
       call('Function', 'success'),
     ]
-    const header = render(items, true, 2)
+    const header = render(items, false, 2)
     expect(header.textContent).toBe('Checked start inputs + 1')
     expect(header.getAttribute('aria-expanded')).toBe('false')
     act(() => header.click())
@@ -401,6 +406,41 @@ describe('AgentGroup main tool summary', () => {
     }
   )
 
+  it('keeps broad activity present through a read, thinking gap, and later creation', () => {
+    const read = call('Exa', 'executing', 'Building Search API')
+    const header = render([read])
+    expect(header.textContent).toBe('Building Search API')
+    const readDone = call('Exa', 'success', 'Building Search API')
+    render([readDone])
+    expect(header.textContent).toBe('Building Search API')
+    const create: AgentGroupItem = {
+      type: 'tool',
+      data: {
+        id: 'create',
+        toolName: 'cli_workflows_create',
+        displayTitle: 'Creating Search API',
+        status: 'executing',
+        params: { activity: { id: 'Building Search API' } },
+      },
+    }
+    render([readDone, create])
+    expect(header.textContent).toBe('Building Search API')
+    const createDone: AgentGroupItem = { ...create, data: { ...create.data, status: 'success' } }
+    render([readDone, createDone])
+    expect(header.textContent).toBe('Building Search API')
+    render([readDone, createDone], false)
+    expect(header.textContent).toBe('Built Search API')
+  })
+
+  it('uses past tense after a visible boundary only once associated tools resolve', () => {
+    const header = render([call('Exa', 'executing', 'Building Search API')], true, 0, false)
+    expect(header.textContent).toBe('Building Search API')
+    render([call('Exa', 'success', 'Building Search API')], true, 0, false)
+    expect(header.textContent).toBe('Built Search API')
+    render([call('Start', 'success', 'Building Search API')], true)
+    expect(header.textContent).toBe('Building Search API')
+  })
+
   it('does not attribute another activity failure to the representative completed activity', () => {
     const header = render(
       [
@@ -434,7 +474,7 @@ describe('AgentGroup main tool summary', () => {
       },
     })
     const header = render([streaming('{"activity":{"id":"inputs","title":"Checking')])
-    expect(header.textContent).toBe('Working…')
+    expect(header.textContent).toBe('Preparing tool call…')
     render([
       streaming(
         '{"activity":{"id":"inputs","title":"Checking search inputs","completedTitle":"Checked search inputs"},"args":['
@@ -468,6 +508,33 @@ describe('AgentGroup main tool summary', () => {
     expect(header.textContent).toBe('Reading Exa configuration')
   })
 
+  it('describes a later generic call as preparation until its arguments identify the work', () => {
+    const pending: AgentGroupItem = {
+      type: 'tool',
+      data: {
+        id: 'next',
+        toolName: 'run_code',
+        displayTitle: 'Running code',
+        status: 'executing',
+        params: { activity: { id: 'unlabeled' } },
+        streamingArgs: '{"code":"const',
+      },
+    }
+    const header = render([call('Exa', 'success'), pending])
+    expect(header.textContent).toBe('Preparing tool call…')
+    render([
+      call('Exa', 'success'),
+      { ...pending, data: { ...pending.data, params: { code: '1' } } },
+    ])
+    expect(header.textContent).toBe('Running code')
+  })
+
+  it('keeps a pending approval current when a later call has already succeeded', () => {
+    const header = render([call('Exa', 'awaiting_approval'), call('Start', 'success')])
+    expect(header.textContent).toBe('Waiting for approval: Reading Exa configuration')
+    expect(header.getAttribute('aria-expanded')).toBe('true')
+  })
+
   it('does not let a nested agent rename the parent or treat a resource title as intent', () => {
     const header = render([
       call('Exa', 'executing', 'Checking search inputs'),
@@ -505,7 +572,7 @@ describe('AgentGroup main tool summary', () => {
     expect(header.getAttribute('aria-expanded')).toBe('false')
   })
 
-  it.each(['success', 'error', 'cancelled'] as const)(
+  it.each(['success', 'error', 'cancelled', 'interrupted', 'skipped'] as const)(
     'shows an honest terminal label for %s with no remaining-call count',
     (status) => {
       const header = render([tool('success'), tool(status)], false)
@@ -514,6 +581,8 @@ describe('AgentGroup main tool summary', () => {
           success: 'Searched',
           error: 'Failed searching',
           cancelled: 'Stopped searching',
+          interrupted: 'Stopped searching',
+          skipped: 'Stopped searching',
         }[status]
       )
       expect(header.getAttribute('aria-expanded')).toBe('false')

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

@@ -45,7 +45,7 @@ interface AgentGroupProps {
   items: AgentGroupItem[]
   isDelegating?: boolean
   isStreaming?: boolean
-  /** The subagent lane is still open (no subagent_end yet) — i.e. actively running. */
+  /** The subagent lane or visible main tool batch can still receive more work. */
   isLaneOpen?: boolean
 }
 
@@ -165,20 +165,18 @@ export function AgentGroup({
   const status = useMemo(() => {
     if (!isMainAgent && !isLaneOpen) return undefined
     const tools = collectGroupTools(items)
-    const running = tools.filter((tool) => tool.status === ToolCallStatus.executing)
+    const running = tools.filter((tool) => !isToolDone(tool.status))
     const latest = running.length
       ? running.reduce((newest, tool) =>
           (tool.startedAt ?? 0) >= (newest.startedAt ?? 0) ? tool : newest
         )
       : tools.at(-1)
     if (!latest) return undefined
     const activity = isMainAgent ? (groupActivity ?? groupActivityTitle(items)) : undefined
-    const initialCall = tools[0]
-    const generatingFirstCall =
-      tools.length === 1 &&
-      initialCall?.status === ToolCallStatus.executing &&
-      (initialCall.toolName === 'sim_cli' || initialCall.toolName === 'run_code') &&
-      Object.keys(initialCall.params ?? {}).length === 0
+    const generatingCall =
+      latest.status === ToolCallStatus.executing &&
+      (latest.toolName === 'sim_cli' || latest.toolName === 'run_code') &&
+      Object.keys(latest.params ?? {}).every((key) => key === 'activity')
     const activityTools =
       completedGroupCount > 1 && activity
         ? tools.filter(
@@ -188,22 +186,22 @@ export function AgentGroup({
     const failed = activityTools.find(
       (tool) => tool.status !== ToolCallStatus.success && isToolDone(tool.status)
     )
-    const activityComplete = !failed && isAgentGroupResolved(items)
+    const activityComplete = !failed && (!isStreaming || !isLaneOpen) && isAgentGroupResolved(items)
     const mainTitle =
       activity?.title && activity.completedTitle
         ? activityComplete
           ? activity.completedTitle
           : activity.title
-        : generatingFirstCall
-          ? 'Working…'
+        : generatingCall
+          ? 'Preparing tool call…'
           : toolStatusTitle(latest)
     return {
       title: isMainAgent
         ? getToolStatusDisplayTitle(
             mainTitle,
             activity
               ? running.length > 0
-                ? 'executing'
+                ? latest.status
                 : failed
                   ? failed.status === 'error' || failed.status === 'rejected'
                     ? 'error'
@@ -215,7 +213,7 @@ export function AgentGroup({
         : toolStatusTitle(latest),
       additionalCount: Math.max(0, (isMainAgent ? completedGroupCount : 0) - 1, running.length - 1),
     }
-  }, [isLaneOpen, isMainAgent, items, groupActivity, completedGroupCount])
+  }, [isLaneOpen, isMainAgent, isStreaming, items, groupActivity, completedGroupCount])
   const AgentIcon = getAgentIcon(agentName)
   const headerText = error
     ? isMainAgent

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

@@ -161,6 +161,43 @@ describe('top-level activity groups', () => {
     expect(groups[1].items).toMatchObject([{ type: 'tool', data: { id: 'b1' } }])
   })
 
+  it('keeps parallel activities open through thinking gaps until their batch closes', () => {
+    const completed = [
+      activityCall('a1', 'Checking invoice inputs'),
+      activityCall('b1', 'Checking customer inputs'),
+      activityReference('a2', 'Checking invoice inputs'),
+    ].map(
+      (block): ContentBlock => ({
+        ...block,
+        toolCall: { ...block.toolCall!, status: 'success' },
+      })
+    )
+    const open = parseBlocks(completed, true)
+    expect(open).toHaveLength(2)
+    expect(open).toMatchObject([
+      { isOpen: true, items: [{ data: { id: 'a1' } }, { data: { id: 'a2' } }] },
+      { isOpen: true, items: [{ data: { id: 'b1' } }] },
+    ])
+    const settled = parseBlocks(completed, false)
+    expect(settled).toHaveLength(1)
+    expect(settled[0]).toMatchObject({ isOpen: false, completedGroupCount: 2 })
+    const proseClosed = parseBlocks([...completed, mainText('The inputs are ready.')], true)
+    expect(proseClosed[0]).toMatchObject({ isOpen: false, completedGroupCount: 2 })
+  })
+
+  it('closes at prose and reopens a reused activity below it during the same turn', () => {
+    const first = activityCall('a1', 'Checking invoice inputs')
+    first.toolCall!.status = 'success'
+    const reused = activityReference('a2', 'Checking invoice inputs')
+    reused.toolCall!.status = 'success'
+    const segments = parseBlocks([first, mainText('Checking the updated inputs.'), reused], true)
+    expect(segments).toMatchObject([
+      { type: 'agent_group', isOpen: false, activity: { id: 'Checking invoice inputs' } },
+      { type: 'text' },
+      { type: 'agent_group', isOpen: true, activity: { id: 'Checking invoice inputs' } },
+    ])
+  })
+
   it('does not merge activities across prose or absorb a subagent into the main activity', () => {
     const segments = parseBlocks([
       activityCall('a1', 'Checking invoice inputs'),

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

@@ -539,7 +539,7 @@ function parseBlocksWithSpanTree(blocks: ContentBlock[]): MessageSegment[] {
 }
 
 /** Each explicit activity owns a top-level group, including interleaved parallel calls. */
-function groupByActivity(segments: MessageSegment[]): MessageSegment[] {
+function groupByActivity(segments: MessageSegment[], isStreaming: boolean): MessageSegment[] {
   const labels = new Map<string, ToolActivity>()
   for (const segment of segments) {
     if (segment.type !== 'agent_group' || segment.agentName !== 'mothership') continue
@@ -550,8 +550,10 @@ function groupByActivity(segments: MessageSegment[]): MessageSegment[] {
         labels.set(activity.id, activity)
     }
   }
-  return segments.flatMap((segment): MessageSegment[] => {
+  return segments.flatMap((segment, index): MessageSegment[] => {
     if (segment.type !== 'agent_group' || segment.agentName !== 'mothership') return [segment]
+    /** A quiet model round can append calls to any activity in this visible batch. */
+    const isOpen = isStreaming && index === segments.length - 1
     const groups: AgentGroupSegment[] = []
     const byActivity = new Map<string, AgentGroupSegment>()
     let current: AgentGroupSegment | undefined
@@ -565,6 +567,7 @@ function groupByActivity(segments: MessageSegment[]): MessageSegment[] {
       else if (!current || activity || currentActivityId) {
         current = {
           ...segment,
+          isOpen,
           activity: activity ? labels.get(activity.id) : undefined,
           id:
             groups.length === 0
@@ -582,6 +585,7 @@ function groupByActivity(segments: MessageSegment[]): MessageSegment[] {
     const summaryActivity = [...groups].reverse().find((group) => group.activity)?.activity
     if (
       groups.length > 1 &&
+      !isOpen &&
       summaryActivity &&
       segment.items.every((item) => item.type === 'tool') &&
       isAgentGroupResolved(segment.items)
@@ -592,11 +596,12 @@ function groupByActivity(segments: MessageSegment[]): MessageSegment[] {
   })
 }
 
-export function parseBlocks(blocks: ContentBlock[]): MessageSegment[] {
+export function parseBlocks(blocks: ContentBlock[], isStreaming = false): MessageSegment[] {
   return groupByActivity(
     blocks.some((block) => Boolean(block.spanId))
       ? parseBlocksWithSpanTree(blocks)
-      : parseBlocksLegacy(blocks)
+      : parseBlocksLegacy(blocks),
+    isStreaming
   )
 }
 
@@ -969,8 +974,8 @@ function MessageContentInner({
   const blockOverlayVersion = useCustomBlockOverlayVersion()
   const titledBlocks = useToolResourceTitles(blocks)
   const parsed = useMemo(
-    () => (titledBlocks.length > 0 ? parseBlocks(titledBlocks) : []),
-    [titledBlocks, blockOverlayVersion]
+    () => (titledBlocks.length > 0 ? parseBlocks(titledBlocks, isStreaming) : []),
+    [titledBlocks, blockOverlayVersion, isStreaming]
   )
 
   const [trailingRevealing, setTrailingRevealing] = useState(false)