Better errors / logging for handleSteps & mainPrompt

Author: jahooma

backend/src/main-prompt.ts

@@ -202,6 +202,8 @@ export const mainPrompt = async (
     localAgentTemplates,
   })
 
+  logger.debug({ agentState }, 'Main prompt finished')
+
   return {
     sessionState: {
       fileContext,

backend/src/run-programmatic-step.ts

@@ -183,6 +183,12 @@ export async function runProgrammaticStep(
         toolCallId: crypto.randomUUID(),
       } as CodebuffToolCall
 
+      if (!template.toolNames.includes(toolCall.toolName)) {
+        throw new Error(
+          `Tool ${toolCall.toolName} is not available for agent ${template.id}. Available tools: ${template.toolNames.join(', ')}`,
+        )
+      }
+
       // 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.toolName !== 'add_message') {
@@ -239,20 +245,20 @@ export async function runProgrammaticStep(
   } catch (error) {
     endTurn = true
 
+    const errorMessage = `Error executing handleSteps for agent ${template.id}: ${
+      error instanceof Error ? error.message : 'Unknown error'
+    }`
     logger.error(
       { error: getErrorObject(error), template: template.id },
-      'Programmatic agent execution failed',
+      errorMessage,
     )
 
-    const errorMessage = `Error executing handleSteps for agent ${template.id}: ${
-      error instanceof Error ? error.message : 'Unknown error'
-    }`
     onResponseChunk(errorMessage)
 
     state.agentState.messageHistory = [
       ...state.messages,
       {
-        role: 'user' as const,
+        role: 'assistant' as const,
         content: errorMessage,
       },
     ]

backend/src/websockets/websocket-action.ts

@@ -31,6 +31,7 @@ import type {
 } from '@codebuff/common/actions'
 import type { ClientMessage } from '@codebuff/common/websockets/websocket-schema'
 import type { WebSocket } from 'ws'
+import { getErrorObject } from '@codebuff/common/util/error'
 
 /**
  * Sends an action to the client via WebSocket
@@ -162,7 +163,7 @@ const onPrompt = async (
           clientSessionId,
         })
       } catch (e) {
-        logger.error(e, 'Error in mainPrompt')
+        logger.error({ error: getErrorObject(e) }, 'Error in mainPrompt')
         let response =
           e && typeof e === 'object' && 'message' in e ? `${e.message}` : `${e}`