betterstart-cli 0.0.93 → 0.0.94

package/dist/cli.js

@@ -123,7 +123,10 @@ function createInitCommand(runtime) {
   ).option("--database-provider <provider>", "Database provider: vercel, railway, or manual").option(
     "--storage-provider <provider>",
     "Storage provider: vercel-blob, railway-bucket, r2, or local"
-  ).option("--deploy-provider <provider>", "Deploy provider: vercel, railway, or none").option("--database-plan <id>", "Neon plan id for a Vercel-provisioned database").option("--railway-workspace <id-or-name>", "Railway workspace for a new project").option("--railway-project <id-or-name>", "Existing Railway project to intentionally reuse").option("--railway-environment <id-or-name>", "Railway environment (default: production)").option("--railway-service <id-or-name>", "Railway app service (default: web)").option(
+  ).option("--deploy-provider <provider>", "Deploy provider: vercel, railway, or none").option(
+    "--use-existing-resources",
+    "Require database/storage credentials from existing project env files; never provision them"
+  ).option("--database-plan <id>", "Neon plan id for a Vercel-provisioned database").option("--railway-workspace <id-or-name>", "Railway workspace for a new project").option("--railway-project <id-or-name>", "Existing Railway project to intentionally reuse").option("--railway-environment <id-or-name>", "Railway environment (default: production)").option("--railway-service <id-or-name>", "Railway app service (default: web)").option(
     "--railway-bucket-region <region>",
     "Railway bucket region: sjc, iad, ams, or sin (default: iad)"
   ).option("--force", "Overwrite all existing Admin files (nuclear option)").addHelpText(
@@ -1778,6 +1781,21 @@ function spawnAsync(cmd, args, cwd) {
     child.on("error", reject);
   });
 }
+function isUnexpectedPnpmStoreError(error) {
+  return error instanceof Error && error.message.includes("ERR_PNPM_UNEXPECTED_STORE");
+}
+async function runDependencyInstall(pm, args, cwd, recovery) {
+  try {
+    await spawnAsync(pm, args, cwd);
+  } catch (error) {
+    if (pm !== "pnpm" || recovery.attempted || !isUnexpectedPnpmStoreError(error)) {
+      throw error;
+    }
+    recovery.attempted = true;
+    await spawnAsync("pnpm", ["install", "--force"], cwd);
+    await spawnAsync(pm, args, cwd);
+  }
+}
 function unique(values) {
   return Array.from(new Set(values));
 }
