Merge remote-tracking branch 'origin/main' into brandon/mock-db

# Conflicts:
#	web/jest.config.cjs
#	web/playwright.config.ts
#	web/src/__tests__/e2e/store-ssr.e2e.ts

Author: brandonkachen

bun.lock

@@ -84,6 +84,7 @@ The `.bin/bun` wrapper automatically checks for tmux when running integration/E2
 - **Skips** tests gracefully if tmux unavailable
 
 **Benefits:**
+
 - ✅ Project-wide (works in any package)
 - ✅ No hardcoded paths
 - ✅ Clear test categorization
@@ -165,17 +166,19 @@ await sleep(1000)
 ## tmux Testing
 
 **See [`../../tmux.knowledge.md`](../../tmux.knowledge.md) for comprehensive tmux documentation**, including:
+
 - Why standard `send-keys` doesn't work (must use bracketed paste mode)
 - Helper functions for Bash and TypeScript
 - Complete example scripts
 - Debugging and troubleshooting tips
 
 **Quick reference:**
+
 ```typescript
-// ❌ Broken: 
+// ❌ Broken:
 await tmux(['send-keys', '-t', session, 'hello'])
 
-// ✅ Works:  
+// ✅ Works:
 await tmux(['send-keys', '-t', session, '-l', '\x1b[200~hello\x1b[201~'])
 ```
 

cli/src/__tests__/README.md

