create-egregore 0.19.8 → 0.19.11

package/runtime/pi/bin/graph-wal.sh

@@ -32,13 +32,14 @@ WAL_FILE="$WAL_DIR/graph-wal-${PROJ_HASH}.jsonl"
 MAX_BUFFER_BYTES=2097152  # 2MB
 MAX_ENTRIES_AFTER_TRUNCATE=200
 LOCK_DIR="$WAL_DIR/graph-wal-${PROJ_HASH}.lock"
+LOCK_ATTEMPTS="${GRAPH_WAL_LOCK_ATTEMPTS:-50}"
 
 # --- Cross-platform file locking via mkdir (atomic on all POSIX systems) ---
 _lock() {
   local attempts=0
   while ! mkdir "$LOCK_DIR" 2>/dev/null; do
     attempts=$((attempts + 1))
-    if [ "$attempts" -gt 50 ]; then
+    if [ "$attempts" -gt "$LOCK_ATTEMPTS" ]; then
       # Stale lock — check if holder PID is alive
       local holder_pid
       holder_pid=$(cat "$LOCK_DIR/pid" 2>/dev/null || echo "")
@@ -46,7 +47,7 @@ _lock() {
         rm -rf "$LOCK_DIR" 2>/dev/null
         continue
       fi
-      echo "graph-wal: lock timeout after 5s" >&2
+      echo "graph-wal: lock timeout after ${LOCK_ATTEMPTS} attempt(s)" >&2
       return 1
     fi
     sleep 0.1

package/runtime/pi/bin/handoff-run.sh

@@ -11,6 +11,7 @@ set -euo pipefail
 #     --topic  "<short topic>" \
 #     [--recipient <name>] \
 #     [--project <name>] \
+#     [--intent <action|feedback|fyi>] \
 #     <<'HANDOFFEOF'
 #   ...full markdown body of the handoff...
 #   HANDOFFEOF
@@ -45,6 +46,7 @@ AUTHOR=""
 TOPIC=""
 RECIPIENT=""
 PROJECT=""
+INTENT="action"
 NO_PUSH=0
 NO_NOTIFY=0
 NO_PUBLISH=0
@@ -56,6 +58,7 @@ while [ $# -gt 0 ]; do
     --topic)      TOPIC="${2:?}";     shift 2 ;;
     --recipient)  RECIPIENT="${2:-}"; shift 2 ;;
     --project)    PROJECT="${2:-}";   shift 2 ;;
+    --intent)     INTENT="${2:-}";    shift 2 ;;
     --composed)   COMPOSED="${2:-}";  shift 2 ;;
     --no-push)    NO_PUSH=1;          shift ;;
     --no-notify)  NO_NOTIFY=1;        shift ;;
@@ -76,6 +79,10 @@ fi
 
 [ -z "$AUTHOR" ] && { echo "Missing --author" >&2; exit 1; }
 [ -z "$TOPIC" ]  && { echo "Missing --topic"  >&2; exit 1; }
+case "$INTENT" in
+  action|feedback|fyi) ;;
+  *) echo "Invalid --intent: $INTENT (action|feedback|fyi)" >&2; exit 1 ;;
+esac
 
 MODE=$(jq -r '.mode // "connected"' "$CONFIG" 2>/dev/null || echo "connected")
 TODAY=$(date +%Y-%m-%d)
@@ -115,6 +122,48 @@ if [ ! -s "$ABS_FILE" ]; then
   exit 1
 fi
 
