Exclude tool results as well when includeToolCall = false

Author: jahooma

backend/src/__tests__/run-programmatic-step.test.ts

@@ -120,7 +120,6 @@ describe('runProgrammaticStep', () => {
       clientSessionId: 'test-session',
       fingerprintId: 'test-fingerprint',
       onResponseChunk: () => {},
-      agentType: 'test-agent' as any,
       fileContext: mockFileContext,
       assistantMessage: undefined,
       assistantPrefix: undefined,

backend/src/__tests__/sandbox-generator.test.ts

@@ -114,7 +114,6 @@ describe('QuickJS Sandbox Generator', () => {
     mockAgentState.agentType = 'test-vm-agent-error'
 
     mockParams.template = mockTemplate
-    mockParams.agentType = 'test-vm-agent-error'
     mockParams.params = {}
     mockParams.localAgentTemplates = { 'test-vm-agent-error': mockTemplate }
 

backend/src/run-agent-step.ts

@@ -566,7 +566,6 @@ export const loopAgentSteps = async (
             clientSessionId,
             fingerprintId,
             onResponseChunk,
-            agentType,
             fileContext,
             ws,
             template: agentTemplate,

backend/src/run-programmatic-step.ts

@@ -18,10 +18,7 @@ import type {
   ToolResultPart,
 } from '@codebuff/common/types/messages/content-part'
 import type { PrintModeEvent } from '@codebuff/common/types/print-mode'
-import type {
-  AgentState,
-  AgentTemplateType,
-} from '@codebuff/common/types/session-state'
+import type { AgentState } from '@codebuff/common/types/session-state'
 import type { ProjectFileContext } from '@codebuff/common/util/file'
 import type { WebSocket } from 'ws'
 
@@ -54,7 +51,6 @@ export async function runProgrammaticStep(
     clientSessionId,
     fingerprintId,
     onResponseChunk,
-    agentType,
     fileContext,
     ws,
     localAgentTemplates,
@@ -68,7 +64,6 @@ export async function runProgrammaticStep(
     clientSessionId: string
     fingerprintId: string
     onResponseChunk: (chunk: string | PrintModeEvent) => void
-    agentType: AgentTemplateType
     fileContext: ProjectFileContext
     ws: WebSocket
     localAgentTemplates: Record<string, AgentTemplate>
@@ -194,9 +189,9 @@ export async function runProgrammaticStep(
         )
       }
 
+      const excludeToolFromMessageHistory = toolCall?.includeToolCall === false
       // Add assistant message with the tool call before executing it
-      // Exception: don't add tool call message for add_message since it adds its own message
-      if (toolCall?.includeToolCall !== false) {
+      if (!excludeToolFromMessageHistory) {
         const toolCallString = getToolCallString(
           toolCall.toolName,
           toolCall.input,
@@ -232,6 +227,7 @@ export async function runProgrammaticStep(
         state,
         userId,
         autoInsertEndStepParam: true,
+        excludeToolFromMessageHistory,
       })
 
       // TODO: Remove messages from state and always use agentState.messageHistory.

backend/src/tools/tool-executor.ts

@@ -126,6 +126,7 @@ export interface ExecuteToolCallParams<T extends string = ToolName> {
   state: Record<string, any>
   userId: string | undefined
   autoInsertEndStepParam?: boolean
+  excludeToolFromMessageHistory?: boolean
 }
 
 export function executeToolCall<T extends ToolName>({
@@ -145,6 +146,7 @@ export function executeToolCall<T extends ToolName>({
   state,
   userId,
   autoInsertEndStepParam = false,
+  excludeToolFromMessageHistory = false,
 }: ExecuteToolCallParams<T>): Promise<void> {
   const toolCall: CodebuffToolCall<T> | ToolCallError = parseRawToolCall<T>(
     {
@@ -264,10 +266,12 @@ export function executeToolCall<T extends ToolName>({
 
     toolResults.push(toolResult)
 
-    state.messages.push({
-      role: 'tool' as const,
-      content: toolResult,
-    })
+    if (!excludeToolFromMessageHistory) {
+      state.messages.push({
+        role: 'tool' as const,
+        content: toolResult,
+      })
+    }
   })
 }
 
@@ -363,6 +367,7 @@ export function executeCustomToolCall({
   state,
   userId,
   autoInsertEndStepParam = false,
+  excludeToolFromMessageHistory = false,
 }: ExecuteToolCallParams<string>): Promise<void> {
   const toolCall: CustomToolCall | ToolCallError = parseRawCustomToolCall(
     fileContext.customToolDefinitions,
@@ -461,10 +466,12 @@ export function executeCustomToolCall({
 
       toolResults.push(toolResult)
 
-      state.messages.push({
-        role: 'tool' as const,
-        content: toolResult,
-      } satisfies Message)
+      if (!excludeToolFromMessageHistory) {
+        state.messages.push({
+          role: 'tool' as const,
+          content: toolResult,
+        } satisfies Message)
+      }
       return
     })
 }