@@ -1824,11 +1842,22 @@ async function installDependenciesAsync({
       ensurePnpmAllowedBuilds(cwd, installPlan.pnpmAllowedBuilds ?? []);
       ensurePnpmPackageExtensions(cwd, installPlan.dependencies);
     }
+    const pnpmStoreRecovery = { attempted: false };
     if (installPlan.dependencies.length > 0) {
-      await spawnAsync(pm, buildAddArgs(pm, installPlan.dependencies, false), cwd);
+      await runDependencyInstall(
+        pm,
+        buildAddArgs(pm, installPlan.dependencies, false),
+        cwd,
+        pnpmStoreRecovery
+      );
     }
     if (installPlan.devDependencies.length > 0) {
-      await spawnAsync(pm, buildAddArgs(pm, installPlan.devDependencies, true), cwd);
+      await runDependencyInstall(
+        pm,
+        buildAddArgs(pm, installPlan.devDependencies, true),
+        cwd,
+        pnpmStoreRecovery
+      );
     }
     return {
       dependencies: installPlan.dependencies,
@@ -3289,6 +3318,13 @@ function walkSlot(field, fieldPath, errors) {
 // core-engine/utils/env.ts
 import fs10 from "fs";
 import path12 from "path";
+import { parseEnv } from "util";
+var DEVELOPMENT_ENV_FILES = [
+  ".env.development.local",
+  ".env.local",
+  ".env.development",
+  ".env"
+];
 function readEnvVar(cwd, key) {
   const envPath = path12.join(cwd, ".env.local");
   if (!fs10.existsSync(envPath)) {
@@ -3308,6 +3344,21 @@ function readEnvVar(cwd, key) {
   }
   return void 0;
 }
+function resolveProjectEnvVar(cwd, key) {
+  for (const envFile of DEVELOPMENT_ENV_FILES) {
+    const envPath = path12.join(cwd, envFile);
+    if (!fs10.existsSync(envPath)) continue;
+    try {
+      const value = parseEnv(fs10.readFileSync(envPath, "utf-8"))[key]?.trim();
+      if (value) return { source: envFile, value };
+    } catch {
+    }
+  }
+  return void 0;
+}
+function readProjectEnvVar(cwd, key) {
+  return resolveProjectEnvVar(cwd, key)?.value;
+}
 function parseEnvValue(rawValue) {
   const value = rawValue.trim();
   const quote2 = value[0];
@@ -3694,10 +3745,10 @@ function hasRequiredIntegrationEnv(definition, cwd) {
   const requiredKeys = definition.envSections.flatMap(
     (section) => section.vars.filter((entry) => entry.value === "").map((entry) => entry.key)
   );
-  return requiredKeys.every((key) => Boolean(readEnvVar(cwd, key)));
+  return requiredKeys.every((key) => Boolean(readProjectEnvVar(cwd, key)));
 }
 function readNonEmptyEnvVar(cwd, key) {
-  const value = readEnvVar(cwd, key)?.trim();
+  const value = readProjectEnvVar(cwd, key)?.trim();
   return value ? value : void 0;
 }
 async function resolveTextEnvValue(options) {
@@ -4319,7 +4370,8 @@ async function installIntegrations({
   pm,
   integrationIds,
   interactive,
-  includeBiome
+  includeBiome,
+  dependenciesInstalled = false
 }) {
   const orderedIntegrationIds = resolveIntegrationInstallOrder(integrationIds);
   const installedIntegrationIds = normalizeInstalledIntegrations(config);
@@ -4397,7 +4449,7 @@ async function installIntegrations({
         (dependency) => !currentPlan.devDependencies.includes(dependency)
       )
     };
-    if (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0) {
+    if (!dependenciesInstalled && (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0)) {
       const result = await installDependenciesAsync({
         cwd,
         pm,
@@ -19444,7 +19496,8 @@ async function installPresets({
   config,
   pm,
   presetIds,
-  includeBiome
+  includeBiome,
+  dependenciesInstalled = false
 }) {
   const orderedPresetIds = resolvePresetInstallOrder(presetIds);
   const installedPresetIds = normalizeInstalledPresets(config);
@@ -19479,7 +19532,7 @@ async function installPresets({
         (dependency) => !currentPlan.devDependencies.includes(dependency)
       )
     };
-    if (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0) {
+    if (!dependenciesInstalled && (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0)) {
       const result = await installDependenciesAsync({
         cwd,
         pm,
@@ -22834,7 +22887,7 @@ async function promptPresets(cwd, options = {}) {
       mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["railway-bucket"]));
     }
   } else if (storage === "vercel-blob") {
-    const existingToken = readEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim();
+    const existingToken = readProjectEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim();
     const flow = !existingToken && options.provisionVercelBlob ? await options.provisionVercelBlob() : void 0;
     if (flow?.ok && flow.token) {
       persistBlobReadWriteToken(cwd, flow.token);
@@ -22947,6 +23000,14 @@ function validateInitProviderFlags(options) {
   if (options.databasePlan && options.databaseProvider && options.databaseProvider !== "vercel") {
     throw new Error("--database-plan can only be used with --database-provider vercel.");
   }
+  if (options.useExistingResources && !options.yes) {
+    throw new Error("--use-existing-resources requires --yes.");
+  }
+  if (options.useExistingResources && options.databaseProvider && options.databaseProvider !== "manual") {
+    throw new Error(
+      "--use-existing-resources requires --database-provider manual for an existing DATABASE_URL."
+    );
+  }
 }
 function resolveFlagStorageProvider(explicitProvider, integrations) {
   const inferred = Array.from(
@@ -27493,20 +27554,62 @@ function removeExistingAdminPaths(cwd, namespaces) {
   }
   return removed;
 }
+function writeInitJson(context, payload) {
+  context.restoreStdout?.();
+  context.restoreStdout = void 0;
+  context.written = true;
+  console.log(JSON.stringify(payload, null, 2));
+}
 async function runInitCommand(name, options) {
-  let restoreStdout;
+  const jsonContext = {
+    restoreStdout: options.json ? redirectStdoutToStderr() : void 0,
+    written: false
+  };
+  try {
+    await runInitCommandInternal(name, options, jsonContext);
+  } catch (error) {
+    if (options.json && !jsonContext.written) {
+      const message = error instanceof Error ? error.message : String(error);
+      writeInitJson(jsonContext, {
+        success: false,
+        phase: "initialization",
+        error: {
+          code: "UNEXPECTED_INIT_ERROR",
+          message: redactSecrets(message)
+        }
+      });
+    }
+    throw error;
+  } finally {
+    jsonContext.restoreStdout?.();
+  }
+}
+async function runInitCommandInternal(name, options, jsonContext) {
+  const exitInit = (phase, message, code = "INIT_FAILED") => {
+    if (options.json) {
+      writeInitJson(jsonContext, {
+        success: false,
+        phase,
+        error: {
+          code,
+          message: redactSecrets(message)
+        }
+      });
+    }
+    process.exit(1);
+  };
   if (options.json) {
     if (!options.yes) {
-      p26.log.error("--json requires --yes.");
-      process.exit(1);
+      const message = "--json requires --yes.";
+      p26.log.error(message);
+      exitInit("validation", message, "JSON_REQUIRES_YES");
     }
-    restoreStdout = redirectStdoutToStderr();
   }
   installPromptCheckmarks();
   const disposeCancelGuard = installSetupCancelGuard();
   renderInitBanner();
-  let selectedPresets;
-  let selectedIntegrations;
+  let selectedPresets = [];
+  let selectedIntegrations = [];
   let flagStorageProvider;
   try {
     validateInitProviderFlags(options);
@@ -27518,8 +27621,9 @@ async function runInitCommand(name, options) {
     }
   } catch (error) {
     disposeCancelGuard();
-    p26.log.error(error instanceof Error ? error.message : String(error));
-    process.exit(1);
+    const message = error instanceof Error ? error.message : String(error);
+    p26.log.error(message);
+    exitInit("validation", message, "INVALID_OPTIONS");
   }
   let cwd = process.cwd();
   let projectName = path52.basename(cwd);
@@ -27529,8 +27633,9 @@ async function runInitCommand(name, options) {
     try {
       namespace = validateAdminNamespace(options.namespace);
     } catch (error) {
-      p26.log.error(error instanceof Error ? error.message : String(error));
-      process.exit(1);
+      const message = error instanceof Error ? error.message : String(error);
+      p26.log.error(message);
+      exitInit("validation", message, "INVALID_NAMESPACE");
     }
   }
   let projectPrompt;
@@ -27538,8 +27643,9 @@ async function runInitCommand(name, options) {
     try {
       projectPrompt = options.yes ? resolveNonInteractiveProject(name) : await promptProject(name);
     } catch (error) {
-      p26.log.error(error instanceof Error ? error.message : String(error));
-      process.exit(1);
+      const message = error instanceof Error ? error.message : String(error);
+      p26.log.error(message);
+      exitInit("project", message, "PROJECT_SETUP_FAILED");
     }
   }
   if (!options.yes && !options.namespace) {
@@ -27570,8 +27676,9 @@ async function runInitCommand(name, options) {
   if (project2.isExisting) {
     srcDir = project2.hasSrcDir;
     if (!project2.hasTypeScript) {
-      p26.log.error("TypeScript is required. Please add a tsconfig.json first.");
-      process.exit(1);
+      const message = "TypeScript is required. Please add a tsconfig.json first.";
+      p26.log.error(message);
+      exitInit("project", message, "TYPESCRIPT_REQUIRED");
     }
     if (forceMode) {
       const nuked = removeExistingAdminPaths(cwd, await resolveForceInitNamespaces(cwd, namespace));
@@ -27587,10 +27694,9 @@ async function runInitCommand(name, options) {
       );
       p26.note(conflictLines.join("\n"), pc10.yellow("Conflicts"));
       if (options.yes) {
-        p26.log.error(
-          "Can't continue with --yes while admin files conflict. Re-run with --force to remove them first."
-        );
-        process.exit(1);
+        const message = "Can't continue with --yes while admin files conflict. Re-run with --force to remove them first.";
+        p26.log.error(message);
+        exitInit("project", message, "ADMIN_FILES_CONFLICT");
       }
       const proceed = await p26.confirm({
         message: [
@@ -27665,7 +27771,7 @@ async function runInitCommand(name, options) {
   ${pc10.cyan(`npx create-next-app@latest ${freshProject.projectName} --typescript --tailwind --app`)}
   Then run ${pc10.cyan("betterstart init")} inside it.`
       );
-      process.exit(1);
+      exitInit("project", createNextAppResult.error, "CREATE_NEXT_APP_FAILED");
     }
     cwd = path52.resolve(cwd, freshProject.projectName);
     const hasPackageJson = fs41.existsSync(path52.join(cwd, "package.json"));
@@ -27683,7 +27789,11 @@ async function runInitCommand(name, options) {
   ${pc10.cyan(manualCmd)}
   Then run ${pc10.cyan("betterstart init")} inside it.`
       );
-      process.exit(1);
+      exitInit(
+        "project",
+        "create-next-app completed but the project was not created.",
+        "CREATE_NEXT_APP_INCOMPLETE"
+      );
     }
     createNextAppSpinner.clear();
     project2 = detectProject(cwd, namespace);
@@ -27695,7 +27805,8 @@ async function runInitCommand(name, options) {
   let railwayDatabaseServiceName;
   let railwayBucketResourceName;
   let railwayBucketUrlStyle;
-  const existingDbUrl = readExistingDbUrl(cwd);
+  const existingDatabase = readExistingDbUrl(cwd);
+  const existingDbUrl = existingDatabase?.value;
   const getRailwaySession = () => {
     railwaySessionPromise ??= createRailwaySession({
       cwd,
@@ -27727,24 +27838,28 @@ async function runInitCommand(name, options) {
   try {
     validateResolvedDatabaseProvider(databaseProvider, options);
   } catch (error) {
-    p26.log.error(error instanceof Error ? error.message : String(error));
-    process.exit(1);
+    const message = error instanceof Error ? error.message : String(error);
+    p26.log.error(message);
+    exitInit("providers", message, "INVALID_DATABASE_PROVIDER");
   }
   if (databaseProvider === "manual") {
     const candidate = options.databaseUrl ?? existingDbUrl ?? promptedManualUrl;
     if (candidate && !isValidDbUrl(candidate)) {
-      p26.log.error(
-        `Invalid database URL. Must start with ${pc10.cyan("postgres://")} or ${pc10.cyan("postgresql://")}`
-      );
-      process.exit(1);
+      const message = "Invalid database URL. Must start with postgres:// or postgresql://";
+      p26.log.error(message);
+      exitInit("providers", message, "INVALID_DATABASE_URL");
     }
     if (candidate) {
       databaseUrl = candidate;
       if (existingDbUrl === candidate && !options.databaseUrl) {
         p26.log.info(
-          `Using the existing DATABASE_URL from .env.local ${pc10.dim(`(${maskDbUrl(candidate)})`)}`
+          `Using the existing DATABASE_URL from ${existingDatabase?.source ?? "project env"} ${pc10.dim(`(${maskDbUrl(candidate)})`)}`
         );
       }
+    } else if (options.useExistingResources) {
+      const message = "DATABASE_URL is missing from the project environment files.";
+      p26.log.error(message);
+      exitInit("providers", message, "MISSING_DATABASE_URL");
     } else if (!options.yes) {
       databaseUrl = await promptConnectionString();
     }
@@ -27761,10 +27876,9 @@ async function runInitCommand(name, options) {
       persistDatabaseUrl(cwd, databaseUrl);
       dismissVercelSignedInNote = flow.dismissSignedInNote;
     } else if (options.yes) {
-      p26.log.error(
-        flow.ok ? "Created a Neon database, but DATABASE_URL could not be retrieved from Vercel." : "Vercel database provisioning did not complete."
-      );
-      process.exit(1);
+      const message = flow.ok ? "Created a Neon database, but DATABASE_URL could not be retrieved from Vercel." : "Vercel database provisioning did not complete.";
+      p26.log.error(message);
+      exitInit("providers", message, "DATABASE_PROVISIONING_FAILED");
     } else if (flow.ok) {
       openBrowserVercelNeonResource(flow.dashboardUrl ?? flow.resourceUrl);
       databaseUrl = await promptConnectionString();
@@ -27784,8 +27898,9 @@ async function runInitCommand(name, options) {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (options.yes) {
-        p26.log.error(`Railway database provisioning failed: ${message}`);
-        process.exit(1);
+        const failureMessage = `Railway database provisioning failed: ${message}`;
+        p26.log.error(failureMessage);
+        exitInit("providers", failureMessage, "DATABASE_PROVISIONING_FAILED");
       }
       p26.log.warn(`Railway database provisioning failed: ${message}`);
       p26.log.info("Falling back to a manual database connection string.");
@@ -27830,27 +27945,39 @@ async function runInitCommand(name, options) {
       storage
     };
     if (storage === "r2") {
-      const missingR2Keys = R2_ENV_KEYS.filter((key) => !readEnvVar(cwd, key)?.trim());
+      const missingR2Keys = R2_ENV_KEYS.filter((key) => !readProjectEnvVar(cwd, key)?.trim());
       if (options.yes && missingR2Keys.length > 0) {
-        p26.log.error(
-          `Cloudflare R2 is missing required environment variables: ${missingR2Keys.join(", ")}.`
-        );
-        process.exit(1);
+        const message = `Cloudflare R2 is missing required environment variables: ${missingR2Keys.join(", ")}.`;
+        p26.log.error(message);
+        exitInit("providers", message, "MISSING_STORAGE_CREDENTIALS");
       }
       mergeCollectedIntegrationConfig(await collectIntegrationConfig(cwd, ["r2"]));
     } else if (storage === "railway-bucket") {
       if (hasRailwayBucketConfig(cwd)) {
         mergeCollectedIntegrationConfig(await collectIntegrationConfig(cwd, ["railway-bucket"]));
+      } else if (options.useExistingResources) {
+        const missingKeys = RAILWAY_BUCKET_ENV_KEYS.filter(
+          (key) => !readProjectEnvVar(cwd, key)?.trim()
+        );
+        const message = `Railway Bucket is missing required environment variables: ${missingKeys.join(", ")}.`;
+        p26.log.error(message);
+        exitInit("providers", message, "MISSING_STORAGE_CREDENTIALS");
       } else {
         const flow = await provisionRailwayBucket();
         if (flow.ok && flow.config) {
           mergeCollectedIntegrationConfig(flow.config);
         } else if (options.yes) {
-          p26.log.error("Railway bucket provisioning did not complete.");
-          process.exit(1);
+          const message = "Railway bucket provisioning did not complete.";
+          p26.log.error(message);
+          exitInit("providers", message, "STORAGE_PROVISIONING_FAILED");
         }
       }
-    } else if (storage === "vercel-blob" && !readEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim()) {
+    } else if (storage === "vercel-blob" && !readProjectEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim()) {
+      if (options.useExistingResources) {
+        const message = "BLOB_READ_WRITE_TOKEN is missing from the project environment files.";
+        p26.log.error(message);
+        exitInit("providers", message, "MISSING_STORAGE_CREDENTIALS");
+      }
       const flow = await runVercelBlobFlow({
         cwd,
         projectName,
@@ -27865,8 +27992,9 @@ async function runInitCommand(name, options) {
         });
         collectedIntegrationConfig.overwriteKeys.add("BLOB_READ_WRITE_TOKEN");
       } else if (options.yes) {
-        p26.log.error("Vercel Blob provisioning did not complete.");
-        process.exit(1);
+        const message = "Vercel Blob provisioning did not complete.";
+        p26.log.error(message);
+        exitInit("providers", message, "STORAGE_PROVISIONING_FAILED");
       } else {
         p26.log.warn(
           "Continuing without a Blob token \u2014 add BLOB_READ_WRITE_TOKEN to .env.local from the store on vercel.com/dashboard/stores."
@@ -27903,6 +28031,45 @@ async function runInitCommand(name, options) {
   config.paths = config.frameworkConfig.next.paths;
   config.database.migrationsDir = deriveMigrationsDir(namespace);
   const s = spinner2();
+  const coreDependencyPlan = getDependencyPlan(
+    presetSelection.presets,
+    presetSelection.integrations,
+    project2.linter.type === "none"
+  );
+  const cliDependencyPlan = getCliDependencySyncPlan(cwd);
+  s.start("Installing dependencies, This may take a moment");
+  const depsResult = await installDependenciesAsync({
+    cwd,
+    pm,
+    ...isFreshProject && pm === "pnpm" ? { pnpmAllowedBuilds: [...FRESH_PNPM_ALLOWED_BUILDS] } : {},
+    dependencies: Array.from(
+      /* @__PURE__ */ new Set([...coreDependencyPlan.dependencies, ...cliDependencyPlan?.dependencies ?? []])
+    ),
+    devDependencies: Array.from(
+      /* @__PURE__ */ new Set([
+        ...coreDependencyPlan.devDependencies,
+        ...cliDependencyPlan?.devDependencies ?? []
+      ])
+    )
+  });
+  if (depsResult.success) {
+    s.stop("");
+  } else {
+    const message = redactSecrets(depsResult.error ?? "Unknown dependency installation error");
+    s.stop("Failed to install dependencies");
+    p26.log.warn(message);
+    p26.log.info(
+      `You can install them manually:
+  ${pc10.cyan(`${pm} add ${depsResult.dependencies.join(" ")}`)}
+  ${pc10.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
+    );
+    disposeCancelGuard();
+    exitInit(
+      "dependencies",
+      message,
+      message.includes("ERR_PNPM_UNEXPECTED_STORE") ? "PNPM_UNEXPECTED_STORE" : "DEPENDENCY_INSTALL_FAILED"
+    );
+  }
   s.start("Directory structure");
   scaffoldBase({
     cwd,
@@ -27970,36 +28137,6 @@ async function runInitCommand(name, options) {
       }
     }
   }
-  const coreDependencyPlan = getDependencyPlan([], [], project2.linter.type === "none");
-  const cliDependencyPlan = getCliDependencySyncPlan(cwd);
-  s.start("Installing dependencies, This may take a moment");
-  const depsResult = await installDependenciesAsync({
-    cwd,
-    pm,
-    ...isFreshProject && pm === "pnpm" ? { pnpmAllowedBuilds: [...FRESH_PNPM_ALLOWED_BUILDS] } : {},
-    dependencies: Array.from(
-      /* @__PURE__ */ new Set([...coreDependencyPlan.dependencies, ...cliDependencyPlan?.dependencies ?? []])
-    ),
-    devDependencies: Array.from(
-      /* @__PURE__ */ new Set([
-        ...coreDependencyPlan.devDependencies,
-        ...cliDependencyPlan?.devDependencies ?? []
-      ])
-    )
-  });
-  if (depsResult.success) {
-    s.stop("");
-  } else {
-    s.stop("Failed to install dependencies");
-    p26.log.warn(depsResult.error ?? "Unknown error");
-    p26.log.info(
-      `You can install them manually:
-  ${pc10.cyan(`${pm} add ${depsResult.dependencies.join(" ")}`)}
-  ${pc10.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
-    );
-    disposeCancelGuard();
-    process.exit(1);
-  }
   process.stdout.write("\x1B[2A\x1B[J");
   s.start("Generating core schemas");
   const coreSchemasResult = scaffoldCoreSchemas({ cwd, config });
@@ -28013,7 +28150,8 @@ async function runInitCommand(name, options) {
       pm,
       presetIds: presetSelection.presets,
       interactive: !options.yes,
-      includeBiome: project2.linter.type === "none"
+      includeBiome: project2.linter.type === "none",
+      dependenciesInstalled: true
     });
   })() : Promise.resolve({ installed: [], skipped: [], warnings: [], config });
   const resolvedPresetInstallResult = await presetInstallResult;
@@ -28032,7 +28170,8 @@ async function runInitCommand(name, options) {
       // .env.local, so the install runs without prompting (rule: no
       // mid-scaffold input).
       interactive: false,
-      includeBiome: project2.linter.type === "none"
+      includeBiome: project2.linter.type === "none",
+      dependenciesInstalled: true
     });
   })() : Promise.resolve({
     installed: [],
@@ -28108,8 +28247,9 @@ async function runInitCommand(name, options) {
           clearDbSpinner();
           if (!verification.success) {
             p26.log.warn(verification.error);
-            p26.log.error("Database was not reachable. Aborting setup.");
-            process.exit(1);
+            const message = "Database was not reachable. Aborting setup.";
+            p26.log.error(message);
+            exitInit("database", verification.error, "DATABASE_UNREACHABLE");
           }
         } else {
           clearDbSpinner();
@@ -28123,8 +28263,9 @@ async function runInitCommand(name, options) {
         const pushError = pushResult.error ?? "Unknown error";
         p26.log.warn(pushError);
         if (isDatabaseReachabilityError(pushError)) {
-          p26.log.error("Database was not reachable. Aborting setup.");
-          process.exit(1);
+          const message = "Database was not reachable. Aborting setup.";
+          p26.log.error(message);
+          exitInit("database", pushError, "DATABASE_UNREACHABLE");
         }
         p26.log.info(`You can run it manually: ${pc10.cyan(drizzlePushCommand(pm))}`);
       }
@@ -28149,8 +28290,9 @@ async function runInitCommand(name, options) {
     if (adminCheck.error) {
       p26.log.warn(`Could not verify existing admin account ${pc10.dim(`(${adminCheck.error})`)}`);
       if (isDatabaseReachabilityError(adminCheck.error)) {
-        p26.log.error("Database was not reachable. Aborting setup.");
-        process.exit(1);
+        const message = "Database was not reachable. Aborting setup.";
+        p26.log.error(message);
+        exitInit("database", adminCheck.error, "DATABASE_UNREACHABLE");
       }
     } else if (adminCheck.existingAdmin) {
       const existingAdminLabel = formatAdminIdentity(adminCheck.existingAdmin);
@@ -28259,8 +28401,9 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
           pc10.red("Seed failed")
         );
         if (isDatabaseReachabilityError(seedResult.error)) {
-          p26.log.error("Database was not reachable. Aborting setup.");
-          process.exit(1);
+          const message = "Database was not reachable. Aborting setup.";
+          p26.log.error(message);
+          exitInit("database", seedResult.error, "DATABASE_UNREACHABLE");
         }
       }
     }
@@ -28301,8 +28444,9 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
     deployedUrl = deployFlow.url;
     if (!deployFlow.ok) {
       if (options.yes) {
-        p26.log.error("Vercel deploy did not complete.");
-        process.exit(1);
+        const message = "Vercel deploy did not complete.";
+        p26.log.error(message);
+        exitInit("deployment", message, "DEPLOYMENT_FAILED");
       }
       p26.log.warn("Vercel deploy did not complete; continuing.");
     }
@@ -28324,16 +28468,18 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
       if (!deployFlow.ok) {
         if (deployFlow.detail) p26.log.message(pc10.dim(redactSecrets(deployFlow.detail)));
         if (options.yes) {
-          p26.log.error("Railway deploy did not complete.");
-          process.exit(1);
+          const message = "Railway deploy did not complete.";
+          p26.log.error(message);
+          exitInit("deployment", message, "DEPLOYMENT_FAILED");
         }
         p26.log.warn("Railway deploy did not complete; continuing.");
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (options.yes) {
-        p26.log.error(`Railway deploy failed: ${message}`);
-        process.exit(1);
+        const failureMessage = `Railway deploy failed: ${message}`;
+        p26.log.error(failureMessage);
+        exitInit("deployment", failureMessage, "DEPLOYMENT_FAILED");
       }
       p26.log.warn(`Railway deploy failed: ${message}`);
     }
@@ -28354,26 +28500,20 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
     }
   }
   disposeCancelGuard();
-  if (options.json && restoreStdout) {
-    restoreStdout();
-    console.log(
-      JSON.stringify(
-        {
-          namespace,
-          configPath: CONFIG_FILE_NAME,
-          databaseProvider,
-          storageProvider: presetSelection.storage,
-          deployProvider,
-          presets: presetSelection.presets,
-          integrations: presetSelection.integrations,
-          adminUrl: adminLoginUrl,
-          adminEmail: seedEmail ?? null,
-          deployedUrl: deployedUrl ?? null
-        },
-        null,
-        2
-      )
-    );
+  if (options.json) {
+    writeInitJson(jsonContext, {
+      success: true,
+      namespace,
+      configPath: CONFIG_FILE_NAME,
+      databaseProvider,
+      storageProvider: presetSelection.storage,
+      deployProvider,
+      presets: presetSelection.presets,
+      integrations: presetSelection.integrations,
+      adminUrl: adminLoginUrl,
+      adminEmail: seedEmail ?? null,
+      deployedUrl: deployedUrl ?? null
+    });
     return;
   }
   p26.outro(`Admin ready at ${adminNamespace.routePath}`);
@@ -28382,21 +28522,13 @@ function isValidDbUrl(url) {
   return url.startsWith("postgres://") || url.startsWith("postgresql://");
 }
 function readExistingDbUrl(cwd) {
-  const envPath = path52.join(cwd, ".env.local");
-  if (!fs41.existsSync(envPath)) return void 0;
-  const content = fs41.readFileSync(envPath, "utf-8");
-  for (const line of content.split("\n")) {
-    const trimmed = line.trim();
-    if (trimmed.startsWith("#") || !trimmed.includes("=")) continue;
-    const [key, ...rest] = trimmed.split("=");
-    if (key?.trim() === "DATABASE_URL") {
-      const val = rest.join("=").replace(/^['"]|['"]$/g, "").trim();
-      if (val.length > 0 && !val.startsWith("your_") && val !== "postgresql://..." && isValidDbUrl(val)) {
-        return val;
-      }
-    }
+  const resolved = resolveProjectEnvVar(cwd, "DATABASE_URL");
+  if (!resolved) return void 0;
+  const value = resolved.value.trim();
+  if (value.startsWith("your_") || value === "postgresql://..." || !isValidDbUrl(value)) {
+    return void 0;
   }
-  return void 0;
+  return { ...resolved, value };
 }
 function maskDbUrl(url) {
   try {
@@ -28438,7 +28570,7 @@ var R2_ENV_KEYS = [
   "BETTERSTART_R2_PUBLIC_URL"
 ];
 function hasRailwayBucketConfig(cwd) {
-  return RAILWAY_BUCKET_ENV_KEYS.every((key) => Boolean(readEnvVar(cwd, key)?.trim()));
+  return RAILWAY_BUCKET_ENV_KEYS.every((key) => Boolean(readProjectEnvVar(cwd, key)?.trim()));
 }
 function railwayBucketIntegrationConfig(credentials) {
   return {
@@ -28558,7 +28690,7 @@ main().catch((error) => {
       cwd,
       timeoutMs: 15e3,
       env: {
-        DATABASE_URL: databaseUrl
+        DATABASE_URL: databaseUrl.value
       }
     }
   );