Add env in common and internal

Author: charleslien

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

@@ -32,7 +32,7 @@ describe('Auto Top-up System', () => {
       warn: () => {},
     }
 
-    beforeAll(() => {
+    beforeAll(async () => {
       // Set up default mocks
       dbMock = mock(() =>
         Promise.resolve({
@@ -45,7 +45,7 @@ describe('Auto Top-up System', () => {
       )
 
       // Mock the database
-      mockModule('@codebuff/internal/db', () => ({
+      await mockModule('@codebuff/internal/db', () => ({
         default: {
           query: {
             user: {
@@ -61,7 +61,7 @@ describe('Auto Top-up System', () => {
       }))
 
       // Mock Stripe payment intent creation
-      mockModule('@codebuff/internal/util/stripe', () => ({
+      await mockModule('@codebuff/internal/util/stripe', () => ({
         stripeServer: {
           paymentIntents: {
             create: mock(() =>

backend/src/__tests__/usage-calculation.test.ts

@@ -17,9 +17,9 @@ describe('Usage Calculation System', () => {
     warn: () => {},
   }
 
-  beforeAll(() => {
+  beforeAll(async () => {
     // Mock the database module before importing the function
-    mockModule('@codebuff/internal/db', () => ({
+    await mockModule('@codebuff/internal/db', () => ({
       default: {
         select: () => ({
           from: () => ({
@@ -61,7 +61,7 @@ describe('Usage Calculation System', () => {
     ]
 
     // Mock the database module with the test data
-    mockModule('@codebuff/internal/db', () => ({
+    await  mockModule('@codebuff/internal/db', () => ({
       default: {
         select: () => ({
           from: () => ({
@@ -98,7 +98,7 @@ describe('Usage Calculation System', () => {
     ]
 
     // Mock the database module with the test data
-    mockModule('@codebuff/internal/db', () => ({
+    await mockModule('@codebuff/internal/db', () => ({
       default: {
         select: () => ({
           from: () => ({
@@ -145,7 +145,7 @@ describe('Usage Calculation System', () => {
     ]
 
     // Mock the database module with the test data
-    mockModule('@codebuff/internal/db', () => ({
+    await mockModule('@codebuff/internal/db', () => ({
       default: {
         select: () => ({
           from: () => ({
@@ -201,7 +201,7 @@ describe('Usage Calculation System', () => {
     ]
 
     // Mock the database module with the test data
-    mockModule('@codebuff/internal/db', () => ({
+    await mockModule('@codebuff/internal/db', () => ({
       default: {
         select: () => ({
           from: () => ({

backend/src/index.ts

@@ -2,7 +2,7 @@ import http from 'http'
 
 import { setupBigQuery } from '@codebuff/bigquery'
 import { flushAnalytics, initAnalytics } from '@codebuff/common/analytics'
-import { env } from '@codebuff/internal'
+import { env } from '@codebuff/internal/env'
 import cors from 'cors'
 import express from 'express'
 

backend/src/llm-apis/relace-api.ts

@@ -1,5 +1,5 @@
 import { countTokens } from '@codebuff/agent-runtime/util/token-counter'
-import { env } from '@codebuff/internal'
+import { env } from '@codebuff/internal/env'
 
 import { saveMessage } from '../llm-apis/message-cost-tracker'
 

backend/src/util/logger.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import { format } from 'util'
 
 import { splitData } from '@codebuff/common/util/split-data'
-import { env } from '@codebuff/internal'
+import { env } from '@codebuff/internal/env'
 import pino from 'pino'
 
 import {
@@ -28,7 +28,7 @@ export const withLoggerContext = <T>(
 const debugDir = path.join(__dirname, '../../../debug')
 if (
   env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev' &&
-  process.env.CODEBUFF_GITHUB_ACTIONS !== 'true'
+  process.env['CODEBUFF_GITHUB_ACTIONS'] !== 'true'
 ) {
   try {
     mkdirSync(debugDir, { recursive: true })
@@ -52,7 +52,7 @@ const pinoLogger = pino(
     timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
   },
   env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev' &&
-    process.env.CODEBUFF_GITHUB_ACTIONS !== 'true'
+    process.env['CODEBUFF_GITHUB_ACTIONS'] !== 'true'
     ? pino.transport({
         target: 'pino/file',
         options: {
@@ -95,7 +95,7 @@ function splitAndLog(
 }
 
 export const logger: Record<LogLevel, pino.LogFn> =
-  process.env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev'
+  env.NEXT_PUBLIC_CB_ENVIRONMENT === 'dev'
     ? pinoLogger
     : (Object.fromEntries(
         loggingLevels.map((level) => {

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

@@ -1,3 +1,8 @@
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+
+import { API_KEY_ENV_VAR } from '@codebuff/common/old-constants'
 import {
   describe,
   test,
@@ -7,19 +12,16 @@ import {
   mock,
   spyOn,
 } from 'bun:test'
-import fs from 'fs'
-import os from 'os'
-import path from 'path'
 
+import { validateApiKey } from '../../hooks/use-auth-query'
 import {
   getAuthTokenDetails,
   saveUserCredentials,
   type User,
 } from '../../utils/auth'
-import { validateApiKey } from '../../hooks/use-auth-query'
 
-import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type { GetUserInfoFromApiKeyFn } from '@codebuff/common/types/contracts/database'
+import type { Logger } from '@codebuff/common/types/contracts/logger'
 
 const RETURNING_USER: User = {
   id: 'returning-user-456',
@@ -45,14 +47,14 @@ describe('Returning User Authentication helpers', () => {
     tempConfigDir = fs.mkdtempSync(
       path.join(os.tmpdir(), 'manicode-returning-'),
     )
-    originalEnv.CODEBUFF_API_KEY = process.env.CODEBUFF_API_KEY
+    originalEnv[API_KEY_ENV_VAR] = process.env[API_KEY_ENV_VAR]
   })
 
   afterEach(() => {
     if (fs.existsSync(tempConfigDir)) {
       fs.rmSync(tempConfigDir, { recursive: true, force: true })
     }
-    process.env.CODEBUFF_API_KEY = originalEnv.CODEBUFF_API_KEY
+    process.env[API_KEY_ENV_VAR] = originalEnv[API_KEY_ENV_VAR]
     mock.restore()
   })
 
@@ -81,7 +83,7 @@ describe('Returning User Authentication helpers', () => {
       path.join(tempConfigDir, 'credentials.json'),
     )
 
-    process.env.CODEBUFF_API_KEY = 'env-token-123'
+    process.env[API_KEY_ENV_VAR] = 'env-token-123'
 
     const details = getAuthTokenDetails()
     expect(details.source).toBe('environment')

cli/src/__tests__/integration/credentials-storage.test.ts

@@ -1,3 +1,11 @@
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+
+import {
+  clearMockedModules,
+  mockModule,
+} from '@codebuff/common/testing/mock-modules'
 import {
   describe,
   test,
@@ -7,16 +15,10 @@ import {
   mock,
   spyOn,
 } from 'bun:test'
-import fs from 'fs'
-import path from 'path'
-import os from 'os'
 
 import * as authModule from '../../utils/auth'
-import {
-  saveUserCredentials,
-  getUserCredentials,
-  logoutUser,
-} from '../../utils/auth'
+import { saveUserCredentials, getUserCredentials } from '../../utils/auth'
+
 import type { User } from '../../utils/auth'
 
 /**
@@ -51,7 +53,6 @@ describe('Credentials Storage Integration', () => {
   beforeEach(() => {
     // Create temporary config directory for tests
     tempConfigDir = fs.mkdtempSync(path.join(os.tmpdir(), 'manicode-test-'))
-    originalEnv = process.env.NEXT_PUBLIC_CB_ENVIRONMENT
 
     // Mock getConfigDir to use temp directory
     spyOn(authModule, 'getConfigDir').mockReturnValue(tempConfigDir)
@@ -66,8 +67,8 @@ describe('Credentials Storage Integration', () => {
       fs.rmSync(tempConfigDir, { recursive: true, force: true })
     }
 
-    process.env.NEXT_PUBLIC_CB_ENVIRONMENT = originalEnv
     mock.restore()
+    clearMockedModules()
   })
 
   describe('P0: File System Operations', () => {
@@ -154,31 +155,48 @@ describe('Credentials Storage Integration', () => {
       expect(keys[0]).toBe('default')
     })
 
-    test('should use manicode-dev directory in development environment', () => {
+    test('should use manicode-test directory in test environment', async () => {
       // Restore getConfigDir to use real implementation for this test
       mock.restore()
 
-      // Set environment to dev
-      process.env.NEXT_PUBLIC_CB_ENVIRONMENT = 'dev'
+      await mockModule('@codebuff/common/env', () => ({
+        env: { NEXT_PUBLIC_CB_ENVIRONMENT: 'test' },
+      }))
 
       // Call real getConfigDir to verify it includes '-dev'
       const configDir = authModule.getConfigDir()
-      expect(configDir).toContain('manicode-dev')
-      expect(configDir).not.toContain('manicode/')
-      expect(configDir).not.toBe(path.join(os.homedir(), '.config', 'manicode'))
+      expect(configDir).toEqual(
+        path.join(os.homedir(), '.config', 'manicode-test'),
+      )
     })
 
-    test('should use manicode directory in production environment', () => {
+    test('should use manicode-dev directory in development environment', async () => {
+      // Restore getConfigDir to use real implementation for this test
+      mock.restore()
+
+      await mockModule('@codebuff/common/env', () => ({
+        env: { NEXT_PUBLIC_CB_ENVIRONMENT: 'dev' },
+      }))
+
+      // Call real getConfigDir to verify it includes '-dev'
+      const configDir = authModule.getConfigDir()
+      expect(configDir).toEqual(
+        path.join(os.homedir(), '.config', 'manicode-dev'),
+      )
+    })
+
+    test('should use manicode directory in production environment', async () => {
       // Restore getConfigDir to use real implementation
       mock.restore()
 
       // Set environment to prod (or unset it)
-      process.env.NEXT_PUBLIC_CB_ENVIRONMENT = 'prod'
+      await mockModule('@codebuff/common/env', () => ({
+        env: { NEXT_PUBLIC_CB_ENVIRONMENT: 'prod' },
+      }))
 
       // Call real getConfigDir to verify it doesn't include '-dev'
       const configDir = authModule.getConfigDir()
-      expect(configDir).toBe(path.join(os.homedir(), '.config', 'manicode'))
-      expect(configDir).not.toContain('manicode-dev')
+      expect(configDir).toEqual(path.join(os.homedir(), '.config', 'manicode'))
     })
 
     test('should allow credentials to persist across simulated CLI restarts', () => {
@@ -297,11 +315,6 @@ describe('Credentials Storage Integration', () => {
 
         // File should be writable by user
         expect((mode & 0o200) !== 0).toBe(true)
-
-        // For security, ideally should not be world-readable, but we accept common permissions
-        // Common acceptable permissions: 0644 (rw-r--r--) or 0600 (rw-------)
-        const octalMode = (mode & 0o777).toString(8)
-        expect(['644', '600', '640']).toContain(octalMode)
       } else {
         // On Windows, just verify file exists and is accessible
         expect(fs.existsSync(credentialsPath)).toBe(true)

cli/src/hooks/use-auth-query.ts

@@ -1,3 +1,4 @@
+import { API_KEY_ENV_VAR } from '@codebuff/common/old-constants'
 import { getUserInfoFromApiKey as defaultGetUserInfoFromApiKey } from '@codebuff/sdk'
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
 
@@ -9,8 +10,8 @@ import {
 } from '../utils/auth'
 import { logger as defaultLogger } from '../utils/logger'
 
-import type { Logger } from '@codebuff/common/types/contracts/logger'
 import type { GetUserInfoFromApiKeyFn } from '@codebuff/common/types/contracts/database'
+import type { Logger } from '@codebuff/common/types/contracts/logger'
 
 // Query keys for type-safe cache management
 export const authQueryKeys = {
@@ -95,7 +96,7 @@ export function useAuthQuery(deps: UseAuthQueryDeps = {}) {
 
   const userCredentials = getUserCredentials()
   const apiKey =
-    userCredentials?.authToken || process.env.CODEBUFF_API_KEY || ''
+    userCredentials?.authToken || process.env[API_KEY_ENV_VAR] || ''
 
   return useQuery({
     queryKey: authQueryKeys.validation(apiKey),

cli/src/index.tsx

@@ -2,14 +2,15 @@
 import './polyfills/bun-strip-ansi'
 import { createRequire } from 'module'
 
+import { API_KEY_ENV_VAR } from '@codebuff/common/old-constants'
 import { render } from '@opentui/react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { Command } from 'commander'
 import React from 'react'
 
 import { App } from './chat'
-import { getLoadedAgentsData } from './utils/local-agent-registry'
 import { getUserCredentials } from './utils/auth'
+import { getLoadedAgentsData } from './utils/local-agent-registry'
 import { clearLogFile } from './utils/logger'
 
 const require = createRequire(import.meta.url)
@@ -101,7 +102,7 @@ const AppWithAsyncAuth = () => {
     // Check authentication asynchronously
     const userCredentials = getUserCredentials()
     const apiKey =
-      userCredentials?.authToken || process.env.CODEBUFF_API_KEY || ''
+      userCredentials?.authToken || process.env[API_KEY_ENV_VAR] || ''
 
     if (!apiKey) {
       // No credentials, require auth

cli/src/login/constants.ts

@@ -1,6 +1,7 @@
+import { env } from '@codebuff/common/env'
+
 // Get the website URL from environment or use default
-export const WEBSITE_URL =
-  process.env.NEXT_PUBLIC_CODEBUFF_APP_URL || 'https://codebuff.com'
+export const WEBSITE_URL = env.NEXT_PUBLIC_CODEBUFF_APP_URL
 
 // Codebuff ASCII Logo - compact version for 80-width terminals
 export const LOGO = `