create-egregore 0.13.0 → 0.14.0

package/lib/auth.js

@@ -5,8 +5,9 @@
 
 const https = require("node:https");
 
-const CLIENT_ID = "Iv23li2obNsAjakoK2RE";
-const SCOPE = "";  // GitHub App — permissions managed via installation, not OAuth scope
+const GITHUB_APP_CLIENT_ID = "Iv23li2obNsAjakoK2RE";   // GitHub App — for founder flow
+const OAUTH_APP_CLIENT_ID = "Ov23liYZjJbbbNgnJ9vH";    // OAuth App — for join flow
+const OAUTH_JOIN_SCOPE = "repo";                         // Minimal scope for cross-account access
 
 function post(url, body) {
   return new Promise((resolve, reject) => {
@@ -75,13 +76,17 @@ function copyToClipboard(text) {
  * Returns the access token string, or throws on failure.
  * @param {object} ui - UI module for output
  * @param {object} [opts] - Options
- * @param {string} [opts.scope] - Override OAuth scope (e.g. "repo" for join flow)
+ * @param {string} [opts.mode] - "join" uses OAuth App with repo scope; default uses GitHub App
  */
 async function deviceFlow(ui, opts = {}) {
+  const isJoin = opts.mode === "join";
+  const clientId = isJoin ? OAUTH_APP_CLIENT_ID : GITHUB_APP_CLIENT_ID;
+  const scope = isJoin ? OAUTH_JOIN_SCOPE : "";
+
   // 1. Request device code
   const codeResp = await post("https://github.com/login/device/code", {
-    client_id: CLIENT_ID,
-    scope: opts.scope ?? SCOPE,
+    client_id: clientId,
+    scope,
   });
 
   if (!codeResp.device_code) {
@@ -115,7 +120,7 @@ async function deviceFlow(ui, opts = {}) {
     await sleep(interval);
 
     const tokenResp = await post("https://github.com/login/oauth/access_token", {
-      client_id: CLIENT_ID,
+      client_id: clientId,
       device_code,
       grant_type: "urn:ietf:params:oauth:grant-type:device_code",
     });

package/lib/local.js

@@ -568,11 +568,11 @@ async function localJoinFlow(orgArg, ui) {
     explicitRepo = null;
   }
 
-  // 1. GitHub auth — repo scope needed to access repos on other accounts
+  // 1. GitHub auth — OAuth App with repo scope for cross-account access
   ui.info(`Joining ${ui.bold(orgLogin)}. First, sign in with GitHub.\n`);
   let githubToken;
   try {
-    githubToken = await deviceFlow(ui, { scope: "repo" });
+    githubToken = await deviceFlow(ui, { mode: "join" });
     ui.success("Authenticated with GitHub");
   } catch (err) {
     ui.error(`GitHub auth failed: ${err.message}`);
@@ -701,7 +701,7 @@ async function localJoinFlow(orgArg, ui) {
   registerInstance(repoName, orgName, egregoreDir);
   const alias = await installShellAlias(egregoreDir, ui);
 
-  // 11. Clone managed repos
+  // 11. Clone managed repos (retry once — git servers may lag behind invitation acceptance)
   for (let i = 0; i < managedRepos.length; i++) {
     const mr = managedRepos[i];
     ui.step(6 + i, totalSteps, `Cloning ${mr}...`);
@@ -711,7 +711,15 @@ async function localJoinFlow(orgArg, ui) {
       cloneRepo(repoUrl, repoDir, githubToken, ui, mr);
       setGitIdentity(repoDir, user);
     } catch {
-      ui.warn(`Could not clone ${mr} — you may not have access yet.`);
+      // Retry after a short delay — invitation acceptance may not have propagated
+      await new Promise((r) => setTimeout(r, 3000));
+      try {
+        const repoUrl = `https://github.com/${orgLogin}/${mr}.git`;
+        cloneRepo(repoUrl, repoDir, githubToken, ui, mr);
+        setGitIdentity(repoDir, user);
+      } catch {
+        ui.warn(`Could not clone ${mr} — you may not have access yet.`);
+      }
     }
   }
 

package/package.json

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