Refactor processFileBlock to accept logger as parameter

Updated processFileBlock and handleLargeFile functions to receive logger
via params object instead of importing it directly. Updated all callers
including write-file handler and tests.

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

Author: charleslien

backend/src/__tests__/process-file-block.test.ts

@@ -9,19 +9,17 @@ import { applyPatch } from 'diff'
 
 import { processFileBlock } from '../process-file-block'
 
+import type { Logger } from '@codebuff/types/logger'
+
+const logger: Logger = {
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+}
+
 describe('processFileBlockModule', () => {
   beforeAll(() => {
-    // Mock logger
-    mockModule('@codebuff/backend/util/logger', () => ({
-      logger: {
-        debug: () => {},
-        error: () => {},
-        info: () => {},
-        warn: () => {},
-      },
-      withLoggerContext: async (context: any, fn: () => Promise<any>) => fn(),
-    }))
-
     // Mock database interactions
     mockModule('pg-pool', () => ({
       Pool: class {
@@ -87,6 +85,7 @@ describe('processFileBlockModule', () => {
         fingerprintId: 'fingerprintId',
         userInputId: 'userInputId',
         userId: TEST_USER_ID,
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -123,6 +122,7 @@ describe('processFileBlockModule', () => {
         fingerprintId: 'fingerprintId',
         userInputId: 'userInputId',
         userId: TEST_USER_ID,
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -155,6 +155,7 @@ describe('processFileBlockModule', () => {
         fingerprintId: 'fingerprintId',
         userInputId: 'userInputId',
         userId: TEST_USER_ID,
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -180,6 +181,7 @@ describe('processFileBlockModule', () => {
         fingerprintId: 'fingerprintId',
         userInputId: 'userInputId',
         userId: TEST_USER_ID,
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -226,6 +228,7 @@ describe('processFileBlockModule', () => {
         fingerprintId: 'fingerprintId',
         userInputId: 'userInputId',
         userId: TEST_USER_ID,
+        logger,
       })
 
       expect(result).not.toBeNull()

backend/src/process-file-block.ts

@@ -9,9 +9,10 @@ import {
   retryDiffBlocksPrompt,
 } from './generate-diffs-prompt'
 import { promptAiSdk } from './llm-apis/vercel-ai-sdk/ai-sdk'
-import { logger } from './util/logger'
 import { countTokens } from './util/token-counter'
 
+import type { Logger } from '@codebuff/types/logger'
+
 import type { Message } from '@codebuff/common/types/messages/codebuff-message'
 
 export async function processFileBlock(params: {
@@ -26,6 +27,7 @@ export async function processFileBlock(params: {
   fingerprintId: string
   userInputId: string
   userId: string | undefined
+  logger: Logger
 }): Promise<
   | {
       tool: 'write_file'
@@ -52,6 +54,7 @@ export async function processFileBlock(params: {
     fingerprintId,
     userInputId,
     userId,
+    logger,
   } = params
   const initialContent = await initialContentPromise
 
@@ -118,6 +121,7 @@ export async function processFileBlock(params: {
       userInputId,
       userId,
       filePath: path,
+      logger,
     })
 
     if (!largeFileContent) {
@@ -232,6 +236,7 @@ export async function handleLargeFile(params: {
   userInputId: string
   userId: string | undefined
   filePath: string
+  logger: Logger
 }): Promise<string | null> {
   const {
     oldContent,
@@ -241,6 +246,7 @@ export async function handleLargeFile(params: {
     userInputId,
     userId,
     filePath,
+    logger,
   } = params
   const startTime = Date.now()
 

backend/src/tools/handlers/tool/write-file.ts

@@ -1,9 +1,10 @@
 import { partition } from 'lodash'
 
 import { processFileBlock } from '../../../process-file-block'
-import { logger } from '../../../util/logger'
 import { requestOptionalFile } from '../../../websockets/websocket-action'
 
+import type { Logger } from '@codebuff/types/logger'
+
 import type { CodebuffToolHandlerFunction } from '../handler-function-type'
 import type {
   ClientToolCall,
@@ -94,13 +95,14 @@ export const handleWriteFile = (({
     fullResponse?: string
     prompt?: string
     messages?: Message[]
+    logger?: Logger
   } & OptionalFileProcessingState
 }): {
   result: Promise<CodebuffToolOutput<'write_file'>>
   state: FileProcessingState
 } => {
   const { path, instructions, content } = toolCall.input
-  const { ws, fingerprintId, userId, fullResponse, prompt } = state
+  const { ws, fingerprintId, userId, fullResponse, prompt, logger } = state
   if (!ws) {
     throw new Error('Internal error for write_file: Missing WebSocket in state')
   }
@@ -117,6 +119,9 @@ export const handleWriteFile = (({
   if (!agentMessagesUntruncated) {
     throw new Error('Internal error for write_file: Missing messages in state')
   }
+  if (!logger) {
+    throw new Error('Internal error for write_file: Missing logger in state')
+  }
 
   // Initialize state for this file path if needed
   if (!fileProcessingPromisesByPath[path]) {
@@ -151,6 +156,7 @@ export const handleWriteFile = (({
     fingerprintId,
     userInputId,
     userId,
+    logger,
   })
     .catch((error) => {
       logger.error(error, 'Error processing write_file block')

plans/logger-refactor-plan.md

@@ -1,26 +1,30 @@
 ## Plan: Refactor Logger to Pass as Parameter
 
 ### Step 1: Search for logger imports
+
 - Use `code_search` with pattern `import \{ logger` (escape curly braces)
 - Set `cwd: "backend"` to limit search scope
 - Exclude websocket-action.ts files
 
 ### Step 2: For each file (except websocket-action.ts)
+
 - Remove the `import { logger }` line
 - Refactor function signature to use single `params` object containing all arguments including `logger: Logger`
 - Import proper type: `import type { Logger } from '@codebuff/types/logger'`
   - Don't manually type as `{ debug: Function; ... }` - will fail typecheck
 - Add destructuring at top of function body to extract params
 
 ### Step 3: Update all callers
+
 - **Always run full `bun run typecheck`** (not head/tail!) to find ALL errors
 - Update function calls to pass object with named properties
-- For tests: create mock logger constant with all 5 methods (debug, info, warn, error, fatal)
+- For tests: create mock logger constant called `logger` with all 4 methods (debug, info, warn, error)
 - Use `allowMultiple: true` in str_replace when updating multiple calls in same file
 - **Check carefully** - there may be multiple call sites in the same file!
 - Repeat typecheck until ALL errors resolved
 
 ### Step 4: Commit changes
+
 - **Do NOT use git-committer agent** - it's too slow
 - Instead, manually run: `git add <files>` then `git commit -m "<message>"`
 - Keep commit message concise but descriptive