+# --- Canonical capture contract -----------------------------------------
+# /handoff is the addressed door into the shared capture engine. Persist the
+# same schema/mode fields used by /wrap and SessionEnd so filesystem and graph
+# retrieval can distinguish captures without inferring from directory names.
+if ! grep -qiE '^(capture_schema:|\*\*[Cc]apture [Ss]chema\*\*:)' "$ABS_FILE"; then
+  CAPTURE_KIND=""
+  if ! grep -qiE '^(kind:|\*\*[Kk]ind\*\*:)' "$ABS_FILE"; then
+    CAPTURE_KIND="addressed"
+  fi
+  if [ "$(head -1 "$ABS_FILE")" = "---" ]; then
+    awk -v kind="$CAPTURE_KIND" '
+      NR == 1 {
+        print
+        print "capture_schema: egregore-capture/v1"
+        print "capture_mode: addressed"
+        if (kind != "") print "kind: " kind
+        next
+      }
+      { print }
+    ' "$ABS_FILE" > "$ABS_FILE.new" && mv "$ABS_FILE.new" "$ABS_FILE"
+  else
+    awk -v kind="$CAPTURE_KIND" '
+      !injected && /^\*\*[Aa]uthor\*\*:/ {
+        print
+        print "**Capture Schema**: egregore-capture/v1"
+        print "**Capture Mode**: addressed"
+        if (kind != "") print "**Kind**: " kind
+        injected=1
+        next
+      }
+      { print }
+      END {
+        if (!injected) {
+          print "**Capture Schema**: egregore-capture/v1"
+          print "**Capture Mode**: addressed"
+          if (kind != "") print "**Kind**: " kind
+        }
+      }
+    ' "$ABS_FILE" > "$ABS_FILE.new" && mv "$ABS_FILE.new" "$ABS_FILE"
+  fi
+fi
+
 # --- Inject **To**: line if --recipient given and body omits it -----
 # index-handoff.sh parses recipients from the file body. Skills
 # normally write the To line themselves, but callers that invoke
@@ -132,6 +181,29 @@ if [ -n "$RECIPIENT" ] && ! grep -qi "^\*\*[Tt]o\*\*:" "$ABS_FILE"; then
   ' "$ABS_FILE" > "$ABS_FILE.new" && mv "$ABS_FILE.new" "$ABS_FILE"
 fi
 
+# --- Persist lifecycle intent in the canonical handoff file -------------
+if ! grep -qiE '^(intent:|\*\*[Ii]ntent\*\*:)' "$ABS_FILE"; then
+  if [ "$(head -1 "$ABS_FILE")" = "---" ]; then
+    awk -v intent="$INTENT" '
+      NR == 1 { print; print "intent: " intent; next }
+      { print }
+    ' "$ABS_FILE" > "$ABS_FILE.new" && mv "$ABS_FILE.new" "$ABS_FILE"
+  else
+    awk -v intent="$INTENT" '
+      !injected && /^\*\*[Aa]uthor\*\*:/ {
+        print
+        print "**Intent**: " intent
+        injected=1
+        next
+      }
+      { print }
+      END {
+        if (!injected) print "**Intent**: " intent
+      }
+    ' "$ABS_FILE" > "$ABS_FILE.new" && mv "$ABS_FILE.new" "$ABS_FILE"
+  fi
+fi
+
 # --- Append repo state ---------------------------------------------------
 # --no-pr skips `gh pr list` (~400–600ms per repo). A detached PR backfill
 # after the parallel phase rewrites `—` → `#N` and re-pushes memory.

package/runtime/pi/bin/handoff-save-egregore.sh

@@ -31,13 +31,22 @@ TOPIC="${2:-session work}"
 shift 2 2>/dev/null || true
 
 REPO_DIR=""
+KIND="handoff"
+BRANCH_SUFFIX=""
 while [ $# -gt 0 ]; do
   case "$1" in
     --repo-dir) REPO_DIR="${2:-}"; shift 2 ;;
+    --kind) KIND="${2:-handoff}"; shift 2 ;;
+    --branch-suffix) BRANCH_SUFFIX="${2:-}"; shift 2 ;;
     *) shift ;;
   esac
 done
 
+case "$KIND" in
+  autosave) MSG_PREFIX="Auto-save" ; PR_BODY="Auto-saved session content (non-coding). No explicit /save needed." ;;
+  *)        MSG_PREFIX="Handoff"   ; PR_BODY="Auto-created by /handoff. Session work for:" ;;
+esac
+
 [ -n "$AUTHOR" ] || { echo "handoff-save-egregore: missing author" >&2; exit 1; }
 
 SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
@@ -50,6 +59,13 @@ cd "$REPO_DIR" || exit 1
 . "$SCRIPT_DIR/bin/lib/git-safe.sh" 2>/dev/null || true
 type git_add_guarded >/dev/null 2>&1 || git_add_guarded() { git add -A 2>/dev/null || true; }
 
