create-macostack 0.6.3 → 0.6.4

package/bin/create-macostack.ts

@@ -6,6 +6,7 @@ import {
     multiselect,
     note,
     outro,
+    password,
     select,
     spinner,
     text,
@@ -134,6 +135,7 @@ Flags:
 Auth (templates are private):
   export GITHUB_TOKEN=github_pat_…   or   gh auth login
   (fine-grained token, Contents: Read-only is enough)
+  No token configured? I'll ask for one when it's needed.
 `);
     process.exit(0);
 }
@@ -158,9 +160,40 @@ const answered = <T>(value: T | symbol): T => {
 const githubToken = (): string | null => {
     const fromEnv = Bun.env.GITHUB_TOKEN ?? Bun.env.GH_TOKEN;
     if (fromEnv) return fromEnv;
-    const gh = Bun.spawnSync(["gh", "auth", "token"], { stdout: "pipe", stderr: "pipe" });
-    const token = gh.exitCode === 0 ? gh.stdout.toString().trim() : "";
-    return token || null;
+    try {
+        const gh = Bun.spawnSync(["gh", "auth", "token"], { stdout: "pipe", stderr: "pipe" });
+        const token = gh.exitCode === 0 ? gh.stdout.toString().trim() : "";
+        return token || null;
+    } catch {
+        return null; // gh isn't installed
+    }
+};
+
+// Resolve a GitHub token, or ask for one when nothing is configured. In --yes
+// mode there's nobody to ask, so it bails with instructions instead.
+const requireGithubToken = async (purpose: string): Promise<string> => {
+    const found = githubToken();
+    if (found) return found;
+    if (flags.yes) {
+        bail(
+            `I need GitHub access to ${purpose} (the repos are private).\n` +
+                "   Easiest: gh auth login\n" +
+                "   Or:      export GITHUB_TOKEN=github_pat_…  (Contents: Read-only)",
+        );
+    }
+    note(
+        `I need GitHub access to ${purpose} (the repos are private).\n` +
+            "A fine-grained token with Contents: Read-only is enough.\n" +
+            "Tip: gh auth login (or export GITHUB_TOKEN=…) skips this question next time.",
+        "GitHub access",
+    );
+    const typed = answered(
+        await password({
+            message: "Paste your GitHub token (input is hidden)",
+            validate: (v) => (v?.trim() ? undefined : "I need a token to continue"),
+        }),
+    );
+    return typed.trim();
 };
 
 const isEmptyDir = (dir: string) =>
@@ -500,29 +533,13 @@ if (present.length > 0) {
         process.exit(0);
     }
     if (action === "docs-update") {
-        const syncToken = githubToken();
-        if (!syncToken) {
-            bail(
-                "I need GitHub access to fetch the docs system (the repo is private).\n" +
-                    "   Easiest: gh auth login\n" +
-                    "   Or:      export GITHUB_TOKEN=github_pat_…  (Contents: Read-only)",
-            );
-            throw ""; // unreachable
-        }
+        const syncToken = await requireGithubToken("fetch the docs system");
         await updateDocs(syncToken, targetRoot);
         outro(`${appName} is up to date ✨`);
         process.exit(0);
     }
     if (action === "docs") {
-        const docsToken = githubToken();
-        if (!docsToken) {
-            bail(
-                "I need GitHub access to download the docs system (the repo is private).\n" +
-                    "   Easiest: gh auth login\n" +
-                    "   Or:      export GITHUB_TOKEN=github_pat_…  (Contents: Read-only)",
-            );
-            throw ""; // unreachable
-        }
+        const docsToken = await requireGithubToken("download the docs system");
         const ok = await scaffoldDocs(docsToken, targetRoot, appName, null);
         if (ok) {
             note(
@@ -571,15 +588,7 @@ if (!selected) {
 // 3. GitHub access — checked before anything is created.
 const owner = flags.owner ?? DEFAULT_OWNER;
 const ref = flags.ref ?? DEFAULT_REF;
-const token = githubToken();
-if (!token) {
-    bail(
-        "I need GitHub access to download the templates (they're private).\n" +
-            "   Easiest: gh auth login\n" +
-            "   Or:      export GITHUB_TOKEN=github_pat_…  (Contents: Read-only)",
-    );
-    throw ""; // unreachable
-}
+const token = await requireGithubToken("download the templates");
 for (const p of selected) {
     p.repo = (p.id === "server" ? flags["server-repo"] : flags["client-repo"]) ?? p.repo;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-macostack",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "description": "Scaffold a production-ready full-stack app from the macostack templates: Bun + Hono + Postgres backend and TanStack web app, each as its own git repo.",
     "license": "MIT",
     "repository": {