Sync public snapshot from freebuff-private

Source: CodebuffAI/freebuff-private@a19448a2db2acc7c15f7c2366f5b29e05a7cfed2

Author: github-actions[bot]

bun.lock

@@ -3,12 +3,6 @@ import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
 
-let tempDataDir = ''
-
-mock.module('../../project-files', () => ({
-  getProjectDataDir: () => tempDataDir,
-}))
-
 mock.module('../logger', () => ({
   logger: {
     debug: () => {},
@@ -21,6 +15,8 @@ mock.module('../logger', () => ({
 
 import { deleteChatSession, getAllChats } from '../chat-history'
 
+let tempDataDir = ''
+
 function writeChat(chatId: string, prompt: string) {
   const chatDir = path.join(tempDataDir, 'chats', chatId)
   fs.mkdirSync(chatDir, { recursive: true })
@@ -51,25 +47,27 @@ describe('chat-history', () => {
     writeChat('chat-a', 'hello from chat a')
     writeChat('chat-b', 'hello from chat b')
 
-    expect(deleteChatSession('chat-a')).toBe(true)
+    expect(deleteChatSession('chat-a', tempDataDir)).toBe(true)
 
     expect(fs.existsSync(path.join(tempDataDir, 'chats', 'chat-a'))).toBe(false)
     expect(fs.existsSync(path.join(tempDataDir, 'chats', 'chat-b'))).toBe(true)
-    expect(getAllChats().map((chat) => chat.chatId)).toEqual(['chat-b'])
+    expect(
+      getAllChats(500, tempDataDir).map((chat) => chat.chatId),
+    ).toEqual(['chat-b'])
   })
 
   test('deleteChatSession rejects invalid chat ids', () => {
     const outsideDir = path.join(tempDataDir, 'outside')
     fs.mkdirSync(outsideDir, { recursive: true })
 
-    expect(deleteChatSession('../outside')).toBe(false)
-    expect(deleteChatSession('..')).toBe(false)
+    expect(deleteChatSession('../outside', tempDataDir)).toBe(false)
+    expect(deleteChatSession('..', tempDataDir)).toBe(false)
 
     expect(fs.existsSync(outsideDir)).toBe(true)
   })
 
   test('deleteChatSession returns false when the chat does not exist', () => {
-    expect(deleteChatSession('missing-chat')).toBe(false)
+    expect(deleteChatSession('missing-chat', tempDataDir)).toBe(false)
   })
 
   test('getAllChats lists corrupt chats as unreadable instead of hiding them', () => {
@@ -83,7 +81,7 @@ describe('chat-history', () => {
       '[{"id":"msg-1","variant":"user","content":"truncat',
     )
 
-    const chats = getAllChats()
+    const chats = getAllChats(500, tempDataDir)
 
     const good = chats.find((chat) => chat.chatId === 'chat-good')
     expect(good).toBeDefined()
@@ -104,7 +102,7 @@ describe('chat-history', () => {
       '{"not":"an array"}',
     )
 
-    const chats = getAllChats()
+    const chats = getAllChats(500, tempDataDir)
 
     expect(chats).toHaveLength(1)
     expect(chats[0].chatId).toBe('chat-not-array')
@@ -125,7 +123,7 @@ describe('chat-history', () => {
       }),
     )
 
-    const chats = getAllChats()
+    const chats = getAllChats(500, tempDataDir)
 
     expect(chats).toHaveLength(1)
     expect(chats[0].lastPrompt).toBe('prompt from meta')
@@ -147,7 +145,7 @@ describe('chat-history', () => {
       }),
     )
 
-    const chats = getAllChats()
+    const chats = getAllChats(500, tempDataDir)
 
     expect(chats).toHaveLength(1)
     expect(chats[0].lastPrompt).toBe('prompt from messages file')
@@ -173,7 +171,7 @@ describe('chat-history', () => {
     // masked by it
     fs.writeFileSync(messagesPath, '[{"id":"msg-1","variant":"user","con')
 
-    const chats = getAllChats()
+    const chats = getAllChats(500, tempDataDir)
 
     expect(chats).toHaveLength(1)
     expect(chats[0].unreadable).toBe(true)
@@ -187,7 +185,7 @@ describe('chat-history', () => {
       '{"messageCount": tru',
     )
 
-    const chats = getAllChats()
+    const chats = getAllChats(500, tempDataDir)
 
     expect(chats).toHaveLength(1)
     expect(chats[0].lastPrompt).toBe('prompt from messages file')
@@ -200,6 +198,6 @@ describe('chat-history', () => {
     fs.mkdirSync(emptyDir, { recursive: true })
     fs.writeFileSync(path.join(emptyDir, 'chat-messages.json'), '[]')
 
-    expect(getAllChats()).toHaveLength(0)
+    expect(getAllChats(500, tempDataDir)).toHaveLength(0)
   })
 })

cli/src/utils/__tests__/chat-history.test.ts

@@ -3,24 +3,24 @@ import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
 
-let tempDir = ''
-
-mock.module('../../project-files', () => ({
-  getProjectRoot: () => tempDir,
-  getCurrentChatDir: () => path.join(tempDir, 'chats', 'current'),
-}))
-
-// Force tracing on and pin the dev path so the test is deterministic
+// Force tracing on so the test is deterministic
 mock.module('@codebuff/common/env', () => ({
   IS_DEV: true,
 }))
 
 import { createTraceWriter } from '../trace-writer'
+import { setProjectRoot, tryGetProjectRoot } from '../../project-files'
 
 import type { Message } from '@codebuff/common/types/messages/codebuff-message'
 
+let tempDir = ''
+
+function tracePathFor(dir: string): string {
+  return path.join(dir, 'debug', 'trace.jsonl')
+}
+
 function readTraceLines(): any[] {
-  const tracePath = path.join(tempDir, 'debug', 'trace.jsonl')
+  const tracePath = tracePathFor(tempDir)
   if (!fs.existsSync(tracePath)) return []
   return fs
     .readFileSync(tracePath, 'utf8')
@@ -47,16 +47,37 @@ const baseParams = {
 }
 
 describe('createTraceWriter', () => {
+  let originalProjectRoot: string | undefined
+
   beforeEach(() => {
     tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'codebuff-trace-'))
+    originalProjectRoot = tryGetProjectRoot()
   })
 
   afterEach(() => {
     fs.rmSync(tempDir, { recursive: true, force: true })
+    if (originalProjectRoot !== undefined) {
+      setProjectRoot(originalProjectRoot)
+    }
   })
 
-  test('writes each message exactly once across steps', () => {
+  test('falls back to the real project-root-based path when no resolver is injected', () => {
+    setProjectRoot(tempDir)
     const writer = createTraceWriter()!
+
+    writer.recordStep({
+      ...baseParams,
+      step: 1,
+      messages: [userMessage('hello')],
+    })
+
+    const lines = readTraceLines()
+    expect(lines).toHaveLength(1)
+    expect(lines[0].message.role).toBe('user')
+  })
+
+  test('writes each message exactly once across steps', () => {
+    const writer = createTraceWriter(() => tracePathFor(tempDir))!
     const history = [userMessage('hello')]
 
     writer.recordStep({ ...baseParams, step: 1, messages: history })
@@ -72,7 +93,7 @@ describe('createTraceWriter', () => {
   })
 
   test('records system prompt once and again only when it changes', () => {
-    const writer = createTraceWriter()!
+    const writer = createTraceWriter(() => tracePathFor(tempDir))!
 
     writer.recordStep({
       ...baseParams,
@@ -105,7 +126,7 @@ describe('createTraceWriter', () => {
   })
 
   test('detects history rewrites and re-dumps the new history', () => {
-    const writer = createTraceWriter()!
+    const writer = createTraceWriter(() => tracePathFor(tempDir))!
 
     writer.recordStep({
       ...baseParams,
@@ -133,7 +154,7 @@ describe('createTraceWriter', () => {
   })
 
   test('tracks agents independently', () => {
-    const writer = createTraceWriter()!
+    const writer = createTraceWriter(() => tracePathFor(tempDir))!
 
     writer.recordStep({
       ...baseParams,
@@ -155,7 +176,7 @@ describe('createTraceWriter', () => {
 
   test('writes base64 image data in full', () => {
     const base64 = 'a'.repeat(10_000)
-    const writer = createTraceWriter()!
+    const writer = createTraceWriter(() => tracePathFor(tempDir))!
 
     writer.recordStep({
       ...baseParams,

cli/src/utils/__tests__/trace-writer.test.ts

@@ -3,14 +3,6 @@ import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
 
-let tempDataDir = ''
-
-mock.module('../../project-files', () => ({
-  getProjectDataDir: () => tempDataDir,
-  getProjectRoot: () => tempDataDir,
-  getCurrentChatDir: () => path.join(tempDataDir, 'chats', 'current'),
-}))
-
 mock.module('../logger', () => ({
   CHAT_LOG_FILENAME: 'log.jsonl',
   logger: {
@@ -24,6 +16,8 @@ mock.module('../logger', () => ({
 
 import { trimOversizedChatLogs } from '../chat-history'
 
+let tempDataDir = ''
+
 function writeLog(
   chatId: string,
   sizeBytes: number,
@@ -60,7 +54,7 @@ describe('trimOversizedChatLogs', () => {
     )
     fs.writeFileSync(messagesFile, '[]')
 
-    trimOversizedChatLogs()
+    trimOversizedChatLogs(tempDataDir)
 
     expect(fs.existsSync(bigOldLog)).toBe(false)
     expect(fs.existsSync(smallOldLog)).toBe(true)
@@ -73,12 +67,12 @@ describe('trimOversizedChatLogs', () => {
       ageDays: 5,
     })
 
-    trimOversizedChatLogs()
+    trimOversizedChatLogs(tempDataDir)
 
     expect(fs.existsSync(bigRecentLog)).toBe(true)
   })
 
   test('does nothing when chats directory does not exist', () => {
-    expect(() => trimOversizedChatLogs()).not.toThrow()
+    expect(() => trimOversizedChatLogs(tempDataDir)).not.toThrow()
   })
 })

cli/src/utils/__tests__/trim-chat-logs.test.ts

@@ -22,8 +22,8 @@ export interface ChatHistoryEntry {
   unreadable?: boolean
 }
 
-function getChatsDir(): string {
-  return path.join(getProjectDataDir(), 'chats')
+function getChatsDir(dataDir: string = getProjectDataDir()): string {
+  return path.join(dataDir, 'chats')
 }
 
 interface ChatDirInfo {
@@ -37,9 +37,12 @@ interface ChatDirInfo {
  * List all available chats sorted by most recent first
  * @param maxChats - Maximum number of chats to load (default: 500)
  */
-export function getAllChats(maxChats: number = 500): ChatHistoryEntry[] {
+export function getAllChats(
+  maxChats: number = 500,
+  dataDir?: string,
+): ChatHistoryEntry[] {
   try {
-    const chatsDir = getChatsDir()
+    const chatsDir = getChatsDir(dataDir)
 
     if (!fs.existsSync(chatsDir)) {
       return []
@@ -152,11 +155,11 @@ const MIN_LOG_AGE_MS = 14 * 24 * 60 * 60 * 1000
  * touched in 14+ days. Only debug logs are removed — chat history files are
  * untouched.
  */
-export function trimOversizedChatLogs(): void {
+export function trimOversizedChatLogs(dataDir?: string): void {
   let chatsDir: string
   let chatIds: string[]
   try {
-    chatsDir = getChatsDir()
+    chatsDir = getChatsDir(dataDir)
     chatIds = fs.readdirSync(chatsDir)
   } catch {
     return // No project root set or no chats directory yet
@@ -183,7 +186,7 @@ export function trimOversizedChatLogs(): void {
 /**
  * Delete a saved chat session from local history.
  */
-export function deleteChatSession(chatId: string): boolean {
+export function deleteChatSession(chatId: string, dataDir?: string): boolean {
   try {
     const safeChatId = chatId.trim()
     if (
@@ -196,7 +199,7 @@ export function deleteChatSession(chatId: string): boolean {
       return false
     }
 
-    const chatsDir = getChatsDir()
+    const chatsDir = getChatsDir(dataDir)
     const chatPath = path.join(chatsDir, safeChatId)
 
     if (!fs.existsSync(chatPath)) {

cli/src/utils/chat-history.ts

@@ -54,7 +54,9 @@ function getTraceFilePath(): string | null {
  * history. Content-only edits that preserve the role sequence are not
  * re-traced — acceptable for a debug trace.
  */
-export function createTraceWriter(): TraceWriter | undefined {
+export function createTraceWriter(
+  resolveTraceFilePath: () => string | null = getTraceFilePath,
+): TraceWriter | undefined {
   if (!isTraceEnabled()) {
     return undefined
   }
@@ -117,7 +119,7 @@ export function createTraceWriter(): TraceWriter | undefined {
       if (lines.length === 0) return
       // Resolve the path per step (not cached for the writer's lifetime: the
       // current chat directory changes when the user starts a new chat).
-      const filePath = getTraceFilePath()
+      const filePath = resolveTraceFilePath()
       if (!filePath) return
       try {
         const dir = dirname(filePath)