+# Shared non-coding classifier (auto-merge policy lives in one place).
+# shellcheck source=bin/lib/noncode.sh
+. "$SCRIPT_DIR/bin/lib/noncode.sh" 2>/dev/null || true
+type noncode_blockers >/dev/null 2>&1 || noncode_blockers() {
+  git -C "${2:-.}" diff "${1:-origin/develop}...HEAD" --name-only 2>/dev/null | grep -v '\.md$' | head -1 || true
+}
+
 # --- Early exit if nothing to do -----------------------------------------
 DIRTY=0
 [ -n "$(git status --porcelain 2>/dev/null)" ] && DIRTY=1
@@ -70,7 +86,9 @@ fi
 case "$CURRENT_BRANCH" in
   develop|main|master|"")
     SLUG_DATE=$(date +%Y-%m-%d)
-    NEW_BRANCH="dev/${AUTHOR}/handoff-${SLUG_DATE}"
+    # --branch-suffix keeps concurrent rescues distinct (e.g. per-checkout
+    # hash from the autosave sweep) — same-name pushes wedge on non-FF.
+    NEW_BRANCH="dev/${AUTHOR}/${KIND}-${SLUG_DATE}${BRANCH_SUFFIX:+-$BRANCH_SUFFIX}"
     git fetch origin develop --quiet 2>/dev/null || true
     git checkout -b "$NEW_BRANCH" origin/develop --quiet 2>/dev/null || \
       git checkout "$NEW_BRANCH" --quiet 2>/dev/null || exit 0
@@ -81,7 +99,7 @@ esac
 # --- Commit whatever is uncommitted --------------------------------------
 if [ -n "$(git status --porcelain 2>/dev/null)" ]; then
   git_add_guarded
-  git commit -m "Handoff: ${TOPIC}" --quiet 2>/dev/null || true
+  git commit -m "${MSG_PREFIX}: ${TOPIC}" --quiet 2>/dev/null || true
 fi
 
 # --- Rebase onto develop, fall back to merge if rebase conflicts ---------
@@ -102,8 +120,21 @@ if ! git push -u origin "$CURRENT_BRANCH" --quiet 2>/dev/null; then
   exit 0
 fi
 
+# --- Ledger: the user-visible trail of background saves ------------------
+# Read by session-autosave.sh (immediate Stop-hook notice) and the greeting
+# (next-launch summary). Machine-scoped so worktree saves surface everywhere.
+LEDGER="${EGREGORE_AUTOSAVE_LOG:-$HOME/.egregore/autosave.log}"
+ledger_write() { # pr outcome
+  local n_files
+  n_files=$(git diff origin/develop...HEAD --name-only 2>/dev/null | grep -c . || echo 0)
+  mkdir -p "$(dirname "$LEDGER")" 2>/dev/null || true
+  printf '%s|%s|%s|%s|%s|%s|%s\n' \
+    "$(date -u +%Y-%m-%dT%H:%M:%SZ)" "$KIND" "$REPO_DIR" "$CURRENT_BRANCH" \
+    "$1" "$2" "$n_files" >> "$LEDGER" 2>/dev/null || true
+}
+
 # --- PR: reuse open PR on this branch, or create one --------------------
-command -v gh >/dev/null 2>&1 || exit 0
+command -v gh >/dev/null 2>&1 || { ledger_write "-" "pushed"; exit 0; }
 
 PR_NUMBER=""
 EXISTING=$(gh pr list --head "$CURRENT_BRANCH" --state open --json number,baseRefName --jq '.[0]' 2>/dev/null)
@@ -119,18 +150,27 @@ else
   PR_URL=$(gh pr create \
     --base develop \
     --head "$CURRENT_BRANCH" \
-    --title "Handoff: ${TOPIC}" \
-    --body "Auto-created by /handoff. Session work for: ${TOPIC}" \
+    --title "${MSG_PREFIX}: ${TOPIC}" \
+    --body "${PR_BODY} ${TOPIC}" \
     2>/dev/null || echo "")
   PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$' || echo "")
 fi
 
