create-egregore 0.3.8 → 0.3.10

package/bin/cli.js

@@ -67,10 +67,10 @@ async function main() {
 
 async function tokenFlow(api, token) {
   const s = ui.spinner("Claiming setup token...");
+  let data;
   try {
-    const data = await api.claimToken(token);
+    data = await api.claimToken(token);
     s.stop(`Claimed — setting up ${ui.bold(data.org_name)}`);
-    await install(data, ui);
   } catch (err) {
     s.fail("Token claim failed");
     ui.error(err.message);
@@ -80,6 +80,13 @@ async function tokenFlow(api, token) {
     ui.info("  npx create-egregore");
     process.exit(1);
   }
+
+  try {
+    await install(data, ui);
+  } catch (err) {
+    ui.error(`Install failed: ${err.message}`);
+    process.exit(1);
+  }
 }
 
 async function interactiveFlow(api) {

package/lib/setup.js

@@ -23,8 +23,9 @@ async function install(data, ui, targetDir) {
   const { fork_url, memory_url, github_token, org_name, github_org, slug, api_key, repos = [], telegram_group_link } = data;
   const base = targetDir || process.cwd();
 
-  const dirSlug = (github_org || slug || "egregore").toLowerCase();
-  const egregoreDir = path.join(base, `egregore-${dirSlug}`);
+  // Directory name from fork URL (what git clone would use), e.g. "egregore-core"
+  const forkDirName = fork_url.split("/").pop().replace(/\.git$/, "");
+  const egregoreDir = path.join(base, forkDirName);
   const memoryDirName = memory_url
     .split("/")
     .pop()
@@ -36,13 +37,18 @@ async function install(data, ui, targetDir) {
   // Configure git credential helper for HTTPS cloning
   configureGitCredentials(github_token);
 
+  // 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
   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", fork_url, egregoreDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+    execFileSync("git", ["clone", authedForkUrl, egregoreDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+    try { run(`git remote set-url origin ${fork_url}`, { cwd: egregoreDir }); } catch {}
   }
   ui.success("Cloned egregore");
 
@@ -52,18 +58,24 @@ async function install(data, ui, targetDir) {
     ui.warn(`${memoryDirName}/ already exists — pulling latest`);
     run("git pull", { cwd: memoryDir });
   } else {
-    execFileSync("git", ["clone", memory_url, memoryDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+    execFileSync("git", ["clone", authedMemoryUrl, memoryDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+    try { run(`git remote set-url origin ${memory_url}`, { cwd: memoryDir }); } catch {}
   }
   ui.success("Cloned memory");
 
-  // 3. Symlink
+  // 3. Symlink (use junction on Windows — no admin required)
   ui.step(3, totalSteps, "Linking memory...");
   const symlinkTarget = path.join(egregoreDir, "memory");
   if (fs.existsSync(symlinkTarget)) {
     ui.warn("memory/ symlink already exists");
   } else {
-    const relPath = path.relative(egregoreDir, memoryDir);
-    fs.symlinkSync(relPath, symlinkTarget);
+    if (process.platform === "win32") {
+      // Junctions require absolute paths on Windows
+      fs.symlinkSync(path.resolve(memoryDir), symlinkTarget, "junction");
+    } else {
+      const relPath = path.relative(egregoreDir, memoryDir);
+      fs.symlinkSync(relPath, symlinkTarget);
+    }
   }
   ui.success("Linked");
 
@@ -77,7 +89,7 @@ async function install(data, ui, targetDir) {
 
   // 5. Register instance + shell alias
   ui.step(5, totalSteps, "Registering instance...");
-  registerInstance(dirSlug, org_name, egregoreDir);
+  registerInstance(forkDirName, org_name, egregoreDir);
   const alias = await installShellAlias(egregoreDir, ui);
 
   // 6+. Clone managed repos (if any)
@@ -91,7 +103,8 @@ async function install(data, ui, targetDir) {
       run("git pull", { cwd: repoDir });
     } else {
       const repoUrl = `https://github.com/${github_org}/${repoName}.git`;
-      execFileSync("git", ["clone", repoUrl, repoDir], { stdio: "pipe", encoding: "utf-8", timeout: 60000 });
+      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 {}
     }
     clonedRepos.push(repoName);
     ui.success(`Cloned ${repoName}`);
@@ -102,7 +115,7 @@ async function install(data, ui, targetDir) {
   ui.success(`Egregore is ready for ${ui.bold(org_name)}`);
   console.log("");
   ui.info(`Your workspace:`);
-  ui.info(`  ${ui.cyan(`./egregore-${dirSlug}/`)}  — Your Egregore instance`);
+  ui.info(`  ${ui.cyan(`./${forkDirName}/`)}  — Your Egregore instance`);
   ui.info(`  ${ui.cyan(`./${memoryDirName}/`)}     — Shared knowledge`);
   for (const repoName of clonedRepos) {
     ui.info(`  ${ui.cyan(`./${repoName}/`)}        — Managed repo`);
@@ -117,6 +130,14 @@ async function install(data, ui, targetDir) {
   console.log("");
 }
 
+function embedToken(url, token) {
+  try {
+    return url.replace("https://github.com/", `https://x-access-token:${token}@github.com/`);
+  } catch {
+    return url;
+  }
+}
+
 function configureGitCredentials(token) {
   try {
     run("git config credential.helper store");

package/package.json

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