pr comments

Author: pranav100000

packages/agent-runtime/src/run-programmatic-step.ts

@@ -82,7 +82,7 @@ export async function runProgrammaticStep(
     | 'toolCallId'
     | 'toolCalls'
     | 'toolResults'
-    | 'toolResultsToAddAfterStream'
+    | 'toolResultsToAddToMessageHistory'
   > &
     ParamsExcluding<
       AddAgentStepFn,
@@ -428,7 +428,7 @@ type ExecuteToolCallsArrayParams = Omit<
   | 'autoInsertEndStepParam'
   | 'excludeToolFromMessageHistory'
   | 'toolCallId'
-  | 'toolResultsToAddAfterStream'
+  | 'toolResultsToAddToMessageHistory'
 > & {
   agentState: AgentState
   onResponseChunk: (chunk: string | PrintModeEvent) => void
@@ -494,7 +494,7 @@ async function executeSingleToolCall(
     excludeToolFromMessageHistory,
     fromHandleSteps: true,
     toolCallId,
-    toolResultsToAddAfterStream: [],
+    toolResultsToAddToMessageHistory: [],
 
     onResponseChunk: (chunk: string | PrintModeEvent) => {
       if (typeof chunk === 'string') {

packages/agent-runtime/src/tools/stream-parser.ts

@@ -14,7 +14,7 @@ import {
   executeToolCall,
   tryTransformAgentToolCall,
 } from './tool-executor'
-import { expireMessages, withSystemTags } from '../util/messages'
+import { withSystemTags } from '../util/messages'
 
 import type { CustomToolCall, ExecuteToolCallParams } from './tool-executor'
 import type { AgentTemplate } from '../templates/types'
@@ -60,7 +60,7 @@ export async function processStream(
     | 'toolCalls'
     | 'toolName'
     | 'toolResults'
-    | 'toolResultsToAddAfterStream'
+    | 'toolResultsToAddToMessageHistory'
   > &
     ParamsExcluding<
       typeof processStreamWithTools,
@@ -84,14 +84,11 @@ export async function processStream(
     userId,
   } = params
   const fullResponseChunks: string[] = [fullResponse]
-  const messageHistoryBeforeStream = expireMessages(
-    agentState.messageHistory,
-    'agentStep',
-  )
+  const messageHistoryBeforeStream = [...agentState.messageHistory]
 
   // === MUTABLE STATE ===
   const toolResults: ToolMessage[] = []
-  const toolResultsToAddAfterStream: ToolMessage[] = []
+  const toolResultsToAddToMessageHistory: ToolMessage[] = []
   const toolCalls: (CodebuffToolCall | CustomToolCall)[] = []
   const assistantMessages: Message[] = []
   let hadToolCallError = false
@@ -149,7 +146,7 @@ export async function processStream(
   // isXmlMode=false: defer execution, results added at end (for native tool calls)
   function createToolExecutionCallback(toolName: string, isXmlMode: boolean) {
     const responseHandler = createResponseHandler(isXmlMode)
-    const resultsArray = isXmlMode ? [] : toolResultsToAddAfterStream
+    const resultsArray = isXmlMode ? [] : toolResultsToAddToMessageHistory
 
     return {
       onTagStart: () => {},
@@ -188,14 +185,14 @@ export async function processStream(
               : (toolName as ToolName),
             input: transformed ? transformed.input : input,
             fromHandleSteps: false,
-            skipDirectResultPush: true,
+
             fileProcessingState,
             fullResponse: fullResponseChunks.join(''),
             previousToolCallFinished: previousPromise,
             toolCallId,
             toolCalls,
             toolResults,
-            toolResultsToAddAfterStream: resultsArray,
+            toolResultsToAddToMessageHistory: resultsArray,
             onCostCalculated,
             onResponseChunk: responseHandler,
           })
@@ -205,14 +202,14 @@ export async function processStream(
             ...params,
             toolName,
             input,
-            skipDirectResultPush: true,
+
             fileProcessingState,
             fullResponse: fullResponseChunks.join(''),
             previousToolCallFinished: previousPromise,
             toolCallId,
             toolCalls,
             toolResults,
-            toolResultsToAddAfterStream: resultsArray,
+            toolResultsToAddToMessageHistory: resultsArray,
             onResponseChunk: responseHandler,
           })
         }
@@ -250,7 +247,7 @@ export async function processStream(
         content: jsonToolResult({ errorMessage: error }),
       }
       toolResults.push(cloneDeep(toolResult))
-      toolResultsToAddAfterStream.push(cloneDeep(toolResult))
+      toolResultsToAddToMessageHistory.push(cloneDeep(toolResult))
     },
     loggerOptions: {
       userId,
@@ -344,7 +341,7 @@ export async function processStream(
   agentState.messageHistory = buildArray<Message>([
     ...messageHistoryBeforeStream,
     ...assistantMessages,
-    ...toolResultsToAddAfterStream,
+    ...toolResultsToAddToMessageHistory,
     ...errorMessages,
   ])
 

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

@@ -120,8 +120,7 @@ export type ExecuteToolCallParams<T extends string = ToolName> = {
   toolCallId: string | undefined
   toolCalls: (CodebuffToolCall | CustomToolCall)[]
   toolResults: ToolMessage[]
-  toolResultsToAddAfterStream: ToolMessage[]
-  skipDirectResultPush?: boolean
+  toolResultsToAddToMessageHistory: ToolMessage[]
   userId: string | undefined
   userInputId: string
 
@@ -146,7 +145,7 @@ export async function executeToolCall<T extends ToolName>(
     previousToolCallFinished,
     toolCalls,
     toolResults,
-    toolResultsToAddAfterStream,
+    toolResultsToAddToMessageHistory,
     userInputId,
 
     onCostCalculated,
@@ -351,11 +350,7 @@ export async function executeToolCall<T extends ToolName>(
     toolResults.push(toolResult)
 
     if (!excludeToolFromMessageHistory) {
-      toolResultsToAddAfterStream.push(toolResult)
-    }
-
-    if (!excludeToolFromMessageHistory && !params.skipDirectResultPush) {
-      agentState.messageHistory.push(toolResult)
+      toolResultsToAddToMessageHistory.push(toolResult)
     }
 
     // After tool completes, resolve any pending creditsUsed promise
@@ -454,7 +449,7 @@ export async function executeCustomToolCall(
     toolCallId,
     toolCalls,
     toolResults,
-    toolResultsToAddAfterStream,
+    toolResultsToAddToMessageHistory,
     userInputId,
   } = params
   const toolCall: CustomToolCall | ToolCallError = parseRawCustomToolCall({
@@ -565,13 +560,10 @@ export async function executeCustomToolCall(
       toolResults.push(toolResult)
 
       if (!excludeToolFromMessageHistory) {
-        toolResultsToAddAfterStream.push(toolResult)
+        toolResultsToAddToMessageHistory.push(toolResult)
       }
 
-      if (!excludeToolFromMessageHistory && !params.skipDirectResultPush) {
-        agentState.messageHistory.push(toolResult)
-      }
-      return
+        return
     })
 }
 

packages/internal/src/openai-compatible/chat/convert-to-openai-compatible-chat-messages.ts

@@ -138,25 +138,5 @@ export function convertToOpenAICompatibleChatMessages(
     }
   }
 
-  // Debug: dump OpenAI-format message summary to catch tool_use_id mismatches
-  console.error('[SDK DEBUG] OpenAI-format messages (' + messages.length + '):')
-  for (let i = 0; i < messages.length; i++) {
-    const m = messages[i] as Record<string, unknown>
-    const role = m.role as string
-    if (role === 'tool') {
-      console.error(`  [${i}] tool tool_call_id=${(m as { tool_call_id?: string }).tool_call_id}`)
-    } else if (role === 'assistant') {
-      const toolCalls = (m as { tool_calls?: Array<{ id: string; function?: { name: string } }> }).tool_calls
-      if (toolCalls?.length) {
-        const ids = toolCalls.map(tc => `${tc.function?.name}:${tc.id}`)
-        console.error(`  [${i}] assistant tool_calls=[${ids.join(', ')}]`)
-      } else {
-        console.error(`  [${i}] assistant (text)`)
-      }
-    } else {
-      console.error(`  [${i}] ${role}`)
-    }
-  }
-
   return messages
 }

sdk/src/impl/llm.ts

@@ -225,34 +225,11 @@ export async function* promptAiSdkStream(
     }
   }
 
-  const convertedMessages = convertCbToModelMessages(params)
-
-  // Debug: dump message summary to catch tool_use_id mismatches before they hit the API
-  console.error('[SDK DEBUG] promptAiSdkStream messages (' + convertedMessages.length + '):')
-  for (let i = 0; i < convertedMessages.length; i++) {
-    const m = convertedMessages[i] as Record<string, unknown>
-    const role = m.role as string
-    const content = m.content
-    if (role === 'tool' && Array.isArray(content)) {
-      const toolIds = (content as Array<{ toolCallId?: string; type?: string }>)
-        .filter(c => c.type === 'tool-result')
-        .map(c => c.toolCallId)
-      console.error(`  [${i}] ${role} toolCallIds=${JSON.stringify(toolIds)}`)
-    } else if (role === 'assistant' && Array.isArray(content)) {
-      const parts = (content as Array<{ type?: string; toolCallId?: string; toolName?: string }>)
-        .map(c => c.type === 'tool-call' ? `tool-call(${c.toolName}:${c.toolCallId})` : c.type)
-      console.error(`  [${i}] ${role} parts=[${parts.join(', ')}]`)
-    } else {
-      const tags = (m as { tags?: string[] }).tags
-      console.error(`  [${i}] ${role}${tags ? ' tags=' + JSON.stringify(tags) : ''}`)
-    }
-  }
-
   const response = streamText({
     ...params,
     prompt: undefined,
     model: aiSDKModel,
-    messages: convertedMessages,
+    messages: convertCbToModelMessages(params),
     // When using Claude OAuth, disable retries so we can immediately fall back to Codebuff
     // backend on rate limit errors instead of retrying 4 times first
     ...(isClaudeOAuth && { maxRetries: 0 }),