Revert "chore: prep sdk types before checks"

This reverts commit 9195ca4.

Author: brandonkachen

cli/package.json

@@ -19,12 +19,11 @@
     "prebuild": "bun run build:sdk",
     "build": "bun build src/index.tsx --outdir dist --target node --format esm",
     "build:sdk": "cd ../sdk && bun run build",
-    "build:sdk-types": "cd ../sdk && bun run build:types",
     "build:binary": "bun ./scripts/build-binary.ts codecane $npm_package_version",
     "start": "bun run dist/index.js",
     "test": "bun test",
     "test:tmux-poc": "bun run src/__tests__/tmux-poc.ts",
-    "pretypecheck": "bun run build:sdk-types",
+    "pretypecheck": "bun run build:sdk",
     "typecheck": "tsc --noEmit -p ."
   },
   "sideEffects": false,

package.json

@@ -32,7 +32,7 @@
     "format": "prettier --write \"**/*.{ts,tsx,json,md}\"",
     "release:npm-app": "bun run --cwd=npm-app release",
     "clean-ts": "find . -name '*.tsbuildinfo' -type f -delete && find . -name '.next' -type d -exec rm -rf {} + 2>/dev/null || true && find . -name 'node_modules' -type d -exec rm -rf {} + 2>/dev/null || true && bun install",
-    "typecheck": "bun --cwd=sdk run build:types && bun --filter='*' run typecheck && echo '✅ All type checks passed!'",
+    "typecheck": "bun --filter='*' run typecheck && echo '✅ All type checks passed!'",
     "test": "bun --filter='{@codebuff/backend,@codebuff/common,@codebuff/npm-app,@codebuff/agents}' run test",
     "init-worktree": "bun scripts/init-worktree.ts",
     "cleanup-worktree": "bash scripts/cleanup-worktree.sh",

packages/billing/src/__tests__/credit-delegation.test.ts

