Thread includeToolCall through properly from sdk

Author: jahooma

cli/src/components/message-block.tsx

@@ -130,10 +130,7 @@ export const MessageBlock = ({
     if (toolBlock.toolName === 'end_turn') {
       return null
     }
-    if (
-      'includeToolCall' in toolBlock.input &&
-      toolBlock.input.includeToolCall === false
-    ) {
+    if ('includeToolCall' in toolBlock && toolBlock.includeToolCall === false) {
       return null
     }
 

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

@@ -1056,7 +1056,7 @@ export const useSendMessage = ({
             }
 
             if (event.type === 'tool_call' && event.toolCallId) {
-              const { toolCallId, toolName, input, agentId } = event
+              const { toolCallId, toolName, input, agentId, includeToolCall } = event
 
               if (toolName === 'spawn_agents' && input?.agents) {
                 const agents = Array.isArray(input.agents) ? input.agents : []
@@ -1136,6 +1136,7 @@ export const useSendMessage = ({
                           toolName,
                           input,
                           agentId,
+                          ...(includeToolCall !== undefined && { includeToolCall }),
                         }
 
                         return {
@@ -1165,6 +1166,7 @@ export const useSendMessage = ({
                       toolName,
                       input,
                       agentId,
+                      ...(includeToolCall !== undefined && { includeToolCall }),
                     }
 
                     return {

cli/src/types/chat.ts

@@ -28,6 +28,7 @@ export type ContentBlock =
       output?: string
       outputRaw?: unknown
       agentId?: string
+      includeToolCall?: boolean
     }
   | {
       type: 'agent'

common/src/types/print-mode.ts

@@ -31,6 +31,7 @@ export const printModeToolCallSchema = z.object({
   input: z.record(z.string(), z.any()),
   agentId: z.string().optional(),
   parentAgentId: z.string().optional(),
+  includeToolCall: z.boolean().optional(),
 })
 export type PrintModeToolCall = z.infer<typeof printModeToolCallSchema>
 

packages/agent-runtime/src/tools/tool-executor.ts

@@ -205,6 +205,8 @@ export function executeToolCall<T extends ToolName>(
     input: toolCall.input,
     // Only include agentId for subagents (agents with a parent)
     ...(state.agentState?.parentId && { agentId: state.agentState.agentId }),
+    // Include includeToolCall flag if explicitly set to false
+    ...(excludeToolFromMessageHistory && { includeToolCall: false }),
   })
 
   toolCalls.push(toolCall)
@@ -442,6 +444,8 @@ export async function executeCustomToolCall(
     input: toolCall.input,
     // Only include agentId for subagents (agents with a parent)
     ...(state.agentState?.parentId && { agentId: state.agentState.agentId }),
+    // Include includeToolCall flag if explicitly set to false
+    ...(excludeToolFromMessageHistory && { includeToolCall: false }),
   })
 
   toolCalls.push(toolCall)