nukebase 2.0.3 → 2.0.4

package/lib/account-commands.js

@@ -202,8 +202,6 @@ async function chooseAccount(args, hint, autoYes) {
 
 // ---- plan -----------------------------------------------------------------
 
-const FREE_TIER = 'spark';
-
 // The account's plan, starting the free plan first when it has none. An
 // account whose paid plan was cancelled is left alone: that's a choice for
 // the dashboard. Returns the plan name, or null if it couldn't be told.
@@ -226,7 +224,7 @@ async function ensurePlan(api, acct) {
 
   const started = await call('/start-free').catch(() => null);
   if (!started || !started.r.ok) return null;   // the create below says why
-  console.log(`\n✓ You're on the free plan: $${started.data.credit || 10} of credit each month, 1 app (128 MB), 1 GB storage.`);
+  console.log(`\n✓ You're on the free plan: $${started.data.credit || 10} of credit each month, 1 app (any size), 1 GB storage.`);
   console.log(`  Upgrade any time at ${api}/`);
   return 'free';
 }
@@ -259,72 +257,27 @@ function tierLabel(catalog, key) {
   return `${t.name}, ${ram} RAM, $${(t.monthlyCents / 100).toFixed(0)}/mo`;
 }
 
-async function createCommand(args) {
-  const autoYes = args.has('yes');
-  const confirm = makeConfirm(autoYes);
-  const askLine = makeAskLine(autoYes);
-
-  const name = args.positional[0];
-  if (!name) fail('Usage: nukebase create <name> [size] [email]   e.g. nukebase create demoapp123 256mb you@example.com');
-  if (!PROJECT_NAME_RE.test(name)) fail('Project names are 3-31 characters: lowercase letters, numbers, - and _, starting with a letter.');
-
-  // After the name, in any order: something with an @ is the account; the
-  // rest is the size.
-  const rest = args.positional.slice(1);
-  const emailArg = rest.find(a => a.includes('@')) || null;
-  const sizeArg = args.get('tier') || rest.find(a => !a.includes('@')) || null;
-
-  const dest = path.resolve(process.cwd(), name);
-  if (fs.existsSync(dest) && fs.readdirSync(dest).length) fail(`The folder ${name} already exists and isn't empty.`);
-
-  const acct = await chooseAccount(args, emailArg, autoYes);
-  const api = apiFor(args, acct.api);
-  const host = hostOf(api);
-
-  // Every account starts free: one with no plan is put on the free plan here,
-  // so a brand-new `npx nukebase start` goes straight to a running app.
-  const plan = await ensurePlan(api, acct);
-  const isFree = plan === 'free';
-
-  let catalog;
+async function loadCatalog(api) {
   try {
     const r = await fetch(`${api}/tiers`);
     if (!r.ok) throw new Error(`HTTP ${r.status}`);
-    catalog = await r.json();
+    const catalog = await r.json();
+    catalog.order = catalog.order || Object.keys(catalog.tiers);
+    catalog.default = catalog.default || catalog.order[0];
+    return catalog;
   } catch (e) {
-    fail(`Could not reach ${host} (${e.cause?.message || e.message}).`);
-  }
-  const order = catalog.order || Object.keys(catalog.tiers);
-  const def = catalog.default || order[0];
-
-  let tier = sizeArg ? resolveTier(sizeArg, catalog) : null;
-  if (sizeArg && !tier) {
-    fail(`Unknown size "${sizeArg}". One of: ${order.map(k => `${catalog.tiers[k].memoryHigh.replace(/M$/, 'mb').replace(/G$/, 'gb').toLowerCase()} (${k})`).join(', ')}`);
-  }
-  if (isFree) {
-    // The free plan has one size; no question to ask.
-    if (tier && tier !== FREE_TIER) fail(`The free plan runs 128 MB apps only. Upgrade for bigger sizes: ${api}/`);
-    tier = FREE_TIER;
-  }
-  if (!tier) {
-    if (autoYes || !process.stdin.isTTY) {
-      tier = def;
-    } else {
-      console.log('\n  Sizes:');
-      order.forEach((k, i) => console.log(`    ${i + 1}) ${tierLabel(catalog, k)}${k === def ? '  (default)' : ''}`));
-      const answer = (await askLine(`\n  Size [${def}]: `)).trim();
-      tier = !answer ? def : /^\d+$/.test(answer) ? order[Number(answer) - 1] : resolveTier(answer, catalog);
-      if (!tier) fail(`Unknown size "${answer}".`);
-    }
+    fail(`Could not reach ${hostOf(api)} (${e.cause?.message || e.message}).`);
   }
+}
 
-  console.log(`\n  Project   ${name}`);
-  console.log(`  Size      ${tierLabel(catalog, tier)}${isFree ? ' (free plan: paid from your $10 monthly credit)' : ''}`);
-  console.log(`  Account   ${describe(acct)}`);
-  console.log(`  Region    ${host}`);
-  const question = isFree ? '\nCreate it? (y/n) ' : '\nCreate it? It is billed to this account. (y/n) ';
-  if (!(await confirm(question))) { console.log('Aborted. Nothing was created.'); return; }
+function sizeList(catalog) {
+  return catalog.order.map(k => `${catalog.tiers[k].memoryHigh.replace(/M$/, 'mb').replace(/G$/, 'gb').toLowerCase()} (${k})`).join(', ');
+}
 
+// Create `name` on the server and unpack it into `dest`. Returns
+// { exists: true } when the account already has a project by that name, so
+// `start` can try the next one; any other failure stops the command.
+async function createProject({ acct, api, name, tier, dest, install }) {
   console.log(`\n🚀 Creating ${name}...`);
   let res;
   try {
@@ -339,10 +292,11 @@ async function createCommand(args) {
   if (!res.ok) {
     let msg = '';
     try { msg = (await res.json()).error; } catch {}
+    if (res.status === 400 && /already exists/i.test(msg || '')) return { exists: true };
     if (res.status === 401) fail(`The sign-in for ${acct.label} is no longer valid. Run: nukebase login --email ${acct.label}`);
-    // No plan, or no credit: both are fixed on the dashboard.
-    if (res.status === 403 && /plan|funds|credit|wallet|balance/i.test(msg)) {
-      fail(`${msg}\n   Choose a plan or add credit at ${api}/`);
+    // No plan, no credit, or the free plan's one project: all fixed on the dashboard.
+    if (res.status === 403 && /plan|funds|credit|wallet|balance|upgrade/i.test(msg)) {
+      fail(`${msg}\n   Manage your plan at ${api}/`);
     }
     fail(`Create failed (${res.status}): ${msg || res.statusText}`);
   }
@@ -355,55 +309,139 @@ async function createCommand(args) {
   let base = {};
   try { base = readConfig(dest); } catch {}
   writeConfig(dest, newConfig({ api, uid: acct.uid, project: name, account: acct.label }, base));
-  console.log(`✓ Downloaded ${count} files into ./${name}`);
+  console.log(`✓ Downloaded ${count} files into ${path.relative(process.cwd(), dest) || 'this folder'}`);
 
-  if (!args.has('no-install') && fs.existsSync(path.join(dest, 'package.json'))) {
+  if (install && fs.existsSync(path.join(dest, 'package.json'))) {
     console.log('\n📦 npm install\n');
     const r = spawnSync('npm', ['install'], { cwd: dest, stdio: 'inherit', shell: process.platform === 'win32' });
-    if (r.status !== 0) console.log(`\n⚠️  npm install failed. Run it yourself in ./${name}.`);
+    if (r.status !== 0) console.log(`\n⚠️  npm install failed. Run it yourself in ${dest}.`);
   }
+  return { ok: true, url: `https://${acct.uid}-${name}.${hostOf(api)}` };
+}
 
-  console.log(`\n✅ ${name} is live at https://${acct.uid}-${name}.${host}`);
+async function createCommand(args) {
+  const autoYes = args.has('yes');
+  const confirm = makeConfirm(autoYes);
+  const askLine = makeAskLine(autoYes);
+
+  const name = args.positional[0];
+  if (!name) fail('Usage: nukebase create <name> [size] [email]   e.g. nukebase create demoapp123 256mb you@example.com');
+  if (!PROJECT_NAME_RE.test(name)) fail('Project names are 3-31 characters: lowercase letters, numbers, - and _, starting with a letter.');
+
+  // After the name, in any order: something with an @ is the account; the
+  // rest is the size.
+  const rest = args.positional.slice(1);
+  const emailArg = rest.find(a => a.includes('@')) || null;
+  const sizeArg = args.get('tier') || rest.find(a => !a.includes('@')) || null;
+
+  const dest = path.resolve(process.cwd(), name);
+  if (fs.existsSync(dest) && fs.readdirSync(dest).length) fail(`The folder ${name} already exists and isn't empty.`);
+
+  const acct = await chooseAccount(args, emailArg, autoYes);
+  const api = apiFor(args, acct.api);
+
+  // Every account starts free: one with no plan is put on the free plan here.
+  const isFree = (await ensurePlan(api, acct)) === 'free';
+  const catalog = await loadCatalog(api);
+
+  let tier = sizeArg ? resolveTier(sizeArg, catalog) : null;
+  if (sizeArg && !tier) fail(`Unknown size "${sizeArg}". One of: ${sizeList(catalog)}`);
+  if (!tier) {
+    if (autoYes || !process.stdin.isTTY || isFree) {
+      tier = catalog.default;
+    } else {
+      console.log('\n  Sizes:');
+      catalog.order.forEach((k, i) => console.log(`    ${i + 1}) ${tierLabel(catalog, k)}${k === catalog.default ? '  (default)' : ''}`));
+      const answer = (await askLine(`\n  Size [${catalog.default}]: `)).trim();
+      tier = !answer ? catalog.default : /^\d+$/.test(answer) ? catalog.order[Number(answer) - 1] : resolveTier(answer, catalog);
+      if (!tier) fail(`Unknown size "${answer}".`);
+    }
+  }
+
+  console.log(`\n  Project   ${name}`);
+  console.log(`  Size      ${tierLabel(catalog, tier)}${isFree ? ' (paid from your $10 monthly credit)' : ''}`);
+  console.log(`  Account   ${describe(acct)}`);
+  console.log(`  Region    ${hostOf(api)}`);
+  const question = isFree ? '\nCreate it? (y/n) ' : '\nCreate it? It is billed to this account. (y/n) ';
+  if (!(await confirm(question))) { console.log('Aborted. Nothing was created.'); return; }
+
+  const out = await createProject({ acct, api, name, tier, dest, install: !args.has('no-install') });
+  if (out.exists) fail(`You already have a project named ${name}. Pick another name, or link to it: nukebase link ${name}`);
+
+  console.log(`\n✅ ${name} is live at ${out.url}`);
   console.log(`\n   cd ${name}`);
   console.log('   nukebase push      deploy your changes');
 }
 
 // ---- start ----------------------------------------------------------------
-// The one command a new user runs after signing up: sign in if needed, then
-// create a project and download it. `nukebase start [name] [size] [email]`.
+// The one command a new user runs, usually by pasting it into Claude Code:
+// `npx nukebase start [name] [size] [email]`. It asks nothing. It signs in
+// if needed (one click in the browser), puts a new account on the free
+// plan, picks a name (from the folder, else "myapp", adding -2, -3... if
+// taken), creates the project at the smallest size unless one is given,
+// downloads it into this folder when it's empty (else a subfolder), and
+// installs it. An AI agent can run it without any back and forth.
 // (Inside a project folder `start` means restart; bin/nukebase.js routes it.)
 
+// Empty apart from dotfiles (.claude, .git, .vscode): a folder made for this.
+function isEmptyFolder(dir) {
+  try { return fs.readdirSync(dir).every(n => n.startsWith('.')); } catch { return false; }
+}
+
+// A folder name as a project name, or null: "My Recipes" -> "my-recipes".
+function nameFromFolder(dir) {
+  const slug = path.basename(dir).toLowerCase().replace(/[^a-z0-9_-]+/g, '-').replace(/^[^a-z]+/, '').replace(/-+$/, '').slice(0, 31);
+  return PROJECT_NAME_RE.test(slug) ? slug : null;
+}
+
 async function startCommand(args) {
-  const autoYes = args.has('yes');
   const { parse } = require('./args');
   const passFlags = [];
   for (const f of ['api', 'region']) if (args.get(f)) passFlags.push(`--${f}`, args.get(f));
-  if (autoYes) passFlags.push('--yes');
-  if (args.has('no-install')) passFlags.push('--no-install');
 
+  const emailArg = args.positional.find(a => a.includes('@')) || args.get('as');
   console.log('\n  Welcome to NukeBase.');
-  const emailArg = args.positional.find(a => a.includes('@'));
-  if (!creds.list().length || (emailArg && !creds.find(emailArg))) {
-    console.log('\n  Step 1 of 2: sign in. Click Allow in the browser window that opens.');
+
+  let acct = emailArg ? creds.find(emailArg) : (creds.getDefault() || creds.list()[0]);
+  if (!acct) {
+    console.log('\n  Confirm your Claude session: click Confirm in the browser window that opens.');
     await loginCommand(parse(['login', ...(emailArg ? ['--email', emailArg] : []), ...passFlags]));
+    acct = emailArg ? creds.find(emailArg) : (creds.getDefault() || creds.list()[0]);
+    if (!acct) fail('Sign-in did not finish. Run: npx nukebase start');
   }
-
-  console.log(`\n  ${creds.list().length ? 'Step 2 of 2: ' : ''}create your project`);
-  let name = args.positional.find(a => !a.includes('@') && PROJECT_NAME_RE.test(a));
-  if (!name) {
-    if (autoYes || !process.stdin.isTTY) fail('Give the project a name, e.g.: nukebase start myapp');
-    for (;;) {
-      name = (await makeAskLine(false)('\n  Project name (lowercase, e.g. myapp): ')).trim().toLowerCase();
-      if (!name) fail('No name given.');
-      if (PROJECT_NAME_RE.test(name)) break;
-      console.log('  3-31 characters: lowercase letters, numbers, - and _, starting with a letter.');
-    }
+  const api = apiFor(args, acct.api);
+  console.log(`\n  Signed in as ${describe(acct)}`);
+
+  const isFree = (await ensurePlan(api, acct)) === 'free';
+  const catalog = await loadCatalog(api);
+  const sizeArg = args.get('tier') || args.positional.find(a => !a.includes('@') && resolveTier(a, catalog));
+  const tier = sizeArg ? resolveTier(sizeArg, catalog) : catalog.default;
+
+  const here = process.cwd();
+  const intoHere = isEmptyFolder(here);
+  const given = args.positional.find(a => !a.includes('@') && PROJECT_NAME_RE.test(a) && !resolveTier(a, catalog));
+  const base = given || (intoHere && nameFromFolder(here)) || 'myapp';
+  const candidates = given ? [given] : [base, ...Array.from({ length: 8 }, (_, i) => `${base}-${i + 2}`.slice(0, 31))];
+
+  console.log(`  Size: ${tierLabel(catalog, tier)}${isFree ? ' (paid from your $10 monthly credit)' : ''}`);
+  let created = null, name = null, dest = null;
+  for (const candidate of candidates) {
+    dest = intoHere ? here : path.resolve(here, candidate);
+    if (!intoHere && fs.existsSync(dest) && fs.readdirSync(dest).length) continue;
+    const out = await createProject({ acct, api, name: candidate, tier, dest, install: !args.has('no-install') });
+    if (out.exists) { console.log(`  (${candidate} is taken, trying another name)`); continue; }
+    created = out; name = candidate;
+    break;
   }
-  const rest = args.positional.filter(a => a !== name);
-  await createCommand(parse(['create', name, ...rest, ...passFlags]));
-
-  console.log('\n  Building with Claude Code? Open the folder and describe your app.');
-  console.log('  Its CLAUDE.md explains NukeBase, and Claude can deploy with: npx nukebase push --yes');
+  if (!created) fail(given ? `You already have a project named ${given}. Pick another name: npx nukebase start <name>` : 'Could not find a free project name. Run: npx nukebase start <name>');
+
+  // Written for whoever runs this next, person or AI agent.
+  console.log(`\n✅ Your app "${name}" is live at ${created.url}`);
+  console.log(`   Project folder: ${dest}`);
+  console.log('\nNext steps (for Claude or you):');
+  console.log(`  1. Work in ${dest}. Read CLAUDE.md there first: it explains how NukeBase apps work.`);
+  console.log('  2. Build what the user describes.');
+  console.log('  3. Put it live with: npx nukebase push --yes   (run inside the project folder)');
 }
 
 // ---- link -----------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nukebase",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "NukeBase CLI: create, deploy and manage NukeBase projects",
   "bin": {
     "nukebase": "bin/nukebase.js"