create-egregore 0.18.8 → 0.18.10

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.5.23
+// egregore-launcher-version: 0.5.24
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -30,7 +30,7 @@ const https = require("node:https");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.5.23";
+const VERSION = "0.5.24";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const PUBLIC_NPX_PACKAGE = "create-egregore";
@@ -1429,7 +1429,9 @@ function renderRuntimePanel({ inst, cursor, width, height }) {
   const runtimes = runtimeChoicesFor(inst);
   const stored = storedRuntimeFor(inst);
   const title = inst.slug || inst.name || path.basename(inst.path);
-  const outerWidth = Math.min(Math.max(50, width - 2), 112);
+  // Same cap/margin as renderHeroPanel so the centered box keeps its position
+  // when you move from the instance list to the assistant picker.
+  const outerWidth = Math.min(Math.max(50, width - 2), 126);
   const innerWidth = Math.max(48, outerWidth - 2);
   const margin = " ".repeat(Math.max(0, Math.floor((width - outerWidth) / 2)));
   const label = " assistant ";
@@ -1521,9 +1523,17 @@ async function browser(args = {}) {
 
   // ── render ────────────────────────────
   const render = () => {
+    if (done) return; // the parent stays alive under the spawned assistant — never redraw after teardown
     const w = process.stdout.columns || 80;
     const h = process.stdout.rows || 24;
 
+    // One centered block: the hero/runtime box, the list, dividers, preview and
+    // footer all share this gutter and width so the whole UI centers together
+    // (matches renderHeroPanel's outerWidth/margin math).
+    const blockWidth = Math.min(Math.max(50, w - 2), 126);
+    const gutter = Math.max(0, Math.floor((w - blockWidth) / 2));
+    const M = " ".repeat(gutter);
+
     const out = [];
     // Home AND clear-to-end-of-screen each frame. The per-line ANSI.clearLine
     // calls below are belt-and-suspenders; some terminals (notably Warp) don't
@@ -1575,9 +1585,9 @@ async function browser(args = {}) {
     const listRows = Math.max(4, Math.floor(availableRows * 0.48));
     const previewRows = Math.max(3, availableRows - listRows - 2); // -2 for dividers
 
-    // List
+    // List — kept within the centered block so long paths don't spill past it.
     const listPad = 4;
-    const listAvail = w - listPad * 2;
+    const listAvail = blockWidth - 4;
     const slugW = Math.min(22, Math.max(6, ...registry.map((r) => (r.slug || "").length)));
     const nameW = Math.min(24, Math.max(6, ...registry.map((r) => (r.name || "").length)));
 
@@ -1594,7 +1604,7 @@ async function browser(args = {}) {
       if (idx >= v.length) {
         if (v.length === 0 && i === Math.floor(listRows / 2)) {
           const msg = state.filter ? "(no matches)" : "(empty)";
-          out.push(" ".repeat(listPad) + DIM + msg + RESET + ANSI.clearLine + "\n");
+          out.push(M + " ".repeat(listPad) + DIM + msg + RESET + ANSI.clearLine + "\n");
         } else {
           out.push(ANSI.clearLine + "\n");
         }
@@ -1608,7 +1618,7 @@ async function browser(args = {}) {
         const label = isCursor ? `${BOLD}${item.label}${RESET}` : item.label;
         const desc = `${DIM}${item.description}${RESET}`;
         const line = ` ${cursorMark}    ${pad(plus, slugW)}  ${pad(label, nameW)}  ${truncate(desc, Math.max(0, listAvail - slugW - nameW - 10))}`;
-        out.push(" ".repeat(listPad - 3) + line + ANSI.clearLine + "\n");
+        out.push(M + " ".repeat(listPad - 3) + line + ANSI.clearLine + "\n");
         continue;
       }
       const { e, origIdx } = item;
@@ -1623,11 +1633,11 @@ async function browser(args = {}) {
       const name = pad(e.name || "", nameW);
       const pathDim = `${DIM}${truncate(e.path, Math.max(0, listAvail - slugW - nameW - 10))}${RESET}`;
       const line = ` ${cursorMark} ${defMark}  ${slug}  ${name}  ${pathDim}`;
-      out.push(" ".repeat(listPad - 3) + line + ANSI.clearLine + "\n");
+      out.push(M + " ".repeat(listPad - 3) + line + ANSI.clearLine + "\n");
     }
 
     // Divider
-    out.push(DIM + "  " + "─".repeat(w - 4) + RESET + ANSI.clearLine + "\n");
+    out.push(DIM + M + "─".repeat(blockWidth) + RESET + ANSI.clearLine + "\n");
 
     // Preview
     const previewLines = [];
@@ -1641,15 +1651,20 @@ async function browser(args = {}) {
       previewLines.push(`${DIM}  (no selection)${RESET}`);
     } else {
       const label = (k) => `${DIM}${pad(k, 10)}${RESET}`;
-      previewLines.push(`  ${label("path")} ${selected.path}`);
-      if (pv.org) previewLines.push(`  ${label("org")} ${pv.org} ${DIM}(${pv.githubOrg || "?"})${RESET}`);
+      // A preview line is "  " + label(10) + " " + value = 13 + value; bound the
+      // value to blockWidth-15 so every line's right edge lands two cols inside
+      // the box border, level with the box inner content (gutter+blockWidth-2).
+      const valW = Math.max(16, blockWidth - 15);
+      previewLines.push(`  ${label("path")} ${truncate(selected.path, valW)}`);
+      if (pv.org) previewLines.push(`  ${label("org")} ${truncate(`${pv.org} ${DIM}(${pv.githubOrg || "?"})${RESET}`, valW)}`);
       if (pv.branch) previewLines.push(`  ${label("branch")} ${BOLD}${pv.branch}${RESET}`);
-      if (pv.lastCommit) previewLines.push(`  ${label("last")} ${DIM}${truncate(pv.lastCommit, w - 18)}${RESET}`);
+      if (pv.lastCommit) previewLines.push(`  ${label("last")} ${DIM}${truncate(pv.lastCommit, valW)}${RESET}`);
       if (pv.repos && pv.repos.length) {
-        previewLines.push(`  ${label("repos")} ${pv.repos.slice(0, 4).join(", ")}${pv.repos.length > 4 ? DIM + ` (+${pv.repos.length - 4} more)` + RESET : ""}`);
+        const reposText = `${pv.repos.slice(0, 4).join(", ")}${pv.repos.length > 4 ? ` (+${pv.repos.length - 4} more)` : ""}`;
+        previewLines.push(`  ${label("repos")} ${truncate(reposText, valW)}`);
       }
       if (pv.skills) {
-        const skillLine = selectedWorkflowLine(pv, Math.max(16, w - 20));
+        const skillLine = selectedWorkflowLine(pv, Math.max(16, blockWidth - 20));
         previewLines.push(`  ${label("invoke")} ${skillLine}`);
         previewLines.push(`  ${label("skills")} Codex ${BOLD}${pv.skills.native.length}${RESET} native, ${BOLD}${pv.skills.adapterCount}${RESET} adapters; Claude ${BOLD}${pv.skills.claudeCount || 0}${RESET}`);
       }
@@ -1663,11 +1678,11 @@ async function browser(args = {}) {
     }
     for (let i = 0; i < previewRows; i++) {
       const line = previewLines[i] || "";
-      out.push(line + ANSI.clearLine + "\n");
+      out.push((line ? M + line : "") + ANSI.clearLine + "\n");
     }
 
     // Divider
-    out.push(DIM + "  " + "─".repeat(w - 4) + RESET + ANSI.clearLine + "\n");
+    out.push(DIM + M + "─".repeat(blockWidth) + RESET + ANSI.clearLine + "\n");
 
     // Footer
     let footer;
@@ -1688,13 +1703,13 @@ async function browser(args = {}) {
       const kindColor = state.messageKind === "success" ? GREEN : state.messageKind === "warn" ? YELLOW : CYAN;
       footer = `  ${kindColor}●${RESET} ${state.message}${ANSI.clearLine}`;
     } else {
-      footer = w < 96
+      footer = blockWidth < 96
         ? `  ${DIM}↑↓${RESET} nav  ${DIM}enter${RESET} select  ${DIM}n/+${RESET} new  ${DIM}i${RESET} invite  ${DIM}?${RESET} help  ${DIM}q${RESET} quit${ANSI.clearLine}`
         : `  ${DIM}↑↓${RESET} nav  ${DIM}enter${RESET} select  ${DIM}n/+${RESET} new  ${DIM}/${RESET} filter  ${DIM}i${RESET} invite  ${DIM}u${RESET} default  ${DIM}r${RESET} rm  ${DIM}p${RESET} prune  ${DIM}?${RESET} help  ${DIM}q${RESET} quit${ANSI.clearLine}`;
     }
-    out.push(footer + "\n");
+    out.push(M + footer + "\n");
     if (state.showHelp) {
-      out.push(`  ${DIM}● default · ❯ cursor · n/+ starts guided setup · i opens /invite${RESET}${ANSI.clearLine}`);
+      out.push(`${M}  ${DIM}● default · ❯ cursor · n/+ starts guided setup · i opens /invite${RESET}${ANSI.clearLine}`);
     } else {
       out.push(ANSI.clearLine);
     }
@@ -1706,12 +1721,30 @@ async function browser(args = {}) {
   process.stdout.write(ANSI.altScreenEnter + ANSI.mouseOff + ANSI.cursorHide + ANSI.clear + ANSI.home);
   const isMouseEvent = makeMouseFilter();
   let done = false;
+  // Named so cleanup() can detach them. The launcher is NOT a true exec — it
+  // stays alive as the parent of the spawned assistant (claude/codex) for the
+  // whole session. The load-bearing detach is the RESIZE listener: Ghostty (and
+  // other terminals) re-send SIGWINCH when a tab regains focus, and a stale
+  // "resize"→render() repaints the launcher frame on top of the running
+  // assistant — exactly the "I switched tabs and the launcher screen came back"
+  // bug. The SIGINT/SIGTERM/exit handlers are dropped too because they're now
+  // pointless: during the live session the child holds the tty in raw mode, so
+  // Ctrl-C reaches it as a 0x03 byte (the parent never sees a SIGINT); and an
+  // out-of-band kill -INT/-TERM exits the parent 130/143 by Node's default
+  // disposition anyway — identical to the explicit handlers we remove.
+  const onResize = () => render(); // render() itself no-ops once done is set
+  let onSigint;
+  let onSigterm;
   const cleanup = () => {
     if (done) return;
     done = true;
     process.stdin.setRawMode(false);
     process.stdin.pause();
     process.stdin.removeAllListeners("keypress");
+    process.stdout.removeListener("resize", onResize);
+    if (onSigint) process.removeListener("SIGINT", onSigint);
+    if (onSigterm) process.removeListener("SIGTERM", onSigterm);
+    process.removeListener("exit", cleanup);
     // Clear the alt buffer BEFORE leaving it. A well-behaved terminal discards
     // the alt buffer and restores the primary screen on \x1b[?1049l, so this is
     // a harmless no-op there. Warp, however, dumps the alt buffer's contents
@@ -1720,10 +1753,12 @@ async function browser(args = {}) {
     // guided "+ new" setup) starts on a clean screen.
     process.stdout.write(ANSI.mouseOff + ANSI.cursorShow + ANSI.clear + ANSI.home + ANSI.altScreenLeave);
   };
+  onSigint = () => { cleanup(); process.exit(130); };
+  onSigterm = () => { cleanup(); process.exit(143); };
   process.on("exit", cleanup);
-  process.on("SIGINT", () => { cleanup(); process.exit(130); });
-  process.on("SIGTERM", () => { cleanup(); process.exit(143); });
-  process.stdout.on("resize", () => render());
+  process.on("SIGINT", onSigint);
+  process.on("SIGTERM", onSigterm);
+  process.stdout.on("resize", onResize);
 
   readline.emitKeypressEvents(process.stdin);
   process.stdin.setRawMode(true);

package/lib/local.js

@@ -125,6 +125,62 @@ async function getFileContent(token, owner, repo, filePath) {
   return Buffer.from(data.content, "base64").toString("utf-8");
 }
 
+// True if `owner` resolves to a real GitHub account (user OR org — both live
+// under /users/{login}). Lets join distinguish "wrong owner" from "owner has
+// no Egregore", which is the difference between a typo and a missing repo.
+async function ownerExists(token, owner) {
+  const { status } = await ghApi("GET", `/users/${owner}`, token);
+  return status === 200;
+}
+
+// Repo names under `owner` that the authenticated user can actually reach —
+// org membership or a (already-accepted) personal-repo collaborator invite.
+// /user/repos is the only endpoint that honors private + collaborator repos
+// across arbitrary owners, so we list it and filter by owner.
+async function listAccessibleRepos(token, owner) {
+  const ownerLc = owner.toLowerCase();
+  const names = [];
+  let page = 1;
+  while (page <= 4) { // cap at 400 accessible repos
+    const url = `/user/repos?per_page=100&sort=updated&affiliation=owner,collaborator,organization_member&page=${page}`;
+    const { status, data } = await ghApi("GET", url, token);
+    if (status !== 200 || !Array.isArray(data) || data.length === 0) break;
+    for (const r of data) {
+      if (r.owner?.login?.toLowerCase() === ownerLc) names.push(r.name);
+    }
+    if (data.length < 100) break;
+    page += 1;
+  }
+  return names;
+}
+
+// Discover every repo under `owner` that carries an egregore.json on its
+// default branch. Probes the conventional name first, then Egregore-looking
+// names, then the rest — capped so a large account doesn't fan out forever.
+// Returns [{ repo, config }] so the caller never re-fetches the config.
+async function discoverEgregoreRepos(token, owner) {
+  const seen = new Set();
+  const candidates = [];
+  const add = (name) => {
+    const key = name.toLowerCase();
+    if (!seen.has(key)) { seen.add(key); candidates.push(name); }
+  };
+  add("egregore"); // conventional default — also covers public repos not in the list
+  const accessible = await listAccessibleRepos(token, owner);
+  for (const n of accessible.filter((n) => /egregore/i.test(n))) add(n);
+  for (const n of accessible.filter((n) => !/egregore/i.test(n))) add(n);
+
+  const MAX_PROBES = 20;
+  const found = [];
+  for (const repo of candidates.slice(0, MAX_PROBES)) {
+    let raw = null;
+    try { raw = await getFileContent(token, owner, repo, "egregore.json"); } catch { raw = null; }
+    if (!raw) continue;
+    try { found.push({ repo, config: JSON.parse(raw) }); } catch { /* malformed config — skip */ }
+  }
+  return found;
+}
+
 async function putFileContent(token, owner, repo, filePath, content, message) {
   // Get SHA if file already exists
   const { status: existStatus, data: existData } = await ghApi(
@@ -1253,22 +1309,63 @@ async function localJoinFlow(orgArg, ui, ctx = {}) {
   await acceptPendingInvitations(githubToken, orgLogin, ui);
   s1.stop("Invitations accepted");
 
-  // 4. Resolve egregore.json before cloning. The shared install() helper owns
-  //    all local filesystem setup after this point.
-  const repoName = explicitRepo || "egregore";
-  const s2 = ui.spinner(`Reading ${orgLogin}/${repoName}/egregore.json...`);
-  let config;
+  // 4. Resolve which repo under `orgLogin` holds egregore.json. An explicit
+  //    repo is read directly; a bare owner is discovered (the founder flow
+  //    names the repo after the org slug, NOT "egregore", so we can't assume).
+  //    The shared install() helper owns all local setup after this point.
+  const s2 = ui.spinner(
+    explicitRepo
+      ? `Reading ${orgLogin}/${explicitRepo}/egregore.json...`
+      : `Finding the Egregore in ${orgLogin}...`,
+  );
+  let candidates = [];
   try {
-    const raw = await getFileContent(githubToken, orgLogin, repoName, "egregore.json");
-    if (!raw) throw new Error("missing");
-    config = JSON.parse(raw);
-    s2.stop("Resolved Egregore config");
-  } catch (err) {
-    s2.fail("Could not read egregore.json");
-    ui.error(`Make sure ${orgLogin}/${repoName} exists and you accepted the GitHub invitation.`);
-    ui.info(`Ask the admin to resend: ${joinCommand(orgLogin, repoName)}`);
+    if (explicitRepo) {
+      const raw = await getFileContent(githubToken, orgLogin, explicitRepo, "egregore.json");
+      if (raw) candidates = [{ repo: explicitRepo, config: JSON.parse(raw) }];
+    } else {
+      candidates = await discoverEgregoreRepos(githubToken, orgLogin);
+    }
+  } catch {
+    candidates = [];
+  }
+
+  if (candidates.length === 0) {
+    s2.fail("Could not find an Egregore to join");
+    const exists = await ownerExists(githubToken, orgLogin);
+    if (!exists) {
+      // The owner itself isn't a GitHub account — almost always a repo name
+      // passed where owner/repo was meant (e.g. `join xenocracy` for
+      // `fcdagdelen/xenocracy`).
+      ui.error(`No GitHub user or organization named ${ui.bold(orgLogin)}.`);
+      ui.info(`Join targets are ${ui.bold("owner/repo")} — e.g. ${ui.bold(joinCommand("acme", "acme"))}.`);
+    } else if (explicitRepo) {
+      ui.error(`${ui.bold(`${orgLogin}/${explicitRepo}`)} has no egregore.json on its default branch.`);
+      ui.info("Confirm the repo name, that egregore.json is committed to the default branch, and that you accepted the GitHub invitation.");
+    } else {
+      ui.error(`No Egregore repo found under ${ui.bold(orgLogin)} that you can access.`);
+      ui.info(`If you know it, pass the repo: ${ui.bold(joinCommand(orgLogin, "<repo>"))}. Otherwise ask the admin for the exact ${ui.bold("owner/repo")}.`);
+    }
     process.exit(1);
   }
+
+  let repoName;
+  let config;
+  if (candidates.length === 1) {
+    ({ repo: repoName, config } = candidates[0]);
+    s2.stop(`Found ${orgLogin}/${repoName}`);
+  } else {
+    s2.stop(`Found ${candidates.length} Egregores in ${orgLogin}`);
+    const picked = await ui.choose(
+      `Which Egregore in ${orgLogin}?`,
+      candidates.map((c) => ({
+        label: `${orgLogin}/${c.repo}`,
+        description: c.config.org_name || "",
+        _candidate: c,
+      })),
+    );
+    ({ repo: repoName, config } = picked._candidate);
+  }
   ui.success(`Found ${ui.bold(config.org_name || orgLogin)}`);
 
   const orgName = config.org_name || orgLogin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.18.8",
+  "version": "0.18.10",
   "description": "Set up Egregore for your team in one command — installs the egregore launcher and your choice of Claude Code or Codex.",
   "license": "MIT",
   "bin": {
@@ -11,7 +11,7 @@
   },
   "scripts": {
     "build:runtime": "node scripts/build-runtime-bundle.mjs",
-    "test": "node scripts/build-runtime-bundle.mjs --check && node --test test/context.test.js test/parse-join-target.test.js test/skip-repos.test.js test/onboarding-shortcircuit.test.js test/welcome-screen.test.js test/runtime-selection.test.js test/command-generation.test.js test/auth-gh.test.js test/gauntlet-fixes.test.js test/codex-runtime.test.js test/installer-runtime-source.test.js test/scroll-repro.test.js",
+    "test": "node scripts/build-runtime-bundle.mjs --check && node --test test/context.test.js test/parse-join-target.test.js test/skip-repos.test.js test/onboarding-shortcircuit.test.js test/welcome-screen.test.js test/runtime-selection.test.js test/command-generation.test.js test/auth-gh.test.js test/gauntlet-fixes.test.js test/codex-runtime.test.js test/installer-runtime-source.test.js test/scroll-repro.test.js test/launcher-refocus-redraw.test.js",
     "test:e2e": "node --test test/e2e-local.test.js",
     "test:all": "node scripts/build-runtime-bundle.mjs --check && node --test test/"
   },

package/runtime/codex/bin/activity-data.sh

@@ -36,13 +36,16 @@ EMPTY='{"fields":[],"values":[]}'
   if [ -z "$API_URL" ] || [ -z "$API_KEY" ]; then
     GRAPH_REASON="missing_config"
   else
-    # Store HTTP status code alongside response body
+    # Store HTTP status code alongside response body. curl already emits 000
+    # on transport failure; keep the exit status separate so it cannot become
+    # 000000 and fall through as an invalid JSON response.
+    CURL_STATUS=0
     HTTP_CODE=$(curl -s -o "$TMPDIR/activity_raw.json" -w "%{http_code}" \
       "${API_URL}/api/activity/dashboard?github_username=$(printf '%s' "$GH_USER" | jq -sRr @uri)" \
       -H "Authorization: Bearer $API_KEY" \
-      --connect-timeout 5 --max-time 15 2>/dev/null || echo "000")
+      --connect-timeout 5 --max-time 15 2>/dev/null) || CURL_STATUS=$?
 
-    if [ "$HTTP_CODE" = "000" ]; then
+    if [ "$CURL_STATUS" -ne 0 ] || [ "$HTTP_CODE" = "000" ] || ! [[ "$HTTP_CODE" =~ ^[0-9][0-9][0-9]$ ]]; then
       GRAPH_REASON="unreachable"
     elif [ "$HTTP_CODE" = "401" ] || [ "$HTTP_CODE" = "403" ]; then
       GRAPH_REASON="auth_error"

package/runtime/codex/bin/dashboard-data.sh

@@ -44,12 +44,16 @@ SESSION_ID=$(cat "$HOME/.egregore/session-${PROJ_HASH}.id" 2>/dev/null || echo "
   if [ -z "$API_URL" ] || [ -z "$API_KEY" ]; then
     GRAPH_REASON="missing_config"
   else
+    # Keep curl's transport status separate from %{http_code}; otherwise a
+    # failed request can concatenate 000 + fallback text and look like an
+    # unexpected API response.
+    CURL_STATUS=0
     HTTP_CODE=$(curl -s -o "$TMPDIR/dashboard_raw.json" -w "%{http_code}" \
       "${API_URL}/api/personal/dashboard?github_username=$(printf '%s' "$GH_USER" | jq -sRr @uri)&time_range=$(printf '%s' "$TIME_RANGE" | jq -sRr @uri)&session_id=$(printf '%s' "$SESSION_ID" | jq -sRr @uri)" \
       -H "Authorization: Bearer $API_KEY" \
-      --connect-timeout 5 --max-time 15 2>/dev/null || echo "000")
+      --connect-timeout 5 --max-time 15 2>/dev/null) || CURL_STATUS=$?
 
-    if [ "$HTTP_CODE" = "000" ]; then
+    if [ "$CURL_STATUS" -ne 0 ] || [ "$HTTP_CODE" = "000" ] || ! [[ "$HTTP_CODE" =~ ^[0-9][0-9][0-9]$ ]]; then
       GRAPH_REASON="unreachable"
     elif [ "$HTTP_CODE" = "401" ] || [ "$HTTP_CODE" = "403" ]; then
       GRAPH_REASON="auth_error"