betterstart-cli 0.0.23 → 0.0.24

package/dist/cli.js

@@ -23984,44 +23984,46 @@ import fs34 from "fs";
 import os from "os";
 import path45 from "path";
 var PROVISION_TIMEOUT_MS = 18e4;
+var INTERACTIVE_PROVISION_TIMEOUT_MS = 6e5;
 var ENV_PULL_TIMEOUT_MS = 6e4;
-async function provisionNeon(runner, cwd, options) {
-  const addArgs = ["integration", "add", "neon", "--no-env-pull", "--format", "json"];
+async function provisionNeonInteractive(runner, cwd, options) {
+  const addArgs = ["integration", "add", "neon", "--no-env-pull"];
   if (options.plan) addArgs.push("--plan", options.plan);
   const add = await runVercel(runner, addArgs, {
     cwd,
-    mode: "capture",
-    timeoutMs: PROVISION_TIMEOUT_MS,
+    mode: "inherit",
+    timeoutMs: INTERACTIVE_PROVISION_TIMEOUT_MS,
     env: options.env
   });
   if (!add.success) {
-    const combined = `${add.stdout}
-${add.stderr}`;
-    if (/terms/i.test(combined)) return { failure: "terms-required" };
-    if (/claim/i.test(combined)) return { failure: "claim-required" };
     return { failure: add.timedOut ? "timeout" : "provision-failed" };
   }
-  const meta = parseVercelJson(add.stdout);
-  const resourceName = meta?.resourceName ?? meta?.name;
   const databaseUrl = await pullDatabaseUrl(runner, cwd, options.env);
-  if (!databaseUrl) return { resourceName, failure: "env-pull-empty" };
-  return { databaseUrl, resourceName };
+  if (!databaseUrl) return { failure: "env-pull-empty" };
+  return { databaseUrl };
 }
-async function provisionNeonInteractive(runner, cwd, options) {
-  const addArgs = ["integration", "add", "neon", "--no-env-pull", "--claim"];
+async function provisionNeon(runner, cwd, options) {
+  const addArgs = ["integration", "add", "neon", "--no-env-pull", "--format", "json"];
   if (options.plan) addArgs.push("--plan", options.plan);
   const add = await runVercel(runner, addArgs, {
     cwd,
-    mode: "inherit",
+    mode: "capture",
     timeoutMs: PROVISION_TIMEOUT_MS,
     env: options.env
   });
   if (!add.success) {
-    return { failure: add.timedOut ? "timeout" : "provision-failed" };
+    const combined = `${add.stdout}
+${add.stderr}`.trim();
+    const detail = combined || void 0;
+    if (/terms/i.test(combined)) return { failure: "terms-required", detail };
+    if (/claim/i.test(combined)) return { failure: "claim-required", detail };
+    return { failure: add.timedOut ? "timeout" : "provision-failed", detail };
   }
+  const meta = parseVercelJson(add.stdout);
+  const resourceName = meta?.resourceName ?? meta?.name;
   const databaseUrl = await pullDatabaseUrl(runner, cwd, options.env);
-  if (!databaseUrl) return { failure: "env-pull-empty" };
-  return { databaseUrl };
+  if (!databaseUrl) return { resourceName, failure: "env-pull-empty" };
+  return { databaseUrl, resourceName };
 }
 async function pullDatabaseUrl(runner, cwd, env) {
   const tmpDir = fs34.mkdtempSync(path45.join(os.tmpdir(), "betterstart-vercel-"));
@@ -24113,23 +24115,19 @@ async function runVercelNeonFlow(options) {
     if (auth.username) {
       p13.log.success(`Signed in to Vercel as ${pc4.cyan(auth.username)}`);
     }
-    const spinner7 = p13.spinner();
-    spinner7.start(`Creating Vercel project ${pc4.cyan(options.projectName)}`);
+    const projectSpinner = p13.spinner();
+    projectSpinner.start(`Creating Vercel project ${pc4.cyan(options.projectName)}`);
     const project2 = await createVercelProject(runner, options.cwd, options.projectName, env);
-    spinner7.message("Provisioning Neon Postgres database");
-    let neon = await provisionNeon(runner, options.cwd, { plan: options.plan, env });
-    if (options.interactive && (neon.failure === "terms-required" || neon.failure === "claim-required")) {
-      spinner7.stop("Confirm the Neon integration in the prompts below");
-      neon = await provisionNeonInteractive(runner, options.cwd, { plan: options.plan, env });
-      return finishInteractive(neon, project2.name, project2.projectId);
-    }
+    projectSpinner.stop(
+      project2.linked ? `Linked Vercel project ${pc4.cyan(project2.name)}` : `Using Vercel project ${pc4.cyan(project2.name)}`
+    );
+    const neon = await provisionNeonForMode(runner, options);
     if (neon.failure || !neon.databaseUrl) {
-      spinner7.stop(
-        `Vercel provisioning did not complete ${pc4.dim(`(${neon.failure ?? "no database url"})`)}`
-      );
+      p13.log.warn(neonFailureMessage(neon.failure));
+      if (neon.detail) p13.log.message(pc4.dim(neon.detail));
       return { ok: false };
     }
-    spinner7.stop(`Provisioned Neon Postgres and linked ${pc4.cyan(project2.name)}`);
+    p13.log.success(`Provisioned Neon Postgres for ${pc4.cyan(project2.name)}`);
     return {
       ok: true,
       databaseUrl: neon.databaseUrl,
@@ -24143,18 +24141,15 @@ async function runVercelNeonFlow(options) {
     return { ok: false };
   }
 }
-function finishInteractive(neon, projectName, projectId) {
-  if (neon.databaseUrl) {
-    p13.log.success(`Provisioned Neon Postgres and linked ${pc4.cyan(projectName)}`);
-    return {
-      ok: true,
-      databaseUrl: neon.databaseUrl,
-      vercelProjectId: projectId,
-      neonResourceName: neon.resourceName
-    };
+function provisionNeonForMode(runner, options) {
+  const opts = { plan: options.plan, env: options.env };
+  if (options.interactive) {
+    p13.log.info(
+      `Create your Neon database in the Vercel prompts below ${pc4.dim("(the Free plan is recommended).")}`
+    );
+    return provisionNeonInteractive(runner, options.cwd, opts);
   }
-  p13.log.warn(`Vercel provisioning did not complete (${neon.failure ?? "no database url"})`);
-  return { ok: false };
+  return provisionNeon(runner, options.cwd, opts);
 }
 function authFailureMessage(reason) {
   switch (reason) {
@@ -24170,6 +24165,20 @@ function authFailureMessage(reason) {
       return "Could not sign in to Vercel.";
   }
 }
+function neonFailureMessage(reason) {
+  switch (reason) {
+    case "terms-required":
+      return "Provisioning needs the Neon marketplace terms accepted \u2014 falling back to manual entry.";
+    case "claim-required":
+      return "The Neon resource needs to be claimed \u2014 falling back to manual entry.";
+    case "env-pull-empty":
+      return "Provisioned Neon, but no DATABASE_URL came back \u2014 falling back to manual entry.";
+    case "timeout":
+      return "Neon provisioning timed out \u2014 falling back to manual entry.";
+    default:
+      return "Neon provisioning did not complete \u2014 falling back to manual entry.";
+  }
+}
 
 // adapters/next/commands/init.ts
 import pc5 from "picocolors";