create-egregore 0.19.12 → 0.19.15

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.8.0
+// egregore-launcher-version: 0.19.15
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -33,10 +33,17 @@ const crypto = require("node:crypto");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.8.0";
+const VERSION = "0.19.15";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
+const UPDATE_CACHE_FILE = path.join(os.homedir(), ".egregore", "update-check.json");
 const PUBLIC_NPX_PACKAGE = "create-egregore";
+const UPDATE_REGISTRY_URL =
+  process.env.EGREGORE_UPDATE_REGISTRY_URL ||
+  `https://registry.npmjs.org/${PUBLIC_NPX_PACKAGE}/latest`;
+const UPDATE_CACHE_TTL_MS = 6 * 60 * 60 * 1000;
+const UPDATE_FAILURE_TTL_MS = 30 * 60 * 1000;
+const UPDATE_CHECK_TIMEOUT_MS = 1500;
 const CONNECT_API_URL = (
   process.env.EGREGORE_CONNECT_API_URL ||
   "https://egregore-production-55f2.up.railway.app"
@@ -694,6 +701,24 @@ function installCodexSkills(egregoreDir) {
   }
 }
 
+function claudeLaunchArgs(egregoreDir) {
+  const args = ["start"];
+  const memoryLink = path.join(egregoreDir, "memory");
+  try {
+    const memoryDir = fs.realpathSync(memoryLink);
+    if (fs.statSync(memoryDir).isDirectory()) {
+      // Egregore memory is intentionally a sibling Git repository. Declare it
+      // as part of Claude's workspace so auto mode does not classify normal
+      // organizational recall as an unexplained cross-project read.
+      args.push("--add-dir", memoryDir);
+    }
+  } catch {
+    // A missing/dangling memory link is diagnosed by session startup. Do not
+    // prevent the harness from opening.
+  }
+  return args;
+}
+
 function runtimeLaunchArgs(runtime, egregoreDir) {
   if (runtime === "codex") {
     return [
@@ -704,7 +729,7 @@ function runtimeLaunchArgs(runtime, egregoreDir) {
     ];
   }
   if (runtime === "pi") return piTrustArgs();
-  return ["start"];
+  return claudeLaunchArgs(egregoreDir);
 }
 
 async function launch(inst, runtimeOverride) {
@@ -976,11 +1001,145 @@ function requestJson(options, body) {
       });
     });
     req.on("error", (err) => resolve({ status: 0, data: { message: err.message } }));
+    if (options.unref) {
+      req.on("socket", (socket) => socket.unref());
+    }
+    if (options.timeoutMs) {
+      req.setTimeout(options.timeoutMs, () => req.destroy(new Error("request timed out")));
+    }
     if (payload) req.write(payload);
     req.end();
   });
 }
 
