betterstart-cli 0.0.73 → 0.0.74

package/dist/cli.js

@@ -115,7 +115,7 @@ 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>", "Railway project to 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("--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)").action(
@@ -22971,6 +22971,16 @@ function parseProjectSummary(value) {
   }
   return { id: project2.id, name: project2.name, workspace };
 }
+var MAX_PROJECT_NAME_ATTEMPTS = 10;
+function versionedRailwayProjectName(base, attempt) {
+  return attempt <= 1 ? base : `${base}-v${attempt}`;
+}
+function railwayProjectNameIsTaken(projects, candidate) {
+  return projects.some((project2) => project2.name.toLowerCase() === candidate.toLowerCase());
+}
+function isRailwayProjectNameConflict(detail) {
+  return /already exists|name.*taken|duplicate.*name/i.test(detail);
+}
 async function readRailwayProjectContext(runner, cwd, environment, env) {
   const result = await runRailway(runner, ["status", "--environment", environment, "--json"], {
     cwd,
@@ -23039,18 +23049,26 @@ ${result.stderr}`) ?? `Could not link Railway project ${project2}.`
     );
   }
 }
-async function createRailwayProject(runner, cwd, projectName, options) {
-  const args = ["init", "--name", projectName, "--json"];
-  if (options.workspace) args.push("--workspace", options.workspace);
-  const result = await runRailway(runner, args, { cwd, mode: "capture", env: options.env });
-  const project2 = result.success ? parseProjectSummary(parseRailwayJson(result.stdout)) : void 0;
-  if (!project2) {
-    throw new Error(
-      railwayOutputTail(`${result.stdout}
-${result.stderr}`) ?? `Could not create Railway project ${projectName}.`
-    );
+async function createRailwayProject(runner, cwd, projectName, existingProjects, options) {
+  const knownProjects = [...existingProjects];
+  for (let attempt = 1; attempt <= MAX_PROJECT_NAME_ATTEMPTS; attempt++) {
+    const candidate = versionedRailwayProjectName(projectName, attempt);
+    if (railwayProjectNameIsTaken(knownProjects, candidate)) continue;
+    const args = ["init", "--name", candidate, "--json"];
+    if (options.workspace) args.push("--workspace", options.workspace);
+    const result = await runRailway(runner, args, { cwd, mode: "capture", env: options.env });
+    const project2 = result.success ? parseProjectSummary(parseRailwayJson(result.stdout)) : void 0;
+    if (project2) return project2;
+    const detail = railwayOutputTail(`${result.stdout}
+${result.stderr}`);
+    if (!detail || !isRailwayProjectNameConflict(detail)) {
+      throw new Error(detail ?? `Could not create Railway project ${candidate}.`);
+    }
+    knownProjects.push({ id: candidate, name: candidate });
   }
-  return project2;
+  throw new Error(
+    `Could not create a unique Railway project name after ${MAX_PROJECT_NAME_ATTEMPTS} attempts.`
+  );
 }
 async function ensureRailwayProject(runner, options) {
   const environment = options.environment?.trim() || "production";
@@ -23063,77 +23081,47 @@ async function ensureRailwayProject(runner, options) {
         env: options.env
       });
     } else {
-      const linked = await readRailwayProjectContext(runner, options.cwd, environment, options.env);
-      if (linked) {
+      let createWorkspace = options.workspace;
+      if (!createWorkspace && options.workspaces?.length === 1) {
+        createWorkspace = options.workspaces[0]?.id;
+      } else if (!createWorkspace && options.interactive && options.workspaces?.length) {
         projectSpinner.clear();
-        return linked;
-      }
-      const projects = options.interactive ? await listRailwayProjects(runner, options.cwd, options.env) : [];
-      projectSpinner.clear();
-      let selectedProject;
-      if (options.interactive && projects.length > 0) {
-        const createValue = "__betterstart_create_railway_project__";
-        const choice = await p15.select({
-          message: "Choose a Railway project",
-          options: [
-            {
-              value: createValue,
-              label: `Create ${options.projectName}`,
-              hint: "new project"
-            },
-            ...projects.map((project2) => ({
-              value: project2.id,
-              label: project2.name,
-              hint: project2.workspace?.name
-            }))
-          ],
-          initialValue: createValue
+        const workspace = await p15.select({
+          message: "Choose a Railway workspace",
+          options: options.workspaces.map((candidate) => ({
+            value: candidate.id,
+            label: candidate.name
+          }))
         });
-        if (p15.isCancel(choice)) {
+        if (p15.isCancel(workspace)) {
           p15.cancel("Setup cancelled.");
           process.exit(0);
         }
-        selectedProject = projects.find((project2) => project2.id === choice);
-      }
-      projectSpinner.start(
-        selectedProject ? `Linking Railway project ${pc2.cyan(selectedProject.name)}` : `Creating Railway project ${pc2.cyan(options.projectName)}`
-      );
-      if (selectedProject) {
-        await linkRailwayProject(runner, options.cwd, selectedProject.id, environment, {
-          workspace: selectedProject.workspace?.id ?? options.workspace,
-          env: options.env
-        });
-      } else {
-        let createWorkspace = options.workspace;
-        if (!createWorkspace && options.workspaces?.length === 1) {
-          createWorkspace = options.workspaces[0]?.id;
-        } else if (!createWorkspace && options.interactive && options.workspaces?.length) {
-          projectSpinner.clear();
-          const workspace = await p15.select({
-            message: "Choose a Railway workspace",
-            options: options.workspaces.map((candidate) => ({
-              value: candidate.id,
-              label: candidate.name
-            }))
-          });
-          if (p15.isCancel(workspace)) {
-            p15.cancel("Setup cancelled.");
-            process.exit(0);
-          }
-          createWorkspace = workspace;
-          projectSpinner.start(`Creating Railway project ${pc2.cyan(options.projectName)}`);
-        }
-        const created = await createRailwayProject(runner, options.cwd, options.projectName, {
+        createWorkspace = workspace;
+        projectSpinner.start("Checking Railway project names");
+      }
+      const projects = await listRailwayProjects(runner, options.cwd, options.env);
+      projectSpinner.start(`Creating Railway project ${pc2.cyan(options.projectName)}`);
+      const created = await createRailwayProject(
+        runner,
+        options.cwd,
+        options.projectName,
+        projects,
+        {
           workspace: createWorkspace,
           env: options.env
-        });
-        if (environment.toLowerCase() !== "production") {
-          await linkRailwayProject(runner, options.cwd, created.id, environment, {
-            workspace: created.workspace?.id ?? options.workspace,
-            env: options.env
-          });
         }
+      );
+      await linkRailwayProject(runner, options.cwd, created.id, environment, {
+        workspace: created.workspace?.id ?? createWorkspace,
+        env: options.env
+      });
+      const context2 = await readRailwayProjectContext(runner, options.cwd, environment, options.env);
+      if (!context2 || context2.id !== created.id) {
+        throw new Error("Railway did not link the newly created project.");
       }
+      projectSpinner.clear();
+      return context2;
     }
     const context = await readRailwayProjectContext(runner, options.cwd, environment, options.env);
     projectSpinner.clear();