create-egregore 0.19.8 → 0.19.11

package/runtime/pi/bin/lib/greeting.sh

@@ -14,7 +14,7 @@
 #   - First session welcome
 #
 # Inputs:  SCRIPT_DIR, STATE_FILE, CONFIG, CTX_DIR, BRANCH, COMMITS_AHEAD,
-#          AUTHOR, LOCAL_MODE, MEMORY_SYNCED, REPOS_STATUS, SAVED_BRANCH,
+#          AUTHOR, LOCAL_MODE, MEMORY_SYNCED, SAVED_BRANCH,
 #          HEALTH_*, FRAMEWORK_VERSION, TIME_OF_DAY, EGREGORE_SESSION_ID,
 #          FIRST_SESSION, DISPLAY_NAME_STATE, DASHBOARD_URL
 
@@ -67,7 +67,8 @@ echo "$SEPARATOR"
 source "$SCRIPT_DIR/bin/lib/metrics.sh"
 _render_momentum_board
 
-# Pending questions addressed to you (one summary line — /answer to engage)
+# Pending questions and handoffs addressed to you. These are lightweight
+# discovery beats; management stays in /answer and /activity.
 PENDING_Q=$(cat "$CTX_DIR/pending_questions" 2>/dev/null || echo "[]")
 PENDING_Q_COUNT=$(echo "$PENDING_Q" | jq 'length' 2>/dev/null || echo "0")
 if [ "$PENDING_Q_COUNT" -gt 0 ] 2>/dev/null && [ "$PENDING_Q_COUNT" != "0" ]; then
@@ -83,6 +84,11 @@ if [ "$PENDING_Q_COUNT" -gt 0 ] 2>/dev/null && [ "$PENDING_Q_COUNT" != "0" ]; th
     printf "  ◐ %s pending %s — /answer to engage\n" "$PENDING_Q_COUNT" "$PQ_NOUN"
   fi
 fi
+ADDRESSED_RICH=$(cat "$CTX_DIR/addressed_rich" 2>/dev/null || echo "[]")
+ADDRESSED_COUNT=$(echo "$ADDRESSED_RICH" | jq 'length' 2>/dev/null || echo "0")
+if [ "$ADDRESSED_COUNT" -gt 0 ] 2>/dev/null; then
+  printf "  ◇ %s handoffs for you — say \"show my handoffs\" to review or close\n" "$ADDRESSED_COUNT"
+fi
 
 # Show auto-save notice if work was committed from a previous branch
 if [ -n "$SAVED_BRANCH" ]; then
@@ -114,14 +120,6 @@ if [ "$LOCAL_MODE" = "true" ]; then
     else
       printf "  ✓ ready\n"
     fi
-
-    # Managed repos on separate line
-    if [ -n "$REPOS_STATUS" ]; then
-      REPOS_COMPACT=$(printf '%s' "$REPOS_STATUS" | sed 's/^  ◇ //;s/^[[:space:]]*//' | paste -sd'  ' - | sed 's/[[:space:]]*$//')
-      if [ -n "$REPOS_COMPACT" ]; then
-        printf "  %s\n" "$REPOS_COMPACT"
-      fi
-    fi
   fi
 else
   # Connected mode: check all services
@@ -151,30 +149,167 @@ else
     F_PAD=$((LINE_WIDTH - FL_LEN - FR_LEN))
     if [ "$F_PAD" -lt 1 ]; then F_PAD=1; fi
     printf "%s%*s%s\n" "$FOOTER_LEFT" "$F_PAD" "" "$FOOTER_RIGHT"
+  fi
+fi
 