+function parseReleaseVersion(value) {
+  const match = String(value || "").trim().match(/^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/);
+  if (!match) return null;
+  return {
+    parts: match.slice(1, 4).map(Number),
+    prerelease: match[4] || "",
+  };
+}
+
+function compareReleaseVersions(a, b) {
+  const left = parseReleaseVersion(a);
+  const right = parseReleaseVersion(b);
+  if (!left || !right) return 0;
+  for (let i = 0; i < 3; i++) {
+    if (left.parts[i] !== right.parts[i]) return left.parts[i] > right.parts[i] ? 1 : -1;
+  }
+  if (left.prerelease === right.prerelease) return 0;
+  if (!left.prerelease) return 1;
+  if (!right.prerelease) return -1;
+  return left.prerelease.localeCompare(right.prerelease);
+}
+
+function cliUpdateState(latest) {
+  if (!parseReleaseVersion(latest)) return null;
+  return {
+    current: VERSION,
+    latest,
+    available: compareReleaseVersions(latest, VERSION) > 0,
+  };
+}
+
+function readUpdateCache() {
+  try {
+    const cache = JSON.parse(fs.readFileSync(UPDATE_CACHE_FILE, "utf-8"));
+    if (!cache || !cache.checked_at) return null;
+    const age = Date.now() - new Date(cache.checked_at).getTime();
+    const ttl = cache.latest ? UPDATE_CACHE_TTL_MS : UPDATE_FAILURE_TTL_MS;
+    if (!Number.isFinite(age) || age < 0 || age > ttl) return null;
+    if (!cache.latest) return { current: VERSION, latest: null, available: false };
+    return cliUpdateState(cache.latest);
+  } catch {
+    return null;
+  }
+}
+
+function writeUpdateCache(latest) {
+  try {
+    fs.mkdirSync(path.dirname(UPDATE_CACHE_FILE), { recursive: true });
+    atomicWrite(
+      UPDATE_CACHE_FILE,
+      JSON.stringify({ checked_at: new Date().toISOString(), latest: latest || null }, null, 2) + "\n",
+      0o600,
+    );
+  } catch {}
+}
+
+async function checkForCliUpdate() {
+  if (process.env.EGREGORE_DISABLE_UPDATE_CHECK === "1") return null;
+  if (process.env.EGREGORE_UPDATE_LATEST_VERSION) {
+    return cliUpdateState(process.env.EGREGORE_UPDATE_LATEST_VERSION);
+  }
+
+  const cached = readUpdateCache();
+  if (cached) return cached;
+
+  try {
+    const url = new URL(UPDATE_REGISTRY_URL);
+    const result = await requestJson({
+      hostname: url.hostname,
+      port: url.port || undefined,
+      path: `${url.pathname}${url.search}`,
+      method: "GET",
+      protocol: url.protocol,
+      timeoutMs: UPDATE_CHECK_TIMEOUT_MS,
+      unref: true,
+      headers: { Accept: "application/json" },
+    });
+    const latest = result.status === 200 && result.data && result.data.version;
+    const update = cliUpdateState(latest);
+    writeUpdateCache(update?.latest || null);
+    return update;
+  } catch {
+    return null;
+  }
+}
+
+function cmdCliUpdate(latest) {
+  if (!parseReleaseVersion(latest)) {
+    console.error(`\n  ${YELLOW}!${RESET} Could not verify the CLI release version.\n`);
+    process.exitCode = 1;
+    return;
+  }
+
+  console.log("");
+  console.log(`  ${BOLD}${CYAN}↑ CLI UPDATE${RESET}`);
+  console.log(`  ${DIM}${VERSION} → ${latest}${RESET}`);
+  console.log("");
+  process.stdout.write(`  [1/2] Installing ${PUBLIC_NPX_PACKAGE}@${latest}…`);
+  const result = spawnSync(
+    "npx",
+    ["-y", `${PUBLIC_NPX_PACKAGE}@${latest}`, "--refresh-launcher"],
+    { encoding: "utf-8", stdio: ["inherit", "pipe", "pipe"], env: { ...process.env } },
+  );
+  if (result.status !== 0) {
+    console.log(`\r${ANSI.clearLine}  [1/2] ${YELLOW}!${RESET} Install failed`);
+    const detail = String(result.stderr || result.stdout || "").trim().split("\n").filter(Boolean).pop();
+    if (detail) console.error(`        ${DIM}${detail}${RESET}`);
+    console.error(`        Retry: npx -y ${PUBLIC_NPX_PACKAGE}@${latest} --refresh-launcher\n`);
+    process.exitCode = 1;
+    return;
+  }
+  console.log(`\r${ANSI.clearLine}  [1/2] ${GREEN}✓${RESET} CLI ${latest} installed`);
+
+  if (process.env.EGREGORE_UPDATE_NO_RELAUNCH === "1") {
+    console.log(`  [2/2] ${GREEN}✓${RESET} Ready for the next launch\n`);
+    return;
+  }
+
+  console.log(`  [2/2] ${GREEN}✓${RESET} Reopening Egregore\n`);
+  const relaunched = spawnSync(process.execPath, [process.argv[1], "browse"], {
+    stdio: "inherit",
+    env: { ...process.env },
+  });
+  if (relaunched.error) {
+    console.error(`  ${YELLOW}!${RESET} Updated successfully. Run ${BOLD}egregore${RESET} to reopen.\n`);
+  }
+}
+
 function githubRequest(token, method, apiPath, body) {
   return requestJson({
     hostname: "api.github.com",
@@ -1109,12 +1268,42 @@ async function cmdConnect(args) {
 
   let intentId = activation.intent_id || "";
   let connectUrl = activation.connect_url || "";
-  if (!intentId || !["checkout_pending", "entitled", "backfilling"].includes(activation.status)) {
+  let ticketExpiresAt = Number(activation.connect_ticket_expires_at || 0) * 1000;
+  const resumable = ["created", "checkout_pending", "entitled", "provisioning", "backfilling"].includes(
+    activation.status,
+  );
+  if (
+    intentId &&
+    resumable &&
+    (!activation.connect_ticket || !ticketExpiresAt || ticketExpiresAt <= Date.now() + 60_000)
+  ) {
+    const refreshed = await connectedApiRequest(
+      githubToken,
+      "POST",
+      `/api/billing/connect/${encodeURIComponent(intentId)}/ticket`,
+      {},
+    );
+    if (refreshed.status !== 200) {
+      die(`could not refresh Connected link: ${connectError(refreshed, `HTTP ${refreshed.status}`)}`);
+    }
+    connectUrl = refreshed.data.connect_url;
+    ticketExpiresAt = Number(refreshed.data.connect_ticket_expires_at || 0) * 1000;
+    persistConnectState(inst, {
+      connect_ticket: refreshed.data.connect_ticket,
+      connect_ticket_expires_at: refreshed.data.connect_ticket_expires_at,
+      connect_url: connectUrl,
+      status: refreshed.data.status || activation.status,
+    });
+  }
+  if (
+    !intentId ||
+    !resumable
+  ) {
     console.log(`  [1/5] ${DIM}Creating connection intent…${RESET}`);
     const checkout = await connectedApiRequest(
       githubToken,
       "POST",
-      "/api/billing/checkout",
+      "/api/billing/connect-intents",
       {
         org_slug: cfg.slug || inst.slug,
         plan: "connect",
@@ -1134,9 +1323,10 @@ async function cmdConnect(args) {
     connectUrl = checkout.data.connect_url;
     persistConnectState(inst, {
       intent_id: intentId,
-      checkout_session_id: checkout.data.checkout_session_id,
+      connect_ticket: checkout.data.connect_ticket,
+      connect_ticket_expires_at: checkout.data.connect_ticket_expires_at,
       connect_url: connectUrl,
-      status: "checkout_pending",
+      status: checkout.data.status || "created",
     });
     console.log(`  [1/5] ${GREEN}✓${RESET} Connection intent`);
   } else {
@@ -1228,12 +1418,17 @@ async function cmdConnect(args) {
   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 },
-  );
+  let complete;
+  for (let attempt = 0; attempt < 3; attempt += 1) {
+    complete = await connectedApiRequest(
+      githubToken,
+      "POST",
+      `/api/billing/connect/${encodeURIComponent(intentId)}/complete`,
+      { backfill_summary: backfillSummary },
+    );
+    if (complete.status === 200 || complete.status !== 0) break;
+    await sleep(250 * (attempt + 1));
+  }
   if (complete.status !== 200) {
     die(`graph replay finished, but activation could not be finalized: ${connectError(complete, `HTTP ${complete.status}`)}`);
   }
@@ -1689,7 +1884,7 @@ function selectedWorkflowLine(pv, width) {
   return joinShort(available.map(skillToken), Math.max(12, width));
 }
 
-function renderHeroPanel({ selected, pv, width, height, countSuffix, filter, filterMode }) {
+function renderHeroPanel({ selected, pv, width, height, countSuffix, filter, filterMode, cliUpdate }) {
   const outerWidth = Math.min(Math.max(50, width - 2), 126);
   const innerWidth = Math.max(48, outerWidth - 2);
   const bodyWidth = Math.max(8, innerWidth - 2);
@@ -1698,6 +1893,11 @@ function renderHeroPanel({ selected, pv, width, height, countSuffix, filter, fil
   const top = `${margin}${DIM}┌${"─".repeat(2)}${label}${"─".repeat(Math.max(0, innerWidth - label.length - 2))}┐${RESET}`;
   const bottom = `${margin}${DIM}└${"─".repeat(innerWidth)}┘${RESET}`;
   const mid = `${margin}${DIM}├${"─".repeat(innerWidth)}┤${RESET}`;
+  const updateBand = cliUpdate?.available
+    ? (colorOn
+      ? `${margin}${DIM}│${RESET}${E(43)}${E(30)}${pad(`  CLI UPDATE AVAILABLE · ${cliUpdate.current} → ${cliUpdate.latest} · ${E(1)}U${E(22)} INSTALL`, innerWidth)}${RESET}${DIM}│${RESET}`
+      : `${margin}│${pad(`  CLI UPDATE AVAILABLE · ${cliUpdate.current} → ${cliUpdate.latest} · U INSTALL`, innerWidth)}│`)
+    : null;
   const lines = [top];
 
   const title = selected ? `${selected.slug || selected.name || "egregore"}` : "egregore";
@@ -1738,7 +1938,7 @@ function renderHeroPanel({ selected, pv, width, height, countSuffix, filter, fil
     lines.push(boxLine(`${BOLD}${CYAN}EGREGORE${RESET} ${DIM}v${VERSION} · ${countSuffix} · ${filterText}${RESET}`, innerWidth, margin));
   }
   lines.push(emptyBoxLine(innerWidth, margin));
-  lines.push(mid);
+  lines.push(updateBand || mid);
   lines.push(boxLine(`${BOLD}${title}${RESET} ${DIM}· ${org} · ${runtime} · ${countSuffix} · ${filterText}${RESET}`, innerWidth, margin));
   lines.push(boxLine(`${DIM}skills${RESET} ${skillStatus}`, innerWidth, margin));
   lines.push(emptyBoxLine(innerWidth, margin));
@@ -1938,6 +2138,7 @@ async function browser(args = {}) {
     message: null, // ephemeral info line (e.g. "default set to X")
     messageKind: "info", // "info" | "success" | "warn"
     messageUntil: 0,
+    cliUpdate: null,
   };
 
   const newAction = {
@@ -2041,6 +2242,7 @@ async function browser(args = {}) {
       countSuffix,
       filter: state.filter,
       filterMode: state.filterMode,
+      cliUpdate: state.cliUpdate,
     });
     for (const line of heroLines) out.push(line + ANSI.clearLine + "\n");
     out.push(ANSI.clearLine + "\n");
@@ -2571,6 +2773,12 @@ async function browser(args = {}) {
         resolve(cmdConnect([pick.slug]));
         return;
       }
+      if (chunk === "U" && state.cliUpdate?.available) {
+        const latest = state.cliUpdate.latest;
+        cleanup();
+        resolve(cmdCliUpdate(latest));
+        return;
+      }
       if (chunk === "i") {
         const pick = visible()[state.cursor]?.e;
         if (!pick) return;
@@ -2657,6 +2865,11 @@ async function browser(args = {}) {
     });
 
     render();
+    checkForCliUpdate().then((update) => {
+      if (done || !update) return;
+      state.cliUpdate = update;
+      if (update.available) render();
+    });
   });
 }
 

package/assets/egregore-launcher.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# egregore-launcher-version: 0.4.9
+# egregore-launcher-version: 0.4.10
 # egregore — launch an Egregore instance in Claude Code.
 # Reads ~/.egregore/instances.json for the registry of installed egregores.
 #
@@ -22,7 +22,7 @@
 
 set -u
 
-VERSION="0.4.9"
+VERSION="0.4.10"
 REGISTRY="${HOME}/.egregore/instances.json"
 DEFAULT_FILE="${HOME}/.egregore/default"
 
@@ -93,7 +93,11 @@ launch() {
     printf '  %s→%s launching %s%s%s ...\n\n' "$DIM" "$RESET" "$BOLD" "$target_slug" "$RESET"
   fi
   cd "$target_path" || die "Could not cd into $target_path"
-  exec claude start
+  local -a claude_args=("start")
+  if [ -d "$target_path/memory" ]; then
+    claude_args+=("--add-dir" "$target_path/memory")
+  fi
+  exec claude "${claude_args[@]}"
 }
 
 cmd_ls() {

package/bin/cli.js

@@ -223,6 +223,8 @@ function parseArgs(argv) {
       // already served as the entry screen — a second alt-screen welcome
       // would otherwise demand a redundant Enter and churn the alt buffer.
       args.noWelcome = true;
+    } else if (argv[i] === "--refresh-launcher") {
+      args.refreshLauncher = true;
     } else if (argv[i] === "--codex") {
       args.runtime = "codex";
     } else if (argv[i] === "--pi") {
@@ -395,6 +397,7 @@ function showHelp() {
   ui.info("  --force           Skip the in-repo detection check");
   ui.info("  --no-autolaunch   Don't launch the harness at the end (for CI)");
   ui.info("  --no-screens      Skip the full-screen welcome/ready bookends");
+  ui.info("  --refresh-launcher Refresh only the Egregore CLI, then exit");
   ui.info("  -h, --help        Show this help");
   ui.info("");
 }
@@ -443,6 +446,21 @@ async function main() {
     }
   }
 
+  if (args.refreshLauncher) {
+    const instances = readLocalInstances();
+    if (instances.length === 0) {
+      ui.error("No installed Egregore instance was found. Run create-egregore without --refresh-launcher.");
+      process.exit(1);
+    }
+    const alias = await installLauncherBinary(instances[0].path, ui);
+    if (!alias || !alias.binaryPath) {
+      ui.error("Could not refresh the Egregore CLI.");
+      process.exit(1);
+    }
+    ui.success(`Egregore CLI is current at ${alias.binaryPath}`);
+    return;
+  }
+
   // Local-first product surface: if the user already has egregores installed
   // and didn't pass an explicit mode flag, refresh the launcher and open the
   // same TUI as bare `egregore`. With no installed instances, make bare

package/lib/setup.js

@@ -426,6 +426,15 @@ async function install(data, ui, targetDir, opts = {}) {
     ui.success("Linked");
   }
 
+  // The connected config is required infrastructure, not an optional overlay.
+  // A setup race once left develop behind main, so a newly-created work branch
+  // could lose egregore.json even though the default branch contained it.
+  // Recover that exact file from origin/main when possible, then validate it
+  // before writing credentials or registering a launcher.
+  if (api_key || data.api_url) {
+    ensureConnectedConfig(egregoreDir, data, ui);
+  }
+
   // 4. Write .env (secrets only — never committed to git)
   ui.step(4, totalSteps, "Writing credentials...");
   const envPath = path.join(egregoreDir, ".env");
@@ -450,19 +459,7 @@ async function install(data, ui, targetDir, opts = {}) {
   fs.writeFileSync(statePath, JSON.stringify(state, null, 2) + "\n");
   try { ensurePersonOnboardingWitness(memoryDir, state); } catch {}
 
-  // 4c. Ensure mode is set in egregore.json (connected mode for API-based setup)
-  const configPath = path.join(egregoreDir, "egregore.json");
-  if (fs.existsSync(configPath)) {
-    try {
-      const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
-      if (!config.mode) {
-        config.mode = "connected";
-        fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
-      }
-    } catch {}
-  }
-
-  // 4d. Overlay the selected shell-runtime support. Claude Code reads
+  // 4c. Overlay the selected shell-runtime support. Claude Code reads
   // CLAUDE.md, not AGENTS.md; overlaying the Codex AGENTS.md/.codex into a Claude
   // workspace gives a wandering agent a competing startup protocol (the
   // xenocracy onboarding regression). Claude joiners keep the cloned repo as-is —
@@ -584,6 +581,74 @@ async function install(data, ui, targetDir, opts = {}) {
   await launchOrInstruct(path.join(base, forkDirName), alias, ui, opts);
 }
 
+/**
+ * Require and validate the connected instance configuration.
+ *
+ * If the current branch is missing egregore.json, restore it from origin/main
+ * without changing branches or disturbing existing work. A missing/invalid
+ * remote config aborts setup before credentials and launcher registration.
+ */
+function ensureConnectedConfig(repoDir, data, ui) {
+  const configPath = path.join(repoDir, "egregore.json");
+
+  if (!fs.existsSync(configPath)) {
+    try {
+      execFileSync(
+        "git",
+        ["-C", repoDir, "fetch", "origin", "+main:refs/remotes/origin/main"],
+        {
+          stdio: "pipe", encoding: "utf-8", timeout: 30000,
+        },
+      );
+      const remoteConfig = execFileSync(
+        "git",
+        ["-C", repoDir, "show", "origin/main:egregore.json"],
+        { stdio: "pipe", encoding: "utf-8", timeout: 10000 },
+      );
+      JSON.parse(remoteConfig);
+      fs.writeFileSync(configPath, remoteConfig.endsWith("\n") ? remoteConfig : `${remoteConfig}\n`);
+      if (ui && typeof ui.warn === "function") {
+        ui.warn("Restored missing egregore.json from origin/main");
+      }
+    } catch {
+      throw new Error(
+        "Connected setup is incomplete: egregore.json is missing from this checkout and origin/main. Retry setup from egregore.xyz/setup."
+      );
+    }
+  }
+
+  let config;
+  try {
+    config = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+  } catch {
+    throw new Error("Connected setup is incomplete: egregore.json is not valid JSON.");
+  }
+
+  const required = ["org_name", "github_org", "memory_repo", "api_url", "slug"];
+  const missing = required.filter((key) => !config[key]);
+  if (missing.length) {
+    throw new Error(
+      `Connected setup is incomplete: egregore.json is missing ${missing.join(", ")}. Retry setup from egregore.xyz/setup.`
+    );
+  }
+  if (data.slug && config.slug !== data.slug) {
+    throw new Error(
+      `Connected setup mismatch: expected org ${data.slug}, but egregore.json belongs to ${config.slug}.`
+    );
+  }
+  if (data.github_org && config.github_org.toLowerCase() !== data.github_org.toLowerCase()) {
+    throw new Error(
+      `Connected setup mismatch: expected GitHub owner ${data.github_org}, but egregore.json uses ${config.github_org}.`
+    );
+  }
+
+  if (config.mode !== "connected") {
+    config.mode = "connected";
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
+  }
+  return config;
+}
+
 /**
  * Ensure a cloned repo has a develop branch. Creates from default branch and pushes if missing.
  * Idempotent — safe to call on repos that already have develop.
@@ -752,6 +817,20 @@ function piTrustArgs() {
   }
 }
 
+function claudeLaunchArgs(egregoreDir) {
+  const args = ["start"];
+  const memoryLink = path.join(egregoreDir, "memory");
+  try {
+    const memoryDir = fs.realpathSync(memoryLink);
+    if (fs.statSync(memoryDir).isDirectory()) {
+      args.push("--add-dir", memoryDir);
+    }
+  } catch {
+    // Session startup owns the actionable missing-memory diagnostic.
+  }
+  return args;
+}
+
 function runtimeLaunchArgs(runtime, egregoreDir) {
   if (normalizeRuntime(runtime) === "codex") {
     return [
@@ -762,7 +841,7 @@ function runtimeLaunchArgs(runtime, egregoreDir) {
     ];
   }
   if (normalizeRuntime(runtime) === "pi") return piTrustArgs();
-  return ["start"];
+  return claudeLaunchArgs(egregoreDir);
 }
 
 function startSpinner(label) {
@@ -1353,5 +1432,6 @@ module.exports = {
   assistantInstallCommand,
   initMemoryDirs,
   ensureDevelop,
+  ensureConnectedConfig,
   run,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.19.12",
+  "version": "0.19.15",
   "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/launcher-connect.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/launcher-update.test.js test/connected-config.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/"
   },

package/runtime/codex/.codex/hooks/search-hint.js

@@ -4,7 +4,7 @@
 //
 // Mirror of .claude/hooks/search-hint.sh: when the user's prompt is
 // recall-shaped ("find the handoff about…", "did we decide…"), inject a
-// routing hint toward `bin/agent.sh search` — one ranked call over
+// routing hint toward `bash bin/search.sh query` — one ranked call over
 // memory/ — instead of improvised ls/grep/graph exploration.
 //
 // Advisory only, never blocks, rate-limited once per session, exits 0.
@@ -43,6 +43,8 @@ const RECALL = new RegExp(
     "\\bwho worked on\\b",
     "\\bdidn.?t (someone|we) already\\b",
     "\\bwas there (a|any) (handoff|decision|discussion|meeting)\\b",
+    "\\b(our|company|org|organization|team)\\b.*\\b(pricing|price|tiers?|plans?|paid|free|strategy|policy|positioning|ownership|decision)\\b",
+    "\\b(pricing|price|tiers?|plans?|paid|free)\\b.*\\b(our|company|org|organization|team)\\b",
   ].join("|"),
   "i"
 );
@@ -59,7 +61,7 @@ process.stdout.write(JSON.stringify({
   hookSpecificOutput: {
     hookEventName: "UserPromptSubmit",
     additionalContext:
-      "Routing hint: this prompt asks for recall from org memory. FIRST action: `bin/agent.sh search \"<the concept, not the literal sentence>\"` — one ranked call over all of memory/ (hybrid keyword+semantic; graph-state annotations attach automatically in connected mode). Read the top hits and cite paths. Do NOT improvise ls/grep/graph exploration first — hand-written graph queries against invented labels (e.g. :Handoff — handoffs are :Session nodes) return empty. Full spec: the search skill.",
+      "Routing hint: this prompt asks for recall from org memory. FIRST action: `bash bin/search.sh query \"<the concept, not the literal sentence>\"` — one ranked call over all of memory/ (hybrid keyword+semantic; graph-state annotations attach automatically in connected mode). Read the top hits and cite paths. Do NOT improvise ls/grep/graph exploration first — hand-written graph queries against invented labels (e.g. :Handoff — handoffs are :Session nodes) return empty. Full spec: the search skill.",
   },
 }) + "\n");
 process.exit(0);

package/runtime/codex/.codex/skills/search/SKILL.md

@@ -11,12 +11,35 @@ search before answering from conversation context alone.
 
 ## Flow
 
-1. Run the search:
+1. Organizational recall must begin with the Egregore search entry point in
+   step 2. Do not resolve `memory/` to its sibling Git repository, change into
+   that absolute path, or improvise raw grep/listing as the first retrieval
+   action. Use direct file reads or grep only on evidence paths returned by the
+   ranked search.
+
+   Before any shell, file-read, grep, or other retrieval tool call, send exactly
+   one standalone commentary line:
+
+   - local/filesystem-only:
+     `⌕ Egregore · searching your organization’s memory`
+   - connected mode with automatic graph enrichment:
+     `⌕ Egregore Connect · searching your organization’s memory and relationships`
+
+   Send the line verbatim. Do not replace it with generic narration such as
+   “I’ll search org memory.” It must be visible before the tool call; captured
+   command output does not satisfy this requirement. Emit it once even when the
+   retrieval needs multiple queries or source reads.
+
+2. Run the search:
 
 ```bash
-bin/agent.sh search "your query" -n 6
+bash bin/search.sh query "your query" -n 6
 ```
 
+- The command also prints the attribution as a direct-shell fallback. That
+  captured banner is diagnostic redundancy, not the user-visible product beat.
+  If the answer instead begins with a graph-only named read, follow the same
+  global Egregore Retrieval Beat before that query.
 - Default is hybrid (BM25 + vector + rerank); it falls back to keyword
   search automatically when local models aren't built, with a note.
 - `--fast` — keyword only (BM25), instant. Use for exact terms: names,
@@ -27,15 +50,15 @@ bin/agent.sh search "your query" -n 6
   state lines (status, recipient, artifact type, quest) with no flag.
   `--no-enrich` skips it when speed matters; local mode never attempts it.
 
-2. Search the *concept*, not the user's literal sentence. If the first query
+3. Search the *concept*, not the user's literal sentence. If the first query
    returns weak scores, run a second with different wording — one
    keyword-ish, one conceptual.
 
-3. Results are snippets with `memory/...` file paths. Read the source file
+4. Results are snippets with `memory/...` file paths. Read the source file
    for anything you will cite or act on — snippets truncate, and memory
    files carry dates, authors, and caveats that change the answer.
 
-4. Answer directly, citing file paths. If results are empty or weak, say so
+5. Answer directly, citing file paths. If results are empty or weak, say so
    plainly — "nothing in memory on X" is a real answer. Do not present
    conversation-context guesses as memory.