create-egregore 0.18.2 → 0.18.4

package/assets/egregore-launcher.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// egregore-launcher-version: 0.5.17
+// egregore-launcher-version: 0.5.18
 //
 // egregore — launch and browse Egregore instances from your terminal.
 // Installed by create-egregore. Reads ~/.egregore/instances.json.
@@ -30,7 +30,7 @@ const https = require("node:https");
 const { spawnSync, spawn } = require("node:child_process");
 const readline = require("node:readline");
 
-const VERSION = "0.5.17";
+const VERSION = "0.5.18";
 const REGISTRY = path.join(os.homedir(), ".egregore", "instances.json");
 const DEFAULT_FILE = path.join(os.homedir(), ".egregore", "default");
 const PUBLIC_NPX_PACKAGE = "create-egregore";
@@ -348,6 +348,10 @@ function runtimePickerLines(inst, runtimes, stored, cursor) {
     const desc = runtimeChoiceDescription(runtime, inst, stored);
     lines.push(`  ${marker} ${BOLD}${label}${RESET}  ${DIM}${desc}${RESET}`);
   }
+  // Coming-soon harnesses — shown for visibility, not selectable yet.
+  for (const soon of ["Hermes", "Pi"]) {
+    lines.push(`  ${DIM}· ${pad(soon, labelWidth)}  coming soon${RESET}`);
+  }
   lines.push("");
   return lines;
 }
