create-egregore 0.18.7 → 0.18.9

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.5.21
+// 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.21";
+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";
@@ -99,6 +99,7 @@ const ANSI = {
   clear:          "\x1b[2J",
   home:           "\x1b[H",
   clearLine:      "\x1b[K",
+  clearDown:      "\x1b[J",
   // Disable every terminal mouse-reporting mode. Some terminals (tmux,
   // iTerm2) or a TUI run earlier in the session leave mouse reporting ON,
   // which turns the scroll wheel into escape sequences that corrupt our
@@ -126,6 +127,23 @@ function makeMouseFilter() {
   let x11 = 0;     // raw bytes left to swallow after ESC [ M
   return function isMouseEvent(chunk, key) {
     const seq = (key && key.sequence) || (typeof chunk === "string" ? chunk : "") || "";
+    // A real, unshifted navigation/action key is never part of a mouse report
+    // — those decompose into "[<"/"[M" plus digit keypresses, never named
+    // arrows/enter/etc. If a quirky terminal (e.g. Warp) emitted a malformed or
+    // partial mouse sequence, the stuck sgr/x11 state below would otherwise
+    // swallow these keys and freeze navigation ("arrows don't work"). Reset and
+    // let them through. Digits are deliberately NOT included — they stay
+    // filtered mid-sequence so scroll-wheel protection still holds.
+    if (key && !key.shift && !key.ctrl && !key.meta) {
+      const nm = key.name;
+      if (nm === "up" || nm === "down" || nm === "left" || nm === "right" ||
+          nm === "return" || nm === "escape" || nm === "home" || nm === "end" ||
+          nm === "pageup" || nm === "pagedown") {
+        sgr = false;
+        x11 = 0;
+        return false;
+      }
+    }
     if (sgr) {
       if (/[Mm]/.test(seq)) sgr = false; // SGR terminates on M (press) / m (release)
       return true;
@@ -1411,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 ";
@@ -1503,11 +1523,25 @@ 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 = [];
-    out.push(ANSI.home);
+    // 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
+    // apply incremental \x1b[K reliably across an alt-screen redraw, leaving
+    // stale lines — most visibly a duplicated footer. A single clear-down after
+    // home wipes the slate before redraw. It's part of the same atomic write,
+    // so there's no extra flicker.
+    out.push(ANSI.home + ANSI.clearDown);
 
     if (state.runtimeInst) {
       const runtimeLines = renderRuntimePanel({
@@ -1551,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)));
 
@@ -1570,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");
         }
@@ -1584,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;
@@ -1599,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 = [];
@@ -1617,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}`);
       }
@@ -1639,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;
@@ -1664,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);
     }
@@ -1682,18 +1721,44 @@ 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.write(ANSI.mouseOff + ANSI.cursorShow + ANSI.altScreenLeave);
+    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
+    // into the primary scrollback on exit — clearing first means it dumps a
+    // blank screen instead of the whole launcher frame, so the next flow (the
+    // 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.18.7",
+  "version": "0.18.9",
   "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"