added streaming render of dynamic tool call generation in subagent terminal UI

Author: sidwan02

packages/cli/src/ui/components/messages/SubagentHistoryDisplay.tsx

@@ -12,10 +12,11 @@ import type {
   SubagentToolResponseHistoryItem,
   SubagentThoughtHistoryItem,
   SubagentToolSummaryHistoryItem,
+  DynamicToolCallChunkHistoryItem,
 } from '../../types.js';
 import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
 import { SubagentToolCallDisplay } from './SubagentToolCallDisplay.js';
-import { debugLogger } from '@google/gemini-cli-core';
+// import { debugLogger } from '@google/gemini-cli-core';
 
 interface SubagentHistoryDisplayProps {
   history: SubagentHistoryItem[];
@@ -27,6 +28,7 @@ type SubagentTurn = {
   toolCall?: SubagentToolCallHistoryItem;
   toolResponse?: SubagentToolResponseHistoryItem;
   toolSummary?: SubagentToolSummaryHistoryItem;
+  dynamicToolCall?: DynamicToolCallChunkHistoryItem;
   subagentHistory?: SubagentHistoryItem[];
 };
 
@@ -93,6 +95,13 @@ export const SubagentHistoryDisplay: React.FC<SubagentHistoryDisplayProps> = ({
           lastTurn.thought = item;
         }
         break;
+      case 'dynamic_tool_call_chunk':
+        // debugLogger.log('overriding dynamic tool call chunk');
+        lastTurn.dynamicToolCall = {
+          type: 'dynamic_tool_call_chunk',
+          data: { chunk: item.data.chunk },
+        };
+        break;
       case 'tool_call':
         if (lastTurn.toolCall) {
           acc.push({ toolCall: item });
@@ -108,7 +117,7 @@ export const SubagentHistoryDisplay: React.FC<SubagentHistoryDisplayProps> = ({
         break;
       case 'tool_summary_chunk':
         // Overwrite the previous toolSummary with the new chunk, enabling streaming.
-        debugLogger.log('overriding tool summary chunk');
+        // debugLogger.log('overriding tool summary chunk');
         lastTurn.toolSummary = {
           type: 'tool_summary',
           data: { summary: item.data.summary },
@@ -195,6 +204,20 @@ export const SubagentHistoryDisplay: React.FC<SubagentHistoryDisplayProps> = ({
                   />
                 </Box>
               )}
+              {turn.dynamicToolCall && (
+                <Box
+                  flexDirection="column"
+                  marginBottom={1}
+                  width={availableWidth}
+                  borderStyle="single"
+                  borderColor="green"
+                  paddingX={1}
+                  paddingY={0}
+                >
+                  <Text color="green">Generating Tool Call:</Text>
+                  <Text>{turn.dynamicToolCall.data.chunk}</Text>
+                </Box>
+              )}
               {turn.toolCall && (
                 <Box width={availableWidth}>
                   <SubagentToolCallDisplay

packages/cli/src/ui/hooks/useReactToolScheduler.ts

@@ -110,6 +110,8 @@ export function useReactToolScheduler(
           'GEMINI_SUBAGENT_START::': 'start',
           'GEMINI_SUBAGENT_THOUGHT::': 'thought',
           'GEMINI_SUBAGENT_TOOL_CALL::': 'tool_call',
+          'GEMINI_SUBAGENT_DYNAMIC_TOOL_CALL_CHUNK::':
+            'dynamic_tool_call_chunk',
           'GEMINI_SUBAGENT_TOOL_RESPONSE::': 'tool_response',
           'GEMINI_SUBAGENT_TOOL_SUMMARY::': 'tool_summary',
           'GEMINI_SUBAGENT_TOOL_SUMMARY_CHUNK::': 'tool_summary_chunk',
@@ -160,6 +162,15 @@ export function useReactToolScheduler(
                         ...currentHistory.slice(0, -1),
                         newHistoryItem,
                       ];
+                    } else if (
+                      newHistoryItem.type === 'dynamic_tool_call_chunk' &&
+                      lastHistoryItem?.type === 'dynamic_tool_call_chunk'
+                    ) {
+                      // Replace the last tool call chunk with the new one
+                      newHistory = [
+                        ...currentHistory.slice(0, -1),
+                        newHistoryItem,
+                      ];
                     } else if (
                       (newHistoryItem.type === 'tool_summary_chunk' ||
                         newHistoryItem.type === 'tool_summary') &&

packages/cli/src/ui/types.ts

@@ -406,7 +406,8 @@ export type SubagentHistoryItem =
   | { type: 'interrupted'; data: { message: string } }
   | { type: 'user_message'; data: { message: string } }
   | SubagentToolSummaryHistoryItem
-  | SubagentToolSummaryChunkHistoryItem;
+  | SubagentToolSummaryChunkHistoryItem
+  | DynamicToolCallChunkHistoryItem;
 
 export type SubagentToolSummaryChunkHistoryItem = {
   type: 'tool_summary_chunk';
@@ -418,6 +419,11 @@ export type SubagentToolSummaryHistoryItem = {
   data: { summary: string };
 };
 
+export type DynamicToolCallChunkHistoryItem = {
+  type: 'dynamic_tool_call_chunk';
+  data: { chunk: string };
+};
+
 export type SubagentThoughtHistoryItem = Extract<
   SubagentHistoryItem,
   { type: 'thought' }

packages/core/src/agents/executor.ts

@@ -1076,6 +1076,11 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
                 functionCall.name,
                 goal,
                 this.definition.modelConfig,
+                (chunk) => {
+                  this.emitActivity('DYNAMIC_TOOL_CALL_CHUNK', {
+                    chunk,
+                  });
+                },
               );
             // Preserve the original goal in the new function call's arguments for summarization.
             if (goal) {

packages/core/src/agents/invocation.ts

@@ -136,6 +136,13 @@ export class SubagentInvocation<
               )}`,
             );
             break;
+          case 'DYNAMIC_TOOL_CALL_CHUNK':
+            updateOutput(
+              `GEMINI_SUBAGENT_DYNAMIC_TOOL_CALL_CHUNK::${JSON.stringify(
+                activity.data,
+              )}`,
+            );
+            break;
           case 'ERROR':
             updateOutput(
               `GEMINI_SUBAGENT_ERROR::${JSON.stringify(activity.data)}`,

packages/core/src/agents/types.ts

@@ -46,6 +46,7 @@ export interface SubagentActivityEvent {
   agentName: string;
   type:
     | 'TOOL_CALL_START'
+    | 'DYNAMIC_TOOL_CALL_CHUNK'
     | 'TOOL_CALL_END'
     | 'THOUGHT_CHUNK'
     | 'ERROR'

packages/core/src/services/toolCallService.ts

@@ -84,6 +84,7 @@ export class ToolCallService {
     toolName: string,
     goal: string,
     modelConfig: ModelConfig | OllamaModelConfig,
+    onChunk?: (chunk: string) => void,
   ): Promise<FunctionCall> {
     const tool = this.toolRegistry.getTool(toolName);
     if (!tool) {
@@ -144,6 +145,9 @@ Respond with only the JSON for the tool call. Do not include any other text or m
 
         if (text) {
           textResponse = text;
+          if (onChunk) {
+            onChunk(text);
+          }
         }
       }
     }