create-egregore 0.19.8 → 0.19.12

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.7.3
+// egregore-launcher-version: 0.8.0
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -13,6 +13,7 @@
 //   egregore <slug|name>        pick a harness for the matching instance
 //   egregore ls | list          list instances (non-interactive table)
 //   egregore use <slug>         set the default for bare `egregore`
+//   egregore connect [slug]     activate Connected for an existing instance
 //   egregore /invite <user>     invite a GitHub user to an instance
 //   egregore settings [slug]    hosting on/off, managed repos, admins (s in browser)
 //   egregore prune [--dry-run]  remove entries whose path is gone
@@ -28,13 +29,18 @@ const path = require("node:path");
 const os = require("node:os");
 const http = require("node:http");
 const https = require("node:https");
+const crypto = require("node:crypto");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.7.3";
+const VERSION = "0.8.0";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const PUBLIC_NPX_PACKAGE = "create-egregore";
+const CONNECT_API_URL = (
+  process.env.EGREGORE_CONNECT_API_URL ||
+  "https://egregore-production-55f2.up.railway.app"
+).replace(/\/+$/, "");
 
 const NATIVE_CODEX_SKILLS = [
   "activity",
@@ -864,6 +870,7 @@ function cmdHelp() {
     `    ${CYAN}egregore browse${RESET}              force the full-screen browser`,
     `    ${CYAN}egregore ls${RESET} ${DIM}| list${RESET}            list installed instances`,
     `    ${CYAN}egregore use${RESET} ${DIM}<slug>${RESET}          set the default for bare ${BOLD}egregore${RESET}`,
+    `    ${CYAN}egregore connect${RESET} ${DIM}[slug]${RESET}     activate Connected for an existing instance`,
     `    ${CYAN}egregore /invite${RESET} ${DIM}<user> [slug]${RESET} invite a GitHub user`,
     `    ${CYAN}egregore settings${RESET} ${DIM}[slug]${RESET}      hosting on/off, repos, admins`,
     `    ${CYAN}egregore prune${RESET} ${DIM}[--dry-run]${RESET}   remove entries with missing paths`,
@@ -874,6 +881,7 @@ function cmdHelp() {
     `    ${DIM}enter${RESET}       choose selected instance`,
     `    ${DIM}/${RESET}           filter (type to narrow; esc to clear)`,
     `    ${DIM}n / +${RESET}       create a new Egregore`,
+    `    ${DIM}c${RESET}           connect selected instance`,
     `    ${DIM}u${RESET}           set selected as default`,
     `    ${DIM}i${RESET}           invite a GitHub user to selected instance`,
     `    ${DIM}s${RESET}           settings (hosting on/off, repos, admins)`,
@@ -994,6 +1002,252 @@ function apiRequest(apiUrl, apiKey, apiPath, body) {
   }, body);
 }
 
+function connectedApiRequest(githubToken, method, apiPath, body, headers = {}) {
+  const url = new URL(apiPath, CONNECT_API_URL + "/");
+  return requestJson({
+    hostname: url.hostname,
+    port: url.port || undefined,
+    path: `${url.pathname}${url.search}`,
+    method,
+    protocol: url.protocol,
+    headers: {
+      Authorization: `Bearer ${githubToken}`,
+      ...headers,
+    },
+  }, body);
+}
+
+function openExternalUrl(url) {
+  try {
+    if (process.platform === "darwin") {
+      spawn("open", [url], { detached: true, stdio: "ignore" }).unref();
+    } else if (process.platform === "win32") {
+      spawn("cmd", ["/c", "start", "", url], { detached: true, stdio: "ignore" }).unref();
+    } else {
+      spawn("xdg-open", [url], { detached: true, stdio: "ignore" }).unref();
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function atomicWrite(file, content, mode) {
+  const temp = path.join(
+    path.dirname(file),
+    `.${path.basename(file)}.${process.pid}.${crypto.randomBytes(4).toString("hex")}.tmp`,
+  );
+  fs.writeFileSync(temp, content, { mode });
+  fs.renameSync(temp, file);
+}
+
+function writeJsonFileAtomic(file, value) {
+  atomicWrite(file, JSON.stringify(value, null, 2) + "\n", 0o644);
+}
+
+function writeEnvValueAtomic(file, key, value) {
+  const lines = fs.existsSync(file)
+    ? fs.readFileSync(file, "utf-8").split(/\r?\n/)
+    : [];
+  let replaced = false;
+  const next = lines
+    .filter((line, index) => !(index === lines.length - 1 && line === ""))
+    .map((line) => {
+      if (!line.startsWith(`${key}=`)) return line;
+      replaced = true;
+      return `${key}=${value}`;
+    });
+  if (!replaced) next.push(`${key}=${value}`);
+  atomicWrite(file, next.join("\n") + "\n", 0o600);
+}
+
+function persistConnectState(inst, fields) {
+  const file = path.join(inst.path, ".egregore-state.json");
+  const state = readJsonFile(file);
+  state.connected_activation = {
+    ...(state.connected_activation || {}),
+    ...fields,
+    updated_at: new Date().toISOString(),
+  };
+  writeJsonFileAtomic(file, state);
+}
+
+function connectError(result, fallback) {
+  if (!result) return fallback;
+  const data = result.data || {};
+  return data.detail || data.message || (typeof data === "string" ? data : fallback);
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function cmdConnect(args) {
+  const registry = readRegistry();
+  if (registry.length === 0) die("no egregores installed yet.\n  run: npx -y create-egregore@latest");
+  const inst = resolveInviteInstance(registry, args[0] || "");
+  if (!inst) {
+    die("multiple egregores installed; choose one:\n  egregore connect <slug>\n  run: egregore ls");
+  }
+  if (!fs.existsSync(inst.path)) die(`instance path is missing: ${inst.path}`);
+
+  const { cfg, state, env } = configForInstance(inst);
+  const githubToken = env.GITHUB_TOKEN || "";
+  if (!githubToken) {
+    die(`GITHUB_TOKEN is missing for ${inst.slug}.\n  Add it to ${path.join(inst.path, ".env")} and retry.`);
+  }
+  const activation = state.connected_activation || {};
+  if (cfg.mode === "connected" && activation.status === "connected") {
+    console.log(`\n  ${GREEN}✓${RESET} ${BOLD}${inst.slug}${RESET} is already connected.\n`);
+    return;
+  }
+
+  console.log("");
+  console.log(`  ${BOLD}CONNECT${RESET}  ${DIM}${inst.slug}${RESET}`);
+  console.log(`  ${DIM}€500/month · Stripe checkout · existing Markdown and Git stay in place${RESET}`);
+  console.log("");
+
+  let intentId = activation.intent_id || "";
+  let connectUrl = activation.connect_url || "";
+  if (!intentId || !["checkout_pending", "entitled", "backfilling"].includes(activation.status)) {
+    console.log(`  [1/5] ${DIM}Creating connection intent…${RESET}`);
+    const checkout = await connectedApiRequest(
+      githubToken,
+      "POST",
+      "/api/billing/checkout",
+      {
+        org_slug: cfg.slug || inst.slug,
+        plan: "connect",
+        instance_metadata: {
+          launcher_version: VERSION,
+          mode: cfg.mode || "local",
+          repo_name: cfg.repo_name || "",
+          managed_repo_count: Array.isArray(cfg.repos) ? cfg.repos.length : 0,
+        },
+      },
+      { "X-Idempotency-Key": `cli:${inst.slug}:${crypto.randomUUID()}` },
+    );
+    if (checkout.status !== 200) {
+      die(`could not start Connected checkout: ${connectError(checkout, `HTTP ${checkout.status}`)}`);
+    }
+    intentId = checkout.data.connection_intent_id;
+    connectUrl = checkout.data.connect_url;
+    persistConnectState(inst, {
+      intent_id: intentId,
+      checkout_session_id: checkout.data.checkout_session_id,
+      connect_url: connectUrl,
+      status: "checkout_pending",
+    });
+    console.log(`  [1/5] ${GREEN}✓${RESET} Connection intent`);
+  } else {
+    console.log(`  [1/5] ${GREEN}✓${RESET} Resuming connection intent`);
+  }
+
+  if (activation.status !== "backfilling") {
+    if (connectUrl) {
+      const opened = openExternalUrl(connectUrl);
+      const mark = opened ? `${GREEN}✓${RESET}` : `${YELLOW}!${RESET}`;
+      console.log(`  [2/5] ${mark} ${opened ? "Opened" : "Open"} Egregore Connect`);
+      console.log(`        ${CYAN}${connectUrl}${RESET}`);
+    }
+    console.log(`  ${DIM}Complete checkout in the browser. Promotion codes are entered in Stripe.${RESET}`);
+  } else {
+    console.log(`  [2/5] ${GREEN}✓${RESET} Subscription already confirmed`);
+  }
+
+  const pollMs = Math.max(100, Number(process.env.EGREGORE_CONNECT_POLL_INTERVAL_MS || 2000));
+  const timeoutMs = Math.max(pollMs, Number(process.env.EGREGORE_CONNECT_TIMEOUT_MS || 30 * 60 * 1000));
+  const deadline = Date.now() + timeoutMs;
+  let status;
+  while (Date.now() < deadline) {
+    const result = await connectedApiRequest(
+      githubToken,
+      "GET",
+      `/api/billing/connect/${encodeURIComponent(intentId)}`,
+    );
+    if (result.status === 200) {
+      status = result.data;
+      if (
+        status.entitled ||
+        ["entitled", "provisioning", "backfilling", "connected"].includes(status.status)
+      ) break;
+      if (["canceled", "failed"].includes(status.status)) {
+        persistConnectState(inst, { status: status.status });
+        die(`Connected checkout ${status.status}. Your local Egregore was not changed.`);
+      }
+    } else if (result.status !== 0) {
+      die(`could not read Connected status: ${connectError(result, `HTTP ${result.status}`)}`);
+    }
+    await sleep(pollMs);
+  }
+  if (!status || !(status.entitled || ["entitled", "provisioning", "backfilling", "connected"].includes(status.status))) {
+    die("timed out waiting for checkout. Run the same command to resume.");
+  }
+  console.log(`  [3/5] ${GREEN}✓${RESET} Subscription confirmed`);
+  persistConnectState(inst, { status: "entitled" });
+
+  const claim = await connectedApiRequest(
+    githubToken,
+    "POST",
+    `/api/billing/connect/${encodeURIComponent(intentId)}/claim`,
+    {},
+  );
+  if (claim.status !== 200) {
+    die(`could not activate Connected infrastructure: ${connectError(claim, `HTTP ${claim.status}`)}`);
+  }
+
+  const configFile = path.join(inst.path, "egregore.json");
+  const envFile = path.join(inst.path, ".env");
+  const currentConfig = readJsonFile(configFile);
+  writeJsonFileAtomic(configFile, {
+    ...currentConfig,
+    mode: "connected",
+    api_url: claim.data.api_url,
+  });
+  writeEnvValueAtomic(envFile, "EGREGORE_API_KEY", claim.data.api_key);
+  persistConnectState(inst, {
+    status: "backfilling",
+    activation_protocol: claim.data.activation_protocol,
+  });
+  console.log(`  [4/5] ${GREEN}✓${RESET} Connected credential and graph node`);
+
+  const syncScript = path.join(inst.path, "bin", "sync-graph.sh");
+  if (!fs.existsSync(syncScript)) {
+    die("bin/sync-graph.sh is missing. Update the installed Egregore version, then run egregore connect again.");
+  }
+  const sync = spawnSync("bash", [syncScript], {
+    cwd: inst.path,
+    encoding: "utf-8",
+    stdio: "pipe",
+    timeout: 10 * 60 * 1000,
+  });
+  if (sync.status !== 0) {
+    const detail = (sync.stderr || sync.stdout || "graph replay failed").trim();
+    die(`Connected is configured, but graph replay did not finish.\n  ${detail}\n  Run egregore connect ${inst.slug} to retry; existing data is unchanged.`);
+  }
+  let backfillSummary = { replayed: true };
+  try { backfillSummary = JSON.parse((sync.stdout || "").trim()); } catch {}
+
+  const complete = await connectedApiRequest(
+    githubToken,
+    "POST",
+    `/api/billing/connect/${encodeURIComponent(intentId)}/complete`,
+    { backfill_summary: backfillSummary },
+  );
+  if (complete.status !== 200) {
+    die(`graph replay finished, but activation could not be finalized: ${connectError(complete, `HTTP ${complete.status}`)}`);
+  }
+  persistConnectState(inst, {
+    status: "connected",
+    connected_at: new Date().toISOString(),
+    backfill_summary: backfillSummary,
+  });
+  console.log(`  [5/5] ${GREEN}✓${RESET} Existing memory projected into the graph`);
+  console.log("");
+  console.log(`  ${GREEN}✓${RESET} ${BOLD}${inst.slug}${RESET} is connected. Local files remain the source of truth.`);
+  console.log("");
+}
+
 function accessLabel(status) {
   if (status === 201) return `${GREEN}sent${RESET}`;
   if (status === 204) return `${GREEN}already added${RESET}`;
@@ -1952,8 +2206,8 @@ async function browser(args = {}) {
       footer = band(`● ${stripAnsi(state.message)}`, bg);
     } else {
       footer = blockWidth < 96
-        ? band(`${key("↑↓", "nav")}  ${key("enter", "select")}  ${key("n/+", "new")}  ${key("i", "invite")}  ${key("s", "settings")}  ${key("d", "delete")}  ${key("?", "help")}  ${key("q", "quit")}`, 46)
-        : band(`${key("↑↓", "nav")}  ${key("enter", "select")}  ${key("n/+", "new")}  ${key("/", "filter")}  ${key("i", "invite")}  ${key("s", "settings")}  ${key("u", "default")}  ${key("d", "delete")}  ${key("?", "help")}  ${key("q", "quit")}`, 46);
+        ? band(`${key("↑↓", "nav")}  ${key("enter", "select")}  ${key("n/+", "new")}  ${key("c", "connect")}  ${key("i", "invite")}  ${key("d", "delete")}  ${key("?", "help")}  ${key("q", "quit")}`, 46)
+        : band(`${key("↑↓", "nav")}  ${key("enter", "select")}  ${key("n/+", "new")}  ${key("/", "filter")}  ${key("c", "connect")}  ${key("i", "invite")}  ${key("s", "settings")}  ${key("u", "default")}  ${key("d", "delete")}  ${key("?", "help")}  ${key("q", "quit")}`, 46);
     }
     out.push(M + footer + "\n");
     if (state.showHelp) {
@@ -2310,6 +2564,13 @@ async function browser(args = {}) {
         resolve(setupNewEgregore(args.runtimeOverride));
         return;
       }
+      if (chunk === "c") {
+        const pick = visible()[state.cursor]?.e;
+        if (!pick) return;
+        cleanup();
+        resolve(cmdConnect([pick.slug]));
+        return;
+      }
       if (chunk === "i") {
         const pick = visible()[state.cursor]?.e;
         if (!pick) return;
@@ -2451,6 +2712,7 @@ function main() {
   // Non-interactive subcommands
   if (cmd === "ls" || cmd === "list") return cmdLs();
   if (cmd === "use") return cmdUse(args[1]);
+  if (cmd === "connect") return cmdConnect(args.slice(1));
   if (cmd === "/invite" || cmd === "invite") return cmdInvite(args.slice(1));
   if (cmd === "settings" || cmd === "config") return cmdSettings(args.slice(1));
   if (cmd === "prune") return cmdPruneNonInteractive(args[1] === "--dry-run" || args[1] === "-n");

package/lib/local.js

@@ -47,7 +47,12 @@ const TEMPLATE_REPO = "egregore";
 async function getUser(token) {
   const { status, data } = await ghApi("GET", "/user", token);
   if (status !== 200) throw new Error("GitHub auth failed — could not fetch user");
-  return { login: data.login, name: data.name || data.login, email: data.email || null };
+  return {
+    login: data.login,
+    id: data.id || null,
+    name: data.name || data.login,
+    email: data.email || null,
+  };
 }
 
 async function listOrgs(token) {
@@ -1286,11 +1291,14 @@ async function localFounderFlow(ui, ctx = {}) {
   const slugifiedName = (displayName || user.login).toLowerCase().replace(/\s+/g, "-");
   const state = {
     github_username: user.login,
+    github_id: user.id,
+    person_id: user.id ? `github:${user.id}` : `github-login:${user.login.toLowerCase()}`,
     github_name: user.name,
     display_name: displayName || user.login,
     name: slugifiedName,
     member_role: memberRole,
     email: user.email,
+    emails: user.email ? [user.email.toLowerCase()] : [],
     onboarding_complete: false,
     usage_type: "founder_group",
     org_setup: true,
@@ -1430,6 +1438,7 @@ async function localFounderFlow(ui, ctx = {}) {
       const invPersonContent = [
         "---",
         `name: ${invUsername}`,
+        `person_id: github-login:${invUsername.toLowerCase()}`,
         `github: ${invUsername}`,
         `invited_by: ${user.login}`,
         `joined: ${today}`,
@@ -1755,6 +1764,7 @@ async function localJoinFlow(orgArg, ui, ctx = {}) {
     org_name: orgName,
     github_org: orgLogin,
     github_username: user.login,
+    github_id: user.id,
     github_name: user.name,
     github_email: user.email,
     slug: config.slug || orgLogin,

package/lib/setup.js

@@ -174,12 +174,24 @@ function mergeProfileFields(existing, additions = []) {
 function personProfileContent(state = {}, opts = {}) {
   const now = opts.onboardedAt || new Date().toISOString();
   const username = state.github_username || opts.githubUsername || "unknown";
+  const githubId = state.github_id || opts.githubId || "";
+  const personId = state.person_id || (githubId ? `github:${githubId}` : `github-login:${username.toLowerCase()}`);
   const displayName = state.display_name || state.github_name || username;
   const role = state.member_role || state.onboarding?.member_role || opts.memberRole || "Member";
+  const emails = [...new Set(
+    [state.email, ...(Array.isArray(state.emails) ? state.emails : [])]
+      .filter(Boolean)
+      .map((value) => String(value).trim().toLowerCase()),
+  )];
   return [
     `# ${displayName}`,
     "",
+    `Person-ID: ${personId}`,
     `GitHub: ${username}`,
+    `GitHub-ID: ${githubId}`,
+    "GitHub-Aliases: ",
+    `Email: ${emails[0] || ""}`,
+    `Emails: ${emails.join(", ")}`,
     `Role: ${role}`,
     `Joined: ${now.split("T")[0]}`,
     `Onboarded: ${now}`,
@@ -234,6 +246,7 @@ function buildOnboardingState(existing = {}, data = {}, opts = {}) {
   const state = { ...existing };
   const preferredRuntime = normalizeRuntime(opts.runtime);
   const githubUsername = data.github_username || state.github_username || "";
+  const githubId = data.github_id || state.github_id || null;
   const githubName = data.github_name || state.github_name || githubUsername;
   const displayName = data.display_name || state.display_name || githubName || githubUsername;
   const usageType = normalizeUsageType(data);
@@ -248,6 +261,12 @@ function buildOnboardingState(existing = {}, data = {}, opts = {}) {
   const shouldComplete = alreadyComplete || (requestedComplete && !!memberRole);
 
   if (githubUsername) state.github_username = githubUsername;
+  if (githubId) {
+    state.github_id = githubId;
+    state.person_id = `github:${githubId}`;
+  } else if (githubUsername && !state.person_id) {
+    state.person_id = `github-login:${githubUsername.toLowerCase()}`;
+  }
   if (githubName) state.github_name = githubName;
   if (displayName) {
     state.display_name = displayName;
@@ -457,6 +476,20 @@ async function install(data, ui, targetDir, opts = {}) {
     reportPiRuntimeSummary(piRuntime, ui);
   }
 
+  // Reconcile the installer-captured identity through the same portable writer
+  // used by /me and onboarding. Failure is recoverable: the state + person
+  // profile already exist and the next session retries `bin/person.sh sync`.
+  const personScript = path.join(egregoreDir, "bin", "person.sh");
+  if (fs.existsSync(personScript)) {
+    try {
+      spawnSync("bash", [personScript, "onboard"], {
+        cwd: egregoreDir,
+        stdio: "ignore",
+        timeout: 15000,
+      });
+    } catch {}
+  }
+
   // 5. Register instance + install launcher binary
   ui.step(5, totalSteps, "Registering instance...");
   registerInstance(forkDirName, org_name, egregoreDir, preferredRuntime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.19.8",
+  "version": "0.19.12",
   "description": "Set up Egregore for your team in one command — installs the egregore launcher and your choice of Claude Code, Codex, or Pi.",
   "license": "MIT",
   "bin": {
@@ -12,7 +12,7 @@
   "scripts": {
     "build:runtime": "node scripts/build-runtime-bundle.mjs && node scripts/build-pi-runtime-bundle.mjs",
     "build:pi-runtime": "node scripts/build-pi-runtime-bundle.mjs",
-    "test": "node scripts/build-runtime-bundle.mjs --check && node scripts/build-pi-runtime-bundle.mjs --check && node --test test/context.test.js test/parse-join-target.test.js test/skip-repos.test.js test/onboarding-shortcircuit.test.js test/welcome-screen.test.js test/runtime-selection.test.js test/command-generation.test.js test/auth-gh.test.js test/gauntlet-fixes.test.js test/codex-runtime.test.js test/pi-runtime.test.js test/pi-product-workflows.test.js test/installer-runtime-source.test.js test/scroll-repro.test.js test/launcher-refocus-redraw.test.js test/multiselect-remote-search.test.js test/back-navigation.test.js test/manifest-form.test.js test/launcher-delete.test.js",
+    "test": "node scripts/build-runtime-bundle.mjs --check && node scripts/build-pi-runtime-bundle.mjs --check && node --test test/context.test.js test/parse-join-target.test.js test/skip-repos.test.js test/onboarding-shortcircuit.test.js test/welcome-screen.test.js test/runtime-selection.test.js test/command-generation.test.js test/auth-gh.test.js test/gauntlet-fixes.test.js test/codex-runtime.test.js test/pi-runtime.test.js test/pi-product-workflows.test.js test/installer-runtime-source.test.js test/scroll-repro.test.js test/launcher-refocus-redraw.test.js test/multiselect-remote-search.test.js test/back-navigation.test.js test/manifest-form.test.js test/launcher-delete.test.js test/launcher-connect.test.js",
     "test:e2e": "node --test test/e2e-local.test.js",
     "test:all": "node scripts/build-runtime-bundle.mjs --check && node scripts/build-pi-runtime-bundle.mjs --check && node --test test/"
   },