Refactor process-str-replace to accept logger as parameter

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

Author: charleslien

backend/src/__tests__/process-str-replace.test.ts

@@ -26,6 +26,15 @@ import {
   benchifyCanFixLanguage,
 } from '../tools/batch-str-replace'
 
+import type { Logger } from '@codebuff/types/logger'
+
+const logger: Logger = {
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+}
+
 describe('processStrReplace', () => {
   it('should replace exact string matches', async () => {
     const initialContent = 'const x = 1;\nconst y = 2;\n'
@@ -36,6 +45,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -56,6 +66,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -75,6 +86,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -93,6 +105,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -107,6 +120,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: 'old', new: 'new', allowMultiple: false }],
       initialContentPromise: Promise.resolve(null),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -121,6 +135,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: '', new: 'new', allowMultiple: false }],
       initialContentPromise: Promise.resolve('content'),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -139,6 +154,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -159,6 +175,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -177,6 +194,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -198,6 +216,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -221,6 +240,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements,
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -245,6 +265,7 @@ describe('processStrReplace', () => {
       path: 'test.ts',
       replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect(result).not.toBeNull()
@@ -262,11 +283,12 @@ describe('processStrReplace', () => {
       const oldStr = 'const x'
       const newStr = 'let x'
 
-      const result = await processStrReplace({
-        path: 'test.ts',
-        replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
-        initialContentPromise: Promise.resolve(initialContent),
-      })
+    const result = await processStrReplace({
+      path: 'test.ts',
+      replacements: [{ old: oldStr, new: newStr, allowMultiple: false }],
+      initialContentPromise: Promise.resolve(initialContent),
+      logger,
+    })
 
       expect(result).not.toBeNull()
       expect('error' in result).toBe(true)
@@ -285,6 +307,7 @@ describe('processStrReplace', () => {
         path: 'test.ts',
         replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -303,6 +326,7 @@ describe('processStrReplace', () => {
         path: 'test.ts',
         replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -324,6 +348,7 @@ describe('processStrReplace', () => {
         path: 'test.ts',
         replacements,
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -355,6 +380,7 @@ function test3() {
         path: 'test.ts',
         replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -378,6 +404,7 @@ function test3() {
         path: 'test.ts',
         replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -401,6 +428,7 @@ function test3() {
         path: 'test.ts',
         replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -420,6 +448,7 @@ function test3() {
         path: 'test.ts',
         replacements: [{ old: oldStr, new: newStr, allowMultiple: true }],
         initialContentPromise: Promise.resolve(initialContent),
+        logger,
       })
 
       expect(result).not.toBeNull()
@@ -451,6 +480,7 @@ function test3() {
       path: 'test.ts',
       replacements,
       initialContentPromise: Promise.resolve(initialContent),
+      logger,
     })
 
     expect('content' in result).toBe(true)

backend/src/process-str-replace.ts

@@ -1,7 +1,8 @@
 import { createPatch } from 'diff'
 
 import { tryToDoStringReplacementWithExtraIndentation } from './generate-diffs-prompt'
-import { logger } from './util/logger'
+
+import type { Logger } from '@codebuff/types/logger'
 
 function normalizeLineEndings(params: { str: string }): string {
   return params.str.replace(/\r\n/g, '\n')
@@ -11,6 +12,7 @@ export async function processStrReplace(params: {
   path: string
   replacements: { old: string; new: string; allowMultiple: boolean }[]
   initialContentPromise: Promise<string | null>
+  logger: Logger
 }): Promise<
   | {
       tool: 'str_replace'
@@ -21,7 +23,7 @@ export async function processStrReplace(params: {
     }
   | { tool: 'str_replace'; path: string; error: string }
 > {
-  const { path, replacements, initialContentPromise } = params
+  const { path, replacements, initialContentPromise, logger } = params
   const initialContent = await initialContentPromise
   if (initialContent === null) {
     return {
@@ -58,6 +60,7 @@ export async function processStrReplace(params: {
       oldStr: normalizedOldStr,
       newStr: normalizedNewStr,
       allowMultiple,
+      logger,
     })
     let updatedOldStr: string | null
 
@@ -125,8 +128,9 @@ const tryMatchOldStr = (params: {
   oldStr: string
   newStr: string
   allowMultiple: boolean
+  logger: Logger
 }): { success: true; oldStr: string } | { success: false; error: string } => {
-  const { initialContent, oldStr, newStr, allowMultiple } = params
+  const { initialContent, oldStr, newStr, allowMultiple, logger } = params
   // count the number of occurrences of oldStr in initialContent
   const count = initialContent.split(oldStr).length - 1
   if (count === 1) {

backend/src/tools/handlers/tool/str-replace.ts

@@ -67,6 +67,7 @@ export const handleStrReplace = ((params: {
     path,
     replacements,
     initialContentPromise: latestContentPromise,
+    logger,
   })
     .catch((error: any) => {
       logger.error(error, 'Error processing str_replace block')