create-egregore 0.17.4 → 0.18.0

package/runtime/codex/bin/worktree-create.sh

@@ -0,0 +1,115 @@
+#!/bin/bash
+# WorktreeCreate hook — replaces EnterWorktree's default behavior.
+# Receives {"name": "<slug>"} on stdin. Must print absolute worktree path to stdout.
+# All diagnostic output goes to stderr or /dev/null — stdout is ONLY for the path.
+# Must complete in under 2 seconds.
+
+# No set -e — a jq failure must not crash the hook
+set -o pipefail
+
+# --- Read input ---
+INPUT=$(cat /dev/stdin 2>/dev/null || echo '{}')
+SLUG=$(echo "$INPUT" | jq -r '.name // empty' 2>/dev/null)
+
+if [ -z "$SLUG" ]; then
+  echo "Error: no name provided" >&2
+  exit 1
+fi
+
+# --- Resolve main repo root ---
+# CLAUDE_PROJECT_DIR may point to main repo or a worktree
+REPO_ROOT="${CLAUDE_PROJECT_DIR:-$(pwd)}"
+if [ -f "$REPO_ROOT/.git" ]; then
+  # In a worktree — trace back to main repo
+  WT_GITDIR=$(sed 's/^gitdir: //' "$REPO_ROOT/.git" 2>/dev/null)
+  REPO_ROOT=$(cd "$WT_GITDIR/../../.." 2>/dev/null && pwd)
+fi
+
+# --- Read author ---
+STATE_FILE="$REPO_ROOT/.egregore-state.json"
+AUTHOR=$(jq -r '.github_username // .display_name // "unknown"' "$STATE_FILE" 2>/dev/null) || AUTHOR="unknown"
+
+# --- Branch and worktree names ---
+BRANCH="dev/${AUTHOR}/${SLUG}"
+WT_PATH="$REPO_ROOT/.claude/worktrees/${SLUG}"
+
+# --- Ensure origin/develop is available ---
+git -C "$REPO_ROOT" fetch origin develop --quiet 2>/dev/null || true
+
+# --- Create branch (idempotent — skip if exists) ---
+if ! git -C "$REPO_ROOT" show-ref --verify --quiet "refs/heads/$BRANCH" 2>/dev/null; then
+  git -C "$REPO_ROOT" branch "$BRANCH" origin/develop >/dev/null 2>&1 || {
+    echo "Error: failed to create branch $BRANCH" >&2
+    exit 1
+  }
+fi
+
+# --- Handle stale worktree at same path ---
+if [ -d "$WT_PATH" ]; then
+  git -C "$REPO_ROOT" worktree remove "$WT_PATH" --force 2>/dev/null || rm -rf "$WT_PATH" 2>/dev/null
+  git -C "$REPO_ROOT" worktree prune 2>/dev/null || true
+fi
+
+# --- Create worktree on our branch ---
+mkdir -p "$REPO_ROOT/.claude/worktrees" 2>/dev/null
+git -C "$REPO_ROOT" worktree add "$WT_PATH" "$BRANCH" --quiet 2>/dev/null || {
+  echo "Error: failed to create worktree at $WT_PATH" >&2
+  exit 1
+}
+
+# --- Symlinks (same as worktree.sh setup) ---
+# Memory
+if [ -L "$REPO_ROOT/memory" ] || [ -d "$REPO_ROOT/memory" ]; then
+  MEMORY_TARGET=$(realpath "$REPO_ROOT/memory" 2>/dev/null)
+  if [ -n "$MEMORY_TARGET" ] && [ -d "$MEMORY_TARGET" ]; then
+    ln -sfn "$MEMORY_TARGET" "$WT_PATH/memory"
+  fi
+fi
+
+# .env
+[ -f "$REPO_ROOT/.env" ] && ln -sfn "$REPO_ROOT/.env" "$WT_PATH/.env"
+
+# .egregore-state.json
+[ -f "$REPO_ROOT/.egregore-state.json" ] && ln -sfn "$REPO_ROOT/.egregore-state.json" "$WT_PATH/.egregore-state.json"
+
+# .egregore-session-id
+[ -f "$REPO_ROOT/.egregore-session-id" ] && ln -sfn "$REPO_ROOT/.egregore-session-id" "$WT_PATH/.egregore-session-id"
+
+# egregore.json
+[ -f "$REPO_ROOT/egregore.json" ] && [ ! -f "$WT_PATH/egregore.json" ] && ln -sfn "$REPO_ROOT/egregore.json" "$WT_PATH/egregore.json"
+
+# --- Compute boundary for worktree (so isolation hook works) ---
+# session-start.sh doesn't re-run for worktrees, so we compute it here.
+HASH=$(echo -n "$WT_PATH" | md5 2>/dev/null || echo -n "$WT_PATH" | md5sum 2>/dev/null | cut -d' ' -f1)
+BOUNDARY_FILE="/tmp/egregore-boundary-${HASH}.json"
+MEMORY_DIR=""
+[ -L "$WT_PATH/memory" ] && MEMORY_DIR=$(realpath "$WT_PATH/memory" 2>/dev/null || true)
+# Managed repos: include main repo (worktree symlinks resolve there) + sibling repos
+MANAGED_REPOS_JSON="[\"$REPO_ROOT\""
+PARENT_DIR="$(dirname "$REPO_ROOT")"
+_repos=$(jq -r '(.repos[]? // empty) | if type == "object" then .name else . end' "$WT_PATH/egregore.json" 2>/dev/null || true)
+for _r in $_repos; do
+  [[ "$_r" == *".."* ]] && continue
+  _resolved=$(realpath "$PARENT_DIR/$_r" 2>/dev/null || true)
+  [ -z "$_resolved" ] && continue
+  MANAGED_REPOS_JSON="$MANAGED_REPOS_JSON,\"$_resolved\""
+done
+MANAGED_REPOS_JSON="$MANAGED_REPOS_JSON]"
+# Denied paths: other instances, but NOT the main repo (worktree is its child)
+DENIED_JSON="[]"
+REGISTRY="$HOME/.egregore/instances.json"
+if [ -f "$REGISTRY" ]; then
+  DENIED_JSON=$(jq --arg self "$REPO_ROOT" --arg wt "$WT_PATH" \
+    '[.[] | select(.path != $self and .path != $wt) | .path]' \
+    "$REGISTRY" 2>/dev/null || echo "[]")
+fi
+jq -n \
+  --arg project_dir "$WT_PATH" \
+  --arg memory_dir "$MEMORY_DIR" \
+  --argjson managed_repos "$MANAGED_REPOS_JSON" \
+  --argjson denied_paths "$DENIED_JSON" \
+  '{project_dir: $project_dir, memory_dir: $memory_dir, managed_repos: $managed_repos, denied_paths: $denied_paths}' \
+  > "$BOUNDARY_FILE.tmp" 2>/dev/null && mv "$BOUNDARY_FILE.tmp" "$BOUNDARY_FILE" 2>/dev/null || true
+
+# --- Output the worktree path (ONLY stdout line) ---
+echo "$WT_PATH"

