@mandujs/cli 0.12.2 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mandujs/cli",
-  "version": "0.12.2",
+  "version": "0.13.1",
   "description": "Agent-Native Fullstack Framework - 에이전트가 코딩해도 아키텍처가 무너지지 않는 개발 OS",
   "type": "module",
   "main": "./src/main.ts",
@@ -32,7 +32,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mandujs/core": "0.12.0",
+    "@mandujs/core": "0.12.2",
     "cfonts": "^3.3.0"
   },
   "engines": {

package/src/commands/contract.ts

@@ -3,63 +3,63 @@
  * Contract 생성 및 검증 명령어
  */
 
-import {
-  runContractGuardCheck,
-  generateContractTemplate,
-  buildContractRegistry,
-  writeContractRegistry,
-  readContractRegistry,
-  diffContractRegistry,
-  validateAndReport,
-} from "@mandujs/core";
-import path from "path";
-import fs from "fs/promises";
-import { resolveManifest } from "../util/manifest";
+import {
+  runContractGuardCheck,
+  generateContractTemplate,
+  buildContractRegistry,
+  writeContractRegistry,
+  readContractRegistry,
+  diffContractRegistry,
+  validateAndReport,
+} from "@mandujs/core";
+import path from "path";
+import fs from "fs/promises";
+import { resolveManifest } from "../util/manifest";
 
 interface ContractCreateOptions {
   routeId: string;
 }
 
-interface ContractValidateOptions {
-  verbose?: boolean;
-}
-
-interface ContractBuildOptions {
-  output?: string;
-}
-
-interface ContractDiffOptions {
-  from?: string;
-  to?: string;
-  output?: string;
-  json?: boolean;
-}
-
-async function loadRoutesManifest(rootDir: string) {
-  const config = await validateAndReport(rootDir);
-  if (!config) {
-    throw new Error("Invalid mandu.config");
-  }
-  const resolved = await resolveManifest(rootDir, { fsRoutes: config.fsRoutes });
-  return resolved.manifest;
-}
+interface ContractValidateOptions {
+  verbose?: boolean;
+}
+
+interface ContractBuildOptions {
+  output?: string;
+}
+
+interface ContractDiffOptions {
+  from?: string;
+  to?: string;
+  output?: string;
+  json?: boolean;
+}
+
+async function loadRoutesManifest(rootDir: string) {
+  const config = await validateAndReport(rootDir);
+  if (!config) {
+    throw new Error("Invalid mandu.config");
+  }
+  const resolved = await resolveManifest(rootDir, { fsRoutes: config.fsRoutes });
+  return resolved.manifest;
+}
 
 /**
  * Create a new contract file for a route
  */
-export async function contractCreate(options: ContractCreateOptions): Promise<boolean> {
-  const rootDir = process.cwd();
-
-  console.log(`\n📜 Creating contract for route: ${options.routeId}\n`);
-
-  // Load manifest
-  let manifest;
-  try {
-    manifest = await loadRoutesManifest(rootDir);
-  } catch (error) {
-    console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
-    return false;
-  }
+export async function contractCreate(options: ContractCreateOptions): Promise<boolean> {
+  const rootDir = process.cwd();
+
+  console.log(`\n📜 Creating contract for route: ${options.routeId}\n`);
+
+  // Load manifest
+  let manifest;
+  try {
+    manifest = await loadRoutesManifest(rootDir);
+  } catch (error) {
+    console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
+    return false;
+  }
 
   // Find the route
   const route = manifest.routes.find((r) => r.id === options.routeId);
@@ -113,22 +113,22 @@ export async function contractCreate(options: ContractCreateOptions): Promise<bo
 /**
  * Validate all contracts against their slot implementations
  */
-export async function contractValidate(options: ContractValidateOptions = {}): Promise<boolean> {
-  const rootDir = process.cwd();
-
-  console.log(`\n🔍 Validating contracts...\n`);
-
-  // Load manifest
-  let manifest;
-  try {
-    manifest = await loadRoutesManifest(rootDir);
-  } catch (error) {
-    console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
-    return false;
-  }
-
-  // Run contract guard check
-  const violations = await runContractGuardCheck(manifest, rootDir);
+export async function contractValidate(options: ContractValidateOptions = {}): Promise<boolean> {
+  const rootDir = process.cwd();
+
+  console.log(`\n🔍 Validating contracts...\n`);
+
+  // Load manifest
+  let manifest;
+  try {
+    manifest = await loadRoutesManifest(rootDir);
+  } catch (error) {
+    console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
+    return false;
+  }
+
+  // Run contract guard check
+  const violations = await runContractGuardCheck(manifest, rootDir);
 
   if (violations.length === 0) {
     console.log(`✅ All contracts are valid!\n`);
@@ -175,112 +175,112 @@ export async function contractValidate(options: ContractValidateOptions = {}): P
     console.log(`💡 Use --verbose for fix suggestions\n`);
   }
 
-  return false;
-}
-
-/**
- * Build contract registry (.mandu/contracts.json)
- */
-export async function contractBuild(options: ContractBuildOptions = {}): Promise<boolean> {
-  const rootDir = process.cwd();
-  const outputPath = options.output || path.join(rootDir, ".mandu", "contracts.json");
-
-  console.log(`\n📦 Building contract registry...\n`);
-
-  let manifest;
-  try {
-    manifest = await loadRoutesManifest(rootDir);
-  } catch (error) {
-    console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
-    return false;
-  }
-  const { registry, warnings } = await buildContractRegistry(manifest, rootDir);
-
-  if (warnings.length > 0) {
-    console.log(`⚠️  ${warnings.length} warning(s):`);
-    for (const warning of warnings) {
-      console.log(`   - ${warning}`);
-    }
-    console.log();
-  }
-
-  await fs.mkdir(path.dirname(outputPath), { recursive: true });
-  await writeContractRegistry(outputPath, registry);
-
-  console.log(`✅ Registry generated: ${path.relative(rootDir, outputPath)}`);
-  console.log(`📊 Contracts: ${registry.contracts.length}`);
-
-  return true;
-}
-
-/**
- * Diff current contracts against a registry
- */
-export async function contractDiff(options: ContractDiffOptions = {}): Promise<boolean> {
-  const rootDir = process.cwd();
-  const fromPath = options.from || path.join(rootDir, ".mandu", "contracts.json");
-
-  console.log(`\n🔍 Diffing contracts...\n`);
-
-  const fromRegistry = await readContractRegistry(fromPath);
-  if (!fromRegistry) {
-    console.error(`❌ Registry not found: ${path.relative(rootDir, fromPath)}`);
-    console.log(`💡 Run \`mandu contract build\` first.`);
-    return false;
-  }
-
-  let toRegistry = options.to ? await readContractRegistry(options.to) : null;
-
-  if (!toRegistry) {
-    let manifest;
-    try {
-      manifest = await loadRoutesManifest(rootDir);
-    } catch (error) {
-      console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
-      return false;
-    }
-    const { registry } = await buildContractRegistry(manifest, rootDir);
-    toRegistry = registry;
-  }
-
-  const diff = diffContractRegistry(fromRegistry, toRegistry);
-
-  if (options.output) {
-    await fs.mkdir(path.dirname(options.output), { recursive: true });
-    await Bun.write(options.output, JSON.stringify(diff, null, 2));
-    console.log(`✅ Diff saved: ${path.relative(rootDir, options.output)}`);
-  }
-
-  if (options.json) {
-    console.log(JSON.stringify(diff, null, 2));
-    return diff.summary.major === 0;
-  }
-
-  console.log(`📊 Summary: major ${diff.summary.major}, minor ${diff.summary.minor}, patch ${diff.summary.patch}`);
-
-  if (diff.added.length > 0) {
-    console.log(`\n🟢 Added (${diff.added.length})`);
-    for (const entry of diff.added) {
-      console.log(`  - ${entry.id} (${entry.routeId})`);
-    }
-  }
-
-  if (diff.removed.length > 0) {
-    console.log(`\n🔴 Removed (${diff.removed.length})`);
-    for (const entry of diff.removed) {
-      console.log(`  - ${entry.id} (${entry.routeId})`);
-    }
-  }
-
-  if (diff.changed.length > 0) {
-    console.log(`\n🟡 Changed (${diff.changed.length})`);
-    for (const change of diff.changed) {
-      console.log(`  - ${change.id} (${change.routeId}) [${change.severity}]`);
-      for (const detail of change.changes) {
-        console.log(`     • ${detail}`);
-      }
-    }
-  }
-
-  return diff.summary.major === 0;
-}
+  return false;
+}
+
+/**
+ * Build contract registry (.mandu/contracts.json)
+ */
+export async function contractBuild(options: ContractBuildOptions = {}): Promise<boolean> {
+  const rootDir = process.cwd();
+  const outputPath = options.output || path.join(rootDir, ".mandu", "contracts.json");
+
+  console.log(`\n📦 Building contract registry...\n`);
+
+  let manifest;
+  try {
+    manifest = await loadRoutesManifest(rootDir);
+  } catch (error) {
+    console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
+    return false;
+  }
+  const { registry, warnings } = await buildContractRegistry(manifest, rootDir);
+
+  if (warnings.length > 0) {
+    console.log(`⚠️  ${warnings.length} warning(s):`);
+    for (const warning of warnings) {
+      console.log(`   - ${warning}`);
+    }
+    console.log();
+  }
+
+  await fs.mkdir(path.dirname(outputPath), { recursive: true });
+  await writeContractRegistry(outputPath, registry);
+
+  console.log(`✅ Registry generated: ${path.relative(rootDir, outputPath)}`);
+  console.log(`📊 Contracts: ${registry.contracts.length}`);
+
+  return true;
+}
+
+/**
+ * Diff current contracts against a registry
+ */
+export async function contractDiff(options: ContractDiffOptions = {}): Promise<boolean> {
+  const rootDir = process.cwd();
+  const fromPath = options.from || path.join(rootDir, ".mandu", "contracts.json");
+
+  console.log(`\n🔍 Diffing contracts...\n`);
+
+  const fromRegistry = await readContractRegistry(fromPath);
+  if (!fromRegistry) {
+    console.error(`❌ Registry not found: ${path.relative(rootDir, fromPath)}`);
+    console.log(`💡 Run \`mandu contract build\` first.`);
+    return false;
+  }
+
+  let toRegistry = options.to ? await readContractRegistry(options.to) : null;
+
+  if (!toRegistry) {
+    let manifest;
+    try {
+      manifest = await loadRoutesManifest(rootDir);
+    } catch (error) {
+      console.error("❌ Failed to load manifest:", error instanceof Error ? error.message : error);
+      return false;
+    }
+    const { registry } = await buildContractRegistry(manifest, rootDir);
+    toRegistry = registry;
+  }
+
+  const diff = diffContractRegistry(fromRegistry, toRegistry);
+
+  if (options.output) {
+    await fs.mkdir(path.dirname(options.output), { recursive: true });
+    await Bun.write(options.output, JSON.stringify(diff, null, 2));
+    console.log(`✅ Diff saved: ${path.relative(rootDir, options.output)}`);
+  }
+
+  if (options.json) {
+    console.log(JSON.stringify(diff, null, 2));
+    return diff.summary.major === 0;
+  }
+
+  console.log(`📊 Summary: major ${diff.summary.major}, minor ${diff.summary.minor}, patch ${diff.summary.patch}`);
+
+  if (diff.added.length > 0) {
+    console.log(`\n🟢 Added (${diff.added.length})`);
+    for (const entry of diff.added) {
+      console.log(`  - ${entry.id} (${entry.routeId})`);
+    }
+  }
+
+  if (diff.removed.length > 0) {
+    console.log(`\n🔴 Removed (${diff.removed.length})`);
+    for (const entry of diff.removed) {
+      console.log(`  - ${entry.id} (${entry.routeId})`);
+    }
+  }
+
+  if (diff.changed.length > 0) {
+    console.log(`\n🟡 Changed (${diff.changed.length})`);
+    for (const change of diff.changed) {
+      console.log(`  - ${change.id} (${change.routeId}) [${change.severity}]`);
+      for (const detail of change.changes) {
+        console.log(`     • ${detail}`);
+      }
+    }
+  }
+
+  return diff.summary.major === 0;
+}

package/src/commands/dev.ts

@@ -1,9 +1,5 @@
 import {
   startServer,
-  registerApiHandler,
-  registerPageLoader,
-  registerPageHandler,
-  registerLayoutLoader,
   startDevBundler,
   createHMRServer,
   needsHydration,
@@ -36,6 +32,7 @@ import { CLI_ERROR_CODES, printCLIError } from "../errors";
 import { importFresh } from "../util/bun";
 import { resolveManifest } from "../util/manifest";
 import { resolveAvailablePort } from "../util/port";
+import { registerManifestHandlers } from "../util/handlers";
 import path from "path";
 
 export interface DevOptions {
@@ -202,70 +199,13 @@ export async function dev(options: DevOptions = {}): Promise<void> {
   // Layout 경로 추적 (중복 등록 방지)
   const registeredLayouts = new Set<string>();
 
-  // 핸들러 등록 함수
-  const registerHandlers = async (manifest: RoutesManifest, isReload = false) => {
-    // 리로드 시 레이아웃 캐시 클리어
-    if (isReload) {
-      registeredLayouts.clear();
-    }
-
-    for (const route of manifest.routes) {
-      if (route.kind === "api") {
-        const modulePath = path.resolve(rootDir, route.module);
-        try {
-          // 캐시 무효화 (HMR용)
-          const module = await importFresh(modulePath);
-          let handler = module.default || module.handler || module;
-
-          // ManduFilling 인스턴스를 핸들러 함수로 래핑
-          if (handler && typeof handler.handle === 'function') {
-            console.log(`  🔄 ManduFilling 래핑: ${route.id}`);
-            const filling = handler;
-            handler = async (req: Request, params?: Record<string, string>) => {
-              return filling.handle(req, params);
-            };
-          } else {
-            console.log(`  ⚠️ 핸들러 타입: ${typeof handler}, handle: ${typeof handler?.handle}`);
-          }
-
-          registerApiHandler(route.id, handler);
-          console.log(`  📡 API: ${route.pattern} -> ${route.id}`);
-        } catch (error) {
-          console.error(`  ❌ API 핸들러 로드 실패: ${route.id}`, error);
-        }
-      } else if (route.kind === "page" && route.componentModule) {
-        const componentPath = path.resolve(rootDir, route.componentModule);
-        const isIsland = needsHydration(route);
-        const hasLayout = route.layoutChain && route.layoutChain.length > 0;
-
-        // Layout 로더 등록
-        if (route.layoutChain) {
-          for (const layoutPath of route.layoutChain) {
-            if (!registeredLayouts.has(layoutPath)) {
-              const absLayoutPath = path.resolve(rootDir, layoutPath);
-              registerLayoutLoader(layoutPath, async () => {
-                // 캐시 무효화 (HMR용)
-                return importFresh(absLayoutPath);
-              });
-              registeredLayouts.add(layoutPath);
-              console.log(`  🎨 Layout: ${layoutPath}`);
-            }
-          }
-        }
-
-        // slotModule이 있으면 PageHandler 사용 (filling.loader 지원)
-        if (route.slotModule) {
-          registerPageHandler(route.id, async () => {
-            const module = await importFresh(componentPath);
-            return module.default;
-          });
-          console.log(`  📄 Page: ${route.pattern} -> ${route.id} (with loader)${isIsland ? " 🏝️" : ""}${hasLayout ? " 🎨" : ""}`);
-        } else {
-          registerPageLoader(route.id, () => importFresh(componentPath));
-          console.log(`  📄 Page: ${route.pattern} -> ${route.id}${isIsland ? " 🏝️" : ""}${hasLayout ? " 🎨" : ""}`);
-        }
-      }
-    }
+  // 핸들러 등록 함수 (공유 유틸 사용)
+  const registerHandlers = async (m: RoutesManifest, isReload = false) => {
+    await registerManifestHandlers(m, rootDir, {
+      importFn: importFresh,
+      registeredLayouts,
+      isReload,
+    });
   };
 
   // 초기 핸들러 등록

package/src/commands/doctor.ts

@@ -15,22 +15,22 @@ import {
   getBrain,
 } from "../../../core/src/index";
 import { resolveFromCwd, getRootDir } from "../util/fs";
-import path from "path";
+import path from "path";
 import fs from "fs/promises";
 
-export interface DoctorOptions {
-  /** Output format: console, json, or markdown */
-  format?: "console" | "json" | "markdown";
+export interface DoctorOptions {
+  /** Output format: console, json, or markdown */
+  format?: "console" | "json" | "markdown";
   /** Whether to use LLM for enhanced analysis */
   useLLM?: boolean;
   /** Output file path (for json/markdown formats) */
-  output?: string;
-}
-
-export async function doctor(options: DoctorOptions = {}): Promise<boolean> {
-  const { format, useLLM = true, output } = options;
-  const inferredFormat = format ?? (output ? (path.extname(output).toLowerCase() === ".json" ? "json" : "markdown") : undefined);
-  const resolvedFormat = inferredFormat ?? "console";
+  output?: string;
+}
+
+export async function doctor(options: DoctorOptions = {}): Promise<boolean> {
+  const { format, useLLM = true, output } = options;
+  const inferredFormat = format ?? (output ? (path.extname(output).toLowerCase() === ".json" ? "json" : "markdown") : undefined);
+  const resolvedFormat = inferredFormat ?? "console";
 
   const specPath = resolveFromCwd("spec/routes.manifest.json");
   const rootDir = getRootDir();
@@ -82,12 +82,12 @@ export async function doctor(options: DoctorOptions = {}): Promise<boolean> {
   });
 
   // Output based on format
-  switch (resolvedFormat) {
-    case "console":
-      printDoctorReport(analysis);
-      break;
-
-    case "json": {
+  switch (resolvedFormat) {
+    case "console":
+      printDoctorReport(analysis);
+      break;
+
+    case "json": {
       const json = JSON.stringify(
         {
           summary: analysis.summary,
@@ -106,10 +106,10 @@ export async function doctor(options: DoctorOptions = {}): Promise<boolean> {
       } else {
         console.log(json);
       }
-      break;
-    }
-
-    case "markdown": {
+      break;
+    }
+
+    case "markdown": {
       const md = generateDoctorMarkdownReport(analysis);
 
       if (output) {
@@ -118,9 +118,9 @@ export async function doctor(options: DoctorOptions = {}): Promise<boolean> {
       } else {
         console.log(md);
       }
-      break;
-    }
-  }
-
-  return false;
-}
+      break;
+    }
+  }
+
+  return false;
+}