create-egregore 0.15.0 → 0.15.1

package/lib/local.js

@@ -168,6 +168,43 @@ function cloneRepo(url, dir, token, ui, label) {
   ui.success(`Cloned ${label}`);
 }
 
+/**
+ * Convert HTTPS GitHub URL to SSH format.
+ * https://github.com/org/repo.git → git@github.com:org/repo.git
+ */
+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.
+ * GIT_TERMINAL_PROMPT=0 prevents the hanging username/password prompt.
+ */
+function cloneWithFallback(httpsUrl, dir, timeout = 60000) {
+  const env = { ...process.env, GIT_TERMINAL_PROMPT: "0" };
+  const sshUrl = toSSH(httpsUrl);
+
+  // Try SSH first (most devs have SSH keys; GitHub no longer supports HTTPS password auth)
+  if (sshUrl) {
+    try {
+      execFileSync("git", ["clone", sshUrl, dir], { stdio: "pipe", encoding: "utf-8", timeout, env });
+      return true;
+    } catch {
+      // Clean up partial clone so HTTPS fallback can use the same dir
+      try { fs.rmSync(dir, { recursive: true, force: true }); } catch {}
+    }
+  }
+
+  // Fall back to HTTPS (works if user has gh CLI or a credential helper configured)
+  try {
+    execFileSync("git", ["clone", httpsUrl, dir], { stdio: "pipe", encoding: "utf-8", timeout, env });
+    return true;
+  } catch {}
+
+  return false;
+}
+
 function setGitIdentity(dir, user) {
   try {
     run(`git config user.name "${user.name}"`, { cwd: dir });
@@ -602,10 +639,9 @@ async function localJoinFlow(orgArg, ui) {
 
   console.log("");
   const s2 = ui.spinner(`Cloning ${orgLogin}/${repoName}...`);
-  try {
-    execFileSync("git", ["clone", `https://github.com/${orgLogin}/${repoName}.git`, egregoreDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+  if (cloneWithFallback(`https://github.com/${orgLogin}/${repoName}.git`, egregoreDir)) {
     s2.stop(`Cloned ${repoName}`);
-  } catch (err) {
+  } else {
     s2.fail(`Could not clone ${orgLogin}/${repoName}`);
     ui.error("Make sure you have git credentials set up (SSH keys or gh auth login).");
     ui.error("Also verify the org admin has set up Egregore and invited you.");
@@ -642,12 +678,11 @@ async function localJoinFlow(orgArg, ui) {
   // Store the invite token for later use (invitation acceptance, not cloning)
   const inviteToken = githubToken;
 
-  // Clone memory using git credentials (same as main repo — no token in URL)
+  // Clone memory using SSH-first fallback (same as main repo)
   ui.step(1, totalSteps, "Cloning shared memory...");
-  try {
-    execFileSync("git", ["clone", memoryUrl, memoryDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+  if (cloneWithFallback(memoryUrl, memoryDir)) {
     ui.success("Cloned memory");
-  } catch {
+  } else {
     ui.warn("Could not clone memory repo — you may not have access yet.");
   }
   setGitIdentity(memoryDir, user);
@@ -683,16 +718,15 @@ async function localJoinFlow(orgArg, ui) {
   registerInstance(repoName, orgName, egregoreDir);
   const alias = await installShellAlias(egregoreDir, ui);
 
-  // Clone managed repos using git credentials
+  // Clone managed repos using SSH-first fallback
   for (let i = 0; i < managedRepos.length; i++) {
     const mr = managedRepos[i];
     ui.step(5 + i, totalSteps, `Cloning ${mr}...`);
     const repoDir = path.join(base, mr);
-    try {
-      execFileSync("git", ["clone", `https://github.com/${orgLogin}/${mr}.git`, repoDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+    if (cloneWithFallback(`https://github.com/${orgLogin}/${mr}.git`, repoDir)) {
       setGitIdentity(repoDir, user);
       ui.success(`Cloned ${mr}`);
-    } catch {
+    } else {
       ui.warn(`Could not clone ${mr} — you may not have access yet.`);
     }
   }

package/package.json

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