create-op-node 0.10.5 → 0.10.7

package/dist/cli.js

@@ -645,6 +645,37 @@ var initCommand = new Command("init").description(
   ).default(false)
 ).addOption(new Option("-y, --yes", "Skip the final confirmation").default(false)).action(async (opts) => {
   p3.intro(pc2.bgCyan(pc2.black(" create-op-node init ")));
+  printWelcomeNote(opts);
+  const region = await resolveRegion(opts);
+  const owner = opts.owner ?? "OpusPopuli";
+  const newRepoName = `opuspopuli-node-${region}`;
+  const newRepoFull = `${owner}/${newRepoName}`;
+  warnIgnoredLocalOnlyFlags(opts);
+  const publicConfig = opts.localOnly ? null : await collectPublicConfig(opts);
+  const ghToken = await resolveGhToken(opts);
+  const keychain = await detectKeychain();
+  printSecretStoreNote(keychain);
+  await confirmPlan({ opts, region, owner, newRepoFull, publicConfig });
+  const created = await createRegionRepo({ opts, ghToken, owner, newRepoName, newRepoFull, region });
+  if (publicConfig) {
+    await seedRepoSecrets({ publicConfig, newRepoFull });
+  }
+  const pr = publicConfig ? await openInfraPr({ opts, ghToken, region, newRepoFull, publicConfig, created }) : null;
+  await persistPgsodiumKey({ keychain, opts, region });
+  if (!publicConfig) {
+    printLocalOnlyOutro({ region, newRepoFull });
+    return;
+  }
+  if (!pr) {
+    throw new Error("init: PR creation step did not run despite publicConfig present");
+  }
+  const proceed = await pauseForMerge({ pr, opts });
+  if (!proceed) return;
+  const tunnelToken = await fetchTunnelToken({ publicConfig });
+  await persistTunnelToken({ keychain, region, tunnelToken });
+  printDoneOutro(region);
+});
+function printWelcomeNote(opts) {
   p3.note(
     opts.localOnly ? [
       "Local-only setup \u2014 creates the region repo from template + a pgsodium key.",
@@ -663,32 +694,30 @@ var initCommand = new Command("init").description(
     ].join("\n"),
     "Welcome"
   );
-  const region = opts.region ? opts.region : unwrap(
+}
+async function resolveRegion(opts) {
+  return opts.region ? opts.region : unwrap(
     await p3.text({
       message: "Short region label (used as the Keychain service suffix + R2 prefix)?",
       placeholder: "us-ca",
       validate: (v) => /^[a-z0-9-]{2,32}$/.test(v ?? "") ? void 0 : "lowercase letters, digits, hyphens; 2\u201332 chars"
     })
   );
-  const owner = opts.owner ?? "OpusPopuli";
-  const newRepoName = `opuspopuli-node-${region}`;
-  const newRepoFull = `${owner}/${newRepoName}`;
-  if (opts.localOnly) {
-    const ignored = listIgnoredLocalOnlyFlags(opts);
-    if (ignored.length > 0) {
-      p3.note(
-        pc2.yellow(
-          `\u26A0 The following ${ignored.length === 1 ? "flag is" : "flags are"} ignored with --local-only:
+}
+function warnIgnoredLocalOnlyFlags(opts) {
+  if (!opts.localOnly) return;
+  const ignored = listIgnoredLocalOnlyFlags(opts);
+  if (ignored.length === 0) return;
+  p3.note(
+    pc2.yellow(
+      `\u26A0 The following ${ignored.length === 1 ? "flag is" : "flags are"} ignored with --local-only:
   ${ignored.join(", ")}
-` + pc2.dim(
-            "These configure Cloudflare / TFC / PR-merge flow, which --local-only skips."
-          )
-        ),
-        "Notice"
-      );
-    }
-  }
-  const publicConfig = opts.localOnly ? null : await collectPublicConfig(opts);
+` + pc2.dim("These configure Cloudflare / TFC / PR-merge flow, which --local-only skips.")
+    ),
+    "Notice"
+  );
+}
+async function resolveGhToken(opts) {
   let ghToken = opts.ghToken;
   if (!ghToken) {
     const fromCli = await ghTokenFromCli();
@@ -709,10 +738,15 @@ var initCommand = new Command("init").description(
       "github"
     );
   }
-  const keychain = await detectKeychain();
+  return ghToken;
+}
+function printSecretStoreNote(keychain) {
   const kcNote = keychain.available ? `\u2713 macOS Keychain available \u2014 pgsodium key + Tunnel token will be saved to your login keychain.
 ` + pc2.dim("Note: items don't sync to iCloud Keychain via the security CLI.\n") + pc2.dim("On the Studio, bootstrap will read locally and prompt you to paste if missing.") : `\u26A0 ${keychain.reason ?? "Keychain unavailable"}. Secrets will be printed for manual stash.`;
   p3.note(kcNote, "Secret store");
+}
+async function confirmPlan(args) {
+  const { opts, region, owner, newRepoFull, publicConfig } = args;
   const orgWriteAccess = pc2.dim(`required for ${owner}`);
   p3.note(
     opts.localOnly ? [
@@ -739,20 +773,19 @@ var initCommand = new Command("init").description(
     ].join("\n"),
     "Plan"
   );
-  if (!opts.yes) {
-    const go = unwrap(
-      await p3.confirm({ message: "Proceed?", initialValue: true })
-    );
-    if (!go) {
-      p3.cancel("Cancelled.");
-      process.exit(0);
-    }
+  if (opts.yes) return;
+  const go = unwrap(await p3.confirm({ message: "Proceed?", initialValue: true }));
+  if (!go) {
+    p3.cancel("Cancelled.");
+    process.exit(0);
   }
+}
+async function createRegionRepo(args) {
+  const { opts, ghToken, owner, newRepoName, newRepoFull, region } = args;
   const repoSpin = p3.spinner();
   repoSpin.start(`Creating ${newRepoFull} from ${opts.template}\u2026`);
-  let created;
   try {
-    created = await createRepoFromTemplate({
+    const created = await createRepoFromTemplate({
       token: ghToken,
       template: opts.template ?? "OpusPopuli/opuspopuli-node",
       owner,
@@ -760,6 +793,7 @@ var initCommand = new Command("init").description(
       description: `Opus Populi node deployment for ${region}`
     });
     repoSpin.stop(pc2.green(`\u2713 Created ${created.fullName}`));
+    return { fullName: created.fullName, defaultBranch: created.defaultBranch };
   } catch (err) {
     const status = typeof err === "object" && err !== null && "status" in err ? err.status : 0;
     const message = err.message ?? "unknown error";
@@ -781,154 +815,155 @@ var initCommand = new Command("init").description(
       );
       process.exit(0);
     }
-    created = {
-      fullName: newRepoFull,
-      htmlUrl: `https://github.com/${newRepoFull}`,
-      defaultBranch: "main"
-    };
-  }
-  if (publicConfig) {
-    const secrets = [
-      { name: "CLOUDFLARE_API_TOKEN", value: publicConfig.cfToken },
-      { name: "CLOUDFLARE_ACCOUNT_ID", value: publicConfig.cfAccount },
-      { name: "CLOUDFLARE_ZONE_ID", value: publicConfig.cfZone },
-      { name: "TF_API_TOKEN", value: publicConfig.tfToken },
-      { name: "TF_CLOUD_ORGANIZATION", value: publicConfig.tfOrg }
-    ];
-    const secSpin = p3.spinner();
-    secSpin.start(`Seeding ${secrets.length} repo secrets\u2026`);
-    const seeded = [];
-    for (const s of secrets) {
-      const r = await setRepoSecret({ repo: newRepoFull, name: s.name, value: s.value });
-      if (!r.written) {
-        secSpin.stop(pc2.red(`\u2717 Failed to set ${s.name}: ${r.reason ?? "unknown"}`));
-        const remaining = secrets.slice(secrets.findIndex((x) => x.name === s.name)).map((x) => x.name);
-        p3.cancel(
-          [
-            seeded.length > 0 ? `Already seeded on ${newRepoFull}: ${seeded.join(", ")}.` : `Nothing seeded yet on ${newRepoFull}.`,
-            `Still pending: ${remaining.join(", ")}.`,
-            "",
-            `Make sure \`gh\` is installed and signed in (\`gh auth login\`).`,
-            `Re-run with --use-existing-repo to retry (GitHub will overwrite the already-set secrets idempotently).`
-          ].join("\n")
-        );
-        process.exit(1);
-      }
-      seeded.push(s.name);
-    }
-    secSpin.stop(pc2.green(`\u2713 Seeded ${secrets.length} secrets on ${newRepoFull}`));
+    return { fullName: newRepoFull, defaultBranch: "main" };
   }
-  let pr = null;
-  if (publicConfig) {
-    const branch = `init/region-${region}-${isoStampUtc(/* @__PURE__ */ new Date())}`;
-    const setupSpin = p3.spinner();
-    setupSpin.start(`Writing prod.tfvars on branch ${branch}\u2026`);
-    try {
-      await createBranch({
-        token: ghToken,
-        repo: newRepoFull,
-        branch,
-        fromBranch: created.defaultBranch
-      });
-      const tfvars = renderProdTfvars({
-        project: opts.project ?? "opuspopuli",
-        domain: publicConfig.domain
-      });
-      await commitFile({
-        token: ghToken,
-        repo: newRepoFull,
-        branch,
-        path: "infra/cloudflare/environments/prod.tfvars",
-        content: tfvars,
-        message: `init: prod.tfvars for ${region}`
-      });
-    } catch (err) {
-      setupSpin.stop(pc2.red(`\u2717 Couldn't write tfvars: ${err.message}`));
-      p3.cancel("The repo exists but the branch / commit failed. Open it on GitHub and inspect.");
-      process.exit(1);
-    }
-    setupSpin.stop(pc2.green("\u2713 Wrote prod.tfvars"));
-    const prSpin = p3.spinner();
-    prSpin.start("Opening pull request\u2026");
-    try {
-      pr = await openPullRequest({
-        token: ghToken,
-        repo: newRepoFull,
-        head: branch,
-        base: created.defaultBranch,
-        title: `init: bring up region ${region}`,
-        body: [
-          `Initial region deployment for **${region}** (${publicConfig.domain}).`,
-          "",
-          "Adds `infra/cloudflare/environments/prod.tfvars`. Merging this PR triggers",
-          "`cloudflare-infra.yml` which runs `terraform apply` against the",
-          `\`${publicConfig.tfOrg}\` Terraform Cloud organization, provisioning the Cloudflare`,
-          "Tunnel, DNS records, R2 buckets, and Pages project.",
+}
+async function seedRepoSecrets(args) {
+  const { publicConfig, newRepoFull } = args;
+  const secrets = [
+    { name: "CLOUDFLARE_API_TOKEN", value: publicConfig.cfToken },
+    { name: "CLOUDFLARE_ACCOUNT_ID", value: publicConfig.cfAccount },
+    { name: "CLOUDFLARE_ZONE_ID", value: publicConfig.cfZone },
+    { name: "TF_API_TOKEN", value: publicConfig.tfToken },
+    { name: "TF_CLOUD_ORGANIZATION", value: publicConfig.tfOrg }
+  ];
+  const secSpin = p3.spinner();
+  secSpin.start(`Seeding ${secrets.length} repo secrets\u2026`);
+  const seeded = [];
+  for (const s of secrets) {
+    const r = await setRepoSecret({ repo: newRepoFull, name: s.name, value: s.value });
+    if (!r.written) {
+      secSpin.stop(pc2.red(`\u2717 Failed to set ${s.name}: ${r.reason ?? "unknown"}`));
+      const remaining = secrets.slice(secrets.findIndex((x) => x.name === s.name)).map((x) => x.name);
+      p3.cancel(
+        [
+          seeded.length > 0 ? `Already seeded on ${newRepoFull}: ${seeded.join(", ")}.` : `Nothing seeded yet on ${newRepoFull}.`,
+          `Still pending: ${remaining.join(", ")}.`,
           "",
-          `Generated by \`create-op-node init\`.`
+          `Make sure \`gh\` is installed and signed in (\`gh auth login\`).`,
+          `Re-run with --use-existing-repo to retry (GitHub will overwrite the already-set secrets idempotently).`
         ].join("\n")
-      });
-    } catch (err) {
-      prSpin.stop(pc2.red(`\u2717 Couldn't open PR: ${err.message}`));
-      p3.cancel("Branch + tfvars are committed; open the PR by hand on GitHub.");
+      );
       process.exit(1);
     }
+    seeded.push(s.name);
+  }
+  secSpin.stop(pc2.green(`\u2713 Seeded ${secrets.length} secrets on ${newRepoFull}`));
+}
+async function openInfraPr(args) {
+  const { opts, ghToken, region, newRepoFull, publicConfig, created } = args;
+  const branch = `init/region-${region}-${isoStampUtc(/* @__PURE__ */ new Date())}`;
+  const setupSpin = p3.spinner();
+  setupSpin.start(`Writing prod.tfvars on branch ${branch}\u2026`);
+  try {
+    await createBranch({
+      token: ghToken,
+      repo: newRepoFull,
+      branch,
+      fromBranch: created.defaultBranch
+    });
+    const tfvars = renderProdTfvars({
+      project: opts.project ?? "opuspopuli",
+      domain: publicConfig.domain
+    });
+    await commitFile({
+      token: ghToken,
+      repo: newRepoFull,
+      branch,
+      path: "infra/cloudflare/environments/prod.tfvars",
+      content: tfvars,
+      message: `init: prod.tfvars for ${region}`
+    });
+  } catch (err) {
+    setupSpin.stop(pc2.red(`\u2717 Couldn't write tfvars: ${err.message}`));
+    p3.cancel("The repo exists but the branch / commit failed. Open it on GitHub and inspect.");
+    process.exit(1);
+  }
+  setupSpin.stop(pc2.green("\u2713 Wrote prod.tfvars"));
+  const prSpin = p3.spinner();
+  prSpin.start("Opening pull request\u2026");
+  try {
+    const pr = await openPullRequest({
+      token: ghToken,
+      repo: newRepoFull,
+      head: branch,
+      base: created.defaultBranch,
+      title: `init: bring up region ${region}`,
+      body: [
+        `Initial region deployment for **${region}** (${publicConfig.domain}).`,
+        "",
+        "Adds `infra/cloudflare/environments/prod.tfvars`. Merging this PR triggers",
+        "`cloudflare-infra.yml` which runs `terraform apply` against the",
+        `\`${publicConfig.tfOrg}\` Terraform Cloud organization, provisioning the Cloudflare`,
+        "Tunnel, DNS records, R2 buckets, and Pages project.",
+        "",
+        `Generated by \`create-op-node init\`.`
+      ].join("\n")
+    });
     prSpin.stop(pc2.green(`\u2713 Opened PR #${pr.number}`));
+    return pr;
+  } catch (err) {
+    prSpin.stop(pc2.red(`\u2717 Couldn't open PR: ${err.message}`));
+    p3.cancel("Branch + tfvars are committed; open the PR by hand on GitHub.");
+    process.exit(1);
   }
+}
+async function persistPgsodiumKey(args) {
+  const { keychain, opts, region } = args;
   const pgsodiumCoords = { region, account: "pgsodium-root-key" };
   const keyLabel = `org.opuspopuli.${region}/pgsodium-root-key`;
-  if (keychain.available) {
-    const existing = opts.overwrite ? null : await readSecret(pgsodiumCoords);
-    if (existing && /^[a-f0-9]{64}$/.test(existing)) {
-      p3.note(
-        `${pc2.green("\u2713")} Re-using existing pgsodium master key from Keychain (${pc2.cyan(keyLabel)}). Pass --overwrite to rotate.`,
-        "Secret"
-      );
-    } else {
-      const fresh = generatePgsodiumRootKey();
-      const r = await saveSecret(pgsodiumCoords, fresh);
-      if (r.written) {
-        p3.note(
-          `${pc2.green("\u2713")} pgsodium master key${r.updated ? " rotated" : " saved"} to Keychain as ${pc2.cyan(keyLabel)}.`,
-          "Secret"
-        );
-      } else {
-        await printKeyForManualSave(fresh, keyLabel, r.reason);
-      }
-    }
-  } else {
-    const fresh = generatePgsodiumRootKey();
-    await printKeyForManualSave(fresh, keyLabel);
+  if (!keychain.available) {
+    const fresh2 = generatePgsodiumRootKey();
+    await printKeyForManualSave(fresh2, keyLabel);
+    return;
   }
-  if (!publicConfig) {
-    p3.outro(
-      pc2.cyan(
-        [
-          `Region ${region} provisioned for local-only mode.`,
-          `Repo: https://github.com/${newRepoFull}`,
-          ``,
-          `Next: on the Studio (fresh or otherwise \u2014 bootstrap installs`,
-          `brew packages it needs), run:`,
-          `  npx create-op-node bootstrap --region ${region} --local-only`,
-          ``,
-          `When you're ready to expose publicly, re-run BOTH \`init\` and`,
-          `\`bootstrap\` without --local-only. Same region repo + pgsodium key`,
-          `promote cleanly to the production-shaped deploy.`
-        ].join("\n")
-      )
+  const existing = opts.overwrite ? null : await readSecret(pgsodiumCoords);
+  if (existing && /^[a-f0-9]{64}$/.test(existing)) {
+    p3.note(
+      `${pc2.green("\u2713")} Re-using existing pgsodium master key from Keychain (${pc2.cyan(keyLabel)}). Pass --overwrite to rotate.`,
+      "Secret"
     );
     return;
   }
-  if (!pr) {
-    throw new Error("init: PR creation step did not run despite publicConfig present");
+  const fresh = generatePgsodiumRootKey();
+  const r = await saveSecret(pgsodiumCoords, fresh);
+  if (r.written) {
+    p3.note(
+      `${pc2.green("\u2713")} pgsodium master key${r.updated ? " rotated" : " saved"} to Keychain as ${pc2.cyan(keyLabel)}.`,
+      "Secret"
+    );
+  } else {
+    await printKeyForManualSave(fresh, keyLabel, r.reason);
   }
+}
+function printLocalOnlyOutro(args) {
+  const { region, newRepoFull } = args;
+  p3.outro(
+    pc2.cyan(
+      [
+        `Region ${region} provisioned for local-only mode.`,
+        `Repo: https://github.com/${newRepoFull}`,
+        ``,
+        `Next: on the Studio (fresh or otherwise \u2014 bootstrap installs`,
+        `brew packages it needs), run:`,
+        `  npx create-op-node bootstrap --region ${region} --local-only`,
+        ``,
+        `When you're ready to expose publicly, re-run BOTH \`init\` and`,
+        `\`bootstrap\` without --local-only. Same region repo + pgsodium key`,
+        `promote cleanly to the production-shaped deploy.`
+      ].join("\n")
+    )
+  );
+}
+async function pauseForMerge(args) {
+  const { pr, opts } = args;
   if (opts.skipWait) {
     p3.outro(
       pc2.cyan(
         `Review + merge ${pr.htmlUrl} when ready. Re-run with no --skip-wait or run \`npx create-op-node verify\` afterwards.`
       )
     );
-    return;
+    return false;
   }
   p3.note(
     [
@@ -939,15 +974,17 @@ var initCommand = new Command("init").description(
     ].join("\n"),
     "Next step: review + merge"
   );
-  const merged = unwrap(
-    await p3.confirm({ message: "PR merged?", initialValue: false })
-  );
+  const merged = unwrap(await p3.confirm({ message: "PR merged?", initialValue: false }));
   if (!merged) {
     p3.outro(
       pc2.cyan(`No worries \u2014 re-run \`create-op-node init --skip-wait\` later to skip this step, or finish manually.`)
     );
-    return;
+    return false;
   }
+  return true;
+}
+async function fetchTunnelToken(args) {
+  const { publicConfig } = args;
   const ws = await findWorkspace({
     token: publicConfig.tfToken,
     organization: publicConfig.tfOrg,
@@ -971,27 +1008,33 @@ var initCommand = new Command("init").description(
     );
     process.exit(1);
   }
+  return tunnelToken;
+}
+async function persistTunnelToken(args) {
+  const { keychain, region, tunnelToken } = args;
   const tunnelCoords = { region, account: "tunnel-token" };
   const tunnelLabel = `org.opuspopuli.${region}/tunnel-token`;
-  if (keychain.available) {
-    const r = await saveSecret(tunnelCoords, tunnelToken);
-    if (r.written) {
-      p3.note(
-        `${pc2.green("\u2713")} Tunnel token saved to Keychain as ${pc2.cyan(tunnelLabel)}.`,
-        "Secret"
-      );
-    } else {
-      await printKeyForManualSave(tunnelToken, tunnelLabel, r.reason);
-    }
-  } else {
+  if (!keychain.available) {
     await printKeyForManualSave(tunnelToken, tunnelLabel);
+    return;
   }
+  const r = await saveSecret(tunnelCoords, tunnelToken);
+  if (r.written) {
+    p3.note(
+      `${pc2.green("\u2713")} Tunnel token saved to Keychain as ${pc2.cyan(tunnelLabel)}.`,
+      "Secret"
+    );
+  } else {
+    await printKeyForManualSave(tunnelToken, tunnelLabel, r.reason);
+  }
+}
+function printDoneOutro(region) {
   p3.outro(
     pc2.cyan(
       `Region ${region} is provisioned. Next: \`npx create-op-node bootstrap\` on the Mac Studio.`
     )
   );
-});
+}
 var MIN_TOKEN_LENGTH = {
   cloudflare: 40,
   tfc: 40,
@@ -1989,6 +2032,10 @@ async function locateOrCloneRepo(input) {
   return { kind: "cloned", path: target };
 }
 
+// src/lib/assert.ts
+function assertNever(_value) {
+}
+
 // src/commands/bootstrap.ts
 var PUBLIC_PROFILES = ["public"];
 var LOCAL_PROFILES = [];
@@ -2036,6 +2083,33 @@ var bootstrapCommand = new Command("bootstrap").description(
   ).default(false)
 ).addOption(new Option("-y, --yes", "Skip confirmation prompts").default(false)).action(async (opts) => {
   p3.intro(pc2.bgCyan(pc2.black(" create-op-node bootstrap ")));
+  const nodeType = await selectNodeType(opts);
+  const region = await resolveRegion2(opts);
+  const owner = opts.owner ?? "OpusPopuli";
+  const repoName = `opuspopuli-node-${region}`;
+  const composeFile = opts.composeFile ?? defaultComposeFiles(opts);
+  const llmModelChoice = opts.llmModel ?? await selectLlmModel(opts);
+  const [embeddingModel, llmModel] = resolveModels({
+    llmModel: llmModelChoice,
+    ...opts.embeddingModel !== void 0 ? { embeddingModel: opts.embeddingModel } : {}
+  });
+  await runSystemChecksPhase();
+  await runBrewPhase(opts);
+  await ensureGhAuth();
+  await promptTailscaleSignin();
+  const repoPath = await locateRegionRepoPhase(opts, owner, repoName);
+  await unlockKeychainPhase();
+  const secrets = await collectSecretsPhase({ region, nodeType, opts });
+  await runLaunchAgentPhase({ opts, secrets, llmModel, embeddingModel });
+  await installWrapperPhase({ repoPath, region, promptServiceUrl: secrets.promptServiceUrl });
+  await loginGhcrPhase();
+  await runOllamaPhase({ opts, embeddingModel, llmModel });
+  await runStackPhase({ opts, repoPath, region, composeFile, secrets, llmModel, embeddingModel });
+});
+function defaultComposeFiles(opts) {
+  return opts.localOnly ? ["docker-compose-prod.yml"] : ["docker-compose-prod.yml", "docker-compose-backup.yml"];
+}
+async function selectNodeType(opts) {
   const nodeType = opts.nodeType ? opts.nodeType : unwrap(
     await p3.select({
       message: "What kind of node are you provisioning?",
@@ -2062,22 +2136,18 @@ var bootstrapCommand = new Command("bootstrap").description(
     );
     process.exit(1);
   }
-  const region = opts.region ? opts.region : unwrap(
+  return nodeType;
+}
+async function resolveRegion2(opts) {
+  return opts.region ? opts.region : unwrap(
     await p3.text({
       message: "Region label (the slug used during init \u2014 e.g. us-ca)?",
       placeholder: "us-ca",
       validate: (v) => /^[a-z0-9-]{2,32}$/.test(v ?? "") ? void 0 : "lowercase letters, digits, hyphens; 2\u201332 chars"
     })
   );
-  const owner = opts.owner ?? "OpusPopuli";
-  const repoName = `opuspopuli-node-${region}`;
-  const composeFileDefault = opts.localOnly ? ["docker-compose-prod.yml"] : ["docker-compose-prod.yml", "docker-compose-backup.yml"];
-  const composeFile = opts.composeFile ?? composeFileDefault;
-  const llmModelChoice = opts.llmModel ?? await selectLlmModel(opts);
-  const [embeddingModel, llmModel] = resolveModels({
-    llmModel: llmModelChoice,
-    ...opts.embeddingModel !== void 0 ? { embeddingModel: opts.embeddingModel } : {}
-  });
+}
+async function runSystemChecksPhase() {
   const sysSpin = p3.spinner();
   sysSpin.start("Inspecting macOS\u2026");
   const snap = await inspectSystem();
@@ -2122,54 +2192,55 @@ var bootstrapCommand = new Command("bootstrap").description(
       if (!r.ok) p3.note(`${pc2.red("\u2717")} ${r.reason}`, "pmset failed");
     }
   }
-  if (!opts.skipBrew) {
-    const brewInfo = await detectBrew();
-    if (!brewInfo.installed) {
-      p3.note(
-        [
-          `Homebrew is not installed. Open another shell and run:`,
-          "",
-          pc2.cyan(HOMEBREW_INSTALL_COMMAND),
-          "",
-          pc2.dim("Then come back and press Enter.")
-        ].join("\n"),
-        "Manual step"
-      );
-      unwrap(await p3.confirm({ message: "Homebrew installed?", initialValue: true }));
-    }
-    const brewSpin = p3.spinner();
-    brewSpin.start("Installing Studio packages\u2026 (~5\u201315 min first run)");
-    const report = await installPackages(STUDIO_PACKAGES, (pkg, status) => {
-      brewSpin.message(`${status}: ${pkg.name}`);
-    });
-    brewSpin.stop(
-      report.failed.length === 0 ? pc2.green(
-        `\u2713 ${report.installed.length} installed, ${report.alreadyPresent.length} already present`
-      ) : pc2.yellow(
-        `\u26A0 ${report.installed.length} installed, ${report.alreadyPresent.length} present, ${report.failed.length} failed`
-      )
+}
+async function runBrewPhase(opts) {
+  if (opts.skipBrew) return;
+  const brewInfo = await detectBrew();
+  if (!brewInfo.installed) {
+    p3.note(
+      [
+        `Homebrew is not installed. Open another shell and run:`,
+        "",
+        pc2.cyan(HOMEBREW_INSTALL_COMMAND),
+        "",
+        pc2.dim("Then come back and press Enter.")
+      ].join("\n"),
+      "Manual step"
     );
-    if (report.failed.length > 0) {
-      p3.note(
-        [
-          report.failed.map((f) => `${pc2.red("\u2022")} ${f.pkg.name}: ${f.reason}`).join("\n"),
-          "",
-          pc2.dim("A partial install usually fails downstream (Docker / Ollama / compose)."),
-          pc2.dim("Install the failed packages manually and re-run with --skip-brew.")
-        ].join("\n"),
-        "Brew failures"
-      );
-      const cont = unwrap(
-        await p3.confirm({
-          message: "Continue anyway? (Default no \u2014 recommended to fix and re-run.)",
-          initialValue: false
-        })
-      );
-      if (!cont) process.exit(1);
-    }
+    unwrap(await p3.confirm({ message: "Homebrew installed?", initialValue: true }));
   }
-  await ensureGhAuth();
-  await promptTailscaleSignin();
+  const brewSpin = p3.spinner();
+  brewSpin.start("Installing Studio packages\u2026 (~5\u201315 min first run)");
+  const report = await installPackages(STUDIO_PACKAGES, (pkg, status) => {
+    brewSpin.message(`${status}: ${pkg.name}`);
+  });
+  brewSpin.stop(
+    report.failed.length === 0 ? pc2.green(
+      `\u2713 ${report.installed.length} installed, ${report.alreadyPresent.length} already present`
+    ) : pc2.yellow(
+      `\u26A0 ${report.installed.length} installed, ${report.alreadyPresent.length} present, ${report.failed.length} failed`
+    )
+  );
+  if (report.failed.length > 0) {
+    p3.note(
+      [
+        report.failed.map((f) => `${pc2.red("\u2022")} ${f.pkg.name}: ${f.reason}`).join("\n"),
+        "",
+        pc2.dim("A partial install usually fails downstream (Docker / Ollama / compose)."),
+        pc2.dim("Install the failed packages manually and re-run with --skip-brew.")
+      ].join("\n"),
+      "Brew failures"
+    );
+    const cont = unwrap(
+      await p3.confirm({
+        message: "Continue anyway? (Default no \u2014 recommended to fix and re-run.)",
+        initialValue: false
+      })
+    );
+    if (!cont) process.exit(1);
+  }
+}
+async function locateRegionRepoPhase(opts, owner, repoName) {
   const repoSpin = p3.spinner();
   repoSpin.start("Locating your region node repo\u2026");
   const located = await locateOrCloneRepo({
@@ -2187,6 +2258,9 @@ var bootstrapCommand = new Command("bootstrap").description(
   repoSpin.stop(
     located.kind === "cloned" ? pc2.green(`\u2713 Cloned ${owner}/${repoName} to ${repoPath}`) : pc2.green(`\u2713 Found region repo at ${repoPath}`)
   );
+  return repoPath;
+}
+async function unlockKeychainPhase() {
   const keychain = await detectKeychain();
   if (!keychain.available) {
     p3.cancel(
@@ -2219,6 +2293,9 @@ var bootstrapCommand = new Command("bootstrap").description(
     }
     p3.note(`${pc2.green("\u2713")} Keychain unlocked for this session.`, "Keychain");
   }
+}
+async function collectCoreSecrets(args) {
+  const { region, opts } = args;
   const pgsodiumKey = await loadSecret({
     region,
     account: "pgsodium-root-key",
@@ -2272,6 +2349,18 @@ var bootstrapCommand = new Command("bootstrap").description(
     validate: (v) => URL_SAFE_PASSWORD_RE.test(v) ? void 0 : "must be base64url chars only (no + / =)",
     generate: generateDashboardPassword
   });
+  return {
+    pgsodiumKey,
+    tunnelToken,
+    postgresPassword,
+    jwtSecret,
+    supabaseAnonKey,
+    supabaseServiceRoleKey,
+    dashboardPassword
+  };
+}
+async function collectPromptServiceSecrets(args) {
+  const { region, nodeType, opts } = args;
   if (nodeType === "region-with-prompts") {
     await loadSecret({
       region,
@@ -2315,6 +2404,9 @@ var bootstrapCommand = new Command("bootstrap").description(
     );
     process.exit(1);
   }
+  return promptServiceUrl;
+}
+async function resolveSupabaseUrl(opts) {
   let supabaseUrl;
   if (opts.supabaseUrl) {
     supabaseUrl = opts.supabaseUrl;
@@ -2338,32 +2430,44 @@ var bootstrapCommand = new Command("bootstrap").description(
     );
     process.exit(1);
   }
-  if (!opts.skipLaunchAgent) {
-    const laSpin = p3.spinner();
-    laSpin.start("Writing pgsodium key file + LaunchAgent plist\u2026");
-    const la = await setupLaunchAgent({
-      pgsodiumKey,
-      ...tunnelToken !== void 0 ? { tunnelToken } : {},
-      llmModel,
-      embeddingModel,
-      postgresPassword,
-      jwtSecret,
-      supabaseAnonKey,
-      supabaseServiceRoleKey,
-      dashboardPassword,
-      supabaseUrl
-    });
-    if (!la.ok) {
-      laSpin.stop(pc2.red(`\u2717 LaunchAgent step ${la.step} failed.`));
-      p3.cancel(la.reason ?? "LaunchAgent setup failed.");
-      process.exit(1);
-    }
-    laSpin.stop(
-      pc2.green(
-        `\u2713 LaunchAgent loaded (${la.paths.plistFile})${opts.localOnly ? " \u2014 local-only mode, no TUNNEL_TOKEN set" : ""}.`
-      )
-    );
+  return supabaseUrl;
+}
+async function collectSecretsPhase(args) {
+  const core = await collectCoreSecrets({ region: args.region, opts: args.opts });
+  const promptServiceUrl = await collectPromptServiceSecrets(args);
+  const supabaseUrl = await resolveSupabaseUrl(args.opts);
+  return { ...core, promptServiceUrl, supabaseUrl };
+}
+async function runLaunchAgentPhase(args) {
+  const { opts, secrets, llmModel, embeddingModel } = args;
+  if (opts.skipLaunchAgent) return;
+  const laSpin = p3.spinner();
+  laSpin.start("Writing pgsodium key file + LaunchAgent plist\u2026");
+  const la = await setupLaunchAgent({
+    pgsodiumKey: secrets.pgsodiumKey,
+    ...secrets.tunnelToken !== void 0 ? { tunnelToken: secrets.tunnelToken } : {},
+    llmModel,
+    embeddingModel,
+    postgresPassword: secrets.postgresPassword,
+    jwtSecret: secrets.jwtSecret,
+    supabaseAnonKey: secrets.supabaseAnonKey,
+    supabaseServiceRoleKey: secrets.supabaseServiceRoleKey,
+    dashboardPassword: secrets.dashboardPassword,
+    supabaseUrl: secrets.supabaseUrl
+  });
+  if (!la.ok) {
+    laSpin.stop(pc2.red(`\u2717 LaunchAgent step ${la.step} failed.`));
+    p3.cancel(la.reason ?? "LaunchAgent setup failed.");
+    process.exit(1);
   }
+  laSpin.stop(
+    pc2.green(
+      `\u2713 LaunchAgent loaded (${la.paths.plistFile})${opts.localOnly ? " \u2014 local-only mode, no TUNNEL_TOKEN set" : ""}.`
+    )
+  );
+}
+async function installWrapperPhase(args) {
+  const { repoPath, region, promptServiceUrl } = args;
   const wrapperSpin = p3.spinner();
   wrapperSpin.start("Installing bin/op-compose wrapper\u2026");
   const wrapper = await installOpComposeWrapper({ repoDir: repoPath, region, promptServiceUrl });
@@ -2373,6 +2477,8 @@ var bootstrapCommand = new Command("bootstrap").description(
     process.exit(1);
   }
   wrapperSpin.stop(pc2.green(`\u2713 Installed ${wrapper.path} (mode 0755).`));
+}
+async function loginGhcrPhase() {
   const ghcrSpin = p3.spinner();
   ghcrSpin.start("Authenticating Docker to ghcr.io\u2026");
   const ghcr = await loginToGhcr();
@@ -2382,45 +2488,66 @@ var bootstrapCommand = new Command("bootstrap").description(
     process.exit(1);
   }
   ghcrSpin.stop(pc2.green("\u2713 Logged in to ghcr.io."));
-  if (!opts.skipOllama) {
-    const olSpin = p3.spinner();
-    olSpin.start(`Pulling + warming Ollama models\u2026 (${estimatedPullTime(llmModel)})`);
-    let olHealth = await checkOllamaHealth();
-    if (!olHealth.reachable) {
-      olSpin.message("Ollama not reachable \u2014 running `brew services start ollama`\u2026");
-      const start = await startOllamaService();
-      if (!start.ok) {
-        olSpin.stop(pc2.red("\u2717 Couldn't start Ollama service."));
-        p3.cancel(
-          `${start.reason ?? "unknown"} \u2014 start it manually with \`brew services start ollama\` and re-run with --skip-brew --skip-launch-agent.`
-        );
-        process.exit(1);
-      }
-      await new Promise((res) => setTimeout(res, 3e3));
-      olHealth = await checkOllamaHealth();
-      if (!olHealth.reachable) {
-        olSpin.stop(
-          pc2.yellow("\u26A0 Ollama service started but daemon not yet answering on :11434.")
-        );
-        p3.cancel(
-          "Give it another few seconds, then re-run with --skip-brew --skip-launch-agent."
-        );
-        process.exit(1);
-      }
+}
+async function runOllamaPhase(args) {
+  const { opts, embeddingModel, llmModel } = args;
+  if (opts.skipOllama) return;
+  const olSpin = p3.spinner();
+  olSpin.start(`Pulling + warming Ollama models\u2026 (${estimatedPullTime(llmModel)})`);
+  let olHealth = await checkOllamaHealth();
+  if (!olHealth.reachable) {
+    olSpin.message("Ollama not reachable \u2014 running `brew services start ollama`\u2026");
+    const start = await startOllamaService();
+    if (!start.ok) {
+      olSpin.stop(pc2.red("\u2717 Couldn't start Ollama service."));
+      p3.cancel(
+        `${start.reason ?? "unknown"} \u2014 start it manually with \`brew services start ollama\` and re-run with --skip-brew --skip-launch-agent.`
+      );
+      process.exit(1);
     }
-    const modelReport = await setupModels([embeddingModel, llmModel], (model, status) => {
-      olSpin.message(`${status}: ${model}`);
-    });
-    olSpin.stop(
-      modelReport.failed.length === 0 ? pc2.green(
-        `\u2713 ${modelReport.pulled.length} pulled, ${modelReport.alreadyPresent.length} present, ${modelReport.warmed.length} warmed`
-      ) : pc2.yellow(`\u26A0 ${modelReport.failed.length} model pull(s) failed`)
-    );
-    const probe = await probeHostDockerInternal();
-    if (!probe.ok) {
-      p3.note(`${pc2.yellow("\u26A0")} ${probe.reason}`, "Docker host networking");
+    await new Promise((res) => setTimeout(res, 3e3));
+    olHealth = await checkOllamaHealth();
+    if (!olHealth.reachable) {
+      olSpin.stop(
+        pc2.yellow("\u26A0 Ollama service started but daemon not yet answering on :11434.")
+      );
+      p3.cancel(
+        "Give it another few seconds, then re-run with --skip-brew --skip-launch-agent."
+      );
+      process.exit(1);
     }
   }
+  const modelReport = await setupModels([embeddingModel, llmModel], (model, status) => {
+    olSpin.message(`${status}: ${model}`);
+  });
+  olSpin.stop(
+    modelReport.failed.length === 0 ? pc2.green(
+      `\u2713 ${modelReport.pulled.length} pulled, ${modelReport.alreadyPresent.length} present, ${modelReport.warmed.length} warmed`
+    ) : pc2.yellow(`\u26A0 ${modelReport.failed.length} model pull(s) failed`)
+  );
+  const probe = await probeHostDockerInternal();
+  if (!probe.ok) {
+    p3.note(`${pc2.yellow("\u26A0")} ${probe.reason}`, "Docker host networking");
+  }
+}
+function buildComposeEnv(args) {
+  const { secrets, llmModel, embeddingModel } = args;
+  return {
+    PGSODIUM_ROOT_KEY: secrets.pgsodiumKey,
+    POSTGRES_PASSWORD: secrets.postgresPassword,
+    JWT_SECRET: secrets.jwtSecret,
+    SUPABASE_ANON_KEY: secrets.supabaseAnonKey,
+    SUPABASE_SERVICE_ROLE_KEY: secrets.supabaseServiceRoleKey,
+    DASHBOARD_PASSWORD: secrets.dashboardPassword,
+    SUPABASE_URL: secrets.supabaseUrl,
+    AUTH_JWT_SECRET: process.env["AUTH_JWT_SECRET"] ?? secrets.jwtSecret,
+    ...secrets.tunnelToken !== void 0 ? { TUNNEL_TOKEN: secrets.tunnelToken } : {},
+    ...llmModel ? { LLM_MODEL: llmModel } : {},
+    ...embeddingModel ? { EMBEDDINGS_MODEL: embeddingModel } : {}
+  };
+}
+async function runStackPhase(args) {
+  const { opts, repoPath, region, composeFile, secrets, llmModel, embeddingModel } = args;
   if (opts.skipStack) {
     const profileFlag = opts.localOnly ? "" : "--profile public ";
     p3.outro(
@@ -2431,19 +2558,7 @@ var bootstrapCommand = new Command("bootstrap").description(
     return;
   }
   const composeFiles = resolveComposeFiles(repoPath, composeFile);
-  const composeEnv = {
-    PGSODIUM_ROOT_KEY: pgsodiumKey,
-    POSTGRES_PASSWORD: postgresPassword,
-    JWT_SECRET: jwtSecret,
-    SUPABASE_ANON_KEY: supabaseAnonKey,
-    SUPABASE_SERVICE_ROLE_KEY: supabaseServiceRoleKey,
-    DASHBOARD_PASSWORD: dashboardPassword,
-    SUPABASE_URL: supabaseUrl,
-    AUTH_JWT_SECRET: process.env["AUTH_JWT_SECRET"] ?? jwtSecret,
-    ...tunnelToken !== void 0 ? { TUNNEL_TOKEN: tunnelToken } : {},
-    ...llmModel ? { LLM_MODEL: llmModel } : {},
-    ...embeddingModel ? { EMBEDDINGS_MODEL: embeddingModel } : {}
-  };
+  const composeEnv = buildComposeEnv({ secrets, llmModel, embeddingModel });
   const composeOpts = {
     files: composeFiles,
     cwd: repoPath,
@@ -2489,9 +2604,25 @@ var bootstrapCommand = new Command("bootstrap").description(
       healthSpin.message(`${healthy}/${running} healthy`);
     }
   });
+  healthSpin.stop(healthOutcomeHeadline(outcome));
+  finishHealthOutcome(outcome, { region, opts, composeFiles });
+}
+function healthOutcomeHeadline(outcome) {
+  switch (outcome.kind) {
+    case "healthy":
+      return pc2.green(`\u2713 All ${outcome.snapshots.length} containers healthy.`);
+    case "unhealthy":
+      return pc2.red(`\u2717 ${outcome.problem}`);
+    case "timeout":
+      return pc2.yellow("\u26A0 Timed out waiting for all containers to report healthy.");
+    default:
+      return assertNever();
+  }
+}
+function finishHealthOutcome(outcome, args) {
+  const { region, opts, composeFiles } = args;
   switch (outcome.kind) {
     case "healthy":
-      healthSpin.stop(pc2.green(`\u2713 All ${outcome.snapshots.length} containers healthy.`));
       if (opts.localOnly) {
         p3.outro(
           pc2.cyan(
@@ -2511,7 +2642,6 @@ var bootstrapCommand = new Command("bootstrap").description(
       }
       return;
     case "unhealthy":
-      healthSpin.stop(pc2.red(`\u2717 ${outcome.problem}`));
       p3.note(
         outcome.snapshots.map((s) => `  ${kvHealth(s.health)} ${s.name} (${s.state})`).join("\n"),
         "Container state"
@@ -2522,7 +2652,6 @@ var bootstrapCommand = new Command("bootstrap").description(
       process.exit(1);
     // eslint-disable-next-line no-fallthrough
     case "timeout":
-      healthSpin.stop(pc2.yellow("\u26A0 Timed out waiting for all containers to report healthy."));
       p3.note(
         outcome.snapshots.map((s) => `  ${kvHealth(s.health)} ${s.name} (${s.state})`).join("\n"),
         "Container state at timeout"
@@ -2532,11 +2661,10 @@ var bootstrapCommand = new Command("bootstrap").description(
       );
       process.exit(1);
     // eslint-disable-next-line no-fallthrough
-    default: {
+    default:
       return;
-    }
   }
-});
+}
 function resolveComposeFiles(repoPath, composeFile) {
   const inputs = composeFile ?? ["docker-compose-prod.yml"];
   return inputs.map((f) => f.startsWith("/") ? f : join(repoPath, f));
@@ -4492,7 +4620,7 @@ async function looksLikeRegionsRepo(dir) {
 }
 
 // src/cli.ts
-var VERSION = "0.10.5";
+var VERSION = "0.10.7";
 var program = new Command();
 program.name("create-op-node").description(
   "Interactive bootstrap for an Opus Populi federation node.\nCloudflare infrastructure \u2192 Mac Studio \u2192 live public API."