fix(chat): restore thinking indicator after tools finish

Author: Sg312

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

@@ -65,6 +65,53 @@ describe('MessageContent shared thinking indicator', () => {
   const thinking = () => container.querySelectorAll('[aria-hidden="false"] svg')
   const groups = () => container.querySelectorAll('[data-agent-group]')
 
+  it.each([undefined, 'main'])(
+    'shows thinking after main tools finish and yields to the next tool (spanId=%s)',
+    (spanId) => {
+      const mainCall = (id: string, status: ToolCallStatus): ContentBlock => ({
+        type: 'tool_call',
+        spanId,
+        toolCall: {
+          id,
+          name: 'sim_cli',
+          status,
+          displayTitle: 'List tables in Alfred',
+          params: {
+            args: ['tables', 'list'],
+            activity: {
+              id: 'inspect',
+              title: 'Inspecting workspace resources',
+              completedTitle: 'Inspected workspace resources',
+            },
+          },
+        },
+      })
+      render([mainCall('first', 'executing')])
+      act(() => vi.advanceTimersByTime(1_500))
+      expect(thinking()).toHaveLength(0)
+      expect(container.querySelector('[class*="shimmer"]')).not.toBeNull()
+
+      const completed = [mainCall('first', 'success')]
+      render(completed)
+      expect(thinking()).toHaveLength(0)
+      act(() => vi.advanceTimersByTime(1_500))
+      expect(thinking()).toHaveLength(1)
+      expect(container.querySelector('[aria-hidden="false"]')?.textContent).toContain('Thinking')
+
+      render([...completed, { type: 'thinking', content: 'Checking the result.', timestamp: 3 }])
+      expect(thinking()).toHaveLength(1)
+      render([...completed, mainCall('next', 'executing')])
+      expect(thinking()).toHaveLength(0)
+
+      const finished = [...completed, mainCall('next', 'success')]
+      render(finished)
+      act(() => vi.advanceTimersByTime(1_500))
+      expect(thinking()).toHaveLength(1)
+      render(finished, false)
+      expect(thinking()).toHaveLength(0)
+    }
+  )
+
   it('shares one indicator across parallel and nested empty agents', () => {
     render([start('workflow'), start('browser'), start('deploy', 'workflow')])
     expect(thinking()).toHaveLength(1)

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

@@ -1023,9 +1023,9 @@ describe('parseBlocks legacy — thinking between top-level tools', () => {
 })
 
 describe('assistantMessageHasVisibleActivity', () => {
-  it('keeps the main tail active between calls but closes it when narration follows', () => {
+  it('leaves the gap after a completed main tool to the turn indicator', () => {
     const blocks = [mainToolCall('finished', 'read')]
-    expect(assistantMessageHasVisibleActivity(parseBlocks(blocks), true)).toBe(true)
+    expect(assistantMessageHasVisibleActivity(parseBlocks(blocks), true)).toBe(false)
     expect(assistantMessageHasVisibleActivity(parseBlocks(blocks), false)).toBe(false)
     expect(
       assistantMessageHasVisibleActivity(parseBlocks([...blocks, mainText('Done.')]), true)

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

@@ -18,7 +18,6 @@ import type { TaskBlockInfo } from '@/lib/mothership/request/types'
 import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools'
 import { resolveToolDisplay } from '@/lib/mothership/tools/client/store-utils'
 import { ClientToolCallState } from '@/lib/mothership/tools/client/tool-call-state'
-import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/mothership/tools/retired-tools'
 import { readToolActivity } from '@/lib/mothership/tools/tool-activity'
 import {
   getToolDisplayTitle,
@@ -883,30 +882,21 @@ export function assistantMessageHasRenderableContent(
   )
 }
 
-/** The transcript already owns an activity indicator, including gaps between calls. */
+/** Only suppress the turn indicator when a tool or agent row is visibly active. */
 export function assistantMessageHasVisibleActivity(
   segments: MessageSegment[],
   isStreaming = false
 ): boolean {
-  return segments.some((segment, index) => {
+  return segments.some((segment) => {
     if (segment.type !== 'agent_group' || !segment.items.some(hasAgentGroupItemContent)) {
       return false
     }
     const tools = collectGroupTools(segment.items)
     if (tools.some((tool) => tool.status === 'executing')) return true
-    if (!isStreaming) return false
-    if (segment.agentName !== 'mothership') {
-      const statusTool = getActivityStatusTool(tools)
-      return (
-        (segment.isOpen || segment.isDelegating) && (!statusTool || statusTool.status === 'success')
-      )
-    }
-    const lastItem = segment.items.at(-1)
+    if (!isStreaming || segment.agentName === 'mothership') return false
+    const statusTool = getActivityStatusTool(tools)
     return (
-      index === segments.length - 1 &&
-      lastItem?.type === 'tool' &&
-      lastItem.data.status === 'success' &&
-      lastItem.data.toolName !== RETIRED_BROWSER_REQUEST_TAKEOVER_ID
+      (segment.isOpen || segment.isDelegating) && (!statusTool || statusTool.status === 'success')
     )
   })
 }
@@ -1088,7 +1078,7 @@ function MessageContentInner({
 
   if (segments.length === 0 && !isLast) return null
 
-  /** Open activity groups own the shimmer through gaps between tool calls. */
+  /** Active tool and agent rows own the shimmer until the turn is waiting again. */
   // A mid-stream special tag renders nothing until complete, so its bytes are a
   // wait, not output — the shimmer bridges it without the quiet-period delay.
   const thinkingLabel = deriveThinkingLabel(blocks)