create-egregore 0.19.7 → 0.19.11

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.7.2
+// egregore-launcher-version: 0.7.3
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -31,7 +31,7 @@ const https = require("node:https");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.7.2";
+const VERSION = "0.7.3";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const PUBLIC_NPX_PACKAGE = "create-egregore";
@@ -1321,292 +1321,6 @@ function settingsDump(inst) {
   try { return JSON.parse(r.stdout); } catch { return null; }
 }
 
-// Nested raw-mode list editor for a domain (repo | admin | people): hover an
-// item and press `d` to remove it, `a` to open an inline add field, esc to go
-// back. Mirrors the main browser's affordances. Its own raw-mode loop; resolves
-// when the user backs out. Each mutation is ONE deterministic settings.sh verb;
-// validation, the last-admin guard, and GitHub-access notes surface as notices.
-function listEditor(inst, domain, label) {
-  const fieldFor = (d) => {
-    if (domain === "repo") return (d.repos || []).map((r) => r.name || r);
-    if (domain === "admin") return d.admins || [];
-    return d.people || [];
-  };
-  const noun = domain === "repo" ? "repo name" : "github handle";
-
-  return new Promise((resolve) => {
-    let items = fieldFor(settingsDump(inst) || {});
-    let cursor = 0;
-    let mode = "browse"; // browse | add | confirm
-    let input = "";
-    let notice = "";
-    let rendered = 0;
-    let done = false;
-    const previousRaw = !!process.stdin.isRaw;
-    const isMouseEvent = makeMouseFilter();
-
-    const refresh = () => {
-      items = fieldFor(settingsDump(inst) || {});
-      if (cursor >= items.length) cursor = Math.max(0, items.length - 1);
-    };
-
-    const erase = () => {
-      if (!rendered) return;
-      process.stdout.write(`\x1b[${rendered}A` + ANSI.clearDown);
-      rendered = 0;
-    };
-
-    const buildLines = () => {
-      const out = [];
-      out.push(``);
-      out.push(`  ${BOLD}${label}${RESET}`);
-      out.push(`  ${DIM}────────────────────────────────────────${RESET}`);
-      if (items.length === 0) {
-        out.push(`    ${DIM}(none)${RESET}`);
-      } else {
-        items.forEach((it, i) => {
-          const sel = i === cursor;
-          out.push(`  ${sel ? CYAN + "❯" + RESET : " "} ${sel ? BOLD + it + RESET : it}`);
-        });
-      }
-      out.push(``);
-      if (notice) out.push(`  ${notice}`);
-      if (mode === "add") {
-        out.push(`  ${CYAN}add ${noun}:${RESET} ${input}${CYAN}▌${RESET}  ${DIM}enter save · esc cancel${RESET}`);
-      } else if (mode === "confirm") {
-        out.push(`  ${YELLOW}remove ${items[cursor]}?${RESET} ${DIM}y / N${RESET}`);
-      } else {
-        out.push(`  ${DIM}↑↓ nav · ${RESET}${BOLD}a${RESET}${DIM} add · ${RESET}${BOLD}d${RESET}${DIM} delete · esc back${RESET}`);
-      }
-      return out;
-    };
-
-    const render = () => {
-      erase();
-      const lines = buildLines();
-      rendered = lines.length;
-      process.stdout.write(lines.map((l) => l + ANSI.clearLine).join("\n") + "\n");
-    };
-
-    const cleanup = () => {
-      if (done) return;
-      done = true;
-      process.stdin.removeListener("keypress", onKey);
-      process.stdout.write(ANSI.mouseOff);
-      if (process.stdin.setRawMode) process.stdin.setRawMode(previousRaw);
-      if (!previousRaw) process.stdin.pause();
-      erase();
-    };
-
-    // Run a verb (spawnSync blocks briefly — people ops hit GitHub). Surface the
-    // last stdout/stderr line as a notice; refresh the list from disk after.
-    const runVerb = (args) => {
-      const r = runSettings(inst, args);
-      const msg = ((r.stdout || "") + " " + (r.stderr || "")).trim().split("\n").map((s) => s.trim()).filter(Boolean).pop() || "";
-      notice = r && r.status === 0 ? msg : `${YELLOW}${msg}${RESET}`;
-      refresh();
-    };
-
-    function onKey(chunk, key = {}) {
-      if (isMouseEvent(chunk, key)) return;
-      if (key.ctrl && key.name === "c") { cleanup(); process.exit(130); }
-
-      if (mode === "add") {
-        if (key.name === "escape") { mode = "browse"; input = ""; render(); return; }
-        if (key.name === "return") {
-          const v = input.trim().split(/\s+/)[0];
-          mode = "browse"; input = "";
-          if (v) runVerb([domain, "add", v]);
-          render();
-          return;
-        }
-        if (key.name === "backspace") { input = input.slice(0, -1); render(); return; }
-        if (chunk && chunk.length === 1 && chunk >= " " && !key.ctrl && !key.meta) { input += chunk; render(); return; }
-        return;
-      }
-
-      if (mode === "confirm") {
-        if (chunk === "y" || chunk === "Y") {
-          const victim = items[cursor];
-          mode = "browse";
-          if (victim) runVerb([domain, "remove", victim]);
-        } else { mode = "browse"; }
-        render();
-        return;
-      }
-
-      // browse
-      if (key.name === "escape" || key.name === "left") { cleanup(); resolve(); return; }
-      if (key.name === "up" || key.name === "k") { if (items.length) cursor = (cursor - 1 + items.length) % items.length; render(); return; }
-      if (key.name === "down" || key.name === "j") { if (items.length) cursor = (cursor + 1) % items.length; render(); return; }
-      if (chunk === "a") { mode = "add"; input = ""; notice = ""; render(); return; }
-      if (chunk === "d") { if (items.length) { mode = "confirm"; render(); } return; }
-    }
-
-    readline.emitKeypressEvents(process.stdin);
-    if (process.stdin.setRawMode) process.stdin.setRawMode(true);
-    process.stdin.resume();
-    process.stdout.write(ANSI.mouseOff);
-    process.stdin.on("keypress", onKey);
-    render();
-  });
-}
-
-// The `s`-key settings screen: a raw-mode menu (hosting toggle + repo/admin
-// editors) over bin/settings.sh. Modeled on pickRuntimeInteractive.
-function settingsScreen(inst) {
-  const title = inst.slug || inst.name || path.basename(inst.path);
-
-  if (!fs.existsSync(settingsScriptPath(inst))) {
-    console.log(`\n  ${YELLOW}Settings unavailable${RESET} — ${BOLD}${title}${RESET} has no ${DIM}bin/settings.sh${RESET}.`);
-    console.log(`  Update it: open the egregore and run ${CYAN}/pull${RESET}.\n`);
-    return Promise.resolve();
-  }
-
-  let data = settingsDump(inst) || { hosting: true, repos: [], admins: [], people: [] };
-
-  const rows = [
-    {
-      label: () => `Hosted Artifacts`,
-      value: () => (data.hosting ? `${GREEN}ON${RESET}` : `${YELLOW}OFF${RESET}`),
-      detailLines: () => [data.hosting
-        ? `    ${DIM}Enter toggles. When OFF, artifacts never upload to egregore.xyz.${RESET}`
-        : `    ${DIM}Artifacts stay local. /view still renders them on localhost.${RESET}`],
-    },
-    {
-      label: () => `Managed repos`,
-      value: () => `${DIM}${data.repos.length}${RESET}`,
-      detailLines: () => data.repos.length
-        ? data.repos.map((r) => `    ${DIM}·${RESET} ${r.name || r}`)
-        : [`    ${DIM}(none)${RESET}`],
-    },
-    {
-      label: () => `Admins`,
-      value: () => `${DIM}${data.admins.length}${RESET}`,
-      detailLines: () => data.admins.length
-        ? [`    ${DIM}${data.admins.join(", ")}${RESET}`]
-        : [`    ${DIM}(none)${RESET}`],
-    },
-    {
-      label: () => `People`,
-      value: () => `${DIM}${(data.people || []).length}${RESET}`,
-      detailLines: () => (data.people && data.people.length)
-        ? [`    ${DIM}${data.people.join(", ")}${RESET}`]
-        : [`    ${DIM}(none)${RESET}`],
-    },
-  ];
-
-  return new Promise((resolve) => {
-    let cursor = 0;
-    let rendered = 0;
-    let done = false;
-    let notice = "";
-    const previousRaw = !!process.stdin.isRaw;
-    const isMouseEvent = makeMouseFilter();
-
-    const erase = () => {
-      if (!rendered) return;
-      // Move to the TOP of the last-rendered block, then wipe everything below
-      // in one shot. Clearing line-by-line leaves the cursor at the BOTTOM, so
-      // the next redraw starts a row lower each time — that's the drift that
-      // pushes blank "margins" on top. Up-N + clearDown returns to the top and
-      // clears cleanly, so every render repaints in place.
-      process.stdout.write(`\x1b[${rendered}A` + ANSI.clearDown);
-      rendered = 0;
-    };
-
-    const buildLines = () => {
-      const out = [];
-      out.push(``);
-      out.push(`  ${BOLD}Settings${RESET} ${DIM}·${RESET} ${BOLD}${title}${RESET}`);
-      out.push(`  ${DIM}────────────────────────────────────────${RESET}`);
-      rows.forEach((row, i) => {
-        const sel = i === cursor;
-        const marker = sel ? `${CYAN}❯${RESET}` : ` `;
-        const name = sel ? `${BOLD}${row.label()}${RESET}` : row.label();
-        out.push(`  ${marker} ${name}   ${row.value()}`);
-        if (sel) for (const dl of row.detailLines()) out.push(dl);
-      });
-      out.push(``);
-      if (notice) out.push(`  ${notice}`);
-      out.push(`  ${DIM}↑↓ nav · enter ${cursor === 0 ? "toggle" : "edit"} · esc back · q quit${RESET}`);
-      return out;
-    };
-
-    const render = () => {
-      erase();
-      const lines = buildLines();
-      rendered = lines.length;
-      process.stdout.write(lines.map((l) => l + ANSI.clearLine).join("\n") + "\n");
-    };
-
-    const teardownRaw = () => {
-      process.stdin.removeListener("keypress", onKey);
-      process.stdout.write(ANSI.mouseOff);
-      if (process.stdin.setRawMode) process.stdin.setRawMode(previousRaw);
-      if (!previousRaw) process.stdin.pause();
-    };
-
-    const setupRaw = () => {
-      readline.emitKeypressEvents(process.stdin);
-      if (process.stdin.setRawMode) process.stdin.setRawMode(true);
-      process.stdin.resume();
-      process.stdout.write(ANSI.mouseOff);
-      process.stdin.on("keypress", onKey);
-    };
-
-    const cleanup = () => {
-      if (done) return;
-      done = true;
-      teardownRaw();
-      erase();
-    };
-
-    const toggleHosting = () => {
-      const r = runSettings(inst, ["hosting", data.hosting ? "off" : "on"]);
-      if (!r || r.status !== 0) {
-        notice = `${YELLOW}${((r && r.stderr) || "could not change hosting").trim().split("\n")[0]}${RESET}`;
-      } else {
-        data = settingsDump(inst) || data;
-        notice = `hosting ${data.hosting ? `${GREEN}ON${RESET}` : `${YELLOW}OFF${RESET}`}`;
-      }
-      render();
-    };
-
-    // Hand off to the nested raw-mode list editor, then repaint this screen with
-    // refreshed counts when the user backs out.
-    const openList = (domain, label) => {
-      erase();
-      teardownRaw();
-      listEditor(inst, domain, label).then(() => {
-        data = settingsDump(inst) || data;
-        notice = "";
-        setupRaw();
-        render();
-      });
-    };
-
-    function onKey(chunk, key = {}) {
-      if (isMouseEvent(chunk, key)) return;
-      if (key.ctrl && key.name === "c") { cleanup(); process.exit(130); }
-      if (key.name === "q") { cleanup(); resolve(); return; }
-      // Esc / ← = back (esc never quits).
-      if (key.name === "escape" || key.name === "left") { cleanup(); resolve(); return; }
-      if (key.name === "up" || key.name === "k") { cursor = (cursor - 1 + rows.length) % rows.length; render(); return; }
-      if (key.name === "down" || key.name === "j") { cursor = (cursor + 1) % rows.length; render(); return; }
-      if (key.name === "return" || chunk === " ") {
-        if (cursor === 0) toggleHosting();
-        else if (cursor === 1) openList("repo", "Managed repos");
-        else if (cursor === 2) openList("admin", "Admins");
-        else if (cursor === 3) openList("people", "People");
-      }
-    }
-
-    setupRaw();
-    render();
-  });
-}
-
 async function cmdSettings(args) {
   const registry = readRegistry();
   if (registry.length === 0) die("no egregores installed yet.\n  run: npx -y create-egregore@latest");
@@ -1618,11 +1332,9 @@ async function cmdSettings(args) {
   if (!inst) {
     die(`multiple egregores installed; choose one:\n  egregore settings <slug> [hosting|repo|admin]\n  run: egregore ls`);
   }
-  // No verb + a TTY → interactive screen. Otherwise forward straight to the verb.
-  if (rest.length === 0) {
-    if (isTTY && canPrompt()) return settingsScreen(inst);
-    rest = ["dump"];
-  }
+  // Interactive editing lives in the launcher (press `s`). With no verb, print
+  // the snapshot; otherwise forward straight to the deterministic verb.
+  if (rest.length === 0) rest = ["dump"];
   const r = runSettings(inst, rest);
   if (r.stdout) process.stdout.write(r.stdout.endsWith("\n") ? r.stdout : r.stdout + "\n");
   if (r.stderr) process.stderr.write(r.stderr);
@@ -1849,6 +1561,78 @@ function renderRuntimePanel({ inst, cursor, width, height }) {
   return lines;
 }
 
+// ── settings panel (rendered in-place inside the browser) ───────────
+
+function settingsItemsFor(data, domain) {
+  if (!data) return [];
+  if (domain === "repo") return (data.repos || []).map((r) => r.name || r);
+  if (domain === "admin") return data.admins || [];
+  return data.people || [];
+}
+
+const SETTINGS_DOMAIN_LABEL = { repo: "Managed repos", admin: "Admins", people: "People" };
+const SETTINGS_DOMAIN_NOUN = { repo: "repo name", admin: "github handle", people: "github handle" };
+
+// Same box geometry as renderRuntimePanel so pressing `s` keeps the frame put.
+function renderSettingsPanel({ inst, data, cursor, view, domain, items, listCursor, mode, input, notice, width }) {
+  const title = inst.slug || inst.name || path.basename(inst.path);
+  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 = " settings ";
+  const d = data || {};
+  const lines = [
+    `${margin}${DIM}┌${"─".repeat(2)}${label}${"─".repeat(Math.max(0, innerWidth - label.length - 2))}┐${RESET}`,
+    emptyBoxLine(innerWidth, margin),
+    boxLine(`${BOLD}${CYAN}${title}${RESET}`, innerWidth, margin),
+    boxLine(`${DIM}${inst.path}${RESET}`, innerWidth, margin),
+    emptyBoxLine(innerWidth, margin),
+  ];
+
+  if (view === "list") {
+    lines.push(boxLine(`${BOLD}${SETTINGS_DOMAIN_LABEL[domain] || domain}${RESET}`, innerWidth, margin));
+    lines.push(emptyBoxLine(innerWidth, margin));
+    if (!items || !items.length) {
+      lines.push(boxLine(`${DIM}(none)${RESET}`, innerWidth, margin));
+    } else {
+      items.forEach((it, i) => {
+        const sel = i === listCursor;
+        const marker = sel ? `${CYAN}❯${RESET}` : " ";
+        lines.push(boxLine(`${marker} ${sel ? `${BOLD}${it}${RESET}` : it}`, innerWidth, margin));
+      });
+    }
+    lines.push(emptyBoxLine(innerWidth, margin));
+    if (notice) lines.push(boxLine(notice, innerWidth, margin));
+    if (mode === "add") {
+      lines.push(boxLine(`${CYAN}add ${SETTINGS_DOMAIN_NOUN[domain]}:${RESET} ${input}${CYAN}▌${RESET}  ${DIM}enter save · esc cancel${RESET}`, innerWidth, margin));
+    } else if (mode === "confirm") {
+      lines.push(boxLine(`${YELLOW}remove ${items[listCursor]}?${RESET} ${DIM}y / N${RESET}`, innerWidth, margin));
+    } else {
+      lines.push(boxLine(`${DIM}↑↓ nav · ${RESET}${BOLD}a${RESET}${DIM} add · ${RESET}${BOLD}d${RESET}${DIM} delete · ← back · q quit${RESET}`, innerWidth, margin));
+    }
+  } else {
+    const rows = [
+      { name: "Hosted Artifacts", value: (d.hosting !== false) ? `${GREEN}ON${RESET}` : `${YELLOW}OFF${RESET}` },
+      { name: "Managed repos", value: `${DIM}${(d.repos || []).length}${RESET}` },
+      { name: "Admins", value: `${DIM}${(d.admins || []).length}${RESET}` },
+      { name: "People", value: `${DIM}${(d.people || []).length}${RESET}` },
+    ];
+    rows.forEach((row, i) => {
+      const sel = i === cursor;
+      const marker = sel ? `${CYAN}❯${RESET}` : " ";
+      const name = sel ? `${BOLD}${row.name}${RESET}` : row.name;
+      lines.push(boxLine(`${marker} ${pad(name, 20)}  ${row.value}`, innerWidth, margin));
+    });
+    lines.push(emptyBoxLine(innerWidth, margin));
+    if (notice) lines.push(boxLine(notice, innerWidth, margin));
+    lines.push(boxLine(`${DIM}↑↓ nav · ${RESET}${BOLD}enter${RESET}${DIM} ${cursor === 0 ? "toggle" : "open"} · ← back · q quit${RESET}`, innerWidth, margin));
+  }
+
+  lines.push(emptyBoxLine(innerWidth, margin));
+  lines.push(`${margin}${DIM}└${"─".repeat(innerWidth)}┘${RESET}`);
+  return lines;
+}
+
 // ── browser (full-screen TUI) ───────────────────────────────────────
 
 async function browser(args = {}) {
@@ -1881,6 +1665,18 @@ async function browser(args = {}) {
     inviteInst: null,
     runtimeInst: null,
     runtimeCursor: 0,
+    // Settings panel — rendered in-place like the harness picker (renderSettingsPanel),
+    // never a separate screen. Active while settingsInst is set.
+    settingsInst: null,
+    settingsData: null,
+    settingsCursor: 0,
+    settingsView: "menu",   // "menu" | "list"
+    settingsDomain: null,   // "repo" | "admin" | "people"
+    settingsItems: [],
+    settingsListCursor: 0,
+    settingsMode: "browse", // "browse" | "add" | "confirm"
+    settingsInput: "",
+    settingsNotice: "",
     cursor: initialCursorForCwd(registry),
     showHelp: false,
     modal: null, // { type: "remove" | "sweep", onYes, onNo }
@@ -1953,6 +1749,27 @@ async function browser(args = {}) {
       return;
     }
 
+    if (state.settingsInst) {
+      const settingsLines = renderSettingsPanel({
+        inst: state.settingsInst,
+        data: state.settingsData,
+        cursor: state.settingsCursor,
+        view: state.settingsView,
+        domain: state.settingsDomain,
+        items: state.settingsItems,
+        listCursor: state.settingsListCursor,
+        mode: state.settingsMode,
+        input: state.settingsInput,
+        notice: state.settingsNotice,
+        width: w,
+      });
+      for (const line of settingsLines) out.push(line + ANSI.clearLine + "\n");
+      const remainingRows = Math.max(0, h - settingsLines.length - 1);
+      for (let i = 0; i < remainingRows; i++) out.push(ANSI.clearLine + "\n");
+      process.stdout.write(out.join(""));
+      return;
+    }
+
     // Header / hero panel
     const def = readDefault();
     const v = visible();
@@ -2206,10 +2023,78 @@ async function browser(args = {}) {
   };
 
   return new Promise((resolve) => {
+    // Run a deterministic settings verb, refresh the panel's data + list in place.
+    const settingsRunVerb = (verbArgs) => {
+      const r = runSettings(state.settingsInst, verbArgs);
+      const msg = ((r.stdout || "") + " " + (r.stderr || "")).trim().split("\n").map((s) => s.trim()).filter(Boolean).pop() || "";
+      state.settingsNotice = r && r.status === 0 ? msg : `${YELLOW}${msg}${RESET}`;
+      state.settingsData = settingsDump(state.settingsInst) || state.settingsData;
+      if (state.settingsView === "list" && state.settingsDomain) {
+        state.settingsItems = settingsItemsFor(state.settingsData, state.settingsDomain);
+        if (state.settingsListCursor >= state.settingsItems.length) state.settingsListCursor = Math.max(0, state.settingsItems.length - 1);
+      }
+    };
+
     process.stdin.on("keypress", (chunk, key) => {
       if (!key) return;
       if (isMouseEvent(chunk, key)) return; // drop scroll-wheel / mouse escape sequences
 
+      if (state.settingsInst) {
+        const S = state;
+        if (key.ctrl && key.name === "c") { cleanup(); process.exit(130); }
+        if (key.name === "q") { cleanup(); resolve(); return; }
+
+        if (S.settingsView === "list") {
+          if (S.settingsMode === "add") {
+            if (key.name === "escape") { S.settingsMode = "browse"; S.settingsInput = ""; render(); return; }
+            if (key.name === "return") {
+              const v = S.settingsInput.trim().split(/\s+/)[0];
+              S.settingsMode = "browse"; S.settingsInput = "";
+              if (v) settingsRunVerb([S.settingsDomain, "add", v]);
+              render(); return;
+            }
+            if (key.name === "backspace") { S.settingsInput = S.settingsInput.slice(0, -1); render(); return; }
+            if (chunk && chunk.length === 1 && chunk >= " " && !key.ctrl && !key.meta) { S.settingsInput += chunk; render(); return; }
+            return;
+          }
+          if (S.settingsMode === "confirm") {
+            if (chunk === "y" || chunk === "Y") {
+              const victim = S.settingsItems[S.settingsListCursor];
+              S.settingsMode = "browse";
+              if (victim) settingsRunVerb([S.settingsDomain, "remove", victim]);
+            } else { S.settingsMode = "browse"; }
+            render(); return;
+          }
+          // list browse
+          if (key.name === "escape" || key.name === "left") { S.settingsView = "menu"; S.settingsNotice = ""; render(); return; }
+          if ((key.name === "up" || key.name === "k") && S.settingsItems.length) { S.settingsListCursor = (S.settingsListCursor - 1 + S.settingsItems.length) % S.settingsItems.length; render(); return; }
+          if ((key.name === "down" || key.name === "j") && S.settingsItems.length) { S.settingsListCursor = (S.settingsListCursor + 1) % S.settingsItems.length; render(); return; }
+          if (chunk === "a") { S.settingsMode = "add"; S.settingsInput = ""; S.settingsNotice = ""; render(); return; }
+          if (chunk === "d" && S.settingsItems.length) { S.settingsMode = "confirm"; render(); return; }
+          return;
+        }
+
+        // menu view
+        if (key.name === "escape" || key.name === "left") { S.settingsInst = null; S.settingsNotice = ""; render(); return; }
+        if (key.name === "up" || key.name === "k") { S.settingsCursor = (S.settingsCursor - 1 + 4) % 4; render(); return; }
+        if (key.name === "down" || key.name === "j") { S.settingsCursor = (S.settingsCursor + 1) % 4; render(); return; }
+        if (key.name === "return" || chunk === " ") {
+          if (S.settingsCursor === 0) {
+            const on = (S.settingsData && S.settingsData.hosting) !== false;
+            settingsRunVerb(["hosting", on ? "off" : "on"]);
+            render();
+          } else {
+            const domain = S.settingsCursor === 1 ? "repo" : S.settingsCursor === 2 ? "admin" : "people";
+            S.settingsView = "list"; S.settingsDomain = domain;
+            S.settingsItems = settingsItemsFor(S.settingsData, domain);
+            S.settingsListCursor = 0; S.settingsMode = "browse"; S.settingsNotice = "";
+            render();
+          }
+          return;
+        }
+        return;
+      }
+
       if (state.runtimeInst) {
         const runtimes = runtimeChoicesFor(state.runtimeInst, args.runtimeOverride);
         if (key.ctrl && key.name === "c") { cleanup(); process.exit(130); }
@@ -2437,8 +2322,16 @@ async function browser(args = {}) {
       if (chunk === "s") {
         const pick = visible()[state.cursor]?.e;
         if (!pick) return;
-        cleanup();
-        resolve(settingsScreen(pick));
+        if (!fs.existsSync(settingsScriptPath(pick))) {
+          flashMessage(`${YELLOW}settings need bin/settings.sh — run /pull in this egregore${RESET}`, "warn");
+          return;
+        }
+        state.settingsInst = pick;
+        state.settingsData = settingsDump(pick) || { hosting: true, repos: [], admins: [], people: [] };
+        state.settingsCursor = 0;
+        state.settingsView = "menu";
+        state.settingsNotice = "";
+        render();
         return;
       }
       if (chunk === "u") {

package/lib/local.js

@@ -47,7 +47,12 @@ const TEMPLATE_REPO = "egregore";
 async function getUser(token) {
   const { status, data } = await ghApi("GET", "/user", token);
   if (status !== 200) throw new Error("GitHub auth failed — could not fetch user");
-  return { login: data.login, name: data.name || data.login, email: data.email || null };
+  return {
+    login: data.login,
+    id: data.id || null,
+    name: data.name || data.login,
+    email: data.email || null,
+  };
 }
 
 async function listOrgs(token) {
@@ -1286,11 +1291,14 @@ async function localFounderFlow(ui, ctx = {}) {
   const slugifiedName = (displayName || user.login).toLowerCase().replace(/\s+/g, "-");
   const state = {
     github_username: user.login,
+    github_id: user.id,
+    person_id: user.id ? `github:${user.id}` : `github-login:${user.login.toLowerCase()}`,
     github_name: user.name,
     display_name: displayName || user.login,
     name: slugifiedName,
     member_role: memberRole,
     email: user.email,
+    emails: user.email ? [user.email.toLowerCase()] : [],
     onboarding_complete: false,
     usage_type: "founder_group",
     org_setup: true,
@@ -1430,6 +1438,7 @@ async function localFounderFlow(ui, ctx = {}) {
       const invPersonContent = [
         "---",
         `name: ${invUsername}`,
+        `person_id: github-login:${invUsername.toLowerCase()}`,
         `github: ${invUsername}`,
         `invited_by: ${user.login}`,
         `joined: ${today}`,
@@ -1755,6 +1764,7 @@ async function localJoinFlow(orgArg, ui, ctx = {}) {
     org_name: orgName,
     github_org: orgLogin,
     github_username: user.login,
+    github_id: user.id,
     github_name: user.name,
     github_email: user.email,
     slug: config.slug || orgLogin,

package/lib/setup.js

@@ -174,12 +174,24 @@ function mergeProfileFields(existing, additions = []) {
 function personProfileContent(state = {}, opts = {}) {
   const now = opts.onboardedAt || new Date().toISOString();
   const username = state.github_username || opts.githubUsername || "unknown";
+  const githubId = state.github_id || opts.githubId || "";
+  const personId = state.person_id || (githubId ? `github:${githubId}` : `github-login:${username.toLowerCase()}`);
   const displayName = state.display_name || state.github_name || username;
   const role = state.member_role || state.onboarding?.member_role || opts.memberRole || "Member";
+  const emails = [...new Set(
+    [state.email, ...(Array.isArray(state.emails) ? state.emails : [])]
+      .filter(Boolean)
+      .map((value) => String(value).trim().toLowerCase()),
+  )];
   return [
     `# ${displayName}`,
     "",
+    `Person-ID: ${personId}`,
     `GitHub: ${username}`,
+    `GitHub-ID: ${githubId}`,
+    "GitHub-Aliases: ",
+    `Email: ${emails[0] || ""}`,
+    `Emails: ${emails.join(", ")}`,
     `Role: ${role}`,
     `Joined: ${now.split("T")[0]}`,
     `Onboarded: ${now}`,
@@ -234,6 +246,7 @@ function buildOnboardingState(existing = {}, data = {}, opts = {}) {
   const state = { ...existing };
   const preferredRuntime = normalizeRuntime(opts.runtime);
   const githubUsername = data.github_username || state.github_username || "";
+  const githubId = data.github_id || state.github_id || null;
   const githubName = data.github_name || state.github_name || githubUsername;
   const displayName = data.display_name || state.display_name || githubName || githubUsername;
   const usageType = normalizeUsageType(data);
@@ -248,6 +261,12 @@ function buildOnboardingState(existing = {}, data = {}, opts = {}) {
   const shouldComplete = alreadyComplete || (requestedComplete && !!memberRole);
 
   if (githubUsername) state.github_username = githubUsername;
+  if (githubId) {
+    state.github_id = githubId;
+    state.person_id = `github:${githubId}`;
+  } else if (githubUsername && !state.person_id) {
+    state.person_id = `github-login:${githubUsername.toLowerCase()}`;
+  }
   if (githubName) state.github_name = githubName;
   if (displayName) {
     state.display_name = displayName;
@@ -457,6 +476,20 @@ async function install(data, ui, targetDir, opts = {}) {
     reportPiRuntimeSummary(piRuntime, ui);
   }
 
+  // Reconcile the installer-captured identity through the same portable writer
+  // used by /me and onboarding. Failure is recoverable: the state + person
+  // profile already exist and the next session retries `bin/person.sh sync`.
+  const personScript = path.join(egregoreDir, "bin", "person.sh");
+  if (fs.existsSync(personScript)) {
+    try {
+      spawnSync("bash", [personScript, "onboard"], {
+        cwd: egregoreDir,
+        stdio: "ignore",
+        timeout: 15000,
+      });
+    } catch {}
+  }
+
   // 5. Register instance + install launcher binary
   ui.step(5, totalSteps, "Registering instance...");
   registerInstance(forkDirName, org_name, egregoreDir, preferredRuntime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.19.7",
+  "version": "0.19.11",
   "description": "Set up Egregore for your team in one command — installs the egregore launcher and your choice of Claude Code, Codex, or Pi.",
   "license": "MIT",
   "bin": {