-[ -n "$PR_NUMBER" ] || exit 0
-
-# --- Auto-merge iff markdown-only ---------------------------------------
-NON_MD=$(git diff origin/develop --name-only 2>/dev/null | grep -v '\.md$' | head -1 || echo "")
-if [ -z "$NON_MD" ]; then
-  gh pr merge "$PR_NUMBER" --auto --merge >/dev/null 2>&1 || true
+[ -n "$PR_NUMBER" ] || { ledger_write "-" "pushed"; exit 0; }
+
+# --- Auto-merge iff non-coding -------------------------------------------
+# `--auto` only works when the repo allows auto-merge AND required checks are
+# pending; on a repo with no branch protection it always errors. Fall back to
+# an immediate merge so non-coding PRs never sit open.
+OUTCOME="open"
+NON_CODE_BLOCKER=$(noncode_blockers origin/develop .)
+if [ -z "$NON_CODE_BLOCKER" ]; then
+  if gh pr merge "$PR_NUMBER" --auto --merge >/dev/null 2>&1 \
+     || gh pr merge "$PR_NUMBER" --merge >/dev/null 2>&1; then
+    OUTCOME="merged"
+  fi
 fi
 
+ledger_write "$PR_NUMBER" "$OUTCOME"
+
 exit 0

package/runtime/pi/bin/index-handoff.sh

@@ -3,7 +3,9 @@ set -euo pipefail
 
 # Index a single handoff file into the Neo4j graph.
 # Usage: bash bin/index-handoff.sh <file-path>
-# Returns: {"sessionId":"...","resolved":N} or {"error":"..."}
+# Returns: {"sessionId":"...","resolved":0} or {"error":"..."}.
+# `resolved` remains for compatibility; lifecycle reconciliation is queued by
+# capture-run.sh after indexing.
 #
 # The file-path should be relative to memory/ (e.g. handoffs/2026-02/14-oz-topic.md)
 # or an absolute/relative path that contains "handoffs/" somewhere in it.
@@ -16,7 +18,7 @@ if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
   echo "Index a single handoff file into the Neo4j graph."
   echo "Parses metadata (author, date, topic, recipients) from"
   echo "markdown headers or YAML front matter, creates Session"
-  echo "and relationship nodes, and auto-resolves old handoffs."
+  echo "and relationship nodes. Lifecycle completion is queued separately."
   echo ""
   echo "Returns: {\"sessionId\":\"...\",\"resolved\":N}"
   exit 0
@@ -135,6 +137,15 @@ PROJECT="$(md_field 'Project')"
 KIND="$(md_field 'Kind')"
 [ -z "$KIND" ] && KIND="$(yaml_extract 'kind')"
 
+# Lifecycle intent determines which automatic transitions are safe.
+INTENT="$(md_field 'Intent')"
+[ -z "$INTENT" ] && INTENT="$(yaml_extract 'intent')"
+INTENT="$(printf '%s' "${INTENT:-unclassified}" | tr '[:upper:]' '[:lower:]')"
+case "$INTENT" in
+  action|feedback|fyi|unclassified) ;;
+  *) INTENT="unclassified" ;;
+esac
+
 # Summary: 5-level precedence chain
 # 1. Frontmatter summary field
 SUMMARY="$(yaml_extract 'summary')"
@@ -180,7 +191,7 @@ if [ -n "$RECIPIENTS_RAW" ]; then
     [ -z "$R" ] && continue
     HANDED_TO_CYPHER="${HANDED_TO_CYPHER}
 WITH s
-OPTIONAL MATCH (r${i}:Person) WHERE toLower(r${i}.name) = \$recipient${i} OR r${i}.github = \$recipient${i} OR toLower(r${i}.fullName) = \$recipient${i}
+OPTIONAL MATCH (r${i}:Person) WHERE toLower(r${i}.name) = \$recipient${i} OR toLower(r${i}.github) = \$recipient${i} OR toLower(r${i}.fullName) = \$recipient${i} OR \$recipient${i} IN [x IN coalesce(r${i}.previousNames, []) | toLower(x)] OR \$recipient${i} IN [x IN coalesce(r${i}.githubAliases, []) | toLower(x)] OR \$recipient${i} IN [x IN coalesce(r${i}.emails, []) | toLower(x)]
 FOREACH (_ IN CASE WHEN r${i} IS NOT NULL THEN [1] ELSE [] END |
   MERGE (s)-[:HANDED_TO]->(r${i})
 )"