package/runtime/codex/bin/worktree-remove.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+# WorktreeRemove hook — handles cleanup when a worktree is removed.
+# Receives {"worktree_path": "<path>"} on stdin. Best-effort, always exit 0.
+
+INPUT=$(cat /dev/stdin 2>/dev/null || echo '{}')
+WT_PATH=$(echo "$INPUT" | jq -r '.worktree_path // empty' 2>/dev/null)
+
+if [ -z "$WT_PATH" ] || [ ! -d "$WT_PATH" ]; then
+  exit 0
+fi
+
+# --- Resolve main repo for git operations ---
+REPO_ROOT="${CLAUDE_PROJECT_DIR:-}"
+if [ -z "$REPO_ROOT" ] || [ -f "$REPO_ROOT/.git" ]; then
+  # In a worktree or no CLAUDE_PROJECT_DIR — trace from the worktree path
+  if [ -f "$WT_PATH/.git" ]; then
+    WT_GITDIR=$(sed 's/^gitdir: //' "$WT_PATH/.git" 2>/dev/null)
+    REPO_ROOT=$(cd "$WT_GITDIR/../../.." 2>/dev/null && pwd) || REPO_ROOT=""
+  fi
+fi
+
+# --- Remove from instance registry ---
+REGISTRY="$HOME/.egregore/instances.json"
+if [ -f "$REGISTRY" ]; then
+  RESOLVED_WT=$(realpath "$WT_PATH" 2>/dev/null || echo "$WT_PATH")
+  UPDATED=$(jq --arg p "$RESOLVED_WT" '[.[] | select(.path != $p)]' "$REGISTRY" 2>/dev/null)
+  if [ -n "$UPDATED" ]; then
+    echo "$UPDATED" > "$REGISTRY.tmp" && mv "$REGISTRY.tmp" "$REGISTRY"
+  fi
+fi
+
+# --- Remove worktree ---
+if [ -n "$REPO_ROOT" ] && [ -d "$REPO_ROOT/.git" ]; then
+  git -C "$REPO_ROOT" worktree remove "$WT_PATH" --force 2>/dev/null || true
+  git -C "$REPO_ROOT" worktree prune 2>/dev/null || true
+else
+  # Fallback: just remove the directory
+  rm -rf "$WT_PATH" 2>/dev/null || true
+fi
+
+# --- Clean up stale marker files ---
+for MARKER_FILE in "$HOME/.egregore"/worktree-cleanup-*.marker; do
+  [ -f "$MARKER_FILE" ] || continue
+  MARKER_PATH=$(cat "$MARKER_FILE" 2>/dev/null)
+  if [ "$MARKER_PATH" = "$WT_PATH" ] || [ ! -d "$MARKER_PATH" ]; then
+    rm -f "$MARKER_FILE" 2>/dev/null || true
+  fi
+done
+
+exit 0

