improvement(tools): tools

Author: Sg312

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

@@ -2,29 +2,6 @@ import { useMemo } from 'react'
 import { ShimmerText } from '@/components/ui'
 import { WorkspaceFile } from '@/lib/copilot/generated/tool-catalog-v1'
 import type { ToolCallStatus } from '../../../../types'
-import { getToolIcon, resolveToolDisplayState } from '../../utils'
-
-function CircleCheck({ className }: { className?: string }) {
-  return (
-    <svg
-      width='16'
-      height='16'
-      viewBox='0 0 16 16'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-      className={className}
-    >
-      <circle cx='8' cy='8' r='6.5' stroke='currentColor' strokeWidth='1.25' />
-      <path
-        d='M5.5 8.5L7 10L10.5 6.5'
-        stroke='currentColor'
-        strokeWidth='1.25'
-        strokeLinecap='round'
-        strokeLinejoin='round'
-      />
-    </svg>
-  )
-}
 
 export function CircleStop({ className }: { className?: string }) {
   return (
@@ -42,58 +19,6 @@ export function CircleStop({ className }: { className?: string }) {
   )
 }
 
-function Hyphen({ className }: { className?: string }) {
-  return (
-    <svg
-      width='16'
-      height='16'
-      viewBox='0 0 16 16'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-      className={className}
-    >
-      <path d='M4 8H12' stroke='currentColor' strokeWidth='1.25' strokeLinecap='round' />
-    </svg>
-  )
-}
-
-function CircleOutline({ className }: { className?: string }) {
-  return (
-    <svg
-      width='16'
-      height='16'
-      viewBox='0 0 16 16'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-      className={className}
-    >
-      <circle cx='8' cy='8' r='6.5' stroke='currentColor' strokeWidth='1.25' />
-    </svg>
-  )
-}
-
-function StatusIcon({ status, toolName }: { status: ToolCallStatus; toolName: string }) {
-  const display = resolveToolDisplayState(status)
-  if (display === 'spinner') {
-    const Icon = getToolIcon(toolName)
-    if (Icon) {
-      return <Icon className='size-[15px] text-[var(--text-tertiary)]' />
-    }
-    return <CircleOutline className='size-[15px] text-[var(--text-tertiary)]' />
-  }
-  if (display === 'cancelled') {
-    return <CircleStop className='size-[15px] text-[var(--text-tertiary)]' />
-  }
-  if (display === 'interrupted') {
-    return <Hyphen className='size-[15px] text-[var(--text-tertiary)]' />
-  }
-  const Icon = getToolIcon(toolName)
-  if (Icon) {
-    return <Icon className='size-[15px] text-[var(--text-tertiary)]' />
-  }
-  return <CircleCheck className='size-[15px] text-[var(--text-tertiary)]' />
-}
-
 interface ToolCallItemProps {
   toolName: string
   displayTitle: string
@@ -131,14 +56,11 @@ export function ToolCallItem({ toolName, displayTitle, status, streamingArgs }:
     return `${verb} ${unescaped}`
   }, [toolName, streamingArgs])
 
-  const isExecuting = resolveToolDisplayState(status) === 'spinner'
-  const title = liveWorkspaceFileTitle || displayTitle
+  const isExecuting = status === 'executing'
+  const title = (isExecuting ? liveWorkspaceFileTitle : null) || displayTitle
 
   return (
-    <div className='flex items-center gap-[8px] pl-[24px]'>
-      <div className='flex size-[16px] flex-shrink-0 items-center justify-center'>
-        <StatusIcon status={status} toolName={toolName} />
-      </div>
+    <div className='flex items-center pl-[24px]'>
       {isExecuting ? (
         <ShimmerText className='text-[13px] [--shimmer-rest:var(--text-secondary)]'>
           {title}

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

@@ -63,7 +63,33 @@ describe('parseBlocks span-identity tree', () => {
     if (group.type !== 'agent_group') throw new Error('expected mothership group')
     const tool = group.items[0]
     if (tool?.type !== 'tool') throw new Error('expected credential tool')
-    expect(tool.data.displayTitle).toBe('Renaming Stripe to Production Stripe')
+    expect(tool.data.displayTitle).toBe('Renamed Stripe to Production Stripe')
+  })
+
+  it('replaces a stale generic search title with the target and settles its tense', () => {
+    const searchCall = (status: 'executing' | 'success'): ContentBlock => ({
+      type: 'tool_call',
+      toolCall: {
+        id: `search-${status}`,
+        name: 'grep',
+        status,
+        displayTitle: 'Searching',
+        params: { pattern: 'Elder|Pulse' },
+      },
+      timestamp: 1,
+    })
+
+    for (const [status, expected] of [
+      ['executing', 'Searching for Elder|Pulse'],
+      ['success', 'Searched for Elder|Pulse'],
+    ] as const) {
+      const segments = parseBlocks([searchCall(status)])
+      const group = segments[0]
+      if (group?.type !== 'agent_group') throw new Error('expected mothership group')
+      const tool = group.items[0]
+      if (tool?.type !== 'tool') throw new Error('expected search tool')
+      expect(tool.data.displayTitle).toBe(expected)
+    }
   })
 
   it('nests a deploy subagent inside the workflow subagent that spawned it', () => {

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

@@ -5,7 +5,11 @@ import { Read as ReadTool, WorkspaceFile } from '@/lib/copilot/generated/tool-ca
 import { isToolHiddenInUi } from '@/lib/copilot/tools/client/hidden-tools'
 import { resolveToolDisplay } from '@/lib/copilot/tools/client/store-utils'
 import { ClientToolCallState } from '@/lib/copilot/tools/client/tool-call-state'
-import { getToolDisplayTitle, humanizeToolName } from '@/lib/copilot/tools/tool-display'
+import {
+  getToolDisplayTitle,
+  humanizeToolName,
+  resolveToolDisplayTitleForStatus,
+} from '@/lib/copilot/tools/tool-display'
 import { useChatSurface } from '@/app/workspace/[workspaceId]/home/components/chat-surface-context'
 import type { ContentBlock, OptionItem, ToolCallData } from '../../types'
 import { SUBAGENT_LABELS } from '../../types'
@@ -158,13 +162,31 @@ function getOverrideDisplayTitle(tc: NonNullable<ContentBlock['toolCall']>): str
       })
     }
   }
+  if (
+    tc.params &&
+    [
+      'search_online',
+      'grep',
+      'glob',
+      'search_library_docs',
+      'search_knowledge_base',
+      'enrichment_run',
+    ].includes(tc.name)
+  ) {
+    const resolvedTitle = getToolDisplayTitle(tc.name, tc.params)
+    // During argument streaming, params can temporarily be an empty object.
+    // Do not replace a richer streamed/persisted title with the no-argument
+    // fallback until the target-bearing argument has actually arrived.
+    if (resolvedTitle !== getToolDisplayTitle(tc.name)) return resolvedTitle
+  }
   return undefined
 }
 
 function toToolData(tc: NonNullable<ContentBlock['toolCall']>): ToolCallData {
   const overrideDisplayTitle = getOverrideDisplayTitle(tc)
-  const displayTitle =
+  const runningDisplayTitle =
     overrideDisplayTitle || tc.displayTitle || getToolDisplayTitle(tc.name, tc.params)
+  const displayTitle = resolveToolDisplayTitleForStatus(runningDisplayTitle, tc.status)
 
   return {
     id: tc.id,

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

@@ -2,7 +2,7 @@
  * @vitest-environment node
  */
 import { describe, expect, it } from 'vitest'
-import { deriveMessagePhase, resolveToolDisplayState } from './utils'
+import { deriveMessagePhase } from './utils'
 
 describe('deriveMessagePhase', () => {
   it('is streaming whenever the transport is live', () => {
@@ -18,21 +18,3 @@ describe('deriveMessagePhase', () => {
     expect(deriveMessagePhase({ isStreaming: false, isRevealing: false })).toBe('settled')
   })
 })
-
-describe('resolveToolDisplayState', () => {
-  it('spins iff the tool is executing — a pure projection of its own status', () => {
-    expect(resolveToolDisplayState('executing')).toBe('spinner')
-  })
-
-  it('maps cancelled and interrupted to their own glyphs', () => {
-    expect(resolveToolDisplayState('cancelled')).toBe('cancelled')
-    expect(resolveToolDisplayState('interrupted')).toBe('interrupted')
-  })
-
-  it('renders terminal successes and errors as the tool icon', () => {
-    expect(resolveToolDisplayState('success')).toBe('icon')
-    expect(resolveToolDisplayState('error')).toBe('icon')
-    expect(resolveToolDisplayState('skipped')).toBe('icon')
-    expect(resolveToolDisplayState('rejected')).toBe('icon')
-  })
-})

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

@@ -1,87 +1,45 @@
 import type { ComponentType, SVGProps } from 'react'
 import {
-  Asterisk,
   Blimp,
   Bug,
   Database,
-  Eye,
   File,
-  FolderCode,
   Hammer,
   Integration,
-  Layout,
-  Library,
-  Pencil,
   PlayOutline,
   Rocket,
   Search,
-  Settings,
-  TerminalWindow,
   Wrench,
 } from '@sim/emcn'
 import { Calendar, Table as TableIcon } from '@sim/emcn/icons'
-import { AgentIcon, ImageIcon, TTSIcon, VideoIcon } from '@/components/icons'
-import type { ToolCallStatus } from '@/app/workspace/[workspaceId]/home/types'
+import { AgentIcon, VideoIcon } from '@/components/icons'
+import type { ToolCallStatus } from '../../types'
 
 export type IconComponent = ComponentType<SVGProps<SVGSVGElement>>
 
-const TOOL_ICONS: Record<string, IconComponent> = {
+const AGENT_ICONS: Record<string, IconComponent> = {
   mothership: Blimp,
-  glob: FolderCode,
-  grep: Search,
-  read: File,
-  mv: FolderCode,
-  cp: Layout,
-  mkdir: FolderCode,
-  search_online: Search,
-  scrape_page: Search,
-  get_page_contents: Search,
-  search_library_docs: Library,
-  manage_mcp_tool: Settings,
-  manage_skill: Asterisk,
-  user_memory: Database,
-  function_execute: TerminalWindow,
-  run_code: TerminalWindow,
   superagent: Blimp,
-  user_table: TableIcon,
-  workspace_file: File,
-  edit_content: File,
-  create_workflow: Layout,
-  edit_workflow: Pencil,
   workflow: Hammer,
   debug: Bug,
   run: PlayOutline,
   deploy: Rocket,
   auth: Integration,
   knowledge: Database,
-  knowledge_base: Database,
-  search_knowledge_base: Database,
   table: TableIcon,
-  query_user_table: TableIcon,
   scheduled_task: Calendar,
   job: Calendar,
   agent: AgentIcon,
   custom_tool: Wrench,
   research: Search,
   scout: Search,
   search: Search,
-  context_compaction: Asterisk,
-  open_resource: Eye,
   file: File,
   media: VideoIcon,
-  generate_image: ImageIcon,
-  generate_video: VideoIcon,
-  generate_audio: TTSIcon,
-  ffmpeg: Wrench,
 }
 
 export function getAgentIcon(name: string): IconComponent {
-  return TOOL_ICONS[name as keyof typeof TOOL_ICONS] ?? Blimp
-}
-
-export function getToolIcon(name: string): IconComponent | undefined {
-  const icon = TOOL_ICONS[name as keyof typeof TOOL_ICONS]
-  return icon === Blimp ? undefined : icon
+  return AGENT_ICONS[name as keyof typeof AGENT_ICONS] ?? Blimp
 }
 
 export type MessagePhase = 'streaming' | 'revealing' | 'settled'
@@ -100,19 +58,6 @@ export function deriveMessagePhase({
   return 'settled'
 }
 
-type ToolDisplayState = 'spinner' | 'cancelled' | 'interrupted' | 'icon'
-
-export function resolveToolDisplayState(status: ToolCallStatus): ToolDisplayState {
-  // Pure projection of the tool's own status. A row spins iff it is genuinely
-  // executing; every terminal status maps to a glyph. No transport/turn-live
-  // gating — deterministic terminals (tool `result`, turn propagation) guarantee
-  // a row never lingers `executing` after its work is done.
-  if (status === 'executing') return 'spinner'
-  if (status === 'cancelled') return 'cancelled'
-  if (status === 'interrupted') return 'interrupted'
-  return 'icon'
-}
-
 export function isToolDone(status: ToolCallStatus): boolean {
   return (
     status === 'success' ||

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts

@@ -335,18 +335,24 @@ export function resolveStreamingToolDisplayTitle(
   }
 
   if (name === SearchOnline.id) {
-    const toolTitle = matchStreamingStringArg(streamingArgs, 'toolTitle')
-    return toolTitle ? `Searching online for ${toolTitle}` : undefined
+    const target =
+      matchStreamingStringArg(streamingArgs, 'toolTitle') ??
+      matchStreamingStringArg(streamingArgs, 'query')
+    return target ? `Searching online for ${target}` : undefined
   }
 
   if (name === Grep.id) {
-    const toolTitle = matchStreamingStringArg(streamingArgs, 'toolTitle')
-    return toolTitle ? `Searching for ${toolTitle}` : undefined
+    const target =
+      matchStreamingStringArg(streamingArgs, 'toolTitle') ??
+      matchStreamingStringArg(streamingArgs, 'pattern')
+    return target ? `Searching for ${target}` : undefined
   }
 
   if (name === Glob.id) {
     const toolTitle = matchStreamingStringArg(streamingArgs, 'toolTitle')
-    return toolTitle ? `Finding ${toolTitle}` : undefined
+    if (toolTitle) return `Finding ${toolTitle}`
+    const pattern = matchStreamingStringArg(streamingArgs, 'pattern')
+    return pattern ? `Finding files matching ${pattern}` : undefined
   }
 
   if (name === 'mv') {

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.test.ts

@@ -62,6 +62,18 @@ describe('streaming resource titles', () => {
       )
     ).toBe('Renaming Old Name to New Name')
   })
+
+  it('uses search query and pattern fallbacks before toolTitle arrives', () => {
+    expect(resolveStreamingToolDisplayTitle('grep', '{"pattern":"Elder|Pulse"}')).toBe(
+      'Searching for Elder|Pulse'
+    )
+    expect(
+      resolveStreamingToolDisplayTitle('search_online', '{"query":"Pulse converter differences"}')
+    ).toBe('Searching online for Pulse converter differences')
+    expect(resolveStreamingToolDisplayTitle('glob', '{"pattern":"workflows/**"}')).toBe(
+      'Finding files matching workflows/**'
+    )
+  })
 })
 
 // A main-agent file delegation: trigger tool (main lane), subagent span, inner

apps/sim/lib/copilot/tools/client/store-utils.test.ts

@@ -118,6 +118,12 @@ describe('resolveToolDisplay', () => {
         path: 'files/deck.pptx/style',
       })?.text
     ).toBe('Read style details for deck.pptx')
+
+    expect(
+      resolveToolDisplay(ReadTool.id, ClientToolCallState.aborted, {
+        path: 'files/report.pdf/content',
+      })?.text
+    ).toBe('Skipped: Read report.pdf')
   })
 
   it('falls back to a humanized tool label for generic tools', () => {