@@ -1287,6 +1291,8 @@ function renderHeroPanel({ selected, pv, width, height, countSuffix, filter, fil
       `${BOLD}Assistants${RESET}`,
       `${DIM}claude-code${RESET}: ${commandExists("claude") ? "installed" : "not installed"}`,
       `${DIM}codex${RESET}: ${commandExists("codex") ? "installed" : "not installed"}`,
+      `${DIM}hermes${RESET}: ${DIM}coming soon${RESET}`,
+      `${DIM}pi${RESET}: ${DIM}coming soon${RESET}`,
     ];
     const rows = Math.max(EGREGORE_SIGIL.length + 2, right.length);
     for (let i = 0; i < rows; i++) {
@@ -1298,7 +1304,7 @@ function renderHeroPanel({ selected, pv, width, height, countSuffix, filter, fil
     lines.push(boxLine(`${BOLD}Available Skills${RESET}`, innerWidth, margin));
     for (const group of skillGroups) lines.push(boxLine(group, innerWidth, margin));
     lines.push(emptyBoxLine(innerWidth, margin));
-    lines.push(boxLine(`${BOLD}Assistants${RESET} ${DIM}claude-code${RESET} ${commandExists("claude") ? "installed" : "missing"} · ${DIM}codex${RESET} ${commandExists("codex") ? "installed" : "missing"}`, innerWidth, margin));
+    lines.push(boxLine(`${BOLD}Assistants${RESET} ${DIM}claude-code${RESET} ${commandExists("claude") ? "installed" : "missing"} · ${DIM}codex${RESET} ${commandExists("codex") ? "installed" : "missing"} · ${DIM}hermes/pi coming soon${RESET}`, innerWidth, margin));
   }
 
   lines.push(emptyBoxLine(innerWidth, margin));
@@ -1332,6 +1338,10 @@ function renderRuntimePanel({ inst, cursor, width, height }) {
     const desc = runtimeChoiceDescription(runtime, inst, stored);
     lines.push(boxLine(`${marker} ${pad(labelText, 16)} ${DIM}${desc}${RESET}`, innerWidth, margin));
   }
+  // Coming-soon harnesses — shown for visibility, not selectable yet.
+  for (const soon of ["Hermes", "Pi"]) {
+    lines.push(boxLine(`${DIM}· ${pad(soon, 16)} coming soon${RESET}`, innerWidth, margin));
+  }
 
   lines.push(emptyBoxLine(innerWidth, margin));
   lines.push(boxLine(`${DIM}↑↓ navigate · enter select · 1-${runtimes.length} quick select · esc back · q quit${RESET}`, innerWidth, margin));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-egregore",
-  "version": "0.18.2",
+  "version": "0.18.4",
   "description": "Set up Egregore for your team in one command — installs the egregore launcher and your choice of Claude Code or Codex.",
   "license": "MIT",
   "bin": {

package/runtime/codex/.codex/hooks/branch-guard.js

@@ -198,16 +198,24 @@ function main() {
   const branch = currentBranch(projectDir);
   if (!isProtectedBranch(branch)) return;
 
+  // Consent bypass: the user explicitly chose to work on this protected branch.
+  // Written only after they pick "Proceed on <branch>"; cleared on session start,
+  // so consent is asked once per session, not per write.
+  try {
+    const consent = fs.readFileSync(path.join(projectDir, ".egregore-branch-consent"), "utf-8").trim();
+    if (consent === branch) return;
+  } catch {}
+
   const toolName = input.tool_name || "";
   const toolInput = input.tool_input || {};
   const memoryDir = realish(path.join(projectDir, "memory"));
   const author = currentAuthor(projectDir);
   const reason = [
-    `Protected branch (${branch}).`,
-    "Create an Egregore work branch before writing:",
-    `  bin/agent.sh branch --topic "<work topic>"`,
-    "Then continue from the printed worktree: path.",
-    `Default branch prefix for this user: dev/${author}/...`,
+    `Protected branch (${branch}). Ask the user how to proceed — do NOT auto-branch silently.`,
+    "Offer a choice (numbered or structured): Branch off (default) / Proceed on this branch / Cancel.",
+    `  • Branch off:        bin/agent.sh branch --topic "<work topic>"  (prefix dev/${author}/...)`,
+    `  • Proceed on ${branch}: echo '${branch}' > .egregore-branch-consent  then retry`,
+    "Proceeding records consent for this branch for the rest of the session (cleared on next session start).",
   ].join("\n");
 
   if (toolName === "apply_patch") {

package/runtime/codex/bin/activity-data.sh

@@ -154,6 +154,26 @@ wait $API_PID $GIT_PID $LOCAL_PID 2>/dev/null || true
 # --- Read results ---
 PRS=$(cat "$TMPDIR/prs.json" 2>/dev/null || echo "[]")
 echo "$PRS" | jq . >/dev/null 2>&1 || PRS="[]"
+
+# Resolve PR author GitHub logins -> egregore display names. `gh pr list` returns
+# the raw github login (e.g. "fcdagdelen"); without this it leaks into activity
+# instead of the person's display name ("cem"). Map via the graph when connected;
+# fall back to the github profile name, then the login. Author becomes a string.
+if [ -n "$PRS" ] && [ "$PRS" != "[]" ]; then
+  AUTHOR_MAP='{}'
+  if [ -n "$API_URL" ] && [ -n "$API_KEY" ]; then
+    MAP_RAW=$(bash "$SCRIPT_DIR/bin/graph.sh" query \
+      "MATCH (p:Person) WHERE p.github IS NOT NULL RETURN p.github AS gh, p.name AS name" 2>/dev/null)
+    AUTHOR_MAP=$(printf '%s' "$MAP_RAW" | jq -c \
+      'reduce (.values[]?) as $v ({}; .[($v[0]|ascii_downcase)] = $v[1])' 2>/dev/null || echo '{}')
+  fi
+  PRS=$(printf '%s' "$PRS" | jq -c --argjson map "$AUTHOR_MAP" '
+    map(
+      (if (.author|type)=="object" then .author else {login: (.author|tostring), name: null} end) as $a
+      | .author = ([$map[(($a.login // "") | ascii_downcase)], $a.name, $a.login]
+                   | map(select(. != null and . != "")) | first // "unknown")
+    )' 2>/dev/null || printf '%s' "$PRS")
+fi
 DISK_HANDOFFS=$(cat "$TMPDIR/disk_handoffs.txt" 2>/dev/null || echo "")
 DISK_DECISIONS=$(cat "$TMPDIR/disk_decisions.txt" 2>/dev/null || echo "")
 LOCAL_SESSIONS=$(cat "$TMPDIR/local_sessions.json" 2>/dev/null || echo '{"my_sessions":[],"team_sessions":[]}')

package/runtime/codex/bin/codex-session-start.sh

@@ -18,6 +18,10 @@ if [ -f "$SCRIPT_DIR/.git" ]; then
   MAIN_PROJECT_DIR=$(cd "$WT_GITDIR/../../.." 2>/dev/null && pwd)
 fi
 
+# Clear any branch-guard consent from a previous session — consent to write on
+# a protected branch is asked fresh each session (see AGENTS.md branch-guard protocol).
+rm -f "$SCRIPT_DIR/.egregore-branch-consent" "$MAIN_PROJECT_DIR/.egregore-branch-consent" 2>/dev/null
+
 if [ -f "$SCRIPT_DIR/bin/lib/worktree-links.sh" ]; then
   source "$SCRIPT_DIR/bin/lib/worktree-links.sh" >/dev/null 2>/dev/null || true
   egregore_link_shared_state "$SCRIPT_DIR" "$MAIN_PROJECT_DIR" >/dev/null 2>/dev/null || true