@@ -5,6 +5,7 @@ import { ChevronDown, cn, Expandable, ExpandableContent, OverflowText } from '@s
 import { ShimmerText } from '@/components/ui'
 import { isBrowserAgentAvailable } from '@/lib/browser-agent/transport'
 import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/mothership/tools/retired-tools'
+import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display'
 import { useSmoothText } from '@/hooks/use-smooth-text'
 import { type ToolCallData, ToolCallStatus } from '../../../../types'
 import { getAgentIcon, isToolDone } from '../../utils'
@@ -44,7 +45,9 @@ interface AgentGroupProps {
 }
 
 function toolStatusTitle(tool: ToolCallData): string {
-  return tool.displayTitle || String(tool.toolName ?? '')
+  // Raw tool names must never surface — derive a human title when no display
+  // title was resolved upstream.
+  return tool.displayTitle || getToolDisplayTitle(String(tool.toolName ?? ''), undefined)
 }
 
 /**
 
@@ -27,6 +27,8 @@ export type IconComponent = ComponentType<SVGProps<SVGSVGElement>>
 
 const TOOL_ICONS: Record<string, IconComponent> = {
   mothership: Blimp,
+  // Delegated subagent lanes: visually distinct from the main Sim lane.
+  task: AgentIcon,
   glob: FolderCode,
   grep: Search,
   read: File,
 
@@ -320,9 +320,56 @@ export function resolveToolDisplayTitle(name: string, args?: Record<string, unkn
     if (workflowName || blockName) return getToolDisplayTitle(name, enriched)
   }
 
+  // CLI rows: name the resource. The command's first positional is the id;
+  // recover it by inverting the worker's name derivation (path tokens joined
+  // with '_'), then resolve through the live stores. "Editing workflow"
+  // becomes "Editing Onboarding"; "Updating table row" becomes "Updating
+  // Leads row". Only a successful name lookup changes anything.
+  if (name.startsWith('cli_workflow') || name.startsWith('cli_tables')) {
+    const positional = cliFirstPositional(name, args)
+    if (positional) {
+      const base = getToolDisplayTitle(name, args)
+      const resourceName = name.startsWith('cli_tables')
+        ? resolveTableNameForDisplay(positional)
+        : resolveWorkflowNameForDisplay(positional)
+      if (resourceName) {
+        const noun = name.startsWith('cli_tables') ? /\btable\b/ : /\bworkflow\b/
+        if (noun.test(base)) return base.replace(noun, resourceName)
+        return `${base}: ${resourceName}`
+      }
+    }
+  }
+
   return getToolDisplayTitle(name, args)
 }
 
+/**
+ * The first positional argument after a CLI command path — the resource id.
+ * Inverts the worker's `cli_<path tokens joined by _>` naming to find where the
+ * command path ends in argv, mirroring its flag handling exactly.
+ */
+function cliFirstPositional(name: string, args?: Record<string, unknown>): string | undefined {
+  const argv = Array.isArray(args?.args) ? (args.args as unknown[]) : undefined
+  if (!argv) return undefined
+  const tokens: string[] = []
+  for (let i = 0; i < argv.length; i++) {
+    const token = argv[i]
+    if (typeof token !== 'string') break
+    if (token === '--output') {
+      i++
+      continue
+    }
+    if (token.startsWith('-')) break
+    tokens.push(token)
+  }
+  let joined = 'cli'
+  for (let i = 0; i < tokens.length; i++) {
+    joined += `_${(tokens[i] ?? '').replace(/-/g, '_')}`
+    if (joined === name) return tokens[i + 1]
+  }
+  return undefined
+}
+
 function decodeStreamingString(value: string): string {
   return value
     .replace(/\\u([0-9a-fA-F]{4})/g, (_: string, hex: string) =>
@@ -370,6 +417,11 @@ export function resolveStreamingToolDisplayTitle(
     return functionExecuteTitle(matchStreamingStringArg(streamingArgs, 'title'))
   }
 
+  if (name === 'task') {
+    const title = matchStreamingStringArg(streamingArgs, 'title')
+    if (title) return `Delegating: ${title}`
+  }
+
   if (name === PrepareFileEdit.id) {
     return resolveWorkspaceFileDisplayTitle(
       matchStreamingStringArg(streamingArgs, 'operation'),
 
@@ -11,7 +11,10 @@ import {
 import { CallIntegrationTool } from '@/lib/mothership/generated/tool-catalog-v1'
 import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
 import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args'
-import { CONTEXT_COMPACTION_DISPLAY_TITLE } from '@/lib/mothership/tools/tool-display'
+import {
+  CONTEXT_COMPACTION_DISPLAY_TITLE,
+  refineStreamingCliToolName,
+} from '@/lib/mothership/tools/tool-display'
 
 /**
  * The single deterministic model of one assistant turn, derived purely from the
@@ -363,12 +366,14 @@ function upsertToolNode(
 ): ToolNode {
   const existing = model.nodes.get(id)
   if (existing && existing.kind === 'tool') {
-    // Fill blanks, and replace exactly the CLI placeholder: the worker's partial frame
-    // names CLI rows `sim_cli` (args unknowable mid-stream) and the finalized frame
-    // carries the real verb (`cli_workflows_list`) — without this every live CLI row
-    // read "Running CLI command" until reload. Scoped to the placeholder so the gateway
-    // rebind's model-authored branding is never clobbered by a later frame.
-    if (name && (!existing.name || (existing.name === 'sim_cli' && name !== 'sim_cli'))) {
+    // Fill blanks, and refine CLI names: the worker's partial frame names CLI rows
+    // `sim_cli` (args unknowable mid-stream), streaming deltas may refine that to a
+    // provisional `cli_*`, and the finalized frame carries the authoritative verb —
+    // so any cli-family name accepts a different cli-family (or authoritative)
+    // successor. Scoped to the cli family so the gateway rebind's model-authored
+    // branding is never clobbered by a later frame.
+    const cliFamily = existing.name === 'sim_cli' || existing.name.startsWith('cli_')
+    if (name && (!existing.name || (cliFamily && name !== existing.name && name !== 'sim_cli'))) {
       existing.name = name
     }
     return existing
@@ -553,6 +558,13 @@ export function reduceEvent(model: TurnModel, envelope: PersistedStreamEventEnve
         )
         const delta = asString(payload.argumentsDelta)
         if (delta) node.streamingArgs = (node.streamingArgs ?? '') + delta
+        // Progressive CLI title: upgrade the placeholder to the specific verb as
+        // soon as enough argv tokens have streamed to name the command — the
+        // browser mirror of the server handler's refinement.
+        if (delta && (node.name === 'sim_cli' || node.name.startsWith('cli_'))) {
+          const refined = refineStreamingCliToolName(node.streamingArgs ?? '')
+          if (refined && refined !== node.name) node.name = refined
+        }
       } else if (phase === MothershipStreamV1ToolPhase.result) {
         applyToolResult(
           model,
 
@@ -49,7 +49,10 @@ import { getToolEntry, isSimExecuted } from '@/lib/mothership/tool-executor'
 import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools'
 import { isUserLocalVfsToolCall } from '@/lib/mothership/tools/local-filesystem'
 import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args'
-import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display'
+import {
+  getToolDisplayTitle,
+  refineStreamingCliToolName,
+} from '@/lib/mothership/tools/tool-display'
 import {
   isWorkflowToolName,
   resolveWorkflowToolTargetId,
@@ -115,6 +118,18 @@ function handleToolArgsDelta(
   const toolCall = context.toolCalls.get(data.toolCallId)
   if (!toolCall) return
   toolCall.streamingArgs = `${toolCall.streamingArgs ?? ''}${data.argumentsDelta}`
+
+  // Progressive CLI title: the row upgrades from "Running CLI command" to the
+  // specific verb as soon as enough argv tokens have streamed to name it —
+  // no wait for the full (possibly huge) argument payload.
+  if (toolCall.name === 'sim_cli' || toolCall.name.startsWith('cli_')) {
+    const refined = refineStreamingCliToolName(toolCall.streamingArgs)
+    if (refined && refined !== toolCall.name) {
+      toolCall.name = refined
+      applyToolDisplay(toolCall)
+    }
+    return
+  }
   if (toolCall.name !== INTEGRATION_GATEWAY_TOOL) return
 
   const toolId = extractStreamingStringArgument(toolCall.streamingArgs, 'toolId')
 
@@ -222,10 +222,21 @@ export const CLI_TOOL_TITLES: Record<string, string> = {
   cli_workspaces_get: 'Reading workspace',
   cli_workspaces_list: 'Listing workspaces',
   cli_workspaces_members: 'Listing workspace members',
+  // Agent-only CLI augmentations
+  cli_files_grep: 'Searching file contents',
+  cli_workflow_blocks: 'Listing workflow blocks',
+  cli_workflow_deps: 'Tracing block inputs',
+  cli_workflow_edges: 'Reading workflow wiring',
+  cli_workflow_grep: 'Searching workflow',
+  cli_workflow_lint: 'Validating workflow',
+  cli_workflow_trace: 'Analyzing run trace',
+  cli_workflows_grep: 'Searching workflows',
   // Non-CLI copilot worker tools
   cli_help: 'Checking CLI reference',
   sim_cli: 'Running CLI command',
   run_code: 'Running code',
   load_skill: 'Loading skill',
+  read_output: 'Reading full output',
+  remember: 'Updating memory',
   task: 'Delegating task',
 }
@@ -0,0 +1,57 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import {
+  getToolDisplayTitle,
+  refineStreamingCliToolName,
+} from '@/lib/mothership/tools/tool-display'
+
+describe('refineStreamingCliToolName', () => {
+  it('names the command from a partial prefix, skipping --output json', () => {
+    expect(refineStreamingCliToolName('{"args":["--output","json","workflows","list"')).toBe(
+      'cli_workflows_list'
+    )
+  })
+
+  it('stays generic on an intermediate prefix, then resolves the full command', () => {
+    const partial = '{"args":["workflows","operations"'
+    const fuller = '{"args":["workflows","operations","apply","wf-1","--operations","[{'
+    expect(refineStreamingCliToolName(partial)).toBeNull()
+    expect(refineStreamingCliToolName(fuller)).toBe('cli_workflows_operations_apply')
+  })
+
+  it('never matches on a half-streamed token', () => {
+    expect(refineStreamingCliToolName('{"args":["workflows","li')).toBeNull()
+  })
+
+  it('names agent augmentations', () => {
+    expect(refineStreamingCliToolName('{"args":["workflow","trace","abc-123"')).toBe(
+      'cli_workflow_trace'
+    )
+    expect(refineStreamingCliToolName('{"args":["workflow","deps"')).toBe('cli_workflow_deps')
+  })
+
+  it('returns null before the args array or on unknown commands', () => {
+    expect(refineStreamingCliToolName('{"ar')).toBeNull()
+    expect(refineStreamingCliToolName('{"args":["frobnicate","things"')).toBeNull()
+  })
+
+  it('recognizes --help wherever it appears', () => {
+    expect(refineStreamingCliToolName('{"args":["tables","--help"')).toBe('cli_help')
+  })
+})
+
+describe('cli display integration', () => {
+  it('maps the new augmentation names to titles', () => {
+    expect(getToolDisplayTitle('cli_workflow_trace', {})).toBe('Analyzing run trace')
+    expect(getToolDisplayTitle('cli_workflow_deps', {})).toBe('Tracing block inputs')
+    expect(getToolDisplayTitle('remember', {})).toBe('Updating memory')
+    expect(getToolDisplayTitle('web_search', { query: 'latest sim release' })).toContain(
+      'latest sim release'
+    )
+    expect(getToolDisplayTitle('task', { title: 'Inventory workspace' })).toBe(
+      'Delegating: Inventory workspace'
+    )
+  })
+})
@@ -931,8 +931,16 @@ export function getToolDisplayTitle(name: string, args?: Record<string, unknown>
       return `Deleting ${target || 'MCP server'}`
     }
     case 'web_search': {
-      const target = firstStringArg(args, 'toolTitle', 'title')
-      return target ? `Searching online for ${target}` : 'Searching online'
+      const target = firstStringArg(args, 'toolTitle', 'title', 'query')
+      return target
+        ? `Searching online for "${truncate(target, MAX_QUOTED_TITLE_VALUE_LENGTH)}"`
+        : 'Searching online'
+    }
+    case 'task': {
+      const target = firstStringArg(args, 'title')
+      return target
+        ? `Delegating: ${truncate(target, MAX_QUOTED_TITLE_VALUE_LENGTH)}`
+        : 'Delegating task'
     }
     case 'search_docs': {
       const target = firstStringArg(args, 'toolTitle', 'title', 'query')
@@ -1032,7 +1040,8 @@ export function getToolDisplayTitle(name: string, args?: Record<string, unknown>
         name === 'generate_image' ? 'image' : name === 'generate_video' ? 'video' : 'audio'
       const target =
         firstStringArg(args, 'toolTitle', 'title') ||
-        (stringArg(args, 'path') ? pathLeaf(stringArg(args, 'path')) : '')
+        (stringArg(args, 'path') ? pathLeaf(stringArg(args, 'path')) : '') ||
+        firstOutputFilePath(args)
       return target ? `Generating ${target}` : `Generating ${kind}`
     }
     case 'download_file': {
@@ -1460,3 +1469,41 @@ export function getToolStatusDisplayTitle(
   if (status === 'cancelled' || status === 'aborted') return getToolStoppedTitle(title)
   return title
 }
+
+/**
+ * Refines a streaming `sim_cli` call's derived name from its PARTIAL argument
+ * JSON, so the row's title upgrades from "Running CLI command" to the specific
+ * verb ("Listing workflows") while the arguments are still generating — the
+ * same progressive pattern the integration gateway rows use. Only complete
+ * quoted tokens count (a half-streamed token never matches), flags end the
+ * command path exactly as the worker's own matcher does, and a candidate is
+ * accepted only when the title registry knows it — an unknown prefix stays on
+ * the generic name rather than inventing one.
+ */
+const STREAMING_ARGS_ARRAY = /"args"\s*:\s*\[([^\]]*)/
+const COMPLETE_STRING_TOKEN = /"((?:[^"\\]|\\.)*)"/g
+
+export function refineStreamingCliToolName(streamingArgs: string): string | null {
+  const argsMatch = STREAMING_ARGS_ARRAY.exec(streamingArgs)
+  if (!argsMatch?.[1]) return null
+  const tokens: string[] = []
+  for (const match of argsMatch[1].matchAll(COMPLETE_STRING_TOKEN)) {
+    tokens.push(match[1] ?? '')
+  }
+  if (tokens.includes('--help') || tokens.includes('-h')) return 'cli_help'
+  const path: string[] = []
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i] ?? ''
+    if (token === '--output') {
+      i++
+      continue
+    }
+    if (token.startsWith('-')) break
+    path.push(token)
+  }
+  for (let length = Math.min(path.length, 4); length >= 1; length--) {
+    const candidate = `cli_${path.slice(0, length).join('_').replace(/-/g, '_')}`
+    if (CLI_TOOL_TITLES[candidate]) return candidate
+  }
+  return null
+}