@@ -17,9 +17,9 @@ describe('Credit Delegation', () => {
     error: () => {},
   }
 
-  beforeAll(async () => {
+  beforeAll(() => {
     // Mock the org-billing functions that credit-delegation depends on
-    await mockModule('@codebuff/billing/org-billing', () => ({
+    mockModule('@codebuff/billing/org-billing', () => ({
       normalizeRepositoryUrl: mock((url: string) => url.toLowerCase().trim()),
       extractOwnerAndRepo: mock((url: string) => {
         if (url.includes('codebuffai/codebuff')) {
@@ -31,61 +31,26 @@ describe('Credit Delegation', () => {
     }))
 
     // Mock common dependencies
-    await mockModule('@codebuff/common/db', () => {
-      const select = mock((fields: Record<string, unknown>) => {
-        if ('orgId' in fields && 'orgName' in fields) {
-          return {
-            from: () => ({
-              innerJoin: () => ({
-                where: () =>
-                  Promise.resolve([
-                    {
-                      orgId: 'org-123',
-                      orgName: 'CodebuffAI',
-                      orgSlug: 'codebuffai',
-                    },
-                  ]),
-              }),
-            }),
-          }
-        }
-
-        if ('repoUrl' in fields) {
-          return {
-            from: () => ({
-              where: () =>
-                Promise.resolve([
-                  {
-                    repoUrl: 'https://github.com/codebuffai/codebuff',
-                    repoName: 'codebuff',
-                    isActive: true,
-                  },
-                ]),
-            }),
-          }
-        }
-
-        return {
-          from: () => ({
-            where: () => Promise.resolve([]),
-          }),
-        }
-      })
-
-      return {
-        default: {
-          select,
-        },
-      }
-    })
+    mockModule('@codebuff/common/db', () => ({
+      default: {
+        select: mock(() => ({
+          from: mock(() => ({
+            innerJoin: mock(() => ({
+              where: mock(() =>
+                Promise.resolve([{ orgId: 'org-123', orgName: 'CodebuffAI' }]),
+              ),
+            })),
+          })),
+        })),
+      },
+    }))
 
-    await mockModule('@codebuff/common/db/schema', () => ({
+    mockModule('@codebuff/common/db/schema', () => ({
       orgMember: { org_id: 'org_id', user_id: 'user_id' },
-      org: { id: 'id', name: 'name', slug: 'slug' },
+      org: { id: 'id', name: 'name' },
       orgRepo: {
         org_id: 'org_id',
         repo_url: 'repo_url',
-        repo_name: 'repo_name',
         is_active: 'is_active',
       },
     }))

packages/billing/src/__tests__/org-billing.test.ts

@@ -2,7 +2,7 @@ import {
   clearMockedModules,
   mockModule,
 } from '@codebuff/common/testing/mock-modules'
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'bun:test'
+import { afterAll, beforeAll, describe, expect, it } from 'bun:test'
 
 import {
   calculateOrganizationUsageAndBalance,
@@ -49,70 +49,56 @@ const logger: Logger = {
   warn: () => {},
 }
 
-const createDbMock = (options?: {
-  grants?: typeof mockGrants | any[]
-  insert?: () => { values: () => Promise<unknown> }
-  update?: () => { set: () => { where: () => Promise<unknown> } }
-}) => {
-  const {
-    grants = mockGrants,
-    insert,
-    update,
-  } = options ?? {}
-
-  return {
-    select: () => ({
-      from: () => ({
-        where: () => ({
-          orderBy: () => grants,
+describe('Organization Billing', () => {
+  beforeAll(() => {
+    mockModule('@codebuff/common/db', () => ({
+      default: {
+        select: () => ({
+          from: () => ({
+            where: () => ({
+              orderBy: () => mockGrants,
+            }),
+          }),
         }),
-      }),
-    }),
-    insert:
-      insert ??
-      (() => ({
-        values: () => Promise.resolve(),
-      })),
-    update:
-      update ??
-      (() => ({
-        set: () => ({
-          where: () => Promise.resolve(),
+        insert: () => ({
+          values: () => Promise.resolve(),
         }),
-      })),
-  }
-}
-
-describe('Organization Billing', () => {
-  beforeAll(async () => {
-    await mockModule('@codebuff/common/db', () => ({
-      default: createDbMock(),
+        update: () => ({
+          set: () => ({
+            where: () => Promise.resolve(),
+          }),
+        }),
+      },
     }))
 
-    await mockModule('@codebuff/common/db/transaction', () => ({
-      withSerializableTransaction: async ({
-        callback,
-      }: {
-        callback: (tx: any) => Promise<unknown> | unknown
-      }) => await callback(createDbMock()),
+    mockModule('@codebuff/common/db/transaction', () => ({
+      withSerializableTransaction: (fn: any) =>
+        fn({
+          select: () => ({
+            from: () => ({
+              where: () => ({
+                orderBy: () => mockGrants,
+              }),
+            }),
+          }),
+          update: () => ({
+            set: () => ({
+              where: () => Promise.resolve(),
+            }),
+          }),
+        }),
     }))
   })
 
   afterAll(() => {
     clearMockedModules()
   })
 
-  afterEach(async () => {
-    await mockModule('@codebuff/common/db', () => ({
-      default: createDbMock(),
-    }))
-  })
-
-describe('calculateOrganizationUsageAndBalance', () => {
-  it('should calculate balance correctly with positive and negative balances', async () => {
-    const organizationId = 'org-123'
-    const quotaResetDate = new Date('2024-01-01')
-    const now = new Date('2024-06-01')
+  describe('calculateOrganizationUsageAndBalance', () => {
+    it('should calculate balance correctly with positive and negative balances', async () => {
+      const organizationId = 'org-123'
+      const quotaResetDate = new Date('2024-01-01')
+      const now = new Date('2024-06-01')
 
       const result = await calculateOrganizationUsageAndBalance({
         organizationId,
@@ -132,11 +118,19 @@ describe('calculateOrganizationUsageAndBalance', () => {
       expect(result.usageThisCycle).toBe(800)
     })
 
-  it('should handle organization with no grants', async () => {
-    // Mock empty grants
-    await mockModule('@codebuff/common/db', () => ({
-      default: createDbMock({ grants: [] }),
-    }))
+    it('should handle organization with no grants', async () => {
+      // Mock empty grants
+      mockModule('@codebuff/common/db', () => ({
+        default: {
+          select: () => ({
+            from: () => ({
+              where: () => ({
+                orderBy: () => [],
+              }),
+            }),
+          }),
+        },
+      }))
 
       const organizationId = 'org-empty'
       const quotaResetDate = new Date('2024-01-01')
@@ -207,7 +201,7 @@ describe('calculateOrganizationUsageAndBalance', () => {
     it('should reject malformed URLs', () => {
       const result = validateAndNormalizeRepositoryUrl('not-a-url')
       expect(result.isValid).toBe(false)
-      expect(result.error).toBe('Repository domain not allowed')
+      expect(result.error).toBe('Invalid URL format')
     })
 
     it('should accept allowed domains', () => {
@@ -261,19 +255,19 @@ describe('calculateOrganizationUsageAndBalance', () => {
     })
 
     it('should handle duplicate operation IDs gracefully', async () => {
-    // Mock database constraint error
-    await mockModule('@codebuff/common/db', () => ({
-      default: createDbMock({
-        insert: () => ({
-          values: () => {
-            const error = new Error('Duplicate key')
-            ;(error as any).code = '23505'
-            ;(error as any).constraint = 'credit_ledger_pkey'
-            throw error
-          },
-        }),
-      }),
-    }))
+      // Mock database constraint error
+      mockModule('@codebuff/common/db', () => ({
+        default: {
+          insert: () => ({
+            values: () => {
+              const error = new Error('Duplicate key')
+              ;(error as any).code = '23505'
+              ;(error as any).constraint = 'credit_ledger_pkey'
+              throw error
+            },
+          }),
+        },
+      }))
 
       const organizationId = 'org-123'
       const userId = 'user-123'

packages/code-map/__tests__/languages.test.ts

@@ -22,19 +22,19 @@ describe('languages module', () => {
       languageTable.forEach((config) => {
         expect(config).toHaveProperty('extensions')
         expect(config).toHaveProperty('wasmFile')
-        expect(config).toHaveProperty('queryPathOrContent')
+        expect(config).toHaveProperty('queryText')
         expect(Array.isArray(config.extensions)).toBe(true)
         expect(config.extensions.length).toBeGreaterThan(0)
         expect(typeof config.wasmFile).toBe('string')
-        expect(typeof config.queryPathOrContent).toBe('string')
+        expect(typeof config.queryText).toBe('string')
       })
     })
 
     it('should support TypeScript files', () => {
       const tsConfig = languageTable.find(c => c.extensions.includes('.ts'))
       expect(tsConfig).toBeDefined()
       expect(tsConfig?.wasmFile).toBe('tree-sitter-typescript.wasm')
-      expect(tsConfig?.queryPathOrContent).toBeDefined()
+      expect(tsConfig?.queryText).toBeDefined()
     })
 
     it('should support TSX files', () => {
@@ -209,12 +209,12 @@ describe('languages module', () => {
       const config: LanguageConfig = {
         extensions: ['.test'],
         wasmFile: 'test.wasm',
-        queryPathOrContent: 'test query',
+        queryText: 'test query',
       }
 
       expect(config.extensions).toEqual(['.test'])
       expect(config.wasmFile).toBe('test.wasm')
-      expect(config.queryPathOrContent).toBe('test query')
+      expect(config.queryText).toBe('test query')
       expect(config.parser).toBeUndefined()
       expect(config.query).toBeUndefined()
       expect(config.language).toBeUndefined()