Refactor utility functions and middleware to pass logger as parameter

Refactored the following files to accept logger as a parameter instead of importing it directly:
- util/simplify-tool-results.ts: simplifyTerminalCommandResults now takes logger param
- util/messages.ts: All message utility functions now accept logger param
- util/check-auth.ts: checkAuth and checkAdmin refactored with logger param
- util/quickjs-sandbox.ts: dispose methods now require logger param
- Updated all callers in production code and test files
- Updated plan documentation with clearer instructions for test logger naming

🤖 Generated with Codebuff
Co-Authored-By: Codebuff <noreply@codebuff.com>

Author: charleslien

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

@@ -1,7 +1,3 @@
-import {
-  clearMockedModules,
-  mockModule,
-} from '@codebuff/common/testing/mock-modules'
 import {
   getInitialAgentState,
   type AgentState,
@@ -18,8 +14,16 @@ import * as requestContext from '../websockets/request-context'
 import * as websocketAction from '../websockets/websocket-action'
 
 import type { AgentTemplate } from '../templates/types'
+import type { Logger } from '@codebuff/types/logger'
 import type { WebSocket } from 'ws'
 
+const logger: Logger = {
+  debug: () => {},
+  error: () => {},
+  info: () => {},
+  warn: () => {},
+}
+
 describe('QuickJS Sandbox Generator', () => {
   let mockAgentState: AgentState
   let mockParams: any
@@ -41,17 +45,6 @@ describe('QuickJS Sandbox Generator', () => {
         'mock-uuid-0000-0000-0000-000000000000' as `${string}-${string}-${string}-${string}-${string}`,
     )
 
-    // Mock logger
-    mockModule('@codebuff/backend/util/logger', () => ({
-      logger: {
-        debug: () => {},
-        error: () => {},
-        info: () => {},
-        warn: () => {},
-      },
-      withLoggerContext: async (context: any, fn: () => Promise<any>) => fn(),
-    }))
-
     // Reuse common test data structure
     mockAgentState = {
       ...getInitialAgentState(),
@@ -85,6 +78,7 @@ describe('QuickJS Sandbox Generator', () => {
 
     // Common params structure
     mockParams = {
+      agentState: mockAgentState,
       template: mockTemplate,
       prompt: 'Test prompt',
       params: { testParam: 'value' },
@@ -101,12 +95,12 @@ describe('QuickJS Sandbox Generator', () => {
       localAgentTemplates: {},
       stepsComplete: false,
       stepNumber: 1,
+      logger,
     }
   })
 
   afterEach(() => {
     clearAgentGeneratorCache()
-    clearMockedModules()
   })
 
   test('should execute string-based generator in QuickJS sandbox', async () => {
@@ -126,7 +120,7 @@ describe('QuickJS Sandbox Generator', () => {
     mockParams.template = mockTemplate
     mockParams.localAgentTemplates = { 'test-vm-agent': mockTemplate }
 
-    const result = await runProgrammaticStep(mockAgentState, mockParams)
+    const result = await runProgrammaticStep(mockParams)
 
     expect(result.agentState.output).toEqual({
       message: 'Hello from QuickJS sandbox!',
@@ -155,7 +149,7 @@ describe('QuickJS Sandbox Generator', () => {
     mockParams.params = {}
     mockParams.localAgentTemplates = { 'test-vm-agent-error': mockTemplate }
 
-    const result = await runProgrammaticStep(mockAgentState, mockParams)
+    const result = await runProgrammaticStep(mockParams)
 
     expect(result.endTurn).toBe(true)
     expect(result.agentState.output?.error).toContain(

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

@@ -48,6 +48,7 @@ async function usageHandler(
       fingerprintId,
       authToken,
       clientSessionId,
+      logger,
     })
     if (authResult) {
       const errorMessage =

backend/src/api/usage.ts

@@ -344,16 +344,17 @@ async function getRelevantFiles(params: {
     logger,
   } = params
   const bufferTokens = 100_000
-  const messagesWithPrompt = getMessagesSubset(
-    [
+  const messagesWithPrompt = getMessagesSubset({
+    messages: [
       ...messages,
       {
         role: 'user' as const,
         content: userPrompt,
       },
     ],
-    bufferTokens,
-  )
+    otherTokens: bufferTokens,
+    logger,
+  })
   const start = performance.now()
   let codebuffMessages = messagesWithSystem({ messages: messagesWithPrompt, system })
 
@@ -435,16 +436,17 @@ async function getRelevantFilesForTraining(params: {
     logger,
   } = params
   const bufferTokens = 100_000
-  const messagesWithPrompt = getMessagesSubset(
-    [
+  const messagesWithPrompt = getMessagesSubset({
+    messages: [
       ...messages,
       {
         role: 'user' as const,
         content: userPrompt,
       },
     ],
-    bufferTokens,
-  )
+    otherTokens: bufferTokens,
+    logger,
+  })
   const start = performance.now()
   let response = await promptAiSdk({
     messages: messagesWithSystem({ messages: messagesWithPrompt, system }),

backend/src/find-files/request-files-prompt.ts

@@ -574,7 +574,8 @@ export const loopAgentSteps = async (
           agentState: programmaticAgentState,
           endTurn,
           stepNumber,
-        } = await runProgrammaticStep(currentAgentState, {
+        } = await runProgrammaticStep({
+          agentState: currentAgentState,
           userId,
           userInputId,
           clientSessionId,
@@ -585,10 +586,11 @@ export const loopAgentSteps = async (
           template: agentTemplate,
           localAgentTemplates,
           prompt: currentPrompt,
-          params: currentParams,
+          toolCallParams: currentParams,
           system,
           stepsComplete: shouldEndTurn,
           stepNumber: totalSteps,
+          logger,
         })
         currentAgentState = programmaticAgentState
         totalSteps = stepNumber

backend/src/run-agent-step.ts

@@ -22,6 +22,7 @@ import type {
 import type { PrintModeEvent } from '@codebuff/common/types/print-mode'
 import type { AgentState } from '@codebuff/common/types/session-state'
 import type { ProjectFileContext } from '@codebuff/common/util/file'
+import type { Logger } from '@codebuff/types/logger'
 import type { WebSocket } from 'ws'
 
 // Global sandbox manager for QuickJS contexts
@@ -38,16 +39,33 @@ export function clearAgentGeneratorCache() {
   }
   runIdToStepAll.clear()
   // Clean up QuickJS sandboxes
-  sandboxManager.dispose()
+  sandboxManager.dispose({ logger })
 }
 
 // Function to handle programmatic agents
-export async function runProgrammaticStep(
-  agentState: AgentState,
-  {
+export async function runProgrammaticStep(params: {
+  agentState: AgentState
+  template: AgentTemplate
+  prompt: string | undefined
+  toolCallParams: Record<string, any> | undefined
+  system: string | undefined
+  userId: string | undefined
+  userInputId: string
+  clientSessionId: string
+  fingerprintId: string
+  onResponseChunk: (chunk: string | PrintModeEvent) => void
+  fileContext: ProjectFileContext
+  ws: WebSocket
+  localAgentTemplates: Record<string, AgentTemplate>
+  stepsComplete: boolean
+  stepNumber: number
+  logger: Logger
+}): Promise<{ agentState: AgentState; endTurn: boolean; stepNumber: number }> {
+  const {
+    agentState,
     template,
     prompt,
-    params,
+    toolCallParams,
     system,
     userId,
     userInputId,
@@ -58,24 +76,10 @@ export async function runProgrammaticStep(
     ws,
     localAgentTemplates,
     stepsComplete,
-    stepNumber,
-  }: {
-    template: AgentTemplate
-    prompt: string | undefined
-    params: Record<string, any> | undefined
-    system: string | undefined
-    userId: string | undefined
-    userInputId: string
-    clientSessionId: string
-    fingerprintId: string
-    onResponseChunk: (chunk: string | PrintModeEvent) => void
-    fileContext: ProjectFileContext
-    ws: WebSocket
-    localAgentTemplates: Record<string, AgentTemplate>
-    stepsComplete: boolean
-    stepNumber: number
-  },
-): Promise<{ agentState: AgentState; endTurn: boolean; stepNumber: number }> {
+    logger,
+  } = params
+  let { stepNumber } = params
+
   if (!template.handleSteps) {
     throw new Error('No step handler found for agent template ' + template.id)
   }
@@ -119,11 +123,12 @@ export async function runProgrammaticStep(
         initialInput: {
           agentState,
           prompt,
-          params,
+          params: toolCallParams,
           logger: streamingLogger,
         },
         config: undefined, // config
-        logger: streamingLogger, // pass the streaming logger instance for internal use
+        sandboxLogger: streamingLogger, // pass the streaming logger instance for internal use
+        logger,
       })
     } else {
       // Initialize native generator
@@ -363,7 +368,7 @@ export async function runProgrammaticStep(
     if (endTurn) {
       if (sandbox) {
         // Clean up QuickJS sandbox if execution is complete
-        sandboxManager.removeSandbox({ runId: agentState.runId })
+        sandboxManager.removeSandbox({ runId: agentState.runId, logger })
       }
       delete runIdToGenerator[agentState.runId]
       runIdToStepAll.delete(agentState.runId)