@flight-framework/cli 0.2.0 → 0.3.0

package/dist/bin.js

@@ -8,7 +8,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/index.ts
 import { cac } from "cac";
-import pc6 from "picocolors";
+import pc7 from "picocolors";
 
 // src/version.ts
 var VERSION = "0.0.1";
@@ -509,1035 +509,1063 @@ ${pc.cyan("Happy flying!")}
 }
 
 // src/commands/dev.ts
-import { resolve as resolve2, join as join2 } from "path";
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+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";
-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 {
+
+// 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)));
+  }
+  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 generateRouteTypes(routes) {
+  const pageRoutes = routes.filter((r) => !r.isApiRoute);
+  const apiRoutes = routes.filter((r) => r.isApiRoute);
+  const staticRoutes = pageRoutes.filter((r) => !r.isDynamic);
+  const dynamicRoutes = pageRoutes.filter((r) => r.isDynamic);
+  const appRoutesUnion = pageRoutes.length > 0 ? pageRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const apiRoutesUnion = apiRoutes.length > 0 ? apiRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const staticRoutesUnion = staticRoutes.length > 0 ? staticRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const dynamicRoutesUnion = dynamicRoutes.length > 0 ? dynamicRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
+  const paramTypes = dynamicRoutes.map((r) => {
+    const params = extractParams(r.path);
+    const typeName = routePathToTypeName(r.path);
+    const paramDef = params.map((p) => `${p}: string`).join("; ");
+    return `export type ${typeName}Params = { ${paramDef} };`;
+  }).join("\n");
+  return `${generateHeader("flight types:generate --routes")}
+
+// ============================================================================
+// Route Types
+// ============================================================================
+
+/**
+ * All available page routes in the application
+ */
+export type AppRoutes =
+${appRoutesUnion};
+
+/**
+ * All available API routes in the application
+ */
+export type ApiRoutes =
+${apiRoutesUnion};
+
+/**
+ * Static routes (no dynamic parameters)
+ */
+export type StaticRoutes =
+${staticRoutesUnion};
+
+/**
+ * Dynamic routes (with parameters like :id or *slug)
+ */
+export type DynamicRoutes =
+${dynamicRoutesUnion};
+
+// ============================================================================
+// Route Parameter Extraction
+// ============================================================================
+
+/**
+ * Extract route parameters from a route pattern using template literal types.
+ *
+ * @example
+ * type Params = ExtractRouteParams<'/users/:id'>; // { id: string }
+ * type BlogParams = ExtractRouteParams<'/blog/:year/:slug'>; // { year: string; slug: string }
+ */
+type ExtractRouteParams<T extends string> =
+    // Handle :param/rest pattern
+    T extends \`\${infer _Start}:\${infer Param}/\${infer Rest}\`
+        ? { [K in Param]: string } & ExtractRouteParams<\`/\${Rest}\`>
+        // Handle :param at end
+        : T extends \`\${infer _Start}:\${infer Param}\`
+            ? { [K in Param]: string }
+            // Handle *param (catch-all)
+            : T extends \`\${infer _Start}*\${infer Param}\`
+                ? { [K in Param]: string }
+                // No params
+                : Record<string, never>;
+
+/**
+ * Get typed parameters for a specific route.
+ *
+ * @example
+ * const params: RouteParams<'/users/:id'> = { id: '123' };
+ */
+export type RouteParams<T extends AppRoutes | ApiRoutes> = ExtractRouteParams<T>;
+
+// ============================================================================
+// Helper Types
+// ============================================================================
+
+/**
+ * Check if a route requires parameters
+ */
+export type RequiresParams<T extends AppRoutes | ApiRoutes> =
+    RouteParams<T> extends Record<string, never> ? false : true;
+
+/**
+ * Props for a type-safe Link component
+ */
+export type TypedLinkProps<T extends AppRoutes> =
+    RequiresParams<T> extends true
+        ? { to: T; params: RouteParams<T> }
+        : { to: T; params?: never };
+
+/**
+ * Build a URL from a route pattern and parameters
+ */
+export type BuildUrl<T extends AppRoutes> =
+    RequiresParams<T> extends true
+        ? (route: T, params: RouteParams<T>) => string
+        : (route: T) => string;
+
+// ============================================================================
+// Individual Route Parameter Types
+// ============================================================================
+
+${paramTypes || "// No dynamic routes found"}
+`;
+}
+function routePathToTypeName(routePath) {
+  return routePath.split("/").filter(Boolean).map((segment) => {
+    const clean = segment.replace(/^[:*]/, "");
+    return clean.charAt(0).toUpperCase() + clean.slice(1);
+  }).join("_") || "Root";
+}
+function parseEnvFile(content) {
+  const server = [];
+  const client = [];
+  const lines = content.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
     }