-    # Managed repos on separate line (avoids line overflow)
-    if [ -n "$REPOS_STATUS" ]; then
-      REPOS_COMPACT=$(printf '%s' "$REPOS_STATUS" | sed 's/^  ◇ //;s/^[[:space:]]*//' | paste -sd'  ' - | sed 's/[[:space:]]*$//')
-      if [ -n "$REPOS_COMPACT" ]; then
-        printf "  %s\n" "$REPOS_COMPACT"
-      fi
+# Autosave trail — background saves (Stop-hook, sweep, SessionEnd) since the
+# last greeting. The ledger is machine-scoped; this is where sweep rescues of
+# abandoned sessions become visible to the user.
+AUTOSAVE_LOG="${EGREGORE_AUTOSAVE_LOG:-$HOME/.egregore/autosave.log}"
+AUTOSAVE_SEEN="${AUTOSAVE_LOG}.seen"
+if [ -f "$AUTOSAVE_LOG" ]; then
+  TOTAL_AS=$(grep -c '|autosave|' "$AUTOSAVE_LOG" 2>/dev/null || echo 0)
+  SEEN_AS=$(cat "$AUTOSAVE_SEEN" 2>/dev/null || echo 0)
+  case "$SEEN_AS" in ''|*[!0-9]*) SEEN_AS=0 ;; esac
+  if [ "$TOTAL_AS" -gt "$SEEN_AS" ]; then
+    NEW_AS=$((TOTAL_AS - SEEN_AS))
+    MERGED_AS=$(grep '|autosave|' "$AUTOSAVE_LOG" 2>/dev/null | tail -n "$NEW_AS" | grep -c '|merged|' || echo 0)
+    if [ "$MERGED_AS" -ge "$NEW_AS" ]; then
+      printf "  ⟲ auto-saved %s non-coding save(s) → develop while you were away\n" "$NEW_AS"
+    else
+      printf "  ⟲ auto-saved %s non-coding save(s) — %s merged, rest in open PRs\n" "$NEW_AS" "$MERGED_AS"
     fi
   fi
+  printf '%s' "$TOTAL_AS" > "$AUTOSAVE_SEEN" 2>/dev/null || true
 fi
 
