create-egregore 0.18.17 → 0.19.0

package/lib/local.js

@@ -539,14 +539,14 @@ async function maybeSetupTelegramGroup(ui, {
   ui.info(`Bot add link: ${ui.cyan(botLink)}`);
   openBrowser(botLink);
 
-  await ui.prompt("Press Enter here after the bot is in the group");
+  await ui.prompt("Press Enter here after the bot is in the group", { hint: "enter continue · ctrl-c quit" });
   ui.note([
     "Step 4: In Telegram, copy a group invite link.",
     "Paste it below so teammate invites include the Telegram group too.",
     "If you skip this, Egregore will still work, but invites will not include Telegram.",
   ]);
 
-  const groupLink = await ui.prompt("Telegram group join link (paste here, or Enter to skip)");
+  const groupLink = await ui.prompt("Telegram group join link (paste here, or Enter to skip)", { hint: "paste the link · enter skip" });
   const cleaned = groupLink.trim();
   let storedGroupLink = "";
   if (cleaned && !looksLikeUrl(cleaned)) {
@@ -653,105 +653,178 @@ async function localFounderFlow(ui, ctx = {}) {
   // 2. Get user info
   const user = await getUser(githubToken);
 
-  // 3. Where — we always have a gh token (the only local auth path), which
-  //    carries org read, so we can list the user's accounts and offer a picker.
-  ui.section("Pick a home", "where should this Egregore live?");
-  const s = ui.spinner("Checking your GitHub accounts...");
-  const orgs = await listOrgs(githubToken);
-  s.stop("Accounts loaded");
-
-  let githubOrg, isOrg;
-  if (orgs.length === 0) {
-    githubOrg = user.login;
-    isOrg = false;
-    ui.info(`Using your personal account: ${ui.bold(githubOrg)}`);
-  } else {
-    const orgChoices = [{ label: user.login, description: "Personal account" }];
-    for (const o of orgs) {
-      orgChoices.push({ label: o.login, description: "Organization" });
+  // 3–6. Home → new/existing → naming → repo picker → repo names, as a
+  // step machine so esc walks BACKWARDS through the flow (field request:
+  // a wrong org pick shouldn't mean Ctrl-C and start over). Every answer
+  // lives in `st`, so a revisited step re-offers the previous choice.
+  // Creation (step 7 below) is the point of no return — no back from there.
+  const slugifyName = (s) => (s || "")
+    .toLowerCase()
+    .replace(/[^a-z0-9-]/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-|-$/g, "");
+  const BACK = ui.BACK;
+  const SKIP = Symbol("step-skip"); // deterministic step — passes through in both directions
+
+  const st = {
+    orgs: null,               // fetched once
+    githubOrg: null, isOrg: false,
+    isNewProject: null,
+    orgName: null, description: "", newProjectRepo: null,
+    selectedRepoNames: null,  // raw picker selection (preserved across back)
+    selectedRepos: [],        // enriched {name, base_branch}
+    repoName: null, memoryRepoName: null,
+    reposCache: null,         // {org, repos, teamRepoCount}
+  };
+
+  const stepHome = async () => {
+    if (!st.orgs) {
+      ui.section("Pick a home", "where should this Egregore live?");
+      const s = ui.spinner("Checking your GitHub accounts...");
+      st.orgs = await listOrgs(githubToken);
+      s.stop("Accounts loaded");
+    }
+    if (st.orgs.length === 0) {
+      if (!st.githubOrg) {
+        st.githubOrg = user.login;
+        st.isOrg = false;
+        ui.info(`Using your personal account: ${ui.bold(st.githubOrg)}`);
+      }
+      return SKIP;
     }
     const orgChoice = await ui.choose(
       "Where should Egregore live?",
-      orgChoices,
+      [
+        { label: user.login, description: "Personal account" },
+        ...st.orgs.map((o) => ({ label: o.login, description: "Organization" })),
+      ],
       "Don't see your org? Authorize it for your account on GitHub, then re-run.",
+      { escAction: "back" },
     );
-    githubOrg = orgChoice.label;
-    isOrg = githubOrg !== user.login;
-  }
+    if (orgChoice === BACK) return BACK; // first step — driver clamps to a re-ask
+    st.githubOrg = orgChoice.label;
+    st.isOrg = st.githubOrg !== user.login;
+    return true;
+  };
 
-  // 4. What — new or existing?
-  // If the user came in via the in-repo detection and chose "install
-  // alongside", they already told us they have an existing project — don't
-  // re-ask. Go straight to the existing-project path.
-  let isNewProject;
-  if (ctx.prefilledRepo) {
-    isNewProject = false;
-    ui.info(`${ui.green("→")} existing project — we'll manage ${ui.cyan(ctx.prefilledRepo.localName)} plus any others you pick.`);
-  } else {
+  const stepWorkType = async () => {
+    // In-repo detection already answered this — pass through both ways.
+    if (ctx.prefilledRepo) {
+      if (st.isNewProject === null) {
+        st.isNewProject = false;
+        ui.info(`${ui.green("→")} existing project — we'll manage ${ui.cyan(ctx.prefilledRepo.localName)} plus any others you pick.`);
+      }
+      return SKIP;
+    }
     const action = await ui.choose("What are you working on?", [
       { label: "Starting something new", description: "Create a project from scratch" },
       { label: "Existing project", description: "Connect repos I already have" },
-    ]);
-    isNewProject = action.label.startsWith("Starting");
-  }
+    ], undefined, { escAction: "back" });
+    if (action === BACK) return BACK;
+    st.isNewProject = action.label.startsWith("Starting");
+    return true;
+  };
 
-  // 5. Collect project info
-  ui.section("Name it", "what's this Egregore called?");
-  let orgName, description, selectedRepos = [], newProjectRepo = null;
-
-  if (isNewProject) {
-    orgName = await ui.prompt("name your Egregore (team or group name)", { default: githubOrg });
-    description = await ui.prompt("what are you building? (one line)");
-
-    // Derive the egregore + memory repo names now so we can validate the
-    // optional project repo name against them before the user commits to it.
-    // Matches the final derivation at line ~395 below.
-    const slugifyRepo = (s) => s.toLowerCase()
-      .replace(/[^a-z0-9-]/g, "-")
-      .replace(/-+/g, "-")
-      .replace(/^-|-$/g, "") || "egregore";
-    const predictedRepoName = slugifyRepo(orgName);
-    const predictedMemoryRepoName = `${predictedRepoName}-memory`;
-
-    // Ask about project repo
-    ui.note([
-      "Your Egregore gets its own repo (memory + config) in your account.",
-      "Have a code project too? Egregore can add a repo for it in your account.",
-    ]);
+  const stepNameManifest = async () => {
+    // One live manifest instead of scattered naming prompts: name the thing
+    // first, watch the repo plan derive from it in place, override any line.
+    // Every collision check runs against names VISIBLE on screen — the old
+    // flow rejected a code-repo name for colliding with an Egregore repo
+    // name the user had never been shown.
+    console.log("");
+    const isNew = st.isNewProject;
+    const validSlug = (v) => (slugifyName(v)
+      ? null
+      : "That doesn't produce a valid repo name. Try letters, numbers, and dashes.");
+    const fields = [
+      {
+        key: "orgName",
+        label: "Egregore",
+        note: "team or group name",
+        hint: "type your preferred Egregore name or hit enter to pick the naming below",
+        initial: st.orgName || undefined,
+        derive: () => st.githubOrg,
+      },
+      {
+        key: "repoName",
+        label: "Egregore repo",
+        note: "config + skills",
+        hint: `enter keeps this name · type to change · created in ${st.githubOrg}`,
+        tree: true,
+        initial: st.repoName || undefined,
+        derive: (v) => slugifyName(v.orgName) || "egregore",
+        normalize: (raw) => slugifyName(raw),
+        validate: (v) => validSlug(v),
+      },
+      {
+        key: "memoryRepoName",
+        label: "memory repo",
+        note: "shared memory",
+        hint: "enter keeps this name · type to change",
+        tree: true,
+        initial: st.memoryRepoName || undefined,
+        derive: (v) => `${v.repoName || "egregore"}-memory`,
+        normalize: (raw) => slugifyName(raw),
+        validate: (v, others) => validSlug(v)
+          || (v === others.repoName ? "Memory repo can't share the Egregore repo's name." : null),
+      },
+      ...(isNew ? [{
+        key: "codeRepo",
+        label: "code repo",
+        note: "your project · optional",
+        hint: "add a repo for your code project — or enter to skip",
+        tree: true,
+        optional: true,
+        initial: st.newProjectRepo || undefined,
+        normalize: (raw) => slugifyName(raw),
+        validate: (v, others) => validSlug(v)
+          || (v === others.repoName ? `"${v}" is the Egregore repo above. Pick a different name — say, ${v}-app.` : null)
+          || (v === others.memoryRepoName ? `"${v}" is the memory repo above. Pick a different name.` : null),
+      }] : []),
+    ];
+    const result = await ui.manifestForm({
+      title: "Name it",
+      subtitle: `repos land in ${st.githubOrg}`,
+      fields,
+    });
+    if (result === BACK) return BACK;
+    const v = result.values;
+    st.orgName = v.orgName;
+    st.repoName = v.repoName;
+    st.memoryRepoName = v.memoryRepoName;
+    st.newProjectRepo = isNew ? (v.codeRepo || null) : null;
+    return true;
+  };
 
-    while (true) {
-      const projectName = await ui.prompt("code project repo name (Enter to skip)");
-      if (!projectName) {
-        newProjectRepo = null;
-        break;
-      }
-      const slug = slugifyRepo(projectName);
-      if (!slug) {
-        ui.warn("That doesn't produce a valid repo name. Try letters, numbers, and dashes.");
-        continue;
-      }
-      if (slug === predictedRepoName) {
-        ui.warn(`"${slug}" is already the name of your Egregore repo. Pick a different name.`);
-        ui.info(`  ${ui.dim("suggestion:")} ${ui.cyan(`${slug}-app`)}`);
-        continue;
-      }
-      if (slug === predictedMemoryRepoName) {
-        ui.warn(`"${slug}" collides with your memory repo. Pick a different name.`);
-        continue;
-      }
-      newProjectRepo = slug;
-      break;
+  // The one-liner is repo metadata, not a naming decision — it lives OUTSIDE
+  // the manifest so enter on the name lands directly in the naming tree
+  // (the manifest's hint promises exactly that).
+  const stepDescription = async () => {
+    if (!st.isNewProject) {
+      st.description = "";
+      return SKIP;
     }
-  } else {
-    // "Existing project"
-    orgName = await ui.prompt("what should we call this Egregore?", { default: githubOrg });
-    description = "";
+    console.log("");
+    const desc = await ui.promptOrBack("what are you building? (one line)", {
+      default: st.description || undefined,
+      hint: "one line on what you're making · enter to skip · ↑ back",
+    });
+    if (desc === BACK) return BACK;
+    st.description = desc;
+    return true;
+  };
 
+  const stepRepos = async () => {
+    if (st.isNewProject) {
+      st.selectedRepoNames = null;
+      st.selectedRepos = [];
+      return SKIP;
+    }
     // Auto-adopt the user's current repo if it's under the chosen GitHub owner.
     const autoAdopt =
       ctx.prefilledRepo &&
       ctx.prefilledRepo.owner &&
-      ctx.prefilledRepo.owner.toLowerCase() === githubOrg.toLowerCase()
+      ctx.prefilledRepo.owner.toLowerCase() === st.githubOrg.toLowerCase()
         ? ctx.prefilledRepo.name
         : null;
 
@@ -759,47 +832,58 @@ async function localFounderFlow(ui, ctx = {}) {
     // 500 most recently updated repos, which buries a team's repos in a big
     // org — so the user's team repos are loaded too and boosted to the top,
     // and typing in the picker live-searches the WHOLE org (see
-    // searchOrgRepos), so no repo is unreachable.
-    const s0 = ui.spinner("Loading repos...");
-    let repos = [];
-    let teamRepoCount = 0;
-    try {
-      const [orgRepos, teams] = await Promise.all([
-        listOrgRepos(githubToken, githubOrg, isOrg),
-        isOrg ? listUserTeams(githubToken, githubOrg) : Promise.resolve([]),
-      ]);
-      const teamRepoLists = await Promise.all(
-        teams.map((t) => listTeamRepos(githubToken, githubOrg, t.slug).catch(() => [])),
-      );
-      const seen = new Set();
-      for (const list of teamRepoLists) {
-        for (const r of list) {
+    // searchOrgRepos), so no repo is unreachable. The load is cached per
+    // owner so back-navigation doesn't refetch.
+    if (!st.reposCache || st.reposCache.org !== st.githubOrg) {
+      const s0 = ui.spinner("Loading repos...");
+      const repos = [];
+      let teamRepoCount = 0;
+      try {
+        const [orgRepos, teams] = await Promise.all([
+          listOrgRepos(githubToken, st.githubOrg, st.isOrg),
+          st.isOrg ? listUserTeams(githubToken, st.githubOrg) : Promise.resolve([]),
+        ]);
+        const teamRepoLists = await Promise.all(
+          teams.map((t) => listTeamRepos(githubToken, st.githubOrg, t.slug).catch(() => [])),
+        );
+        const seen = new Set();
+        for (const list of teamRepoLists) {
+          for (const r of list) {
+            if (seen.has(r.name)) continue;
+            seen.add(r.name);
+            repos.push(r);
+          }
+        }
+        teamRepoCount = repos.length;
+        for (const r of orgRepos) {
           if (seen.has(r.name)) continue;
           seen.add(r.name);
           repos.push(r);
         }
+        s0.stop(teamRepoCount > 0 ? `Loaded repos — your teams' ${teamRepoCount} first` : "Loaded repos");
+      } catch {
+        s0.stop("Could not load repos");
       }
-      teamRepoCount = repos.length;
-      for (const r of orgRepos) {
-        if (seen.has(r.name)) continue;
-        seen.add(r.name);
-        repos.push(r);
-      }
-      s0.stop(teamRepoCount > 0 ? `Loaded repos — your teams' ${teamRepoCount} first` : "Loaded repos");
-    } catch {
-      s0.stop("Could not load repos");
+      st.reposCache = { org: st.githubOrg, repos, teamRepoCount };
     }
+    const repos = st.reposCache.repos;
 
     const filtered = autoAdopt ? repos.filter((r) => r.name !== autoAdopt) : repos;
     if (autoAdopt) {
       console.log("");
       ui.info(`${ui.cyan(autoAdopt)} will be managed automatically (your current repo)`);
     }
-    selectedRepos = await ui.multiSelect(
+    const picked = await ui.multiSelect(
       "Which other repos should Egregore manage?",
       filtered,
-      { remoteSearch: (term) => searchOrgRepos(githubToken, githubOrg, isOrg, term) },
+      {
+        remoteSearch: (term) => searchOrgRepos(githubToken, st.githubOrg, st.isOrg, term),
+        preselected: st.selectedRepoNames || [],
+        escAction: "back",
+      },
     );
+    if (picked === BACK) return BACK;
+    let selectedRepos = picked;
 
     // Non-interactive terminals get no live search — keep a typed-names
     // escape hatch there, validated so a typo doesn't become a ghost repo.
@@ -808,11 +892,11 @@ async function localFounderFlow(ui, ctx = {}) {
       for (const raw of (extraRaw || "").split(",")) {
         const name = raw.trim();
         if (!name || selectedRepos.includes(name)) continue;
-        if (await repoExists(githubToken, githubOrg, name)) {
+        if (await repoExists(githubToken, st.githubOrg, name)) {
           selectedRepos.push(name);
           ui.success(`Added ${name}`);
         } else {
-          ui.warn(`No repo ${githubOrg}/${name} — skipping`);
+          ui.warn(`No repo ${st.githubOrg}/${name} — skipping`);
         }
       }
     }
@@ -820,6 +904,7 @@ async function localFounderFlow(ui, ctx = {}) {
       selectedRepos.unshift(autoAdopt);
     }
     if (autoAdopt) skipRepos.add(autoAdopt);
+    st.selectedRepoNames = [...selectedRepos];
 
     // Detect default branch for each selected repo and convert to {name, base_branch} format
     if (selectedRepos.length > 0) {
@@ -827,14 +912,13 @@ async function localFounderFlow(ui, ctx = {}) {
       const reposWithBranch = [];
       for (const repoName of selectedRepos) {
         try {
-          const info = await detectRepoBranches(githubToken, githubOrg, repoName);
+          const info = await detectRepoBranches(githubToken, st.githubOrg, repoName);
           reposWithBranch.push({ name: repoName, base_branch: info ? info.defaultBranch : "main" });
         } catch {
           reposWithBranch.push({ name: repoName, base_branch: "main" });
         }
       }
       s0b.stop("Checked branches");
-      // Replace flat list with enriched objects
       selectedRepos = reposWithBranch;
       console.log("");
       ui.info("Detected branch setup:");
@@ -843,42 +927,48 @@ async function localFounderFlow(ui, ctx = {}) {
       }
       console.log("");
     }
+    st.selectedRepos = selectedRepos;
+    return true;
+  };
+
+  // Direction-aware driver: BACK rewinds one step; SKIP (deterministic
+  // steps) passes through in whichever direction we're moving, so backing
+  // over an auto-answered step doesn't bounce the user forward again.
+  // ALL naming (Egregore + repo plan) happens in the manifest BEFORE the
+  // existing-project repo picker — name the thing first, then attach repos.
+  const steps = [stepHome, stepWorkType, stepNameManifest, stepDescription, stepRepos];
+  let stepIdx = 0;
+  let stepDir = 1;
+  while (stepIdx < steps.length) {
+    const result = await steps[stepIdx]();
+    if (result === BACK) {
+      stepDir = -1;
+      stepIdx = Math.max(0, stepIdx - 1);
+      continue;
+    }
+    if (result === SKIP) {
+      stepIdx += stepDir;
+      if (stepIdx < 0) { stepIdx = 0; stepDir = 1; }
+      continue;
+    }
+    stepDir = 1;
+    stepIdx++;
   }
 
-  // 6. Derive repo names from team name — then let the founder edit them.
-  // Creating repos with silently derived names was a repeated field
-  // complaint: founders want to choose what lands in their org.
-  const slugifyName = (s) => (s || "")
-    .toLowerCase()
-    .replace(/[^a-z0-9-]/g, "-")
-    .replace(/-+/g, "-")
-    .replace(/^-|-$/g, "");
+  const githubOrg = st.githubOrg;
+  const isOrg = st.isOrg;
+  const isNewProject = st.isNewProject;
+  const orgName = st.orgName;
+  const description = st.description;
+  let newProjectRepo = st.newProjectRepo;
+  let selectedRepos = st.selectedRepos;
+  const repoName = st.repoName;
+  const memoryRepoName = st.memoryRepoName;
   const nameSlug = slugifyName(orgName) || "egregore";
   // Org slug prefixed with GitHub owner — globally unique across all egregores
   const ghPrefix = slugifyName(githubOrg);
   const slug = ghPrefix === nameSlug ? nameSlug : `${ghPrefix}-${nameSlug}`;
 
-  console.log("");
-  ui.note([
-    `Two repos will be created in ${ui.bold(githubOrg)}: the Egregore repo`,
-    "(config + skills) and its shared-memory repo. Enter keeps the defaults.",
-  ]);
-  let repoName;
-  for (;;) {
-    repoName = slugifyName(await ui.prompt("Egregore repo name", { default: nameSlug }));
-    if (!repoName) { ui.warn("That doesn't produce a valid repo name. Try letters, numbers, and dashes."); continue; }
-    if (newProjectRepo && repoName === newProjectRepo) { ui.warn(`"${repoName}" is already your project repo. Pick a different name.`); continue; }
-    break;
-  }
-  let memoryRepoName;
-  for (;;) {
-    memoryRepoName = slugifyName(await ui.prompt("memory repo name", { default: `${repoName}-memory` }));
-    if (!memoryRepoName) { ui.warn("That doesn't produce a valid repo name. Try letters, numbers, and dashes."); continue; }
-    if (memoryRepoName === repoName) { ui.warn("Memory repo can't share the Egregore repo's name."); continue; }
-    if (newProjectRepo && memoryRepoName === newProjectRepo) { ui.warn(`"${memoryRepoName}" is already your project repo. Pick a different name.`); continue; }
-    break;
-  }
-
   // Guard: if egregore repo already exists with a config, don't overwrite
   console.log("");
   const s1 = ui.spinner("Checking for existing Egregore...");
@@ -1067,7 +1157,10 @@ async function localFounderFlow(ui, ctx = {}) {
 
   // 14. "What should we call you?" + write state
   ui.section("Your name", "this is how teammates will see you in handoffs");
-  const displayName = await ui.prompt("what should we call you?", { default: user.login });
+  const displayName = await ui.prompt("what should we call you?", {
+    default: user.login,
+    hint: `type a display name · enter keeps ${user.login}`,
+  });
   const memberRole = await ensureInstallerMemberRole(
     { usage_type: "founder_group", member_role: ctx.memberRole },
     {},