create-egregore 0.3.9 → 0.3.11

package/bin/cli.js

@@ -117,13 +117,22 @@ async function interactiveFlow(api) {
   // 3. Build choices
   const choices = [];
 
-  // Orgs with egregore → join
+  // Orgs with egregore → show each instance to join + option to set up another
   for (const org of orgsData.orgs) {
     if (org.has_egregore) {
+      for (const inst of org.instances || []) {
+        choices.push({
+          label: `${org.name || org.login} — ${inst.org_name || inst.repo_name}`,
+          description: "Join existing",
+          action: "join",
+          login: org.login,
+          repo_name: inst.repo_name,
+        });
+      }
       choices.push({
-        label: org.name || org.login,
-        description: "Join existing",
-        action: "join",
+        label: `${org.name || org.login} — new instance`,
+        description: "Set up another",
+        action: "setup",
         login: org.login,
       });
     }
@@ -141,13 +150,23 @@ async function interactiveFlow(api) {
     }
   }
 
-  // Personal account
+  // Personal account — show join for each existing instance + setup for new
   if (orgsData.personal.has_egregore) {
+    for (const inst of orgsData.personal.instances || []) {
+      choices.push({
+        label: `${orgsData.user.login} (personal) — ${inst.org_name || inst.repo_name}`,
+        description: "Join existing",
+        action: "join",
+        login: orgsData.user.login,
+        repo_name: inst.repo_name,
+      });
+    }
     choices.push({
-      label: `${orgsData.user.login} (personal)`,
-      description: "Join existing",
-      action: "join",
+      label: `${orgsData.user.login} (personal) — new instance`,
+      description: "Set up another",
+      action: "setup",
       login: orgsData.user.login,
+      is_personal: true,
     });
   } else {
     choices.push({
@@ -180,6 +199,10 @@ async function setupFlow(api, githubToken, choice) {
   const orgName = await ui.prompt(`Organization display name [${choice.login}]:`);
   const name = orgName || choice.login;
 
+  // Instance name — determines repo names (egregore-{instance}, {instance}-memory)
+  const instanceInput = await ui.prompt(`Instance name (e.g. "ops", "research") [leave blank for default]:`);
+  const instanceName = instanceInput || undefined;
+
   // Repo picker — show org repos for selection
   let selectedRepos = [];
   try {
@@ -201,6 +224,7 @@ async function setupFlow(api, githubToken, choice) {
       org_name: name,
       is_personal: choice.is_personal || false,
       repos: selectedRepos,
+      instance_name: instanceName,
     });
     s.stop("Setup complete on GitHub");
 
@@ -220,10 +244,12 @@ async function setupFlow(api, githubToken, choice) {
 }
 
 async function joinFlow(api, githubToken, choice) {
-  const s = ui.spinner(`Joining ${ui.bold(choice.login)}...`);
+  const displayName = choice.repo_name ? `${choice.login} (${choice.repo_name})` : choice.login;
+  const s = ui.spinner(`Joining ${ui.bold(displayName)}...`);
   try {
     const result = await api.joinOrg(githubToken, {
       github_org: choice.login,
+      repo_name: choice.repo_name,
     });
     s.stop("Joined");
 

package/lib/setup.js

@@ -20,11 +20,12 @@ function run(cmd, opts = {}) {
  * @param {string} targetDir - where to install (default: cwd)
  */
 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 { fork_url, memory_url, github_token, org_name, github_org, slug, api_key, repos = [], telegram_group_link, github_username, github_name } = 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,23 +37,39 @@ 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");
 
+  // Set repo-local git identity from GitHub user (not machine-global config)
+  if (github_username) {
+    try {
+      run(`git config user.name "${github_name || github_username}"`, { cwd: egregoreDir });
+      run(`git config user.email "${github_username}@users.noreply.github.com"`, { cwd: egregoreDir });
+    } catch {
+      // Non-fatal
+    }
+  }
+
   // 2. Clone memory
   ui.step(2, totalSteps, "Cloning shared memory...");
   if (fs.existsSync(memoryDir)) {
     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");
 
@@ -80,9 +97,22 @@ async function install(data, ui, targetDir) {
   fs.writeFileSync(envPath, envLines.join("\n") + "\n", { mode: 0o600 });
   ui.success("Credentials saved");
 
+  // 4b. Save identity to .egregore-state.json (so session-start.sh knows who this is)
+  const statePath = path.join(egregoreDir, ".egregore-state.json");
+  let state = {};
+  if (fs.existsSync(statePath)) {
+    try { state = JSON.parse(fs.readFileSync(statePath, "utf-8")); } catch {}
+  }
+  if (github_username) {
+    state.github_username = github_username;
+    state.github_name = github_name || github_username;
+  }
+  state.onboarding_complete = true;
+  fs.writeFileSync(statePath, JSON.stringify(state, null, 2) + "\n");
+
   // 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)
@@ -96,7 +126,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}`);
@@ -107,7 +138,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`);
@@ -122,6 +153,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.9",
+  "version": "0.3.11",
   "description": "Set up Egregore for your team in one command",
   "license": "MIT",
   "bin": {