khal-os 1.260326.13 → 1.260326.15

package/CLAUDE.md

@@ -24,10 +24,8 @@ pm2 flush <name>                  # clear logs
 
 ### Service Loader Runtime
 
-Services run under **Bun** by default. Services that need Node.js (e.g. `node-pty`) place a `service/runtime` file containing `node` — the loader spawns them via `npx tsx` instead.
+All services run under **Node.js + tsx**. The service-loader spawns each discovered service via `npx tsx`.
 
-- `node-pty` does NOT work under Bun (PTY gets SIGHUP immediately). The terminal service uses `runtime: node`.
-- `import.meta.dir` is Bun-only. Use `import.meta.dirname ?? dirname(fileURLToPath(import.meta.url))` for cross-runtime compat.
 - `import pty from 'node-pty'` fails under tsx (CJS compat). Use `import * as pty from 'node-pty'`.
 
 ### Caddy (reverse proxy)
@@ -69,9 +67,9 @@ Headless Chrome needs to render `/desktop` without logging in. When `OS_SECRET`
 ## Lint / Build
 
 ```bash
-bun biome check --write .    # lint + format
-bunx tsc --noEmit             # typecheck
-bun next build               # production build
+pnpm biome check --write .    # lint + format
+npx tsc --noEmit              # typecheck
+pnpm next build               # production build
 ```
 
 - Biome config: `biome.json` — `**/service/**` override allows console.log
@@ -81,8 +79,8 @@ bun next build               # production build
 
 Before claiming any work is complete, **run verification first**:
 
-1. `bun biome check .` — lint + format clean
-2. `bunx tsc --noEmit` — no type errors
+1. `pnpm biome check .` — lint + format clean
+2. `npx tsc --noEmit` — no type errors
 
 Never say "tests pass", "build succeeds", or "should work now" without showing command output.
 These hooks run automatically on Stop (after each response that edits .ts/.tsx files).

package/Makefile

@@ -53,11 +53,11 @@ dev:
 	bash $(SLOT_SCRIPT) update-pid "$$SLOT" "$$$$"; \
 	$(MAKE) db-create DB="$$DB_NAME" 2>&1 | sed 's/^/[db] /' || { echo "[dev] DB creation failed"; exit 1; }; \
 	echo "[dev] Starting processes..."; \
-	DATABASE_URL="$$DB_URL" PORT="$$NEXT_PORT" bun next dev --port "$$NEXT_PORT" 2>&1 | sed 's/^/[next] /' & \
+	DATABASE_URL="$$DB_URL" PORT="$$NEXT_PORT" pnpm next dev --port "$$NEXT_PORT" 2>&1 | sed 's/^/[next] /' & \
 	PID_NEXT=$$!; \
-	DATABASE_URL="$$DB_URL" bun run src/lib/service-loader.ts 2>&1 | sed 's/^/[svc]  /' & \
+	DATABASE_URL="$$DB_URL" pnpm tsx src/lib/service-loader.ts 2>&1 | sed 's/^/[svc]  /' & \
 	PID_SVC=$$!; \
-	WS_BRIDGE_PORT="$$WS_PORT" DATABASE_URL="$$DB_URL" bun run src/lib/ws-server.ts 2>&1 | sed 's/^/[ws]   /' & \
+	WS_BRIDGE_PORT="$$WS_PORT" DATABASE_URL="$$DB_URL" pnpm tsx src/lib/ws-server.ts 2>&1 | sed 's/^/[ws]   /' & \
 	PID_WS=$$!; \
 	wait $$PID_NEXT $$PID_SVC $$PID_WS
 
@@ -95,7 +95,7 @@ db-create:
 	echo "Creating database $(DB)..."; \
 	PGPASSWORD=$(PG_PASS) createdb -h $(PG_HOST) -p $(PG_PORT) -U $(PG_USER) "$(DB)" 2>/dev/null || echo "Database $(DB) already exists"; \
 	echo "Running migrations..."; \
