@nimbuslab/cli 0.6.3 → 0.8.0

package/src/commands/create.ts

@@ -1,14 +1,144 @@
 import * as p from "@clack/prompts"
 import pc from "picocolors"
-import { $} from "bun"
-import { rm } from "node:fs/promises"
+import { $ } from "bun"
+import { rm, mkdir } from "node:fs/promises"
 import { join } from "node:path"
 
+// AI Assistant configs
+const AI_CONFIGS: Record<string, { filename: string; content: (type: string) => string }> = {
+  claude: {
+    filename: "CLAUDE.md",
+    content: (type) => `# ${type === "landing" ? "Landing Page" : type === "app" ? "Web App" : "Monorepo"}
+
+## Stack
+- Next.js 16 (App Router, Turbopack)
+- React 19 (Server Components)
+- TypeScript (strict)
+- Tailwind CSS 4
+- shadcn/ui
+- Bun
+${type === "app" ? "- Better Auth\n- Drizzle + PostgreSQL" : ""}
+
+## Commands
+\`\`\`bash
+bun dev      # Start development
+bun build    # Production build
+bun lint     # Run ESLint
+${type === "app" ? "bun setup    # Setup database" : ""}
+\`\`\`
+
+## Conventions
+- Use \`bun\` for all package operations
+- Server Components by default
+- Dark mode first design
+- Use \`cn()\` for conditional classes
+- Add components: \`bunx --bun shadcn@latest add [component]\`
+`,
+  },
+  cursor: {
+    filename: ".cursorrules",
+    content: (type) => `# Cursor Rules
+
+Stack: Next.js 16, React 19, TypeScript, Tailwind CSS 4, shadcn/ui, Bun
+${type === "app" ? "Auth: Better Auth | DB: Drizzle + PostgreSQL" : ""}
+
+- Server Components by default
+- "use client" only when needed
+- Tailwind utility classes
+- cn() for conditional classes
+- Dark mode first
+`,
+  },
+  gemini: {
+    filename: ".gemini/GEMINI.md",
+    content: (type) => `# ${type === "landing" ? "Landing Page" : type === "app" ? "Web App" : "Monorepo"}
+
+## Stack
+- Next.js 16 (App Router, Turbopack)
+- React 19 (Server Components)
+- TypeScript (strict)
+- Tailwind CSS 4
+- shadcn/ui
+- Bun
+${type === "app" ? "- Better Auth\n- Drizzle + PostgreSQL" : ""}
+
+## Conventions
+- Use \`bun\` for all package operations
+- Server Components by default
+- Dark mode first design
+- Use \`cn()\` for conditional classes
+`,
+  },
+  copilot: {
+    filename: ".github/copilot-instructions.md",
+    content: (type) => `# GitHub Copilot Instructions
+
+Stack: Next.js 16, React 19, TypeScript, Tailwind CSS 4, shadcn/ui, Bun
+${type === "app" ? "Auth: Better Auth | DB: Drizzle + PostgreSQL" : ""}
+
+## Do
+- Use TypeScript strict mode
+- Prefer Server Components
+- Use Tailwind for styling
+- Use cn() for class merging
+
+## Don't
+- Use CSS modules or styled-components
+- Use class components
+- Add unnecessary dependencies
+`,
+  },
+  windsurf: {
+    filename: ".windsurfrules",
+    content: (type) => `# Windsurf Rules
+
+Stack: Next.js 16, React 19, TypeScript, Tailwind CSS 4, shadcn/ui, Bun
+${type === "app" ? "Auth: Better Auth | DB: Drizzle + PostgreSQL" : ""}
+
+- Server Components by default
+- "use client" only when needed
+- Tailwind utility classes
+- cn() for conditional classes
+- Dark mode first
+`,
+  },
+}
+
+// GitHub CLI check
+async function checkGitHubCli(): Promise<{
+  installed: boolean
+  authenticated: boolean
+  username: string | null
+  orgs: string[]
+}> {
+  const checkCmd = process.platform === "win32" ? "where" : "which"
+  try {
+    const hasGh = await $`${checkCmd} gh`.quiet().nothrow()
+    if (hasGh.exitCode !== 0) {
+      return { installed: false, authenticated: false, username: null, orgs: [] }
+    }
+
+    const authStatus = await $`gh auth status`.quiet().nothrow()
+    if (authStatus.exitCode !== 0) {
+      return { installed: true, authenticated: false, username: null, orgs: [] }
+    }
+
+    const username = (await $`gh api user --jq '.login'`.quiet().text()).trim()
+    const orgsJson = await $`gh api user/orgs --jq '.[].login'`.quiet().text()
+    const orgs = orgsJson.trim().split("\n").filter(Boolean)
+
+    return { installed: true, authenticated: true, username, orgs }
+  } catch {
+    return { installed: false, authenticated: false, username: null, orgs: [] }
+  }
+}
+
 // Templates privados (nimbuslab-templates) - uso interno
 const PRIVATE_TEMPLATES = {
   "fast": "nimbuslab-templates/fast-template",
   "fast+": "nimbuslab-templates/fastplus-template",
   "fast+-monorepo": "nimbuslab-templates/fastplus-monorepo-template",
+  "nimbus-core": "nimbuslab/nimbus-core",
 }
 
 // Templates públicos (nimbuslab)
@@ -39,7 +169,7 @@ async function isNimbuslabMember(): Promise<{ isMember: boolean; user: string |
   }
 }
 