-    try {
-      await import("@flight-framework/core/file-router");
-      flightRouterAvailable = true;
-    } catch {
+    const match = trimmed.match(/^([A-Z_][A-Z0-9_]*)(\?)?=/i);
+    if (!match) {
+      continue;
     }
-    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);
+    const key = match[1];
+    const optional = match[2] === "?";
+    const envVar = { key, optional };
+    if (key.startsWith("PUBLIC_")) {
+      client.push(envVar);
     } 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 });
+      server.push(envVar);
     }
-  } catch (error) {
-    console.error(pc2.red("\nFailed to start dev server:"), error);
-    process.exit(1);
   }
+  return { server, client };
 }
-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;
+function loadEnvFiles(projectRoot) {
+  const envFiles = [".env", ".env.local", ".env.development", ".env.production"];
+  const merged = { server: [], client: [] };
+  const seenKeys = /* @__PURE__ */ new Set();
+  for (const envFile of envFiles) {
+    const envPath = join2(projectRoot, envFile);
+    if (!existsSync2(envPath)) {
+      continue;
     }
-    if (pathname.startsWith("/api/")) {
-      vite.middlewares(req, res);
-      return;
-    }
-    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);
+    const content = readFileSync2(envPath, "utf-8");
+    const parsed = parseEnvFile(content);
+    for (const envVar of parsed.server) {
+      if (!seenKeys.has(envVar.key)) {
+        seenKeys.add(envVar.key);
+        merged.server.push(envVar);
       }
-    } 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}`);
+    }
+    for (const envVar of parsed.client) {
+      if (!seenKeys.has(envVar.key)) {
+        seenKeys.add(envVar.key);
+        merged.client.push(envVar);
       }
     }
-  });
-  const listenHost = host === true ? "0.0.0.0" : host || "localhost";
-  server.listen(port, listenHost, () => {
-    console.log(pc2.green(`  \u2713 SSR server listening`));
-  });
+  }
+  return merged;
 }
-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 generateEnvTypes(env) {
+  const serverVars = env.server.sort((a, b) => a.key.localeCompare(b.key)).map((v) => `        ${v.key}${v.optional ? "?" : ""}: string;`).join("\n");
+  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 accessible via process.env
+ * These are NOT exposed to the client.
+ */
+declare namespace NodeJS {
+    interface ProcessEnv {
+${serverVars || "        // No server environment variables defined"}
     }
-  };
 }
-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);
+
+// ============================================================================
+// 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 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);
+  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);
       }
     }
   }
-  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 {
+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
+    };
   }
-  return "0.0.0.0";
+  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;
 }
-
-// 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;
+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 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");
+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);
     }
-    if (config.adapter) {
-      console.log(pc3.cyan(`
-Running ${config.adapter.name} adapter...`));
-      console.log(pc3.green("\u2713") + ` ${config.adapter.name} adapter complete`);
+  };
+  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();
     }
-    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:")} ${resolve3(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);
-  }
+  });
+  return () => {
+    watcher.close();
+    if (timeout) clearTimeout(timeout);
+  };
 }
 
-// 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) {
+// src/commands/dev.ts
+async function devCommand(options) {
+  const startTime = Date.now();
   printLogo();
-  console.log(pc4.cyan("\n\u2708\uFE0F  Starting Flight preview server...\n"));
+  console.log(pc2.cyan("\n  Starting Flight development 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 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 ?? false;
-    const { preview } = await import("vite");
-    const server = await preview({
+    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,
-      preview: {
-        port,
+      mode: "development",
+      server: {
+        middlewareMode: ssrEnabled && hasSSREntry,
+        port: ssrEnabled && hasSSREntry ? void 0 : port,
         host: host === true ? "0.0.0.0" : host,
-        open
+        open: ssrEnabled && hasSSREntry ? false : open,
+        https: options.https ? {} : void 0
       },
-      build: {
-        outDir: config.build.outDir
-      }
+      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(`
-  ${pc4.green("\u2713")} Flight preview server ready
+  ${pc2.green("\u2713")} Flight dev server ready in ${pc2.bold(elapsed + "ms")}
 
