Change tool result to be string result instead of wrapper object

Author: jahooma

.agents/researcher.ts

@@ -50,7 +50,7 @@ Always end your response with the end_turn tool.\
   handleSteps: function* ({ agentState, prompt, params }) {
     yield {
       toolName: 'web_search',
-      args: { query: prompt },
+      args: { query: prompt ?? '', depth: 'standard' },
     }
     yield 'STEP_ALL'
   },

.agents/sonnet4-agent-builder.ts

@@ -127,13 +127,13 @@ IMPORTANT: Always end your response with the end_turn tool when you have complet
       },
     }
 
-    if (configResult?.result) {
+    if (configResult) {
       yield {
         toolName: 'write_file',
         args: {
           path: TEMPLATE_TYPES_PATH,
           instructions: 'Create agent template type definitions file',
-          content: configResult.result,
+          content: configResult,
         },
       }
     }
@@ -146,13 +146,13 @@ IMPORTANT: Always end your response with the end_turn tool when you have complet
       },
     }
 
-    if (toolsResult?.result) {
+    if (toolsResult) {
       yield {
         toolName: 'write_file',
         args: {
           path: TOOL_DEFINITIONS_PATH,
           instructions: 'Create tools type file',
-          content: toolsResult.result,
+          content: toolsResult,
         },
       }
     }
@@ -169,8 +169,8 @@ IMPORTANT: Always end your response with the end_turn tool when you have complet
       },
     }
 
-    if (exampleAgentsResult?.result) {
-      const exampleFiles = exampleAgentsResult.result
+    if (exampleAgentsResult) {
+      const exampleFiles = exampleAgentsResult
         .split('\n\n')
         .filter(Boolean)
 

.agents/types/agent-config.d.ts

@@ -151,7 +151,7 @@ export interface AgentConfig {
   ) => Generator<
     ToolCall | 'STEP' | 'STEP_ALL',
     void,
-    { agentState: AgentState; toolResult: ToolResult | undefined }
+    { agentState: AgentState; toolResult: string | undefined }
   >
 }
 

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

@@ -378,7 +378,7 @@ describe('runProgrammaticStep', () => {
 
     it('should comprehensively test STEP_ALL functionality with multiple tools and state management', async () => {
       // Track all tool results and state changes for verification
-      const toolResultsReceived: (ToolResult | undefined)[] = []
+      const toolResultsReceived: (string | undefined)[] = []
       const stateSnapshots: AgentState[] = []
       let stepCount = 0
 
@@ -573,10 +573,9 @@ describe('runProgrammaticStep', () => {
 
       // Verify tool results were passed back to generator
       expect(toolResultsReceived).toHaveLength(7)
-      expect(toolResultsReceived[0]?.toolName).toBe('read_files')
-      expect(toolResultsReceived[0]?.result).toContain('authenticate')
-      expect(toolResultsReceived[3]?.toolName).toBe('add_subgoal')
-      expect(toolResultsReceived[6]?.toolName).toBe('set_output')
+      expect(toolResultsReceived[0]).toContain('authenticate')
+      expect(toolResultsReceived[3]).toContain('auth-analysis')
+      expect(toolResultsReceived[6]).toContain('Output set successfully')
 
       // Verify state management throughout execution
       expect(stateSnapshots).toHaveLength(7)
@@ -638,7 +637,7 @@ describe('runProgrammaticStep', () => {
 
     it('should pass tool results back to generator', async () => {
       const toolResults: ToolResult[] = []
-      let receivedToolResult: ToolResult | undefined
+      let receivedToolResult: string | undefined
 
       const mockGenerator = (function* () {
         const input1 = yield {
@@ -664,11 +663,7 @@ describe('runProgrammaticStep', () => {
 
       await runProgrammaticStep(mockAgentState, mockParams)
 
-      expect(receivedToolResult).toEqual({
-        toolName: 'read_files',
-        toolCallId: 'test-id',
-        result: 'file content',
-      })
+      expect(receivedToolResult).toEqual('file content')
     })
   })
 

backend/src/run-programmatic-step.ts

@@ -148,7 +148,7 @@ export async function runProgrammaticStep(
     messages: agentState.messageHistory.map((msg) => ({ ...msg })),
   }
 
-  let toolResult: ToolResult | undefined
+  let toolResult: string | undefined
   let endTurn = false
 
   try {
@@ -232,7 +232,7 @@ export async function runProgrammaticStep(
       state.agentState.messageHistory = state.messages
 
       // Get the latest tool result
-      toolResult = toolResults[toolResults.length - 1]
+      toolResult = toolResults[toolResults.length - 1]?.result
 
       if (toolCall.toolName === 'end_turn') {
         endTurn = true

backend/src/templates/agents/file-explorer.ts

@@ -53,7 +53,7 @@ export const fileExplorer = {
     yield {
       toolName: 'set_output' as const,
       args: {
-        results: spawnResult?.result,
+        results: spawnResult,
       },
     }
   },

backend/src/templates/agents/thinking-base.ts

@@ -45,10 +45,7 @@ export const thinkingBase = (
           ],
         },
       }
-      const { toolResult: thinkResult } = yield 'STEP'
-      if (thinkResult?.toolName === 'end_turn') {
-        break
-      }
+      yield 'STEP'
     }
   },
 })

common/src/types/agent-template.ts

@@ -36,7 +36,7 @@ export type AgentTemplate<
 export type StepGenerator = Generator<
   Omit<ToolCall, 'toolCallId'> | 'STEP' | 'STEP_ALL', // Generic tool call type
   void,
-  { agentState: AgentState; toolResult: ToolResult | undefined }
+  { agentState: AgentState; toolResult: string | undefined }
 >
 
 export type StepHandler<

common/src/util/types/agent-config.d.ts

@@ -139,10 +139,7 @@ export interface AgentConfig {
    *       ],
    *     },
    *   }
-   *   const { toolResult: thinkResult } = yield 'STEP'
-   *   if (thinkResult?.toolName === 'end_turn') {
-   *     break
-   *   }
+   *   yield 'STEP'
    * }
    * }
    */