Merge branch 'main' into base-layers

Author: jahooma

.agents/types/tools.ts

@@ -6,6 +6,8 @@ export type ToolName =
   | 'code_search'
   | 'end_turn'
   | 'find_files'
+  | 'glob'
+  | 'list_directory'
   | 'lookup_agent_info'
   | 'read_docs'
   | 'read_files'
@@ -27,6 +29,8 @@ export interface ToolParamsMap {
   code_search: CodeSearchParams
   end_turn: EndTurnParams
   find_files: FindFilesParams
+  glob: GlobParams
+  list_directory: ListDirectoryParams
   lookup_agent_info: LookupAgentInfoParams
   read_docs: ReadDocsParams
   read_files: ReadFilesParams
@@ -59,7 +63,7 @@ export interface CodeSearchParams {
   flags?: string
   /** Optional working directory to search within, relative to the project root. Defaults to searching the entire project. */
   cwd?: string
-  /** Maximum number of results to return. Defaults to 30. */
+  /** Maximum number of results to return per file. Defaults to 15. There is also a global limit of 250 results across all files. */
   maxResults?: number
 }
 
@@ -76,6 +80,24 @@ export interface FindFilesParams {
   prompt: string
 }
 
+/**
+ * Search for files matching a glob pattern. Returns matching file paths sorted by modification time.
+ */
+export interface GlobParams {
+  /** Glob pattern to match files against (e.g., *.js, src/glob/*.ts, glob/test/glob/*.go). */
+  pattern: string
+  /** Optional working directory to search within, relative to project root. If not provided, searches from project root. */
+  cwd?: string
+}
+
+/**
+ * List files and directories in the specified path. Returns information about each entry including name, type, size, and modification time.
+ */
+export interface ListDirectoryParams {
+  /** Directory path to list, relative to the project root. */
+  path: string
+}
+
 /**
  * Retrieve information about an agent by ID
  */

backend/package.json

@@ -42,6 +42,7 @@
     "gpt-tokenizer": "2.8.1",
     "ignore": "5.3.2",
     "lodash": "*",
+    "micromatch": "^4.0.8",
     "openai": "^4.78.1",
     "pino": "9.4.0",
     "postgres": "3.4.4",
@@ -56,6 +57,7 @@
     "@types/cors": "^2.8.19",
     "@types/diff": "^5.0.3",
     "@types/express": "^4.17.13",
+    "@types/micromatch": "^4.0.9",
     "@types/ws": "^8.5.5"
   }
 }

backend/src/__tests__/auto-topup.test.ts

