codebakers 2.2.1 → 2.3.0

package/dist/index.d.ts

@@ -1 +1,4 @@
 #!/usr/bin/env node
+declare function showPostBuildInstructions(projectName: string, projectPath?: string): void;
+
+export { showPostBuildInstructions };

package/dist/index.js

@@ -15,6 +15,7 @@ import * as p21 from "@clack/prompts";
 import chalk21 from "chalk";
 import boxen from "boxen";
 import gradient from "gradient-string";
+import * as path16 from "path";
 
 // src/utils/updates.ts
 import chalk from "chalk";
@@ -276,10 +277,8 @@ async function setupCommand() {
   const connectedCount = [...CORE_SERVICES, ...OPTIONAL_SERVICES].filter(
     (key) => config.getCredentials(key)
   ).length;
-  p.outro(chalk2.green(`
-  \u2713 Setup complete! ${connectedCount} services connected.
-  
-  Run ${chalk2.bold("codebakers")} to get started.
+  console.log(chalk2.green(`
+  \u2713 ${connectedCount} services connected!
 `));
 }
 async function connectService(config, service) {
@@ -7538,73 +7537,9 @@ If unclear between multiple commands, use the most likely one with lower confide
   }
   return JSON.parse(jsonMatch[0]);
 }
-async function clarifyCommand(parsed) {
-  if (parsed.confidence >= 0.8) {
-    return parsed;
-  }
-  if (parsed.confidence >= 0.5) {
-    const confirm13 = await p20.confirm({
-      message: `Did you mean: ${parsed.interpretation}?`,
-      initialValue: true
-    });
-    if (confirm13 && !p20.isCancel(confirm13)) {
-      return { ...parsed, confidence: 1 };
-    }
-  }
-  const options = [
-    { value: "init", label: "\u{1F195} Create new project", description: "Start a fresh project" },
-    { value: "build", label: "\u{1F3D7}\uFE0F  Build from PRD", description: "Parallel build from document" },
-    { value: "code", label: "\u{1F4AC} AI Coding", description: "Get help writing code" },
-    { value: "check", label: "\u{1F50D} Check code", description: "Lint and validate" },
-    { value: "deploy", label: "\u{1F680} Deploy", description: "Push to production" },
-    { value: "fix", label: "\u{1F527} Fix errors", description: "Auto-fix issues" },
-    { value: "advisors", label: "\u{1F31F} Dream Team", description: "Get expert advice" },
-    { value: "prd-maker", label: "\u{1F4DD} Create PRD", description: "Document your idea" },
-    { value: "other", label: "\u2753 Something else", description: "Describe what you need" }
-  ];
-  const selection = await p20.select({
-    message: "What would you like to do?",
-    options: options.map((o) => ({ value: o.value, label: o.label, hint: o.description }))
-  });
-  if (p20.isCancel(selection)) {
-    return { ...parsed, command: "cancel", confidence: 1 };
-  }
-  if (selection === "other") {
-    const description = await p20.text({
-      message: "Describe what you want to do:",
-      placeholder: "I want to..."
-    });
-    if (p20.isCancel(description)) {
-      return { ...parsed, command: "cancel", confidence: 1 };
-    }
-    return {
-      command: "code",
-      args: [description],
-      confidence: 1,
-      interpretation: description
-    };
-  }
-  return {
-    command: selection,
-    args: parsed.args,
-    confidence: 1,
-    interpretation: options.find((o) => o.value === selection)?.description || ""
-  };
-}
-async function clarifyDeployTarget() {
-  const target = await p20.select({
-    message: "Where do you want to deploy?",
-    options: [
-      { value: "preview", label: "\u{1F50D} Preview", hint: "Test URL to review changes" },
-      { value: "production", label: "\u{1F680} Production", hint: "Live site for users" }
-    ]
-  });
-  if (p20.isCancel(target)) return null;
-  return target;
-}
 
 // src/index.ts
-var VERSION2 = "2.2.1";
+var VERSION2 = "2.3.0";
 var logo = `
    \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
   \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551 \u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D
@@ -7615,58 +7550,73 @@ var logo = `
 `;
 async function showMainMenu() {
   const config = new Config();
-  const isSetup = config.isConfigured();
   console.log(gradient.pastel.multiline(logo));
   console.log(chalk21.dim(`  v${VERSION2} \u2014 AI dev team that follows the rules
 `));
-  if (!isSetup) {
+  const hasAnthropic = !!config.getCredentials("anthropic")?.apiKey;
+  if (!hasAnthropic) {
     console.log(boxen(
-      chalk21.yellow("Welcome to CodeBakers! Let's get you set up."),
+      chalk21.yellow("Welcome to CodeBakers!\n\n") + chalk21.white("Let's connect your Anthropic API key so the AI can work.\n") + chalk21.dim("(Takes about 1 minute)"),
       { padding: 1, borderColor: "yellow", borderStyle: "round" }
     ));
     await setupCommand();
+    showPostSetupInstructions();
     return;
   }
   const inProject = config.isInProject();
+  const projectConfig = config.getProjectConfig();
+  const cwd = process.cwd();
+  const folderName = path16.basename(cwd);
+  if (inProject && projectConfig) {
+    const framework = projectConfig.framework || "detected";
+    console.log(chalk21.cyan(`  \u{1F4C1} Working in: ${chalk21.bold(folderName)}`));
+    console.log(chalk21.dim(`     ${framework} project
+`));
+    await showProjectMenu(config);
+  } else {
+    console.log(chalk21.cyan(`  \u{1F4C1} Current folder: ${chalk21.bold(cwd)}`));
+    console.log(chalk21.dim(`     Not a project folder
+`));
+    await showStartMenu(config);
+  }
+}
+async function showStartMenu(config) {
   const action = await p21.select({
-    message: "What do you want to do? (or type naturally)",
-    options: inProject ? [
-      { value: "code", label: "\u{1F4AC} Code with AI", hint: "build features, fix bugs" },
-      { value: "integrate", label: "\u{1F50C} One-Click Integrations", hint: "50+ services, browser auth" },
-      { value: "check", label: "\u{1F50D} Check code quality", hint: "run pattern enforcement" },
-      { value: "deploy", label: "\u{1F680} Deploy", hint: "deploy to Vercel" },
-      { value: "migrate", label: "\u{1F5C4}\uFE0F  Database migrations", hint: "push, generate, status" },
-      { value: "fix", label: "\u{1F527} Fix errors", hint: "auto-fix build/deploy errors" },
-      { value: "generate", label: "\u26A1 Generate", hint: "scaffold components, pages" },
-      { value: "status", label: "\u{1F4CA} Project status", hint: "view project health" },
-      { value: "separator1", label: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" },
-      { value: "connect", label: "\u{1F517} Connect service", hint: "add integrations" },
-      { value: "gateway", label: "\u{1F4F1} Channel gateway", hint: "WhatsApp, Telegram, etc." },
-      { value: "learn", label: "\u{1F9E0} Learning settings", hint: "view what I've learned" },
-      { value: "security", label: "\u{1F512} Security audit", hint: "check for vulnerabilities" },
-      { value: "design", label: "\u{1F3A8} Design system", hint: "set profile, colors" },
-      { value: "separator2", label: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" },
-      { value: "new", label: "\u{1F195} Create new project" },
-      { value: "website", label: "\u{1F310} Website Builder", hint: "Describe \u2192 AI builds it" },
-      { value: "build", label: "\u{1F3D7}\uFE0F  Parallel Build", hint: "3 agents from PRD (swarm)" },
-      { value: "prd", label: "\u{1F4C4} Build from PRD", hint: "sequential build" },
-      { value: "prd-maker", label: "\u270F\uFE0F  Create PRD", hint: "interview \u2192 generate PRD" },
-      { value: "advisors", label: "\u{1F31F} Dream Team Advisors", hint: "consult with experts" },
-      { value: "settings", label: "\u2699\uFE0F  Settings" },
+    message: "What would you like to do?",
+    options: [
+      { value: "website", label: "\u{1F310} Build a website", hint: "Describe it \u2192 AI builds it" },
+      { value: "new", label: "\u{1F195} Create new project", hint: "From scratch with options" },
+      { value: "prd-maker", label: "\u270F\uFE0F  Create a PRD", hint: "Plan before building" },
+      { value: "build", label: "\u{1F3D7}\uFE0F  Build from PRD", hint: "Have a PRD? Build it now" },
+      { value: "advisors", label: "\u{1F31F} Consult advisors", hint: "AI experts help you plan" },
+      { value: "divider1", label: chalk21.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500") },
+      { value: "integrate", label: "\u{1F50C} Add integration", hint: "Stripe, Supabase, etc." },
+      { value: "settings", label: "\u2699\uFE0F  Settings", hint: "API keys & preferences" },
       { value: "help", label: "\u2753 Help" }
-    ] : [
-      { value: "new", label: "\u{1F195} Create new project" },
-      { value: "website", label: "\u{1F310} Website Builder", hint: "Describe \u2192 AI builds it" },
-      { value: "build", label: "\u{1F3D7}\uFE0F  Parallel Build", hint: "3 agents from PRD (swarm)" },
-      { value: "prd", label: "\u{1F4C4} Build from PRD", hint: "sequential build" },
-      { value: "prd-maker", label: "\u270F\uFE0F  Create PRD", hint: "interview \u2192 generate PRD" },
-      { value: "advisors", label: "\u{1F31F} Dream Team Advisors", hint: "consult with experts" },
-      { value: "open", label: "\u{1F4C2} Open existing project" },
-      { value: "status", label: "\u{1F4CA} View all projects" },
-      { value: "separator1", label: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" },
-      { value: "connect", label: "\u{1F517} Connect service" },
-      { value: "gateway", label: "\u{1F4F1} Channel gateway", hint: "WhatsApp, Telegram, etc." },
-      { value: "learn", label: "\u{1F9E0} Learning settings" },
+    ]
+  });
+  if (p21.isCancel(action)) {
+    p21.cancel("Goodbye!");
+    process.exit(0);
+  }
+  if (action === "divider1") {
+    await showStartMenu(config);
+    return;
+  }
+  await handleAction(action, config);
+}
+async function showProjectMenu(config) {
+  const action = await p21.select({
+    message: "What would you like to do?",
+    options: [
+      { value: "code", label: "\u{1F4AC} Code with AI", hint: "Build features, fix bugs" },
+      { value: "deploy", label: "\u{1F680} Deploy", hint: "Push to production" },
+      { value: "check", label: "\u{1F50D} Check code", hint: "Quality & patterns" },
+      { value: "fix", label: "\u{1F527} Fix errors", hint: "Auto-fix with AI" },
+      { value: "integrate", label: "\u{1F50C} Add integration", hint: "Stripe, Supabase, etc." },
+      { value: "generate", label: "\u26A1 Generate", hint: "Components, pages" },
+      { value: "divider1", label: chalk21.dim("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500") },
+      { value: "new", label: "\u{1F195} Start new project", hint: "Create something else" },
       { value: "settings", label: "\u2699\uFE0F  Settings" },
       { value: "help", label: "\u2753 Help" }
     ]
@@ -7675,51 +7625,37 @@ async function showMainMenu() {
     p21.cancel("Goodbye!");
     process.exit(0);
   }
+  if (action === "divider1") {
+    await showProjectMenu(config);
+    return;
+  }
+  await handleAction(action, config);
+}
+async function handleAction(action, config) {
   switch (action) {
+    case "website":
+      await websiteCommand();
+      break;
+    case "new":
+      await initCommand();
+      break;
     case "code":
       await codeCommand();
       break;
-    case "integrate":
-      await integrateCommand();
-      break;
     case "check":
       await checkCommand();
       break;
     case "deploy":
       await deployCommand();
       break;
-    case "migrate":
-      await migrateCommand();
-      break;
     case "fix":
       await fixCommand();
       break;
     case "generate":
       await generateCommand();
       break;
-    case "status":
-      await statusCommand();
-      break;
-    case "connect":
-      await connectCommand();
-      break;
-    case "gateway":
-      await gatewayCommand();
-      break;
-    case "learn":
-      await learnCommand();
-      break;
-    case "security":
-      await securityCommand();
-      break;
-    case "design":
-      await designCommand();
-      break;
-    case "new":
-      await initCommand();
-      break;
-    case "website":
-      await websiteCommand();
+    case "integrate":
+      await integrateCommand();
       break;
     case "build":
       await buildCommand();
@@ -7733,6 +7669,12 @@ async function showMainMenu() {
     case "advisors":
       await advisorsCommand();
       break;
+    case "gateway":
+      await gatewayCommand();
+      break;
+    case "migrate":
+      await migrateCommand();
+      break;
     case "settings":
       await setupCommand();
       break;
@@ -7740,121 +7682,107 @@ async function showMainMenu() {
       showHelp2();
       break;
     default:
-      await showMainMenu();
+      console.log(chalk21.yellow("Coming soon!"));
   }
 }
+function showPostSetupInstructions() {
+  console.log(boxen(
+    chalk21.green.bold("\u2713 Setup complete!\n\n") + chalk21.white("What's next?\n\n") + chalk21.cyan("1. ") + "Navigate to where you want to build:\n" + chalk21.dim("   cd C:\\dev\\my-project\n\n") + chalk21.cyan("2. ") + "Run CodeBakers:\n" + chalk21.dim("   codebakers\n\n") + chalk21.white("Or build a website right now:\n") + chalk21.dim("   codebakers website"),
+    { padding: 1, borderColor: "green", borderStyle: "round" }
+  ));
+}
+function showPostBuildInstructions(projectName, projectPath) {
+  const displayPath = projectPath || projectName;
+  console.log(boxen(
+    chalk21.green.bold(`\u2713 ${projectName} created!
+
+`) + chalk21.white("Next steps:\n\n") + chalk21.cyan("1. ") + "Go to your project:\n" + chalk21.dim(`   cd ${displayPath}
+
+`) + chalk21.cyan("2. ") + "Install dependencies:\n" + chalk21.dim("   npm install\n\n") + chalk21.cyan("3. ") + "Start the dev server:\n" + chalk21.dim("   npm run dev\n\n") + chalk21.cyan("4. ") + "Open in browser:\n" + chalk21.dim("   http://localhost:3000\n\n") + chalk21.white("Ready to deploy?\n") + chalk21.dim("   codebakers deploy"),
+    { padding: 1, borderColor: "green", borderStyle: "round" }
+  ));
+}
 function showHelp2() {
   console.log(boxen(`
 ${chalk21.bold("CodeBakers CLI v" + VERSION2)} \u2014 AI dev team that follows the rules
 
 ${chalk21.bold.cyan("Getting Started:")}
-  ${chalk21.cyan("codebakers setup")}        Connect your accounts (GitHub, Vercel, etc.)
-  ${chalk21.cyan("codebakers init")}         Create a new project from scratch
-  ${chalk21.cyan("codebakers website")}      Build a website by describing it
-  ${chalk21.cyan("codebakers build")}        Build from PRD with parallel AI agents
+  ${chalk21.cyan("codebakers")}              Interactive menu
+  ${chalk21.cyan("codebakers setup")}        Connect API keys
+  ${chalk21.cyan("codebakers website")}      Build website by describing it
+  ${chalk21.cyan("codebakers init")}         Create new project
 
-${chalk21.bold.cyan("Daily Development:")}
+${chalk21.bold.cyan("In a Project:")}
   ${chalk21.cyan("codebakers code")}         Chat with AI to build features
-  ${chalk21.cyan("codebakers check")}        Check code quality & patterns
-  ${chalk21.cyan("codebakers fix")}          Auto-fix errors with AI
   ${chalk21.cyan("codebakers deploy")}       Deploy to Vercel
-
-${chalk21.bold.cyan("Integrations:")}
-  ${chalk21.cyan("codebakers integrate")}    50+ one-click integrations (Stripe, Supabase, etc.)
-  ${chalk21.cyan("codebakers gateway")}      Connect WhatsApp, Telegram, Discord, etc.
+  ${chalk21.cyan("codebakers check")}        Check code quality
+  ${chalk21.cyan("codebakers fix")}          Auto-fix errors
 
 ${chalk21.bold.cyan("Planning:")}
-  ${chalk21.cyan("codebakers prd-maker")}    Create PRD through interview (voice supported)
-  ${chalk21.cyan("codebakers advisors")}     Consult AI experts (CEO, CTO, Designer, etc.)
+  ${chalk21.cyan("codebakers prd-maker")}    Create PRD through interview
+  ${chalk21.cyan("codebakers build")}        Build from PRD (parallel agents)
+  ${chalk21.cyan("codebakers advisors")}     Consult AI experts
 
-${chalk21.bold.cyan("Tips:")}
-  \u2022 Type naturally: ${chalk21.dim('codebakers "add a contact form"')}
-  \u2022 Voice input: Type ${chalk21.yellow('"v"')} at any prompt
-  \u2022 Clipboard: Type ${chalk21.yellow('"clip"')} to paste from clipboard
+${chalk21.bold.cyan("Integrations:")}
+  ${chalk21.cyan("codebakers integrate")}    50+ one-click integrations
+  ${chalk21.cyan("codebakers gateway")}      WhatsApp, Telegram, Discord
 
 ${chalk21.bold("Docs:")} ${chalk21.dim("https://codebakers.dev/docs")}
 `, { padding: 1, borderColor: "cyan", borderStyle: "round" }));
 }
 var program = new Command();
 program.name("codebakers").description("AI dev team that follows the rules").version(VERSION2).action(showMainMenu);
-program.command("setup").description("Configure CodeBakers (first-time setup)").action(setupCommand);
-program.command("init").description("Create a new project").option("-n, --name <name>", "Project name").option("-t, --template <template>", "Template (nextjs, voice-agent, saas)").option("--no-git", "Skip GitHub repo creation").option("--no-vercel", "Skip Vercel deployment").option("--no-supabase", "Skip Supabase setup").action(initCommand);
-program.command("code [prompt]").description("Start AI coding session").option("-w, --watch", "Watch mode - continuous assistance").action(codeCommand);
-program.command("check").description("Run CodeBakers pattern enforcement").option("-f, --fix", "Auto-fix violations").option("--watch", "Watch mode").action(checkCommand);
-program.command("deploy").description("Deploy to production").option("-p, --preview", "Deploy to preview only").option("--no-check", "Skip pattern check").action(deployCommand);
-program.command("fix").description("Auto-fix build and deployment errors").option("--auto", "Fix without asking").action(fixCommand);
-program.command("generate <type>").alias("g").description("Generate components, pages, API routes").option("-n, --name <name>", "Name of the generated item").action(generateCommand);
-program.command("connect [service]").description("Connect external services (Stripe, VAPI, etc.)").action(connectCommand);
-program.command("gateway").description("Manage messaging channel gateway").option("--start", "Start the gateway").option("--stop", "Stop the gateway").option("--status", "Show gateway status").action(gatewayCommand);
-program.command("status").description("View project status and health").option("-a, --all", "Show all projects").action(statusCommand);
-program.command("security").description("Run security audit").option("--fix", "Auto-fix security issues").action(securityCommand);
-program.command("learn").description("View and manage learning settings").option("--forget <item>", "Forget a learned preference").option("--reset", "Reset all learning").option("--export", "Export learned patterns").action(learnCommand);
-program.command("design [action]").description("Manage design system (profile, palette, check)").action(designCommand);
-program.command("prd [file]").description("Build entire project from a PRD document").action(prdCommand);
-program.command("advisors").alias("dream-team").description("Consult with the CodeBakers Dream Team advisory board").action(advisorsCommand);
-program.command("migrate").alias("db").description("Database migrations (push, generate, status)").option("--push", "Push migrations to database").option("--generate", "Generate new migration").option("--status", "Check migration status").action(migrateCommand);
-program.command("prd-maker").alias("create-prd").description("Create a PRD through guided interview (supports voice input)").action(prdMakerCommand);
-program.command("build [prd-file]").alias("swarm").description("Parallel build with 3 AI agents (self-healing)").option("--sequential", "Disable parallel execution").action(buildCommand);
-program.command("integrate [integration]").alias("add").description("One-click integrations (50+ services with browser auth)").action(integrateCommand);
-program.command("website").alias("site").description("Build a website by describing it in plain English").action(websiteCommand);
+program.command("setup").description("Configure CodeBakers (API keys)").action(setupCommand);
+program.command("init").description("Create a new project").option("-n, --name <n>", "Project name").option("-t, --template <t>", "Template").action(initCommand);
+program.command("code [prompt]").description("Start AI coding session").option("-w, --watch", "Watch mode").action(codeCommand);
+program.command("check").description("Run code quality checks").action(checkCommand);
+program.command("deploy").description("Deploy to production").option("-p, --preview", "Preview deployment").option("--no-check", "Skip quality check").action(deployCommand);
+program.command("fix").description("Auto-fix errors with AI").action(fixCommand);
+program.command("generate").alias("gen").description("Generate components, pages, etc.").action(generateCommand);
+program.command("status").description("View project status").action(statusCommand);
+program.command("connect").description("Connect external services").action(connectCommand);
+program.command("gateway").description("Manage messaging channels (WhatsApp, Telegram, etc.)").option("--start", "Start gateway").option("--stop", "Stop gateway").option("--status", "Show status").action(gatewayCommand);
+program.command("security").description("Run security audit").action(securityCommand);
+program.command("learn").description("View/manage what CodeBakers has learned").action(learnCommand);
+program.command("design").description("Manage design system").action(designCommand);
+program.command("prd [file]").description("Build project from PRD").action(prdCommand);
+program.command("advisors").alias("dream-team").description("Consult AI expert advisors").action(advisorsCommand);
+program.command("migrate").alias("db").description("Database migrations").option("--push", "Push migrations").option("--generate", "Generate migration").option("--status", "Check status").action(migrateCommand);
+program.command("prd-maker").alias("create-prd").description("Create PRD through guided interview").action(prdMakerCommand);
+program.command("build [prd-file]").alias("swarm").description("Parallel build with AI agents").option("--sequential", "Disable parallel").action(buildCommand);
+program.command("integrate [integration]").alias("add").description("One-click integrations (50+ services)").action(integrateCommand);
+program.command("website").alias("site").description("Build website by describing it").action(websiteCommand);
+program.command("help").description("Show help").action(showHelp2);
 async function handleNaturalLanguage(input) {
   const config = new Config();
-  console.log(chalk21.dim("\n  Parsing your request...\n"));
+  console.log(chalk21.dim("\n  Understanding your request...\n"));
   const parsed = await parseNaturalLanguage(input, config);
   if (!parsed) {
     await codeCommand(input);
     return;
   }
-  const clarified = await clarifyCommand(parsed);
-  if (clarified.command === "cancel") {
-    return;
-  }
-  switch (clarified.command) {
-    case "init":
-      await initCommand();
+  switch (parsed.command) {
+    case "deploy":
+      await deployCommand();
       break;
     case "build":
-      await buildCommand(clarified.args[0]);
+      await buildCommand();
       break;
     case "code":
-      await codeCommand(clarified.args.join(" "));
+      await codeCommand(input);
+      break;
+    case "init":
+      await initCommand();
+      break;
+    case "website":
+      await websiteCommand();
       break;
     case "check":
       await checkCommand();
       break;
-    case "deploy":
-      const target = await clarifyDeployTarget();
-      if (target) {
-        await deployCommand({ preview: target === "preview" });
-      }
-      break;
     case "fix":
       await fixCommand();
       break;
-    case "migrate":
-      await migrateCommand();
-      break;
-    case "design":
-      await designCommand();
-      break;
-    case "advisors":
-      await advisorsCommand();
-      break;
-    case "prd-maker":
-      await prdMakerCommand();
-      break;
-    case "security":
-      await securityCommand();
-      break;
-    case "status":
-      await statusCommand();
-      break;
-    case "setup":
-      await setupCommand();
-      break;
-    case "help":
-      showHelp2();
-      break;
     default:
       await codeCommand(input);
   }
@@ -7873,6 +7801,7 @@ if (args.length === 0) {
     "deploy",
     "fix",
     "generate",
+    "gen",
     "connect",
     "status",
     "gateway",
@@ -7881,8 +7810,11 @@ if (args.length === 0) {
     "design",
     "prd",
     "advisors",
+    "dream-team",
     "migrate",
+    "db",
     "prd-maker",
+    "create-prd",
     "build",
     "swarm",
     "integrate",
@@ -7903,3 +7835,6 @@ if (args.length === 0) {
 } else {
   program.parse();
 }
+export {
+  showPostBuildInstructions
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebakers",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "AI dev team that follows the rules. Build apps from anywhere with pattern enforcement.",
   "type": "module",
   "main": "dist/index.js",

package/src/commands/setup.ts

@@ -276,16 +276,12 @@ export async function setupCommand(): Promise<void> {
     }
   }
 
-  // Done
+  // Done - just show count, index.ts will show detailed next steps
   const connectedCount = [...CORE_SERVICES, ...OPTIONAL_SERVICES].filter(
     key => config.getCredentials(key)
   ).length;
 
-  p.outro(chalk.green(`
-  ✓ Setup complete! ${connectedCount} services connected.
-  
-  Run ${chalk.bold('codebakers')} to get started.
-`));
+  console.log(chalk.green(`\n  ✓ ${connectedCount} services connected!\n`));
 }
 
 // ============================================================================

package/src/index.ts

@@ -5,6 +5,7 @@ import * as p from '@clack/prompts';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import gradient from 'gradient-string';
+import * as path from 'path';
 import { Config } from './utils/config.js';
 import { checkForUpdates } from './utils/updates.js';
 import { setupCommand } from './commands/setup.js';
@@ -27,9 +28,9 @@ import { prdMakerCommand } from './commands/prd-maker.js';
 import { buildCommand } from './commands/build.js';
 import { integrateCommand, INTEGRATIONS } from './commands/integrate.js';
 import { websiteCommand } from './commands/website.js';
-import { parseNaturalLanguage, clarifyCommand, clarifyDeployTarget } from './utils/nlp.js';
+import { parseNaturalLanguage } from './utils/nlp.js';
 
-const VERSION = '2.2.1';
+const VERSION = '2.3.0';
 
 // ASCII art logo
 const logo = `
@@ -41,71 +42,112 @@ const logo = `
    ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝╚══════╝
 `;
 
-// Main interactive menu
+// ============================================================================
+// MAIN MENU
+// ============================================================================
+
 async function showMainMenu(): Promise<void> {
   const config = new Config();
-  const isSetup = config.isConfigured();
 
   // Show logo
   console.log(gradient.pastel.multiline(logo));
   console.log(chalk.dim(`  v${VERSION} — AI dev team that follows the rules\n`));
 
-  // If not setup, run setup wizard
-  if (!isSetup) {
+  // Check setup status
+  const hasAnthropic = !!config.getCredentials('anthropic')?.apiKey;
+
+  // STEP 1: First time? Run setup
+  if (!hasAnthropic) {
     console.log(boxen(
-      chalk.yellow('Welcome to CodeBakers! Let\'s get you set up.'),
+      chalk.yellow('Welcome to CodeBakers!\n\n') +
+      chalk.white('Let\'s connect your Anthropic API key so the AI can work.\n') +
+      chalk.dim('(Takes about 1 minute)'),
       { padding: 1, borderColor: 'yellow', borderStyle: 'round' }
     ));
+    
     await setupCommand();
+    
+    // After setup, show next steps
+    showPostSetupInstructions();
     return;
   }
 
-  // Check if in a project directory
+  // STEP 2: Detect context
   const inProject = config.isInProject();
+  const projectConfig = config.getProjectConfig();
+  const cwd = process.cwd();
+  const folderName = path.basename(cwd);
+
+  // Show context
+  if (inProject && projectConfig) {
+    const framework = projectConfig.framework || 'detected';
+    console.log(chalk.cyan(`  📁 Working in: ${chalk.bold(folderName)}`));
+    console.log(chalk.dim(`     ${framework} project\n`));
+    
+    // SHOW PROJECT MENU
+    await showProjectMenu(config);
+  } else {
+    console.log(chalk.cyan(`  📁 Current folder: ${chalk.bold(cwd)}`));
+    console.log(chalk.dim(`     Not a project folder\n`));
+    
+    // SHOW START MENU
+    await showStartMenu(config);
+  }
+}
+
+// ============================================================================
+// START MENU (Not in a project)
+// ============================================================================
 
-  // Main menu
+async function showStartMenu(config: Config): Promise<void> {
   const action = await p.select({
-    message: 'What do you want to do? (or type naturally)',
-    options: inProject ? [
-      { value: 'code', label: '💬 Code with AI', hint: 'build features, fix bugs' },
-      { value: 'integrate', label: '🔌 One-Click Integrations', hint: '50+ services, browser auth' },
-      { value: 'check', label: '🔍 Check code quality', hint: 'run pattern enforcement' },
-      { value: 'deploy', label: '🚀 Deploy', hint: 'deploy to Vercel' },
-      { value: 'migrate', label: '🗄️  Database migrations', hint: 'push, generate, status' },
-      { value: 'fix', label: '🔧 Fix errors', hint: 'auto-fix build/deploy errors' },
-      { value: 'generate', label: '⚡ Generate', hint: 'scaffold components, pages' },
-      { value: 'status', label: '📊 Project status', hint: 'view project health' },
-      { value: 'separator1', label: '─────────────────────────' },
-      { value: 'connect', label: '🔗 Connect service', hint: 'add integrations' },
-      { value: 'gateway', label: '📱 Channel gateway', hint: 'WhatsApp, Telegram, etc.' },
-      { value: 'learn', label: '🧠 Learning settings', hint: 'view what I\'ve learned' },
-      { value: 'security', label: '🔒 Security audit', hint: 'check for vulnerabilities' },
-      { value: 'design', label: '🎨 Design system', hint: 'set profile, colors' },
-      { value: 'separator2', label: '─────────────────────────' },
-      { value: 'new', label: '🆕 Create new project' },
-      { value: 'website', label: '🌐 Website Builder', hint: 'Describe → AI builds it' },
-      { value: 'build', label: '🏗️  Parallel Build', hint: '3 agents from PRD (swarm)' },
-      { value: 'prd', label: '📄 Build from PRD', hint: 'sequential build' },
-      { value: 'prd-maker', label: '✏️  Create PRD', hint: 'interview → generate PRD' },
-      { value: 'advisors', label: '🌟 Dream Team Advisors', hint: 'consult with experts' },
-      { value: 'settings', label: '⚙️  Settings' },
+    message: 'What would you like to do?',
+    options: [
+      { value: 'website', label: '🌐 Build a website', hint: 'Describe it → AI builds it' },
+      { value: 'new', label: '🆕 Create new project', hint: 'From scratch with options' },
+      { value: 'prd-maker', label: '✏️  Create a PRD', hint: 'Plan before building' },
+      { value: 'build', label: '🏗️  Build from PRD', hint: 'Have a PRD? Build it now' },
+      { value: 'advisors', label: '🌟 Consult advisors', hint: 'AI experts help you plan' },
+      { value: 'divider1', label: chalk.dim('─────────────────────────────') },
+      { value: 'integrate', label: '🔌 Add integration', hint: 'Stripe, Supabase, etc.' },
+      { value: 'settings', label: '⚙️  Settings', hint: 'API keys & preferences' },
       { value: 'help', label: '❓ Help' },
-    ] : [
-      { value: 'new', label: '🆕 Create new project' },
-      { value: 'website', label: '🌐 Website Builder', hint: 'Describe → AI builds it' },
-      { value: 'build', label: '🏗️  Parallel Build', hint: '3 agents from PRD (swarm)' },
-      { value: 'prd', label: '📄 Build from PRD', hint: 'sequential build' },
-      { value: 'prd-maker', label: '✏️  Create PRD', hint: 'interview → generate PRD' },
-      { value: 'advisors', label: '🌟 Dream Team Advisors', hint: 'consult with experts' },
-      { value: 'open', label: '📂 Open existing project' },
-      { value: 'status', label: '📊 View all projects' },
-      { value: 'separator1', label: '─────────────────────────' },
-      { value: 'connect', label: '🔗 Connect service' },
-      { value: 'gateway', label: '📱 Channel gateway', hint: 'WhatsApp, Telegram, etc.' },
-      { value: 'learn', label: '🧠 Learning settings' },
+    ],
+  });
+
+  if (p.isCancel(action)) {
+    p.cancel('Goodbye!');
+    process.exit(0);
+  }
+
+  // Handle divider - show menu again
+  if (action === 'divider1') {
+    await showStartMenu(config);
+    return;
+  }
+
+  await handleAction(action as string, config);
+}
+
+// ============================================================================
+// PROJECT MENU (In a project)
+// ============================================================================
+
+async function showProjectMenu(config: Config): Promise<void> {
+  const action = await p.select({
+    message: 'What would you like to do?',
+    options: [
+      { value: 'code', label: '💬 Code with AI', hint: 'Build features, fix bugs' },
+      { value: 'deploy', label: '🚀 Deploy', hint: 'Push to production' },
+      { value: 'check', label: '🔍 Check code', hint: 'Quality & patterns' },
+      { value: 'fix', label: '🔧 Fix errors', hint: 'Auto-fix with AI' },
+      { value: 'integrate', label: '🔌 Add integration', hint: 'Stripe, Supabase, etc.' },
+      { value: 'generate', label: '⚡ Generate', hint: 'Components, pages' },
+      { value: 'divider1', label: chalk.dim('─────────────────────────────') },
+      { value: 'new', label: '🆕 Start new project', hint: 'Create something else' },
       { value: 'settings', label: '⚙️  Settings' },
       { value: 'help', label: '❓ Help' },
-    ]
+    ],
   });
 
   if (p.isCancel(action)) {
@@ -113,52 +155,44 @@ async function showMainMenu(): Promise<void> {
     process.exit(0);
   }
 
-  // Handle actions
+  // Handle divider - show menu again
+  if (action === 'divider1') {
+    await showProjectMenu(config);
+    return;
+  }
+
+  await handleAction(action as string, config);
+}
+
+// ============================================================================
+// ACTION HANDLER
+// ============================================================================
+
+async function handleAction(action: string, config: Config): Promise<void> {
   switch (action) {
+    case 'website':
+      await websiteCommand();
+      break;
+    case 'new':
+      await initCommand();
+      break;
     case 'code':
       await codeCommand();
       break;
-    case 'integrate':
-      await integrateCommand();
-      break;
     case 'check':
       await checkCommand();
       break;
     case 'deploy':
       await deployCommand();
       break;
-    case 'migrate':
-      await migrateCommand();
-      break;
     case 'fix':
       await fixCommand();
       break;
     case 'generate':
       await generateCommand();
       break;
-    case 'status':
-      await statusCommand();
-      break;
-    case 'connect':
-      await connectCommand();
-      break;
-    case 'gateway':
-      await gatewayCommand();
-      break;
-    case 'learn':
-      await learnCommand();
-      break;
-    case 'security':
-      await securityCommand();
-      break;
-    case 'design':
-      await designCommand();
-      break;
-    case 'new':
-      await initCommand();
-      break;
-    case 'website':
-      await websiteCommand();
+    case 'integrate':
+      await integrateCommand();
       break;
     case 'build':
       await buildCommand();
@@ -172,6 +206,12 @@ async function showMainMenu(): Promise<void> {
     case 'advisors':
       await advisorsCommand();
       break;
+    case 'gateway':
+      await gatewayCommand();
+      break;
+    case 'migrate':
+      await migrateCommand();
+      break;
     case 'settings':
       await setupCommand();
       break;
@@ -179,45 +219,89 @@ async function showMainMenu(): Promise<void> {
       showHelp();
       break;
     default:
-      // Separators, do nothing
-      await showMainMenu();
+      console.log(chalk.yellow('Coming soon!'));
   }
 }
 
+// ============================================================================
+// POST-SETUP INSTRUCTIONS
+// ============================================================================
+
+function showPostSetupInstructions(): void {
+  console.log(boxen(
+    chalk.green.bold('✓ Setup complete!\n\n') +
+    chalk.white('What\'s next?\n\n') +
+    chalk.cyan('1. ') + 'Navigate to where you want to build:\n' +
+    chalk.dim('   cd C:\\dev\\my-project\n\n') +
+    chalk.cyan('2. ') + 'Run CodeBakers:\n' +
+    chalk.dim('   codebakers\n\n') +
+    chalk.white('Or build a website right now:\n') +
+    chalk.dim('   codebakers website'),
+    { padding: 1, borderColor: 'green', borderStyle: 'round' }
+  ));
+}
+
+// ============================================================================
+// POST-BUILD INSTRUCTIONS (exported for other commands to use)
+// ============================================================================
+
+export function showPostBuildInstructions(projectName: string, projectPath?: string): void {
+  const displayPath = projectPath || projectName;
+  
+  console.log(boxen(
+    chalk.green.bold(`✓ ${projectName} created!\n\n`) +
+    chalk.white('Next steps:\n\n') +
+    chalk.cyan('1. ') + 'Go to your project:\n' +
+    chalk.dim(`   cd ${displayPath}\n\n`) +
+    chalk.cyan('2. ') + 'Install dependencies:\n' +
+    chalk.dim('   npm install\n\n') +
+    chalk.cyan('3. ') + 'Start the dev server:\n' +
+    chalk.dim('   npm run dev\n\n') +
+    chalk.cyan('4. ') + 'Open in browser:\n' +
+    chalk.dim('   http://localhost:3000\n\n') +
+    chalk.white('Ready to deploy?\n') +
+    chalk.dim('   codebakers deploy'),
+    { padding: 1, borderColor: 'green', borderStyle: 'round' }
+  ));
+}
+
+// ============================================================================
+// HELP
+// ============================================================================
+
 function showHelp(): void {
   console.log(boxen(`
 ${chalk.bold('CodeBakers CLI v' + VERSION)} — AI dev team that follows the rules
 
 ${chalk.bold.cyan('Getting Started:')}
-  ${chalk.cyan('codebakers setup')}        Connect your accounts (GitHub, Vercel, etc.)
-  ${chalk.cyan('codebakers init')}         Create a new project from scratch
-  ${chalk.cyan('codebakers website')}      Build a website by describing it
-  ${chalk.cyan('codebakers build')}        Build from PRD with parallel AI agents
+  ${chalk.cyan('codebakers')}              Interactive menu
+  ${chalk.cyan('codebakers setup')}        Connect API keys
+  ${chalk.cyan('codebakers website')}      Build website by describing it
+  ${chalk.cyan('codebakers init')}         Create new project
 
-${chalk.bold.cyan('Daily Development:')}
+${chalk.bold.cyan('In a Project:')}
   ${chalk.cyan('codebakers code')}         Chat with AI to build features
-  ${chalk.cyan('codebakers check')}        Check code quality & patterns
-  ${chalk.cyan('codebakers fix')}          Auto-fix errors with AI
   ${chalk.cyan('codebakers deploy')}       Deploy to Vercel
-
-${chalk.bold.cyan('Integrations:')}
-  ${chalk.cyan('codebakers integrate')}    50+ one-click integrations (Stripe, Supabase, etc.)
-  ${chalk.cyan('codebakers gateway')}      Connect WhatsApp, Telegram, Discord, etc.
+  ${chalk.cyan('codebakers check')}        Check code quality
+  ${chalk.cyan('codebakers fix')}          Auto-fix errors
 
 ${chalk.bold.cyan('Planning:')}
-  ${chalk.cyan('codebakers prd-maker')}    Create PRD through interview (voice supported)
-  ${chalk.cyan('codebakers advisors')}     Consult AI experts (CEO, CTO, Designer, etc.)
+  ${chalk.cyan('codebakers prd-maker')}    Create PRD through interview
+  ${chalk.cyan('codebakers build')}        Build from PRD (parallel agents)
+  ${chalk.cyan('codebakers advisors')}     Consult AI experts
 
-${chalk.bold.cyan('Tips:')}
-  • Type naturally: ${chalk.dim('codebakers "add a contact form"')}
-  • Voice input: Type ${chalk.yellow('"v"')} at any prompt
-  • Clipboard: Type ${chalk.yellow('"clip"')} to paste from clipboard
+${chalk.bold.cyan('Integrations:')}
+  ${chalk.cyan('codebakers integrate')}    50+ one-click integrations
+  ${chalk.cyan('codebakers gateway')}      WhatsApp, Telegram, Discord
 
 ${chalk.bold('Docs:')} ${chalk.dim('https://codebakers.dev/docs')}
 `, { padding: 1, borderColor: 'cyan', borderStyle: 'round' }));
 }
 
-// CLI setup with Commander
+// ============================================================================
+// CLI COMMANDS (Commander)
+// ============================================================================
+
 const program = new Command();
 
 program
@@ -228,225 +312,191 @@ program
 
 program
   .command('setup')
-  .description('Configure CodeBakers (first-time setup)')
+  .description('Configure CodeBakers (API keys)')
   .action(setupCommand);
 
 program
   .command('init')
   .description('Create a new project')
-  .option('-n, --name <name>', 'Project name')
-  .option('-t, --template <template>', 'Template (nextjs, voice-agent, saas)')
-  .option('--no-git', 'Skip GitHub repo creation')
-  .option('--no-vercel', 'Skip Vercel deployment')
-  .option('--no-supabase', 'Skip Supabase setup')
+  .option('-n, --name <n>', 'Project name')
+  .option('-t, --template <t>', 'Template')
   .action(initCommand);
 
 program
   .command('code [prompt]')
   .description('Start AI coding session')
-  .option('-w, --watch', 'Watch mode - continuous assistance')
+  .option('-w, --watch', 'Watch mode')
   .action(codeCommand);
 
 program
   .command('check')
-  .description('Run CodeBakers pattern enforcement')
-  .option('-f, --fix', 'Auto-fix violations')
-  .option('--watch', 'Watch mode')
+  .description('Run code quality checks')
   .action(checkCommand);
 
 program
   .command('deploy')
   .description('Deploy to production')
-  .option('-p, --preview', 'Deploy to preview only')
-  .option('--no-check', 'Skip pattern check')
+  .option('-p, --preview', 'Preview deployment')
+  .option('--no-check', 'Skip quality check')
   .action(deployCommand);
 
 program
   .command('fix')
-  .description('Auto-fix build and deployment errors')
-  .option('--auto', 'Fix without asking')
+  .description('Auto-fix errors with AI')
   .action(fixCommand);
 
 program
-  .command('generate <type>')
-  .alias('g')
-  .description('Generate components, pages, API routes')
-  .option('-n, --name <name>', 'Name of the generated item')
+  .command('generate')
+  .alias('gen')
+  .description('Generate components, pages, etc.')
   .action(generateCommand);
 
 program
-  .command('connect [service]')
-  .description('Connect external services (Stripe, VAPI, etc.)')
+  .command('status')
+  .description('View project status')
+  .action(statusCommand);
+
+program
+  .command('connect')
+  .description('Connect external services')
   .action(connectCommand);
 
 program
   .command('gateway')
-  .description('Manage messaging channel gateway')
-  .option('--start', 'Start the gateway')
-  .option('--stop', 'Stop the gateway')
-  .option('--status', 'Show gateway status')
+  .description('Manage messaging channels (WhatsApp, Telegram, etc.)')
+  .option('--start', 'Start gateway')
+  .option('--stop', 'Stop gateway')
+  .option('--status', 'Show status')
   .action(gatewayCommand);
 
-program
-  .command('status')
-  .description('View project status and health')
-  .option('-a, --all', 'Show all projects')
-  .action(statusCommand);
-
 program
   .command('security')
   .description('Run security audit')
-  .option('--fix', 'Auto-fix security issues')
   .action(securityCommand);
 
 program
   .command('learn')
-  .description('View and manage learning settings')
-  .option('--forget <item>', 'Forget a learned preference')
-  .option('--reset', 'Reset all learning')
-  .option('--export', 'Export learned patterns')
+  .description('View/manage what CodeBakers has learned')
   .action(learnCommand);
 
 program
-  .command('design [action]')
-  .description('Manage design system (profile, palette, check)')
+  .command('design')
+  .description('Manage design system')
   .action(designCommand);
 
 program
   .command('prd [file]')
-  .description('Build entire project from a PRD document')
+  .description('Build project from PRD')
   .action(prdCommand);
 
 program
   .command('advisors')
   .alias('dream-team')
-  .description('Consult with the CodeBakers Dream Team advisory board')
+  .description('Consult AI expert advisors')
   .action(advisorsCommand);
 
 program
   .command('migrate')
   .alias('db')
-  .description('Database migrations (push, generate, status)')
-  .option('--push', 'Push migrations to database')
-  .option('--generate', 'Generate new migration')
-  .option('--status', 'Check migration status')
+  .description('Database migrations')
+  .option('--push', 'Push migrations')
+  .option('--generate', 'Generate migration')
+  .option('--status', 'Check status')
   .action(migrateCommand);
 
 program
   .command('prd-maker')
   .alias('create-prd')
-  .description('Create a PRD through guided interview (supports voice input)')
+  .description('Create PRD through guided interview')
   .action(prdMakerCommand);
 
 program
   .command('build [prd-file]')
   .alias('swarm')
-  .description('Parallel build with 3 AI agents (self-healing)')
-  .option('--sequential', 'Disable parallel execution')
+  .description('Parallel build with AI agents')
+  .option('--sequential', 'Disable parallel')
   .action(buildCommand);
 
 program
   .command('integrate [integration]')
   .alias('add')
-  .description('One-click integrations (50+ services with browser auth)')
+  .description('One-click integrations (50+ services)')
   .action(integrateCommand);
 
 program
   .command('website')
   .alias('site')
-  .description('Build a website by describing it in plain English')
+  .description('Build website by describing it')
   .action(websiteCommand);
 
-// Natural language processing for free-form input
+program
+  .command('help')
+  .description('Show help')
+  .action(showHelp);
+
+// ============================================================================
+// NATURAL LANGUAGE HANDLER
+// ============================================================================
+
 async function handleNaturalLanguage(input: string): Promise<void> {
   const config = new Config();
   
-  console.log(chalk.dim('\n  Parsing your request...\n'));
+  console.log(chalk.dim('\n  Understanding your request...\n'));
   
   const parsed = await parseNaturalLanguage(input, config);
   
   if (!parsed) {
-    // Fall back to code command
+    // Fall back to code command with the input as prompt
     await codeCommand(input);
     return;
   }
 
-  // Clarify if needed
-  const clarified = await clarifyCommand(parsed);
-  
-  if (clarified.command === 'cancel') {
-    return;
-  }
-
-  // Execute the command
-  switch (clarified.command) {
-    case 'init':
-      await initCommand();
+  // Handle recognized commands
+  switch (parsed.command) {
+    case 'deploy':
+      await deployCommand();
       break;
     case 'build':
-      await buildCommand(clarified.args[0]);
+      await buildCommand();
       break;
     case 'code':
-      await codeCommand(clarified.args.join(' '));
+      await codeCommand(input);
+      break;
+    case 'init':
+      await initCommand();
+      break;
+    case 'website':
+      await websiteCommand();
       break;
     case 'check':
       await checkCommand();
       break;
-    case 'deploy':
-      const target = await clarifyDeployTarget();
-      if (target) {
-        await deployCommand({ preview: target === 'preview' });
-      }
-      break;
     case 'fix':
       await fixCommand();
       break;
-    case 'migrate':
-      await migrateCommand();
-      break;
-    case 'design':
-      await designCommand();
-      break;
-    case 'advisors':
-      await advisorsCommand();
-      break;
-    case 'prd-maker':
-      await prdMakerCommand();
-      break;
-    case 'security':
-      await securityCommand();
-      break;
-    case 'status':
-      await statusCommand();
-      break;
-    case 'setup':
-      await setupCommand();
-      break;
-    case 'help':
-      showHelp();
-      break;
     default:
-      // Unknown command - pass to code agent
+      // Fall back to code command
       await codeCommand(input);
   }
 }
 
-// Parse args or show menu
+// ============================================================================
+// ENTRY POINT
+// ============================================================================
+
 const args = process.argv.slice(2);
 
 if (args.length === 0) {
-  // Check for updates in background
+  // No args - show interactive menu
   checkForUpdates().catch(() => {});
-  
-  // Show interactive menu
   showMainMenu().catch(console.error);
 } else if (args.length > 0 && args[0] && !args[0].startsWith('-')) {
   // Check if it's a known command
   const knownCommands = [
-    'setup', 'init', 'code', 'check', 'deploy', 'fix', 'generate',
+    'setup', 'init', 'code', 'check', 'deploy', 'fix', 'generate', 'gen',
     'connect', 'status', 'gateway', 'security', 'learn', 'design',
-    'prd', 'advisors', 'migrate', 'prd-maker', 'build', 'swarm', 
-    'integrate', 'add', 'website', 'site', 'help'
+    'prd', 'advisors', 'dream-team', 'migrate', 'db', 'prd-maker', 'create-prd',
+    'build', 'swarm', 'integrate', 'add', 'website', 'site', 'help'
   ];
   
   const firstArg = args[0] as string;