Refactor generate-diffs-prompt.ts to pass logger as parameter

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

Author: charleslien

backend/src/__tests__/generate-diffs-prompt.test.ts

@@ -2,6 +2,15 @@ import { expect, describe, it } from 'bun:test'
 
 import { parseAndGetDiffBlocksSingleFile } from '../generate-diffs-prompt'
 
+import type { Logger } from '@codebuff/types/logger'
+
+const logger: Logger = {
+  debug: () => {},
+  info: () => {},
+  warn: () => {},
+  error: () => {},
+}
+
 describe('parseAndGetDiffBlocksSingleFile', () => {
   it('should parse diff blocks with newline before closing marker', () => {
     const oldContent = 'function test() {\n  return true;\n}\n'
@@ -16,7 +25,11 @@ function test() {
 }
 >>>>>>> REPLACE`
 
-    const result = parseAndGetDiffBlocksSingleFile(newContent, oldContent)
+    const result = parseAndGetDiffBlocksSingleFile({
+      newContent,
+      oldFileContent: oldContent,
+      logger,
+    })
     console.log(JSON.stringify({ result }))
 
     expect(result.diffBlocks.length).toBe(1)
@@ -41,7 +54,11 @@ function test() {
   return true;
 }>>>>>>> REPLACE`
 
-    const result = parseAndGetDiffBlocksSingleFile(newContent, oldContent)
+    const result = parseAndGetDiffBlocksSingleFile({
+      newContent,
+      oldFileContent: oldContent,
+      logger,
+    })
 
     expect(result.diffBlocks.length).toBe(1)
     expect(result.diffBlocksThatDidntMatch.length).toBe(0)
@@ -90,7 +107,11 @@ function subtract(a, b) {
 }
 >>>>>>> REPLACE`
 
-    const result = parseAndGetDiffBlocksSingleFile(newContent, oldContent)
+    const result = parseAndGetDiffBlocksSingleFile({
+      newContent,
+      oldFileContent: oldContent,
+      logger,
+    })
 
     expect(result.diffBlocks.length).toBe(2)
     expect(result.diffBlocksThatDidntMatch.length).toBe(0)
@@ -114,7 +135,11 @@ function subtract(a, b) {
 =======
 >>>>>>> REPLACE`
 
-    const result = parseAndGetDiffBlocksSingleFile(newContent, oldContent)
+    const result = parseAndGetDiffBlocksSingleFile({
+      newContent,
+      oldFileContent: oldContent,
+      logger,
+    })
 
     expect(result.diffBlocks.length).toBe(1)
     expect(result.diffBlocksThatDidntMatch.length).toBe(0)

backend/src/generate-diffs-prompt.ts

@@ -5,12 +5,15 @@ import {
 } from '@codebuff/common/util/file'
 
 import { promptAiSdk } from './llm-apis/vercel-ai-sdk/ai-sdk'
-import { logger } from './util/logger'
 
-export const parseAndGetDiffBlocksSingleFile = (
-  newContent: string,
-  oldFileContent: string,
-) => {
+import type { Logger } from '@codebuff/types/logger'
+
+export const parseAndGetDiffBlocksSingleFile = (params: {
+  newContent: string
+  oldFileContent: string
+  logger: Logger
+}) => {
+  const { newContent, oldFileContent, logger } = params
   const diffBlocksThatDidntMatch: {
     searchContent: string
     replaceContent: string
@@ -138,6 +141,7 @@ export async function retryDiffBlocksPrompt(params: {
   userInputId: string
   userId: string | undefined
   diffBlocksThatDidntMatch: { searchContent: string; replaceContent: string }[]
+  logger: Logger
 }) {
   const {
     filePath,
@@ -147,6 +151,7 @@ export async function retryDiffBlocksPrompt(params: {
     userInputId,
     userId,
     diffBlocksThatDidntMatch,
+    logger,
   } = params
   const newPrompt =
     `The assistant failed to find a match for the following changes. Please help the assistant understand what the changes should be.
@@ -173,7 +178,11 @@ Provide a new set of SEARCH/REPLACE changes to make the intended edit from the o
   const {
     diffBlocks: newDiffBlocks,
     diffBlocksThatDidntMatch: newDiffBlocksThatDidntMatch,
-  } = parseAndGetDiffBlocksSingleFile(response, oldContent)
+  } = parseAndGetDiffBlocksSingleFile({
+    newContent: response,
+    oldFileContent: oldContent,
+    logger,
+  })
 
   if (newDiffBlocksThatDidntMatch.length > 0) {
     logger.error(

backend/src/process-file-block.ts

@@ -298,7 +298,11 @@ Please output just the SEARCH/REPLACE blocks like this:
   })
 
   const { diffBlocks, diffBlocksThatDidntMatch } =
-    parseAndGetDiffBlocksSingleFile(response, oldContent)
+    parseAndGetDiffBlocksSingleFile({
+      newContent: response,
+      oldFileContent: oldContent,
+      logger,
+    })
 
   let updatedContent = oldContent
   for (const { searchContent, replaceContent } of diffBlocks) {
@@ -328,6 +332,7 @@ Please output just the SEARCH/REPLACE blocks like this:
         userInputId,
         userId,
         diffBlocksThatDidntMatch,
+        logger,
       })
 
     if (newDiffBlocksThatDidntMatch.length > 0) {

plans/logger-refactor-plan.md

@@ -41,7 +41,7 @@ For all other files:
 - Update function calls to pass object with named properties
 - **For tests:** Create a no-op logger constant named `logger` (NOT `mockLogger`!) with all 4 methods:
   ```typescript
-  const logger = {
+  const logger: Logger = {
     debug: () => {},
     info: () => {},
     warn: () => {},
@@ -51,12 +51,18 @@ For all other files:
 - **Check carefully** - there may be multiple call sites in the same file!
 - Repeat typecheck until ALL errors resolved
 
-### Step 4: Commit changes
+### Step 4: Run reviewer agent
+
+- After all typechecks pass, spawn the reviewer agent to review the changes
+- Address any feedback from the reviewer before committing
+- If you make _any_ changes, go back to Step 3.
+
+### Step 5: Commit changes
 
 - **Do NOT use git-committer agent** - it's too slow
 - Instead, manually run: `git add <files> && git commit -m "<message>" && git push`
   - This will push to a branch, where I can manually review the changes.
 - Keep commit message concise but descriptive
 - Include Codebuff footer in commit message
 
-### Step 5: Go back to Step 1 and repeat
+### Step 6: Go back to Step 1 and repeat