betterstart-cli 0.0.82 → 0.0.84

package/dist/cli.js

@@ -25696,12 +25696,25 @@ function runVercel(runner, args, options) {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
+    let closed = false;
+    let effectiveTimeoutMs = timeoutMs;
+    let timeout;
+    const armTimeout = (ms) => {
+      if (closed) return;
+      clearTimeout(timeout);
+      effectiveTimeoutMs = ms;
+      timeout = setTimeout(() => {
+        timedOut = true;
+        child.kill("SIGTERM");
+      }, ms);
+    };
+    const runControl = { extendTimeout: armTimeout };
     const onOutputLine = options.onOutputLine;
     const createOutputObserver = () => {
       if (!onOutputLine) return void 0;
       return createFilteredLineForwarder(
         (line) => line.length > 0,
-        (text7) => onOutputLine(stripVTControlCharacters3(text7).trim())
+        (text7) => onOutputLine(stripVTControlCharacters3(text7).trim(), runControl)
       );
     };
     const stdoutObserver = createOutputObserver();
@@ -25748,11 +25761,9 @@ function runVercel(runner, args, options) {
         errForwarder.flush();
       });
     }
-    const timeout = setTimeout(() => {
-      timedOut = true;
-      child.kill("SIGTERM");
-    }, timeoutMs);
+    armTimeout(timeoutMs);
     child.on("close", (code, signal) => {
+      closed = true;
       clearTimeout(timeout);
       stdoutObserver?.flush();
       stderrObserver?.flush();
@@ -25764,7 +25775,7 @@ function runVercel(runner, args, options) {
           stdout,
           stderr,
           timedOut: true,
-          errorMessage: `Vercel command timed out after ${Math.floor(timeoutMs / 1e3)}s`
+          errorMessage: `Vercel command timed out after ${Math.floor(effectiveTimeoutMs / 1e3)}s`
         });
         return;
       }
@@ -25779,6 +25790,7 @@ function runVercel(runner, args, options) {
       });
     });
     child.on("error", (err) => {
+      closed = true;
       clearTimeout(timeout);
       stdoutObserver?.flush();
       stderrObserver?.flush();
@@ -25961,6 +25973,14 @@ function versionedVercelProjectName(base, attempt) {
 }
 async function createVercelProject(runner, cwd, name, options = {}) {
   const base = sanitizeVercelProjectName(name);
+  const scoped = await createAndLinkProject(runner, cwd, base, options);
+  if (scoped.linked || !options.scope) return scoped;
+  return createAndLinkProject(runner, cwd, base, {
+    env: options.env,
+    preferredScope: options.scope
+  });
+}
+async function createAndLinkProject(runner, cwd, base, options) {
   let projectName = base;
   for (let attempt = 1; attempt <= MAX_NAME_ATTEMPTS; attempt++) {
     const candidate = versionedVercelProjectName(base, attempt);
@@ -25990,7 +26010,7 @@ ${add.stderr}`)) continue;
     fs37.rmSync(path48.join(cwd, ".vercel", "project.json"), { force: true });
   } catch {
   }
-  const link = await runVercel(
+  let link = await runVercel(
     runner,
     withScope(["link", "--project", projectName, "--yes"], options.scope),
     {
@@ -25999,6 +26019,24 @@ ${add.stderr}`)) continue;
       env: options.env
     }
   );
+  if (!link.success) {
+    const fallbackScope = resolveMissingScopeChoice(
+      `${link.stdout}
+${link.stderr}`,
+      options.scope ?? options.preferredScope
+    );
+    if (fallbackScope && fallbackScope !== options.scope) {
+      link = await runVercel(
+        runner,
+        withScope(["link", "--project", projectName, "--yes"], fallbackScope),
+        {
+          cwd,
+          mode: "capture",
+          env: options.env
+        }
+      );
+    }
+  }
   return {
     name: projectName,
     linked: link.success,
@@ -26008,6 +26046,19 @@ ${add.stderr}`)) continue;
 function withScope(args, scope) {
   return scope ? [...args, "--scope", scope] : args;
 }
+function resolveMissingScopeChoice(output, preferred) {
+  if (!/missing_scope/.test(output)) return void 0;
+  const payload = parseVercelJson(output);
+  if (payload?.reason !== "missing_scope") return void 0;
+  const names = (payload.choices ?? []).map((choice) => choice.name).filter((name) => typeof name === "string" && name.length > 0);
+  if (names.length === 0) return void 0;
+  if (names.length === 1) return names[0];
+  if (preferred) {
+    const match = names.find((name) => name === preferred || name.startsWith(preferred));
+    if (match) return match;
+  }
+  return names[0];
+}
 function readLinkedProjectId(cwd) {
   return readLinkedProjectJson(cwd)?.projectId;
 }
@@ -26309,14 +26360,36 @@ import * as p20 from "@clack/prompts";
 import pc7 from "picocolors";
 var PROVISION_TIMEOUT_MS2 = 18e4;
 var INTERACTIVE_PROVISION_TIMEOUT_MS2 = 6e5;
+var ACCEPT_TERMS_URL_PATTERN = /https:\/\/vercel\.com\/\S+\/integrations\/accept-terms\/\S+/i;
+var TERMS_ACCEPTED_PATTERN = /terms accepted/i;
+function findAcceptTermsUrl(line) {
+  return ACCEPT_TERMS_URL_PATTERN.exec(line)?.[0];
+}
 async function provisionNeonInteractive(runner, cwd, options) {
   const quietSpinner = spinner2();
   quietSpinner.start("Creating your Neon database");
+  let waitingOnTerms = false;
   const quiet = await runVercel(runner, neonAddArgs(options), {
     cwd,
     mode: "capture",
     timeoutMs: PROVISION_TIMEOUT_MS2,
-    env: options.env
+    env: options.env,
+    onOutputLine: (line, run) => {
+      if (!waitingOnTerms) {
+        const termsUrl = findAcceptTermsUrl(line);
+        if (!termsUrl) return;
+        waitingOnTerms = true;
+        run.extendTimeout(INTERACTIVE_PROVISION_TIMEOUT_MS2);
+        quietSpinner.clear();
+        p20.log.info(`Please accept the Neon terms in your browser
+${pc7.dim(termsUrl)}`);
+        quietSpinner.start("Waiting for the terms to be accepted");
+        return;
+      }
+      if (TERMS_ACCEPTED_PATTERN.test(line)) {
+        quietSpinner.message("Creating your Neon database");
+      }
+    }
   });
   if (quiet.success) {
     quietSpinner.clear();