create-egregore 0.20.2 → 0.21.0-runtime-mvp.2

package/runtime/codex/bin/settings.sh

@@ -232,8 +232,26 @@ _people_dir() { echo "$SCRIPT_DIR/memory/people"; }
 _people_names() {
   local pdir; pdir="$(_people_dir)"
   [ -d "$pdir" ] || return 0
-  ls "$pdir"/*.md 2>/dev/null | while IFS= read -r f; do basename "$f" .md; done \
-    | grep -viE '^(index|readme)$' || true
+  # Removals are durable: sessions and syncs can resurrect person FILES
+  # (observed: deleted members reappearing via session auto-saves), so the
+  # committed removal ledger in egregore.json, not file presence, decides
+  # who is listed. `people add` clears the tombstone.
+  local removed; removed="$(jq -r '(.people_removed // [])[] | ascii_downcase' "$CONFIG" 2>/dev/null | sort -u)"
+  ls "$pdir"/*.md 2>/dev/null | while IFS= read -r f; do
+      # Alias witness files (Alias-Of: other.md) are presentation metadata
+      # for an existing member, not members themselves — one person, one row.
+      if head -8 "$f" 2>/dev/null | grep -q '^Alias-Of:[[:space:]]*[^[:space:]]'; then
+        continue
+      fi
+      basename "$f" .md
+    done \
+    | grep -viE '^(index|readme)$' \
+    | while IFS= read -r name; do
+        if [ -n "$removed" ] && printf '%s\n' "$removed" | grep -qxF "$(printf '%s' "$name" | tr '[:upper:]' '[:lower:]')"; then
+          continue
+        fi
+        printf '%s\n' "$name"
+      done || true
 }
 
 _people_json() {
@@ -299,6 +317,7 @@ cmd_people() {
     add)
       local h="${1:-}"
       _valid_token "$h" || _die "usage: settings.sh people add <github-handle>" 1
+      _save '.people_removed = ((.people_removed // []) | map(select(ascii_downcase != ($h | ascii_downcase)))) | if .people_removed == [] then del(.people_removed) else . end' --arg h "$h"
       if _has_person "$h"; then echo "'$h' is already in people"; return 0; fi
       _people_github "$h" "add"
       _people_file "$h" "add"
@@ -307,10 +326,14 @@ cmd_people() {
     remove)
       local h="${1:-}"
       _valid_token "$h" || _die "usage: settings.sh people remove <github-handle>" 1
-      if ! _has_person "$h"; then echo "'$h' is not in people"; return 0; fi
+      # Tombstone first: the removal ledger in committed org config keeps a
+      # removal durable even when a person file is later resurrected by a
+      # session write or sync.
+      _save '.people_removed = ((.people_removed // []) + [$h] | map(ascii_downcase) | unique)' --arg h "$h"
+      if ! _has_person "$h"; then echo "'$h' is not in people (removal recorded)"; return 0; fi
       _people_github "$h" "remove"
       _people_file "$h" "remove"
-      echo "removed '$h' (repo access + person file)"
+      echo "removed '$h' (repo access + person file + durable removal record)"
       [ -n "$(jq -r '.api_url // empty' "$CONFIG" 2>/dev/null)" ] && echo "  connected org: for full deprovision (Supabase/Neo4j), run /delete-user $h" ;;
     *) _die "usage: settings.sh people list|add|remove" 1 ;;
   esac
@@ -349,6 +372,150 @@ for _a in "$@"; do
 done
 set -- "${_args[@]+"${_args[@]}"}"
 
+# ── privacy & access (read snapshot) ─────────────────────────────────────
+# One composed JSON for the Settings Privacy & access panel. Identity,
+# membership, and capability values come from the Runtime authorization
+# backend (access-status); this shell layer adds only committed boundary
+# config, the personal boundary-local file, isolation state, and honest
+# constant statements. Never includes secrets, tokens, or internal paths.
+
+_md5() { if command -v md5 >/dev/null 2>&1; then md5 -q -s "$1" 2>/dev/null || printf '%s' "$1" | md5; else printf '%s' "$1" | md5sum | cut -d' ' -f1; fi; }
+
+_graph_retrieval_state() {
+  # Mirrors bin/search.sh: activation record keyed sha256(org_id|main)[:16].
+  local org main gitdir key record
+  org=$(jq -r '.org_id // empty' "$CONFIG" 2>/dev/null)
+  [ -n "$org" ] || { echo "unknown"; return; }
+  main="$SCRIPT_DIR"
+  if [ -f "$SCRIPT_DIR/.git" ]; then
+    gitdir=$(sed -n 's/^gitdir: //p' "$SCRIPT_DIR/.git" 2>/dev/null)
+    case "$gitdir" in */.git/worktrees/*) main="${gitdir%/.git/worktrees/*}" ;; esac
+  fi
+  main=$(cd "$main" 2>/dev/null && pwd -P) || { echo "unknown"; return; }
+  key=$(printf '%s|%s' "$org" "$main" | shasum -a 256 2>/dev/null | cut -c1-16)
+  record="${EGREGORE_UPGRADE_ROOT:-$HOME/.egregore/runtime/upgrade}/${key}/active.json"
+  if [ -f "$record" ] && [ "$(jq -r '.retrieval // empty' "$record" 2>/dev/null)" = "runtime-qmd" ]; then
+    echo "not-used-by-this-runtime"
+  else
+    echo "legacy"
+  fi
+}
+
+cmd_privacy() {
+  local access posture locked org_reads personal_reads denied digest graph
+  access=$(cd "$SCRIPT_DIR" && EGREGORE_ROOT="$SCRIPT_DIR" \
+    PYTHONPATH="$SCRIPT_DIR${PYTHONPATH:+:$PYTHONPATH}" \
+    python3 -m egregore_runtime.harness_cli access-status 2>/dev/null) || true
+  printf '%s' "$access" | jq -e . >/dev/null 2>&1 || access='{"status":"attention"}'
+  posture=$(jq -r '.boundary.posture // "standard"' "$CONFIG" 2>/dev/null || echo standard)
+  locked=$(jq -r 'if (.boundary.locked // false) == true then "true" else "false" end' "$CONFIG" 2>/dev/null || echo false)
+  org_reads=$(jq -c '.boundary.read // []' "$CONFIG" 2>/dev/null || echo '[]')
+  personal_reads=$(jq -c '.read // []' "$SCRIPT_DIR/.egregore-boundary.local.json" 2>/dev/null || echo '[]')
+  digest=$(_md5 "$SCRIPT_DIR")
+  denied=$(jq -r '.denied_paths | length' "/tmp/egregore-boundary-${digest}.json" 2>/dev/null || echo 0)
+  graph=$(_graph_retrieval_state)
+  jq -n \
+    --argjson access "$access" \
+    --arg posture "$posture" \
+    --argjson locked "$locked" \
+    --argjson org_reads "$org_reads" \
+    --argjson personal_reads "$personal_reads" \
+    --argjson denied "${denied:-0}" \
+    --arg graph "$graph" \
+    '{
+      access: $access,
+      boundary: {
+        posture: $posture,
+        locked: $locked,
+        org_read_roots: $org_reads,
+        personal_read_roots: $personal_reads
+      },
+      isolation: { foreign_instances_denied: $denied },
+      graph_retrieval: $graph,
+      content_protection: {
+        admin_marked: "hidden on Egregore surfaces from non-admin members",
+        external_publication: "admin-marked content blocked unless an authorized admin separately confirms",
+        raw_repository_access: "organization-wide",
+        per_document_filesystem_acl: "not enabled"
+      }
+    }'
+}
+
+# ── personal boundary read roots ─────────────────────────────────────────
+# Personal-only: edits .egregore-boundary.local.json for the current member.
+# Respects org `locked: true` (no personal expansion), and never accepts a
+# path inside another Egregore instance — the hard tier has no consent path.
+
+LOCAL_BOUNDARY="$SCRIPT_DIR/.egregore-boundary.local.json"
+
+_boundary_locked() {
+  [ "$(jq -r '.boundary.locked // false' "$CONFIG" 2>/dev/null)" = "true" ]
+}
+
+_inside_foreign_instance() {
+  local target="$1" registry="$HOME/.egregore/instances.json" p self
+  [ -f "$registry" ] || return 1
+  self=$(cd "$SCRIPT_DIR" 2>/dev/null && pwd -P)
+  while IFS= read -r p; do
+    [ -n "$p" ] || continue
+    p=$(cd "$p" 2>/dev/null && pwd -P) || continue
+    [ "$p" = "$self" ] && continue
+    case "$target" in "$p"|"$p"/*) return 0 ;; esac
+  done < <(jq -r '.[].path // empty' "$registry" 2>/dev/null)
+  return 1
+}
+
+cmd_boundary() {
+  local action="${1:-list}" raw target current
+  case "$action" in
+    list)
+      current=$(jq -c '.read // []' "$LOCAL_BOUNDARY" 2>/dev/null || echo '[]')
+      if [ "$JSON" -eq 1 ]; then
+        jq -n --argjson read "$current" --argjson locked "$(_boundary_locked && echo true || echo false)" \
+          '{personal_read_roots: $read, locked: $locked}'
+      else
+        echo "personal read roots:"
+        printf '%s\n' "$current" | jq -r '.[] // empty' | sed 's/^/  /'
+        _boundary_locked && echo "(organization boundary policy is locked — personal changes disabled)"
+      fi
+      ;;
+    add|remove)
+      raw="${2:-}"
+      [ -n "$raw" ] || _die "usage: settings.sh boundary $action <directory>" 1
+      if _boundary_locked; then
+        _die "boundary policy is managed by your organization and locked; personal read roots cannot change" 1
+      fi
+      case "$raw" in "~"*) target="$HOME${raw#\~}" ;; *) target="$raw" ;; esac
+      target=$(cd "$target" 2>/dev/null && pwd -P) || {
+        [ "$action" = "remove" ] && target="$raw" || _die "directory not found: $raw" 1
+      }
+      if [ "$action" = "add" ]; then
+        if _inside_foreign_instance "$target"; then
+          _die "that directory belongs to another Egregore instance; it can never be a personal read root" 1
+        fi
+        [ -f "$LOCAL_BOUNDARY" ] || printf '{}\n' > "$LOCAL_BOUNDARY"
+        tmp="$(mktemp "$LOCAL_BOUNDARY.XXXXXX")"
+        if jq --arg p "$target" '.read = ((.read // []) + [$p] | unique)' "$LOCAL_BOUNDARY" > "$tmp" 2>/dev/null && [ -s "$tmp" ]; then
+          mv "$tmp" "$LOCAL_BOUNDARY"
+          echo "added personal read root: $target (applies from the next session start)"
+        else
+          rm -f "$tmp"; _die "failed to update $LOCAL_BOUNDARY" 1
+        fi
+      else
+        [ -f "$LOCAL_BOUNDARY" ] || { echo "removed personal read root: $raw (was not present)"; return 0; }
+        tmp="$(mktemp "$LOCAL_BOUNDARY.XXXXXX")"
+        if jq --arg p "$target" --arg raw "$raw" '.read = ((.read // []) | map(select(. != $p and . != $raw)))' "$LOCAL_BOUNDARY" > "$tmp" 2>/dev/null && [ -s "$tmp" ]; then
+          mv "$tmp" "$LOCAL_BOUNDARY"
+          echo "removed personal read root: $target"
+        else
+          rm -f "$tmp"; _die "failed to update $LOCAL_BOUNDARY" 1
+        fi
+      fi
+      ;;
+    *) _die "usage: settings.sh boundary list|add <dir>|remove <dir>" 1 ;;
+  esac
+}
+
 DOMAIN="${1:-}"; shift || true
 case "$DOMAIN" in
   hosting) cmd_hosting "$@" ;;
@@ -357,7 +524,9 @@ case "$DOMAIN" in
   repo)    cmd_repo "$@" ;;
   admin)   cmd_admin "$@" ;;
   people)  cmd_people "$@" ;;
+  privacy) cmd_privacy ;;
+  boundary) cmd_boundary "$@" ;;
   dump)    cmd_dump ;;
   ""|-h|--help|help) usage 0 ;;
-  *) _die "unknown settings domain: '$DOMAIN' (try: hosting, relay, workflow, repo, admin, people, dump)" 1 ;;
+  *) _die "unknown settings domain: '$DOMAIN' (try: hosting, relay, workflow, repo, admin, people, privacy, boundary, dump)" 1 ;;
 esac

package/runtime/codex/bin/startup-check.sh

@@ -0,0 +1,136 @@
+#!/usr/bin/env bash
+# startup-check.sh — Validate local config and phone home health status.
+# Called by session-start.sh in background. Fire-and-forget.
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+CONFIG="$SCRIPT_DIR/egregore.json"
+ENV_FILE="$SCRIPT_DIR/.env"
+STATE_FILE="$SCRIPT_DIR/.egregore-state.json"
+
+# Bail if essential files missing
+[ -f "$CONFIG" ] || exit 0
+[ -f "$ENV_FILE" ] || exit 0
+
+# --- Read config ---
+API_URL=$(jq -r '.api_url // empty' "$CONFIG" 2>/dev/null)
+MODE=$(jq -r '.mode // "local"' "$CONFIG" 2>/dev/null)
+CONFIG_SLUG=$(jq -r '.slug // empty' "$CONFIG" 2>/dev/null)
+ORG_NAME=$(jq -r '.org_name // empty' "$CONFIG" 2>/dev/null)
+GITHUB_ORG=$(jq -r '.github_org // empty' "$CONFIG" 2>/dev/null)
+
+# shellcheck source=bin/lib/config.sh
+source "$SCRIPT_DIR/bin/lib/config.sh"
+
+# Runtime telemetry and diagnostics remain on-device by default. Historical
+# Connected health reporting is retained only as an explicit operator action;
+# merely having stale credentials in .env must never trigger an upload.
+[ "$MODE" = "connected" ] || exit 0
+[ "${EGREGORE_SHARE_HEALTH:-0}" = "1" ] || exit 0
+
+GITHUB_TOKEN=$(grep '^GITHUB_TOKEN=' "$ENV_FILE" 2>/dev/null | cut -d'=' -f2-)
+API_KEY=$(grep '^EGREGORE_API_KEY=' "$ENV_FILE" 2>/dev/null | cut -d'=' -f2-)
+
+[ -z "$API_URL" ] && exit 0
+[ -z "$GITHUB_TOKEN" ] && exit 0
+[ -z "$CONFIG_SLUG" ] && exit 0
+
+# --- Framework version ---
+FRAMEWORK_VERSION=""
+if [ -f "$SCRIPT_DIR/bin/session-start.sh" ]; then
+  FRAMEWORK_VERSION=$(grep '^FRAMEWORK_VERSION=' "$SCRIPT_DIR/bin/session-start.sh" 2>/dev/null | head -1 | cut -d'"' -f2)
+fi
+
+# --- Validate API key ---
+KEY_VALID="false"
+KEY_SLUG=""
+ERRORS="[]"
+ERR_LIST=""
+
+if [ -n "$API_KEY" ]; then
+  KEY_SLUG=$(echo "$API_KEY" | cut -d'_' -f2)
+  if [ "$KEY_SLUG" = "$CONFIG_SLUG" ]; then
+    KEY_VALID="true"
+  elif _graph_projection_enabled; then
+    # Slug mismatch is not proof of a bad key — org renames leave the working
+    # key on the old slug. Ask the API before reporting it broken.
+    PROBE_CODE=$(curl -s -o /dev/null -w '%{http_code}' \
+      -H "Authorization: Bearer $API_KEY" \
+      "${API_URL}/api/graph/test" \
+      --connect-timeout 3 --max-time 5 2>/dev/null || echo "000")
+    if [ "$PROBE_CODE" = "401" ] || [ "$PROBE_CODE" = "403" ]; then
+      ERR_LIST="\"key_auth_failed: key=$KEY_SLUG config=$CONFIG_SLUG\""
+    else
+      KEY_VALID="true"
+    fi
+  else
+    # Graph is intentionally quarantined for this instance. Do not use its
+    # health endpoint as a generic Connected authentication probe.
+    KEY_VALID="true"
+  fi
+else
+  ERR_LIST="\"no_api_key\""
+fi
+
+# --- Check memory directory ---
+MEMORY_LINKED="false"
+if [ -d "$SCRIPT_DIR/memory" ]; then
+  MEMORY_LINKED="true"
+else
+  [ -n "$ERR_LIST" ] && ERR_LIST="$ERR_LIST,"
+  ERR_LIST="${ERR_LIST}\"memory_not_found\""
+fi
+
+# --- Check git sync ---
+GIT_SYNCED="false"
+BRANCH=""
+if [ -d "$SCRIPT_DIR/.git" ]; then
+  BRANCH=$(git -C "$SCRIPT_DIR" branch --show-current 2>/dev/null || echo "")
+  LOCAL=$(git -C "$SCRIPT_DIR" rev-parse HEAD 2>/dev/null || echo "")
+  REMOTE=$(git -C "$SCRIPT_DIR" rev-parse origin/develop 2>/dev/null || echo "none")
+  if [ "$LOCAL" = "$REMOTE" ] || git -C "$SCRIPT_DIR" merge-base --is-ancestor origin/develop HEAD 2>/dev/null; then
+    GIT_SYNCED="true"
+  else
+    [ -n "$ERR_LIST" ] && ERR_LIST="$ERR_LIST,"
+    ERR_LIST="${ERR_LIST}\"git_behind_develop\""
+  fi
+fi
+
+ERRORS="[$ERR_LIST]"
+
+# --- Platform info ---
+PLATFORM=$(uname -s 2>/dev/null || echo "unknown")
+SHELL_NAME=$(basename "$SHELL" 2>/dev/null || echo "unknown")
+
+# --- POST health check-in (fire & forget) ---
+PAYLOAD=$(jq -n \
+  --arg org_slug "$CONFIG_SLUG" \
+  --argjson key_valid "$KEY_VALID" \
+  --arg key_slug "$KEY_SLUG" \
+  --arg config_slug "$CONFIG_SLUG" \
+  --arg framework_version "$FRAMEWORK_VERSION" \
+  --argjson memory_linked "$MEMORY_LINKED" \
+  --argjson git_synced "$GIT_SYNCED" \
+  --arg branch "$BRANCH" \
+  --argjson errors "$ERRORS" \
+  --arg platform "$PLATFORM" \
+  --arg shell "$SHELL_NAME" \
+  '{
+    org_slug: $org_slug,
+    key_valid: $key_valid,
+    key_slug: $key_slug,
+    config_slug: $config_slug,
+    framework_version: $framework_version,
+    memory_linked: $memory_linked,
+    git_synced: $git_synced,
+    branch: $branch,
+    errors: $errors,
+    platform: $platform,
+    shell: $shell
+  }')
+
+curl -sf "${API_URL}/api/health/checkin" \
+  -H "Authorization: Bearer $GITHUB_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d "$PAYLOAD" \
+  --connect-timeout 5 --max-time 10 >/dev/null 2>&1 || true