codebakers 2.3.0 → 2.3.5

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 import { Command } from "commander";
 import * as p21 from "@clack/prompts";
 import chalk21 from "chalk";
-import boxen from "boxen";
+import boxen2 from "boxen";
 import gradient from "gradient-string";
 import * as path16 from "path";
 
@@ -43,19 +43,26 @@ async function checkForUpdates() {
 // src/commands/setup.ts
 import * as p from "@clack/prompts";
 import chalk2 from "chalk";
+import boxen from "boxen";
 import open from "open";
 var SERVICES = {
   anthropic: {
     key: "anthropic",
     name: "Anthropic (Claude)",
     description: "Powers the AI coding agent",
-    whyNeeded: "Without this, CodeBakers cannot generate any code. This is the brain of the system.",
+    whyNeeded: "This is REQUIRED. Without it, CodeBakers cannot generate any code.",
     url: "https://console.anthropic.com/settings/keys",
-    urlDescription: "Create an API key",
+    steps: [
+      "Sign up or log in to Anthropic Console",
+      'Click "Create Key"',
+      'Give it a name like "CodeBakers"',
+      "Copy the key (starts with sk-ant-)"
+    ],
     fields: [{
       key: "apiKey",
-      label: "Anthropic API Key",
+      label: "Paste your Anthropic API Key",
       placeholder: "sk-ant-...",
+      hint: "Starts with sk-ant-",
       validate: (v) => {
         if (!v) return "API key is required";
         if (!v.startsWith("sk-ant-")) return "Should start with sk-ant-";
@@ -67,13 +74,19 @@ var SERVICES = {
     key: "github",
     name: "GitHub",
     description: "Create repos and push code",
-    whyNeeded: "Without this, CodeBakers cannot create repositories or save your code to GitHub.",
+    whyNeeded: "Needed to create repositories and save your code. Skip if you'll manage git manually.",
     url: "https://github.com/settings/tokens/new?scopes=repo,user&description=CodeBakers",
-    urlDescription: 'Create a token with "repo" and "user" scopes checked',
+    steps: [
+      "Log in to GitHub",
+      'The "repo" and "user" boxes should already be checked',
+      'Scroll down and click "Generate token"',
+      "Copy the token (starts with ghp_)"
+    ],
     fields: [{
       key: "token",
-      label: "GitHub Token",
-      placeholder: "ghp_... or github_pat_...",
+      label: "Paste your GitHub Token",
+      placeholder: "ghp_...",
+      hint: "Starts with ghp_ or github_pat_",
       validate: (v) => {
         if (!v) return "Token is required";
         if (!v.startsWith("ghp_") && !v.startsWith("github_pat_")) {
@@ -87,38 +100,55 @@ var SERVICES = {
     key: "vercel",
     name: "Vercel",
     description: "Deploy your apps to production",
-    whyNeeded: "Without this, CodeBakers cannot deploy your apps. You'll have to deploy manually.",
+    whyNeeded: "Needed to deploy apps automatically. Skip if you'll deploy manually.",
     url: "https://vercel.com/account/tokens",
-    urlDescription: 'Click "Create" to generate a new token',
+    steps: [
+      "Log in to Vercel",
+      'Click "Create" button',
+      'Name it "CodeBakers"',
+      'Click "Create Token"',
+      "Copy the token"
+    ],
     fields: [{
       key: "token",
-      label: "Vercel Token",
-      placeholder: "vercel_..."
+      label: "Paste your Vercel Token",
+      placeholder: "vercel_...",
+      hint: "The token you just created"
     }]
   },
   supabase: {
     key: "supabase",
     name: "Supabase",
     description: "Database and authentication",
-    whyNeeded: "Without this, CodeBakers cannot create databases for your apps. You'll need to set up databases manually.",
+    whyNeeded: "Needed for database features. Skip if you'll set up databases manually.",
     url: "https://supabase.com/dashboard/account/tokens",
-    urlDescription: "Generate a new access token",
+    steps: [
+      "Log in to Supabase",
+      'Click "Generate new token"',
+      'Name it "CodeBakers"',
+      "Copy the token"
+    ],
     fields: [{
       key: "accessToken",
-      label: "Supabase Access Token",
-      placeholder: "sbp_..."
+      label: "Paste your Supabase Token",
+      placeholder: "sbp_...",
+      hint: "Starts with sbp_"
     }]
   },
   openai: {
     key: "openai",
     name: "OpenAI",
     description: "GPT models, embeddings, DALL-E",
-    whyNeeded: "Optional. Only needed if you want to use OpenAI models instead of or alongside Claude.",
+    whyNeeded: "Optional. Only if you want to use OpenAI alongside Claude.",
     url: "https://platform.openai.com/api-keys",
-    urlDescription: "Create a new API key",
+    steps: [
+      "Log in to OpenAI",
+      'Click "Create new secret key"',
+      "Copy the key"
+    ],
     fields: [{
       key: "apiKey",
-      label: "OpenAI API Key",
+      label: "Paste your OpenAI API Key",
       placeholder: "sk-..."
     }]
   },
@@ -126,12 +156,15 @@ var SERVICES = {
     key: "stripe",
     name: "Stripe",
     description: "Payment processing",
-    whyNeeded: "Optional. Only needed if your app accepts payments.",
+    whyNeeded: "Optional. Only if your app accepts payments.",
     url: "https://dashboard.stripe.com/apikeys",
-    urlDescription: "Copy your Secret key (sk_live or sk_test)",
+    steps: [
+      "Log in to Stripe",
+      "Copy your Secret key (starts with sk_)"
+    ],
     fields: [{
       key: "secretKey",
-      label: "Stripe Secret Key",
+      label: "Paste your Stripe Secret Key",
       placeholder: "sk_live_... or sk_test_..."
     }]
   },
@@ -139,9 +172,13 @@ var SERVICES = {
     key: "twilio",
     name: "Twilio",
     description: "SMS, voice calls, WhatsApp",
-    whyNeeded: "Optional. Only needed if your app sends SMS or makes calls.",
+    whyNeeded: "Optional. Only if your app sends SMS or makes calls.",
     url: "https://console.twilio.com/",
-    urlDescription: "Find Account SID and Auth Token on the dashboard",
+    steps: [
+      "Log in to Twilio",
+      "Find Account SID on the dashboard",
+      "Find Auth Token on the dashboard"
+    ],
     fields: [
       {
         key: "accountSid",
@@ -159,12 +196,16 @@ var SERVICES = {
     key: "resend",
     name: "Resend",
     description: "Email sending",
-    whyNeeded: "Optional. Only needed if your app sends emails.",
+    whyNeeded: "Optional. Only if your app sends emails.",
     url: "https://resend.com/api-keys",
-    urlDescription: "Create an API key",
+    steps: [
+      "Log in to Resend",
+      'Click "Create API Key"',
+      "Copy the key"
+    ],
     fields: [{
       key: "apiKey",
-      label: "Resend API Key",
+      label: "Paste your Resend API Key",
       placeholder: "re_..."
     }]
   },
@@ -172,12 +213,16 @@ var SERVICES = {
     key: "vapi",
     name: "VAPI",
     description: "Voice AI agents",
-    whyNeeded: "Optional. Only needed if you're building voice agents.",
+    whyNeeded: "Optional. Only if you're building voice agents.",
     url: "https://dashboard.vapi.ai/",
-    urlDescription: "Copy your API key from the dashboard",
+    steps: [
+      "Log in to VAPI",
+      "Go to Settings > API Keys",
+      "Copy your API key"
+    ],
     fields: [{
       key: "apiKey",
-      label: "VAPI API Key",
+      label: "Paste your VAPI API Key",
       placeholder: "..."
     }]
   },
@@ -185,12 +230,16 @@ var SERVICES = {
     key: "elevenlabs",
     name: "ElevenLabs",
     description: "AI voice generation",
-    whyNeeded: "Optional. Only needed if you want AI-generated voices.",
+    whyNeeded: "Optional. Only if you want AI-generated voices.",
     url: "https://elevenlabs.io/app/settings/api-keys",
-    urlDescription: "Create an API key",
+    steps: [
+      "Log in to ElevenLabs",
+      'Click "Create API Key"',
+      "Copy the key"
+    ],
     fields: [{
       key: "apiKey",
-      label: "ElevenLabs API Key",
+      label: "Paste your ElevenLabs API Key",
       placeholder: "..."
     }]
   }
@@ -199,171 +248,210 @@ var CORE_SERVICES = ["anthropic", "github", "vercel", "supabase"];
 var OPTIONAL_SERVICES = ["openai", "stripe", "twilio", "resend", "vapi", "elevenlabs"];
 async function setupCommand() {
   const config = new Config();
-  p.intro(chalk2.bgCyan.black(" CodeBakers Setup "));
-  if (config.isConfigured()) {
-    const action = await p.select({
-      message: "CodeBakers is already configured. What do you want to do?",
-      options: [
-        { value: "view", label: "\u{1F440} View connected services" },
-        { value: "add", label: "\u2795 Add another service" },
-        { value: "update", label: "\u{1F504} Update a service" },
-        { value: "reset", label: "\u{1F5D1}\uFE0F  Reset all configuration" },
-        { value: "back", label: "\u2190 Back" }
-      ]
+  const hasAnthropic = !!config.getCredentials("anthropic")?.apiKey;
+  if (hasAnthropic) {
+    await showManagementMenu(config);
+    return;
+  }
+  console.log(boxen(
+    chalk2.bold.cyan("Welcome to CodeBakers Setup!\n\n") + chalk2.white("We need to connect a few services to get started.\n\n") + chalk2.dim("Your credentials are stored locally on your computer\n") + chalk2.dim("in ~/.codebakers/ and never sent to our servers.\n\n") + chalk2.yellow("Required: ") + chalk2.white("Anthropic API key (for AI)\n") + chalk2.dim("Optional: GitHub, Vercel, Supabase (for full features)"),
+    { padding: 1, borderColor: "cyan", borderStyle: "round" }
+  ));
+  console.log(chalk2.bold.cyan("\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"));
+  console.log(chalk2.bold.cyan("  STEP 1 of 4: Anthropic API Key (Required)"));
+  console.log(chalk2.bold.cyan("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  console.log(chalk2.white("  Anthropic (Claude)"));
+  console.log(chalk2.dim("  Powers the AI coding agent\n"));
+  const hasAccount = await p.select({
+    message: "Do you have an Anthropic account?",
+    options: [
+      { value: "yes", label: "\u2713 Yes, I have an API key ready" },
+      { value: "no", label: "\u2717 No, I need to sign up (free)" }
+    ]
+  });
+  if (p.isCancel(hasAccount)) {
+    return;
+  }
+  if (hasAccount === "no") {
+    console.log(chalk2.yellow("\n  No problem! Let's get you signed up.\n"));
+    console.log(chalk2.white("  Steps:"));
+    console.log(chalk2.cyan("  1. ") + 'Click "Sign Up" on the page that opens');
+    console.log(chalk2.cyan("  2. ") + "Create your account (email + password)");
+    console.log(chalk2.cyan("  3. ") + "Once logged in, go to Settings \u2192 API Keys");
+    console.log(chalk2.cyan("  4. ") + 'Click "Create Key"');
+    console.log(chalk2.cyan("  5. ") + "Copy the key and paste it here\n");
+    const openSignup = await p.confirm({
+      message: "Open Anthropic signup page?",
+      initialValue: true
     });
-    if (p.isCancel(action) || action === "back") {
-      return;
+    if (openSignup && !p.isCancel(openSignup)) {
+      await open("https://console.anthropic.com/");
+      console.log(chalk2.dim("\n  Take your time - come back when you have your API key.\n"));
     }
-    switch (action) {
-      case "view":
-        showConnectedServices(config);
-        return;
-      case "add":
-        await addService(config);
-        return;
-      case "update":
-        await updateService(config);
-        return;
-      case "reset":
-        await resetConfig(config);
-        return;
+  } else {
+    console.log(chalk2.bold.white("\n  Here's what to do:\n"));
+    console.log(chalk2.cyan("  1. ") + "Log in to Anthropic Console");
+    console.log(chalk2.cyan("  2. ") + "Go to Settings \u2192 API Keys");
+    console.log(chalk2.cyan("  3. ") + 'Click "Create Key"');
+    console.log(chalk2.cyan("  4. ") + "Copy the key (starts with sk-ant-)");
+    console.log("");
+    const openBrowser = await p.confirm({
+      message: "Open Anthropic Console?",
+      initialValue: true
+    });
+    if (openBrowser && !p.isCancel(openBrowser)) {
+      await open("https://console.anthropic.com/settings/keys");
     }
   }
-  console.log(chalk2.cyan(`
-  Welcome to CodeBakers! Let's connect your services.
-  
-  ${chalk2.dim("Your credentials are stored locally in ~/.codebakers/")}
-  ${chalk2.dim("and are never sent to our servers.")}
-  
-  ${chalk2.bold("Core Services (Recommended):")}
-  ${chalk2.dim("These power the main CodeBakers features.")}
-  
-`));
-  let skippedCore = [];
-  for (const serviceKey of CORE_SERVICES) {
-    const service = SERVICES[serviceKey];
-    const connected = await connectService(config, service);
-    if (!connected) {
-      skippedCore.push(service.name);
+  console.log("");
+  const apiKey = await p.text({
+    message: "Paste your Anthropic API Key:",
+    placeholder: "sk-ant-...",
+    validate: (v) => {
+      if (!v) return "API key is required";
+      if (!v.startsWith("sk-ant-")) return "Should start with sk-ant-";
+      return void 0;
     }
-  }
-  if (skippedCore.length > 0) {
-    console.log(chalk2.yellow(`
-  \u26A0\uFE0F  You skipped: ${skippedCore.join(", ")}
-  
-  Some features won't work without these services.
-  Run ${chalk2.bold("codebakers setup")} anytime to add them.
-`));
-  }
-  const addOptional = await p.confirm({
-    message: "Add optional services? (Stripe, Twilio, Resend, etc.)",
-    initialValue: false
   });
-  if (addOptional && !p.isCancel(addOptional)) {
-    const selected = await p.multiselect({
-      message: "Select services to add:",
-      options: OPTIONAL_SERVICES.map((key) => ({
-        value: key,
-        label: `${SERVICES[key].name} - ${SERVICES[key].description}`
-      })),
-      required: false
-    });
-    if (!p.isCancel(selected) && Array.isArray(selected)) {
-      for (const serviceKey of selected) {
-        await connectService(config, SERVICES[serviceKey]);
-      }
-    }
+  if (p.isCancel(apiKey) || !apiKey) {
+    console.log(chalk2.red("\n  \u274C Anthropic API key is required to use CodeBakers."));
+    console.log(chalk2.dim("  Run `codebakers setup` when you're ready to try again.\n"));
+    return;
   }
-  const connectedCount = [...CORE_SERVICES, ...OPTIONAL_SERVICES].filter(
-    (key) => config.getCredentials(key)
-  ).length;
-  console.log(chalk2.green(`
-  \u2713 ${connectedCount} services connected!
-`));
+  config.setCredentials("anthropic", { apiKey });
+  console.log(chalk2.green("\n  \u2713 Anthropic connected successfully!\n"));
+  console.log(chalk2.bold.cyan("\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"));
+  console.log(chalk2.bold.cyan("  STEP 2 of 4: GitHub Token (Recommended)"));
+  console.log(chalk2.bold.cyan("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  await connectServiceWithInstructions(config, SERVICES.github, false);
+  console.log(chalk2.bold.cyan("\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"));
+  console.log(chalk2.bold.cyan("  STEP 3 of 4: Vercel Token (Recommended)"));
+  console.log(chalk2.bold.cyan("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  await connectServiceWithInstructions(config, SERVICES.vercel, false);
+  console.log(chalk2.bold.cyan("\n\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501"));
+  console.log(chalk2.bold.cyan("  STEP 4 of 4: Supabase Token (Optional)"));
+  console.log(chalk2.bold.cyan("\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\n"));
+  await connectServiceWithInstructions(config, SERVICES.supabase, false);
+  const connectedServices = CORE_SERVICES.filter((key) => config.getCredentials(key)).map((key) => SERVICES[key].name);
+  console.log(boxen(
+    chalk2.bold.green("\u2713 Setup Complete!\n\n") + chalk2.white("Connected: ") + chalk2.cyan(connectedServices.join(", ")) + "\n\n" + chalk2.bold.white("What to do next:\n\n") + chalk2.cyan("1. ") + chalk2.white("Open a terminal and navigate to where you want to build:\n") + chalk2.dim("   cd C:\\dev\\my-project\n") + chalk2.dim("   (or any folder where you want to create your project)\n\n") + chalk2.cyan("2. ") + chalk2.white("Run CodeBakers:\n") + chalk2.dim("   codebakers\n\n") + chalk2.bold.white("Or try these commands directly:\n\n") + chalk2.dim("   codebakers website    ") + chalk2.white("Build a website by describing it\n") + chalk2.dim("   codebakers init       ") + chalk2.white("Create a new project from scratch\n") + chalk2.dim("   codebakers help       ") + chalk2.white("See all available commands"),
+    { padding: 1, borderColor: "green", borderStyle: "round" }
+  ));
 }
-async function connectService(config, service) {
-  console.log("");
-  console.log(chalk2.bold(`  ${service.name}`));
-  console.log(chalk2.dim(`  ${service.description}`));
-  console.log("");
+async function connectServiceWithInstructions(config, service, required) {
+  console.log(chalk2.white(`  ${service.name}`));
+  console.log(chalk2.dim(`  ${service.description}
+`));
+  if (!required) {
+    console.log(chalk2.yellow(`  ${service.whyNeeded}
+`));
+  }
   const action = await p.select({
     message: `Connect ${service.name}?`,
-    options: [
-      { value: "connect", label: "\u2713 Yes, connect now" },
-      { value: "skip", label: "\u2192 Skip for now" },
-      { value: "why", label: "? Why do I need this?" }
+    options: required ? [
+      { value: "connect", label: "\u2713 Yes, let's connect it" }
+    ] : [
+      { value: "connect", label: "\u2713 Yes, connect it" },
+      { value: "skip", label: "\u2192 Skip for now" }
     ]
   });
-  if (p.isCancel(action)) return false;
-  if (action === "why") {
-    console.log(chalk2.yellow(`
-  ${service.whyNeeded}
+  if (p.isCancel(action) || action === "skip") {
+    if (!required) {
+      console.log(chalk2.dim(`
+  Skipped ${service.name}. You can add it later with: codebakers setup
 `));
-    const proceed = await p.confirm({
-      message: `Connect ${service.name}?`,
-      initialValue: true
-    });
-    if (!proceed || p.isCancel(proceed)) {
-      console.log(chalk2.dim(`  Skipped ${service.name}`));
-      return false;
     }
-  } else if (action === "skip") {
-    console.log(chalk2.dim(`  Skipped ${service.name}`));
-    console.log(chalk2.dim(`  ${service.whyNeeded}`));
     return false;
   }
+  console.log(chalk2.bold.white("\n  Here's what to do:\n"));
+  service.steps.forEach((step, i) => {
+    console.log(chalk2.cyan(`  ${i + 1}. `) + chalk2.white(step));
+  });
+  console.log("");
   const openBrowser = await p.confirm({
-    message: "Open browser to get credentials?",
+    message: "Open the website in your browser?",
     initialValue: true
   });
   if (openBrowser && !p.isCancel(openBrowser)) {
     console.log(chalk2.dim(`
-  Opening: ${service.url}`));
-    console.log(chalk2.dim(`  ${service.urlDescription}
+  Opening: ${service.url}
 `));
     await open(service.url);
+    console.log(chalk2.dim("  Complete the steps above, then paste your key below.\n"));
   }
   const credentials = {};
   for (const field of service.fields) {
     const value = await p.text({
-      message: `${field.label}:`,
+      message: field.label + (field.hint ? chalk2.dim(` (${field.hint})`) : "") + ":",
       placeholder: field.placeholder,
       validate: field.validate
     });
     if (p.isCancel(value)) return false;
     if (!value) {
-      console.log(chalk2.dim(`  Skipped ${service.name} (no ${field.label} provided)`));
+      if (required) {
+        console.log(chalk2.red(`
+  ${field.label} is required.
+`));
+        return false;
+      }
+      console.log(chalk2.dim(`
+  Skipped ${service.name}.
+`));
       return false;
     }
     credentials[field.key] = value;
   }
   config.setCredentials(service.key, credentials);
-  console.log(chalk2.green(`  \u2713 ${service.name} connected!`));
+  console.log(chalk2.green(`
+  \u2713 ${service.name} connected successfully!
+`));
   return true;
 }
-function showConnectedServices(config) {
-  console.log(chalk2.bold("\n  Connected Services:\n"));
+async function showManagementMenu(config) {
+  console.log(chalk2.bold.cyan("\n  CodeBakers Settings\n"));
   const allServices = [...CORE_SERVICES, ...OPTIONAL_SERVICES];
-  let connectedCount = 0;
-  for (const key of allServices) {
-    const service = SERVICES[key];
-    const creds = config.getCredentials(key);
-    if (creds) {
-      console.log(chalk2.green(`  \u2713 ${service.name}`));
-      connectedCount++;
-    } else {
-      console.log(chalk2.dim(`  \u25CB ${service.name} (not connected)`));
-    }
+  const connected = allServices.filter((key) => config.getCredentials(key));
+  const notConnected = allServices.filter((key) => !config.getCredentials(key));
+  console.log(chalk2.green("  Connected:"));
+  connected.forEach((key) => {
+    console.log(chalk2.green(`    \u2713 ${SERVICES[key].name}`));
+  });
+  if (notConnected.length > 0) {
+    console.log(chalk2.dim("\n  Not connected:"));
+    notConnected.forEach((key) => {
+      console.log(chalk2.dim(`    \u25CB ${SERVICES[key].name}`));
+    });
+  }
+  console.log("");
+  const action = await p.select({
+    message: "What would you like to do?",
+    options: [
+      { value: "add", label: "\u2795 Add a service" },
+      { value: "update", label: "\u{1F504} Update a service" },
+      { value: "reset", label: "\u{1F5D1}\uFE0F  Reset all settings" },
+      { value: "back", label: "\u2190 Back" }
+    ]
+  });
+  if (p.isCancel(action) || action === "back") {
+    return;
+  }
+  switch (action) {
+    case "add":
+      await addService(config);
+      break;
+    case "update":
+      await updateService(config);
+      break;
+    case "reset":
+      await resetConfig(config);
+      break;
   }
-  console.log(chalk2.dim(`
-  ${connectedCount}/${allServices.length} services connected
-`));
 }
 async function addService(config) {
   const allServices = [...CORE_SERVICES, ...OPTIONAL_SERVICES];
   const unconnected = allServices.filter((key) => !config.getCredentials(key));
   if (unconnected.length === 0) {
-    p.log.info("All services are already connected!");
+    console.log(chalk2.green("\n  All services are already connected!\n"));
     return;
   }
   const selected = await p.select({
@@ -374,13 +462,13 @@ async function addService(config) {
     }))
   });
   if (p.isCancel(selected)) return;
-  await connectService(config, SERVICES[selected]);
+  await connectServiceWithInstructions(config, SERVICES[selected], false);
 }
 async function updateService(config) {
   const allServices = [...CORE_SERVICES, ...OPTIONAL_SERVICES];
   const connected = allServices.filter((key) => config.getCredentials(key));
   if (connected.length === 0) {
-    p.log.info("No services connected yet. Run setup first.");
+    console.log(chalk2.yellow("\n  No services connected yet.\n"));
     return;
   }
   const selected = await p.select({
@@ -391,19 +479,24 @@ async function updateService(config) {
     }))
   });
   if (p.isCancel(selected)) return;
-  await connectService(config, SERVICES[selected]);
+  await connectServiceWithInstructions(config, SERVICES[selected], false);
 }
 async function resetConfig(config) {
+  console.log(chalk2.yellow("\n  \u26A0\uFE0F  This will remove ALL your saved API keys.\n"));
   const confirm13 = await p.confirm({
-    message: "Are you sure? This will remove ALL credentials.",
+    message: "Are you sure?",
     initialValue: false
   });
-  if (!confirm13 || p.isCancel(confirm13)) return;
+  if (!confirm13 || p.isCancel(confirm13)) {
+    console.log(chalk2.dim("\n  Cancelled.\n"));
+    return;
+  }
   const allServices = [...CORE_SERVICES, ...OPTIONAL_SERVICES];
   for (const key of allServices) {
     config.setCredentials(key, null);
   }
-  p.log.success("Configuration reset. Run `codebakers setup` to reconfigure.");
+  console.log(chalk2.green("\n  \u2713 All settings reset.\n"));
+  console.log(chalk2.dim("  Run `codebakers setup` to configure again.\n"));
 }
 
 // src/commands/init.ts
@@ -7539,7 +7632,7 @@ If unclear between multiple commands, use the most likely one with lower confide
 }
 
 // src/index.ts
-var VERSION2 = "2.3.0";
+var VERSION2 = "2.3.5";
 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
@@ -7555,7 +7648,7 @@ async function showMainMenu() {
 `));
   const hasAnthropic = !!config.getCredentials("anthropic")?.apiKey;
   if (!hasAnthropic) {
-    console.log(boxen(
+    console.log(boxen2(
       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" }
     ));
@@ -7581,55 +7674,85 @@ async function showMainMenu() {
   }
 }
 async function showStartMenu(config) {
-  const action = await p21.select({
-    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" }
-    ]
-  });
-  if (p21.isCancel(action)) {
-    p21.cancel("Goodbye!");
-    process.exit(0);
-  }
-  if (action === "divider1") {
-    await showStartMenu(config);
-    return;
+  console.log(chalk21.cyan("\n  \u2139\uFE0F  This folder doesn't have a project yet."));
+  console.log(chalk21.dim("  Use the arrow keys to select an option, then press Enter.\n"));
+  let keepRunning = true;
+  while (keepRunning) {
+    const action = await p21.select({
+      message: "What would you like to do?",
+      options: [
+        { value: "website", label: "\u{1F310} Build a website", hint: "Describe it, AI builds it" },
+        { value: "new", label: "\u{1F195} Create new project", hint: "Start with Next.js, React, etc." },
+        { value: "prd-maker", label: "\u270F\uFE0F  Plan my project", hint: "Create a detailed plan first" },
+        { value: "build", label: "\u{1F3D7}\uFE0F  Build from plan", hint: "I already have a PRD file" },
+        { value: "advisors", label: "\u{1F31F} Get expert advice", hint: "AI consultants help you decide" },
+        { value: "integrate", label: "\u{1F50C} Add a service", hint: "Stripe, Supabase, Auth, etc." },
+        { value: "settings", label: "\u2699\uFE0F  Settings", hint: "API keys & preferences" },
+        { value: "help", label: "\u2753 Help", hint: "Learn how CodeBakers works" },
+        { value: "exit", label: "\u{1F6AA} Return to terminal", hint: "Go back to command line" }
+      ]
+    });
+    if (p21.isCancel(action) || action === "exit") {
+      console.log("");
+      console.log(chalk21.cyan("  \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\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      console.log(chalk21.white("  You're back in the terminal."));
+      console.log("");
+      console.log(chalk21.dim("  To start CodeBakers again, type:"));
+      console.log(chalk21.green("    codebakers"));
+      console.log("");
+      console.log(chalk21.dim("  Quick commands you can run directly:"));
+      console.log(chalk21.dim("    codebakers website") + chalk21.gray(" - Build a website"));
+      console.log(chalk21.dim("    codebakers code") + chalk21.gray("    - Code with AI"));
+      console.log(chalk21.dim("    codebakers help") + chalk21.gray("    - See all commands"));
+      console.log(chalk21.cyan("  \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\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      console.log("");
+      keepRunning = false;
+      break;
+    }
+    await handleAction(action, config);
+    console.log("");
   }
-  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" }
-    ]
-  });
-  if (p21.isCancel(action)) {
-    p21.cancel("Goodbye!");
-    process.exit(0);
-  }
-  if (action === "divider1") {
-    await showProjectMenu(config);
-    return;
+  console.log(chalk21.cyan("\n  \u2139\uFE0F  I found an existing project in this folder."));
+  console.log(chalk21.dim("  Use the arrow keys to select an option, then press Enter.\n"));
+  let keepRunning = true;
+  while (keepRunning) {
+    const action = await p21.select({
+      message: "What would you like to do with this project?",
+      options: [
+        { value: "code", label: "\u{1F4AC} Code with AI", hint: "Tell AI what to build or fix" },
+        { value: "deploy", label: "\u{1F680} Deploy to production", hint: "Make your site live" },
+        { value: "check", label: "\u{1F50D} Check my code", hint: "Find issues & improvements" },
+        { value: "fix", label: "\u{1F527} Fix errors for me", hint: "AI repairs broken code" },
+        { value: "integrate", label: "\u{1F50C} Add a service", hint: "Stripe, Supabase, Auth, etc." },
+        { value: "generate", label: "\u26A1 Create new files", hint: "Components, pages, APIs" },
+        { value: "new", label: "\u{1F195} Start fresh project", hint: "Begin something new" },
+        { value: "settings", label: "\u2699\uFE0F  Settings", hint: "API keys & preferences" },
+        { value: "help", label: "\u2753 Help", hint: "Learn how CodeBakers works" },
+        { value: "exit", label: "\u{1F6AA} Return to terminal", hint: "Go back to command line" }
+      ]
+    });
+    if (p21.isCancel(action) || action === "exit") {
+      console.log("");
+      console.log(chalk21.cyan("  \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\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      console.log(chalk21.white("  You're back in the terminal."));
+      console.log("");
+      console.log(chalk21.dim("  To start CodeBakers again, type:"));
+      console.log(chalk21.green("    codebakers"));
+      console.log("");
+      console.log(chalk21.dim("  Quick commands you can run directly:"));
+      console.log(chalk21.dim("    codebakers code") + chalk21.gray("    - Code with AI"));
+      console.log(chalk21.dim("    codebakers deploy") + chalk21.gray("  - Deploy your project"));
+      console.log(chalk21.dim("    codebakers help") + chalk21.gray("    - See all commands"));
+      console.log(chalk21.cyan("  \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\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      console.log("");
+      keepRunning = false;
+      break;
+    }
+    await handleAction(action, config);
+    console.log("");
   }
-  await handleAction(action, config);
 }
 async function handleAction(action, config) {
   switch (action) {
@@ -7686,14 +7809,14 @@ async function handleAction(action, config) {
   }
 }
 function showPostSetupInstructions() {
-  console.log(boxen(
+  console.log(boxen2(
     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(
+  console.log(boxen2(
     chalk21.green.bold(`\u2713 ${projectName} created!
 
 `) + chalk21.white("Next steps:\n\n") + chalk21.cyan("1. ") + "Go to your project:\n" + chalk21.dim(`   cd ${displayPath}
@@ -7703,7 +7826,7 @@ function showPostBuildInstructions(projectName, projectPath) {
   ));
 }
 function showHelp2() {
-  console.log(boxen(`
+  console.log(boxen2(`
 ${chalk21.bold("CodeBakers CLI v" + VERSION2)} \u2014 AI dev team that follows the rules
 
 ${chalk21.bold.cyan("Getting Started:")}