-  ${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}/`)}` : ""}
+  ${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"}
 
-  ${pc4.dim("This is a preview of your production build.")}
-  ${pc4.dim("For development, use")} ${pc4.bold("flight dev")}
+  ${pc2.dim("press")} ${pc2.bold("h")} ${pc2.dim("to show help")}
 `);
-    server.printUrls();
+    if (!isSSR) {
+      vite.bindCLIShortcuts({ print: true });
+    }
   } catch (error) {
-    console.error(pc4.red("\nFailed to start preview server:"), error);
+    console.error(pc2.red("\nFailed to start dev server:"), error);
     process.exit(1);
   }
 }
-
-// src/commands/routes-generate.ts
-import { resolve as resolve5 } from "path";
-
-// 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;
-  }
-  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 (!existsSync4(dir)) {
-    return results;
+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 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
-        });
+  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}`);
       }
     }
-  }
-  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);
+  });
+  const listenHost = host === true ? "0.0.0.0" : host || "localhost";
+  server.listen(port, listenHost, () => {
+    console.log(pc2.green(`  \u2713 SSR server listening`));
   });
 }
-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));
+function flightDevPlugin(root) {
   return {
-    routes,
-    layouts,
-    loadingStates,
-    errorBoundaries,
-    notFoundPages,
-    apiRoutes,
-    generated: (/* @__PURE__ */ new Date()).toISOString()
+    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();
+      });
+    }
   };
 }
-function generateRoutesFile(manifest, outputDir) {
-  if (!existsSync4(outputDir)) {
-    mkdirSync2(outputDir, { recursive: true });
+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 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"};
+  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";
+}
 
-// 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}
- */
+// 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)`)}
 
-import type { RouteParams } from '@flight-framework/router';
+${pc3.cyan("Output:")} ${resolve4(root, outDir)}
 
-// 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;
+${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/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");
+// 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 manifest = await generateRoutes({
-      routesDir,
-      outputDir,
-      watch: options.watch
+    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("\nRoute manifest generated successfully!");
-    console.log(`  Pages: ${manifest.routes.length}`);
-    console.log(`  API Routes: ${manifest.apiRoutes.length}`);
-    console.log(`  Layouts: ${manifest.layouts.length}`);
+    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("Failed to generate routes:", error);
+    console.error(pc4.red("\nFailed to start preview server:"), error);
     process.exit(1);
   }
 }
 
-// src/commands/types-generate.ts
-import { resolve as resolve7 } from "path";
+// src/commands/routes-generate.ts
+import { resolve as resolve6 } 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)));
+// 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;
   }
