create-egregore 0.12.0 → 0.12.2

package/lib/auth.js

@@ -6,7 +6,7 @@
 const https = require("node:https");
 
 const CLIENT_ID = "Iv23li2obNsAjakoK2RE";
-const SCOPE = "";
+const SCOPE = "";  // GitHub App — permissions managed via installation, not OAuth scope
 
 function post(url, body) {
   return new Promise((resolve, reject) => {

package/lib/local.js

@@ -22,9 +22,6 @@ const {
 const TEMPLATE_OWNER = "egregore-labs";
 const TEMPLATE_REPO = "egregore";
 
-// GitHub App installation URL
-const APP_INSTALL_URL = "https://github.com/apps/egregore-labs/installations/new";
-
 // ── GitHub API helpers ──────────────────────────────────────────────
 
 async function getUser(token) {
@@ -83,6 +80,17 @@ async function waitForRepo(token, owner, repo, timeoutMs = 30000) {
   return false;
 }
 
+async function findEgregoreRepo(token, orgLogin, explicitRepo) {
+  if (explicitRepo) {
+    if (await repoExists(token, orgLogin, explicitRepo)) return explicitRepo;
+  } else {
+    for (const candidate of ["egregore", "egregore-core"]) {
+      if (await repoExists(token, orgLogin, candidate)) return candidate;
+    }
+  }
+  return null;
+}
+
 async function getFileContent(token, owner, repo, filePath) {
   const { status, data } = await ghApi("GET", `/repos/${owner}/${repo}/contents/${filePath}`, token);
   if (status !== 200 || !data.content) return null;
@@ -182,15 +190,8 @@ function createSymlink(egregoreDir, memoryDir, ui) {
 // ── Flow 1: Founder (local mode) ───────────────────────────────────
 
 async function localFounderFlow(ui) {
-  // 1. Install GitHub App — grants Egregore access to the repos the user selects
-  ui.info("Let's set up Egregore.\n");
-  ui.info("First, install the Egregore app on your GitHub account.");
-  ui.info("You'll choose exactly which repos to share.\n");
-  openBrowser(APP_INSTALL_URL);
-  await ui.prompt("Press Enter when done...");
-
-  // 2. GitHub auth (auto-approved — user just authorized during App install)
-  ui.info("");
+  // 1. GitHub auth
+  ui.info("Let's set up Egregore. First, sign in with GitHub.\n");
   let githubToken;
   try {
     githubToken = await deviceFlow(ui);
@@ -571,40 +572,43 @@ async function localJoinFlow(orgArg, ui) {
   // 2. Get user info
   const user = await getUser(githubToken);
 
-  // 3. Accept pending invitations
+  // 3. Accept pending invitations (may silently fail with GitHub App tokens)
   console.log("");
   const s1 = ui.spinner("Checking for invitations...");
   await acceptPendingInvitations(githubToken, orgLogin, ui);
   s1.stop("Checked invitations");
 
   // 4. Find egregore repo
-  const s2 = ui.spinner(`Looking for egregore in ${orgLogin}...`);
-  let repoName = null;
-  if (explicitRepo) {
-    // User specified org/repo — use it directly
-    if (await repoExists(githubToken, orgLogin, explicitRepo)) {
-      repoName = explicitRepo;
-    }
-  } else {
-    // Search for known repo names
-    for (const candidate of ["egregore", "egregore-core"]) {
-      if (await repoExists(githubToken, orgLogin, candidate)) {
-        repoName = candidate;
-        break;
-      }
+  let repoName = await findEgregoreRepo(githubToken, orgLogin, explicitRepo);
+
+  // 4b. If repo not found, the user likely has a pending invitation that couldn't
+  //     be accepted automatically. Open the repo page so they can accept with one click.
+  if (!repoName && explicitRepo) {
+    console.log("");
+    ui.info("Accept the repo invitation in your browser.");
+    openBrowser(`https://github.com/${orgLogin}/${explicitRepo}`);
+    await ui.prompt("Press Enter after accepting...");
+
+    const s2 = ui.spinner("Retrying...");
+    repoName = await findEgregoreRepo(githubToken, orgLogin, explicitRepo);
+    if (!repoName) {
+      s2.fail(`Still can't access ${orgLogin}/${explicitRepo}`);
+      ui.error("Make sure the org admin has set up Egregore and invited you.");
+      process.exit(1);
     }
-  }
-  if (!repoName) {
-    s2.fail(`No egregore repo found in ${orgLogin}${explicitRepo ? `/${explicitRepo}` : ""}`);
+    s2.stop("Access confirmed");
+  } else if (!repoName) {
+    ui.error(`No egregore repo found in ${orgLogin}`);
     ui.error("Make sure the org admin has set up Egregore and invited you.");
     ui.info("If the repo has a custom name, use: npx create-egregore join <org>/<repo>");
     process.exit(1);
   }
 
   // 5. Read egregore.json from remote
+  const s3 = ui.spinner(`Reading config from ${orgLogin}/${repoName}...`);
   const configRaw = await getFileContent(githubToken, orgLogin, repoName, "egregore.json");
   if (!configRaw) {
-    s2.fail("Could not read egregore.json");
+    s3.fail("Could not read egregore.json");
     ui.error("The egregore repo exists but has no egregore.json. Ask the admin to set up first.");
     process.exit(1);
   }
@@ -612,10 +616,10 @@ async function localJoinFlow(orgArg, ui) {
   try {
     config = JSON.parse(configRaw);
   } catch {
-    s2.fail("Invalid egregore.json");
+    s3.fail("Invalid egregore.json");
     process.exit(1);
   }
-  s2.stop(`Found ${ui.bold(config.org_name || orgLogin)}`);
+  s3.stop(`Found ${ui.bold(config.org_name || orgLogin)}`);
 
   const orgName = config.org_name || orgLogin;
   const memoryRepoName = config.memory_repo
@@ -623,6 +627,36 @@ async function localJoinFlow(orgArg, ui) {
     : `${orgLogin}-memory`;
   const managedRepos = config.repos || [];
 
+  // 5b. Check access to memory repo + managed repos (may need invitation acceptance)
+  const additionalRepos = [memoryRepoName, ...managedRepos];
+  const inaccessible = [];
+  for (const repo of additionalRepos) {
+    if (!(await repoExists(githubToken, orgLogin, repo))) {
+      inaccessible.push(repo);
+    }
+  }
+  if (inaccessible.length > 0) {
+    console.log("");
+    ui.info(`Accept ${inaccessible.length === 1 ? "the invitation" : "all invitations"} in your browser.`);
+    for (const repo of inaccessible) {
+      openBrowser(`https://github.com/${orgLogin}/${repo}`);
+    }
+    await ui.prompt("Press Enter after accepting...");
+
+    const stillBlocked = [];
+    for (const repo of inaccessible) {
+      if (!(await repoExists(githubToken, orgLogin, repo))) {
+        stillBlocked.push(repo);
+      }
+    }
+    if (stillBlocked.length > 0) {
+      ui.error(`Still can't access: ${stillBlocked.join(", ")}`);
+      ui.error("Make sure you've been invited to all repos.");
+      process.exit(1);
+    }
+    ui.success("All repos accessible");
+  }
+
   // 6. Clone locally
   const base = process.cwd();
   const forkUrl = `https://github.com/${orgLogin}/${repoName}.git`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Set up Egregore for your team in one command",
   "license": "MIT",
   "bin": {