@@ -89,7 +89,8 @@ describe('bash-mode', () => {
       }
       const inputMode = 'bash' as InputMode
 
-      const userTypedBang = inputMode === ('default' as InputMode) && inputValue.text === '!'
+      const userTypedBang =
+        inputMode === ('default' as InputMode) && inputValue.text === '!'
 
       if (userTypedBang) {
         setInputMode('bash')
@@ -231,15 +232,17 @@ describe('bash-mode', () => {
       const trimmedInput = 'ls -la' // The stored value WITHOUT '!'
 
       // Router logic prepends '!' when in bash mode
-      const commandWithBang = inputMode === 'bash' ? '!' + trimmedInput : trimmedInput
+      const commandWithBang =
+        inputMode === 'bash' ? '!' + trimmedInput : trimmedInput
 
       expect(commandWithBang).toBe('!ls -la')
     })
 
     test('submission displays "!" in user message', () => {
       const inputMode: InputMode = 'bash'
       const trimmedInput = 'pwd'
-      const commandWithBang = inputMode === 'bash' ? '!' + trimmedInput : trimmedInput
+      const commandWithBang =
+        inputMode === 'bash' ? '!' + trimmedInput : trimmedInput
 
       // The user message should show the command WITH '!'
       const userMessage = { content: commandWithBang }
@@ -291,8 +294,14 @@ describe('bash-mode', () => {
   describe('bash mode UI state', () => {
     test('input mode is stored separately from input value', () => {
       // The inputMode is independent of the input text
-      const state1: { inputMode: InputMode; inputValue: string } = { inputMode: 'bash', inputValue: 'ls' }
-      const state2: { inputMode: InputMode; inputValue: string } = { inputMode: 'default', inputValue: 'hello' }
+      const state1: { inputMode: InputMode; inputValue: string } = {
+        inputMode: 'bash',
+        inputValue: 'ls',
+      }
+      const state2: { inputMode: InputMode; inputValue: string } = {
+        inputMode: 'default',
+        inputValue: 'hello',
+      }
 
       expect(state1.inputMode).toBe('bash')
       expect(state1.inputValue).not.toContain('!')
@@ -317,7 +326,9 @@ describe('bash-mode', () => {
       const inputModeValue = 'default' as InputMode
 
       const adjustedInputWidth =
-        inputModeValue === ('bash' as InputMode) ? baseInputWidth - 2 : baseInputWidth
+        inputModeValue === ('bash' as InputMode)
+          ? baseInputWidth - 2
+          : baseInputWidth
 
       expect(adjustedInputWidth).toBe(100)
     })
@@ -339,7 +350,9 @@ describe('bash-mode', () => {
       const inputMode = 'default' as InputMode
 
       const effectivePlaceholder =
-        inputMode === ('bash' as InputMode) ? bashPlaceholder : normalPlaceholder
+        inputMode === ('bash' as InputMode)
+          ? bashPlaceholder
+          : normalPlaceholder
 
       expect(effectivePlaceholder).toBe('Ask Buffy anything...')
     })

cli/src/__tests__/bash-mode.test.ts

@@ -4,7 +4,6 @@ import path from 'path'
 import { describe, test, expect } from 'bun:test'
 import stripAnsi from 'strip-ansi'
 
-
 import { isSDKBuilt, ensureCliTestEnv } from './test-utils'
 
 const CLI_PATH = path.join(__dirname, '../index.tsx')

cli/src/__tests__/e2e-cli.test.ts

@@ -19,8 +19,8 @@ import {
 } from '../../utils/auth'
 import { setProjectRoot } from '../../project-files'
 
-import type * as AuthModule from '../../utils/auth'
-import type * as CodebuffApiModule from '../../utils/codebuff-api'
+import * as AuthModule from '../../utils/auth'
+import * as CodebuffApiModule from '../../utils/codebuff-api'
 
 type User = AuthModule.User
 
@@ -57,16 +57,14 @@ describe('Logout and Re-login helpers', () => {
   })
 
   const mockConfigPaths = () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
   }
 
   const mockLogoutApi = () => {
-    const apiModule = require('../../utils/codebuff-api') as typeof CodebuffApiModule
-    spyOn(apiModule, 'getApiClient').mockReturnValue({
+    spyOn(CodebuffApiModule, 'getApiClient').mockReturnValue({
       logout: async () => ({ ok: true, status: 200 }),
     } as any)
   }

cli/src/__tests__/e2e/logout-relogin-flow.test.ts

@@ -13,14 +13,9 @@ import {
   spyOn,
 } from 'bun:test'
 
-
 import { validateApiKey } from '../../hooks/use-auth-query'
-import {
-  getAuthTokenDetails,
-  saveUserCredentials,
-} from '../../utils/auth'
-
-import type * as AuthModule from '../../utils/auth'
+import * as AuthModule from '../../utils/auth'
+import { getAuthTokenDetails, saveUserCredentials } from '../../utils/auth'
 import type { GetUserInfoFromApiKeyFn } from '@codebuff/common/types/contracts/database'
 import type { Logger } from '@codebuff/common/types/contracts/logger'
 
@@ -62,10 +57,8 @@ describe('Returning User Authentication helpers', () => {
   })
 
   test('should load auth token from credentials file for returning user', () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
 
@@ -77,10 +70,8 @@ describe('Returning User Authentication helpers', () => {
   })
 
   test('should fall back to CODEBUFF_API_KEY when credentials are missing', () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
 
@@ -92,10 +83,8 @@ describe('Returning User Authentication helpers', () => {
   })
 
   test('should validate stored credentials without blocking the UI thread', async () => {
-    const authModule = require('../../utils/auth') as typeof AuthModule
-
-    spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
-    spyOn(authModule, 'getCredentialsPath').mockReturnValue(
+    spyOn(AuthModule, 'getConfigDir').mockReturnValue(tempConfigDir)
+    spyOn(AuthModule, 'getCredentialsPath').mockReturnValue(
       path.join(tempConfigDir, 'credentials.json'),
     )
 

cli/src/__tests__/e2e/returning-user-auth.test.ts

@@ -37,18 +37,28 @@ export const createMockApiClient = (
   overrides: MockApiClientOverrides = {},
 ): CodebuffApiClient => ({
   get: (overrides.get ?? mock(defaultOkResponse)) as CodebuffApiClient['get'],
-  post: (overrides.post ?? mock(defaultOkResponse)) as CodebuffApiClient['post'],
+  post: (overrides.post ??
+    mock(defaultOkResponse)) as CodebuffApiClient['post'],
   put: (overrides.put ?? mock(defaultOkResponse)) as CodebuffApiClient['put'],
-  patch: (overrides.patch ?? mock(defaultOkResponse)) as CodebuffApiClient['patch'],
-  delete: (overrides.delete ?? mock(defaultOkResponse)) as CodebuffApiClient['delete'],
-  request: (overrides.request ?? mock(defaultOkResponse)) as CodebuffApiClient['request'],
+  patch: (overrides.patch ??
+    mock(defaultOkResponse)) as CodebuffApiClient['patch'],
+  delete: (overrides.delete ??
+    mock(defaultOkResponse)) as CodebuffApiClient['delete'],
+  request: (overrides.request ??
+    mock(defaultOkResponse)) as CodebuffApiClient['request'],
   me: (overrides.me ?? mock(defaultOkResponse)) as CodebuffApiClient['me'],
-  usage: (overrides.usage ?? mock(defaultOkResponse)) as CodebuffApiClient['usage'],
-  loginCode: (overrides.loginCode ?? mock(defaultOkResponse)) as CodebuffApiClient['loginCode'],
-  loginStatus: (overrides.loginStatus ?? mock(defaultOkResponse)) as CodebuffApiClient['loginStatus'],
-  referral: (overrides.referral ?? mock(defaultOkResponse)) as CodebuffApiClient['referral'],
-  publish: (overrides.publish ?? mock(defaultOkResponse)) as CodebuffApiClient['publish'],
-  logout: (overrides.logout ?? mock(defaultOkResponse)) as CodebuffApiClient['logout'],
+  usage: (overrides.usage ??
+    mock(defaultOkResponse)) as CodebuffApiClient['usage'],
+  loginCode: (overrides.loginCode ??
+    mock(defaultOkResponse)) as CodebuffApiClient['loginCode'],
+  loginStatus: (overrides.loginStatus ??
+    mock(defaultOkResponse)) as CodebuffApiClient['loginStatus'],
+  referral: (overrides.referral ??
+    mock(defaultOkResponse)) as CodebuffApiClient['referral'],
+  publish: (overrides.publish ??
+    mock(defaultOkResponse)) as CodebuffApiClient['publish'],
+  logout: (overrides.logout ??
+    mock(defaultOkResponse)) as CodebuffApiClient['logout'],
   baseUrl: overrides.baseUrl ?? 'https://test.codebuff.com',
   authToken: overrides.authToken,
 })