-  const catchAllMatches = routePath.match(/\*(\w+)/g);
-  if (catchAllMatches) {
-    params.push(...catchAllMatches.map((m) => m.slice(1)));
+  if (urlPath === "" || urlPath === "/") {
+    urlPath = "/";
   }
-  return params;
-}
-function isDynamicRoute(routePath) {
-  return routePath.includes(":") || routePath.includes("*");
-}
-function generateRouteTypes(routes) {
-  const pageRoutes = routes.filter((r) => !r.isApiRoute);
-  const apiRoutes = routes.filter((r) => r.isApiRoute);
-  const staticRoutes = pageRoutes.filter((r) => !r.isDynamic);
-  const dynamicRoutes = pageRoutes.filter((r) => r.isDynamic);
-  const appRoutesUnion = pageRoutes.length > 0 ? pageRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
-  const apiRoutesUnion = apiRoutes.length > 0 ? apiRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
-  const staticRoutesUnion = staticRoutes.length > 0 ? staticRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
-  const dynamicRoutesUnion = dynamicRoutes.length > 0 ? dynamicRoutes.map((r) => `    | '${r.path}'`).join("\n") : "    | never";
-  const paramTypes = dynamicRoutes.map((r) => {
-    const params = extractParams(r.path);
-    const typeName = routePathToTypeName(r.path);
-    const paramDef = params.map((p) => `${p}: string`).join("; ");
-    return `export type ${typeName}Params = { ${paramDef} };`;
-  }).join("\n");
-  return `${generateHeader("flight types:generate --routes")}
-
-// ============================================================================
-// Route Types
-// ============================================================================
-
-/**
- * All available page routes in the application
- */
-export type AppRoutes =
-${appRoutesUnion};
-
-/**
- * All available API routes in the application
- */
-export type ApiRoutes =
-${apiRoutesUnion};
-
-/**
- * Static routes (no dynamic parameters)
- */
-export type StaticRoutes =
-${staticRoutesUnion};
-
-/**
- * Dynamic routes (with parameters like :id or *slug)
- */
-export type DynamicRoutes =
-${dynamicRoutesUnion};
-
-// ============================================================================
-// Route Parameter Extraction
-// ============================================================================
-
-/**
- * Extract route parameters from a route pattern using template literal types.
- *
- * @example
- * type Params = ExtractRouteParams<'/users/:id'>; // { id: string }
- * type BlogParams = ExtractRouteParams<'/blog/:year/:slug'>; // { year: string; slug: string }
- */
-type ExtractRouteParams<T extends string> =
-    // Handle :param/rest pattern
-    T extends \`\${infer _Start}:\${infer Param}/\${infer Rest}\`
-        ? { [K in Param]: string } & ExtractRouteParams<\`/\${Rest}\`>
-        // Handle :param at end
-        : T extends \`\${infer _Start}:\${infer Param}\`
-            ? { [K in Param]: string }
-            // Handle *param (catch-all)
-            : T extends \`\${infer _Start}*\${infer Param}\`
-                ? { [K in Param]: string }
-                // No params
-                : Record<string, never>;
-
-/**
- * Get typed parameters for a specific route.
- *
- * @example
- * const params: RouteParams<'/users/:id'> = { id: '123' };
- */
-export type RouteParams<T extends AppRoutes | ApiRoutes> = ExtractRouteParams<T>;
-
-// ============================================================================
-// Helper Types
-// ============================================================================
-
-/**
- * Check if a route requires parameters
- */
-export type RequiresParams<T extends AppRoutes | ApiRoutes> =
-    RouteParams<T> extends Record<string, never> ? false : true;
-
-/**
- * Props for a type-safe Link component
- */
-export type TypedLinkProps<T extends AppRoutes> =
-    RequiresParams<T> extends true
-        ? { to: T; params: RouteParams<T> }
-        : { to: T; params?: never };
-
-/**
- * Build a URL from a route pattern and parameters
- */
-export type BuildUrl<T extends AppRoutes> =
-    RequiresParams<T> extends true
-        ? (route: T, params: RouteParams<T>) => string
-        : (route: T) => string;
-
-// ============================================================================
-// Individual Route Parameter Types
-// ============================================================================
-
-${paramTypes || "// No dynamic routes found"}
-`;
-}
-function routePathToTypeName(routePath) {
-  return routePath.split("/").filter(Boolean).map((segment) => {
-    const clean = segment.replace(/^[:*]/, "");
-    return clean.charAt(0).toUpperCase() + clean.slice(1);
-  }).join("_") || "Root";
+  urlPath = urlPath.replace(/\/+/g, "/");
+  return urlPath;
 }
