create-egregore 0.16.0 → 0.16.2

package/lib/setup.js

@@ -118,24 +118,18 @@ async function install(data, ui, targetDir) {
 
   const totalSteps = 5 + repos.length;
 
-  // Configure git credential helper for HTTPS cloning
-  configureGitCredentials(github_token);
-
   // Accept pending repo collaboration invitations (joiners get invited as collaborators)
   await acceptPendingInvitations(github_token, github_org, ui);
 
-  // Embed token in URLs as fallback for private repos (credential helper may not work)
-  const authedForkUrl = embedToken(fork_url, github_token);
-  const authedMemoryUrl = embedToken(memory_url, github_token);
-
-  // 1. Clone fork
+  // 1. Clone fork (SSH first, HTTPS fallback — no token embedding)
   ui.step(1, totalSteps, "Cloning egregore...");
   if (fs.existsSync(egregoreDir)) {
     ui.warn("egregore/ already exists — pulling latest");
     run("git pull", { cwd: egregoreDir });
   } else {
-    execFileSync("git", ["clone", authedForkUrl, egregoreDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
-    try { run(`git remote set-url origin ${fork_url}`, { cwd: egregoreDir }); } catch {}
+    if (!cloneRepo(fork_url, egregoreDir)) {
+      throw new Error(`Command failed: git clone ${fork_url} ${egregoreDir}\nCloning into '${egregoreDir}'...\nMake sure you have SSH keys set up or run 'gh auth login' first.`);
+    }
   }
   try { run("git config credential.helper store", { cwd: egregoreDir }); } catch {}
   ensureDevelop(egregoreDir);
@@ -157,8 +151,9 @@ async function install(data, ui, targetDir) {
     ui.warn(`${memoryDirName}/ already exists — pulling latest`);
     run("git pull", { cwd: memoryDir });
   } else {
-    execFileSync("git", ["clone", authedMemoryUrl, memoryDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
-    try { run(`git remote set-url origin ${memory_url}`, { cwd: memoryDir }); } catch {}
+    if (!cloneRepo(memory_url, memoryDir)) {
+      ui.warn(`Could not clone memory repo — you may need SSH keys or 'gh auth login'`);
+    }
   }
   try { run("git config credential.helper store", { cwd: memoryDir }); } catch {}
   if (github_username) {
@@ -234,7 +229,8 @@ async function install(data, ui, targetDir) {
   const clonedRepos = [];
   const failedRepos = [];
   for (let i = 0; i < repos.length; i++) {
-    const repoName = repos[i];
+    const repoEntry = repos[i];
+    const repoName = typeof repoEntry === 'string' ? repoEntry : repoEntry.name;
     ui.step(6 + i, totalSteps, `Cloning ${repoName}...`);
     const repoDir = path.join(base, repoName);
     try {
@@ -243,8 +239,9 @@ async function install(data, ui, targetDir) {
         run("git pull", { cwd: repoDir });
       } else {
         const repoUrl = `https://github.com/${github_org}/${repoName}.git`;
-        execFileSync("git", ["clone", embedToken(repoUrl, github_token), repoDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
-        try { run(`git remote set-url origin ${repoUrl}`, { cwd: repoDir }); } catch {}
+        if (!cloneRepo(repoUrl, repoDir)) {
+          throw new Error(`Clone failed for ${repoName}`);
+        }
       }
       try { run("git config credential.helper store", { cwd: repoDir }); } catch {}
       ensureDevelop(repoDir);
@@ -329,6 +326,37 @@ function embedToken(url, token) {
   }
 }
 
+function toSSH(url) {
+  const m = url.match(/https:\/\/github\.com\/(.+?)(?:\.git)?$/);
+  return m ? `git@github.com:${m[1]}.git` : null;
+}
+
+/**
+ * Clone a repo, trying SSH first then HTTPS (no token embedded).
+ * The repo:invite-scoped OAuth token can't clone — we rely on the
+ * user's own git credentials (SSH keys / gh CLI / credential helper).
+ */
+function cloneRepo(httpsUrl, dir, timeout = 60000) {
+  const env = { ...process.env, GIT_TERMINAL_PROMPT: "0" };
+  const sshUrl = toSSH(httpsUrl);
+
+  if (sshUrl) {
+    try {
+      execFileSync("git", ["clone", sshUrl, dir], { stdio: "pipe", encoding: "utf-8", timeout, env });
+      return true;
+    } catch {
+      try { fs.rmSync(dir, { recursive: true, force: true }); } catch {}
+    }
+  }
+
+  try {
+    execFileSync("git", ["clone", httpsUrl, dir], { stdio: "pipe", encoding: "utf-8", timeout, env });
+    return true;
+  } catch {}
+
+  return false;
+}
+
 function configureGitCredentials(token) {
   try {
     // Use --global since this runs before any repos are cloned (no local .git exists)

package/package.json

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