create-egregore 0.20.0 → 0.20.2

package/runtime/prime/bin/session-autosave.sh

@@ -29,6 +29,12 @@
 
 set -uo pipefail
 
+# shellcheck source=bin/lib/git-message.sh
+. "$(cd "$(dirname "$0")" && pwd)/lib/git-message.sh" 2>/dev/null || true
+type egregore_commit >/dev/null 2>&1 || egregore_commit() {
+  local gd="$1" m="$3"; shift 3; git -C "$gd" commit -m "$m" "$@"
+}
+
 DIR=""
 AUTHOR=""
 DEBOUNCE=0
@@ -79,7 +85,12 @@ git rev-parse --git-dir >/dev/null 2>&1 || exit 0
 DIR_HASH=$( { md5sum <<<"$DIR" 2>/dev/null || md5 -q -s "$DIR" 2>/dev/null || echo default; } | cut -c1-8 )
 STAMP="/tmp/.egregore-autosave-${DIR_HASH}"
 if [ "$DEBOUNCE" -gt 0 ] && [ -f "$STAMP" ]; then
-  LAST=$(stat -f %m "$STAMP" 2>/dev/null || stat -c %Y "$STAMP" 2>/dev/null || echo 0)
+  if stat -c %Y "$STAMP" >/dev/null 2>&1; then
+    LAST=$(stat -c %Y "$STAMP")
+  else
+    LAST=$(stat -f %m "$STAMP" 2>/dev/null || echo 0)
+  fi
+  case "$LAST" in ""|*[!0-9]*) LAST=0 ;; esac
   [ $(( $(date +%s) - LAST )) -lt "$DEBOUNCE" ] && exit 0
 fi
 touch "$STAMP" 2>/dev/null || true
@@ -118,7 +129,7 @@ fi
 if git -C "$DIR/memory" rev-parse --git-dir >/dev/null 2>&1; then
   if [ -n "$(git -C "$DIR/memory" status --porcelain 2>/dev/null)" ]; then
     git -C "$DIR/memory" add -A >/dev/null 2>&1 || true
-    git -C "$DIR/memory" commit -m "Auto-save: session content" --quiet 2>/dev/null || true
+    egregore_commit "$DIR/memory" "$DIR" "chore(autosave): save session work" --quiet 2>/dev/null || true
   fi
   if [ -n "$(git -C "$DIR/memory" log origin/main..HEAD --oneline 2>/dev/null)" ]; then
     for _try in 1 2 3; do

package/runtime/prime/bin/settings.sh

@@ -3,14 +3,16 @@ set -euo pipefail
 
 # settings.sh — deterministic config verbs for an Egregore instance.
 #
-# Edits egregore.json atomically. No agent, no network, no session. Idempotent:
-# re-adding an existing item is a no-op success; removing a missing one is too.
+# Edits egregore.json atomically. No agent, no session. Idempotent: re-adding
+# an existing item is a no-op success; removing a missing one is too. Switching
+# to staged releases is the one networked verb: it creates origin/develop first.
 # This is the deterministic core the launcher settings screen (and slash
 # commands) call — the reliability lives here, the surfaces are thin callers.
 #
 # Usage:
 #   settings.sh hosting status|on|off
 #   settings.sh relay status|on|off
+#   settings.sh workflow status|simple|staged
 #   settings.sh repo list | add <name> [description] | remove <name>
 #   settings.sh admin list | add <github-handle> | remove <github-handle>
 #   settings.sh dump                 # full settings snapshot as JSON (for the launcher)
@@ -53,6 +55,7 @@ settings.sh — Egregore instance settings
 
   settings.sh hosting status|on|off
   settings.sh relay  status|on|off
+  settings.sh workflow status|simple|staged
   settings.sh repo   list | add <name> [description] | remove <name>
   settings.sh admin  list | add <github-handle> | remove <github-handle>
   settings.sh people list | add <github-handle> | remove <github-handle>
@@ -114,6 +117,54 @@ cmd_relay() {
   esac
 }
 
