create-egregore 0.18.17 → 0.19.0

package/runtime/codex/bin/codex-render-spec.mjs

@@ -224,6 +224,8 @@ Codex has no structured question tool — render each batch as compact numbered
 
 **Rules:** Max 4 questions per batch. When choices aren't mutually exclusive, say "pick any that apply".`;
 
+const LOOM_ROUTING_BODY = `Loom routes commands across model tiers on the Claude Code runtime (\`loom/routes.json\` + \`bin/loom.sh\` + a model-pinned executor subagent). Codex has no subagent delegation — every command runs inline in the current session. Ignore "Loom routing" preambles if you encounter them in a skill spec, and skip \`bin/loom.sh\` calls; \`loom/\` and \`.claude/agents/\` are framework files synced for the Claude runtime.`;
+
 const ISOLATION_BODY = `Sessions are confined to this project + memory + managed repos. On Codex this boundary is a standing instruction, not an enforced hook — hold it yourself.
 
 - **Never modify \`~/.egregore/instances.json\`** — managed by session-start.sh
@@ -266,6 +268,11 @@ const RULES = {
   'Onboarding': { action: 'keep', note: 'Kept; /onboarding rendered as $onboarding.' },
   'Transparency Beat': { action: 'keep', note: 'Kept verbatim.' },
   'Memory': { action: 'keep', note: 'Kept verbatim.' },
+  'Loom Routing': {
+    action: 'replace',
+    body: LOOM_ROUTING_BODY,
+    note: 'Loom delegation rides the Claude Code Agent tool; Codex has no subagent delegation — commands run inline. Preambles and bin/loom.sh calls marked skippable.',
+  },
   'Git Workflow': {
     action: 'keep',
     note: 'Kept; slash tokens rendered as $skill tokens. Branch diagram unchanged (code fence).',

package/runtime/codex/bin/lib/git-sync.sh

@@ -72,12 +72,12 @@ _apply_framework_update() {
   fi
   # Apply upstream changes — checkout is idempotent, skip diff check
   # (git diff with variable path lists breaks in zsh — no word-splitting)
-  for _p in bin/ .claude/commands/ .claude/skills/ .claude/hooks/ .claude/context/ CLAUDE.md skills/; do
+  for _p in bin/ .claude/commands/ .claude/skills/ .claude/hooks/ .claude/context/ .claude/agents/ loom/ CLAUDE.md skills/; do
     git checkout upstream/main -- "$_p" 2>/dev/null || true
   done
   # Only commit if there are actual changes
-  if [ -n "$(git status --porcelain bin/ .claude/ CLAUDE.md skills/ 2>/dev/null | head -1)" ]; then
-    git add bin/ .claude/ CLAUDE.md skills/ 2>/dev/null
+  if [ -n "$(git status --porcelain bin/ .claude/ loom/ CLAUDE.md skills/ 2>/dev/null | head -1)" ]; then
+    git add bin/ .claude/ loom/ CLAUDE.md skills/ 2>/dev/null
     EGREGORE_FRAMEWORK_UPDATE=1 git commit -m "Auto-update Egregore framework" --quiet 2>/dev/null || true
     FRAMEWORK_UPDATED="true"
   fi

package/runtime/codex/bin/lib/identity.sh

@@ -162,3 +162,13 @@ PROJ_HASH=$(echo -n "$SCRIPT_DIR" | md5 2>/dev/null || echo -n "$SCRIPT_DIR" | m
 echo "$EGREGORE_SESSION_ID" > "$SESSION_ID_DIR/session-${PROJ_HASH}.id"
 # Also write project-local file (CLAUDE.md reads this — no glob needed)
 echo "$EGREGORE_SESSION_ID" > "$SCRIPT_DIR/.egregore-session-id"
+
+# Model stamp hashes the git common-dir root because telemetry.sh resolves it that way.
+MODEL_REPO_ROOT=$(git -C "$SCRIPT_DIR" rev-parse --path-format=absolute --git-common-dir 2>/dev/null | sed 's|/\.git$||') || MODEL_REPO_ROOT="$SCRIPT_DIR"
+MODEL_PROJ_HASH=$(echo -n "$MODEL_REPO_ROOT" | md5 2>/dev/null || echo -n "$MODEL_REPO_ROOT" | md5sum 2>/dev/null | cut -d' ' -f1)
+MODEL_STAMP_FILE="$SESSION_ID_DIR/session-model-${MODEL_PROJ_HASH}"
+if [ -n "${CLAUDE_MODEL:-}" ]; then
+  echo "$CLAUDE_MODEL" > "$MODEL_STAMP_FILE"
+else
+  rm -f "$MODEL_STAMP_FILE"
+fi

package/runtime/codex/bin/telemetry.sh

@@ -98,6 +98,13 @@ _resolve_org() {
   fi
 }
 
+_resolve_proj_hash() {
+  # Use git common dir so worktrees hash to the same path as the main checkout
+  local repo_root
+  repo_root=$(git -C "$SCRIPT_DIR" rev-parse --path-format=absolute --git-common-dir 2>/dev/null | sed 's|/\.git$||') || repo_root="$SCRIPT_DIR"
+  echo -n "$repo_root" | md5 2>/dev/null || echo -n "$repo_root" | md5sum 2>/dev/null | cut -d' ' -f1
+}
+
 _resolve_session_id() {
   if [ -n "${EGREGORE_SESSION_ID:-}" ]; then
     echo "$EGREGORE_SESSION_ID"
@@ -106,11 +113,8 @@ _resolve_session_id() {
 
   # Fallback: read from file written by session-start.sh
   # (env vars from hooks don't propagate into the Claude Code agent)
-  # Use git common dir so worktrees hash to the same path as the main checkout
-  local repo_root
-  repo_root=$(git -C "$SCRIPT_DIR" rev-parse --path-format=absolute --git-common-dir 2>/dev/null | sed 's|/\.git$||') || repo_root="$SCRIPT_DIR"
   local proj_hash
-  proj_hash=$(echo -n "$repo_root" | md5 2>/dev/null || echo -n "$repo_root" | md5sum 2>/dev/null | cut -d' ' -f1)
+  proj_hash=$(_resolve_proj_hash)
   local sid_file="$HOME/.egregore/session-${proj_hash}.id"
   if [ -f "$sid_file" ]; then
     cat "$sid_file" 2>/dev/null || echo "unknown"
@@ -119,6 +123,45 @@ _resolve_session_id() {
   fi
 }
 
+_resolve_model() {
+  local proj_hash
+  proj_hash=$(_resolve_proj_hash)
+  local model_file="$HOME/.egregore/session-model-${proj_hash}"
+  if [ ! -s "$model_file" ]; then
+    return 0
+  fi
+
+  local model=""
+  IFS= read -r model < "$model_file" || true
+  if [ -n "$model" ]; then
+    printf '%s\n' "$model"
+  fi
+}
+
+_stamp_model_if_absent() {
+  local compact_data="$1"
+  local has_model=""
+  has_model=$(printf '%s' "$compact_data" | jq -e 'has("model")' 2>/dev/null || true)
+  if [ "$has_model" != "false" ]; then
+    printf '%s' "$compact_data"
+    return 0
+  fi
+
+  local model=""
+  model=$(_resolve_model 2>/dev/null || true)
+  if [ -z "$model" ]; then
+    printf '%s' "$compact_data"
+    return 0
+  fi
+
+  local stamped_data=""
+  if stamped_data=$(printf '%s' "$compact_data" | jq -c --arg m "$model" 'if has("model") then . else . + {model:$m} end' 2>/dev/null); then
+    printf '%s' "$stamped_data"
+  else
+    printf '%s' "$compact_data"
+  fi
+}
+
 # --- emit: append event to local JSONL buffer ---
 cmd_emit() {
   local event_type="${1:?Usage: telemetry.sh emit <type> <json>}"
@@ -129,12 +172,15 @@ cmd_emit() {
     return 0
   fi
 
+  local ts
+  ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+  # Compact data to single line — callers may pass pretty-printed JSON
+  local compact_data
+  compact_data=$(printf '%s' "$data" | tr -d '\n' | tr -s ' ')
+  compact_data=$(_stamp_model_if_absent "$compact_data")
+
   # Debug mode: print to stderr instead of writing
   if _is_debug; then
-    local ts
-    ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-    local compact_data
-    compact_data=$(printf '%s' "$data" | tr -d '\n' | tr -s ' ')
     printf '{"ts":"%s","type":"%s","sid":"%s","org":"%s","user":"%s","data":%s}\n' \
       "$ts" "$event_type" "$(_resolve_session_id)" "$(_resolve_org)" "$(_resolve_user)" "$compact_data" >&2
     return 0
@@ -144,11 +190,6 @@ cmd_emit() {
   mkdir -p "$BUFFER_DIR"
 
   # Build event line (outside lock for minimal hold time)
-  local ts
-  ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-  # Compact data to single line — callers may pass pretty-printed JSON
-  local compact_data
-  compact_data=$(printf '%s' "$data" | tr -d '\n' | tr -s ' ')
   local line
   line=$(printf '{"ts":"%s","type":"%s","sid":"%s","org":"%s","user":"%s","data":%s}' \
     "$ts" "$event_type" "$(_resolve_session_id)" "$(_resolve_org)" "$(_resolve_user)" "$compact_data")