@flight-framework/cli 0.1.0 → 0.2.1

package/dist/bin.js

@@ -8,7 +8,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/index.ts
 import { cac } from "cac";
-import pc5 from "picocolors";
+import pc6 from "picocolors";
 
 // src/version.ts
 var VERSION = "0.0.1";
@@ -61,6 +61,21 @@ async function createCommand(name, options) {
     console.log(pc.red("Project creation cancelled."));
     return;
   }
+  if (options.raw) {
+    const projectPath2 = resolve(process.cwd(), projectName);
+    createRawProject(projectPath2, projectName, options);
+    return;
+  }
+  if (options.empty) {
+    const projectPath2 = resolve(process.cwd(), projectName);
+    createEmptyProject(projectPath2, projectName, options);
+    return;
+  }
+  if (options.minimal) {
+    const projectPath2 = resolve(process.cwd(), projectName);
+    createMinimalProject(projectPath2, projectName, options);
+    return;
+  }
   if (!uiFramework) {
     const response = await prompts({
       type: "select",
@@ -221,710 +236,311 @@ function copyDirWithTemplates(srcDir, destDir, vars) {
     }
   }
 }
+function createRawProject(projectPath, projectName, options) {
+  mkdirSync(projectPath, { recursive: true });
+  const packageJson = {
+    name: projectName,
+    version: "0.0.1",
+    type: "module",
+    scripts: {
+      // Works with Bun, Node 22+, or Deno
+      "dev": "node --watch server.js",
+      "dev:bun": "bun --watch server.js",
+      "dev:deno": "deno run --allow-net server.js",
+      "start": "node server.js"
+    },
+    dependencies: {},
+    devDependencies: {}
+  };
+  writeFileSync(
+    join(projectPath, "package.json"),
+    JSON.stringify(packageJson, null, 2)
+  );
+  const serverCode = `/**
+ * ${projectName}
+ * 
+ * 100% Web Standards server. Zero dependencies. Zero lock-in.
+ * Works on: Bun, Deno, Node 22+, Cloudflare Workers
+ * 
+ * Run:
+ *   bun server.js
+ *   deno run --allow-net server.js
+ *   node server.js (Node 22+)
+ */
 
-// src/commands/dev.ts
-import { resolve as resolve2, join as join2 } from "path";
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
-import pc2 from "picocolors";
-import { loadConfig } from "@flight-framework/core/config";
-async function devCommand(options) {
-  const startTime = Date.now();
-  printLogo();
-  console.log(pc2.cyan("\n\u2708\uFE0F  Starting Flight development server...\n"));
-  try {
-    const root = resolve2(process.cwd());
-    const config = await loadConfig(root);
-    const port = options.port ? parseInt(options.port, 10) : config.dev.port;
-    const host = options.host ?? config.dev.host;
-    const open = options.open ?? config.dev.open;
-    const ssrEnabled = options.ssr ?? config.rendering?.default === "ssr";
-    const entryServerPath = join2(root, "src", "entry-server.tsx");
-    const hasSSREntry = existsSync2(entryServerPath);
-    const { createServer: createViteServer } = await import("vite");
-    let flightHttpAvailable = false;
-    let flightRouterAvailable = false;
-    try {
-      await import("@flight-framework/http");
-      flightHttpAvailable = true;
-    } catch {
+/**
+ * Handle incoming requests using Web Standard APIs
+ * @param {Request} request
+ * @returns {Response}
+ */
+function handleRequest(request) {
+    const url = new URL(request.url);
+    const method = request.method;
+    
+    // Router
+    if (method === 'GET' && url.pathname === '/') {
+        return Response.json({
+            message: 'Hello World!',
+            runtime: detectRuntime(),
+            docs: 'https://flight.dev/docs/quickstart-http',
+        });
     }
-    try {
-      await import("@flight-framework/core/file-router");
-      flightRouterAvailable = true;
-    } catch {
+    
+    if (method === 'GET' && url.pathname === '/health') {
+        return Response.json({
+            status: 'ok',
+            timestamp: Date.now(),
+        });
     }
-    const vite = await createViteServer({
-      root,
-      mode: "development",
-      server: {
-        middlewareMode: ssrEnabled && hasSSREntry,
-        port: ssrEnabled && hasSSREntry ? void 0 : port,
-        host: host === true ? "0.0.0.0" : host,
-        open: ssrEnabled && hasSSREntry ? false : open,
-        https: options.https ? {} : void 0
-      },
-      appType: ssrEnabled && hasSSREntry ? "custom" : "spa",
-      plugins: [
-        // Add Flight plugin when @flight-framework/http is available
-        flightHttpAvailable ? flightDevPlugin(root) : null
-      ].filter(Boolean)
-    });
-    if (ssrEnabled && hasSSREntry) {
-      await startSSRServer(vite, root, port, host);
-    } else {
-      await vite.listen();
+    
+    if (method === 'GET' && url.pathname.startsWith('/api/')) {
+        return Response.json({
+            path: url.pathname,
+            query: Object.fromEntries(url.searchParams),
+        });
     }
-    const elapsed = Date.now() - startTime;
-    const isSSR = ssrEnabled && hasSSREntry;
-    console.log(`
-  ${pc2.green("\u2713")} Flight dev server ready in ${pc2.bold(elapsed + "ms")}
+    
+    // 404
+    return Response.json(
+        { error: 'Not Found', path: url.pathname },
+        { status: 404 }
+    );
+}
 
-  ${pc2.cyan("\u279C")} Local:   ${pc2.cyan(`http://localhost:${port}/`)}
-  ${host === true || host === "0.0.0.0" ? `  ${pc2.cyan("\u279C")} Network: ${pc2.cyan(`http://${getNetworkAddress()}:${port}/`)}` : ""}
-  
-  ${isSSR ? pc2.green("\u2713") : pc2.yellow("\u25CB")} SSR ${isSSR ? "enabled (streaming)" : "disabled (CSR mode)"}
-  ${flightHttpAvailable ? pc2.green("\u2713") : pc2.yellow("\u25CB")} @flight-framework/http ${flightHttpAvailable ? "enabled" : "not installed"}
-  ${flightRouterAvailable ? pc2.green("\u2713") : pc2.yellow("\u25CB")} File-based routing ${flightRouterAvailable ? "enabled" : "not available"}
+/**
+ * Detect which runtime we're running on
+ */
+function detectRuntime() {
+    if (typeof Bun !== 'undefined') return 'bun';
+    if (typeof Deno !== 'undefined') return 'deno';
+    return 'node';
+}
 
-  ${pc2.dim("press")} ${pc2.bold("h")} ${pc2.dim("to show help")}
-`);
-    if (!isSSR) {
-      vite.bindCLIShortcuts({ print: true });
+// Export for different runtimes
+const port = process.env.PORT || 3000;
+
+// Bun / Cloudflare Workers style
+export default {
+    port,
+    fetch: handleRequest,
+};
+
+// Also start server for Node.js
+if (detectRuntime() === 'node') {
+    const { serve } = await import('node:http');
+    serve({ port }, (req, res) => {
+        const url = 'http://localhost' + req.url;
+        const request = new Request(url, { method: req.method });
+        handleRequest(request).then(response => {
+            res.writeHead(response.status, Object.fromEntries(response.headers));
+            response.text().then(body => res.end(body));
+        });
+    });
+    console.log(\`Server running at http://localhost:\${port}\`);
+}
+`;
+  writeFileSync(join(projectPath, "server.js"), serverCode);
+  if (options.git) {
+    writeFileSync(
+      join(projectPath, ".gitignore"),
+      "node_modules\ndist\n.env\n.env.local\n"
+    );
+    try {
+      execSync("git init", { cwd: projectPath, stdio: "ignore" });
+    } catch {
     }
-  } catch (error) {
-    console.error(pc2.red("\nFailed to start dev server:"), error);
-    process.exit(1);
   }
+  console.log(`
+${pc.green("[OK] Raw project created!")}
+
+${pc.bold("ZERO dependencies. ZERO lock-in. 100% Web Standards.")}
+
+${pc.cyan("Run with any runtime:")}
+
+  ${pc.dim("# Bun (fastest)")}
+  bun server.js
+
+  ${pc.dim("# Deno")}
+  deno run --allow-net server.js
+
+  ${pc.dim("# Node.js 22+")}
+  node server.js
+
+${pc.dim("Want to add Flight later? Just run:")}
+  flight add http    ${pc.dim("# HTTP server with routing")}
+  flight add db      ${pc.dim("# Database abstraction")}
+  flight add cache   ${pc.dim("# Caching layer")}
+
+${pc.dim("Path:")} ${projectPath}
+`);
 }
-async function startSSRServer(vite, root, port, host) {
-  const { createServer: createHttpServer } = await import("http");
-  let pageRouter = null;
-  try {
-    const { createFileRouter } = await import("@flight-framework/core/file-router");
-    const moduleLoader = async (filePath) => {
-      const normalizedFilePath = filePath.replace(/\\/g, "/");
-      const normalizedRoot = root.replace(/\\/g, "/");
-      const relativePath = normalizedFilePath.replace(normalizedRoot, "");
-      return vite.ssrLoadModule(relativePath);
-    };
-    pageRouter = await createFileRouter({
-      directory: join2(root, "src", "routes"),
-      extensions: [".tsx", ".ts", ".jsx", ".js"],
-      moduleLoader
-      // Use Vite's ssrLoadModule
-    });
-    console.log(pc2.green(`  \u2713 Page router loaded: ${pageRouter.routes.filter((r) => r.type === "page").length} pages`));
-  } catch {
-  }
-  const server = createHttpServer(async (req, res) => {
-    const url = req.url || "/";
-    const pathname = url.split("?")[0];
-    const isStaticAsset = url.startsWith("/@") || url.startsWith("/node_modules") || url.startsWith("/src") && !url.includes("entry-server") || // Static file extensions
-    pathname.endsWith(".css") || pathname.endsWith(".js") || pathname.endsWith(".ts") || pathname.endsWith(".tsx") || pathname.endsWith(".svg") || pathname.endsWith(".png") || pathname.endsWith(".jpg") || pathname.endsWith(".jpeg") || pathname.endsWith(".gif") || pathname.endsWith(".ico") || pathname.endsWith(".woff") || pathname.endsWith(".woff2") || pathname.endsWith(".ttf") || pathname.endsWith(".eot") || pathname.endsWith(".json") || pathname.endsWith(".webp") || pathname.endsWith(".mp4") || pathname.endsWith(".webm");
-    if (isStaticAsset) {
-      vite.middlewares(req, res);
-      return;
-    }
-    if (pathname.startsWith("/api/")) {
-      vite.middlewares(req, res);
-      return;
-    }
+function createEmptyProject(projectPath, projectName, options) {
+  mkdirSync(projectPath, { recursive: true });
+  const packageJson = {
+    name: projectName,
+    version: "0.0.1",
+    type: "module",
+    scripts: {
+      dev: "node server.js"
+    },
+    dependencies: {},
+    devDependencies: {}
+  };
+  writeFileSync(
+    join(projectPath, "package.json"),
+    JSON.stringify(packageJson, null, 2)
+  );
+  if (options.git) {
+    writeFileSync(
+      join(projectPath, ".gitignore"),
+      "node_modules\ndist\n.env\n.env.local\n"
+    );
     try {
-      let template = readFileSync2(
-        join2(root, "index.html"),
-        "utf-8"
-      );
-      template = await vite.transformIndexHtml(url, template);
-      let appHtml = "";
-      if (pageRouter) {
-        const pageRoute = pageRouter.routes.find(
-          (r) => r.type === "page" && matchPath(r.path, pathname)
-        );
-        if (pageRoute && pageRoute.component) {
-          const normalizedFilePath = pageRoute.filePath.replace(/\\/g, "/");
-          const normalizedRoot = root.replace(/\\/g, "/");
-          const relativePath = normalizedFilePath.replace(normalizedRoot, "");
-          const mod = await vite.ssrLoadModule(relativePath);
-          const Component = mod.default;
-          const { render } = await vite.ssrLoadModule("/src/entry-server.tsx");
-          if (typeof render === "function" && Component) {
-            appHtml = await render(url, { Component });
-          }
-        }
-      }
-      if (!appHtml) {
-        const { render } = await vite.ssrLoadModule("/src/entry-server.tsx");
-        if (typeof render === "function") {
-          appHtml = await render(url);
-        }
-      }
-      if (appHtml) {
-        const html = template.replace("<!--ssr-outlet-->", appHtml);
-        res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-        res.end(html);
-      } else {
-        res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-        res.end(template);
-      }
-    } catch (e) {
-      vite.ssrFixStacktrace(e);
-      console.error(pc2.red("[SSR Error]"), e.stack);
-      if (!res.headersSent) {
-        res.writeHead(500, { "Content-Type": "text/plain" });
-        res.end(`SSR Error: ${e.message}
-
-${e.stack}`);
-      }
+      execSync("git init", { cwd: projectPath, stdio: "ignore" });
+    } catch {
     }
-  });
-  const listenHost = host === true ? "0.0.0.0" : host || "localhost";
-  server.listen(port, listenHost, () => {
-    console.log(pc2.green(`  \u2713 SSR server listening`));
-  });
+  }
+  console.log(`
+${pc.green("[OK] Empty project created!")}
+
+${pc.cyan("Your project is a blank canvas.")} Add what you need:
+
+  ${pc.dim("# HTTP server")}
+  npm install @flight-framework/http
+
+  ${pc.dim("# Database")}
+  npm install @flight-framework/db
+
+  ${pc.dim("# Cache")}
+  npm install @flight-framework/cache
+
+  ${pc.dim("# Authentication")}
+  npm install @flight-framework/auth
+
+${pc.dim("Path:")} ${projectPath}
+`);
 }
-function flightDevPlugin(root) {
-  return {
-    name: "flight:dev",
-    configureServer(server) {
-      server.middlewares.use(async (req, res, next) => {
-        const url = req.url || "/";
-        if (url.startsWith("/__flight_action/")) {
-          try {
-            const { handleActionRequest } = await import("@flight-framework/core");
-            const webRequest = await nodeToWebRequest(req);
-            const response = await handleActionRequest(webRequest);
-            res.statusCode = response.status;
-            response.headers.forEach((value, key) => {
-              res.setHeader(key, value);
-            });
-            const body = await response.text();
-            res.end(body);
-          } catch (error) {
-            console.error("[Flight] Action error:", error);
-            res.statusCode = 500;
-            res.end(JSON.stringify({ error: "Internal server error" }));
-          }
-          return;
-        }
-        if (url.startsWith("/api/")) {
-          try {
-            const { createFileRouter } = await import("@flight-framework/core/file-router");
-            const routesDir = join2(root, "src", "routes");
-            const router = await createFileRouter({ directory: routesDir });
-            const route = router.routes.find((r) => {
-              return matchPath(r.path, url);
-            });
-            if (route && route.handler) {
-              const webRequest = await nodeToWebRequest(req);
-              const response = await route.handler({ req: webRequest, params: {} });
-              res.statusCode = response.status;
-              response.headers.forEach((value, key) => {
-                res.setHeader(key, value);
-              });
-              const body = await response.text();
-              res.end(body);
-              return;
-            }
-          } catch (error) {
-          }
-        }
-        next();
-      });
+function createMinimalProject(projectPath, projectName, options) {
+  mkdirSync(projectPath, { recursive: true });
+  const packageJson = {
+    name: projectName,
+    version: "0.0.1",
+    type: "module",
+    scripts: {
+      dev: "node --watch server.js",
+      start: "node server.js"
+    },
+    dependencies: {
+      "@flight-framework/http": "^0.0.1"
     }
   };
-}
-async function nodeToWebRequest(req) {
-  const host = req.headers.host || "localhost";
-  const protocol = "http";
-  const url = new URL(req.url || "/", `${protocol}://${host}`);
-  let body = null;
-  if (req.method !== "GET" && req.method !== "HEAD") {
-    const chunks = [];
-    for await (const chunk of req) {
-      chunks.push(chunk);
+  writeFileSync(
+    join(projectPath, "package.json"),
+    JSON.stringify(packageJson, null, 2)
+  );
+  const serverCode = `/**
+ * ${projectName} - Built with Flight
+ * 
+ * This is a minimal Flight server. Add more as you need.
+ * Run: npm run dev
+ */
+
+import { createServer } from '@flight-framework/http';
+
+const app = createServer();
+
+// Your routes
+app.get('/', (c) => c.json({ 
+    message: 'Hello from Flight!',
+    docs: 'https://flight.dev/docs/quickstart-http'
+}));
+
+app.get('/health', (c) => c.json({ 
+    status: 'ok', 
+    timestamp: Date.now() 
+}));
+
+// Start server
+const port = process.env.PORT || 3000;
+console.log(\`Server running at http://localhost:\${port}\`);
+
+export default { port, fetch: app.fetch };
+`;
+  writeFileSync(join(projectPath, "server.js"), serverCode);
+  if (options.git) {
+    writeFileSync(
+      join(projectPath, ".gitignore"),
+      "node_modules\ndist\n.env\n.env.local\n"
+    );
+    try {
+      execSync("git init", { cwd: projectPath, stdio: "ignore" });
+    } catch {
     }
-    body = Buffer.concat(chunks);
   }
-  const headers = new Headers();
-  for (const [key, value] of Object.entries(req.headers)) {
-    if (value) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          headers.append(key, v);
-        }
-      } else {
-        headers.set(key, value);
-      }
-    }
-  }
-  return new Request(url.toString(), {
-    method: req.method || "GET",
-    headers,
-    body
-  });
-}
-function matchPath(pattern, path) {
-  const cleanPath = path.split("?")[0];
-  const regexPattern = pattern.replace(/:\w+/g, "[^/]+").replace(/\*/g, ".*");
-  const regex = new RegExp(`^${regexPattern}$`);
-  return regex.test(cleanPath || "/");
-}
-function getNetworkAddress() {
-  try {
-    const { networkInterfaces } = __require("os");
-    const nets = networkInterfaces();
-    for (const name of Object.keys(nets)) {
-      for (const net of nets[name]) {
-        if (net.family === "IPv4" && !net.internal) {
-          return net.address;
-        }
-      }
+  if (options.install) {
+    console.log(pc.dim("\\nInstalling dependencies...\\n"));
+    try {
+      const pm = detectPackageManager();
+      execSync(`${pm} install`, { cwd: projectPath, stdio: "inherit" });
+    } catch {
     }
-  } catch {
   }
-  return "0.0.0.0";
-}
+  console.log(`
+${pc.green("[OK] Minimal project created!")}
 
-// src/commands/build.ts
-import { resolve as resolve3 } from "path";
-import { existsSync as existsSync3 } from "fs";
-import pc3 from "picocolors";
-import { loadConfig as loadConfig2 } from "@flight-framework/core/config";
-function findEntryServer(root, srcDir) {
-  const tsxPath = resolve3(root, srcDir, "entry-server.tsx");
-  const tsPath = resolve3(root, srcDir, "entry-server.ts");
-  if (existsSync3(tsxPath)) return tsxPath;
-  if (existsSync3(tsPath)) return tsPath;
-  return tsxPath;
-}
-async function buildCommand(options) {
-  const startTime = Date.now();
-  printLogo();
-  console.log(pc3.cyan("\n[*] Building Flight project for production...\n"));
-  try {
-    const root = resolve3(process.cwd());
-    const config = await loadConfig2(root);
-    const outDir = options.outDir ?? config.build.outDir;
-    const sourcemap = options.sourcemap ?? config.build.sourcemap;
-    const minify = options.minify ?? config.build.minify;
-    const { build } = await import("vite");
-    console.log(pc3.dim(`Output directory: ${outDir}`));
-    console.log(pc3.dim(`Sourcemaps: ${sourcemap ? "enabled" : "disabled"}`));
-    console.log(pc3.dim(`Minification: ${minify ? "enabled" : "disabled"}
-`));
-    console.log(pc3.cyan("Building client..."));
-    await build({
-      root,
-      mode: "production",
-      build: {
-        outDir: `${outDir}/client`,
-        sourcemap,
-        minify: minify ? "esbuild" : false,
-        rollupOptions: {
-          input: resolve3(root, "index.html")
-        }
-      }
-    });
-    console.log(pc3.green("\u2713") + " Client build complete");
-    if (config.rendering.default !== "csr") {
-      console.log(pc3.cyan("\nBuilding server..."));
-      await build({
-        root,
-        mode: "production",
-        build: {
-          outDir: `${outDir}/server`,
-          sourcemap,
-          minify: minify ? "esbuild" : false,
-          ssr: true,
-          rollupOptions: {
-            input: findEntryServer(root, config.build.srcDir)
-          }
-        }
-      });
-      console.log(pc3.green("\u2713") + " Server build complete");
-    }
-    if (config.adapter) {
-      console.log(pc3.cyan(`
-Running ${config.adapter.name} adapter...`));
-      console.log(pc3.green("\u2713") + ` ${config.adapter.name} adapter complete`);
-    }
-    const elapsed = Date.now() - startTime;
-    const elapsedSeconds = (elapsed / 1e3).toFixed(2);
-    console.log(`
-${pc3.green("[OK] Build complete!")} ${pc3.dim(`(${elapsedSeconds}s)`)}
+${pc.cyan("Next steps:")}
 
-${pc3.cyan("Output:")} ${resolve3(root, outDir)}
+  ${pc.dim("$")} cd ${projectName}
+  ${pc.dim("$")} ${options.install ? "" : "npm install && "}npm run dev
 
-${pc3.dim("To preview the build:")}
-  ${pc3.dim("$")} flight preview
+${pc.dim("Add more features as needed:")}
 
-${pc3.dim("To deploy:")}
-  ${pc3.dim("\u2022")} Upload ${outDir}/ to your server
-  ${pc3.dim("\u2022")} Or use your configured adapter
-`);
-  } catch (error) {
-    console.error(pc3.red("\nBuild failed:"), error);
-    process.exit(1);
-  }
-}
+  ${pc.dim("# File-based routing")}
+  npm install @flight-framework/core
 
-// src/commands/preview.ts
-import { resolve as resolve4 } from "path";
-import pc4 from "picocolors";
-import { loadConfig as loadConfig3 } from "@flight-framework/core/config";
-async function previewCommand(options) {
-  printLogo();
-  console.log(pc4.cyan("\n\u2708\uFE0F  Starting Flight preview server...\n"));
-  try {
-    const root = resolve4(process.cwd());
-    const config = await loadConfig3(root);
-    const port = options.port ? parseInt(options.port, 10) : config.dev.port + 1;
-    const host = options.host ?? config.dev.host;
-    const open = options.open ?? false;
-    const { preview } = await import("vite");
-    const server = await preview({
-      root,
-      preview: {
-        port,
-        host: host === true ? "0.0.0.0" : host,
-        open
-      },
-      build: {
-        outDir: config.build.outDir
-      }
-    });
-    console.log(`
-  ${pc4.green("\u2713")} Flight preview server ready
+  ${pc.dim("# Database")}
+  npm install @flight-framework/db pg
 
-  ${pc4.cyan("\u279C")} Local:   ${pc4.cyan(`http://localhost:${port}/`)}
-  ${host === true || host === "0.0.0.0" ? `  ${pc4.cyan("\u279C")} Network: ${pc4.cyan(`http://0.0.0.0:${port}/`)}` : ""}
+  ${pc.dim("# Caching")}
+  npm install @flight-framework/cache
 
-  ${pc4.dim("This is a preview of your production build.")}
-  ${pc4.dim("For development, use")} ${pc4.bold("flight dev")}
+${pc.cyan("Happy flying!")}
 `);
-    server.printUrls();
-  } catch (error) {
-    console.error(pc4.red("\nFailed to start preview server:"), error);
-    process.exit(1);
-  }
 }
 
-// src/commands/routes-generate.ts
-import { resolve as resolve5 } from "path";
+// src/commands/dev.ts
+import { resolve as resolve3, join as join3 } from "path";
+import { readFileSync as readFileSync3, existsSync as existsSync3 } from "fs";
+import pc2 from "picocolors";
+import { loadConfig } from "@flight-framework/core/config";
 
-// src/generators/routes.ts
-import { readdirSync as readdirSync2, statSync as statSync2, existsSync as existsSync4, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-import { join as join3, dirname as dirname2 } from "path";
-function filePathToUrlPath(filePath) {
-  let urlPath = filePath.replace(/\.(page|route)\.(tsx?|jsx?)$/, "").replace(/\.(get|post|put|patch|delete|options|head)$/, "").replace(/\/index$/, "").replace(/\/?\([^)]+\)/g, "").replace(/\[\.\.\.(\w+)\]/g, "*$1").replace(/\[(\w+)\]/g, ":$1");
-  if (!urlPath.startsWith("/")) {
-    urlPath = "/" + urlPath;
+// src/generators/typegen.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, readdirSync as readdirSync2, watch } from "fs";
+import { join as join2 } from "path";
+function generateHeader(command) {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  return `/**
+ * Auto-generated by Flight CLI
+ * Do not edit manually - changes will be overwritten
+ *
+ * Command: ${command}
+ * Generated: ${timestamp}
+ */`;
+}
+function extractParams(routePath) {
+  const params = [];
+  const dynamicMatches = routePath.match(/:(\w+)/g);
+  if (dynamicMatches) {
+    params.push(...dynamicMatches.map((m) => m.slice(1)));
   }
-  if (urlPath === "" || urlPath === "/") {
-    urlPath = "/";
+  const catchAllMatches = routePath.match(/\*(\w+)/g);
+  if (catchAllMatches) {
+    params.push(...catchAllMatches.map((m) => m.slice(1)));
   }
-  urlPath = urlPath.replace(/\/+/g, "/");
-  return urlPath;
-}
-function extractHttpMethod(filename) {
-  const match = filename.match(/\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/i);
-  return match ? match[1].toUpperCase() : void 0;
-}
-function isLayoutFile(filename) {
-  return filename.startsWith("_layout.");
-}
-function isLoadingFile(filename) {
-  return filename.startsWith("_loading.");
-}
-function isErrorFile(filename) {
-  return filename.startsWith("_error.");
-}
-function isNotFoundFile(filename) {
-  return filename.startsWith("_not-found.");
-}
-function isRouteFile(filename) {
-  return /\.(page|route)\.(tsx?|jsx?)$/.test(filename);
-}
-function isApiRouteFile(filename) {
-  return /\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/.test(filename);
+  return params;
 }
-function hasDynamicSegments(path) {
-  return path.includes("[") && path.includes("]");
-}
-function scanDirectory(dir, basePath = "", results = []) {
-  if (!existsSync4(dir)) {
-    return results;
-  }
-  const entries = readdirSync2(dir);
-  for (const entry of entries) {
-    const fullPath = join3(dir, entry);
-    const relativePath = join3(basePath, entry);
-    const stat = statSync2(fullPath);
-    if (stat.isDirectory()) {
-      if (entry.startsWith(".") || entry === "node_modules") {
-        continue;
-      }
-      scanDirectory(fullPath, relativePath, results);
-    } else if (stat.isFile()) {
-      const routePath = filePathToUrlPath(dirname2(relativePath));
-      const normalizedFilePath = relativePath.replace(/\\/g, "/");
-      const isDynamic = hasDynamicSegments(relativePath);
-      if (isLayoutFile(entry)) {
-        results.push({
-          path: routePath,
-          filePath: normalizedFilePath,
-          isLayout: true,
-          isLoading: false,
-          isError: false,
-          isNotFound: false,
-          isDynamic,
-          isApiRoute: false
-        });
-      } else if (isLoadingFile(entry)) {
-        results.push({
-          path: routePath,
-          filePath: normalizedFilePath,
-          isLayout: false,
-          isLoading: true,
-          isError: false,
-          isNotFound: false,
-          isDynamic,
-          isApiRoute: false
-        });
-      } else if (isErrorFile(entry)) {
-        results.push({
-          path: routePath,
-          filePath: normalizedFilePath,
-          isLayout: false,
-          isLoading: false,
-          isError: true,
-          isNotFound: false,
-          isDynamic,
-          isApiRoute: false
-        });
-      } else if (isNotFoundFile(entry)) {
-        results.push({
-          path: routePath,
-          filePath: normalizedFilePath,
-          isLayout: false,
-          isLoading: false,
-          isError: false,
-          isNotFound: true,
-          isDynamic,
-          isApiRoute: false
-        });
-      } else if (isApiRouteFile(entry)) {
-        const method = extractHttpMethod(entry);
-        results.push({
-          path: filePathToUrlPath(relativePath),
-          filePath: normalizedFilePath,
-          isLayout: false,
-          isLoading: false,
-          isError: false,
-          isNotFound: false,
-          isDynamic,
-          isApiRoute: true,
-          httpMethod: method
-        });
-      } else if (isRouteFile(entry)) {
-        results.push({
-          path: filePathToUrlPath(relativePath),
-          filePath: normalizedFilePath,
-          isLayout: false,
-          isLoading: false,
-          isError: false,
-          isNotFound: false,
-          isDynamic,
-          isApiRoute: false
-        });
-      }
-    }
-  }
-  return results;
-}
-function sortRoutes(routes) {
-  return routes.sort((a, b) => {
-    if (!a.isDynamic && b.isDynamic) return -1;
-    if (a.isDynamic && !b.isDynamic) return 1;
-    const aSegments = a.path.split("/").length;
-    const bSegments = b.path.split("/").length;
-    if (aSegments !== bSegments) return aSegments - bSegments;
-    return a.path.localeCompare(b.path);
-  });
-}
-function generateRouteManifest(routesDir) {
-  const allRoutes = scanDirectory(routesDir);
-  const isPageRoute = (r) => !r.isLayout && !r.isLoading && !r.isError && !r.isNotFound && !r.isApiRoute;
-  const routes = sortRoutes(allRoutes.filter(isPageRoute));
-  const layouts = allRoutes.filter((r) => r.isLayout);
-  const loadingStates = allRoutes.filter((r) => r.isLoading);
-  const errorBoundaries = allRoutes.filter((r) => r.isError);
-  const notFoundPages = allRoutes.filter((r) => r.isNotFound);
-  const apiRoutes = sortRoutes(allRoutes.filter((r) => r.isApiRoute));
-  return {
-    routes,
-    layouts,
-    loadingStates,
-    errorBoundaries,
-    notFoundPages,
-    apiRoutes,
-    generated: (/* @__PURE__ */ new Date()).toISOString()
-  };
-}
-function generateRoutesFile(manifest, outputDir) {
-  if (!existsSync4(outputDir)) {
-    mkdirSync2(outputDir, { recursive: true });
-  }
-  const routesContent = `/**
- * Auto-generated by Flight CLI
- * Do not edit manually
- * Generated: ${manifest.generated}
- */
-
-import type { RouteDefinition } from '@flight-framework/router';
-
-// Page Routes
-export const routes: RouteDefinition[] = [
-${manifest.routes.map((r) => `    {
-        path: '${r.path}',
-        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
-    },`).join("\n")}
-];
-
-// Layout Components
-export const layouts = [
-${manifest.layouts.map((r) => `    {
-        path: '${r.path}',
-        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
-    },`).join("\n")}
-];
-
-// Loading State Components
-export const loadingStates = [
-${manifest.loadingStates.map((r) => `    {
-        path: '${r.path}',
-        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
-    },`).join("\n")}
-];
-
-// Error Boundary Components
-export const errorBoundaries = [
-${manifest.errorBoundaries.map((r) => `    {
-        path: '${r.path}',
-        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
-    },`).join("\n")}
-];
-
-// Not Found Page Components
-export const notFoundPages = [
-${manifest.notFoundPages.map((r) => `    {
-        path: '${r.path}',
-        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
-    },`).join("\n")}
-];
-
-// API Routes
-export const apiRoutes = [
-${manifest.apiRoutes.map((r) => `    {
-        path: '${r.path}',
-        method: '${r.httpMethod}',
-        handler: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
-    },`).join("\n")}
-];
-
-// Type-safe route paths
-export type AppRoutes = ${manifest.routes.length > 0 ? manifest.routes.map((r) => `'${r.path}'`).join(" | ") : "never"};
-
-// Type-safe API route paths
-export type ApiRoutes = ${manifest.apiRoutes.length > 0 ? manifest.apiRoutes.map((r) => `'${r.path}'`).join(" | ") : "never"};
-`;
-  writeFileSync2(join3(outputDir, "routes.ts"), routesContent, "utf-8");
-  const typesContent = `/**
- * Auto-generated route types
- * Generated: ${manifest.generated}
- */
-
-import type { RouteParams } from '@flight-framework/router';
-
-// Extract params from route patterns
-${manifest.routes.filter((r) => r.isDynamic).map((r) => {
-    const paramMatches = r.path.match(/:(\w+)/g) || [];
-    const params = paramMatches.map((p) => p.slice(1));
-    const typeName = r.path.replace(/[/:]/g, "_").replace(/^_/, "").replace(/_$/, "") || "Root";
-    return `export type ${typeName}Params = { ${params.map((p) => `${p}: string`).join("; ")} };`;
-  }).join("\n")}
-`;
-  writeFileSync2(join3(outputDir, "types.ts"), typesContent, "utf-8");
-}
-async function generateRoutes(options) {
-  const { routesDir, outputDir } = options;
-  console.log(`Scanning routes in: ${routesDir}`);
-  const manifest = generateRouteManifest(routesDir);
-  const stats = [
-    `${manifest.routes.length} pages`,
-    `${manifest.layouts.length} layouts`,
-    `${manifest.loadingStates.length} loading states`,
-    `${manifest.errorBoundaries.length} error boundaries`,
-    `${manifest.notFoundPages.length} not-found pages`,
-    `${manifest.apiRoutes.length} API routes`
-  ].join(", ");
-  console.log(`Found: ${stats}`);
-  generateRoutesFile(manifest, outputDir);
-  console.log(`Generated route manifest in: ${outputDir}`);
-  return manifest;
-}
-
-// src/commands/routes-generate.ts
-async function routesGenerateCommand(options = {}) {
-  const cwd = process.cwd();
-  const routesDir = options.routesDir ? resolve5(cwd, options.routesDir) : resolve5(cwd, "src/routes");
-  const outputDir = options.outputDir ? resolve5(cwd, options.outputDir) : resolve5(cwd, "src/.flight");
-  try {
-    const manifest = await generateRoutes({
-      routesDir,
-      outputDir,
-      watch: options.watch
-    });
-    console.log("\nRoute manifest generated successfully!");
-    console.log(`  Pages: ${manifest.routes.length}`);
-    console.log(`  API Routes: ${manifest.apiRoutes.length}`);
-    console.log(`  Layouts: ${manifest.layouts.length}`);
-  } catch (error) {
-    console.error("Failed to generate routes:", error);
-    process.exit(1);
-  }
-}
-
-// src/commands/types-generate.ts
-import { resolve as resolve7 } from "path";
-
-// src/generators/typegen.ts
-import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, readdirSync as readdirSync3, watch } from "fs";
-import { join as join4 } from "path";
-function generateHeader(command) {
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-  return `/**
- * Auto-generated by Flight CLI
- * Do not edit manually - changes will be overwritten
- *
- * Command: ${command}
- * Generated: ${timestamp}
- */`;
-}
-function extractParams(routePath) {
-  const params = [];
-  const dynamicMatches = routePath.match(/:(\w+)/g);
-  if (dynamicMatches) {
-    params.push(...dynamicMatches.map((m) => m.slice(1)));
-  }
-  const catchAllMatches = routePath.match(/\*(\w+)/g);
-  if (catchAllMatches) {
-    params.push(...catchAllMatches.map((m) => m.slice(1)));
-  }
-  return params;
-}
-function isDynamicRoute(routePath) {
-  return routePath.includes(":") || routePath.includes("*");
+function isDynamicRoute(routePath) {
+  return routePath.includes(":") || routePath.includes("*");
 }
 function generateRouteTypes(routes) {
   const pageRoutes = routes.filter((r) => !r.isApiRoute);
@@ -1071,11 +687,11 @@ function loadEnvFiles(projectRoot) {
   const merged = { server: [], client: [] };
   const seenKeys = /* @__PURE__ */ new Set();
   for (const envFile of envFiles) {
-    const envPath = join4(projectRoot, envFile);
-    if (!existsSync5(envPath)) {
+    const envPath = join2(projectRoot, envFile);
+    if (!existsSync2(envPath)) {
       continue;
     }
-    const content = readFileSync3(envPath, "utf-8");
+    const content = readFileSync2(envPath, "utf-8");
     const parsed = parseEnvFile(content);
     for (const envVar of parsed.server) {
       if (!seenKeys.has(envVar.key)) {
@@ -1097,161 +713,859 @@ function generateEnvTypes(env) {
   const clientVars = env.client.sort((a, b) => a.key.localeCompare(b.key)).map((v) => `    ${v.key}${v.optional ? "?" : ""}: string;`).join("\n");
   return `${generateHeader("flight types:generate --env")}
 
-// ============================================================================
-// Server-side Environment Variables
-// ============================================================================
+// ============================================================================
+// Server-side Environment Variables
+// ============================================================================
+
+/**
+ * Server-side environment variables accessible via process.env
+ * These are NOT exposed to the client.
+ */
+declare namespace NodeJS {
+    interface ProcessEnv {
+${serverVars || "        // No server environment variables defined"}
+    }
+}
+
+// ============================================================================
+// Client-side Environment Variables
+// ============================================================================
+
+/**
+ * Client-side environment variables accessible via import.meta.env
+ * Only variables with PUBLIC_ prefix are included.
+ */
+interface ImportMetaEnv {
+${clientVars || "    // No client environment variables defined"}
+}
+
+interface ImportMeta {
+    readonly env: ImportMetaEnv;
+}
+`;
+}
+function scanRoutesForTypes(routesDir) {
+  if (!existsSync2(routesDir)) {
+    return [];
+  }
+  const routes = [];
+  scanDirectoryRecursive(routesDir, "", routes);
+  return routes;
+}
+function scanDirectoryRecursive(dir, basePath, results) {
+  const entries = readdirSync2(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = join2(dir, entry.name);
+    const relativePath = join2(basePath, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name.startsWith(".") || entry.name === "node_modules") {
+        continue;
+      }
+      scanDirectoryRecursive(fullPath, relativePath, results);
+    } else if (entry.isFile()) {
+      const route = parseRouteFile(entry.name, relativePath);
+      if (route) {
+        results.push(route);
+      }
+    }
+  }
+}
+function parseRouteFile(filename, relativePath) {
+  if (/\.(page|route)\.(tsx?|jsx?)$/.test(filename)) {
+    const urlPath = filePathToUrlPath(relativePath);
+    return {
+      path: urlPath,
+      filePath: relativePath.replace(/\\/g, "/"),
+      isDynamic: isDynamicRoute(urlPath),
+      isApiRoute: false
+    };
+  }
+  const apiMatch = filename.match(/\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/i);
+  if (apiMatch) {
+    const urlPath = filePathToUrlPath(relativePath);
+    return {
+      path: urlPath,
+      filePath: relativePath.replace(/\\/g, "/"),
+      isDynamic: isDynamicRoute(urlPath),
+      isApiRoute: true,
+      httpMethod: apiMatch[1].toUpperCase()
+    };
+  }
+  return null;
+}
+function filePathToUrlPath(filePath) {
+  let urlPath = filePath.replace(/\\/g, "/").replace(/\.(page|route)\.(tsx?|jsx?)$/, "").replace(/\.(get|post|put|patch|delete|options|head)$/i, "").replace(/\/index$/, "").replace(/^index$/, "").replace(/\/?\\?\([^)]+\\?\)/g, "").replace(/\[\.\.\.(\w+)\]/g, "*$1").replace(/\[(\w+)\]/g, ":$1");
+  if (!urlPath.startsWith("/")) {
+    urlPath = "/" + urlPath;
+  }
+  urlPath = urlPath.replace(/\/+/g, "/");
+  return urlPath || "/";
+}
+async function generateTypes(options) {
+  const {
+    routesDir,
+    outputDir,
+    includeRoutes = true,
+    includeEnv = false,
+    projectRoot = process.cwd()
+  } = options;
+  const result = {
+    routeTypes: "",
+    envTypes: "",
+    filesWritten: [],
+    routeCount: 0,
+    envVarCount: 0
+  };
+  if (!existsSync2(outputDir)) {
+    mkdirSync2(outputDir, { recursive: true });
+  }
+  if (includeRoutes) {
+    const routes = scanRoutesForTypes(routesDir);
+    result.routeCount = routes.length;
+    result.routeTypes = generateRouteTypes(routes);
+    const routeTypesPath = join2(outputDir, "routes.d.ts");
+    writeFileSync2(routeTypesPath, result.routeTypes, "utf-8");
+    result.filesWritten.push(routeTypesPath);
+    console.log(`Generated route types: ${routes.length} routes`);
+  }
+  if (includeEnv) {
+    const env = loadEnvFiles(projectRoot);
+    result.envVarCount = env.server.length + env.client.length;
+    result.envTypes = generateEnvTypes(env);
+    const envTypesPath = join2(outputDir, "env.d.ts");
+    writeFileSync2(envTypesPath, result.envTypes, "utf-8");
+    result.filesWritten.push(envTypesPath);
+    console.log(`Generated env types: ${env.server.length} server, ${env.client.length} client`);
+  }
+  return result;
+}
+function watchAndGenerate(options) {
+  const { routesDir, debounce = 100, onRegenerate } = options;
+  let timeout = null;
+  const regenerate = async () => {
+    try {
+      const result = await generateTypes(options);
+      onRegenerate?.(result);
+    } catch (error) {
+      console.error("Type generation failed:", error.message);
+    }
+  };
+  const debouncedRegenerate = () => {
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(regenerate, debounce);
+  };
+  regenerate();
+  const watcher = watch(routesDir, { recursive: true }, (eventType, filename) => {
+    if (filename && /\.(tsx?|jsx?)$/.test(filename)) {
+      console.log(`Route file changed: ${filename}`);
+      debouncedRegenerate();
+    }
+  });
+  return () => {
+    watcher.close();
+    if (timeout) clearTimeout(timeout);
+  };
+}
+
+// src/commands/dev.ts
+async function devCommand(options) {
+  const startTime = Date.now();
+  printLogo();
+  console.log(pc2.cyan("\n  Starting Flight development server...\n"));
+  try {
+    const root = resolve3(process.cwd());
+    const config = await loadConfig(root);
+    const routesDir = join3(root, "src", "routes");
+    const outputDir = join3(root, "src", ".flight");
+    if (existsSync3(routesDir)) {
+      try {
+        const result = await generateTypes({
+          routesDir,
+          outputDir,
+          includeRoutes: true,
+          includeEnv: false,
+          projectRoot: root
+        });
+        console.log(pc2.green(`  Route types generated: ${result.routeCount} routes`));
+        const cleanup = watchAndGenerate({
+          routesDir,
+          outputDir,
+          includeRoutes: true,
+          includeEnv: false,
+          projectRoot: root,
+          onRegenerate: (watchResult) => {
+            console.log(pc2.blue(`  Route types updated: ${watchResult.routeCount} routes`));
+          }
+        });
+        process.on("SIGINT", () => cleanup());
+        process.on("SIGTERM", () => cleanup());
+      } catch (typeError) {
+        console.log(pc2.yellow(`  Route type generation skipped: ${typeError}`));
+      }
+    }
+    const port = options.port ? parseInt(options.port, 10) : config.dev.port;
+    const host = options.host ?? config.dev.host;
+    const open = options.open ?? config.dev.open;
+    const ssrEnabled = options.ssr ?? config.rendering?.default === "ssr";
+    const entryServerPath = join3(root, "src", "entry-server.tsx");
+    const hasSSREntry = existsSync3(entryServerPath);
+    const { createServer: createViteServer } = await import("vite");
+    let flightHttpAvailable = false;
+    let flightRouterAvailable = false;
+    try {
+      await import("@flight-framework/http");
+      flightHttpAvailable = true;
+    } catch {
+    }
+    try {
+      await import("@flight-framework/core/file-router");
+      flightRouterAvailable = true;
+    } catch {
+    }
+    const vite = await createViteServer({
+      root,
+      mode: "development",
+      server: {
+        middlewareMode: ssrEnabled && hasSSREntry,
+        port: ssrEnabled && hasSSREntry ? void 0 : port,
+        host: host === true ? "0.0.0.0" : host,
+        open: ssrEnabled && hasSSREntry ? false : open,
+        https: options.https ? {} : void 0
+      },
+      appType: ssrEnabled && hasSSREntry ? "custom" : "spa",
+      plugins: [
+        // Add Flight plugin when @flight-framework/http is available
+        flightHttpAvailable ? flightDevPlugin(root) : null
+      ].filter(Boolean)
+    });
+    if (ssrEnabled && hasSSREntry) {
+      await startSSRServer(vite, root, port, host);
+    } else {
+      await vite.listen();
+    }
+    const elapsed = Date.now() - startTime;
+    const isSSR = ssrEnabled && hasSSREntry;
+    console.log(`
+  ${pc2.green("\u2713")} Flight dev server ready in ${pc2.bold(elapsed + "ms")}
+
+  ${pc2.cyan("\u279C")} Local:   ${pc2.cyan(`http://localhost:${port}/`)}
+  ${host === true || host === "0.0.0.0" ? `  ${pc2.cyan("\u279C")} Network: ${pc2.cyan(`http://${getNetworkAddress()}:${port}/`)}` : ""}
+  
+  ${isSSR ? pc2.green("\u2713") : pc2.yellow("\u25CB")} SSR ${isSSR ? "enabled (streaming)" : "disabled (CSR mode)"}
+  ${flightHttpAvailable ? pc2.green("\u2713") : pc2.yellow("\u25CB")} @flight-framework/http ${flightHttpAvailable ? "enabled" : "not installed"}
+  ${flightRouterAvailable ? pc2.green("\u2713") : pc2.yellow("\u25CB")} File-based routing ${flightRouterAvailable ? "enabled" : "not available"}
+
+  ${pc2.dim("press")} ${pc2.bold("h")} ${pc2.dim("to show help")}
+`);
+    if (!isSSR) {
+      vite.bindCLIShortcuts({ print: true });
+    }
+  } catch (error) {
+    console.error(pc2.red("\nFailed to start dev server:"), error);
+    process.exit(1);
+  }
+}
+async function startSSRServer(vite, root, port, host) {
+  const { createServer: createHttpServer } = await import("http");
+  let pageRouter = null;
+  try {
+    const { createFileRouter } = await import("@flight-framework/core/file-router");
+    const moduleLoader = async (filePath) => {
+      const normalizedFilePath = filePath.replace(/\\/g, "/");
+      const normalizedRoot = root.replace(/\\/g, "/");
+      const relativePath = normalizedFilePath.replace(normalizedRoot, "");
+      return vite.ssrLoadModule(relativePath);
+    };
+    pageRouter = await createFileRouter({
+      directory: join3(root, "src", "routes"),
+      extensions: [".tsx", ".ts", ".jsx", ".js"],
+      moduleLoader
+      // Use Vite's ssrLoadModule
+    });
+    console.log(pc2.green(`  \u2713 Page router loaded: ${pageRouter.routes.filter((r) => r.type === "page").length} pages`));
+  } catch {
+  }
+  const server = createHttpServer(async (req, res) => {
+    const url = req.url || "/";
+    const pathname = url.split("?")[0];
+    const isStaticAsset = url.startsWith("/@") || url.startsWith("/node_modules") || url.startsWith("/src") && !url.includes("entry-server") || // Static file extensions
+    pathname.endsWith(".css") || pathname.endsWith(".js") || pathname.endsWith(".ts") || pathname.endsWith(".tsx") || pathname.endsWith(".svg") || pathname.endsWith(".png") || pathname.endsWith(".jpg") || pathname.endsWith(".jpeg") || pathname.endsWith(".gif") || pathname.endsWith(".ico") || pathname.endsWith(".woff") || pathname.endsWith(".woff2") || pathname.endsWith(".ttf") || pathname.endsWith(".eot") || pathname.endsWith(".json") || pathname.endsWith(".webp") || pathname.endsWith(".mp4") || pathname.endsWith(".webm");
+    if (isStaticAsset) {
+      vite.middlewares(req, res);
+      return;
+    }
+    if (pathname.startsWith("/api/")) {
+      vite.middlewares(req, res);
+      return;
+    }
+    try {
+      let template = readFileSync3(
+        join3(root, "index.html"),
+        "utf-8"
+      );
+      template = await vite.transformIndexHtml(url, template);
+      let appHtml = "";
+      if (pageRouter) {
+        const pageRoute = pageRouter.routes.find(
+          (r) => r.type === "page" && matchPath(r.path, pathname)
+        );
+        if (pageRoute && pageRoute.component) {
+          const normalizedFilePath = pageRoute.filePath.replace(/\\/g, "/");
+          const normalizedRoot = root.replace(/\\/g, "/");
+          const relativePath = normalizedFilePath.replace(normalizedRoot, "");
+          const mod = await vite.ssrLoadModule(relativePath);
+          const Component = mod.default;
+          const { render } = await vite.ssrLoadModule("/src/entry-server.tsx");
+          if (typeof render === "function" && Component) {
+            appHtml = await render(url, { Component });
+          }
+        }
+      }
+      if (!appHtml) {
+        const { render } = await vite.ssrLoadModule("/src/entry-server.tsx");
+        if (typeof render === "function") {
+          appHtml = await render(url);
+        }
+      }
+      if (appHtml) {
+        const html = template.replace("<!--ssr-outlet-->", appHtml);
+        res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+        res.end(html);
+      } else {
+        res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+        res.end(template);
+      }
+    } catch (e) {
+      vite.ssrFixStacktrace(e);
+      console.error(pc2.red("[SSR Error]"), e.stack);
+      if (!res.headersSent) {
+        res.writeHead(500, { "Content-Type": "text/plain" });
+        res.end(`SSR Error: ${e.message}
+
+${e.stack}`);
+      }
+    }
+  });
+  const listenHost = host === true ? "0.0.0.0" : host || "localhost";
+  server.listen(port, listenHost, () => {
+    console.log(pc2.green(`  \u2713 SSR server listening`));
+  });
+}
+function flightDevPlugin(root) {
+  return {
+    name: "flight:dev",
+    configureServer(server) {
+      server.middlewares.use(async (req, res, next) => {
+        const url = req.url || "/";
+        if (url.startsWith("/__flight_action/")) {
+          try {
+            const { handleActionRequest } = await import("@flight-framework/core");
+            const webRequest = await nodeToWebRequest(req);
+            const response = await handleActionRequest(webRequest);
+            res.statusCode = response.status;
+            response.headers.forEach((value, key) => {
+              res.setHeader(key, value);
+            });
+            const body = await response.text();
+            res.end(body);
+          } catch (error) {
+            console.error("[Flight] Action error:", error);
+            res.statusCode = 500;
+            res.end(JSON.stringify({ error: "Internal server error" }));
+          }
+          return;
+        }
+        if (url.startsWith("/api/")) {
+          try {
+            const { createFileRouter } = await import("@flight-framework/core/file-router");
+            const routesDir = join3(root, "src", "routes");
+            const router = await createFileRouter({ directory: routesDir });
+            const route = router.routes.find((r) => {
+              return matchPath(r.path, url);
+            });
+            if (route && route.handler) {
+              const webRequest = await nodeToWebRequest(req);
+              const response = await route.handler({ req: webRequest, params: {} });
+              res.statusCode = response.status;
+              response.headers.forEach((value, key) => {
+                res.setHeader(key, value);
+              });
+              const body = await response.text();
+              res.end(body);
+              return;
+            }
+          } catch (error) {
+          }
+        }
+        next();
+      });
+    }
+  };
+}
+async function nodeToWebRequest(req) {
+  const host = req.headers.host || "localhost";
+  const protocol = "http";
+  const url = new URL(req.url || "/", `${protocol}://${host}`);
+  let body = null;
+  if (req.method !== "GET" && req.method !== "HEAD") {
+    const chunks = [];
+    for await (const chunk of req) {
+      chunks.push(chunk);
+    }
+    body = Buffer.concat(chunks);
+  }
+  const headers = new Headers();
+  for (const [key, value] of Object.entries(req.headers)) {
+    if (value) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          headers.append(key, v);
+        }
+      } else {
+        headers.set(key, value);
+      }
+    }
+  }
+  return new Request(url.toString(), {
+    method: req.method || "GET",
+    headers,
+    body
+  });
+}
+function matchPath(pattern, path) {
+  const cleanPath = path.split("?")[0];
+  const regexPattern = pattern.replace(/:\w+/g, "[^/]+").replace(/\*/g, ".*");
+  const regex = new RegExp(`^${regexPattern}$`);
+  return regex.test(cleanPath || "/");
+}
+function getNetworkAddress() {
+  try {
+    const { networkInterfaces } = __require("os");
+    const nets = networkInterfaces();
+    for (const name of Object.keys(nets)) {
+      for (const net of nets[name]) {
+        if (net.family === "IPv4" && !net.internal) {
+          return net.address;
+        }
+      }
+    }
+  } catch {
+  }
+  return "0.0.0.0";
+}
+
+// src/commands/build.ts
+import { resolve as resolve4 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import pc3 from "picocolors";
+import { loadConfig as loadConfig2 } from "@flight-framework/core/config";
+function findEntryServer(root, srcDir) {
+  const tsxPath = resolve4(root, srcDir, "entry-server.tsx");
+  const tsPath = resolve4(root, srcDir, "entry-server.ts");
+  if (existsSync4(tsxPath)) return tsxPath;
+  if (existsSync4(tsPath)) return tsPath;
+  return tsxPath;
+}
+async function buildCommand(options) {
+  const startTime = Date.now();
+  printLogo();
+  console.log(pc3.cyan("\n[*] Building Flight project for production...\n"));
+  try {
+    const root = resolve4(process.cwd());
+    const config = await loadConfig2(root);
+    const outDir = options.outDir ?? config.build.outDir;
+    const sourcemap = options.sourcemap ?? config.build.sourcemap;
+    const minify = options.minify ?? config.build.minify;
+    const { build } = await import("vite");
+    console.log(pc3.dim(`Output directory: ${outDir}`));
+    console.log(pc3.dim(`Sourcemaps: ${sourcemap ? "enabled" : "disabled"}`));
+    console.log(pc3.dim(`Minification: ${minify ? "enabled" : "disabled"}
+`));
+    console.log(pc3.cyan("Building client..."));
+    await build({
+      root,
+      mode: "production",
+      build: {
+        outDir: `${outDir}/client`,
+        sourcemap,
+        minify: minify ? "esbuild" : false,
+        rollupOptions: {
+          input: resolve4(root, "index.html")
+        }
+      }
+    });
+    console.log(pc3.green("\u2713") + " Client build complete");
+    if (config.rendering.default !== "csr") {
+      console.log(pc3.cyan("\nBuilding server..."));
+      await build({
+        root,
+        mode: "production",
+        build: {
+          outDir: `${outDir}/server`,
+          sourcemap,
+          minify: minify ? "esbuild" : false,
+          ssr: true,
+          rollupOptions: {
+            input: findEntryServer(root, config.build.srcDir)
+          }
+        }
+      });
+      console.log(pc3.green("\u2713") + " Server build complete");
+    }
+    if (config.adapter) {
+      console.log(pc3.cyan(`
+Running ${config.adapter.name} adapter...`));
+      console.log(pc3.green("\u2713") + ` ${config.adapter.name} adapter complete`);
+    }
+    const elapsed = Date.now() - startTime;
+    const elapsedSeconds = (elapsed / 1e3).toFixed(2);
+    console.log(`
+${pc3.green("[OK] Build complete!")} ${pc3.dim(`(${elapsedSeconds}s)`)}
+
+${pc3.cyan("Output:")} ${resolve4(root, outDir)}
+
+${pc3.dim("To preview the build:")}
+  ${pc3.dim("$")} flight preview
+
+${pc3.dim("To deploy:")}
+  ${pc3.dim("\u2022")} Upload ${outDir}/ to your server
+  ${pc3.dim("\u2022")} Or use your configured adapter
+`);
+  } catch (error) {
+    console.error(pc3.red("\nBuild failed:"), error);
+    process.exit(1);
+  }
+}
+
+// src/commands/preview.ts
+import { resolve as resolve5 } from "path";
+import pc4 from "picocolors";
+import { loadConfig as loadConfig3 } from "@flight-framework/core/config";
+async function previewCommand(options) {
+  printLogo();
+  console.log(pc4.cyan("\n\u2708\uFE0F  Starting Flight preview server...\n"));
+  try {
+    const root = resolve5(process.cwd());
+    const config = await loadConfig3(root);
+    const port = options.port ? parseInt(options.port, 10) : config.dev.port + 1;
+    const host = options.host ?? config.dev.host;
+    const open = options.open ?? false;
+    const { preview } = await import("vite");
+    const server = await preview({
+      root,
+      preview: {
+        port,
+        host: host === true ? "0.0.0.0" : host,
+        open
+      },
+      build: {
+        outDir: config.build.outDir
+      }
+    });
+    console.log(`
+  ${pc4.green("\u2713")} Flight preview server ready
+
+  ${pc4.cyan("\u279C")} Local:   ${pc4.cyan(`http://localhost:${port}/`)}
+  ${host === true || host === "0.0.0.0" ? `  ${pc4.cyan("\u279C")} Network: ${pc4.cyan(`http://0.0.0.0:${port}/`)}` : ""}
+
+  ${pc4.dim("This is a preview of your production build.")}
+  ${pc4.dim("For development, use")} ${pc4.bold("flight dev")}
+`);
+    server.printUrls();
+  } catch (error) {
+    console.error(pc4.red("\nFailed to start preview server:"), error);
+    process.exit(1);
+  }
+}
+
+// src/commands/routes-generate.ts
+import { resolve as resolve6 } from "path";
+
+// src/generators/routes.ts
+import { readdirSync as readdirSync3, statSync as statSync2, existsSync as existsSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "fs";
+import { join as join4, dirname as dirname3 } from "path";
+function filePathToUrlPath2(filePath) {
+  let urlPath = filePath.replace(/\.(page|route)\.(tsx?|jsx?)$/, "").replace(/\.(get|post|put|patch|delete|options|head)$/, "").replace(/\/index$/, "").replace(/\/?\([^)]+\)/g, "").replace(/\[\.\.\.(\w+)\]/g, "*$1").replace(/\[(\w+)\]/g, ":$1");
+  if (!urlPath.startsWith("/")) {
+    urlPath = "/" + urlPath;
+  }
+  if (urlPath === "" || urlPath === "/") {
+    urlPath = "/";
+  }
+  urlPath = urlPath.replace(/\/+/g, "/");
+  return urlPath;
+}
+function extractHttpMethod(filename) {
+  const match = filename.match(/\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/i);
+  return match ? match[1].toUpperCase() : void 0;
+}
+function isLayoutFile(filename) {
+  return filename.startsWith("_layout.");
+}
+function isLoadingFile(filename) {
+  return filename.startsWith("_loading.");
+}
+function isErrorFile(filename) {
+  return filename.startsWith("_error.");
+}
+function isNotFoundFile(filename) {
+  return filename.startsWith("_not-found.");
+}
+function isRouteFile(filename) {
+  return /\.(page|route)\.(tsx?|jsx?)$/.test(filename);
+}
+function isApiRouteFile(filename) {
+  return /\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/.test(filename);
+}
+function hasDynamicSegments(path) {
+  return path.includes("[") && path.includes("]");
+}
+function scanDirectory(dir, basePath = "", results = []) {
+  if (!existsSync5(dir)) {
+    return results;
+  }
+  const entries = readdirSync3(dir);
+  for (const entry of entries) {
+    const fullPath = join4(dir, entry);
+    const relativePath = join4(basePath, entry);
+    const stat = statSync2(fullPath);
+    if (stat.isDirectory()) {
+      if (entry.startsWith(".") || entry === "node_modules") {
+        continue;
+      }
+      scanDirectory(fullPath, relativePath, results);
+    } else if (stat.isFile()) {
+      const routePath = filePathToUrlPath2(dirname3(relativePath));
+      const normalizedFilePath = relativePath.replace(/\\/g, "/");
+      const isDynamic = hasDynamicSegments(relativePath);
+      if (isLayoutFile(entry)) {
+        results.push({
+          path: routePath,
+          filePath: normalizedFilePath,
+          isLayout: true,
+          isLoading: false,
+          isError: false,
+          isNotFound: false,
+          isDynamic,
+          isApiRoute: false
+        });
+      } else if (isLoadingFile(entry)) {
+        results.push({
+          path: routePath,
+          filePath: normalizedFilePath,
+          isLayout: false,
+          isLoading: true,
+          isError: false,
+          isNotFound: false,
+          isDynamic,
+          isApiRoute: false
+        });
+      } else if (isErrorFile(entry)) {
+        results.push({
+          path: routePath,
+          filePath: normalizedFilePath,
+          isLayout: false,
+          isLoading: false,
+          isError: true,
+          isNotFound: false,
+          isDynamic,
+          isApiRoute: false
+        });
+      } else if (isNotFoundFile(entry)) {
+        results.push({
+          path: routePath,
+          filePath: normalizedFilePath,
+          isLayout: false,
+          isLoading: false,
+          isError: false,
+          isNotFound: true,
+          isDynamic,
+          isApiRoute: false
+        });
+      } else if (isApiRouteFile(entry)) {
+        const method = extractHttpMethod(entry);
+        results.push({
+          path: filePathToUrlPath2(relativePath),
+          filePath: normalizedFilePath,
+          isLayout: false,
+          isLoading: false,
+          isError: false,
+          isNotFound: false,
+          isDynamic,
+          isApiRoute: true,
+          httpMethod: method
+        });
+      } else if (isRouteFile(entry)) {
+        results.push({
+          path: filePathToUrlPath2(relativePath),
+          filePath: normalizedFilePath,
+          isLayout: false,
+          isLoading: false,
+          isError: false,
+          isNotFound: false,
+          isDynamic,
+          isApiRoute: false
+        });
+      }
+    }
+  }
+  return results;
+}
+function sortRoutes(routes) {
+  return routes.sort((a, b) => {
+    if (!a.isDynamic && b.isDynamic) return -1;
+    if (a.isDynamic && !b.isDynamic) return 1;
+    const aSegments = a.path.split("/").length;
+    const bSegments = b.path.split("/").length;
+    if (aSegments !== bSegments) return aSegments - bSegments;
+    return a.path.localeCompare(b.path);
+  });
+}
+function generateRouteManifest(routesDir) {
+  const allRoutes = scanDirectory(routesDir);
+  const isPageRoute = (r) => !r.isLayout && !r.isLoading && !r.isError && !r.isNotFound && !r.isApiRoute;
+  const routes = sortRoutes(allRoutes.filter(isPageRoute));
+  const layouts = allRoutes.filter((r) => r.isLayout);
+  const loadingStates = allRoutes.filter((r) => r.isLoading);
+  const errorBoundaries = allRoutes.filter((r) => r.isError);
+  const notFoundPages = allRoutes.filter((r) => r.isNotFound);
+  const apiRoutes = sortRoutes(allRoutes.filter((r) => r.isApiRoute));
+  return {
+    routes,
+    layouts,
+    loadingStates,
+    errorBoundaries,
+    notFoundPages,
+    apiRoutes,
+    generated: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
+function generateRoutesFile(manifest, outputDir) {
+  if (!existsSync5(outputDir)) {
+    mkdirSync3(outputDir, { recursive: true });
+  }
+  const routesContent = `/**
+ * Auto-generated by Flight CLI
+ * Do not edit manually
+ * Generated: ${manifest.generated}
+ */
+
+import type { RouteDefinition } from '@flight-framework/router';
+
+// Page Routes
+export const routes: RouteDefinition[] = [
+${manifest.routes.map((r) => `    {
+        path: '${r.path}',
+        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
+    },`).join("\n")}
+];
+
+// Layout Components
+export const layouts = [
+${manifest.layouts.map((r) => `    {
+        path: '${r.path}',
+        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
+    },`).join("\n")}
+];
+
+// Loading State Components
+export const loadingStates = [
+${manifest.loadingStates.map((r) => `    {
+        path: '${r.path}',
+        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
+    },`).join("\n")}
+];
+
+// Error Boundary Components
+export const errorBoundaries = [
+${manifest.errorBoundaries.map((r) => `    {
+        path: '${r.path}',
+        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
+    },`).join("\n")}
+];
 
-/**
- * Server-side environment variables accessible via process.env
- * These are NOT exposed to the client.
- */
-declare namespace NodeJS {
-    interface ProcessEnv {
-${serverVars || "        // No server environment variables defined"}
-    }
-}
+// Not Found Page Components
+export const notFoundPages = [
+${manifest.notFoundPages.map((r) => `    {
+        path: '${r.path}',
+        component: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
+    },`).join("\n")}
+];
 
-// ============================================================================
-// Client-side Environment Variables
-// ============================================================================
+// API Routes
+export const apiRoutes = [
+${manifest.apiRoutes.map((r) => `    {
+        path: '${r.path}',
+        method: '${r.httpMethod}',
+        handler: () => import('../routes/${r.filePath.replace(/\.(tsx?|jsx?)$/, "")}'),
+    },`).join("\n")}
+];
 
-/**
- * Client-side environment variables accessible via import.meta.env
- * Only variables with PUBLIC_ prefix are included.
+// Type-safe route paths
+export type AppRoutes = ${manifest.routes.length > 0 ? manifest.routes.map((r) => `'${r.path}'`).join(" | ") : "never"};
+
+// Type-safe API route paths
+export type ApiRoutes = ${manifest.apiRoutes.length > 0 ? manifest.apiRoutes.map((r) => `'${r.path}'`).join(" | ") : "never"};
+`;
+  writeFileSync3(join4(outputDir, "routes.ts"), routesContent, "utf-8");
+  const typesContent = `/**
+ * Auto-generated route types
+ * Generated: ${manifest.generated}
  */
-interface ImportMetaEnv {
-${clientVars || "    // No client environment variables defined"}
-}
 
-interface ImportMeta {
-    readonly env: ImportMetaEnv;
-}
+import type { RouteParams } from '@flight-framework/router';
+
+// Extract params from route patterns
+${manifest.routes.filter((r) => r.isDynamic).map((r) => {
+    const paramMatches = r.path.match(/:(\w+)/g) || [];
+    const params = paramMatches.map((p) => p.slice(1));
+    const typeName = r.path.replace(/[/:]/g, "_").replace(/^_/, "").replace(/_$/, "") || "Root";
+    return `export type ${typeName}Params = { ${params.map((p) => `${p}: string`).join("; ")} };`;
+  }).join("\n")}
 `;
+  writeFileSync3(join4(outputDir, "types.ts"), typesContent, "utf-8");
 }
-function scanRoutesForTypes(routesDir) {
-  if (!existsSync5(routesDir)) {
-    return [];
-  }
-  const routes = [];
-  scanDirectoryRecursive(routesDir, "", routes);
-  return routes;
-}
-function scanDirectoryRecursive(dir, basePath, results) {
-  const entries = readdirSync3(dir, { withFileTypes: true });
-  for (const entry of entries) {
-    const fullPath = join4(dir, entry.name);
-    const relativePath = join4(basePath, entry.name);
-    if (entry.isDirectory()) {
-      if (entry.name.startsWith(".") || entry.name === "node_modules") {
-        continue;
-      }
-      scanDirectoryRecursive(fullPath, relativePath, results);
-    } else if (entry.isFile()) {
-      const route = parseRouteFile(entry.name, relativePath);
-      if (route) {
-        results.push(route);
-      }
-    }
-  }
-}
-function parseRouteFile(filename, relativePath) {
-  if (/\.(page|route)\.(tsx?|jsx?)$/.test(filename)) {
-    const urlPath = filePathToUrlPath2(relativePath);
-    return {
-      path: urlPath,
-      filePath: relativePath.replace(/\\/g, "/"),
-      isDynamic: isDynamicRoute(urlPath),
-      isApiRoute: false
-    };
-  }
-  const apiMatch = filename.match(/\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/i);
-  if (apiMatch) {
-    const urlPath = filePathToUrlPath2(relativePath);
-    return {
-      path: urlPath,
-      filePath: relativePath.replace(/\\/g, "/"),
-      isDynamic: isDynamicRoute(urlPath),
-      isApiRoute: true,
-      httpMethod: apiMatch[1].toUpperCase()
-    };
-  }
-  return null;
-}
-function filePathToUrlPath2(filePath) {
-  let urlPath = filePath.replace(/\\/g, "/").replace(/\.(page|route)\.(tsx?|jsx?)$/, "").replace(/\.(get|post|put|patch|delete|options|head)$/i, "").replace(/\/index$/, "").replace(/^index$/, "").replace(/\/?\\?\([^)]+\\?\)/g, "").replace(/\[\.\.\.(\w+)\]/g, "*$1").replace(/\[(\w+)\]/g, ":$1");
-  if (!urlPath.startsWith("/")) {
-    urlPath = "/" + urlPath;
-  }
-  urlPath = urlPath.replace(/\/+/g, "/");
-  return urlPath || "/";
+async function generateRoutes(options) {
+  const { routesDir, outputDir } = options;
+  console.log(`Scanning routes in: ${routesDir}`);
+  const manifest = generateRouteManifest(routesDir);
+  const stats = [
+    `${manifest.routes.length} pages`,
+    `${manifest.layouts.length} layouts`,
+    `${manifest.loadingStates.length} loading states`,
+    `${manifest.errorBoundaries.length} error boundaries`,
+    `${manifest.notFoundPages.length} not-found pages`,
+    `${manifest.apiRoutes.length} API routes`
+  ].join(", ");
+  console.log(`Found: ${stats}`);
+  generateRoutesFile(manifest, outputDir);
+  console.log(`Generated route manifest in: ${outputDir}`);
+  return manifest;
 }
-async function generateTypes(options) {
-  const {
-    routesDir,
-    outputDir,
-    includeRoutes = true,
-    includeEnv = false,
-    projectRoot = process.cwd()
-  } = options;
-  const result = {
-    routeTypes: "",
-    envTypes: "",
-    filesWritten: [],
-    routeCount: 0,
-    envVarCount: 0
-  };
-  if (!existsSync5(outputDir)) {
-    mkdirSync3(outputDir, { recursive: true });
-  }
-  if (includeRoutes) {
-    const routes = scanRoutesForTypes(routesDir);
-    result.routeCount = routes.length;
-    result.routeTypes = generateRouteTypes(routes);
-    const routeTypesPath = join4(outputDir, "routes.d.ts");
-    writeFileSync3(routeTypesPath, result.routeTypes, "utf-8");
-    result.filesWritten.push(routeTypesPath);
-    console.log(`Generated route types: ${routes.length} routes`);
-  }
-  if (includeEnv) {
-    const env = loadEnvFiles(projectRoot);
-    result.envVarCount = env.server.length + env.client.length;
-    result.envTypes = generateEnvTypes(env);
-    const envTypesPath = join4(outputDir, "env.d.ts");
-    writeFileSync3(envTypesPath, result.envTypes, "utf-8");
-    result.filesWritten.push(envTypesPath);
-    console.log(`Generated env types: ${env.server.length} server, ${env.client.length} client`);
+
+// src/commands/routes-generate.ts
+async function routesGenerateCommand(options = {}) {
+  const cwd = process.cwd();
+  const routesDir = options.routesDir ? resolve6(cwd, options.routesDir) : resolve6(cwd, "src/routes");
+  const outputDir = options.outputDir ? resolve6(cwd, options.outputDir) : resolve6(cwd, "src/.flight");
+  try {
+    const manifest = await generateRoutes({
+      routesDir,
+      outputDir,
+      watch: options.watch
+    });
+    console.log("\nRoute manifest generated successfully!");
+    console.log(`  Pages: ${manifest.routes.length}`);
+    console.log(`  API Routes: ${manifest.apiRoutes.length}`);
+    console.log(`  Layouts: ${manifest.layouts.length}`);
+  } catch (error) {
+    console.error("Failed to generate routes:", error);
+    process.exit(1);
   }
-  return result;
-}
-function watchAndGenerate(options) {
-  const { routesDir, debounce = 100, onRegenerate } = options;
-  let timeout = null;
-  const regenerate = async () => {
-    try {
-      const result = await generateTypes(options);
-      onRegenerate?.(result);
-    } catch (error) {
-      console.error("Type generation failed:", error.message);
-    }
-  };
-  const debouncedRegenerate = () => {
-    if (timeout) clearTimeout(timeout);
-    timeout = setTimeout(regenerate, debounce);
-  };
-  regenerate();
-  const watcher = watch(routesDir, { recursive: true }, (eventType, filename) => {
-    if (filename && /\.(tsx?|jsx?)$/.test(filename)) {
-      console.log(`Route file changed: ${filename}`);
-      debouncedRegenerate();
-    }
-  });
-  return () => {
-    watcher.close();
-    if (timeout) clearTimeout(timeout);
-  };
 }
 
 // src/commands/types-generate.ts
+import { resolve as resolve7 } from "path";
 async function typesGenerateCommand(options = {}) {
   const cwd = process.cwd();
   const routesDir = options.routesDir ? resolve7(cwd, options.routesDir) : resolve7(cwd, "src/routes");
@@ -1310,25 +1624,234 @@ async function typesGenerateCommand(options = {}) {
   }
 }
 
+// src/commands/add.ts
+import { existsSync as existsSync6 } from "fs";
+import { join as join5 } from "path";
+import { execSync as execSync2 } from "child_process";
+import pc5 from "picocolors";
+var PACKAGES = {
+  // Core
+  "http": {
+    name: "@flight-framework/http",
+    description: "HTTP server with routing and middleware",
+    category: "core"
+  },
+  "core": {
+    name: "@flight-framework/core",
+    description: "File-based routing and configuration",
+    category: "core"
+  },
+  // Data
+  "db": {
+    name: "@flight-framework/db",
+    description: "Database abstraction layer",
+    category: "data",
+    drivers: ["pg", "@libsql/client", "@neondatabase/serverless", "@supabase/supabase-js"]
+  },
+  "cache": {
+    name: "@flight-framework/cache",
+    description: "Caching with multiple adapters",
+    category: "data"
+  },
+  // Auth
+  "auth": {
+    name: "@flight-framework/auth",
+    description: "Authentication adapters",
+    category: "auth"
+  },
+  // Frontend
+  "forms": {
+    name: "@flight-framework/forms",
+    description: "Type-safe form handling",
+    category: "frontend"
+  },
+  "i18n": {
+    name: "@flight-framework/i18n",
+    description: "Internationalization",
+    category: "frontend"
+  },
+  "seo": {
+    name: "@flight-framework/seo",
+    description: "SEO utilities",
+    category: "frontend"
+  },
+  "image": {
+    name: "@flight-framework/image",
+    description: "Image optimization",
+    category: "frontend"
+  },
+  // Communication
+  "email": {
+    name: "@flight-framework/email",
+    description: "Email sending",
+    category: "communication"
+  },
+  "realtime": {
+    name: "@flight-framework/realtime",
+    description: "WebSocket and real-time features",
+    category: "communication"
+  },
+  // Deployment
+  "helpers": {
+    name: "@flight-framework/helpers",
+    description: "Optional helper utilities (detection, suggestions)",
+    category: "utilities"
+  }
+};
+async function addCommand(packageName) {
+  const cwd = process.cwd();
+  if (!existsSync6(join5(cwd, "package.json"))) {
+    console.log(pc5.red("No package.json found. Run this command from your project directory."));
+    process.exit(1);
+  }
+  if (!packageName) {
+    showAvailablePackages();
+    return;
+  }
+  const pkg = PACKAGES[packageName];
+  if (!pkg) {
+    console.log(pc5.red(`Unknown package: ${packageName}`));
+    console.log(pc5.dim("Run `flight add` to see available packages."));
+    process.exit(1);
+  }
+  console.log(`
+${pc5.cyan("Adding")} ${pc5.bold(pkg.name)}...`);
+  console.log(pc5.dim(pkg.description));
+  console.log();
+  const pm = detectPackageManager2();
+  try {
+    const installCmd = pm === "npm" ? "npm install" : `${pm} add`;
+    execSync2(`${installCmd} ${pkg.name}`, { cwd, stdio: "inherit" });
+    console.log(`
+${pc5.green("[OK]")} ${pkg.name} added successfully!`);
+    showNextSteps(packageName, pkg);
+  } catch (error) {
+    console.log(pc5.red(`
+Failed to install ${pkg.name}`));
+    process.exit(1);
+  }
+}
+function detectPackageManager2() {
+  const cwd = process.cwd();
+  if (existsSync6(join5(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (existsSync6(join5(cwd, "yarn.lock"))) return "yarn";
+  if (existsSync6(join5(cwd, "bun.lockb"))) return "bun";
+  return "npm";
+}
+function showAvailablePackages() {
+  console.log(`
+${pc5.cyan("Available Flight packages:")}
+
+${pc5.bold("Core")}
+  ${pc5.green("http")}      ${pc5.dim("HTTP server with routing and middleware")}
+  ${pc5.green("core")}      ${pc5.dim("File-based routing and configuration")}
+
+${pc5.bold("Data")}
+  ${pc5.green("db")}        ${pc5.dim("Database abstraction layer")}
+  ${pc5.green("cache")}     ${pc5.dim("Caching with multiple adapters")}
+
+${pc5.bold("Auth")}
+  ${pc5.green("auth")}      ${pc5.dim("Authentication adapters")}
+
+${pc5.bold("Frontend")}
+  ${pc5.green("forms")}     ${pc5.dim("Type-safe form handling")}
+  ${pc5.green("i18n")}      ${pc5.dim("Internationalization")}
+  ${pc5.green("seo")}       ${pc5.dim("SEO utilities")}
+  ${pc5.green("image")}     ${pc5.dim("Image optimization")}
+
+${pc5.bold("Communication")}
+  ${pc5.green("email")}     ${pc5.dim("Email sending")}
+  ${pc5.green("realtime")}  ${pc5.dim("WebSocket and real-time features")}
+
+${pc5.bold("Utilities")}
+  ${pc5.green("helpers")}   ${pc5.dim("Optional helper utilities")}
+
+${pc5.cyan("Usage:")}
+  flight add http
+  flight add db
+  flight add auth
+`);
+}
+function showNextSteps(packageName, pkg) {
+  const examples = {
+    "http": `
+${pc5.cyan("Quick example:")}
+
+  import { createServer } from '@flight-framework/http';
+  
+  const app = createServer();
+  app.get('/', (c) => c.json({ hello: 'world' }));
+  
+  export default { port: 3000, fetch: app.fetch };
+`,
+    "db": `
+${pc5.cyan("Quick example:")}
+
+  import { createDb } from '@flight-framework/db';
+  import { postgres } from '@flight-framework/db/postgres';
+  
+  const db = createDb(postgres({ connectionString: process.env.DATABASE_URL }));
+  const users = await db.query('SELECT * FROM users');
+
+${pc5.dim("You may also need a driver:")}
+  npm install pg                    ${pc5.dim("# PostgreSQL")}
+  npm install @libsql/client        ${pc5.dim("# Turso/SQLite")}
+  npm install @neondatabase/serverless  ${pc5.dim("# Neon")}
+`,
+    "cache": `
+${pc5.cyan("Quick example:")}
+
+  import { createCache, lru } from '@flight-framework/cache';
+  
+  const cache = createCache(lru({ max: 1000 }));
+  await cache.set('key', { data: 'value' });
+  const value = await cache.get('key');
+`,
+    "auth": `
+${pc5.cyan("Quick example:")}
+
+  import { createAuth } from '@flight-framework/auth';
+  import { betterAuth } from '@flight-framework/auth/better-auth';
+  
+  const auth = createAuth(betterAuth({ db }));
+  const user = await auth.getUser(request);
+`,
+    "forms": `
+${pc5.cyan("Quick example:")}
+
+  import { createForm } from '@flight-framework/forms';
+  import { zodAdapter } from '@flight-framework/forms/adapters/zod';
+  
+  const form = createForm({ schema: zodAdapter(schema) });
+  const result = form.validate(data);
+`
+  };
+  if (examples[packageName]) {
+    console.log(examples[packageName]);
+  }
+  console.log(`${pc5.dim("Docs:")} https://flight.dev/docs/packages/${packageName}`);
+}
+
 // src/index.ts
 var cli = cac("flight");
 var LOGO = `
-${pc5.cyan("  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557     \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557")}
-${pc5.cyan("  \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D \u2588\u2588\u2551  \u2588\u2588\u2551\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D")}
-${pc5.cyan("  \u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551   \u2588\u2588\u2551   ")}
-${pc5.cyan("  \u2588\u2588\u2554\u2550\u2550\u255D  \u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551   \u2588\u2588\u2551   ")}
-${pc5.cyan("  \u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551  \u2588\u2588\u2551   \u2588\u2588\u2551   ")}
-${pc5.cyan("  \u255A\u2550\u255D     \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u255D  \u255A\u2550\u255D   \u255A\u2550\u255D   ")}
+${pc6.cyan("  \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557     \u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557")}
+${pc6.cyan("  \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D \u2588\u2588\u2551  \u2588\u2588\u2551\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D")}
+${pc6.cyan("  \u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551   \u2588\u2588\u2551   ")}
+${pc6.cyan("  \u2588\u2588\u2554\u2550\u2550\u255D  \u2588\u2588\u2551     \u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551   \u2588\u2588\u2551   ")}
+${pc6.cyan("  \u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551  \u2588\u2588\u2551   \u2588\u2588\u2551   ")}
+${pc6.cyan("  \u255A\u2550\u255D     \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u255D  \u255A\u2550\u255D   \u255A\u2550\u255D   ")}
   
-  ${pc5.dim("The Agnostic Full-Stack Framework")}
-  ${pc5.dim("Maximum Flexibility. Zero Lock-in.")}
+  ${pc6.dim("The Agnostic Full-Stack Framework")}
+  ${pc6.dim("Maximum Flexibility. Zero Lock-in.")}
 `;
 function printLogo() {
   console.log(LOGO);
 }
 cli.version(VERSION);
 cli.help();
-cli.command("create [name]", "Create a new Flight project").option("-t, --template <template>", "Project template to use", { default: "basic" }).option("--ui <framework>", "UI framework (react, vue, svelte, solid, vanilla)").option("--use-case <useCase>", "Use-case template (blog, ecommerce, saas, api, docs)").option("--ts", "Use TypeScript", { default: true }).option("--git", "Initialize git repository", { default: true }).option("--install", "Install dependencies", { default: true }).action(createCommand);
+cli.command("create [name]", "Create a new Flight project").option("-t, --template <template>", "Project template to use", { default: "basic" }).option("--ui <framework>", "UI framework (react, vue, svelte, solid, vanilla)").option("--use-case <useCase>", "Use-case template (blog, ecommerce, saas, api, docs)").option("--ts", "Use TypeScript", { default: true }).option("--git", "Initialize git repository", { default: true }).option("--install", "Install dependencies", { default: true }).option("--raw", "Create raw project (100% Web Standards, zero dependencies)").option("--empty", "Create empty project (just package.json)").option("--minimal", "Create minimal project (single server file with Flight)").action(createCommand);
+cli.command("add [package]", "Add a Flight package to your project").action(addCommand);
 cli.command("dev", "Start development server").option("-p, --port <port>", "Port to listen on").option("-h, --host <host>", "Host to bind to").option("--open", "Open browser on start").option("--https", "Enable HTTPS").option("--ssr", "Enable Server-Side Rendering").action(devCommand);
 cli.command("build", "Build for production").option("--outDir <dir>", "Output directory").option("--sourcemap", "Generate source maps").option("--minify", "Minify output", { default: true }).action(buildCommand);
 cli.command("preview", "Preview production build").option("-p, --port <port>", "Port to listen on").option("-h, --host <host>", "Host to bind to").option("--open", "Open browser on start").action(previewCommand);
@@ -1342,7 +1865,7 @@ function run() {
     }
     cli.runMatchedCommand();
   } catch (error) {
-    console.error(pc5.red("Error:"), error instanceof Error ? error.message : error);
+    console.error(pc6.red("Error:"), error instanceof Error ? error.message : error);
     process.exit(1);
   }
 }