-	DATABASE_URL="postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST):$(PG_PORT)/$(DB)" bun run packages/os-sdk/src/db/migrate.ts; \
+	DATABASE_URL="postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST):$(PG_PORT)/$(DB)" pnpm tsx packages/os-sdk/src/db/migrate.ts; \
 	echo "Database $(DB) ready."
 
 ## Drop a database (DB=<name>)
@@ -111,7 +111,7 @@ db-migrate:
 	@set -euo pipefail; \
 	if [ -z "$(DB)" ]; then echo "Usage: make db-migrate DB=<name>"; exit 1; fi; \
 	echo "Running migrations on $(DB)..."; \
-	DATABASE_URL="postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST):$(PG_PORT)/$(DB)" bun run packages/os-sdk/src/db/migrate.ts; \
+	DATABASE_URL="postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST):$(PG_PORT)/$(DB)" pnpm tsx packages/os-sdk/src/db/migrate.ts; \
 	echo "Migrations complete."
 
 # =====================
@@ -124,9 +124,9 @@ db-migrate:
 prod:
 	@set -euo pipefail; \
 	echo "[prod] Installing dependencies..."; \
-	bun install; \
+	pnpm install; \
 	echo "[prod] Building Next.js..."; \
-	bun next build; \
+	pnpm next build; \
 	echo "[prod] Starting PM2 processes..."; \
 	if pm2 describe os-services >/dev/null 2>&1; then \
 		pm2 restart ecosystem.config.cjs; \
@@ -213,9 +213,9 @@ deploy:
 	echo "[deploy] Installing dependencies..."; \
 	pnpm install; \
 	echo "[deploy] Running database migrations..."; \
-	DATABASE_URL="postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST):$(PG_PORT)/genie-os" bun run packages/os-sdk/src/db/migrate.ts; \
+	DATABASE_URL="postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST):$(PG_PORT)/genie-os" pnpm tsx packages/os-sdk/src/db/migrate.ts; \
 	echo "[deploy] Building Next.js..."; \
-	bun next build; \
+	pnpm next build; \
 	echo "[deploy] Restarting PM2 processes..."; \
 	pm2 restart ecosystem.config.cjs 2>/dev/null || pm2 start ecosystem.config.cjs; \
 	echo "[deploy] Waiting for startup..."; \
@@ -228,8 +228,8 @@ deploy:
 ## Run QA assertions against the running instance
 test:
 	@echo "Running QA assertions..."
-	@bun run packages/os-cli/src/index.ts qa assert health
-	@bun run packages/os-cli/src/index.ts qa assert auth
+	@pnpm tsx packages/os-cli/src/index.ts qa assert health
+	@pnpm tsx packages/os-cli/src/index.ts qa assert auth
 	@echo ""
 	@echo "All assertions passed."
 
@@ -251,7 +251,7 @@ preflight:
 prod-backend:
 	@set -euo pipefail; \
 	echo "[prod-backend] Installing dependencies..."; \
-	bun install; \
+	pnpm install; \
 	echo "[prod-backend] Starting backend services..."; \
 	if pm2 describe os-services >/dev/null 2>&1; then \
 		pm2 restart os-services os-ws-bridge; \

package/ecosystem.config.cjs