@@ -200,10 +211,10 @@ FOREACH (_ IN CASE WHEN proj IS NOT NULL THEN [1] ELSE [] END |
   _PROJECT_ARGS=("--arg" "project" "$PROJECT")
 fi
 
-Q1_CYPHER="MATCH (p:Person) WHERE toLower(p.name) = \$author OR p.github = \$author OR toLower(p.fullName) = \$author OR \$author IN [x IN coalesce(p.previousNames, []) | toLower(x)]
+Q1_CYPHER="MATCH (p:Person) WHERE toLower(p.name) = \$author OR toLower(p.github) = \$author OR toLower(p.fullName) = \$author OR \$author IN [x IN coalesce(p.previousNames, []) | toLower(x)] OR \$author IN [x IN coalesce(p.githubAliases, []) | toLower(x)] OR \$author IN [x IN coalesce(p.emails, []) | toLower(x)]
 MERGE (s:Session {id: \$sessionId})
-ON CREATE SET s.date = date(\$date), s.topic = \$topic, s.summary = \$summary, s.filePath = \$filePath, s.author = \$author, s.handoffKind = CASE WHEN \$kind = '' THEN null ELSE \$kind END, s.handoffStatus = 'pending', s.repoState = \$repoState, s.startedAt = datetime(\$date + 'T00:00:00Z')
-ON MATCH SET s.topic = \$topic, s.summary = \$summary, s.filePath = \$filePath, s.author = \$author, s.handoffKind = CASE WHEN \$kind = '' THEN null ELSE \$kind END, s.repoState = \$repoState
+ON CREATE SET s.date = date(\$date), s.topic = \$topic, s.summary = \$summary, s.filePath = \$filePath, s.author = \$author, s.handoffKind = CASE WHEN \$kind = '' THEN null ELSE \$kind END, s.handoffStatus = 'pending', s.handoffIntent = \$intent, s.handoffLifecycleVersion = 1, s.repoState = \$repoState, s.startedAt = datetime(\$date + 'T00:00:00Z')
+ON MATCH SET s.topic = \$topic, s.summary = \$summary, s.filePath = \$filePath, s.author = \$author, s.handoffKind = CASE WHEN \$kind = '' THEN null ELSE \$kind END, s.handoffIntent = CASE WHEN \$intent = 'unclassified' THEN coalesce(s.handoffIntent, 'unclassified') ELSE \$intent END, s.handoffLifecycleVersion = 1, s.repoState = \$repoState
 WITH s, p
 MERGE (s)-[:BY]->(p)${PROJECT_CYPHER}${HANDED_TO_CYPHER}
 RETURN s.id AS sessionId"
@@ -216,22 +227,20 @@ Q1_PARAMS=$(jq -n \
   --arg summary "$SUMMARY" \
   --arg filePath "$REL_PATH" \
   --arg kind "$KIND" \
+  --arg intent "$INTENT" \
   --arg repoState "$REPO_STATE_JSON" \
   "${_PROJECT_ARGS[@]:+${_PROJECT_ARGS[@]}}" \
   "${_RECIP_ARGS[@]:+${_RECIP_ARGS[@]}}" \
   '$ARGS.named')
 
-# Q2: Auto-resolve old read handoffs from this author
-Q2_CYPHER="MATCH (s:Session)-[:HANDED_TO]->(p:Person) WHERE (toLower(p.name) = \$author OR p.github = \$author OR toLower(p.fullName) = \$author) AND s.handoffStatus = 'read' AND s.id <> \$sessionId
-WITH s, p, coalesce(s.handoffReadDate, s.date) AS sinceDate
-MATCH (later:Session)-[:BY]->(p)
-WHERE later.date > sinceDate
-WITH s, count(later) AS laterSessions WHERE laterSessions > 0
-SET s.handoffStatus = 'done'
-RETURN count(s) AS resolved"
-
-Q2_PARAMS=$(jq -n --arg author "$AUTHOR_HANDLE" --arg sessionId "$SESSION_ID" \
-  '{author: $author, sessionId: $sessionId}')
+# Q2: Preserve the stable three-result batch shape without mutating lifecycle.
+# Completion used to run inside this foreground indexing request. It now enters
+# through capture-run.sh's local WAL queue and is reconciled off the caller's
+# critical path.
+Q2_CYPHER="MATCH (s:Session {id: \$sessionId})
+RETURN 0 AS resolved"
+
+Q2_PARAMS=$(jq -n --arg sessionId "$SESSION_ID" '{sessionId: $sessionId}')
 
 # Q3: Capture the handoff's knowledge-graph neighborhood for artifact rendering.
 # Only the "graph-only" relations — things not already visible in the markdown

package/runtime/pi/bin/ingest-graph.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+set -euo pipefail
+
+# Validate, plan, or apply a durable ingestion manifest to the organization graph.
+# The planner owns the source-to-graph contract; this wrapper owns mode detection,
+# batching, and truthful delivery receipts.
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+SCRIPT_DIR="$ROOT"
+CONFIG="${CONFIG:-$ROOT/egregore.json}"
+PLANNER="${EGREGORE_INGEST_GRAPH_PLANNER:-$ROOT/bin/ingest_graph.py}"
+GRAPH_BATCH="${EGREGORE_INGEST_GRAPH_BATCH:-$ROOT/bin/graph-batch.sh}"
+
+# shellcheck source=bin/lib/config.sh
+source "$ROOT/bin/lib/config.sh"
+
+usage() {
+  echo "usage: bash bin/ingest-graph.sh {validate|plan|apply} MANIFEST" >&2
+  exit 2
+}
+
+mode="${1:-}"
+manifest="${2:-}"
+[ -n "$mode" ] && [ -n "$manifest" ] || usage
+
+case "$mode" in
+  validate|plan)
+    exec python3 "$PLANNER" "$mode" "$manifest"
+    ;;
+  apply) ;;
+  *) usage ;;
+esac
+
+plan="$(python3 "$PLANNER" plan "$manifest")"
+manifest_id="$(printf '%s' "$plan" | jq -r '.manifest_id')"
+query_count="$(printf '%s' "$plan" | jq -r '.query_count')"
+
+if [ "$(_detect_mode)" = "local" ]; then
+  jq -cn \
+    --arg manifest_id "$manifest_id" \
+    --argjson queries "$query_count" \
+    '{status:"stored",graph:"unavailable-in-local-mode",manifest_id:$manifest_id,queries:$queries,batches:0,failed:0,replayable:true}'
+  exit 0
+fi
+
+total=0
+succeeded=0
+failed=0
+while IFS= read -r batch; do
+  [ -n "$batch" ] || continue
+  total=$((total + 1))
+  expected="$(printf '%s' "$batch" | jq 'length')"
+  if response="$(bash "$GRAPH_BATCH" "$batch" 2>/dev/null)" \
+    && actual="$(printf '%s' "$response" | jq -er '.results | length' 2>/dev/null)" \
+    && [ "$actual" -eq "$expected" ]; then
+    succeeded=$((succeeded + 1))
+  else
+    failed=$((failed + 1))
+  fi
+done < <(
+  printf '%s' "$plan" |
+    jq -c '.queries | map({statement, parameters}) as $all | range(0; length; 20) as $i | $all[$i:$i+20]'
+)
+
+if [ "$failed" -gt 0 ]; then
+  jq -cn \
+    --arg manifest_id "$manifest_id" \
+    --argjson queries "$query_count" \
+    --argjson batches "$total" \
+    --argjson succeeded "$succeeded" \
+    --argjson failed "$failed" \
+    '{status:"partial",manifest_id:$manifest_id,queries:$queries,batches:$batches,succeeded:$succeeded,failed:$failed,replayable:true}'
+  exit 1
+fi
+
+jq -cn \
+  --arg manifest_id "$manifest_id" \
+  --argjson queries "$query_count" \
+  --argjson batches "$total" \
+  '{status:"projected",manifest_id:$manifest_id,queries:$queries,batches:$batches,failed:0,replayable:true}'