-# Dashboard link (OSC 8 hyperlink — clickable text in supported terminals)
-if [ -n "${DASHBOARD_URL:-}" ]; then
-  printf "  ◆ %s\n" "$DASHBOARD_URL"
-fi
+# Greeting links. Org config `pinned_links` in egregore.json replaces the
+# default dashboard + board links. Entries are strings or {url, label}.
+# (OSC 8 hyperlink — clickable text in supported terminals)
+PINNED_LINKS=$(jq -c '.pinned_links // []' "$SCRIPT_DIR/egregore.json" 2>/dev/null || echo "[]")
+if [ "$(printf '%s' "$PINNED_LINKS" | jq 'length' 2>/dev/null || echo 0)" -gt 0 ]; then
+  printf '%s' "$PINNED_LINKS" | jq -r '.[] |
+    if type == "string" then "  ◆ \(.)"
+    elif (.label // "") != "" then "  ◆ \(.label): \(.url)"
+    else "  ◆ \(.url)" end' 2>/dev/null
+else
+  if [ -n "${DASHBOARD_URL:-}" ]; then
+    printf "  ◆ %s\n" "$DASHBOARD_URL"
+  fi
 
-if [ -n "${BOARD_URL:-}" ]; then
-  printf "  ◆ %s (board)\n" "$BOARD_URL"
+  if [ -n "${BOARD_URL:-}" ]; then
+    printf "  ◆ %s (board)\n" "$BOARD_URL"
+  fi
 fi
 
 if [ -n "${LOOM_DOCTOR_BRIEF:-}" ]; then
   printf "  %s\n" "$LOOM_DOCTOR_BRIEF"
 fi
 
+# --- Creator review gate: pending turns on owned scrolls/surfaces ---
+# This is deliberately filesystem-only and fail-soft. The two environment seams
+# make the scan safe to exercise without touching the instance memory repo.
+_print_pending_scroll_turns() {
+  local memory_root="${EGREGORE_MEMORY_ROOT:-$SCRIPT_DIR/memory}"
+  local person="${EGREGORE_PERSON:-${AUTHOR:-}}"
+  local rows="" file slug owner count surface_file
+
+  if [ -z "$person" ] && [ -f "${STATE_FILE:-}" ]; then
+    person=$(jq -r '.github_username // .display_name // .name // empty' "$STATE_FILE" 2>/dev/null || true)
+  fi
+  [ -n "$person" ] || return 0
+  [ -d "$memory_root" ] || return 0
+
+  for file in "$memory_root"/scrolls/.events/*.jsonl; do
+    [ -f "$file" ] || continue
+    slug=$(basename "$file" .jsonl)
+    [[ "$slug" =~ ^[A-Za-z0-9._-]+$ ]] || continue
+    safe_slug=$(printf '%s' "$slug" | tr -d '\000-\037\177')
+    [ "$safe_slug" = "$slug" ] || continue
+    owner=$(sed -nE 's/^[[:space:]-]*(\*\*)?creator(\*\*)?[[:space:]]*:[[:space:]]*//p' "$memory_root/scrolls/$slug.md" 2>/dev/null | head -1 | sed 's/[[:space:]]*$//')
+    [ "$owner" = "$person" ] || continue
+    count=$(jq -s -r '
+      def event_id:
+        if (.turn | type) == "object" then .turn.id
+        elif (.turn | type) == "string" then .turn
+        else .id end;
+      def received($events):
+        [$events[] | select(.type == "turn-received")
+          | {id: event_id, answers: (.turn.answers // .answers // [])}
+          | select(.id != null)] | unique_by(.id);
+      def review_id: event_id;
+      def is_absorbed($events; $id):
+        any($events[]; .type == "version-published" and ((.absorbs // .version.absorbs // .record.absorbs // []) | index($id) != null));
+      def is_applied($events; $id):
+        any($events[]; .type == "turn-applied" and (event_id == $id));
+      def is_declined($events; $received; $id):
+        ([$received[] | select(.id == $id)] | .[0]) as $turn |
+        ([$events[] | select(.type == "turn-reviewed" and review_id == $id)] | .[0]) as $review |
+        if $review == null then false
+        else if (($turn.answers // []) | length) == 0 then $review.disposition == "declined"
+        else (($turn.answers // [])
+          | map(($review.answers // {})[.fork] // $review.disposition)
+          | map(select(. == "accepted")) | length) == 0
+        end
+        end;
+      . as $events
+      | ($events | received($events)) as $received
+      | [$received[] as $turn
+          | select((is_absorbed($events; $turn.id) | not))
+          | select((is_declined($events; $received; $turn.id) | not))
+          | select(if $mode == "scroll" then true else (is_applied($events; $turn.id) | not) end)]
+      | length
+    ' --arg mode scroll "$file" 2>/dev/null) || continue
+    [[ "$count" =~ ^[0-9]+$ ]] || return 0
+    [ "$count" -gt 0 ] && rows+="${safe_slug}"$'\t'"${count}"$'\n'
+  done
+
+  for file in "$memory_root"/harvests/.events/*.jsonl; do
+    [ -f "$file" ] || continue
+    slug=$(basename "$file" .jsonl)
+    [[ "$slug" =~ ^[A-Za-z0-9._-]+$ ]] || continue
+    safe_slug=$(printf '%s' "$slug" | tr -d '\000-\037\177')
+    [ "$safe_slug" = "$slug" ] || continue
+    surface_file="$memory_root/harvests/$slug.json"
+    [ -f "$surface_file" ] || continue
+    owner=$(jq -r '.author // empty' "$surface_file" 2>/dev/null) || continue
+    [ "$owner" = "$person" ] || continue
+    count=$(jq -s -r '
+      def event_id:
+        if (.turn | type) == "object" then .turn.id
+        elif (.turn | type) == "string" then .turn
+        else .id end;
+      def received($events):
+        [$events[] | select(.type == "turn-received")
+          | {id: event_id, answers: (.turn.answers // .answers // [])}
+          | select(.id != null)] | unique_by(.id);
+      def review_id: event_id;
+      def is_absorbed($events; $id): false;
+      def is_applied($events; $id):
+        any($events[]; .type == "turn-applied" and (event_id == $id));
+      def is_declined($events; $received; $id):
+        ([$received[] | select(.id == $id)] | .[0]) as $turn |
+        ([$events[] | select(.type == "turn-reviewed" and review_id == $id)] | .[0]) as $review |
+        if $review == null then false
+        else if (($turn.answers // []) | length) == 0 then $review.disposition == "declined"
+        else (($turn.answers // [])
+          | map(($review.answers // {})[.fork] // $review.disposition)
+          | map(select(. == "accepted")) | length) == 0
+        end
+        end;
+      . as $events
+      | ($events | received($events)) as $received
+      | [$received[] as $turn
+          | select((is_applied($events; $turn.id) | not))
+          | select((is_declined($events; $received; $turn.id) | not))]
+      | length
+    ' --arg mode harvest "$file" 2>/dev/null) || continue
+    [[ "$count" =~ ^[0-9]+$ ]] || return 0
+    [ "$count" -gt 0 ] && rows+="${safe_slug}"$'\t'"${count}"$'\n'
+  done
+
+  [ -n "$rows" ] || return 0
+  local summary total details
+  summary=$(printf '%s' "$rows" | awk -F '\t' 'NF == 2 { totals[$1] += $2 } END { for (slug in totals) print slug "\t" totals[slug] }' | sort -t $'\t' -k1,1) || return 0
+  [ -n "$summary" ] || return 0
+  total=$(printf '%s\n' "$summary" | awk -F '\t' '{ total += $2 } END { print total + 0 }') || return 0
+  details=$(printf '%s\n' "$summary" | awk -F '\t' '{printf "%s%s (%s)", (NR == 1 ? "" : ", "), $1, $2}') || return 0
+  [ -n "$details" ] || return 0
+  printf "  ⧖ %s pending turn(s) on your scrolls: %s\n" "$total" "$details"
+}
+
+_print_pending_scroll_turns
+
 # Framework updates come through PRs to develop — no separate auto-update channel.
 # The develop sync above already keeps framework files current.
 # Use /update for manual upstream pulls when needed.

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

@@ -41,8 +41,16 @@ else
     if [ -n "$GH_TOKEN" ]; then
       GH_USER_JSON=$(curl -s -H "Authorization: token $GH_TOKEN" https://api.github.com/user --max-time 5 2>/dev/null || echo "")
       GH_LOGIN=$(echo "$GH_USER_JSON" | jq -r '.login // empty' 2>/dev/null)
+      GH_ID=$(echo "$GH_USER_JSON" | jq -r '.id // empty' 2>/dev/null)
       GH_NAME=$(echo "$GH_USER_JSON" | jq -r '.name // empty' 2>/dev/null)
+      GH_EMAIL=$(echo "$GH_USER_JSON" | jq -r '.email // empty' 2>/dev/null)
       if [ -n "$GH_LOGIN" ]; then
+        GH_ID_JSON="null"
+        GH_PERSON_ID="github-login:$(echo "$GH_LOGIN" | tr '[:upper:]' '[:lower:]')"
+        if [[ "$GH_ID" =~ ^[0-9]+$ ]]; then
+          GH_ID_JSON="$GH_ID"
+          GH_PERSON_ID="github:$GH_ID"
+        fi
         AUTHOR="$GH_LOGIN"
         HEALTH_GITHUB="ok"
         # Set repo-local config and save to state for next time
@@ -63,11 +71,19 @@ else
           if [ "$HAS_ONBOARDING" = "unset" ]; then
             # State file exists but no onboarding flag — set to false to trigger it
             jq --arg u "$GH_LOGIN" --arg n "${GH_NAME:-$GH_LOGIN}" --arg ut "$USAGE_TYPE" \
-              '.github_username = $u | .github_name = $n | .name = $n | .onboarding_complete = false | .usage_type = $ut' "$STATE_FILE" > "$STATE_FILE.tmp" \
+              --argjson gid "$GH_ID_JSON" --arg pid "$GH_PERSON_ID" --arg email "$GH_EMAIL" \
+              '.github_username = $u | .github_id = $gid | .person_id = $pid |
+               .github_name = $n | .name = $n |
+               (if $email != "" then .email = ($email | ascii_downcase) else . end) |
+               .onboarding_complete = false | .usage_type = $ut' "$STATE_FILE" > "$STATE_FILE.tmp" \
               && mv "$STATE_FILE.tmp" "$STATE_FILE"
           else
             jq --arg u "$GH_LOGIN" --arg n "${GH_NAME:-$GH_LOGIN}" --arg ut "$USAGE_TYPE" \
-              '.github_username = $u | .github_name = $n | .name = $n | .usage_type = $ut' "$STATE_FILE" > "$STATE_FILE.tmp" \
+              --argjson gid "$GH_ID_JSON" --arg pid "$GH_PERSON_ID" --arg email "$GH_EMAIL" \
+              '.github_username = $u | .github_id = $gid | .person_id = $pid |
+               .github_name = $n | .name = $n |
+               (if $email != "" then .email = ($email | ascii_downcase) else . end) |
+               .usage_type = $ut' "$STATE_FILE" > "$STATE_FILE.tmp" \
               && mv "$STATE_FILE.tmp" "$STATE_FILE"
           fi
           FIRST_SESSION="false"
@@ -77,39 +93,44 @@ else
           GRAPH_PERSON=""
           GRAPH_DISPLAY_NAME=""
           GRAPH_PERSON=$(bash "$SCRIPT_DIR/bin/graph.sh" query \
-            "MATCH (p:Person {github: \$github}) RETURN p.name AS name" \
-            "$(jq -n --arg github "$GH_LOGIN" '{github: $github}')" 2>/dev/null || echo "")
+            "MATCH (p:Person)
+             WHERE NOT coalesce(p.kind, '') IN ['external', 'identity_alias']
+               AND coalesce(p.status, 'active') = 'active'
+               AND p.ingestRef IS NULL
+               AND (p.github = \$github
+                 OR (\$githubId <> '' AND coalesce(toString(p.githubId), '') = \$githubId)
+                 OR toLower(\$github) IN [alias IN coalesce(p.githubAliases, []) | toLower(alias)])
+             RETURN p.name AS name" \
+            "$(jq -n --arg github "$GH_LOGIN" --arg githubId "$GH_ID" \
+              '{github: $github, githubId: $githubId}')" 2>/dev/null || echo "")
           if echo "$GRAPH_PERSON" | jq -e '.values | length > 0' &>/dev/null; then
             GRAPH_DISPLAY_NAME=$(echo "$GRAPH_PERSON" | jq -r '.values[0][0] // empty' 2>/dev/null)
             # Existing team member — skip onboarding
-            cat > "$STATE_FILE" << STATEEOF
-{
-  "github_username": "$GH_LOGIN",
-  "github_name": "${GH_NAME:-$GH_LOGIN}",
-  "name": "${GRAPH_DISPLAY_NAME:-${GH_NAME:-$GH_LOGIN}}",
-  "display_name": "${GRAPH_DISPLAY_NAME:-}",
-  "onboarding_complete": true,
-  "usage_type": "$USAGE_TYPE",
-  "session_tracking": true,
-  "transcript_sharing": true,
-  "telemetry": true,
-  "contact_preference": "all",
-  "telemetry_noticed": true
-}
-STATEEOF
+            jq -n --arg github "$GH_LOGIN" --argjson githubId "$GH_ID_JSON" \
+              --arg personId "$GH_PERSON_ID" --arg githubName "${GH_NAME:-$GH_LOGIN}" \
+              --arg name "${GRAPH_DISPLAY_NAME:-${GH_NAME:-$GH_LOGIN}}" \
+              --arg displayName "${GRAPH_DISPLAY_NAME:-}" --arg email "$GH_EMAIL" \
+              --arg usageType "$USAGE_TYPE" \
+              '{
+                github_username: $github, github_id: $githubId, person_id: $personId,
+                github_name: $githubName, name: $name, display_name: $displayName,
+                email: (if $email == "" then null else ($email | ascii_downcase) end),
+                onboarding_complete: true, usage_type: $usageType,
+                session_tracking: true, transcript_sharing: true, telemetry: true,
+                contact_preference: "all", telemetry_noticed: true
+              }' > "$STATE_FILE"
             FIRST_SESSION="false"
           else
             # Genuinely new user — trigger onboarding
-            cat > "$STATE_FILE" << STATEEOF
-{
-  "github_username": "$GH_LOGIN",
-  "github_name": "${GH_NAME:-$GH_LOGIN}",
-  "name": "${GH_NAME:-$GH_LOGIN}",
-  "onboarding_complete": false,
-  "usage_type": "$USAGE_TYPE",
-  "first_session": true
-}
-STATEEOF
+            jq -n --arg github "$GH_LOGIN" --argjson githubId "$GH_ID_JSON" \
+              --arg personId "$GH_PERSON_ID" --arg githubName "${GH_NAME:-$GH_LOGIN}" \
+              --arg email "$GH_EMAIL" --arg usageType "$USAGE_TYPE" \
+              '{
+                github_username: $github, github_id: $githubId, person_id: $personId,
+                github_name: $githubName, name: $githubName,
+                email: (if $email == "" then null else ($email | ascii_downcase) end),
+                onboarding_complete: false, usage_type: $usageType, first_session: true
+              }' > "$STATE_FILE"
             FIRST_SESSION="true"
           fi
         fi

package/runtime/pi/bin/lib/noncode.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# noncode.sh — shared "non-coding change" classifier for auto-merge decisions.
+#
+# The org rule: non-coding PRs auto-merge to develop; code goes to review.
+# Non-coding means:
+#   - any .md file, anywhere
+#   - anything under content directories (artifacts/, docs/, .threads/) —
+#     html/css/images/design bundles there are authored content, not shipped code
+#   - session-state droppings (.egregore-worktree-tty)
+# Everything else — bin/, api/, packages/, .claude/, site 2/, root config — is
+# code and stays open for review.
+#
+# Sourced by handoff-save-egregore.sh, session-autosave.sh, agent.sh, and the
+# /save skill. Keep the policy HERE — call sites must not grow their own.
+
+# noncode_filter — reads paths on stdin, prints the first code-bearing path.
+# Empty output = everything is non-coding.
+noncode_filter() {
+  grep -Ev '\.md$' \
+    | grep -Ev '^(artifacts|docs|\.threads)/' \
+    | grep -Ev '^\.egregore-worktree-tty$' \
+    | head -1 || true
+}
+
+# noncode_blockers [base-ref] [repo-dir] — first code-bearing path committed
+# on HEAD relative to base (three-dot: only our side of the diff).
+# Empty output = the branch is non-coding and safe to auto-merge.
+noncode_blockers() {
+  local base="${1:-origin/develop}" dir="${2:-.}"
+  git -C "$dir" diff "$base...HEAD" --name-only 2>/dev/null | noncode_filter
+}