@@ -11,21 +11,21 @@ module.exports = {
 		{
 			name: 'os-dev',
 			script: 'bash',
-			args: '-c "bun next build && exec bun next start --port 8888"',
+			args: '-c "pnpm next build && exec pnpm next start --port 8888"',
 			cwd: __dirname,
 			autorestart: true,
 		},
 		{
 			name: 'os-services',
-			script: 'bun',
-			args: 'run src/lib/service-loader.ts',
+			script: 'npx',
+			args: 'tsx src/lib/service-loader.ts',
 			cwd: __dirname,
 			autorestart: true,
 		},
 		{
 			name: 'os-ws-bridge',
-			script: 'bun',
-			args: 'run src/lib/ws-server.ts',
+			script: 'npx',
+			args: 'tsx src/lib/ws-server.ts',
 			cwd: __dirname,
 			autorestart: true,
 			env: { WS_BRIDGE_PORT: '4280' },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "khal-os",
-	"version": "1.260326.13",
+	"version": "1.260326.15",
 	"bin": {
 		"khal-os": "./packages/npx-cli/dist/cli.js"
 	},
@@ -12,7 +12,7 @@
 		"lint": "biome check .",
 		"lint:fix": "biome check --write .",
 		"knip": "knip",
-		"services": "bun run src/lib/service-loader.ts",
+		"services": "tsx src/lib/service-loader.ts",
 		"tauri": "cd tauri && cargo run",
 		"tauri:build": "cd tauri && cargo build --release",
 		"prepare": "husky"
@@ -52,6 +52,7 @@
 		"react-dom": "19.2.3",
 		"tailwind-merge": "^3.4.0",
 		"uuid": "^13.0.0",
+		"ws": "^8.20.0",
 		"zod": "^4.3.6",
 		"zustand": "^5.0.11"
 	},
@@ -64,6 +65,7 @@
 		"@types/react": "^19",
 		"@types/react-dom": "^19",
 		"@types/uuid": "^11.0.0",
+		"@types/ws": "^8.18.1",
 		"git-cliff": "^2.12.0",
 		"husky": "^9.1.7",
 		"knip": "^5.85.0",

package/packages/npx-cli/dist/cli.js

@@ -44,7 +44,7 @@ var exports__version = {};
 __export(exports__version, {
   KHALOS_BUILD_VERSION: () => KHALOS_BUILD_VERSION
 });
-var KHALOS_BUILD_VERSION = "1.260326.13";
+var KHALOS_BUILD_VERSION = "1.260326.15";
 
 // src/cli.ts
 import { execSync, spawn } from "node:child_process";
@@ -793,13 +793,13 @@ function runFromSource(args) {
   if (!existsSync(serverTs)) {
     console.error(source_default.red(`
   No binary available for your platform and source not found.`));
-    console.error(source_default.dim(`  Install from source: git clone + bun run packages/npx-cli/src/server.ts
+    console.error(source_default.dim(`  Install from source: git clone + npx tsx packages/npx-cli/src/server.ts
 `));
     process.exit(1);
   }
   console.log(source_default.dim(`  No binary available — running from source...
 `));
-  const child = spawn("bun", ["run", serverTs, ...args], {
+  const child = spawn("npx", ["tsx", serverTs, ...args], {
     cwd: projectRoot,
     stdio: "inherit",
     env: process.env

package/packages/npx-cli/src/_version.ts

@@ -1 +1 @@
-export const KHALOS_BUILD_VERSION = '1.260326.13';
+export const KHALOS_BUILD_VERSION = '1.260326.15';

package/packages/npx-cli/src/cli.ts

@@ -349,12 +349,12 @@ function runFromSource(args: string[]): void {
 
 	if (!existsSync(serverTs)) {
 		console.error(chalk.red('\n  No binary available for your platform and source not found.'));
-		console.error(chalk.dim('  Install from source: git clone + bun run packages/npx-cli/src/server.ts\n'));
+		console.error(chalk.dim('  Install from source: git clone + npx tsx packages/npx-cli/src/server.ts\n'));
 		process.exit(1);
 	}
 
 	console.log(chalk.dim('  No binary available — running from source...\n'));
-	const child = spawn('bun', ['run', serverTs, ...args], {
+	const child = spawn('npx', ['tsx', serverTs, ...args], {
 		cwd: projectRoot,
 		stdio: 'inherit',
 		env: process.env,

package/packages/npx-cli/src/provision.ts

@@ -8,6 +8,7 @@
 import { execSync } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
+import chalk from 'chalk';
 import { DATA_DIR, PG_PORT } from './services';
 
 const DB_NAME = 'khal-os';
@@ -62,15 +63,29 @@ export async function createDatabase(): Promise<void> {
 // ---------------------------------------------------------------------------
 
 /**
- * Run Drizzle migrations using the existing migration orchestrator.
+ * Run Drizzle migrations inline — no subprocess, works inside compiled binary.
  */
-export async function runMigrations(projectRoot: string): Promise<void> {
+export async function runMigrations(_projectRoot: string): Promise<void> {
 	const dbUrl = getDatabaseUrl();
-	execSync('bun run packages/os-sdk/src/db/migrate.ts', {
-		cwd: projectRoot,
-		stdio: 'pipe',
-		env: { ...process.env, DATABASE_URL: dbUrl } as NodeJS.ProcessEnv,
-	});
+	// Set DATABASE_URL for the migration module to pick up
+	process.env.DATABASE_URL = dbUrl;
+	try {
+		// Import and run migrations directly — bundled into the binary
+		const { runAllMigrations } = await import('@khal-os/sdk');
+		await runAllMigrations();
+	} catch {
+		// If the SDK import fails (e.g., in minimal binary mode), try direct postgres
+		console.log(`  ${chalk.yellow('⚠')} Migration via SDK failed, trying direct connection...`);
+		try {
+			const postgres = (await import('postgres')).default;
+			const sql = postgres(dbUrl, { max: 1 });
+			await sql`SELECT 1`;
+			await sql.end();
+			console.log(`  ${chalk.dim('Database reachable — migrations may need manual run')}`);
+		} catch {
+			console.log(`  ${chalk.yellow('⚠')} Could not connect to database — skipping migrations`);
+		}
+	}
 }
 
 // ---------------------------------------------------------------------------

package/packages/npx-cli/src/server.ts

@@ -1,7 +1,7 @@
 /**
  * khal-os server — standalone binary entry point.
  *
- * This file compiles to a standalone binary via `bun build --compile`.
+ * This file compiles to a standalone binary via esbuild + pkg.
  * It IS the khal-os server: starts everything, serves everything.
  *
  * Modes:
@@ -41,9 +41,9 @@ import {
 // ---------------------------------------------------------------------------
 
 /**
- * Detect if we are running as a compiled Bun binary.
- * When compiled with `bun build --compile`, import.meta.url will not
- * end with `.ts` and process.argv[0] points to the binary itself.
+ * Detect if we are running as a compiled binary.
+ * When compiled, import.meta.url will not end with `.ts` and
+ * process.argv[0] points to the binary itself.
  */
 function isCompiledBinary(): boolean {
 	return !import.meta.url.endsWith('.ts');
@@ -123,7 +123,7 @@ function printStatus(services: ServiceStatus[]): void {
 
 async function buildNextJs(projectRoot: string, env: Record<string, string | undefined>): Promise<void> {
 	console.log(`\n  ${chalk.dim('Building Next.js...')}`);
-	execSync('bun next build', {
+	execSync('pnpm next build', {
 		cwd: projectRoot,
 		env: { ...process.env, ...env, NEXT_PRIVATE_BUILD_WORKER: 'false' } as NodeJS.ProcessEnv,
 		stdio: 'inherit',
@@ -135,9 +135,16 @@ async function buildNextJs(projectRoot: string, env: Record<string, string | und
 // ---------------------------------------------------------------------------
 
 async function ensureDeps(projectRoot: string): Promise<void> {
+	// Compiled binary has everything bundled — no need to install deps
+	if (isCompiledBinary()) return;
+
 	if (!existsSync(join(projectRoot, 'node_modules'))) {
 		console.log(`  ${chalk.dim('Installing dependencies...')}`);
-		execSync('bun install', { cwd: projectRoot, stdio: 'pipe' });
+		try {
+			execSync('pnpm install', { cwd: projectRoot, stdio: 'pipe' });
+		} catch {
+			console.log(`  ${chalk.yellow('⚠')} Could not install deps — continuing without`);
+		}
 	}
 }
 

package/packages/os-sdk/package.json

@@ -34,6 +34,10 @@
 		}
 	},
 	"devDependencies": {
+		"@types/pg": "^8.20.0",
 		"drizzle-kit": "^0.31.10"
+	},
+	"dependencies": {
+		"pg": "^8.20.0"
 	}
 }

package/packages/os-sdk/src/db/provision.ts

@@ -3,10 +3,9 @@
  *
  * Each app calls provisionAppSchema() on boot to create its isolated
  * PostgreSQL schema + role via pgserve. Idempotent, safe for restarts.
- *
- * Requires Bun runtime (uses Bun.SQL for the pgserve admin connection).
  */
 
+import pg from 'pg';
 import { getDatabaseUrl } from '../config';
 
 export interface AppSchemaConfig {
@@ -20,25 +19,15 @@ export async function provisionAppSchema(config: AppSchemaConfig): Promise<{ cre
 	const pgserveModule = 'pgserve';
 	// biome-ignore lint/suspicious/noExplicitAny: optional runtime dependency, no types guaranteed
 	const { initCatalog, provisionSchema } = (await import(pgserveModule)) as any;
-	// Bun.SQL is only available at runtime under Bun — indirect import to skip tsc module resolution
-	const bunModule = 'bun';
-	// biome-ignore lint/suspicious/noExplicitAny: Bun-only runtime API, no type declarations available
-	const { SQL } = (await import(bunModule)) as any;
 
-	const url = new URL(getDatabaseUrl());
-	const adminSql = new SQL({
-		hostname: url.hostname,
-		port: Number(url.port),
-		database: url.pathname.slice(1),
-		username: url.username,
-		password: url.password,
-	});
+	const client = new pg.Client({ connectionString: getDatabaseUrl() });
+	await client.connect();
 
 	try {
-		await initCatalog(adminSql);
-		const result = await provisionSchema(adminSql, config);
+		await initCatalog(client);
+		const result = await provisionSchema(client, config);
 		return { created: result.created };
 	} finally {
-		await adminSql.close();
+		await client.end();
 	}
 }

package/scripts/app-cli.ts

@@ -1,6 +1,6 @@
-#!/usr/bin/env bun
+#!/usr/bin/env node
 /**
  * Thin wrapper to run the khal-os CLI from source (no build needed).
- * Usage: bun scripts/app-cli.ts app list
+ * Usage: tsx scripts/app-cli.ts app list
  */
 import '../packages/os-cli/src/index.ts';

package/scripts/build-binaries.sh

@@ -1,18 +1,18 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Build khal-os standalone binaries via bun build --compile.
+# Build khal-os standalone binaries via esbuild + pkg.
 # Usage: bash scripts/build-binaries.sh [--target <platform>]
 #
 # Targets: linux-x64, macos-arm64, all (default)
 
 ENTRY="packages/npx-cli/src/server.ts"
+BUNDLE="dist/server.cjs"
 DIST="dist"
 
-# Map our target names to bun's --target values
-declare -A BUN_TARGETS=(
-  [linux-x64]="bun-linux-x64"
-  [macos-arm64]="bun-darwin-arm64"
+declare -A PKG_TARGETS=(
+  [linux-x64]="node22-linux-x64"
+  [macos-arm64]="node22-macos-arm64"
 )
 
 declare -A ASSET_NAMES=(
@@ -20,16 +20,28 @@ declare -A ASSET_NAMES=(
   [macos-arm64]="khal-os-macos-arm64"
 )
 
+bundle() {
+  echo "Bundling ${ENTRY} → ${BUNDLE}..."
+  npx esbuild "${ENTRY}" \
+    --bundle \
+    --platform=node \
+    --target=node22 \
+    --format=cjs \
+    --outfile="${BUNDLE}" \
+    --external:@nats-io/* \
+    --external:node-pty
+  echo "  -> ${BUNDLE}"
+}
+
 build_target() {
   local target="$1"
-  local bun_target="${BUN_TARGETS[$target]}"
+  local pkg_target="${PKG_TARGETS[$target]}"
   local asset="${ASSET_NAMES[$target]}"
 
-  echo "Building ${asset} (${bun_target})..."
-  bun build --compile \
-    --target="${bun_target}" \
-    "${ENTRY}" \
-    --outfile "${DIST}/${asset}"
+  echo "Building ${asset} (${pkg_target})..."
+  npx @yao-pkg/pkg "${BUNDLE}" \
+    --targets "${pkg_target}" \
+    --output "${DIST}/${asset}"
 
   echo "  -> ${DIST}/${asset}"
 }
@@ -71,10 +83,14 @@ fi
 echo ""
 echo "=== khal-os binary build ==="
 echo "Entry:   ${ENTRY}"
+echo "Bundle:  ${BUNDLE}"
 echo "Output:  ${DIST}/"
 echo "Targets: ${TARGETS[*]}"
 echo ""
 
+# Bundle TypeScript to single CJS file
+bundle
+
 # Build each target
 for target in "${TARGETS[@]}"; do
   build_target "${target}"

package/scripts/preflight.sh

@@ -36,7 +36,7 @@ echo "◆ Khal OS — Preflight Check"
 echo ""
 echo "  Core tools:"
 check "node"        "node"      "--version"
-check "bun"         "bun"       "--version"
+check "tsx"         "tsx"       "--version"
 check "pnpm"        "pnpm"      "--version"
 check "git"         "git"       "--version"
 
@@ -64,9 +64,8 @@ echo "  ${GREEN}✔${RESET} $PASS passed   ${RED}✘${RESET} $FAIL missing"
 if [ "$FAIL" -gt 0 ]; then
 	echo ""
 	echo "  ${DIM}Install missing tools:${RESET}"
-	echo "    bun:      curl -fsSL https://bun.sh/install | bash"
 	echo "    pnpm:     corepack enable && corepack prepare pnpm@latest --activate"
-	echo "    pm2:      bun install -g pm2"
+	echo "    pm2:      pnpm add -g pm2"
 	echo "    psql:     sudo apt install postgresql-client  (Linux)"
 	echo "              brew install postgresql              (macOS)"
 	echo ""

package/scripts/setup.sh

@@ -24,17 +24,7 @@ echo "${BOLD}◆ Khal OS — Developer Setup${RESET}"
 echo ""
 
 # -------------------------
-# 1. Install Bun
-# -------------------------
-if ! command -v bun &>/dev/null; then
-	echo "  Installing bun..."
-	curl -fsSL https://bun.sh/install | bash
-	export PATH="$HOME/.bun/bin:$PATH"
-fi
-echo "  bun           $(bun --version) ${GREEN}✔${RESET}"
-
-# -------------------------
-# 2. Install pnpm via corepack
+# 1. Install pnpm via corepack
 # -------------------------
 if ! command -v pnpm &>/dev/null; then
 	echo "  Installing pnpm via corepack..."
@@ -44,16 +34,16 @@ fi
 echo "  pnpm          $(pnpm --version) ${GREEN}✔${RESET}"
 
 # -------------------------
-# 3. Install PM2
+# 2. Install PM2
 # -------------------------
 if ! command -v pm2 &>/dev/null; then
 	echo "  Installing pm2..."
-	bun install -g pm2
+	pnpm add -g pm2
 fi
 echo "  pm2           $(pm2 --version) ${GREEN}✔${RESET}"
 
 # -------------------------
-# 4. Install NATS server
+# 3. Install NATS server
 # -------------------------
 if ! command -v nats-server &>/dev/null; then
 	echo "  Installing nats-server..."
@@ -62,7 +52,7 @@ fi
 echo "  nats-server   $(nats-server --version 2>&1 | grep -oE 'v[0-9.]+' | head -1) ${GREEN}✔${RESET}"
 
 # -------------------------
-# 5. Check PostgreSQL
+# 4. Check PostgreSQL
 # -------------------------
 if ! command -v pg_ctl &>/dev/null && ! command -v psql &>/dev/null; then
 	echo ""
@@ -79,13 +69,15 @@ echo "  postgresql    $(psql --version 2>&1 | grep -oE '[0-9]+\.[0-9]+' | head -
 echo ""
 
 # -------------------------
-# 6. Install dependencies
+# 5. Install dependencies
 # -------------------------
 echo "  ${DIM}Installing project dependencies...${RESET}"
 pnpm install --no-frozen-lockfile 2>&1 | tail -1
 
+# tsx should be installed via pnpm install (devDependency)
+
 # -------------------------
-# 7. Create database
+# 6. Create database
 # -------------------------
 echo "  ${DIM}Setting up database...${RESET}"
 PG_PORT="${PG_PORT:-5433}"
@@ -98,19 +90,19 @@ PGPASSWORD="$PG_USER" createdb -h 127.0.0.1 -p "$PG_PORT" -U "$PG_USER" "$DB_NAM
 	|| echo "  ${DIM}Database ${DB_NAME} already exists${RESET}"
 
 # -------------------------
-# 8. Run migrations
+# 7. Run migrations
 # -------------------------
 echo "  ${DIM}Running migrations...${RESET}"
-DATABASE_URL="$DB_URL" bun run packages/os-sdk/src/db/migrate.ts 2>&1 | tail -3
+DATABASE_URL="$DB_URL" pnpm tsx packages/os-sdk/src/db/migrate.ts 2>&1 | tail -3
 
 # -------------------------
-# 9. Build
+# 8. Build
 # -------------------------
 echo "  ${DIM}Building Next.js...${RESET}"
-bun next build 2>&1 | tail -3
+pnpm next build 2>&1 | tail -3
 
 # -------------------------
-# 10. Generate .env if missing
+# 9. Generate .env if missing
 # -------------------------
 if [ ! -f .env ]; then
 	echo "  ${DIM}Generating .env from .env.example...${RESET}"
@@ -123,7 +115,7 @@ if [ ! -f .env ]; then
 fi
 
 # -------------------------
-# 11. Start PM2
+# 10. Start PM2
 # -------------------------
 echo "  ${DIM}Starting PM2 processes...${RESET}"
 pm2 start ecosystem.config.cjs 2>/dev/null \

package/src/lib/service-loader.ts

@@ -1,12 +1,15 @@
 // @ts-nocheck
+
+import { type ChildProcess, spawn } from 'node:child_process';
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
-import { relative, resolve } from 'node:path';
+import { dirname, relative, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { runAllMigrations } from '@khal-os/sdk/db/migrate';
 import { ensureO11yStreams } from '@khal-os/sdk/service/o11y-streams';
 import { connect } from '@nats-io/transport-node';
 
-const ROOT = resolve(import.meta.dir, '../components/apps');
-const PACKAGE_ROOT = resolve(import.meta.dir, '../../packages');
+const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '../components/apps');
+const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '../../packages');
 const MAX_RETRIES = 5;
 const RETRY_DELAY_MS = 2000;
 const HEALTH_INTERVAL_MS = 30_000;
@@ -14,19 +17,19 @@ const HEALTH_INTERVAL_MS = 30_000;
 interface ManagedService {
 	name: string;
 	path: string;
-	runtime: 'bun' | 'node';
-	process: ReturnType<typeof Bun.spawn> | null;
+	runtime: 'node';
+	process: ChildProcess | null;
 	retries: number;
 	running: boolean;
 }
 
-function detectRuntime(serviceDir: string): 'bun' | 'node' {
+function detectRuntime(serviceDir: string): 'node' {
 	const runtimeFile = resolve(serviceDir, 'runtime');
 	if (existsSync(runtimeFile)) {
 		const content = readFileSync(runtimeFile, 'utf8').trim();
 		if (content === 'node') return 'node';
 	}
-	return 'bun';
+	return 'node';
 }
 
 function discoverPackageServices(knownNames: Set<string>): ManagedService[] {
@@ -108,23 +111,20 @@ function discoverServices(): ManagedService[] {
 
 function spawnService(service: ManagedService): void {
 	const relPath = relative(process.cwd(), service.path);
-	const runtimeLabel = service.runtime === 'node' ? 'node/tsx' : 'bun';
+	const runtimeLabel = 'node/tsx';
 	console.log(`[service-loader] starting ${service.name} (${relPath}) [${runtimeLabel}]`);
 
-	// node-pty and other native addons may not work under Bun;
-	// services can opt into Node via a `service/runtime` file containing "node"
-	const cmd = service.runtime === 'node' ? ['npx', 'tsx', service.path] : ['bun', 'run', service.path];
+	const cmd = ['npx', 'tsx', service.path];
 
-	const proc = Bun.spawn(cmd, {
-		stdout: 'inherit',
-		stderr: 'inherit',
+	const proc = spawn(cmd[0], cmd.slice(1), {
+		stdio: ['ignore', 'inherit', 'inherit'],
 		env: { ...process.env },
 	});
 
 	service.process = proc;
 	service.running = true;
 
-	proc.exited.then((code) => {
+	proc.on('exit', (code) => {
 		service.running = false;
 		service.process = null;