create-egregore 0.3.10 → 0.3.12

package/bin/cli.js

@@ -81,6 +81,18 @@ async function tokenFlow(api, token) {
     process.exit(1);
   }
 
+  // Joiner tokens don't include a github_token — run device flow to get one
+  if (!data.github_token || data.needs_cli_auth) {
+    ui.info("\nSign in with GitHub to complete setup.\n");
+    try {
+      data.github_token = await deviceFlow(ui);
+      ui.success("Authenticated with GitHub");
+    } catch (err) {
+      ui.error(`GitHub auth failed: ${err.message}`);
+      process.exit(1);
+    }
+  }
+
   try {
     await install(data, ui);
   } catch (err) {
@@ -117,13 +129,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 +162,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 +211,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 {
@@ -194,6 +229,14 @@ async function setupFlow(api, githubToken, choice) {
     // Non-fatal — continue without repos
   }
 
+  // Transcript sharing consent
+  console.log("");
+  console.log("  Egregore can collect session transcripts to build");
+  console.log("  organizational memory (decisions, patterns, handoffs).");
+  console.log("  Transcripts are private to your org. Members can opt out individually.");
+  const consentAnswer = await ui.prompt("Enable transcript collection? [Y/n]:");
+  const transcriptSharing = !consentAnswer || consentAnswer.toLowerCase() !== "n";
+
   const s = ui.spinner(`Setting up Egregore for ${ui.bold(name)}...`);
   try {
     const result = await api.setupOrg(githubToken, {
@@ -201,6 +244,8 @@ async function setupFlow(api, githubToken, choice) {
       org_name: name,
       is_personal: choice.is_personal || false,
       repos: selectedRepos,
+      instance_name: instanceName,
+      transcript_sharing: transcriptSharing,
     });
     s.stop("Setup complete on GitHub");
 
@@ -220,10 +265,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/api.js

@@ -79,8 +79,8 @@ class EgregoreAPI {
     });
   }
 
-  async setupOrg(githubToken, { github_org, org_name, is_personal = false, repos = [], instance_name }) {
-    const body = { github_org, org_name, is_personal, repos };
+  async setupOrg(githubToken, { github_org, org_name, is_personal = false, repos = [], instance_name, transcript_sharing = false }) {
+    const body = { github_org, org_name, is_personal, repos, transcript_sharing };
     if (instance_name) body.instance_name = instance_name;
     return request("POST", `${this.base}/api/org/setup`, {
       headers: { Authorization: `Bearer ${githubToken}` },

package/lib/auth.js

@@ -6,7 +6,7 @@
 const https = require("node:https");
 
 const CLIENT_ID = "Ov23lizB4nYEeIRsHTdb";
-const SCOPE = "repo,admin:org";
+const SCOPE = "repo,read:org";
 
 function post(url, body) {
   return new Promise((resolve, reject) => {

package/lib/setup.js

@@ -8,10 +8,65 @@ const fs = require("node:fs");
 const path = require("node:path");
 const os = require("node:os");
 
+const https = require("node:https");
+
 function run(cmd, opts = {}) {
   return execSync(cmd, { stdio: "pipe", encoding: "utf-8", timeout: 60000, ...opts }).trim();
 }
 
+function ghApi(method, path, token) {
+  return new Promise((resolve, reject) => {
+    const req = https.request(
+      {
+        hostname: "api.github.com",
+        path,
+        method,
+        headers: {
+          Authorization: `Bearer ${token}`,
+          Accept: "application/vnd.github+json",
+          "User-Agent": "create-egregore",
+        },
+      },
+      (res) => {
+        let buf = "";
+        res.on("data", (c) => (buf += c));
+        res.on("end", () => {
+          try {
+            resolve({ status: res.statusCode, data: JSON.parse(buf) });
+          } catch {
+            resolve({ status: res.statusCode, data: buf });
+          }
+        });
+      }
+    );
+    req.on("error", reject);
+    req.end();
+  });
+}
+
+/**
+ * Accept pending GitHub repo collaboration invitations for the given org.
+ */
+async function acceptPendingInvitations(githubToken, githubOrg, ui) {
+  try {
+    const { status, data } = await ghApi("GET", "/user/repository_invitations", githubToken);
+    if (status !== 200 || !Array.isArray(data)) return;
+
+    const matching = data.filter(
+      (inv) => inv.repository?.owner?.login?.toLowerCase() === githubOrg.toLowerCase()
+    );
+
+    for (const inv of matching) {
+      const patchResult = await ghApi("PATCH", `/user/repository_invitations/${inv.id}`, githubToken);
+      if (patchResult.status < 300) {
+        ui.success(`Accepted invite to ${inv.repository.full_name}`);
+      }
+    }
+  } catch {
+    // Non-fatal — user may need to accept manually
+  }
+}
+
 /**
  * Full local setup from claimed token data.
  *
@@ -20,7 +75,7 @@ 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, transcript_sharing } = data;
   const base = targetDir || process.cwd();
 
   // Directory name from fork URL (what git clone would use), e.g. "egregore-core"
@@ -37,6 +92,9 @@ async function install(data, ui, targetDir) {
   // 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);
@@ -52,6 +110,16 @@ async function install(data, ui, targetDir) {
   }
   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)) {
@@ -87,6 +155,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;
+  if (transcript_sharing !== undefined) {
+    state.transcript_sharing = transcript_sharing;
+  }
+  fs.writeFileSync(statePath, JSON.stringify(state, null, 2) + "\n");
+
   // 5. Register instance + shell alias
   ui.step(5, totalSteps, "Registering instance...");
   registerInstance(forkDirName, org_name, egregoreDir);
@@ -94,20 +178,26 @@ async function install(data, ui, targetDir) {
 
   // 6+. Clone managed repos (if any)
   const clonedRepos = [];
+  const failedRepos = [];
   for (let i = 0; i < repos.length; i++) {
     const repoName = repos[i];
     ui.step(6 + i, totalSteps, `Cloning ${repoName}...`);
     const repoDir = path.join(base, repoName);
-    if (fs.existsSync(repoDir)) {
-      ui.warn(`${repoName}/ already exists — pulling latest`);
-      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 {}
+    try {
+      if (fs.existsSync(repoDir)) {
+        ui.warn(`${repoName}/ already exists — pulling latest`);
+        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 {}
+      }
+      clonedRepos.push(repoName);
+      ui.success(`Cloned ${repoName}`);
+    } catch {
+      failedRepos.push(repoName);
+      ui.warn(`Could not clone ${repoName} — you may not have access yet. Ask the org admin to grant access.`);
     }
-    clonedRepos.push(repoName);
-    ui.success(`Cloned ${repoName}`);
   }
 
   // Done
@@ -227,11 +317,16 @@ async function installShellAlias(egregoreDir, ui) {
       defaultName = slug ? `egregore-${slug}` : "egregore-2";
     }
 
-    // Ask user
-    console.log("");
-    ui.info(`This instance will be launched with a shell command.`);
-    const answer = await ui.prompt(`Command name (Enter for ${ui.bold(defaultName)}):`);
-    const aliasName = answer || defaultName;
+    // Ask user (skip prompt in non-interactive mode)
+    let aliasName;
+    if (process.stdin.isTTY) {
+      console.log("");
+      ui.info(`This instance will be launched with a shell command.`);
+      const answer = await ui.prompt(`Command name (Enter for ${ui.bold(defaultName)}):`);
+      aliasName = answer || defaultName;
+    } else {
+      aliasName = defaultName;
+    }
 
     // Remove old alias for this directory
     let lines = profileContent.split("\n");

package/package.json

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