@@ -7,6 +7,7 @@ import {
 import {
   afterAll,
   afterEach,
+  beforeAll,
   beforeEach,
   describe,
   expect,
@@ -15,26 +16,23 @@ import {
   spyOn,
 } from 'bun:test'
 
+import type { Logger } from '@codebuff/types/logger'
+
 describe('Auto Top-up System', () => {
   describe('checkAndTriggerAutoTopup', () => {
     // Create fresh mocks for each test
     let dbMock: ReturnType<typeof mock>
     let balanceMock: ReturnType<typeof mock>
     let validateAutoTopupMock: ReturnType<typeof mock>
     let grantCreditsMock: ReturnType<typeof mock>
-
-    beforeEach(() => {
-      // Mock logger for auto-topup functionality
-      mockModule('@codebuff/common/util/logger', () => ({
-        logger: {
-          debug: () => {},
-          error: () => {},
-          info: () => {},
-          warn: () => {},
-        },
-        withLoggerContext: async (context: any, fn: () => Promise<any>) => fn(),
-      }))
-
+    const logger: Logger = {
+      debug: () => {},
+      error: () => {},
+      info: () => {},
+      warn: () => {},
+    }
+
+    beforeAll(() => {
       // Set up default mocks
       dbMock = mock(() =>
         Promise.resolve({
@@ -46,6 +44,38 @@ describe('Auto Top-up System', () => {
         }),
       )
 
+      // Mock the database
+      mockModule('@codebuff/common/db', () => ({
+        default: {
+          query: {
+            user: {
+              findFirst: dbMock,
+            },
+          },
+          update: mock(() => ({
+            set: () => ({
+              where: () => Promise.resolve(),
+            }),
+          })),
+        },
+      }))
+
+      // Mock Stripe payment intent creation
+      mockModule('@codebuff/common/util/stripe', () => ({
+        stripeServer: {
+          paymentIntents: {
+            create: mock(() =>
+              Promise.resolve({
+                status: 'succeeded',
+                id: 'pi_123',
+              }),
+            ),
+          },
+        },
+      }))
+    })
+
+    beforeEach(() => {
       balanceMock = mock(() =>
         Promise.resolve({
           usageThisCycle: 0,
@@ -74,43 +104,17 @@ describe('Auto Top-up System', () => {
 
       grantCreditsMock = mock(() => Promise.resolve())
 
-      // Mock the database
-      mockModule('@codebuff/common/db', () => ({
-        default: {
-          query: {
-            user: {
-              findFirst: dbMock,
-            },
-          },
-          update: mock(() => ({
-            set: () => ({
-              where: () => Promise.resolve(),
-            }),
-          })),
-        },
-      }))
-
       spyOn(billing, 'calculateUsageAndBalance').mockImplementation(balanceMock)
       spyOn(billing, 'validateAutoTopupStatus').mockImplementation(
         validateAutoTopupMock,
       )
       spyOn(billing, 'processAndGrantCredit').mockImplementation(
         grantCreditsMock,
       )
+    })
 
-      // Mock Stripe payment intent creation
-      mockModule('@codebuff/common/util/stripe', () => ({
-        stripeServer: {
-          paymentIntents: {
-            create: mock(() =>
-              Promise.resolve({
-                status: 'succeeded',
-                id: 'pi_123',
-              }),
-            ),
-          },
-        },
-      }))
+    afterEach(() => {
+      mock.restore()
     })
 
     afterAll(() => {
@@ -119,7 +123,10 @@ describe('Auto Top-up System', () => {
 
     it('should trigger top-up when balance below threshold', async () => {
       // Replace direct call with capture of returned amount
-      const amount = await checkAndTriggerAutoTopup('test-user')
+      const amount = await checkAndTriggerAutoTopup({
+        userId: 'test-user',
+        logger,
+      })
 
       // Should check user settings
       expect(dbMock).toHaveBeenCalled()
@@ -158,7 +165,10 @@ describe('Auto Top-up System', () => {
       )
 
       // Capture return value (should be undefined)
-      const amount = await checkAndTriggerAutoTopup('test-user')
+      const amount = await checkAndTriggerAutoTopup({
+        userId: 'test-user',
+        logger,
+      })
 
       // Should still check settings and balance
       expect(dbMock).toHaveBeenCalled()
@@ -195,7 +205,10 @@ describe('Auto Top-up System', () => {
       )
 
       // Capture the returned amount and assert debt coverage
-      const amount = await checkAndTriggerAutoTopup('test-user')
+      const amount = await checkAndTriggerAutoTopup({
+        userId: 'test-user',
+        logger,
+      })
 
       expect(amount).toBe(600)
     })
@@ -214,9 +227,12 @@ describe('Auto Top-up System', () => {
         validateAutoTopupMock,
       )
 
-      await expect(checkAndTriggerAutoTopup('test-user')).rejects.toThrow(
-        'No valid payment method found',
-      )
+      await expect(
+        checkAndTriggerAutoTopup({
+          userId: 'test-user',
+          logger,
+        }),
+      ).rejects.toThrow('No valid payment method found')
 
       // Should have called validation
       expect(validateAutoTopupMock).toHaveBeenCalled()

backend/src/__tests__/cost-aggregation.integration.test.ts

@@ -237,9 +237,9 @@ describe('Cost Aggregation Integration Tests', () => {
 
     // Mock file reading
     spyOn(websocketAction, 'requestFiles').mockImplementation(
-      async (ws, paths) => {
+      async (params: { ws: any; filePaths: string[] }) => {
         const results: Record<string, string | null> = {}
-        paths.forEach((path) => {
+        params.filePaths.forEach((path) => {
           results[path] = path === 'hello.txt' ? 'Hello, World!' : null
         })
         return results

backend/src/__tests__/fast-rewrite.test.ts

@@ -43,16 +43,16 @@ describe.skip('rewriteWithOpenAI', () => {
     const editSnippet = await Bun.file(`${testDataDir}/edit-snippet.go`).text()
     const expectedResult = await Bun.file(`${testDataDir}/expected.go`).text()
 
-    const result = await rewriteWithOpenAI(
-      originalContent,
+    const result = await rewriteWithOpenAI({
+      oldContent: originalContent,
       editSnippet,
-      'taskruntoolcall.go',
-      'clientSessionId',
-      'fingerprintId',
-      'userInputId',
-      TEST_USER_ID,
-      undefined,
-    )
+      filePath: 'taskruntoolcall.go',
+      clientSessionId: 'clientSessionId',
+      fingerprintId: 'fingerprintId',
+      userInputId: 'userInputId',
+      userId: TEST_USER_ID,
+      userMessage: undefined,
+    })
 
     const patch = createPatch('test.ts', expectedResult, result)
     const patchLines = patch.split('\n').slice(4)