-function parseEnvFile(content) {
-  const server = [];
-  const client = [];
-  const lines = content.split("\n");
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) {
-      continue;
-    }
-    const match = trimmed.match(/^([A-Z_][A-Z0-9_]*)(\?)?=/i);
-    if (!match) {
-      continue;
-    }
-    const key = match[1];
-    const optional = match[2] === "?";
-    const envVar = { key, optional };
-    if (key.startsWith("PUBLIC_")) {
-      client.push(envVar);
-    } else {
-      server.push(envVar);
-    }
-  }
-  return { server, client };
+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 loadEnvFiles(projectRoot) {
-  const envFiles = [".env", ".env.local", ".env.development", ".env.production"];
-  const merged = { server: [], client: [] };
-  const seenKeys = /* @__PURE__ */ new Set();
-  for (const envFile of envFiles) {
-    const envPath = join4(projectRoot, envFile);
-    if (!existsSync5(envPath)) {
-      continue;
-    }
-    const content = readFileSync3(envPath, "utf-8");
-    const parsed = parseEnvFile(content);
-    for (const envVar of parsed.server) {
-      if (!seenKeys.has(envVar.key)) {
-        seenKeys.add(envVar.key);
-        merged.server.push(envVar);
-      }
-    }
-    for (const envVar of parsed.client) {
-      if (!seenKeys.has(envVar.key)) {
-        seenKeys.add(envVar.key);
-        merged.client.push(envVar);
-      }
-    }
-  }
-  return merged;
+function isLayoutFile(filename) {
+  return filename.startsWith("_layout.");
 }
-function generateEnvTypes(env) {
-  const serverVars = env.server.sort((a, b) => a.key.localeCompare(b.key)).map((v) => `        ${v.key}${v.optional ? "?" : ""}: string;`).join("\n");
-  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 accessible via process.env
- * These are NOT exposed to the client.
- */
-declare namespace NodeJS {
-    interface ProcessEnv {
-${serverVars || "        // No server environment variables defined"}
-    }
+function isLoadingFile(filename) {
+  return filename.startsWith("_loading.");
 }
-
-// ============================================================================
-// 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"}
+function isErrorFile(filename) {
+  return filename.startsWith("_error.");
 }
-
-interface ImportMeta {
-    readonly env: ImportMetaEnv;
+function isNotFoundFile(filename) {
+  return filename.startsWith("_not-found.");
 }
-`;
+function isRouteFile(filename) {
+  return /\.(page|route)\.(tsx?|jsx?)$/.test(filename);
 }
-function scanRoutesForTypes(routesDir) {
-  if (!existsSync5(routesDir)) {
-    return [];
-  }
-  const routes = [];
-  scanDirectoryRecursive(routesDir, "", routes);
-  return routes;
+function isApiRouteFile(filename) {
+  return /\.(get|post|put|patch|delete|options|head)\.(tsx?|jsx?)$/.test(filename);
 }
-function scanDirectoryRecursive(dir, basePath, results) {
-  const entries = readdirSync3(dir, { withFileTypes: true });
+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.name);
-    const relativePath = join4(basePath, entry.name);
-    if (entry.isDirectory()) {
-      if (entry.name.startsWith(".") || entry.name === "node_modules") {
+    const fullPath = join4(dir, entry);
+    const relativePath = join4(basePath, entry);
+    const stat = statSync2(fullPath);
+    if (stat.isDirectory()) {
+      if (entry.startsWith(".") || entry === "node_modules") {
         continue;
       }
-      scanDirectoryRecursive(fullPath, relativePath, results);
-    } else if (entry.isFile()) {
-      const route = parseRouteFile(entry.name, relativePath);
-      if (route) {
-        results.push(route);
+      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 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()
-    };
+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 });
   }
-  return null;
+  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"};
+`;
+  writeFileSync3(join4(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")}
+`;
+  writeFileSync3(join4(outputDir, "types.ts"), typesContent, "utf-8");
 }
-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");
@@ -1804,18 +1832,471 @@ ${pc5.cyan("Quick example:")}
   console.log(`${pc5.dim("Docs:")} https://flight.dev/docs/packages/${packageName}`);
 }
 
+// src/commands/adapter-create.ts
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
+import { join as join6 } from "path";
+import pc6 from "picocolors";
+async function adapterCreateCommand(name, options = {}) {
+  const cwd = process.cwd();
+  const adapterName = name.toLowerCase().replace(/[^a-z0-9-]/g, "-");
+  const packageName = `@flight-framework/adapter-${adapterName}`;
+  const outputDir = options.outputDir || join6(cwd, "packages", `adapter-${adapterName}`);
+  const type = options.type || "node";
+  const includeValidation = options.validation || false;
+  console.log(pc6.cyan(`
+  Creating adapter: ${packageName}
+`));
+  if (existsSync7(outputDir)) {
+    console.error(pc6.red(`  Error: Directory already exists: ${outputDir}`));
+    process.exit(1);
+  }
+  mkdirSync4(join6(outputDir, "src"), { recursive: true });
+  mkdirSync4(join6(outputDir, "tests"), { recursive: true });
+  const files = generateAdapterFiles(adapterName, packageName, type, includeValidation);
+  for (const [filePath, content] of Object.entries(files)) {
+    const fullPath = join6(outputDir, filePath);
+    writeFileSync5(fullPath, content, "utf-8");
+    console.log(pc6.green(`  \u2713 Created ${filePath}`));
+  }
+  console.log(pc6.cyan(`
+  Adapter created successfully!
+
+  Next steps:
+    1. cd packages/adapter-${adapterName}
+    2. Implement your adapter logic in src/index.ts
+    3. Run: pnpm build
+    4. Test: pnpm test
+
+  Documentation:
+    https://flight.dev/docs/adapters/custom
+`));
+}
+function generateAdapterFiles(name, packageName, type, includeValidation) {
+  const pascalName = name.split("-").map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("");
+  return {
+    "package.json": generatePackageJson(packageName, includeValidation),
+    "tsconfig.json": generateTsConfig(),
+    "tsup.config.ts": generateTsupConfig(),
+    "src/index.ts": generateAdapterSource(name, pascalName, type, includeValidation),
+    "tests/adapter.test.ts": generateAdapterTest(name, pascalName),
+    "README.md": generateReadme(name, packageName)
+  };
+}
+function generatePackageJson(packageName, includeValidation) {
+  const pkg = {
+    name: packageName,
+    version: "0.1.0",
+    description: `Flight adapter for custom platform`,
+    type: "module",
+    main: "./dist/index.js",
+    types: "./dist/index.d.ts",
+    exports: {
+      ".": {
+        types: "./dist/index.d.ts",
+        import: "./dist/index.js"
+      }
+    },
+    scripts: {
+      build: "tsup",
+      test: "vitest run",
+      "test:watch": "vitest"
+    },
+    dependencies: {
+      "@flight-framework/core": "^0.4.0"
+    },
+    devDependencies: {
+      tsup: "^8.0.0",
+      typescript: "^5.0.0",
+      vitest: "^2.0.0",
+      ...includeValidation ? { zod: "^3.23.0" } : {}
+    },
+    peerDependencies: includeValidation ? {
+      zod: "^3.0.0"
+    } : void 0,
+    peerDependenciesMeta: includeValidation ? {
+      zod: { optional: true }
+    } : void 0
+  };
+  return JSON.stringify(pkg, null, 2);
+}
+function generateTsConfig() {
+  return JSON.stringify({
+    extends: "../../tsconfig.base.json",
+    compilerOptions: {
+      outDir: "./dist",
+      rootDir: "./src"
+    },
+    include: ["src"]
+  }, null, 2);
+}
+function generateTsupConfig() {
+  return `import { defineConfig } from 'tsup';
+
+export default defineConfig({
+    entry: ['src/index.ts'],
+    format: ['esm'],
+    dts: true,
+    clean: true,
+    target: 'node20',
+});
+`;
+}
+function generateAdapterSource(name, pascalName, type, includeValidation) {
+  if (includeValidation) {
+    return `/**
+ * Flight Adapter - ${pascalName}
+ * 
+ * Custom deployment adapter with optional Zod validation.
+ */
+
+import { createValidatedAdapter, type AdapterBuilder } from '@flight-framework/core/adapters';
+import { z } from 'zod';
+
+// ============================================================================
+// Options Schema (Optional - Zod validation)
+// ============================================================================
+
+const optionsSchema = z.object({
+    /** Server port */
+    port: z.number().default(3000),
+    /** Enable health check endpoint */
+    healthCheck: z.boolean().default(true),
+    /** Custom environment variables */
+    env: z.record(z.string()).optional(),
+});
+
+export type ${pascalName}AdapterOptions = z.infer<typeof optionsSchema>;
+
+// ============================================================================
+// Adapter Implementation
+// ============================================================================
+
+export default createValidatedAdapter('${name}', optionsSchema, (options) => ({
+    async adapt(builder: AdapterBuilder) {
+        builder.log.info(\`Building for ${pascalName} platform...\`);
+        builder.log.info(\`Port: \${options.port}\`);
+
+        // Generate server entry
+        await generateServerEntry(builder, options);
+
+        // Generate platform-specific config
+        await generatePlatformConfig(builder, options);
+
+        builder.log.info('Build complete!');
+    },
+
+    supports: {
+        node: () => ${type === "node" || type === "container"},
+        edge: () => ${type === "edge" || type === "serverless"},
+        streaming: () => ${type === "node"},
+        websockets: () => ${type === "node"},
+    },
+
+    emulate: () => ({
+        env: {
+            ${name.toUpperCase().replace(/-/g, "_")}_PLATFORM: 'true',
+            PORT: String(options.port),
+        },
+    }),
+}));
+
+// ============================================================================
+// Generator Functions
+// ============================================================================
+
+async function generateServerEntry(builder: AdapterBuilder, options: ${pascalName}AdapterOptions): Promise<void> {
+    const serverCode = \`
+import { createUniversalHandler } from '@flight-framework/core/adapters';
+import manifest from './manifest.js';
+
+const handler = createUniversalHandler(manifest);
+
+const server = Bun.serve({
+    port: \${options.port},
+    fetch: handler,
+});
+
+console.log(\\\`Server running at http://localhost:\${options.port}\\\`);
+\`;
+
+    await builder.writeFile('server.ts', serverCode.trim());
+}
+
+async function generatePlatformConfig(builder: AdapterBuilder, options: ${pascalName}AdapterOptions): Promise<void> {
+    const config = {
+        name: '${name}-app',
+        port: options.port,
+        healthCheck: options.healthCheck ? '/health' : null,
+    };
+
+    await builder.writeFile('platform.json', JSON.stringify(config, null, 2));
+}
+`;
+  }
+  return `/**
+ * Flight Adapter - ${pascalName}
+ * 
+ * Custom deployment adapter for ${pascalName} platform.
+ * 
+ * @example
+ * \`\`\`typescript
+ * import ${name.replace(/-/g, "")} from '${name.includes("@") ? name : `@flight-framework/adapter-${name}`}';
+ * 
+ * export default defineConfig({
+ *     adapter: ${name.replace(/-/g, "")}({
+ *         port: 3000,
+ *     }),
+ * });
+ * \`\`\`
+ */
+
+import { createAdapter, type AdapterBuilder } from '@flight-framework/core/adapters';
+
+// ============================================================================
+// Options Interface
+// ============================================================================
+
+export interface ${pascalName}AdapterOptions {
+    /** Server port (default: 3000) */
+    port?: number;
+    /** Enable health check endpoint (default: true) */
+    healthCheck?: boolean;
+    /** Custom environment variables */
+    env?: Record<string, string>;
+}
+
+// ============================================================================
+// Adapter Implementation
+// ============================================================================
+
+export default function ${name.replace(/-/g, "")}Adapter(options: ${pascalName}AdapterOptions = {}) {
+    const {
+        port = 3000,
+        healthCheck = true,
+        env = {},
+    } = options;
+
+    return createAdapter({
+        name: '${name}',
+
+        async adapt(builder: AdapterBuilder) {
+            builder.log.info(\`Building for ${pascalName} platform...\`);
+            builder.log.info(\`Port: \${port}\`);
+
+            // Generate server entry
+            await generateServerEntry(builder, port, healthCheck);
+
+            // Generate platform-specific config
+            await generatePlatformConfig(builder, port, healthCheck);
+
+            builder.log.info('Build complete!');
+        },
+
+        supports: {
+            node: () => ${type === "node" || type === "container"},
+            edge: () => ${type === "edge" || type === "serverless"},
+            streaming: () => ${type === "node"},
+            websockets: () => ${type === "node"},
+        },
+
+        emulate: () => ({
+            env: {
+                ${name.toUpperCase().replace(/-/g, "_")}_PLATFORM: 'true',
+                PORT: String(port),
+                ...env,
+            },
+        }),
+    });
+}
+
+// ============================================================================
+// Generator Functions
+// ============================================================================
+
+async function generateServerEntry(
+    builder: AdapterBuilder,
+    port: number,
+    healthCheck: boolean
+): Promise<void> {
+    const serverCode = \`
+import { createServer } from 'node:http';
+import { createUniversalHandler } from '@flight-framework/core/adapters';
+import manifest from './manifest.js';
+
+const handler = createUniversalHandler(manifest);
+
+const server = createServer(async (req, res) => {
+    const url = req.url || '/';
+    
+    // Health check endpoint
+    if (url === '/health' && \${healthCheck}) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ status: 'ok' }));
+        return;
+    }
+
+    // Handle request with Flight
+    const webReq = new Request(\\\`http://localhost\${url}\\\`, {
+        method: req.method,
+        headers: Object.fromEntries(
+            Object.entries(req.headers).filter(([_, v]) => v != null).map(([k, v]) => [k, String(v)])
+        ),
+    });
+
+    const response = await handler(webReq);
+
+    res.writeHead(response.status, Object.fromEntries(response.headers));
+    res.end(await response.text());
+});
+
+server.listen(\${port}, () => {
+    console.log(\\\`Server running at http://localhost:\${port}\\\`);
+});
+\`;
+
+    await builder.writeFile('server.mjs', serverCode.trim());
+}
+
+async function generatePlatformConfig(
+    builder: AdapterBuilder,
+    port: number,
+    healthCheck: boolean
+): Promise<void> {
+    const config = {
+        name: '${name}-app',
+        port,
+        healthCheck: healthCheck ? '/health' : null,
+    };
+
+    await builder.writeFile('platform.json', JSON.stringify(config, null, 2));
+}
+`;
+}
+function generateAdapterTest(name, pascalName) {
+  return `/**
+ * ${pascalName} Adapter Tests
+ */
+
+import { describe, it, expect, vi } from 'vitest';
+import adapter from '../src/index.js';
+
+describe('adapter-${name}', () => {
+    const createMockBuilder = () => ({
+        manifest: {
+            entries: {},
+            files: [],
+            routes: [],
+        },
+        root: '/test',
+        outDir: '/test/dist',
+        readFile: vi.fn(),
+        writeFile: vi.fn(),
+        copy: vi.fn(),
+        glob: vi.fn(),
+        log: {
+            info: vi.fn(),
+            warn: vi.fn(),
+            error: vi.fn(),
+        },
+    });
+
+    it('should have correct name', () => {
+        const instance = adapter();
+        expect(instance.name).toBe('${name}');
+    });
+
+    it('should generate server entry', async () => {
+        const instance = adapter({ port: 4000 });
+        const builder = createMockBuilder();
+
+        await instance.adapt(builder);
+
+        expect(builder.writeFile).toHaveBeenCalledWith(
+            'server.mjs',
+            expect.stringContaining('4000')
+        );
+    });
+
+    it('should generate platform config', async () => {
+        const instance = adapter();
+        const builder = createMockBuilder();
+
+        await instance.adapt(builder);
+
+        expect(builder.writeFile).toHaveBeenCalledWith(
+            'platform.json',
+            expect.any(String)
+        );
+    });
+
+    it('should declare supported features', () => {
+        const instance = adapter();
+
+        expect(instance.supports?.node?.()).toBeDefined();
+        expect(instance.supports?.streaming?.()).toBeDefined();
+    });
+
+    it('should provide emulation environment', () => {
+        const instance = adapter({ port: 5000 });
+        const emulation = instance.emulate?.();
+
+        expect(emulation?.env?.PORT).toBe('5000');
+        expect(emulation?.env?.${name.toUpperCase().replace(/-/g, "_")}_PLATFORM).toBe('true');
+    });
+});
+`;
+}
+function generateReadme(name, packageName) {
+  return `# ${packageName}
+
+Flight adapter for ${name} platform.
+
+## Installation
+
+\`\`\`bash
+npm install ${packageName}
+\`\`\`
+
+## Usage
+
+\`\`\`typescript
+import { defineConfig } from '@flight-framework/core';
+import ${name.replace(/-/g, "")} from '${packageName}';
+
+export default defineConfig({
+    adapter: ${name.replace(/-/g, "")}({
+        port: 3000,
+        healthCheck: true,
+    }),
+});
+\`\`\`
+
+## Options
+
+| Option | Type | Default | Description |
+|--------|------|---------|-------------|
+| \`port\` | \`number\` | \`3000\` | Server port |
+| \`healthCheck\` | \`boolean\` | \`true\` | Enable health check endpoint |
+| \`env\` | \`Record<string, string>\` | \`{}\` | Custom environment variables |
+
+## License
+
+MIT
+`;
+}
+
 // src/index.ts
 var cli = cac("flight");
 var LOGO = `
-${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   ")}
+${pc7.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")}
+${pc7.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")}
+${pc7.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   ")}
+${pc7.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   ")}
+${pc7.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   ")}
+${pc7.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.dim("The Agnostic Full-Stack Framework")}
-  ${pc6.dim("Maximum Flexibility. Zero Lock-in.")}
+  ${pc7.dim("The Agnostic Full-Stack Framework")}
+  ${pc7.dim("Maximum Flexibility. Zero Lock-in.")}
 `;
 function printLogo() {
   console.log(LOGO);
@@ -1829,6 +2310,7 @@ cli.command("build", "Build for production").option("--outDir <dir>", "Output di
 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);
 cli.command("routes:generate", "Generate route manifest from routes directory").option("--routesDir <dir>", "Routes directory", { default: "src/routes" }).option("--outputDir <dir>", "Output directory", { default: "src/.flight" }).action(routesGenerateCommand);
 cli.command("types:generate", "Generate TypeScript types for routes and environment").option("--routesDir <dir>", "Routes directory", { default: "src/routes" }).option("--outputDir <dir>", "Output directory", { default: "src/.flight" }).option("--routes", "Generate route types", { default: true }).option("--env", "Generate environment variable types").option("--watch", "Watch for changes and regenerate").action(typesGenerateCommand);
+cli.command("adapter:create <name>", "Create a new adapter package").option("-t, --type <type>", "Platform type (node, edge, container, serverless)", { default: "node" }).option("--validation", "Include Zod validation example").option("--outputDir <dir>", "Output directory").action(adapterCreateCommand);
 function run() {
   try {
     cli.parse(process.argv, { run: false });
@@ -1837,7 +2319,7 @@ function run() {
     }
     cli.runMatchedCommand();
   } catch (error) {
-    console.error(pc6.red("Error:"), error instanceof Error ? error.message : error);
+    console.error(pc7.red("Error:"), error instanceof Error ? error.message : error);
     process.exit(1);
   }
 }