create-egregore 0.20.3 → 0.20.4

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.20.3
+// egregore-launcher-version: 0.20.4
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -33,7 +33,7 @@ const crypto = require("node:crypto");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.20.3";
+const VERSION = "0.20.4";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const UPDATE_CACHE_FILE = path.join(os.homedir(), ".egregore", "update-check.json");

package/bin/cli.js

@@ -543,75 +543,20 @@ async function main() {
 }
 
 async function tokenFlow(api, token, ctx) {
-  const s = ui.spinner("Claiming setup token...");
-  let data;
-  try {
-    data = await api.claimToken(token);
-    s.stop(`Claimed — setting up ${ui.bold(data.org_name)}`);
-  } catch (err) {
-    s.fail("Token claim failed");
-    ui.error(err.message);
-    ui.info("");
-    ui.info("The token may have expired or already been used.");
-    ui.info("Visit egregore.xyz to get a new one, or run without --token:");
-    ui.info("  npx -y create-egregore@latest");
-    process.exit(1);
-  }
-
-  // Joiner tokens don't include a github_token — try gh CLI first. If gh is
-  // installed but logged out, run gh auth login instead of device flow.
-  if (!data.github_token || data.needs_cli_auth) {
-    const ghAuth = tryGhAuthOrLogin(ui, data.needs_cli_auth ? { mode: "join" } : {});
-    if (ghAuth) {
-      ui.success(`Using your ${ui.bold("gh")} CLI auth${ghAuth.user ? ` (${ghAuth.user})` : ""}`);
-      data.github_token = ghAuth.token;
-    } else if (ghCliExists()) {
-      ui.error("GitHub CLI auth did not complete.");
-      ui.info(`Run ${ui.bold("gh auth login")} and then re-run this command.`);
-      process.exit(1);
-    } else {
+  const { installFromToken } = require("../lib/token-install");
+  await installFromToken(api, token, ctx, {
+    ui, install, request: ghApi,
+    authenticate: async (forceLogin) => {
+      const auth = tryGhAuthOrLogin(ui, { mode: "join", requireRepoScope: true, forceLogin });
+      if (auth) return auth;
+      if (ghCliExists()) return null;
       if (!canUseInteractiveBrowserFlow()) {
         explainNoGhHeadless(ui);
-        process.exit(1);
+        return null;
       }
-      ui.info("\nSign in to your GitHub to complete setup.\n");
-      try {
-        data.github_token = await deviceFlow(ui, data.needs_cli_auth ? { mode: "join" } : {});
-        ui.success("Authenticated with GitHub");
-      } catch (err) {
-        ui.error(`GitHub auth failed: ${err.message}`);
-        process.exit(1);
-      }
-    }
-  }
-
-  // Token-mode setups already have their repo list baked in server-side. If
-  // the user's current working repo happens to match a managed-repo name, skip
-  // the clone/pull/configure step for it so we don't clobber uncommitted work.
-  const skipRepos = new Set();
-  if (ctx.prefilledRepo && Array.isArray(data.repos)) {
-    for (const r of data.repos) {
-      const n = typeof r === "string" ? r : r && r.name;
-      if (n && n === ctx.prefilledRepo.name) skipRepos.add(n);
-    }
-  }
-  try {
-    await install(data, ui, ctx.targetDir, {
-      skipRepos,
-      noAutolaunch: ctx.noAutolaunch,
-      noScreens: ctx.noScreens,
-      flowVariant: ctx.flowVariant,
-      runtime: ctx.runtime,
-    });
-    if (ctx.prefilledRepo && skipRepos.size === 0) {
-      console.log("");
-      ui.info(`Tip: add your current repo to managed_repos with:`);
-      ui.info(`  /add ${ctx.prefilledRepo.toplevel || `../${ctx.prefilledRepo.localName}`}`);
-    }
-  } catch (err) {
-    ui.error(`Install failed: ${err.message}`);
-    process.exit(1);
-  }
+      return { token: await deviceFlow(ui, { mode: "join", scope: "repo" }) };
+    },
+  });
 }
 
 async function interactiveFlow(api, ctx) {

package/lib/api.js

@@ -63,8 +63,12 @@ class EgregoreAPI {
     this.base = (baseUrl || DEFAULT_API).replace(/\/$/, "");
   }
 
-  async claimToken(token) {
-    return request("GET", `${this.base}/api/org/claim/${token}`);
+  async claimToken(token, githubToken) {
+    // Old APIs reject POST without consuming a one-time setup token. Never
+    // silently downgrade an authenticated retry to the legacy GET protocol.
+    return request(githubToken ? "POST" : "GET", `${this.base}/api/org/claim/${token}`, {
+      headers: githubToken ? { Authorization: `Bearer ${githubToken}` } : {},
+    });
   }
 
   async getOrgs(githubToken) {

package/lib/auth.js

@@ -212,7 +212,7 @@ function runGhAuthLogin(ui, opts = {}) {
 
 function tryGhAuthOrLogin(ui, opts = {}) {
   const existing = tryGhAuth();
-  if (existing) return existing;
+  if (existing && !opts.forceLogin && !(opts.requireRepoScope && existing.hasRepoScope === false)) return existing;
   if (!ghCliExists()) return null;
   return runGhAuthLogin(ui, opts);
 }

package/lib/install-access.js

@@ -0,0 +1,87 @@
+/** Repository access for a connected install. Never accept unrelated invitations. */
+class RepositoryAccessError extends Error {
+  constructor(message, canReauthenticate = false) {
+    super(message);
+    this.name = "RepositoryAccessError";
+    this.canReauthenticate = canReauthenticate;
+  }
+}
+
+function repositoryFromUrl(value) {
+  const url = new URL(value);
+  const name = url.pathname.replace(/^\//, "").replace(/\.git$/, "");
+  if (url.protocol !== "https:" || url.hostname !== "github.com" || url.username || url.password ||
+      url.search || url.hash || !/^[\w.-]+\/[\w.-]+$/.test(name)) {
+    throw new Error("Setup contains an invalid GitHub repository URL.");
+  }
+  return name;
+}
+
+function requiredRepositories(data) {
+  const names = [repositoryFromUrl(data.fork_url), repositoryFromUrl(data.memory_url)];
+  for (const entry of data.repos || []) {
+    const name = typeof entry === "string" ? entry : entry?.name;
+    if (!/^[\w.-]+$/.test(name || "") || name === "." || name === "..") {
+      throw new Error("Setup contains an invalid managed repository name.");
+    }
+    names.push(repositoryFromUrl(`https://github.com/${data.github_org}/${name}`));
+  }
+  return [...new Map(names.map(name => [name.toLowerCase(), name])).values()];
+}
+
+function matchesIdentity(data, user) {
+  // IDs survive account renames. Older payloads can only be checked by login.
+  if (data.github_id != null) return String(data.github_id) === String(user?.id);
+  return !!data.github_username && data.github_username.toLowerCase() === user?.login?.toLowerCase();
+}
+
+async function ensureRepositoryAccess(data, ui, { request, sleep = ms => new Promise(r => setTimeout(r, ms)) }) {
+  const token = data.github_token;
+  if (!token) throw new RepositoryAccessError("GitHub authentication is required for this installation.", true);
+  const who = await request("GET", "/user", token);
+  if (who.status !== 200) throw new RepositoryAccessError(`GitHub identity check failed (HTTP ${who.status}).`, who.status === 401 || who.status === 403);
+  if (!matchesIdentity(data, who.data)) throw new RepositoryAccessError("Your active GitHub account does not match the account that accepted this invitation. Sign in to that account and retry.");
+
+  const required = requiredRepositories(data);
+  async function missingRepos() {
+    const missing = [];
+    for (const name of required) {
+      const result = await request("GET", `/repos/${name}`, token);
+      if (result.status === 200 && result.data?.permissions?.pull !== false) continue;
+      if (![401, 403, 404, 200].includes(result.status)) {
+        throw new RepositoryAccessError(`GitHub access check for ${name} failed (HTTP ${result.status}). Retry the same install command.`);
+      }
+      missing.push(name);
+    }
+    return missing;
+  }
+  let missing = await missingRepos();
+  if (!missing.length) return required;
+  const wanted = new Set(missing.map(name => name.toLowerCase()));
+  // Collect before accepting: removing invitations while paginating would skip entries.
+  const invitations = [];
+  for (let page = 1; ; page++) {
+    const result = await request("GET", `/user/repository_invitations?per_page=100&page=${page}`, token);
+    if (result.status !== 200 || !Array.isArray(result.data)) {
+      throw new RepositoryAccessError(`Could not list GitHub repository invitations (HTTP ${result.status}); access is missing for ${missing.join(", ")}.`, [401, 403].includes(result.status));
+    }
+    invitations.push(...result.data.filter(inv => wanted.has(inv.repository?.full_name?.toLowerCase())));
+    if (result.data.length < 100) break;
+    if (page === 100) throw new RepositoryAccessError("GitHub returned too many invitation pages. Retry after reviewing pending invitations.");
+  }
+  let acceptanceError;
+  for (const inv of invitations) {
+    const result = await request("PATCH", `/user/repository_invitations/${inv.id}`, token);
+    if (result.status >= 200 && result.status < 300) ui.success(`Accepted invite to ${inv.repository.full_name}`);
+    else acceptanceError = new RepositoryAccessError(`Could not accept the GitHub invitation for ${inv.repository.full_name} (HTTP ${result.status}).`, [401, 403].includes(result.status));
+  }
+  // A concurrent acceptance can reject our PATCH yet leave effective access ready.
+  for (let attempt = 0; attempt < 3; attempt++) {
+    missing = await missingRepos();
+    if (!missing.length) return required;
+    if (attempt < 2) await sleep(250 * (attempt + 1));
+  }
+  throw acceptanceError || new RepositoryAccessError(`GitHub access is still missing for ${missing.join(", ")}. Confirm this account has been invited to these repositories, then retry the same install command.`, true);
+}
+
+module.exports = { RepositoryAccessError, requiredRepositories, matchesIdentity, ensureRepositoryAccess };

package/lib/setup.js

@@ -29,6 +29,7 @@ const {
 const { commandExists } = require("./path-lookup");
 
 const https = require("node:https");
+const { RepositoryAccessError, ensureRepositoryAccess } = require("./install-access");
 
 function run(cmd, opts = {}) {
   return execSync(cmd, { stdio: "pipe", encoding: "utf-8", timeout: 60000, ...opts }).trim();
@@ -52,6 +53,7 @@ function ghApi(method, apiPath, token, body) {
         path: apiPath,
         method,
         headers,
+        timeout: 15000,
       },
       (res) => {
         let buf = "";
@@ -66,6 +68,7 @@ function ghApi(method, apiPath, token, body) {
       }
     );
     req.on("error", reject);
+    req.on("timeout", () => req.destroy(new Error("GitHub request timed out. Retry the same install command.")));
     if (payload) req.write(payload);
     req.end();
   });
@@ -416,9 +419,15 @@ async function install(data, ui, targetDir, opts = {}) {
   // steps are skipped. Falls through to the normal flow if anything is off.
   const alreadyInstalled = isFullySetUp(egregoreDir, memoryDir, fork_url, memory_url);
 
-  // Accept pending repo collaboration invitations (joiners get invited as collaborators)
-  if (github_token) configureGitCredentials(github_token);
-  await acceptPendingInvitations(github_token, github_org, ui);
+  // Verify before credential writes or cloning. The same verified credential
+  // handles Git operations, so an unrelated SSH account cannot take over.
+  if (opts.verifyAccess) {
+    const required = await ensureRepositoryAccess(data, ui, { request: ghApi });
+    for (const name of required) verifyGitAccess(`https://github.com/${name}.git`, github_token);
+  } else {
+    if (github_token) configureGitCredentials(github_token);
+    await acceptPendingInvitations(github_token, github_org, ui);
+  }
 
   if (alreadyInstalled) {
     ui.success(`Already installed at ${ui.bold(egregoreDir)} — refreshing setup`);
@@ -426,7 +435,9 @@ async function install(data, ui, targetDir, opts = {}) {
   } else {
     // 1. Clone fork (SSH first, HTTPS fallback — no token embedding)
     ui.step(1, totalSteps, "Cloning egregore...");
-    if (fs.existsSync(egregoreDir)) {
+    if (opts.verifyAccess) {
+      syncAuthenticatedRepository(fork_url, egregoreDir, github_token);
+    } else if (fs.existsSync(egregoreDir)) {
       ui.warn("egregore/ already exists — pulling latest");
       run("git pull", { cwd: egregoreDir });
     } else {
@@ -449,7 +460,9 @@ async function install(data, ui, targetDir, opts = {}) {
 
     // 2. Clone memory
     ui.step(2, totalSteps, "Cloning shared memory...");
-    if (fs.existsSync(memoryDir)) {
+    if (opts.verifyAccess) {
+      syncAuthenticatedRepository(memory_url, memoryDir, github_token);
+    } else if (fs.existsSync(memoryDir)) {
       ui.warn(`${memoryDirName}/ already exists — pulling latest`);
       run("git pull", { cwd: memoryDir });
     } else {
@@ -576,7 +589,9 @@ async function install(data, ui, targetDir, opts = {}) {
       continue;
     }
     try {
-      if (fs.existsSync(repoDir)) {
+      if (opts.verifyAccess) {
+        syncAuthenticatedRepository(`https://github.com/${github_org}/${repoName}.git`, repoDir, github_token);
+      } else if (fs.existsSync(repoDir)) {
         ui.warn(`${repoName}/ already exists — pulling latest`);
         run("git pull", { cwd: repoDir });
       } else {
@@ -588,7 +603,8 @@ async function install(data, ui, targetDir, opts = {}) {
       try { run("git config credential.helper store", { cwd: repoDir }); } catch {}
       clonedRepos.push(repoName);
       ui.success(`Cloned ${repoName}`);
-    } catch {
+    } catch (err) {
+      if (opts.verifyAccess) throw err;
       failedRepos.push(repoName);
       ui.warn(`Could not clone ${repoName} — you may not have access yet. Ask the org admin to grant access.`);
     }
@@ -823,6 +839,61 @@ function gitCloneEnv(base = process.env) {
   };
 }
 
+function authenticatedGitEnv(token, base = process.env) {
+  if (!token || /[\r\n]/.test(token)) throw new Error("A valid GitHub credential is required.");
+  const env = gitCloneEnv(base);
+  const count = Number(env.GIT_CONFIG_COUNT || 0);
+  if (!Number.isSafeInteger(count) || count < 0) throw new Error("Invalid Git configuration environment.");
+  const settings = [
+    ["credential.helper", ""],
+    ["http.https://github.com/.extraheader", ""],
+    ["http.https://github.com/.extraheader", `Authorization: Basic ${Buffer.from("x-access-token:" + token).toString("base64")}`],
+  ];
+  settings.forEach(([key, value], index) => {
+    env[`GIT_CONFIG_KEY_${count + index}`] = key;
+    env[`GIT_CONFIG_VALUE_${count + index}`] = value;
+  });
+  env.GIT_CONFIG_COUNT = String(count + settings.length);
+  return env;
+}
+
+function authenticatedGit(args, token, cwd) {
+  try {
+    return execFileSync("git", args, {
+      cwd, env: authenticatedGitEnv(token), timeout: 60000,
+      stdio: "pipe", encoding: "utf-8",
+    }).trim();
+  } catch (err) {
+    const detail = redactToken(err.stderr || err.message, token)
+      .split(Buffer.from("x-access-token:" + token).toString("base64")).join("***");
+    throw new Error(`Git ${args[0]} failed: ${detail.trim()}`);
+  }
+}
+
+function verifyGitAccess(url, token) {
+  try {
+    authenticatedGit(["ls-remote", url], token);
+  } catch (err) {
+    throw new RepositoryAccessError(
+      `Cannot read ${url} with the verified GitHub account. ${err.message}`,
+      /authentication|could not read Username|not found|403|access denied/i.test(err.message),
+    );
+  }
+}
+
+function syncAuthenticatedRepository(url, dir, token) {
+  if (fs.existsSync(dir)) {
+    const origin = authenticatedGit(["remote", "get-url", "origin"], token, dir);
+    if (normalizeGitUrl(origin) !== normalizeGitUrl(url)) {
+      throw new Error(`Refusing to update ${dir}: its Git origin differs from this setup.`);
+    }
+    // A retry reuses completed clones. Do not merge a remote default branch
+    // into a user's working branch or disturb changes made after the failure.
+  } else {
+    authenticatedGit(["clone", url, dir], token);
+  }
+}
+
 /**
  * Clone a repo, trying SSH first then HTTPS (no token embedded).
  * The repo:invite-scoped OAuth token can't clone — we rely on the
@@ -1544,6 +1615,9 @@ module.exports = {
   redactToken,
   configureGitCredentials,
   gitCloneEnv,
+  authenticatedGitEnv,
+  verifyGitAccess,
+  syncAuthenticatedRepository,
   assistantInstallCommand,
   initMemoryDirs,
   ensureDevelop,

package/lib/token-install.js

@@ -0,0 +1,65 @@
+/** Authenticate before redeeming, and keep retries on the original connected setup. */
+const { RepositoryAccessError, matchesIdentity } = require("./install-access");
+
+async function installFromToken(api, token, ctx, deps) {
+  const { ui, authenticate, request, install } = deps;
+  let auth = await authenticate(false);
+  if (!auth?.token) throw new Error("GitHub sign-in did not complete. Retry this install command to continue joining the same Egregore.");
+  let who = await request("GET", "/user", auth.token);
+  if ([401, 403].includes(who.status)) {
+    ui.info("Your GitHub session needs authentication. Signing in again before opening this setup.");
+    auth = await authenticate(true);
+    if (!auth?.token) throw new Error("GitHub sign-in did not complete. Retry this install command.");
+    who = await request("GET", "/user", auth.token);
+  }
+  if (who.status !== 200 || !who.data?.id) throw new Error(`GitHub identity check failed (HTTP ${who.status}). Retry after signing in.`);
+  const spinner = ui.spinner("Verifying setup...");
+  let data;
+  try {
+    data = await api.claimToken(token, auth.token);
+    spinner.stop(`Setting up ${ui.bold(data.org_name)}`);
+  } catch (err) {
+    spinner.fail("Could not open this setup");
+    if (/Method Not Allowed|HTTP 405/i.test(err.message)) {
+      throw new Error("The setup service needs the authenticated retry update before this installer can continue. The setup token has not been consumed.");
+    }
+    throw new Error(`${err.message}. Retry with the GitHub account that accepted the invitation. If the setup has expired, reopen the invitation page to continue joining the same Egregore.`);
+  }
+  if (!matchesIdentity(data, who.data)) throw new Error("This setup belongs to a different GitHub account. Sign in to the account that accepted the invitation and retry.");
+
+  const skipRepos = new Set();
+  if (ctx.prefilledRepo && Array.isArray(data.repos)) {
+    for (const repo of data.repos) {
+      const name = typeof repo === "string" ? repo : repo?.name;
+      if (name === ctx.prefilledRepo.name) skipRepos.add(name);
+    }
+  }
+  const options = {
+    skipRepos,
+    noAutolaunch: ctx.noAutolaunch,
+    noScreens: ctx.noScreens,
+    flowVariant: ctx.flowVariant,
+    runtime: ctx.runtime,
+    verifyAccess: true,
+  };
+  for (let attempt = 0; attempt < 2; attempt++) {
+    try {
+      await install({ ...data, github_token: auth.token }, ui, ctx.targetDir, options);
+      return;
+    } catch (err) {
+      if (attempt === 0 && err instanceof RepositoryAccessError && err.canReauthenticate) {
+        ui.warn(err.message);
+        ui.info("Signing in again with permission to accept invitations and read the required repositories.");
+        const next = await authenticate(true);
+        if (next?.token) {
+          auth = next;
+          // install() verifies identity again before invitations or any writes.
+          continue;
+        }
+      }
+      throw new Error(`${err.message}\nRetry the same install command to continue this setup before its token expires.`);
+    }
+  }
+}
+
+module.exports = { installFromToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "description": "Set up Egregore for your team in one command \u2014 installs the egregore launcher and your choice of Claude Code, Codex, or Pi.",
   "license": "MIT",
   "bin": {
@@ -13,7 +13,7 @@
     "build:runtime": "node ../../bin/capability-distribution.mjs generate-skill-view --root ../.. && node scripts/build-runtime-bundle.mjs && node scripts/build-pi-runtime-bundle.mjs && node scripts/build-prime-runtime-bundle.mjs && node ../../api/scripts/build-connect-runtime-pack.mjs",
     "build:pi-runtime": "node scripts/build-pi-runtime-bundle.mjs",
     "build:prime-runtime": "node scripts/build-prime-runtime-bundle.mjs",
-    "test": "node ../../bin/capability-distribution.mjs validate --root ../.. && node scripts/build-runtime-bundle.mjs --check && node scripts/build-pi-runtime-bundle.mjs --check && node scripts/build-prime-runtime-bundle.mjs --check && node ../../bin/prime-render-spec.mjs --check && node ../../bin/pi-render-spec.mjs --check && node ../../api/scripts/build-connect-runtime-pack.mjs --check && node --test test/capability-distribution.test.js test/connect-runtime.test.js test/context.test.js test/path-lookup.test.js test/nixos-portability.test.js test/parse-join-target.test.js test/skip-repos.test.js test/install-origin-guard.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/pi-runtime.test.js test/prime-runtime.test.js test/prime-branch-policy.test.js test/prime-bridge-skill.test.js test/prime-session-smoke.test.js test/pi-product-workflows.test.js test/installer-runtime-source.test.js test/scroll-repro.test.js test/launcher-refocus-redraw.test.js test/multiselect-remote-search.test.js test/back-navigation.test.js test/manifest-form.test.js test/launcher-delete.test.js test/launcher-connect.test.js test/installer-connect-choice.test.js test/launcher-connected-status.test.js test/launcher-permissions.test.js test/launcher-update.test.js test/connected-config.test.js test/workflow-settings.test.js",
+    "test": "node ../../bin/capability-distribution.mjs validate --root ../.. && node scripts/build-runtime-bundle.mjs --check && node scripts/build-pi-runtime-bundle.mjs --check && node scripts/build-prime-runtime-bundle.mjs --check && node ../../bin/prime-render-spec.mjs --check && node ../../bin/pi-render-spec.mjs --check && node ../../api/scripts/build-connect-runtime-pack.mjs --check && node --test test/invite-install.test.js test/capability-distribution.test.js test/connect-runtime.test.js test/context.test.js test/path-lookup.test.js test/nixos-portability.test.js test/parse-join-target.test.js test/skip-repos.test.js test/install-origin-guard.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/pi-runtime.test.js test/prime-runtime.test.js test/prime-branch-policy.test.js test/prime-bridge-skill.test.js test/prime-session-smoke.test.js test/pi-product-workflows.test.js test/installer-runtime-source.test.js test/scroll-repro.test.js test/launcher-refocus-redraw.test.js test/multiselect-remote-search.test.js test/back-navigation.test.js test/manifest-form.test.js test/launcher-delete.test.js test/launcher-connect.test.js test/installer-connect-choice.test.js test/launcher-connected-status.test.js test/launcher-permissions.test.js test/launcher-update.test.js test/connected-config.test.js test/workflow-settings.test.js",
     "test:e2e": "node --test test/e2e-local.test.js",
     "test:all": "node scripts/build-runtime-bundle.mjs --check && node scripts/build-pi-runtime-bundle.mjs --check && node --test test/"
   },