create-macostack 0.2.0 → 0.2.1

package/bin/create-macostack.ts

@@ -1,10 +1,8 @@
 #!/usr/bin/env bun
 import {
     cancel,
-    confirm,
     intro,
     isCancel,
-    log,
     multiselect,
     note,
     outro,
@@ -12,11 +10,9 @@ import {
     text,
 } from "@clack/prompts";
 import {
-    closeSync,
     existsSync,
     mkdirSync,
     mkdtempSync,
-    openSync,
     readdirSync,
     rmSync,
 } from "node:fs";
@@ -127,29 +123,6 @@ const answered = <T>(value: T | symbol): T => {
     return value as T;
 };
 
-// The setup wizards downstream are interactive. Under `bun create` / `bunx`,
-// stdin often arrives as a pipe (not a TTY) even though a human is right
-// there — so we hand children the real terminal via /dev/tty.
-const openTty = (): number | null => {
-    try {
-        return openSync("/dev/tty", "r");
-    } catch {
-        return null;
-    }
-};
-
-const run = (command: string[], cwd: string) => {
-    const ttyFd = openTty();
-    const result = Bun.spawnSync(command, {
-        cwd,
-        stdin: ttyFd ?? "inherit",
-        stdout: "inherit",
-        stderr: "inherit",
-    });
-    if (ttyFd !== null) closeSync(ttyFd);
-    return result.exitCode;
-};
-
 const githubToken = (): string | null => {
     const fromEnv = Bun.env.GITHUB_TOKEN ?? Bun.env.GH_TOKEN;
     if (fromEnv) return fromEnv;
@@ -299,19 +272,59 @@ for (const p of selected) {
         );
     }
 
-    // Hand over to the template's own wizard — it knows its modules, we don't.
+    // Configure the template. It OWNS its questions — we fetch them as data
+    // (`setup --questions`), ask them in THIS wizard (nested interactive
+    // prompts don't get keyboard control under `bun create`), and apply the
+    // answers non-interactively (`setup --yes`).
     const pkg = existsSync(resolve(dest, "package.json"))
         ? await Bun.file(resolve(dest, "package.json")).json()
         : null;
     if (!flags["skip-setup"] && pkg?.scripts?.setup) {
-        log.step(`Now shaping the ${p.label.toLowerCase()} — its own wizard takes it from here:`);
-        const args = flags.yes
-            ? ["run", "setup", "--yes", "--name", appName]
-            : ["run", "setup", "--name", appName];
-        const code = run(["bun", ...args], dest);
-        if (code !== 0) {
+        let questions: { modules?: { options: string[]; initial: string[]; exclusive?: string[][] } } | null = null;
+        if (!flags.yes) {
+            const q = Bun.spawnSync(["bun", "run", "setup", "--questions"], {
+                cwd: dest,
+                stdout: "pipe",
+                stderr: "pipe",
+            });
+            if (q.exitCode === 0) {
+                try {
+                    questions = JSON.parse(q.stdout.toString().trim().split("\n").at(-1) ?? "");
+                } catch {}
+            }
+        }
+
+        const setupArgs = ["run", "setup", "--yes", "--name", appName];
+
+        if (questions?.modules) {
+            let chosen: string[];
+            for (;;) {
+                chosen = answered(
+                    await multiselect({
+                        message: `${p.label} — which modules should start ON? (everything stays in the code; off = dormant, ready when you need it)`,
+                        options: questions.modules.options.map((m) => ({ value: m, label: m })),
+                        initialValues: questions.modules.initial,
+                        required: false,
+                    }),
+                );
+                const clash = (questions.modules.exclusive ?? []).find((pair) =>
+                    pair.every((m) => chosen.includes(m)),
+                );
+                if (!clash) break;
+                note(`${clash.join(" and ")} can't both be on — keep one of the two.`, "One thing");
+            }
+            setupArgs.push("--modules", chosen.join(","));
+        }
+
+        const s3 = spinner();
+        s3.start(`${p.label} — applying your setup (modules, fresh secrets, git)`);
+        const setup = Bun.spawnSync(["bun", ...setupArgs], { cwd: dest, stdout: "pipe", stderr: "pipe" });
+        if (setup.exitCode === 0) {
+            s3.stop(`${p.label} — configured`);
+        } else {
+            s3.stop(`${p.label} — setup didn't finish`);
             note(
-                `The ${p.folder} wizard didn't finish. Everything downloaded fine — resume with:\n  cd ${appName}/${p.folder} && bun run setup`,
+                `Everything downloaded fine — just finish it yourself:\n  cd ${appName}/${p.folder} && bun run setup`,
                 "Heads up",
             );
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-macostack",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "Private macostack scaffold orchestrator for detached server/client repos.",
     "type": "module",
     "bin": {