Merge branch 'staging' into cursor/add-migration-and-update-endpoint-1563

apps/server/Dockerfile

@@ -36,7 +36,7 @@ RUN START=$(date +%s) && \
 RUN START=$(date +%s) && \
     echo "=== Starting application build ===" && \
     cd apps/server && \
-    time bun build src/index.ts --outdir ./dist --target bun && \
+    time bun build src/index.ts --outdir ./dist --target bun --external pino-pretty && \
     echo "Build complete - output:" && \
     ls -la dist/ && \
     END=$(date +%s) && \

apps/server/package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {
     "prebuild": "bun run scripts/validate-env.js",
-    "build": "bun build src/index.ts --outdir ./dist --target bun",
+    "build": "bun build src/index.ts --outdir ./dist --target bun --external pino-pretty",
     "dev": "bun --max-old-space-size=512 run --hot src/index.ts",
     "lint": "biome check",
     "prod": "pnpm run build:vercel && pnpm run start:vercel",

apps/server/src/middleware/logger.test.ts

@@ -10,19 +10,7 @@ describe('logger middleware', () => {
     debug: typeof console.debug;
   };
 
-  beforeEach(() => {
+  import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-    // Save original env and console
-    originalEnv = { ...process.env };
-    originalConsole = {
-      info: console.info,
-      warn: console.warn,
-      error: console.error,
-      debug: console.debug,
-    };
-
-    // Clear module cache to reload logger with new env
-    vi.resetModules();
-  });
 
   afterEach(() => {
     // Restore original env and console

apps/server/src/middleware/logger.ts

@@ -1,34 +1,40 @@
 import { pinoLogger } from 'hono-pino';
 import pino from 'pino';
-import 'pino-pretty';
 
 const isDev = process.env.NODE_ENV !== 'production';
 const logLevel = process.env.LOG_LEVEL || 'info';
 
-let isPinoPrettyAvailable = true;
+// Create base pino instance
-
+const createBaseLogger = () => {
-// Create base pino instance for console capture
+  if (isDev) {
-const baseLogger = pino({
+    try {
+      // Only use pino-pretty transport in development
+      return pino({
         level: logLevel,
-  transport: isDev && isPinoPrettyAvailable
+        transport: {
-    ? {
           target: 'pino-pretty',
           options: { colorize: true },
-      }
+        },
-    : undefined,
       });
+    } catch (error) {
+      console.warn('pino-pretty not available, falling back to JSON logging');
+      console.error(error);
+    }
+  }
+
+  // Production or fallback: use standard JSON logging
+  return pino({
+    level: logLevel,
+  });
+};
+
+const baseLogger = createBaseLogger();
 
 // Simple console capture - only override if LOG_LEVEL is set
 if (process.env.LOG_LEVEL) {
-  const originalConsole = {
+  console.info = (...args) => baseLogger.info(...args);
-    info: console.info,
+  console.warn = (...args) => baseLogger.warn(...args);
-    warn: console.warn,
+  console.error = (...args) => baseLogger.error(...args);
-    error: console.error,
-  };
-
-  console.info = (...args) => baseLogger.info(args.join(' '));
-  console.warn = (...args) => baseLogger.warn(args.join(' '));
-  console.error = (...args) => baseLogger.error(args.join(' '));
 
   // Suppress debug logs when LOG_LEVEL is info or higher
   if (logLevel !== 'debug' && logLevel !== 'trace') {
@@ -36,26 +42,7 @@ if (process.env.LOG_LEVEL) {
   }
 }
 
-// Create logger with fallback for pino-pretty failures
+// Create logger middleware
-function createLogger() {
+export const loggerMiddleware = pinoLogger({
-  // Try pino-pretty in development
-  if (isDev && isPinoPrettyAvailable) {
-    try {
-      return pinoLogger({
   pino: baseLogger,
 });
-    } catch (error) {
-      console.error('pino-pretty not available, falling back to JSON logging', error);
-      isPinoPrettyAvailable = false;
-    }
-  }
-
-  // Fallback to simple JSON logging
-  return pinoLogger({
-    pino: {
-      level: logLevel,
-    },
-  });
-}
-
-export const loggerMiddleware = createLogger();