fix: cli uses parentAgentId to distinguish tools from subagents

Author: jahooma

cli/src/hooks/use-send-message.ts

@@ -28,7 +28,12 @@ import {
 
 import type { ElapsedTimeTracker } from './use-elapsed-time'
 import type { StreamStatus } from './use-message-queue'
-import type { ChatMessage, ContentBlock, ToolContentBlock, AskUserContentBlock } from '../types/chat'
+import type {
+  ChatMessage,
+  ContentBlock,
+  ToolContentBlock,
+  AskUserContentBlock,
+} from '../types/chat'
 import type { SendMessageFn } from '../types/contracts/send-message'
 import type { ParamsOf } from '../types/function-params'
 import type { SetElement } from '../types/utils'
@@ -1123,7 +1128,7 @@ export const useSendMessage = ({
                   ] of spawnAgentsMapRef.current.entries()) {
                     const eventType = event.agentType || ''
                     const storedType = info.agentType || ''
-                    
+
                     // Extract base names without version or scope
                     // e.g., 'codebuff/file-picker@0.0.2' -> 'file-picker'
                     //       'file-picker' -> 'file-picker'
@@ -1135,10 +1140,10 @@ export const useSendMessage = ({
                       // Handle simple names, possibly with version
                       return type.split('@')[0]
                     }
-                    
+
                     const eventBaseName = getBaseName(eventType)
                     const storedBaseName = getBaseName(storedType)
-                    
+
                     // Match if base names are the same
                     const isMatch = eventBaseName === storedBaseName
                     if (isMatch) {
@@ -1416,6 +1421,7 @@ export const useSendMessage = ({
                   input,
                   agentId,
                   includeToolCall,
+                  parentAgentId,
                 } = event
 
                 if (toolName === 'spawn_agents' && input?.agents) {
@@ -1487,7 +1493,7 @@ export const useSendMessage = ({
                 }
 
                 // If this tool call belongs to a subagent, add it to that agent's blocks
-                if (agentId) {
+                if (parentAgentId && agentId) {
                   applyMessageUpdate((prev) =>
                     prev.map((msg) => {
                       if (msg.id !== aiMessageId || !msg.blocks) {
@@ -1557,18 +1563,24 @@ export const useSendMessage = ({
                 }
 
                 setStreamingAgents((prev) => new Set(prev).add(toolCallId))
-              } else              if (event.type === 'tool_result' && event.toolCallId) {
+              } else if (event.type === 'tool_result' && event.toolCallId) {
                 const { toolCallId } = event
 
                 // Handle ask_user result transformation
-                applyMessageUpdate((prev) => 
+                applyMessageUpdate((prev) =>
                   prev.map((msg) => {
                     if (msg.id !== aiMessageId || !msg.blocks) return msg
 
                     // Recursively check for tool blocks to transform
-                    const transformAskUser = (blocks: ContentBlock[]): ContentBlock[] => {
+                    const transformAskUser = (
+                      blocks: ContentBlock[],
+                    ): ContentBlock[] => {
                       return blocks.map((block) => {
-                        if (block.type === 'tool' && block.toolCallId === toolCallId && block.toolName === 'ask_user') {
+                        if (
+                          block.type === 'tool' &&
+                          block.toolCallId === toolCallId &&
+                          block.toolName === 'ask_user'
+                        ) {
                           const resultValue = (event.output?.[0] as any)?.value
                           const skipped = resultValue?.skipped
                           const answers = resultValue?.answers
@@ -1587,7 +1599,7 @@ export const useSendMessage = ({
                             skipped,
                           } as AskUserContentBlock
                         }
-                        
+
                         if (block.type === 'agent' && block.blocks) {
                           const updatedBlocks = transformAskUser(block.blocks)
                           if (updatedBlocks !== block.blocks) {
@@ -1600,10 +1612,10 @@ export const useSendMessage = ({
 
                     const newBlocks = transformAskUser(msg.blocks)
                     if (newBlocks !== msg.blocks) {
-                       return { ...msg, blocks: newBlocks }
+                      return { ...msg, blocks: newBlocks }
                     }
                     return msg
-                  })
+                  }),
                 )
 
                 // Check if this is a spawn_agents result