fix: use bunx --bun for drizzle-kit to ensure .env.local loading

Author: brandonkachen

.bin/bun

@@ -202,46 +202,10 @@ check_env_setup() {
     echo "" >&2
 }
 
-# Clear inherited env vars that would conflict with .env file values
-# Bun loads .env files natively, but inherited shell variables take precedence.
-# We unset variables defined in our env files so Bun can set fresh values.
-clear_inherited_env_vars() {
-    # Skip clearing if CODEBUFF_SKIP_ENV_CLEAR is set
-    # Used by TypeScript scripts that already have env vars loaded via Bun
-    if [ -n "$CODEBUFF_SKIP_ENV_CLEAR" ]; then
-        return
-    fi
-
-    # Unset variables from .env.local so Bun can load fresh values
-    if [ -f "$ENV_LOCAL_FILE" ]; then
-        while IFS='=' read -r key _; do
-            # Skip comments and empty lines
-            case "$key" in
-                '#'*|'') continue ;;
-            esac
-            # Remove any 'export ' prefix
-            key="${key#export }"
-            unset "$key" 2>/dev/null || true
-        done < "$ENV_LOCAL_FILE"
-    fi
-    
-    # Unset variables from .env.development.local
-    if [ -f "$ENV_DEVELOPMENT_LOCAL_FILE" ]; then
-        while IFS='=' read -r key _; do
-            case "$key" in
-                '#'*|'') continue ;;
-            esac
-            key="${key#export }"
-            unset "$key" 2>/dev/null || true
-        done < "$ENV_DEVELOPMENT_LOCAL_FILE"
-    fi
-}
-
 run_bun() {
     create_env_symlinks
     check_env_setup
-    clear_inherited_env_vars
-    # Bun natively loads .env files in the correct precedence order
+    # Bun natively loads .env files and gives them precedence over inherited shell vars
     exec "$REAL_BUN" "$@"
 }
 

packages/internal/knowledge.md

@@ -0,0 +1,24 @@
+# @codebuff/internal
+
+This package contains internal utilities, database schema, and shared server-side code.
+
+## Database Commands
+
+### Why `bunx --bun` for Drizzle Commands
+
+All drizzle-kit scripts in `package.json` use `bunx --bun` instead of calling `drizzle-kit` directly:
+
+```json
+"db:generate": "bunx --bun drizzle-kit generate --config=./src/db/drizzle.config.ts",
+"db:migrate": "bunx --bun drizzle-kit push --config=./src/db/drizzle.config.ts",
+"db:studio": "bunx --bun drizzle-kit studio --config=./src/db/drizzle.config.ts"
+```
+
+**Why this is necessary:**
+
+1. `drizzle-kit` runs via Node.js (not Bun) by default - it has `#!/usr/bin/env node` in its shebang
+2. Node.js does NOT auto-load `.env.local` files like Bun does
+3. Without `--bun`, drizzle-kit won't have access to environment variables like `DATABASE_URL`
+4. The `--bun` flag forces the command to run via Bun's runtime, which properly loads `.env.local`
+
+**If you add new drizzle-kit scripts**, always use `bunx --bun drizzle-kit ...` to ensure environment variables are available.

packages/internal/package.json

@@ -38,10 +38,10 @@
   "scripts": {
     "typecheck": "tsc --noEmit -p .",
     "test": "bun test",
-    "db:generate": "drizzle-kit generate --config=./src/db/drizzle.config.ts",
-    "db:migrate": "drizzle-kit push --config=./src/db/drizzle.config.ts",
+    "db:generate": "bunx --bun drizzle-kit generate --config=./src/db/drizzle.config.ts",
+    "db:migrate": "bunx --bun drizzle-kit push --config=./src/db/drizzle.config.ts",
     "db:start": "docker compose -f ./src/db/docker-compose.yml up --wait && bun run db:generate && (timeout 1 || sleep 1) && bun run db:migrate",
-    "db:studio": "drizzle-kit studio --config=./src/db/drizzle.config.ts"
+    "db:studio": "bunx --bun drizzle-kit studio --config=./src/db/drizzle.config.ts"
   },
   "sideEffects": false,
   "engines": {

scripts/dev.ts

@@ -23,7 +23,6 @@ import { join, resolve } from 'path'
 const PROJECT_ROOT = resolve(import.meta.dir, '..')
 const LOG_DIR = join(PROJECT_ROOT, 'debug', 'console')
 const PID_FILE = join(LOG_DIR, 'services.json')
-// Use the .bin/bun wrapper with CODEBUFF_SKIP_ENV_CLEAR to preserve inherited env vars
 const BUN_PATH = join(PROJECT_ROOT, '.bin', 'bun')
 
 // Get config from environment (Bun loads .env files automatically)
@@ -156,7 +155,7 @@ function startDb(): boolean {
   const result = spawnSync(BUN_PATH, ['--cwd', 'packages/internal', 'db:start'], {
     cwd: PROJECT_ROOT,
     stdio: ['ignore', logFile, logFile],
-    env: { ...process.env, CODEBUFF_SKIP_ENV_CLEAR: 'true' },
+    env: process.env,
   })
 
   if (result.status !== 0) {
@@ -180,7 +179,7 @@ function spawnBackgroundProcess(
     cwd: PROJECT_ROOT,
     detached: true,
     stdio: ['ignore', logFile, logFile],
-    env: { ...process.env, CODEBUFF_SKIP_ENV_CLEAR: 'true' },
+    env: process.env,
   })
 
   child.unref()
@@ -253,7 +252,7 @@ function startCli(args: string[]): Promise<number> {
     cliProcess = spawn(BUN_PATH, ['--cwd', 'cli', 'dev', ...args], {
       cwd: PROJECT_ROOT,
       stdio: 'inherit',
-      env: { ...process.env, CODEBUFF_SKIP_ENV_CLEAR: 'true' },
+      env: process.env,
     })
 
     cliProcess.on('close', (code) => {

scripts/start-services.ts

@@ -25,7 +25,6 @@ import { join, resolve } from 'path'
 const PROJECT_ROOT = resolve(import.meta.dir, '..')
 const LOG_DIR = join(PROJECT_ROOT, 'debug', 'console')
 const PID_FILE = join(LOG_DIR, 'services.json')
-// Use the .bin/bun wrapper with CODEBUFF_SKIP_ENV_CLEAR to preserve inherited env vars
 const BUN_PATH = join(PROJECT_ROOT, '.bin', 'bun')
 
 // Get config from environment (Bun loads .env files automatically)
@@ -127,7 +126,7 @@ function startDb(): boolean {
   const result = spawnSync(BUN_PATH, ['--cwd', 'packages/internal', 'db:start'], {
     cwd: PROJECT_ROOT,
     stdio: ['ignore', logFile, logFile],
-    env: { ...process.env, CODEBUFF_SKIP_ENV_CLEAR: 'true' },
+    env: process.env,
   })
 
   if (result.status !== 0) {
@@ -152,7 +151,7 @@ function spawnBackgroundProcess(
     cwd: PROJECT_ROOT,
     detached: true,
     stdio: ['ignore', logFile, logFile],
-    env: { ...process.env, CODEBUFF_SKIP_ENV_CLEAR: 'true' },
+    env: process.env,
   })
 
   child.unref()