-type ProjectType = "fast" | "fast+" | "landing" | "app" | "turborepo"
+type ProjectType = "fast" | "fast+" | "landing" | "app" | "turborepo" | "nimbus-core"
 
 interface ProjectConfig {
   name: string
@@ -50,6 +180,9 @@ interface ProjectConfig {
   github: boolean
   githubOrg: string | null
   githubDescription: string
+  // Public template configs
+  theme: "dark" | "light" | "system"
+  aiAssistant: string | null
   // M26: Número do contrato (fast only)
   contractNumber: string
   // M21-M23: Configs de infra
@@ -75,6 +208,7 @@ interface CreateFlags {
   fast: boolean
   fastPlus: boolean
   fastTurborepo: boolean
+  core: boolean
   // Outros
   noGit: boolean
   noInstall: boolean
@@ -91,6 +225,7 @@ function parseFlags(args: string[]): { flags: CreateFlags; projectName: string |
     fast: false,
     fastPlus: false,
     fastTurborepo: false,
+    core: false,
     noGit: false,
     noInstall: false,
     railway: false,
@@ -117,6 +252,8 @@ function parseFlags(args: string[]): { flags: CreateFlags; projectName: string |
       flags.fastPlus = true
     } else if (arg === "--fast-turborepo") {
       flags.fastTurborepo = true
+    } else if (arg === "--core") {
+      flags.core = true
     } else if (arg === "--no-git") {
       flags.noGit = true
     } else if (arg === "--no-install") {
@@ -143,7 +280,7 @@ async function ensureRailwayCli(): Promise<boolean> {
 
   if (hasRailway) return true
 
-  console.log(pc.yellow("Railway CLI nao encontrado. Instalando..."))
+  console.log(pc.yellow("Railway CLI not found. Installing..."))
   console.log()
 
   try {
@@ -152,11 +289,11 @@ async function ensureRailwayCli(): Promise<boolean> {
     } else {
       await $`curl -fsSL https://railway.app/install.sh | sh`.quiet()
     }
-    console.log(pc.green("Railway CLI instalado com sucesso!"))
+    console.log(pc.green("Railway CLI installed successfully!"))
     return true
   } catch (error) {
-    console.log(pc.red("Erro ao instalar Railway CLI."))
-    console.log(pc.dim("Instale manualmente: https://docs.railway.app/guides/cli"))
+    console.log(pc.red("Error installing Railway CLI."))
+    console.log(pc.dim("Install manually: https://docs.railway.app/guides/cli"))
     return false
   }
 }
@@ -192,8 +329,8 @@ export async function create(args: string[]) {
   const hasGh = await $`${checkCmd} gh`.quiet().then(() => true).catch(() => false)
 
   if (!hasBun) {
-    console.log(pc.red("Erro: Bun nao encontrado."))
-    console.log(pc.dim("Instale em: https://bun.sh"))
+    console.log(pc.red("Error: Bun not found."))
+    console.log(pc.dim("Install from: https://bun.sh"))
     console.log()
     if (process.platform === "win32") {
       console.log(pc.cyan('powershell -c "irm bun.sh/install.ps1 | iex"'))
@@ -205,30 +342,17 @@ export async function create(args: string[]) {
   }
 
   if (!hasGit) {
-    console.log(pc.red("Erro: Git nao encontrado."))
-    console.log(pc.dim("Instale git para continuar."))
+    console.log(pc.red("Error: Git not found."))
+    console.log(pc.dim("Install git to continue."))
     process.exit(1)
   }
 
+  // GitHub CLI is optional for public templates
+  // Will be checked later if user wants to create a repo
   if (!hasGh) {
-    console.log(pc.red("Erro: GitHub CLI (gh) nao encontrado."))
-    console.log(pc.dim("Instale em: https://cli.github.com"))
+    console.log(pc.dim("  GitHub CLI not found (repo creation will be skipped)"))
+    console.log(pc.dim("  Install from: https://cli.github.com"))
     console.log()
-    if (process.platform === "win32") {
-      console.log(pc.cyan("winget install GitHub.cli"))
-    } else {
-      console.log(pc.cyan("sudo apt install gh  # ou brew install gh"))
-    }
-    console.log()
-    process.exit(1)
-  }
-
-  // Verifica se gh esta autenticado
-  const ghAuth = await $`gh auth status`.quiet().then(() => true).catch(() => false)
-  if (!ghAuth) {
-    console.log(pc.red("Erro: GitHub CLI nao autenticado."))
-    console.log(pc.dim("Execute: gh auth login"))
-    process.exit(1)
   }
 
   // M30: Verificar/instalar Railway CLI
@@ -236,26 +360,27 @@ export async function create(args: string[]) {
   if (hasRailway) {
     const railwayAuth = await isRailwayAuthenticated()
     if (!railwayAuth) {
-      console.log(pc.yellow("Railway CLI nao autenticado."))
-      console.log(pc.dim("Execute: railway login"))
+      console.log(pc.yellow("Railway CLI not authenticated."))
+      console.log(pc.dim("Run: railway login"))
       console.log()
     }
   }
 
   const { flags, projectName } = parseFlags(args)
 
-  p.intro(pc.bgCyan(pc.black(" Novo Projeto nimbuslab ")))
+  p.intro(pc.bgCyan(pc.black(" New nimbuslab Project ")))
 
   let config: ProjectConfig | symbol
 
   // Determina tipo baseado nas flags
-  const hasTypeFlag = flags.landing || flags.app || flags.turborepo || flags.fast || flags.fastPlus || flags.fastTurborepo
+  const hasTypeFlag = flags.landing || flags.app || flags.turborepo || flags.fast || flags.fastPlus || flags.fastTurborepo || flags.core
   const typeFromFlag: ProjectType | null = flags.landing ? "landing"
     : flags.app ? "app"
     : flags.turborepo ? "turborepo"
     : flags.fastTurborepo ? "fast+"
     : flags.fastPlus ? "fast+"
     : flags.fast ? "fast"
+    : flags.core ? "nimbus-core"
     : null
   const monorepoFromFlag = flags.fastTurborepo
 
@@ -272,6 +397,8 @@ export async function create(args: string[]) {
       github: false,
       githubOrg: null,
       githubDescription: "",
+      theme: "dark" as const,
+      aiAssistant: null,
       contractNumber: "",
       resendApiKey: "",
       resendFromEmail: "",
@@ -284,10 +411,10 @@ export async function create(args: string[]) {
     }
 
     const typeLabel = flags.turborepo ? "fast+ (monorepo)" : config.type
-    console.log(pc.dim(`  Projeto: ${projectName}`))
-    console.log(pc.dim(`  Tipo: ${typeLabel}`))
-    console.log(pc.dim(`  Git: ${config.git ? "sim" : "nao"}`))
-    console.log(pc.dim(`  Instalar: ${config.install ? "sim" : "nao"}`))
+    console.log(pc.dim(`  Project: ${projectName}`))
+    console.log(pc.dim(`  Type: ${typeLabel}`))
+    console.log(pc.dim(`  Git: ${config.git ? "yes" : "no"}`))
+    console.log(pc.dim(`  Install: ${config.install ? "yes" : "no"}`))
     if (flags.railway) console.log(pc.dim(`  Railway: configurar`))
     if (flags.template) console.log(pc.dim(`  Template: ${flags.template}`))
     console.log()
@@ -305,7 +432,7 @@ export async function create(args: string[]) {
           }
         } else {
           // Fast+: cria projeto novo automaticamente
-          console.log(pc.dim(`  Criando projeto Railway: ${projectName}...`))
+          console.log(pc.dim(`  Creating project Railway: ${projectName}...`))
           try {
             const result = await $`echo "" | railway init -n ${projectName} -w nimbuslab --json`.text()
             const newProject = JSON.parse(result)
@@ -316,7 +443,7 @@ export async function create(args: string[]) {
           }
         }
       } else {
-        console.log(pc.yellow(`  Railway: nao autenticado (railway login)`))
+        console.log(pc.yellow(`  Railway: not authenticated (railway login)`))
       }
       console.log()
     }
@@ -325,13 +452,13 @@ export async function create(args: string[]) {
   }
 
   if (p.isCancel(config)) {
-    p.cancel("Operacao cancelada")
+    p.cancel("Operation cancelled")
     process.exit(0)
   }
 
   await createProject(config as ProjectConfig)
 
-  p.outro(pc.green("Projeto criado com sucesso!"))
+  p.outro(pc.green("Project created successfully!"))
 
   showNextSteps(config as ProjectConfig)
 }
@@ -341,18 +468,18 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
   const { isMember, user } = await isNimbuslabMember()
 
   // Saudacao
-  const greeting = user ? `Ola, ${user}!` : "Ola!"
+  const greeting = user ? `Hello, ${user}!` : "Hello!"
   console.log(pc.dim(`  ${greeting}`))
   console.log()
 
   const name = await p.text({
-    message: "Nome do projeto:",
+    message: "Project name:",
     placeholder: "meu-projeto",
     initialValue: initialName,
     validate: (value) => {
-      if (!value) return "Nome e obrigatorio"
+      if (!value) return "Name is required"
       if (!/^[a-z0-9-]+$/.test(value)) {
-        return "Use apenas letras minusculas, numeros e hifens"
+        return "Use only lowercase letters, numbers and hyphens"
       }
       return undefined
     },
@@ -370,7 +497,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     {
       value: "app",
       label: "Web App",
-      hint: "Landing + Better Auth + Prisma",
+      hint: "Landing + Better Auth + Drizzle",
     },
     {
       value: "turborepo",
@@ -384,17 +511,22 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     {
       value: "fast",
       label: "fast",
-      hint: "Landing page metodologia fast",
+      hint: "Landing page fast methodology",
     },
     {
       value: "fast+",
       label: "fast+",
-      hint: "SaaS completo",
+      hint: "Complete SaaS",
+    },
+    {
+      value: "nimbus-core",
+      label: "nimbus-core",
+      hint: "External projects (stealth mode)",
     },
   ] : []
 
   const type = await p.select({
-    message: "Tipo de projeto:",
+    message: "Project type:",
     options: [...publicOptions, ...privateOptions],
   })
 
@@ -405,15 +537,58 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
 
   // Se não é membro e tentou usar template privado (via flag), bloqueia
   if (!isMember && !isPublicTemplate) {
-    console.log(pc.red("Erro: Template disponivel apenas para membros nimbuslab"))
+    console.log(pc.red("Error: Template available only for nimbuslab members"))
     process.exit(1)
   }
 
+  // Fluxo especial para nimbus-core (projetos externos)
+  if (type === "nimbus-core") {
+    console.log()
+    console.log(pc.dim("  nimbus-core: Motor para projetos externos (stealth mode)"))
+    console.log()
+
+    // Sempre cria repo no GitHub (org nimbuslab, privado)
+    const createGithub = await p.confirm({
+      message: "Create GitHub repository? (nimbuslab, private)",
+      initialValue: true,
+    })
+    if (p.isCancel(createGithub)) return createGithub
+
+    // Perguntar URL do repo do cliente para clonar no workspace
+    const clientRepo = await p.text({
+      message: "Client repo URL (optional, to clone in workspace):",
+      placeholder: "git@github.com:client/repo.git",
+    })
+    if (p.isCancel(clientRepo)) return clientRepo
+
+    return {
+      name: name as string,
+      type: "nimbus-core" as ProjectType,
+      monorepo: false,
+      git: true, // sempre init git
+      install: false, // nimbus-core não tem package.json
+      github: createGithub as boolean,
+      githubOrg: "nimbuslab", // sempre na org nimbuslab
+      githubDescription: `nimbus-core for ${name} - external project`,
+      theme: "dark" as const,
+      aiAssistant: null,
+      contractNumber: "",
+      resendApiKey: "",
+      resendFromEmail: "",
+      contactEmail: "",
+      railwayProject: "",
+      railwayToken: "",
+      stagingUrl: "",
+      productionUrl: "",
+      customTemplate: (clientRepo as string) || null, // reusa campo para URL do cliente
+    }
+  }
+
   // Pergunta sobre monorepo apenas para fast+
   let monorepo = false
   if (type === "fast+") {
     const useMonorepo = await p.confirm({
-      message: "Usar monorepo (Turborepo)?",
+      message: "Use monorepo (Turborepo)?",
       initialValue: false,
     })
     if (p.isCancel(useMonorepo)) return useMonorepo
@@ -421,7 +596,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
   }
 
   const git = await p.confirm({
-    message: "Inicializar repositorio Git?",
+    message: "Initialize Git repository?",
     initialValue: true,
   })
 
@@ -434,7 +609,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
 
   if (git) {
     const createGithub = await p.confirm({
-      message: "Criar repositorio no GitHub?",
+      message: "Create GitHub repository?",
       initialValue: false,
     })
 
@@ -445,12 +620,12 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     if (github) {
       // M13: Selecao de organizacao GitHub
       const org = await p.select({
-        message: "Organizacao GitHub:",
+        message: "GitHub organization:",
         options: [
-          { value: "nimbuslab", label: "nimbuslab", hint: "Org principal" },
-          { value: "fast-by-nimbuslab", label: "fast-by-nimbuslab", hint: "Projetos de clientes" },
+          { value: "nimbuslab", label: "nimbuslab", hint: "Main org" },
+          { value: "fast-by-nimbuslab", label: "fast-by-nimbuslab", hint: "Client projects" },
           { value: "nimbuslab-templates", label: "nimbuslab-templates", hint: "Templates" },
-          { value: null, label: "Pessoal", hint: "Sem organizacao" },
+          { value: null, label: "Pessoal", hint: "Personal" },
         ],
       })
 
@@ -459,7 +634,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
 
       // M14: Descricao do repo
       const description = await p.text({
-        message: "Descricao do repositorio:",
+        message: "Repository description:",
         placeholder: "Landing page para cliente X",
         initialValue: type === "fast" ? "Landing page fast by nimbuslab" : "SaaS fast+ by nimbuslab",
       })
@@ -473,18 +648,85 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
   let contractNumber = ""
   if (type === "fast") {
     const contract = await p.text({
-      message: "Numero do contrato (ex: 001):",
+      message: "Contract number (ex: 001):",
       placeholder: "001",
-      validate: (v) => v ? undefined : "Numero do contrato e obrigatorio para fast",
+      validate: (v) => v ? undefined : "Contract number is required for fast",
     })
     if (p.isCancel(contract)) return contract
     contractNumber = contract as string
   }
 
-  // Templates públicos têm fluxo simplificado
+  // Templates públicos têm fluxo simplificado mas com configs globais
   if (isPublicTemplate) {
+    // Theme selection
+    const theme = await p.select({
+      message: "Default theme:",
+      options: [
+        { value: "dark", label: "Dark", hint: "recommended" },
+        { value: "light", label: "Light" },
+        { value: "system", label: "System", hint: "follows OS preference" },
+      ],
+    })
+    if (p.isCancel(theme)) return theme
+
+    // AI Assistant selection
+    const aiAssistant = await p.select({
+      message: "Which AI assistant do you use?",
+      options: [
+        { value: "claude", label: "Claude Code", hint: "Anthropic" },
+        { value: "cursor", label: "Cursor", hint: "AI-first editor" },
+        { value: "gemini", label: "Gemini CLI", hint: "Google" },
+        { value: "copilot", label: "GitHub Copilot" },
+        { value: "windsurf", label: "Windsurf", hint: "Codeium" },
+        { value: "none", label: "None", hint: "skip AI config" },
+      ],
+    })
+    if (p.isCancel(aiAssistant)) return aiAssistant
+
+    // GitHub repo for public templates (uses user's orgs)
+    let publicGithub = false
+    let publicGithubOrg: string | null = null
+
+    if (git) {
+      const gh = await checkGitHubCli()
+
+      if (gh.installed && gh.authenticated) {
+        const createRepo = await p.confirm({
+          message: "Create GitHub repository?",
+          initialValue: false,
+        })
+        if (p.isCancel(createRepo)) return createRepo
+
+        publicGithub = createRepo as boolean
+
+        if (publicGithub) {
+          const repoOptions: { value: string | null; label: string; hint?: string }[] = [
+            { value: gh.username, label: gh.username!, hint: "personal account" },
+            ...gh.orgs.map((org) => ({ value: org, label: org })),
+          ]
+
+          const repoOwner = await p.select({
+            message: "Where to create the repository?",
+            options: repoOptions,
+          })
+          if (p.isCancel(repoOwner)) return repoOwner
+          publicGithubOrg = repoOwner as string | null
+
+          const repoVisibility = await p.select({
+            message: "Repository visibility:",
+            options: [
+              { value: "private", label: "Private", hint: "recommended" },
+              { value: "public", label: "Public" },
+            ],
+          })
+          if (p.isCancel(repoVisibility)) return repoVisibility
+          githubDescription = repoVisibility as string // reusing for visibility
+        }
+      }
+    }
+
     const install = await p.confirm({
-      message: "Instalar dependencias?",
+      message: "Install dependencies?",
       initialValue: true,
     })
 
@@ -496,9 +738,11 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
       monorepo: false,
       git: git as boolean,
       install: install as boolean,
-      github,
-      githubOrg,
+      github: publicGithub,
+      githubOrg: publicGithubOrg,
       githubDescription,
+      theme: theme as "dark" | "light" | "system",
+      aiAssistant: aiAssistant === "none" ? null : aiAssistant as string,
       contractNumber: "",
       resendApiKey: "",
       resendFromEmail: "",
@@ -533,11 +777,11 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
 
   // Menu de configuracoes opcionais
   const infraOptions = await p.multiselect({
-    message: "O que deseja configurar agora?",
+    message: "What do you want to configure now?",
     options: [
-      { value: "urls", label: "URLs", hint: "staging e producao" },
-      { value: "resend", label: "Resend", hint: "emails do formulario" },
-      { value: "railway", label: "Railway", hint: "deploy e hospedagem" },
+      { value: "urls", label: "URLs", hint: "staging and production" },
+      { value: "resend", label: "Resend", hint: "form emails" },
+      { value: "railway", label: "Railway", hint: "deploy and hosting" },
     ],
     required: false,
   })
@@ -549,10 +793,10 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
   // URLs
   if (configItems.includes("urls")) {
     console.log()
-    console.log(pc.dim("  URLs do projeto"))
+    console.log(pc.dim("  Project URLs"))
 
     const staging = await p.text({
-      message: "URL de staging:",
+      message: "Staging URL:",
       placeholder: defaultStagingUrl,
       initialValue: defaultStagingUrl,
     })
@@ -560,7 +804,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     stagingUrl = staging as string
 
     const production = await p.text({
-      message: "URL de producao:",
+      message: "Production URL:",
       placeholder: defaultStagingUrl.replace('.nimbuslab.net.br', '.com.br'),
       initialValue: "",
     })
@@ -581,7 +825,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     resendApiKey = resendKey as string
 
     const fromEmail = await p.text({
-      message: "Email de envio (from):",
+      message: "From email:",
       placeholder: defaultFromEmail,
       initialValue: defaultFromEmail,
     })
@@ -589,7 +833,7 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     resendFromEmail = fromEmail as string
 
     const contact = await p.text({
-      message: "Email de contato (recebe formularios):",
+      message: "Contact email (receives forms):",
       placeholder: defaultContactEmail,
       initialValue: defaultContactEmail,
     })
@@ -613,21 +857,21 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
         const fastProject = projects.find(p => p.toLowerCase().includes("fast by nimbuslab"))
         if (fastProject) {
           railwayProject = fastProject
-          console.log(pc.green(`  Projeto: ${fastProject} (automatico)`))
+          console.log(pc.green(`  Project: ${fastProject} (automatico)`))
         } else {
-          console.log(pc.yellow("  Projeto 'Fast by nimbuslab' nao encontrado."))
-          console.log(pc.dim("  Configure RAILWAY_TOKEN manualmente no .env"))
+          console.log(pc.yellow("  Project 'Fast by nimbuslab' not found."))
+          console.log(pc.dim("  Configure manually in .env"))
         }
       } else {
         // Fast+ pode escolher projeto existente ou criar novo
         const projectOptions = [
           ...projects.map(proj => ({ value: proj, label: proj })),
-          { value: "__new__", label: "Criar novo projeto", hint: "via railway init" },
-          { value: "__skip__", label: "Pular", hint: "Configurar depois" },
+          { value: "__new__", label: "Create new project", hint: "via railway init" },
+          { value: "__skip__", label: "Skip", hint: "Configure later" },
         ]
 
         const selectedProject = await p.select({
-          message: "Projeto Railway para este SaaS:",
+          message: "Railway project for this SaaS:",
           options: projectOptions,
         })
 
@@ -636,32 +880,32 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
         if (selectedProject === "__new__") {
           // Criar projeto via Railway CLI
           const projectNameForRailway = name as string
-          console.log(pc.dim(`  Criando projeto "${projectNameForRailway}" no Railway...`))
+          console.log(pc.dim(`  Creating project "${projectNameForRailway}" on Railway...`))
           try {
             // Usa echo para passar input vazio e aceitar defaults (workspace)
             const result = await $`echo "" | railway init -n ${projectNameForRailway} -w nimbuslab --json`.text()
             const newProject = JSON.parse(result)
             railwayProject = newProject.name || projectNameForRailway
-            console.log(pc.green(`  Projeto "${railwayProject}" criado com sucesso!`))
+            console.log(pc.green(`  Projeto "${railwayProject}" created successfully!`))
             console.log(pc.dim(`  ID: ${newProject.id || "N/A"}`))
           } catch (error) {
-            console.log(pc.yellow("  Erro ao criar projeto via CLI."))
-            console.log(pc.dim("  Crie manualmente em: https://railway.app/new"))
+            console.log(pc.yellow("  Error creating project via CLI."))
+            console.log(pc.dim("  Create manually at: https://railway.app/new"))
           }
         } else if (selectedProject !== "__skip__") {
           railwayProject = selectedProject as string
-          console.log(pc.green(`  Projeto selecionado: ${railwayProject}`))
+          console.log(pc.green(`  Project selected: ${railwayProject}`))
         }
       }
     } else {
       console.log()
-      console.log(pc.yellow("  Railway: nao autenticado (railway login)"))
-      console.log(pc.dim("  Configure RAILWAY_TOKEN manualmente no .env"))
+      console.log(pc.yellow("  Railway: not authenticated (railway login)"))
+      console.log(pc.dim("  Configure manually in .env"))
     }
   }
 
   const install = await p.confirm({
-    message: "Instalar dependencias?",
+    message: "Install dependencies?",
     initialValue: true,
   })
 
@@ -676,6 +920,8 @@ async function promptConfig(initialName?: string, flags?: CreateFlags): Promise<
     github,
     githubOrg,
     githubDescription,
+    theme: "dark" as const,
+    aiAssistant: null,
     contractNumber,
     resendApiKey,
     resendFromEmail,
@@ -708,7 +954,7 @@ async function createProject(config: ProjectConfig) {
   // Verifica se é template público
   const isPublicTemplate = ["landing", "app", "turborepo"].includes(config.type)
 
-  s.start(`Clonando template ${templateLabel}...`)
+  s.start(`Cloning template ${templateLabel}...`)
   try {
     if (isPublicTemplate) {
       // Templates públicos: usa HTTPS (não precisa de auth)
@@ -719,23 +965,79 @@ async function createProject(config: ProjectConfig) {
       await $`gh repo clone ${templateRepo} ${config.name} -- --depth 1`.quiet()
     }
     await rm(join(config.name, ".git"), { recursive: true, force: true })
-    s.stop(`Template ${templateLabel} clonado`)
+    s.stop(`Template cloned`)
   } catch (error) {
-    s.stop("Erro ao clonar template")
-    throw new Error(`Falha ao clonar template ${templateRepo}. Verifique sua conexao ou acesso ao repositorio.`)
+    s.stop("Error cloning template")
+    throw new Error(`Failed to clone template ${templateRepo}. Check your connection or repository access.`)
   }
 
-  // Update package.json
-  s.start("Configurando projeto...")
-  try {
-    const pkgPath = `${config.name}/package.json`
-    const pkg = await Bun.file(pkgPath).json()
-    pkg.name = config.name
-    await Bun.write(pkgPath, JSON.stringify(pkg, null, 2))
-    s.stop("Projeto configurado")
-  } catch (error) {
-    s.stop("Erro ao configurar")
-    // Continue anyway
+  // nimbus-core: clone client repo in workspace if provided
+  if (config.type === "nimbus-core" && config.customTemplate) {
+    const clientRepoUrl = config.customTemplate
+    s.start(`Cloning client repo in workspace...`)
+    try {
+      const projectName = clientRepoUrl.split("/").pop()?.replace(".git", "") || "client-project"
+      await $`git clone ${clientRepoUrl} ${config.name}/workspace/${projectName}`.quiet()
+      s.stop(`Client repo cloned: workspace/${projectName}`)
+    } catch (error) {
+      s.stop("Error cloning client repo")
+      console.log(pc.dim("  You can clone manually: cd workspace && git clone <url>"))
+    }
+  }
+
+  // Update package.json (skip for nimbus-core)
+  if (config.type !== "nimbus-core") {
+    s.start("Configuring project...")
+    try {
+      const pkgPath = `${config.name}/package.json`
+      const pkg = await Bun.file(pkgPath).json()
+      pkg.name = config.name
+      await Bun.write(pkgPath, JSON.stringify(pkg, null, 2))
+      s.stop("Project configured")
+    } catch (error) {
+      s.stop("Error configuring")
+      // Continue anyway
+    }
+  }
+
+  // Apply theme config (public templates only)
+  if (isPublicTemplate && config.theme) {
+    s.start(`Setting theme to ${config.theme}...`)
+    try {
+      const layoutPath = `${config.name}/src/app/layout.tsx`
+      let layout = await Bun.file(layoutPath).text()
+      layout = layout.replace(
+        /defaultTheme="(dark|light|system)"/,
+        `defaultTheme="${config.theme}"`
+      )
+      await Bun.write(layoutPath, layout)
+      s.stop(`Theme set to ${config.theme}`)
+    } catch {
+      s.stop("Theme config skipped")
+    }
+  }
+
+  // Generate AI config (public templates only)
+  if (isPublicTemplate && config.aiAssistant) {
+    const aiConfig = AI_CONFIGS[config.aiAssistant]
+    if (aiConfig) {
+      s.start(`Generating ${config.aiAssistant} config...`)
+      try {
+        const content = aiConfig.content(config.type)
+        const filePath = `${config.name}/${aiConfig.filename}`
+
+        // Create directory if needed
+        if (aiConfig.filename.includes("/")) {
+          const dir = aiConfig.filename.split("/").slice(0, -1).join("/")
+          await mkdir(`${config.name}/${dir}`, { recursive: true })
+        }
+
+        await Bun.write(filePath, content)
+        s.stop(`${aiConfig.filename} created`)
+      } catch {
+        s.stop("AI config skipped")
+      }
+    }
   }
 
   // Setup fast+ if selected
@@ -747,7 +1049,7 @@ async function createProject(config: ProjectConfig) {
 
   // Git init with full branch flow: main → staging → develop
   if (config.git) {
-    s.start("Inicializando Git...")
+    s.start("Initializing Git...")
     try {
       const cwd = config.name
       // Init with main branch (not master)
@@ -759,25 +1061,38 @@ async function createProject(config: ProjectConfig) {
       await $`git checkout -b staging`.cwd(cwd).quiet()
       await $`git checkout -b develop`.cwd(cwd).quiet()
 
-      s.stop("Git inicializado (main -> staging -> develop)")
+      s.stop("Git initialized (main -> staging -> develop)")
     } catch (error) {
-      s.stop("Erro ao inicializar Git")
+      s.stop("Error initializing Git")
     }
 
     // Create GitHub repo if requested (M13 + M14)
     if (config.github) {
-      s.start("Criando repositorio no GitHub...")
+      s.start("Creating GitHub repository...")
       try {
         const cwd = config.name
         const repoName = config.githubOrg
           ? `${config.githubOrg}/${config.name}`
           : config.name
 
-        // Create repo with description (private by default for client projects)
-        const visibility = config.githubOrg === "fast-by-nimbuslab" ? "--private" : "--public"
+        // For public templates, githubDescription contains visibility (private/public)
+        // For private templates, use org-based visibility
+        // nimbus-core is ALWAYS private
+        let visibility: string
+        if (config.type === "nimbus-core") {
+          visibility = "--private" // nimbus-core sempre privado
+        } else if (isPublicTemplate) {
+          visibility = config.githubDescription === "public" ? "--public" : "--private"
+        } else {
+          visibility = config.githubOrg === "fast-by-nimbuslab" ? "--private" : "--public"
+        }
 
-        // Criar repo sem push automático
-        await $`gh repo create ${repoName} ${visibility} --description ${config.githubDescription} --source . --remote origin`.cwd(cwd).quiet()
+        // Create repo
+        if (isPublicTemplate) {
+          await $`gh repo create ${repoName} ${visibility} --source . --remote origin`.cwd(cwd).quiet()
+        } else {
+          await $`gh repo create ${repoName} ${visibility} --description ${config.githubDescription} --source . --remote origin`.cwd(cwd).quiet()
+        }
 
         // Push todas as branches na ordem correta: main -> staging -> develop
         await $`git checkout main`.cwd(cwd).quiet()
@@ -787,10 +1102,10 @@ async function createProject(config: ProjectConfig) {
         await $`git checkout develop`.cwd(cwd).quiet()
         await $`git push -u origin develop`.cwd(cwd).quiet()
 
-        s.stop(`GitHub: ${repoName} criado`)
+        s.stop(`GitHub: ${repoName}`)
       } catch (error) {
-        s.stop("Erro ao criar repositorio GitHub")
-        console.log(pc.dim("  Voce pode criar manualmente com: gh repo create"))
+        s.stop("Error creating GitHub repository")
+        console.log(pc.dim("  You can create manually with: gh repo create"))
       }
     }
   }
@@ -802,8 +1117,8 @@ async function createProject(config: ProjectConfig) {
       await $`railway link -p ${config.railwayProject}`.cwd(config.name).quiet()
       s.stop(`Railway linkado: ${config.railwayProject}`)
     } catch (error) {
-      s.stop("Erro ao linkar Railway")
-      console.log(pc.dim("  Execute manualmente: railway link"))
+      s.stop("Error linking Railway")
+      console.log(pc.dim("  Run manually: railway link"))
     }
   }
 
@@ -815,18 +1130,18 @@ async function createProject(config: ProjectConfig) {
       await Bun.write(`${config.name}/.env`, envContent)
       s.stop("Arquivo .env criado")
     } catch (error) {
-      s.stop("Erro ao criar .env")
+      s.stop("Error creating .env")
     }
   }
 
   // Install deps
   if (config.install) {
-    s.start("Instalando dependencias (pode demorar)...")
+    s.start("Installing dependencies (pode demorar)...")
     try {
       await $`bun install`.cwd(config.name).quiet()
-      s.stop("Dependencias instaladas")
+      s.stop("Dependencies installed")
     } catch (error) {
-      s.stop("Erro ao instalar dependencias")
+      s.stop("Error installing dependencies")
     }
   }
 }
@@ -856,7 +1171,7 @@ function generateEnvFile(config: ProjectConfig): string {
     lines.push("")
     lines.push("# Railway")
     if (config.railwayProject) {
-      lines.push(`# Projeto: ${config.railwayProject}`)
+      lines.push(`# Project: ${config.railwayProject}`)
     }
     lines.push(`RAILWAY_TOKEN=${config.railwayToken || "# Configure com: railway link"}`)
   }
@@ -877,27 +1192,65 @@ function generateEnvFile(config: ProjectConfig): string {
 
 function showNextSteps(config: ProjectConfig) {
   const isPublicTemplate = ["landing", "app", "turborepo"].includes(config.type)
+  const needsSetup = config.type === "app" // app needs bun setup for DB
 
   console.log()
-  console.log(pc.bold("Proximos passos:"))
+  console.log(pc.bold("Next steps:"))
   console.log()
   console.log(`  ${pc.cyan("cd")} ${config.name}`)
 
+  // nimbus-core tem fluxo especial
+  if (config.type === "nimbus-core") {
+    console.log()
+    console.log(pc.dim("  nimbus-core: Motor para projetos externos"))
+    console.log()
+    console.log(pc.dim("  Para clonar repo do cliente:"))
+    console.log(`    ${pc.cyan("cd")} workspace`)
+    console.log(`    ${pc.cyan("git clone")} <repo-do-cliente>`)
+    console.log()
+    console.log(pc.dim("  Para usar a Lola:"))
+    console.log(`    ${pc.cyan("gemini")}  ${pc.dim("# Gemini CLI")}`)
+    console.log(`    ${pc.cyan("claude --append-system-prompt-file .claude/agents/lola.md")}`)
+    console.log()
+    console.log(pc.yellow("  STEALTH MODE: Commits sem mencao a nimbuslab/Lola/IA"))
+    console.log()
+
+    // GitHub info
+    if (config.github) {
+      const repoUrl = `https://github.com/nimbuslab/${config.name}`
+      console.log(pc.green(`  GitHub (private): ${repoUrl}`))
+      console.log()
+    }
+
+    console.log(pc.dim("  Docs: See README.md for full instructions"))
+    console.log()
+    return
+  }
+
   if (!config.install) {
     console.log(`  ${pc.cyan("bun")} install`)
   }
 
-  // Templates públicos não têm bun setup
-  if (!isPublicTemplate) {
+  // Templates que precisam de setup adicional
+  if (!isPublicTemplate || needsSetup) {
     console.log(`  ${pc.cyan("bun")} setup`)
   }
+
   console.log(`  ${pc.cyan("bun")} dev`)
   console.log()
 
+  // Explicar o que o bun setup faz para o app
+  if (needsSetup && isPublicTemplate) {
+    console.log(pc.dim("  bun setup will:"))
+    console.log(pc.dim("    - Start PostgreSQL with Docker"))
+    console.log(pc.dim("    - Run database migrations"))
+    console.log(pc.dim("    - Create demo user (demo@example.com / demo1234)"))
+    console.log()
+  }
+
   // Git flow info
   if (config.git) {
-    console.log(pc.dim("  Git flow: main -> staging -> develop (branch atual)"))
-    console.log()
+    console.log(pc.dim("  Git: main -> staging -> develop (current branch)"))
 
     // GitHub info
     if (config.github) {
@@ -905,36 +1258,56 @@ function showNextSteps(config: ProjectConfig) {
         ? `https://github.com/${config.githubOrg}/${config.name}`
         : `https://github.com/${config.name}`
       console.log(pc.green(`  GitHub: ${repoUrl}`))
-      console.log()
-    } else {
-      console.log(pc.yellow("  Dica: Para criar repo GitHub, use 'gh repo create' ou 'bun setup'."))
+    }
+    console.log()
+  }
+
+  // Theme e AI info
+  if (isPublicTemplate) {
+    if (config.theme !== "dark") {
+      console.log(pc.dim(`  Theme: ${config.theme}`))
+    }
+    if (config.aiAssistant) {
+      const aiConfig = AI_CONFIGS[config.aiAssistant]
+      if (aiConfig) {
+        console.log(pc.dim(`  AI config: ${aiConfig.filename}`))
+      }
+    }
+    if (config.theme !== "dark" || config.aiAssistant) {
       console.log()
     }
   }
 
   if (config.type === "fast+") {
-    console.log(pc.dim("  Dica: Para fast+, configure DATABASE_URL e BETTER_AUTH_SECRET no .env"))
+    console.log(pc.dim("  bun setup will:"))
+    console.log(pc.dim("    - Start PostgreSQL with Docker"))
+    console.log(pc.dim("    - Run database migrations"))
+    console.log(pc.dim("    - Create demo user (demo@example.com / demo1234)"))
+    console.log()
+    console.log(pc.dim("  Tip: Configure DATABASE_URL and BETTER_AUTH_SECRET in .env"))
     if (!config.railwayToken) {
-      console.log(pc.dim("  Railway: Crie um projeto em https://railway.app/new"))
+      console.log(pc.dim("  Railway: Create a project at https://railway.app/new"))
     }
     console.log()
   }
 
-  // Info sobre .env
-  if (config.resendApiKey || config.stagingUrl) {
-    console.log(pc.green("  .env configurado com sucesso!"))
-    console.log()
-  } else {
-    console.log(pc.yellow("  Dica: Configure .env manualmente ou use 'bun setup'."))
-    console.log()
+  // Info sobre .env (templates privados)
+  if (!isPublicTemplate) {
+    if (config.resendApiKey || config.stagingUrl) {
+      console.log(pc.green("  .env configured!"))
+      console.log()
+    } else {
+      console.log(pc.yellow("  Tip: Configure .env manually or use 'bun setup'."))
+      console.log()
+    }
   }
 
-  // Info sobre templates públicos
+  // Info sobre templates
   if (isPublicTemplate) {
-    console.log(pc.dim("  Template open source (MIT) by nimbuslab"))
-    console.log(pc.dim(`  Documentacao: https://github.com/nimbuslab/create-next-${config.type === "turborepo" ? "turborepo" : config.type}`))
+    console.log(pc.dim("  Open source template (MIT) by nimbuslab"))
+    console.log(pc.dim(`  https://github.com/nimbuslab/create-next-${config.type === "turborepo" ? "turborepo" : config.type}`))
   } else {
-    console.log(pc.dim("  Documentacao: https://github.com/nimbuslab-templates"))
+    console.log(pc.dim("  https://github.com/nimbuslab-templates"))
   }
   console.log()
 }