package/runtime/codex/bin/worktree.sh

@@ -0,0 +1,199 @@
+#!/bin/bash
+# Worktree lifecycle management for Egregore sessions.
+# Each session gets an isolated worktree so parallel sessions don't conflict.
+#
+# Usage:
+#   bash bin/worktree.sh setup <worktree-path> <main-project-dir>
+#   bash bin/worktree.sh cleanup <worktree-path>
+#   bash bin/worktree.sh cleanup-stale <main-project-dir>
+#   bash bin/worktree.sh health [path]
+#   bash bin/worktree.sh list
+
+set -o pipefail
+
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+  echo "Usage: worktree.sh <command> [args...]"
+  echo ""
+  echo "Worktree lifecycle management for Egregore sessions."
+  echo ""
+  echo "Commands:"
+  echo "  setup <path> <main-dir>         Set up symlinks for a new worktree"
+  echo "  cleanup <path>                  Remove a worktree"
+  echo "  cleanup-stale <main-dir>        List stale worktrees (manual review)"
+  echo "  health [path]                   Check worktree + branch health"
+  echo "  list                            List all git worktrees"
+  exit 0
+fi
+
+CMD="${1:-}"
+shift 2>/dev/null || true
+
+case "$CMD" in
+
+  setup)
+    # Setup symlinks so worktree shares state with main project.
+    # Args: <worktree-path> <main-project-dir>
+    WT_PATH="${1:?Usage: worktree.sh setup <worktree-path> <main-project-dir>}"
+    MAIN_DIR="${2:?Usage: worktree.sh setup <worktree-path> <main-project-dir>}"
+
+    # Symlink shared files from main project
+    for FILE in memory .env .egregore-state.json .egregore-session-id; do
+      SRC="$MAIN_DIR/$FILE"
+      DST="$WT_PATH/$FILE"
+      if [ "$FILE" = "memory" ]; then
+        # Follow the shared memory symlink or direct directory to get an
+        # absolute path. Most installs use a symlink; local/dev fixtures may
+        # use a directory.
+        [ -L "$SRC" ] || [ -d "$SRC" ] || continue
+        SRC=$(realpath "$SRC" 2>/dev/null) || continue
+        [ -d "$SRC" ] || continue
+      else
+        [ -f "$SRC" ] || continue
+      fi
+      ln -sfn "$SRC" "$DST"
+    done
+
+    # Symlink egregore.json if not already present (committed file)
+    if [ -f "$MAIN_DIR/egregore.json" ] && [ ! -f "$WT_PATH/egregore.json" ]; then
+      ln -sfn "$MAIN_DIR/egregore.json" "$WT_PATH/egregore.json"
+    fi
+
+    # Find terminal TTY for statusline matching
+    _pid=$$
+    _tty=""
+    while [ "$_pid" -gt 1 ] 2>/dev/null; do
+      _ptty=$(ps -o tty= -p "$_pid" 2>/dev/null | tr -d ' ')
+      if [ -n "$_ptty" ] && [ "$_ptty" != "??" ]; then
+        _tty="$_ptty"
+        break
+      fi
+      _pid=$(ps -o ppid= -p "$_pid" 2>/dev/null | tr -d ' ')
+    done
+    [ -n "$_tty" ] && echo "$_tty" > "$WT_PATH/.egregore-worktree-tty"
+
+    echo "Worktree setup complete: $WT_PATH"
+    ;;
+
+  cleanup)
+    # Remove a worktree. Only called explicitly (ExitWorktree or manual).
+    # Args: <worktree-path>
+    WT_PATH="${1:?Usage: worktree.sh cleanup <worktree-path>}"
+
+    # Remove from instance registry if accidentally registered
+    REGISTRY="$HOME/.egregore/instances.json"
+    if [ -f "$REGISTRY" ]; then
+      RESOLVED_WT=$(realpath "$WT_PATH" 2>/dev/null || echo "$WT_PATH")
+      UPDATED=$(jq --arg p "$RESOLVED_WT" '[.[] | select(.path != $p)]' "$REGISTRY" 2>/dev/null)
+      if [ -n "$UPDATED" ]; then
+        echo "$UPDATED" > "$REGISTRY.tmp" && mv "$REGISTRY.tmp" "$REGISTRY"
+      fi
+    fi
+
+    git worktree remove "$WT_PATH" --force 2>/dev/null || true
+    git worktree prune 2>/dev/null || true
+
+    echo "Worktree cleaned up: $WT_PATH"
+    ;;
+
+  cleanup-stale)
+    # List stale worktrees for manual review. Does NOT auto-delete.
+    # Run interactively or from a cleanup command — never from session-start.
+    # Args: <main-project-dir>
+    MAIN_DIR="${1:?Usage: worktree.sh cleanup-stale <main-project-dir>}"
+    WT_BASE="$MAIN_DIR/.claude/worktrees"
+
+    if [ ! -d "$WT_BASE" ]; then
+      echo "No worktrees directory."
+      exit 0
+    fi
+
+    NOW_TS=$(date +%s)
+    FOUND=0
+
+    for WT_DIR in "$WT_BASE"/*/; do
+      [ -d "$WT_DIR" ] || continue
+
+      WT_NAME=$(basename "$WT_DIR")
+      WT_BRANCH=""
+      STATUS="unknown"
+
+      if [ -f "$WT_DIR/.git" ]; then
+        WT_BRANCH=$(git -C "$WT_DIR" branch --show-current 2>/dev/null || echo "?")
+
+        # Check if merged
+        if [ "$WT_BRANCH" != "?" ] && [ "$WT_BRANCH" != "develop" ] && [ "$WT_BRANCH" != "main" ]; then
+          if git merge-base --is-ancestor "$(git -C "$WT_DIR" rev-parse HEAD 2>/dev/null)" \
+               "$(git -C "$MAIN_DIR" rev-parse origin/develop 2>/dev/null)" 2>/dev/null; then
+            STATUS="merged"
+          else
+            STATUS="active"
+          fi
+        fi
+      else
+        STATUS="broken"
+      fi
+
+      # Age
+      WT_MTIME=$(stat -f %m "$WT_DIR" 2>/dev/null || stat -c %Y "$WT_DIR" 2>/dev/null || echo "$NOW_TS")
+      WT_AGE_H=$(( (NOW_TS - WT_MTIME) / 3600 ))
+
+      if [ "$STATUS" = "merged" ] || [ "$STATUS" = "broken" ] || [ "$WT_AGE_H" -gt 24 ]; then
+        echo "  $WT_NAME  [$STATUS]  ${WT_AGE_H}h old  branch: ${WT_BRANCH:-none}"
+        FOUND=$((FOUND + 1))
+      fi
+    done
+
+    if [ "$FOUND" -eq 0 ]; then
+      echo "No stale worktrees found."
+    else
+      echo ""
+      echo "To remove: bash bin/worktree.sh cleanup <path>"
+    fi
+
+    # Prune git's internal worktree list
+    git -C "$MAIN_DIR" worktree prune 2>/dev/null || true
+    ;;
+
+  health)
+    # Check worktree + branch health
+    # Exit codes: 0=healthy, 1=not_worktree, 2=branch_gone, 3=protected_branch
+    WT_PATH="${1:-$(pwd)}"
+
+    if [ ! -f "$WT_PATH/.git" ]; then
+      echo '{"status":"not_worktree"}'
+      exit 1
+    fi
+
+    BRANCH=$(git -C "$WT_PATH" branch --show-current 2>/dev/null || echo "")
+
+    case "$BRANCH" in
+      develop|main|master)
+        jq -n --arg branch "$BRANCH" '{status: "protected_branch", branch: $branch}'
+        exit 3
+        ;;
+    esac
+
+    # Check if remote branch still exists
+    git -C "$WT_PATH" fetch origin --prune --quiet 2>/dev/null || true
+    if ! git -C "$WT_PATH" ls-remote --heads origin "$BRANCH" 2>/dev/null | grep -q "$BRANCH"; then
+      if git -C "$WT_PATH" branch -r --merged origin/develop 2>/dev/null | grep -q "origin/$BRANCH" 2>/dev/null; then
+        jq -n --arg branch "$BRANCH" '{status: "merged", branch: $branch}'
+      else
+        jq -n --arg branch "$BRANCH" '{status: "remote_deleted", branch: $branch}'
+      fi
+      exit 2
+    fi
+
+    jq -n --arg branch "$BRANCH" '{status: "healthy", branch: $branch}'
+    exit 0
+    ;;
+
+  list)
+    git worktree list
+    ;;
+
+  *)
+    echo "Usage: worktree.sh {setup|cleanup|cleanup-stale|health|list}" >&2
+    exit 1
+    ;;
+esac

package/runtime/codex/manifest.json

@@ -0,0 +1,162 @@
+{
+  "generatedAt": "2026-06-15T13:36:14.132Z",
+  "source": "egregore-runtime",
+  "policy": "public-safe subset derived from .syncignore; internal .codex/skills exclusions omitted",
+  "skillCount": 55,
+  "skills": [
+    "activity",
+    "add",
+    "announce",
+    "answer",
+    "archive",
+    "ask",
+    "branch",
+    "checkup",
+    "comment",
+    "commit",
+    "contribute",
+    "dark-mode",
+    "dashboard",
+    "deep-reflect",
+    "delete-user",
+    "edit",
+    "edit-process",
+    "egregore-voice",
+    "emissary",
+    "env",
+    "handoff",
+    "harvest",
+    "infra",
+    "ingest",
+    "ingest-google",
+    "ingest-user-interview",
+    "invite",
+    "issue",
+    "me",
+    "meeting",
+    "note",
+    "onboarding",
+    "pr",
+    "project",
+    "pull",
+    "push",
+    "quest",
+    "quest-suggest",
+    "reflect",
+    "review-pr",
+    "save",
+    "setup",
+    "summon",
+    "sync-repos",
+    "telegram-connect",
+    "telemetry",
+    "test",
+    "the-spiral",
+    "todo",
+    "tui-design",
+    "tutorial",
+    "update",
+    "view",
+    "visual-explain",
+    "wrap"
+  ],
+  "files": [
+    ".codex/config.toml",
+    ".codex/hooks.json",
+    ".codex/hooks/branch-guard.js",
+    ".codex/skills/activity/SKILL.md",
+    ".codex/skills/add/SKILL.md",
+    ".codex/skills/announce/SKILL.md",
+    ".codex/skills/answer/SKILL.md",
+    ".codex/skills/archive/SKILL.md",
+    ".codex/skills/ask/SKILL.md",
+    ".codex/skills/branch/SKILL.md",
+    ".codex/skills/checkup/SKILL.md",
+    ".codex/skills/comment/SKILL.md",
+    ".codex/skills/commit/SKILL.md",
+    ".codex/skills/contribute/SKILL.md",
+    ".codex/skills/dark-mode/SKILL.md",
+    ".codex/skills/dashboard/SKILL.md",
+    ".codex/skills/deep-reflect/SKILL.md",
+    ".codex/skills/delete-user/SKILL.md",
+    ".codex/skills/edit-process/SKILL.md",
+    ".codex/skills/edit/SKILL.md",
+    ".codex/skills/egregore-voice/SKILL.md",
+    ".codex/skills/emissary/SKILL.md",
+    ".codex/skills/env/SKILL.md",
+    ".codex/skills/handoff/SKILL.md",
+    ".codex/skills/harvest/SKILL.md",
+    ".codex/skills/infra/SKILL.md",
+    ".codex/skills/ingest-google/SKILL.md",
+    ".codex/skills/ingest-user-interview/SKILL.md",
+    ".codex/skills/ingest/SKILL.md",
+    ".codex/skills/invite/SKILL.md",
+    ".codex/skills/issue/SKILL.md",
+    ".codex/skills/me/SKILL.md",
+    ".codex/skills/meeting/SKILL.md",
+    ".codex/skills/note/SKILL.md",
+    ".codex/skills/onboarding/SKILL.md",
+    ".codex/skills/pr/SKILL.md",
+    ".codex/skills/project/SKILL.md",
+    ".codex/skills/pull/SKILL.md",
+    ".codex/skills/push/SKILL.md",
+    ".codex/skills/quest-suggest/SKILL.md",
+    ".codex/skills/quest/SKILL.md",
+    ".codex/skills/reflect/SKILL.md",
+    ".codex/skills/review-pr/SKILL.md",
+    ".codex/skills/save/SKILL.md",
+    ".codex/skills/setup/SKILL.md",
+    ".codex/skills/summon/SKILL.md",
+    ".codex/skills/sync-repos/SKILL.md",
+    ".codex/skills/telegram-connect/SKILL.md",
+    ".codex/skills/telemetry/SKILL.md",
+    ".codex/skills/test/SKILL.md",
+    ".codex/skills/the-spiral/SKILL.md",
+    ".codex/skills/todo/SKILL.md",
+    ".codex/skills/tui-design/SKILL.md",
+    ".codex/skills/tutorial/SKILL.md",
+    ".codex/skills/update/SKILL.md",
+    ".codex/skills/view/SKILL.md",
+    ".codex/skills/visual-explain/SKILL.md",
+    ".codex/skills/wrap/SKILL.md",
+    ".codex/spec-manifest.json",
+    "AGENTS.md",
+    "bin/activity-data.sh",
+    "bin/agent.sh",
+    "bin/codex-install-skills.sh",
+    "bin/codex-render-spec.mjs",
+    "bin/codex-session-start.sh",
+    "bin/codex-skill-render.mjs",
+    "bin/codex-sync-skills.sh",
+    "bin/dashboard-data.sh",
+    "bin/graph-batch.sh",
+    "bin/graph-op.sh",
+    "bin/graph-wal.sh",
+    "bin/graph.sh",
+    "bin/handoff-pr-backfill.sh",
+    "bin/handoff-run.sh",
+    "bin/handoff-save-egregore.sh",
+    "bin/index-handoff.sh",
+    "bin/lib/artifact-id.sh",
+    "bin/lib/config.sh",
+    "bin/lib/context.sh",
+    "bin/lib/dashboard-artifact.sh",
+    "bin/lib/edit-loopback.mjs",
+    "bin/lib/ensure-develop.sh",
+    "bin/lib/git-sync.sh",
+    "bin/lib/greeting.sh",
+    "bin/lib/hash.sh",
+    "bin/lib/identity.sh",
+    "bin/lib/permissions.sh",
+    "bin/lib/time.sh",
+    "bin/lib/worktree-links.sh",
+    "bin/notify.sh",
+    "bin/publish-artifact.sh",
+    "bin/publish-references.sh",
+    "bin/repo-state.sh",
+    "bin/telemetry.sh",
+    "bin/worktree-create.sh",
+    "bin/worktree-remove.sh",
+    "bin/worktree.sh"
+  ]
+}