fix: show tool calls

brandonkachen · brandonkachen · commit e40000835682 · 2025-10-08T14:20:20.000-07:00
diff --git a/cli/src/chat.tsx b/cli/src/chat.tsx
@@ -26,6 +26,7 @@ import {
   getToolDisplayInfo,
   formatToolOutput,
 } from './codebuff-client'
+import type { ToolName } from '@codebuff/sdk'
 import { logger } from './logger'
 import { ShimmerText } from './shimmer-text'
 
@@ -854,7 +855,7 @@ export const App = ({ initialPrompt }: { initialPrompt?: string } = {}) => {
       setCanProcessQueue(false)
       isChainInProgressRef.current = true
 
-      const activeTools = new Map<string, string>()
+      const activeTools = new Map<string, { agentId: string; toolName: ToolName }>()
       let hasReceivedContent = false
       let actualCredits: number | undefined = undefined
 
@@ -928,15 +929,20 @@ export const App = ({ initialPrompt }: { initialPrompt?: string } = {}) => {
             if (event.type === 'tool_call' && event.toolCallId) {
               const { toolCallId, toolName, input } = event
 
+              const hiddenTools: ToolName[] = ['spawn_agent_inline', 'end_turn']
+              if (hiddenTools.includes(toolName)) {
+                return
+              }
+
               const displayInfo = getToolDisplayInfo(toolName)
               const agentId = `agent-${toolCallId}`
 
-              activeTools.set(toolCallId, agentId)
+              activeTools.set(toolCallId, { agentId, toolName })
 
               const agentMessage: ChatMessage = {
                 id: agentId,
                 variant: 'agent',
-                content: `Executing ${toolName}...\n\n\`\`\`json\n${JSON.stringify(input, null, 2)}\n\`\`\``,
+                content: `\`\`\`json\n${JSON.stringify(input, null, 2)}\n\`\`\``,
                 timestamp: formatTimestamp(),
                 parentId: aiMessageId,
                 agent: {
@@ -950,19 +956,33 @@ export const App = ({ initialPrompt }: { initialPrompt?: string } = {}) => {
               setStreamingAgents((prev) => new Set(prev).add(agentId))
               setCollapsedAgents((prev) => new Set(prev).add(agentId))
             } else if (event.type === 'tool_result' && event.toolCallId) {
-              const agentId = activeTools.get(event.toolCallId)
-              if (!agentId) return
+              const toolInfo = activeTools.get(event.toolCallId)
+              if (!toolInfo) return
+
+              const { agentId, toolName } = toolInfo
+
+              let output: string
+              if (event.error) {
+                output = `**Error:** ${typeof event.error === 'string' ? event.error : JSON.stringify(event.error)}`
+              } else if (toolName === 'run_terminal_command') {
+                const parsed = event.output?.[0]?.value
+                if (parsed?.stdout || parsed?.stderr) {
+                  output = (parsed.stdout || '') + (parsed.stderr || '')
+                } else {
+                  output = formatToolOutput(event.output)
+                }
+              } else {
+                output = formatToolOutput(event.output)
+              }
 
-              const output = event.error
-                ? `**Error:** ${typeof event.error === 'string' ? event.error : JSON.stringify(event.error)}`
-                : formatToolOutput(event.output)
+              const codeBlockLang = toolName === 'run_terminal_command' ? '' : 'yaml'
 
               setMessages((prev) =>
                 prev.map((msg) =>
                   msg.id === agentId
                     ? {
                         ...msg,
-                        content: `${msg.content}\n\n**Result:**\n\`\`\`\n${output}\n\`\`\``,
+                        content: `${msg.content}\n\n**Result:**\n\`\`\`${codeBlockLang}\n${output}\n\`\`\``,
                       }
                     : msg,
                 ),
diff --git a/cli/src/codebuff-client.ts b/cli/src/codebuff-client.ts
@@ -33,35 +33,67 @@ export function getToolDisplayInfo(toolName: string): {
   name: string
   type: string
 } {
-  const toolNameMap: Record<string, string> = {
-    write_file: 'File Writer',
-    str_replace: 'File Editor',
-    read_files: 'File Reader',
-    code_search: 'Code Search',
-    run_terminal_command: 'Terminal',
-    browser_logs: 'Browser',
-    run_file_change_hooks: 'File Hooks',
-    web_search: 'Web Search',
-    read_docs: 'Doc Reader',
-    spawn_agents: 'Agent Spawner',
+  const capitalizeWords = (str: string) => {
+    return str.replace(/_/g, ' ').replace(/\b\w/g, (l) => l.toUpperCase())
   }
 
   return {
-    name:
-      toolNameMap[toolName] ||
-      toolName.replace(/_/g, ' ').replace(/\b\w/g, (l) => l.toUpperCase()),
+    name: capitalizeWords(toolName),
     type: 'tool',
   }
 }
 
+function toYaml(obj: any, indent = 0): string {
+  const spaces = '  '.repeat(indent)
+  
+  if (obj === null || obj === undefined) {
+    return 'null'
+  }
+  
+  if (typeof obj === 'string') {
+    if (obj.includes('\n')) {
+      const lines = obj.split('\n')
+      return '|\n' + lines.map(line => '  '.repeat(indent + 1) + line).join('\n')
+    }
+    return obj.includes(':') || obj.includes('#') ? `"${obj}"` : obj
+  }
+  
+  if (typeof obj === 'number' || typeof obj === 'boolean') {
+    return String(obj)
+  }
+  
+  if (Array.isArray(obj)) {
+    if (obj.length === 0) return '[]'
+    return '\n' + obj.map(item => spaces + '- ' + toYaml(item, indent + 1).trimStart()).join('\n')
+  }
+  
+  if (typeof obj === 'object') {
+    const entries = Object.entries(obj)
+    if (entries.length === 0) return '{}'
+    
+    return entries.map(([key, value]) => {
+      const yamlValue = toYaml(value, indent + 1)
+      if (typeof value === 'object' && value !== null && !Array.isArray(value) && Object.keys(value).length > 0) {
+        return `${spaces}${key}:\n${yamlValue}`
+      }
+      if (typeof value === 'string' && value.includes('\n')) {
+        return `${spaces}${key}: ${yamlValue}`
+      }
+      return `${spaces}${key}: ${yamlValue}`
+    }).join('\n')
+  }
+  
+  return String(obj)
+}
+
 export function formatToolOutput(output: unknown): string {
   if (!output) return ''
 
   if (Array.isArray(output)) {
     return output
       .map((item) => {
         if (item.type === 'json') {
-          return JSON.stringify(item.value, null, 2)
+          return toYaml(item.value)
         }
         if (item.type === 'text') {
           return item.text || ''
@@ -75,5 +107,5 @@ export function formatToolOutput(output: unknown): string {
     return output
   }
 
-  return JSON.stringify(output, null, 2)
+  return toYaml(output)
 }
diff --git a/sdk/src/index.ts b/sdk/src/index.ts
@@ -2,6 +2,7 @@ export type * from './run'
 export type * from '../../common/src/types/json'
 export type * from '../../common/src/types/messages/codebuff-message'
 export type * from '../../common/src/types/messages/data-content'
+export { type ToolName } from '../../common/src/tools/constants'
 // Agent type exports
 export type { AgentDefinition } from '../../common/src/templates/initial-agents-dir/types/agent-definition'
 // Re-export code analysis functionality
diff --git a/sdk/src/run.ts b/sdk/src/run.ts
@@ -174,7 +174,7 @@ export async function run({
         if (insideToolCall && buffer.length > BUFFER_SIZE * 10) {
           buffer = buffer.slice(-BUFFER_SIZE * 10)
         }
-      } else if (chunk.type !== 'tool_call') {
+      } else {
         await handleEvent?.(chunk)
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ export async function run({`
`174`	`174`	`if (insideToolCall && buffer.length > BUFFER_SIZE * 10) {`
`175`	`175`	`buffer = buffer.slice(-BUFFER_SIZE * 10)`
`176`	`176`	`}`
`177`		`- } else if (chunk.type !== 'tool_call') {`
	`177`	`+ } else {`
`178`	`178`	`await handleEvent?.(chunk)`
`179`	`179`	`}`
`180`	`180`	`},`