+cmd_workflow() {
+  local action="${1:-status}"
+  local base
+  base="$(jq -r 'if has("base_branch") then .base_branch else "develop" end' "$CONFIG" 2>/dev/null)"
+  case "$action" in
+    status)
+      local workflow="custom"
+      [ "$base" = "main" ] && workflow="simple"
+      [ "$base" = "develop" ] && workflow="staged"
+      if [ "$JSON" = 1 ]; then
+        jq -n --arg workflow "$workflow" --arg base_branch "$base" \
+          '{domain:"workflow", workflow:$workflow, base_branch:$base_branch}'
+      elif [ "$workflow" = "simple" ]; then
+        echo "Git workflow: SIMPLE — pull requests target main"
+      elif [ "$workflow" = "staged" ]; then
+        echo "Git workflow: STAGED — pull requests target develop; releases promote to main"
+      else
+        echo "Git workflow: CUSTOM — pull requests target $base"
+      fi
+      ;;
+    simple)
+      if [ "$base" != "main" ]; then
+        git -C "$SCRIPT_DIR" rev-parse --git-dir >/dev/null 2>&1 \
+          || _die "cannot switch workflow: $SCRIPT_DIR is not a Git repository" 1
+        git -C "$SCRIPT_DIR" ls-remote --exit-code --heads origin main >/dev/null 2>&1 \
+          || _die "cannot switch workflow: origin/main does not exist or could not be reached" 1
+        _save '.base_branch = "main"'
+      fi
+      echo "Git workflow: SIMPLE — pull requests now target main"
+      ;;
+    staged)
+      if [ "$base" != "develop" ]; then
+        git -C "$SCRIPT_DIR" rev-parse --git-dir >/dev/null 2>&1 \
+          || _die "cannot switch workflow: $SCRIPT_DIR is not a Git repository" 1
+        bash "$SCRIPT_DIR/bin/lib/ensure-develop.sh" "$SCRIPT_DIR" >/dev/null \
+          || _die "could not create develop; workflow is unchanged" 1
+        git -C "$SCRIPT_DIR" ls-remote --exit-code --heads origin develop >/dev/null 2>&1 \
+          || _die "could not verify origin/develop; workflow is unchanged" 1
+        _save '.base_branch = "develop"'
+      elif ! jq -e 'has("base_branch")' "$CONFIG" >/dev/null 2>&1; then
+        _save '.base_branch = "develop"'
+      fi
+      echo "Git workflow: STAGED — pull requests now target develop; releases promote to main"
+      ;;
+    *) _die "usage: settings.sh workflow status|simple|staged" 1 ;;
+  esac
+}
+
 cmd_repo() {
   local action="${1:-list}"; shift || true
   case "$action" in
@@ -232,7 +283,7 @@ _people_file() {
     rm -f "$f"
   fi
   ( cd "$SCRIPT_DIR/memory" 2>/dev/null && git add -A people/ 2>/dev/null \
-      && git commit -q -m "settings: people $op $user" 2>/dev/null \
+      && git commit -q -m "chore(settings): $op $user in people" 2>/dev/null \
       && git push -q 2>/dev/null ) || true
 }
 
@@ -273,6 +324,13 @@ cmd_dump() {
     slug: .slug,
     hosting: (.features.publishing != false),
     public_relay: (.features.public_relay == true),
+    workflow: (
+      if ((if has("base_branch") then .base_branch else "develop" end) == "main") then "simple"
+      elif ((if has("base_branch") then .base_branch else "develop" end) == "develop") then "staged"
+      else "custom"
+      end
+    ),
+    base_branch: (if has("base_branch") then .base_branch else "develop" end),
     repos: [.repos[]? | if type=="object" then . else {name:.} end],
     admins: (.admins // []),
     people: $people
@@ -295,10 +353,11 @@ DOMAIN="${1:-}"; shift || true
 case "$DOMAIN" in
   hosting) cmd_hosting "$@" ;;
   relay)   cmd_relay "$@" ;;
+  workflow) cmd_workflow "$@" ;;
   repo)    cmd_repo "$@" ;;
   admin)   cmd_admin "$@" ;;
   people)  cmd_people "$@" ;;
   dump)    cmd_dump ;;
   ""|-h|--help|help) usage 0 ;;
-  *) _die "unknown settings domain: '$DOMAIN' (try: hosting, relay, repo, admin, people, dump)" 1 ;;
+  *) _die "unknown settings domain: '$DOMAIN' (try: hosting, relay, workflow, repo, admin, people, dump)" 1 ;;
 esac

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

@@ -48,7 +48,10 @@ git -C "$REPO_ROOT" fetch origin "$BASE_BRANCH" --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/$BASE_BRANCH" >/dev/null 2>&1 || {
+  # A task branch starts at the integration branch but must never track it.
+  # Otherwise `git push` can target origin/$BASE_BRANCH (especially when the
+  # user's push.default is `upstream`) before the first explicit task push.
+  git -C "$REPO_ROOT" branch --no-track "$BRANCH" "origin/$BASE_BRANCH" >/dev/null 2>&1 || {
     echo "Error: failed to create branch $BRANCH" >&2
     exit 1
   }

package/runtime/prime/manifest.json

@@ -1,7 +1,7 @@
 {
   "source": "egregore-prime-meta-harness",
   "policy": "Prime Agent-native lifecycle layer over the available OSS Codex skill corpus",
-  "skillCount": 46,
+  "skillCount": 47,
   "skills": [
     "activity",
     "announce",
@@ -19,6 +19,7 @@
     "handoff",
     "harvest",
     "ingest",
+    "ingest-corpus",
     "ingest-notion",
     "ingest-user-interview",
     "invite",
@@ -73,6 +74,7 @@
     ".codex/skills/handoff/SKILL.md",
     ".codex/skills/harvest/QUESTION_PALETTE.md",
     ".codex/skills/harvest/SKILL.md",
+    ".codex/skills/ingest-corpus/SKILL.md",
     ".codex/skills/ingest-notion/SKILL.md",
     ".codex/skills/ingest-user-interview/SKILL.md",
     ".codex/skills/ingest/SKILL.md",
@@ -127,6 +129,7 @@
     "bin/codex-skill-render.mjs",
     "bin/codex-sync-skills.sh",
     "bin/connect-refresh.sh",
+    "bin/contribute-guard.sh",
     "bin/dashboard-data.sh",
     "bin/graph-batch.sh",
     "bin/graph-op.sh",
@@ -147,6 +150,7 @@
     "bin/lib/context.sh",
     "bin/lib/dashboard-artifact.sh",
     "bin/lib/ensure-develop.sh",
+    "bin/lib/git-message.sh",
     "bin/lib/git-sync.sh",
     "bin/lib/greeting.sh",
     "bin/lib/hash.sh",