create-egregore 0.19.20 → 0.19.22

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

@@ -179,11 +179,18 @@ const ON_LAUNCH_BODY = `The \`egregore\` launcher renders the Egregore startup c
 
 const AFTER_GREETING_BODY = `**Mandatory behavioral rule.** When the user describes work, your **first action** — before reading files, exploring code, or anything else — is to get onto a working branch:
 
+The integration branch is \`develop\` by default. When top-level
+\`egregore.json.base_branch\` is set, that configured branch replaces
+\`develop\` as the branch point, rebase target, PR base, and protected
+integration branch.
+
 1. Derive a topic slug from what the user said (kebab-case, 2–4 words)
-2. Run \`bin/agent.sh branch --topic "<topic>"\` — it creates a work branch from \`origin/develop\` in a task worktree (\`dev/{author}/{slug}\`, or \`feature/{slug}\` / \`bugfix/{slug}\` when the topic reads as a feature or fix) and prints the worktree path. Continue all file work from that printed path.
+2. Run \`bin/agent.sh branch --topic "<topic>"\` — it resolves the configured base and creates a work branch from \`origin/{base}\` in a task worktree (\`dev/{author}/{slug}\`, or \`feature/{slug}\` / \`bugfix/{slug}\` when the topic reads as a feature or fix). Continue all file work from the printed path.
 3. Confirm: \`On {branch} (worktree).\`
 
-**Fallback:** If \`bin/agent.sh branch\` fails, use \`git checkout -b dev/{author}/{slug} origin/develop\`.
+**Fallback:** If \`bin/agent.sh branch\` fails, resolve \`{base}\` with
+\`_get_base_branch\`, then use
+\`git checkout -b dev/{author}/{slug} origin/{base}\`.
 
 4. Update graph (fire-and-forget): \`bash bin/graph-op.sh set-topic "$(cat .egregore-session-id 2>/dev/null)" "topic from slug" "dev/author/slug" 2>/dev/null &\`
 
@@ -215,11 +222,11 @@ Report results: \`✓ Checked out {branch} in {repo1}, {repo2}\`. If a branch no
 
 **Topic pivot while on a working branch:** If the user describes work **unrelated** to the current branch's topic, treat it as a new topic and create a new branch (\`bin/agent.sh branch --topic "<new topic>"\`). Do NOT mix unrelated work on one branch.
 
-If on develop after two messages, create a branch immediately from whatever context you have.
+If still on the configured base branch after two messages, create a branch immediately from whatever context you have.
 
 ### Branch-guard protocol
 
-The \`.codex/hooks/branch-guard.js\` PreToolUse hook (enabled by the launcher via \`--enable hooks\`) protects project writes on \`develop\`/\`main\`/\`master\`. Its block message is operational guidance, not a reason to interrupt the user with routine Git choices:
+The \`.codex/hooks/branch-guard.js\` PreToolUse hook (enabled by the launcher via \`--enable hooks\`) protects project writes on the configured base branch as well as \`develop\`/\`main\`/\`master\`. Its block message is operational guidance, not a reason to interrupt the user with routine Git choices:
 
 - **Topic is clear** (the user said "fix X", "add Y feature") → run \`bin/agent.sh branch --topic "<topic>"\` automatically, continue in the printed worktree, and say one short sentence so the branch change is visible. Do not ask the user to approve routine branching.
 - **Topic is genuinely ambiguous** → ask only for the topic, using compact numbered options:
@@ -236,7 +243,7 @@ The \`.codex/hooks/branch-guard.js\` PreToolUse hook (enabled by the launcher vi
 
 Memory, managed-repo, and runtime-state writes should bypass the project guard. If one triggers it, correct the operation target/context instead of asking for protected-branch consent.
 
-If this Codex build does not support hooks, follow the same discipline as a standing instruction: never write or commit on develop/main/master.
+If this Codex build does not support hooks, follow the same discipline as a standing instruction: never write or commit on the configured base, develop, main, or master.
 
 ### Onboarding exception
 

package/runtime/codex/bin/codex-session-start.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o pipefail
 
 # Codex does not run Claude Code SessionStart hooks. This is the runtime-neutral

package/runtime/codex/bin/codex-sync-skills.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
@@ -162,11 +162,15 @@ EOF
   cat <<EOF
 1. Read \`${source}\` for the workflow details.
 2. Run the referenced \`bin/\` scripts directly from Codex.
-3. Treat graph, publish, and notify steps as best-effort unless that workflow
-   explicitly says they are required.
-4. Keep local-mode behavior filesystem-first and avoid graph or notification
+3. Treat graph and publish steps as best-effort unless that workflow explicitly
+   says they are required.
+4. For every external notification, follow
+   \`.claude/context/notification-consent.md\`: plan without sending, then show
+   a separate exact Send / Edit / Cancel checkpoint. Never infer notification
+   consent from the workflow request or a batch approval.
+5. Keep local-mode behavior filesystem-first and avoid graph or notification
    calls when \`egregore.json\` declares \`"mode": "local"\`.
-5. Never call the deprecated \`egregore-handoff\` CLI for Egregore project
+6. Never call the deprecated \`egregore-handoff\` CLI for Egregore project
    handoffs.
 EOF
 }

package/runtime/codex/bin/dashboard-data.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Fetches personal dashboard data: single API call + parallel git ops.
 # Usage: bash bin/dashboard-data.sh [username] [time_range]
 # Returns a single JSON object with all query results.

package/runtime/codex/bin/graph-batch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 # Execute multiple Cypher queries in a single HTTP call.

package/runtime/codex/bin/graph-op.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 # Named graph operations — clean interface over raw Cypher.
 # Keeps implementation details out of the TUI.

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Graph Write-Ahead Log — resilient graph writes with local buffer.
 # Mirrors bin/telemetry.sh architecture.
 #

package/runtime/codex/bin/graph.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"

package/runtime/codex/bin/handoff-pr-backfill.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # handoff-pr-backfill.sh — fill in PR numbers in a handoff file's ## Repo State
 # table, then re-commit + push the memory repo. Detached fire-and-forget from
 # /handoff's hot path so user-visible latency doesn't include N × `gh pr list`.

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 # handoff-run.sh — atomic orchestrator for /handoff.
 #
@@ -25,7 +25,7 @@ set -euo pipefail
 #      and returns a subgraph snapshot in the result JSON
 #   6. Commits + pushes memory repo (with orphan-stash dance if needed)
 #   7. Publishes HTML artifact via bin/publish-artifact.sh
-#   8. Sends Telegram notification via bin/notify.sh (if recipient)
+#   8. Creates an exact notification proposal via bin/notify.sh (never sends)
 #   9. Emits ONE status line and ONE JSON blob on stdout
 #
 # Exit codes:
@@ -231,14 +231,14 @@ awk -v line="$IDX_LINE" '
   END { if (!inserted) print line }
 ' "$INDEX" > "$INDEX.new" && mv "$INDEX.new" "$INDEX"
 
-# --- Parallel stage: graph + memory + (publish → notify) ----------------
+# --- Parallel stage: graph + memory + (publish → notification proposal) -
 #
 # Three independent branches fork here and join before we emit the result:
 #   A. Graph index     — reads ABS_FILE, writes Session node to Neo4j, and
 #                        returns the handoff's neighborhood as subgraph JSON.
 #   B. Memory push     — commits + pushes memory repo (orphan-stash dance).
-#   C. Publish+notify  — publishes HTML artifact, then (if recipient is set)
-#                        sends Telegram with the artifact URL embedded.
+#   C. Publish+plan    — publishes HTML artifact, then creates an immutable
+#                        notification proposal with the artifact URL embedded.
 #
 # Each branch writes its result to a tmpfile. Wall-clock is max(A,B,C).
 #
@@ -251,7 +251,7 @@ MEMORY_DIR="$SCRIPT_DIR/memory"
 TMPD=$(mktemp -d -t handoff-run-XXXXXX)
 trap 'rm -rf "$TMPD"' EXIT
 
-# Extract briefing text once (used by publish and notify) so we don't
+# Extract briefing text once (used by publish and the proposal) so we don't
 # re-awk the same file inside multiple workers.
 BRIEFING_LEAD=$(awk '/^## Briefing/{found=1; next} found && /^##/{exit} found && NF{print}' "$ABS_FILE" 2>/dev/null \
   | head -2 | tr '\n' ' ' | cut -c1-200 || true)
@@ -390,7 +390,11 @@ PID_MEMORY=$!
     fi
     EMISSARY_API_URL="${EMISSARY_API_URL:-https://egregore-production-55f2.up.railway.app/api/v1/emissary}"
 
-    if [ -n "$EMISSARY_TOKEN" ]; then
+    # /handoff is an internal team primitive, not an implicit public-emissary
+    # composer. Use the emissary route only for an explicit recipient, and make
+    # that artifact directed-private. Recipient-less handoffs fall through to
+    # the org-scoped publisher (connected) or opt-in relay (local).
+    if [ -n "$EMISSARY_TOKEN" ] && [ -n "$RECIPIENT" ]; then
       # Step 1: render the handoff to HTML locally using egregore-artifacts.
       # Same renderer + template publish-artifact.sh uses today — handoffs
       # keep their familiar look.
@@ -422,12 +426,8 @@ PID_MEMORY=$!
             DISPLAY_NAME=$(head -1 "$PERSON_FILE" | sed 's/^# //')
           fi
 
-          # addressed_to: only set if there's a recipient
-          ADDRESSED_TO="[]"
-          if [ -n "$RECIPIENT" ]; then
-            RECIP_HANDLE=$(echo "$RECIPIENT" | tr '[:upper:]' '[:lower:]' | awk '{print $1}')
-            ADDRESSED_TO=$(jq -nc --arg h "$RECIP_HANDLE" --arg d "$RECIPIENT" '[{"handle":$h,"display":$d}]')
-          fi
+          RECIP_HANDLE=$(echo "$RECIPIENT" | tr '[:upper:]' '[:lower:]' | awk '{print $1}')
+          ADDRESSED_TO=$(jq -nc --arg h "$RECIP_HANDLE" --arg d "$RECIPIENT" '[{"handle":$h,"display":$d}]')
 
           CLAIM=$(echo "$BRIEFING_LEAD" | cut -c1-200)
 
@@ -456,8 +456,8 @@ PID_MEMORY=$!
               body: { prose: $prose },
               audience: {
                 addressed_to: $addressed,
-                visible_to: "public",
-                extendable_by: "anyone"
+                visible_to: $addressed,
+                extendable_by: $addressed
               },
               parents: [],
               render_mode: "custom",
@@ -475,15 +475,30 @@ PID_MEMORY=$!
     fi
   fi
 
-  # Fallback: if the emissary publish didn't produce a URL (no token, no
-  # network, size cap, render failure), fire the legacy publish-artifact.sh
-  # so handoffs still get a Telegram-able URL.
+  # Fallback: if a directed emissary publish didn't produce a URL—or this is a
+  # recipient-less team handoff—use publish-artifact.sh. Connected mode is
+  # authenticated and org-scoped; local mode's public relay is opt-in.
+  PUBLISH_RC=0
   if [ -z "$V1URL" ] && [ "$NO_PUBLISH" = "0" ] && [ -x "$SCRIPT_DIR/bin/publish-artifact.sh" ]; then
     AURL=$(bash "$SCRIPT_DIR/bin/publish-artifact.sh" "$RENDER_TYPE" "${RENDER_SRC:-$ABS_FILE}" \
       --title "$TOPIC" \
       --author "$AUTHOR" \
-      --description "$BRIEFING_LEAD" 2>/dev/null || echo "")
+      --description "$BRIEFING_LEAD" 2>/dev/null) || PUBLISH_RC=$?
+  fi
+
+  PS="published"
+  if [ "$NO_PUBLISH" = "1" ]; then
+    PS="disabled"
+  elif [ -n "$V1URL" ] || [ -n "$AURL" ]; then
+    PS="published"
+  elif [ "$PUBLISH_RC" = "4" ]; then
+    PS="relay-off"
+  elif [ "$PUBLISH_RC" = "3" ]; then
+    PS="hosting-off"
+  else
+    PS="failed"
   fi
+  echo "$PS" > "$TMPD/publish"
 
   # Prefer v1 (emissary-rendered) URL when available; fall back to the
   # legacy egregore-artifacts URL only if the v1 publish failed.
@@ -497,6 +512,7 @@ PID_MEMORY=$!
   fi
 
   NS="skipped"
+  echo '{}' > "$TMPD/notify-plan"
   if [ "$NO_NOTIFY" = "0" ]; then
     if [ -n "$NOTIFY_URL" ]; then
       MSG_NOTIFY="Handoff from ${AUTHOR}: ${TOPIC}
@@ -510,21 +526,19 @@ View: ${NOTIFY_URL}"
 \"${BRIEFING_SHORT}\""
     fi
 
-    # Always notify. With a recipient (connected mode) → DM. Otherwise → group.
-    # Self-handoffs still post to the group so they're visible on /activity
-    # and in the Telegram feed — a handoff without a Telegram beat is invisible.
-    if [ -n "$RECIPIENT" ] && [ "$MODE" = "connected" ]; then
-      NR=$(bash "$SCRIPT_DIR/bin/notify.sh" send "$RECIPIENT" "$MSG_NOTIFY" 2>/dev/null || echo "Failed")
+    # Resolve the exact destination, but never approve or dispatch here. The
+    # interactive harness must show this proposal in a separate checkpoint.
+    if [ -n "$RECIPIENT" ]; then
+      NR=$(bash "$SCRIPT_DIR/bin/notify.sh" plan send "$RECIPIENT" "$MSG_NOTIFY" 2>/dev/null || echo '{}')
     else
-      NR=$(bash "$SCRIPT_DIR/bin/notify.sh" group "$MSG_NOTIFY" 2>/dev/null || echo "Failed")
+      NR=$(bash "$SCRIPT_DIR/bin/notify.sh" plan group "$MSG_NOTIFY" 2>/dev/null || echo '{}')
     fi
 
-    if echo "$NR" | grep -qi "^Sent"; then
-      NS="sent"
-    elif echo "$NR" | grep -qi "^Failed"; then
-      NS="failed"
+    if printf '%s' "$NR" | jq -e '.status == "approval_required"' >/dev/null 2>&1; then
+      NS="approval_required"
+      printf '%s\n' "$NR" > "$TMPD/notify-plan"
     else
-      NS="unknown"
+      NS="unavailable"
     fi
   fi
   echo "$NS" > "$TMPD/notify"
@@ -574,6 +588,9 @@ fi
 MEMORY_STATUS=$(cat "$TMPD/memory"   2>/dev/null || echo "skipped")
 ARTIFACT_URL=$(cat "$TMPD/artifact"  2>/dev/null || echo "")
 NOTIFY_STATUS=$(cat "$TMPD/notify"   2>/dev/null || echo "skipped")
+NOTIFY_PLAN=$(cat "$TMPD/notify-plan" 2>/dev/null || echo "{}")
+PUBLISH_STATUS=$(cat "$TMPD/publish" 2>/dev/null || echo "skipped")
+[ -z "$PUBLISH_STATUS" ] && PUBLISH_STATUS="skipped"
 ARTIFACTS_ARR=$(cat "$TMPD/artifacts" 2>/dev/null || echo "[]")
 [ -z "$ARTIFACTS_ARR" ] && ARTIFACTS_ARR="[]"
 
@@ -594,16 +611,9 @@ fi
 STATUS_BITS=("saved")
 [ "$GRAPH_STATUS"  = "ok" ]    && STATUS_BITS+=("graphed")
 [ "$MEMORY_STATUS" = "ok" ]    && STATUS_BITS+=("pushed")
-if [ "$NOTIFY_STATUS" = "sent" ]; then
-  if [ -n "$RECIPIENT" ]; then
-    STATUS_BITS+=("${RECIPIENT} notified")
-  else
-    STATUS_BITS+=("group notified")
-  fi
-elif [ "$NOTIFY_STATUS" = "unknown" ] && [ -n "$RECIPIENT" ]; then
-  STATUS_BITS+=("${RECIPIENT} relayed to group")
-fi
+[ "$NOTIFY_STATUS" = "approval_required" ] && STATUS_BITS+=("notify approval pending")
 [ -n "$ARTIFACT_URL" ]         && STATUS_BITS+=("published")
+[ "$PUBLISH_STATUS" = "relay-off" ] && STATUS_BITS+=("not published")
 
 STATUS_LINE=""
 for bit in "${STATUS_BITS[@]}"; do
@@ -625,7 +635,9 @@ jq -cn \
   --arg graphStatus "$GRAPH_STATUS" \
   --arg memoryStatus "$MEMORY_STATUS" \
   --arg notifyStatus "$NOTIFY_STATUS" \
+  --argjson notifyPlan "$NOTIFY_PLAN" \
   --arg artifactUrl "$ARTIFACT_URL" \
+  --arg publishStatus "$PUBLISH_STATUS" \
   --arg recipient "$RECIPIENT" \
   --arg topic "$TOPIC" \
   --arg author "$AUTHOR" \
@@ -640,7 +652,9 @@ jq -cn \
     graphStatus:$graphStatus,
     memoryStatus:$memoryStatus,
     notifyStatus:$notifyStatus,
+    notifyPlan:$notifyPlan,
     artifactUrl:$artifactUrl,
+    publishStatus:$publishStatus,
     recipient:$recipient,
     topic:$topic,
     author:$author,

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

@@ -1,13 +1,14 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # handoff-save-egregore.sh — background save+auto-merge for the core repo after a handoff.
 #
 # /handoff renders its card first, then fires this detached. The user never waits on git.
 #
 # Behavior:
 #   - If nothing to save (clean working tree + up-to-date with origin) → exit silently.
-#   - If on develop/main/master → create dev/{author}/handoff-{YYYY-MM-DD} branch from origin/develop.
-#   - Commit all changes, rebase onto origin/develop, push.
-#   - If push succeeds: create PR to develop (or reuse existing), then:
+#   - If on the configured base (or another protected branch) → create a
+#     dev/{author}/handoff-{YYYY-MM-DD} branch from origin/{base}.
+#   - Commit all changes, rebase onto origin/{base}, push.
+#   - If push succeeds: create a PR to the configured base (or reuse existing), then:
 #     - Markdown-only diff → `gh pr merge --auto --merge` (auto-merges when checks pass).
 #     - Code/config present → leave PR open for review (no auto-merge).
 #
@@ -45,9 +46,19 @@ while [ $# -gt 0 ]; do
 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:" ;;
+  autosave)
+    MSG_PREFIX="Auto-save"
+    PR_WHAT="Save session content captured by the opted-in autosave workflow."
+    PR_WHY="This preserves unattended non-coding work without requiring an explicit /save."
+    ;;
+  *)
+    MSG_PREFIX="Handoff"
+    PR_WHAT="Save core-repository session work captured when the handoff was created."
+    PR_WHY="The handoff records shared context immediately; this companion PR keeps the originating checkout's work from remaining only local."
+    ;;
 esac
+PR_BODY=$(printf '## What\n\n- %s\n\n## Why\n\n%s Topic: `%s`.\n\n## Verification\n\nNot verified — background %s save; review code or configuration changes before merging.\n\n🤖 Saved via `bin/handoff-save-egregore.sh`\n' \
+  "$PR_WHAT" "$PR_WHY" "$TOPIC" "$KIND")
 
 [ -n "$AUTHOR" ] || { echo "handoff-save-egregore: missing author" >&2; exit 1; }
 
@@ -56,6 +67,22 @@ SCRIPT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 [ -z "$REPO_DIR" ] && REPO_DIR="$SCRIPT_DIR"
 cd "$REPO_DIR" || exit 1
 
+# Resolve the target checkout's configured integration branch. SCRIPT_DIR points
+# at the framework that owns this helper, while CONFIG must follow --repo-dir so
+# sandboxed and installed instances read their own egregore.json.
+CONFIG="$REPO_DIR/egregore.json"
+[ -f "$SCRIPT_DIR/bin/lib/config.sh" ] || {
+  echo "handoff-save-egregore: base-branch resolver is unavailable" >&2
+  exit 1
+}
+# shellcheck source=bin/lib/config.sh
+. "$SCRIPT_DIR/bin/lib/config.sh" 2>/dev/null || exit 1
+if ! BASE_BRANCH=$(_get_base_branch); then
+  echo "handoff-save-egregore: could not resolve the configured base branch" >&2
+  exit 1
+fi
+BASE_REF="origin/$BASE_BRANCH"
+
 # Shared safe-staging guard — never auto-commit stray sibling-repo gitlinks.
 # shellcheck source=bin/lib/git-safe.sh
 . "$SCRIPT_DIR/bin/lib/git-safe.sh" 2>/dev/null || true
@@ -65,7 +92,7 @@ type git_add_guarded >/dev/null 2>&1 || git_add_guarded() { git add -A 2>/dev/nu
 # 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
+  git -C "${2:-.}" diff "${1:-$BASE_REF}...HEAD" --name-only 2>/dev/null | grep -v '\.md$' | head -1 || true
 }
 
 # --- Early exit if nothing to do -----------------------------------------
@@ -75,9 +102,12 @@ DIRTY=0
 CURRENT_BRANCH=$(git branch --show-current 2>/dev/null || echo "")
 AHEAD=0
 if [ -n "$CURRENT_BRANCH" ]; then
-  # Count commits ahead of origin/develop on the current branch (works from any
-  # dev/* branch or from develop itself).
-  AHEAD=$(git rev-list --count "origin/develop..HEAD" 2>/dev/null || echo 0)
+  # A missing remote base is not evidence that there is nothing to save. The
+  # former `|| echo 0` made a main-only instance silently discard clean,
+  # committed topic work because origin/develop did not exist.
+  if ! AHEAD=$(git rev-list --count "$BASE_REF..HEAD" 2>/dev/null); then
+    AHEAD=1
+  fi
 fi
 
 if [ "$DIRTY" = "0" ] && [ "$AHEAD" = "0" ]; then
@@ -85,18 +115,18 @@ if [ "$DIRTY" = "0" ] && [ "$AHEAD" = "0" ]; then
 fi
 
 # --- Protect the protected branches: create a working branch if needed --
-case "$CURRENT_BRANCH" in
-  develop|main|master|"")
-    SLUG_DATE=$(date +%Y-%m-%d)
-    # --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
-    CURRENT_BRANCH="$NEW_BRANCH"
-    ;;
-esac
+if [ -z "$CURRENT_BRANCH" ] || [ "$CURRENT_BRANCH" = "$BASE_BRANCH" ] \
+   || [ "$CURRENT_BRANCH" = "develop" ] || [ "$CURRENT_BRANCH" = "main" ] \
+   || [ "$CURRENT_BRANCH" = "master" ]; then
+  SLUG_DATE=$(date +%Y-%m-%d)
+  # --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 "$BASE_BRANCH" --quiet 2>/dev/null || true
+  git checkout -b "$NEW_BRANCH" "$BASE_REF" --quiet 2>/dev/null || \
+    git checkout "$NEW_BRANCH" --quiet 2>/dev/null || exit 0
+  CURRENT_BRANCH="$NEW_BRANCH"
+fi
 
 # --- Commit whatever is uncommitted --------------------------------------
 if [ -n "$(git status --porcelain 2>/dev/null)" ]; then
@@ -104,11 +134,11 @@ if [ -n "$(git status --porcelain 2>/dev/null)" ]; then
   git commit -m "${MSG_PREFIX}: ${TOPIC}" --quiet 2>/dev/null || true
 fi
 
-# --- Rebase onto develop, fall back to merge if rebase conflicts ---------
-git fetch origin develop --quiet 2>/dev/null || true
-if ! git rebase origin/develop --quiet 2>/dev/null; then
+# --- Rebase onto the configured base, fall back to merge on conflicts ----
+git fetch origin "$BASE_BRANCH" --quiet 2>/dev/null || true
+if ! git rebase "$BASE_REF" --quiet 2>/dev/null; then
   git rebase --abort 2>/dev/null || true
-  if ! git merge origin/develop --quiet -m "Sync with develop" 2>/dev/null; then
+  if ! git merge "$BASE_REF" --quiet -m "Sync with $BASE_BRANCH" 2>/dev/null; then
     # Conflicts we can't auto-resolve. Leave the branch as-is; the user will see it
     # next session or when they run /save explicitly.
     git merge --abort 2>/dev/null || true
@@ -128,7 +158,7 @@ fi
 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)
+  n_files=$(git diff "$BASE_REF...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" \
@@ -145,15 +175,15 @@ EXISTING_BASE=$(echo "$EXISTING" | jq -r '.baseRefName // empty' 2>/dev/null)
 
 if [ -n "$EXISTING_NUMBER" ]; then
   PR_NUMBER="$EXISTING_NUMBER"
-  if [ "$EXISTING_BASE" != "develop" ]; then
-    gh pr edit "$PR_NUMBER" --base develop >/dev/null 2>&1 || true
+  if [ "$EXISTING_BASE" != "$BASE_BRANCH" ]; then
+    gh pr edit "$PR_NUMBER" --base "$BASE_BRANCH" >/dev/null 2>&1 || true
   fi
 else
   PR_URL=$(gh pr create \
-    --base develop \
+    --base "$BASE_BRANCH" \
     --head "$CURRENT_BRANCH" \
     --title "${MSG_PREFIX}: ${TOPIC}" \
-    --body "${PR_BODY} ${TOPIC}" \
+    --body "$PR_BODY" \
     2>/dev/null || echo "")
   PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$' || echo "")
 fi
@@ -167,7 +197,7 @@ fi
 # 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 .)
+NON_CODE_BLOCKER=$(noncode_blockers "$BASE_REF" .)
 if [ -z "$NON_CODE_BLOCKER" ]; then
   if [ "$PUBLISH" = "gate" ]; then
     OUTCOME="staged"

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 # Index a single handoff file into the Neo4j graph.

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 # Validate, plan, or apply a durable ingestion manifest to the organization graph.

package/runtime/codex/bin/ingest.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 # Org-scoped intake plane. Shared manifests live in memory/; normalized bodies

package/runtime/codex/bin/lib/artifact-id.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # artifact-id.sh — Deterministic artifact IDs for memory files.
 #
 # Emits `{prefix}-{12 hex}` where prefix is derived from the file extension

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Shared config helpers — sourced by session-start.sh and other scripts.
 # Expects SCRIPT_DIR to be set by the caller.
 
@@ -25,35 +25,71 @@ _config_val() {
   fi
 }
 
-# Get base branch for a repo. Reads base_branch from egregore.json repos[] config.
-# Defaults to "develop" for backwards compatibility (existing egregores use develop).
-# Only returns something other than "develop" when base_branch is explicitly set
-# (e.g., for teams who added existing repos with a different default branch).
+# Get base branch for a repo. Reads base_branch from egregore.json — top-level
+# for the core egregore repo, per-entry under repos[] for managed repos.
+# Defaults to "develop" for backwards compatibility only when a valid config
+# omits the setting. Missing, unreadable, malformed, or invalid config fails:
+# callers must never turn a config read failure into a remote branch mutation.
+#
+# Setting a top-level "base_branch": "main" is single-branch mode: the whole
+# develop layer disappears and everything (session start, sync, the branch
+# guard, PR bases) targets main instead. Solo operators who never wanted the
+# develop/main split had no way to say so — the core repo used to be hardcoded
+# even though managed repos were already configurable.
+#
 # Usage: _get_base_branch "repo-name"   (omit for core repo)
 _get_base_branch() {
   local repo_name="${1:-}"
   local config="${CONFIG:-$SCRIPT_DIR/egregore.json}"
+  local base=""
 
-  # Core egregore repo — always develop
-  if [ -z "$repo_name" ]; then
-    echo "develop"
-    return
+  if [ ! -r "$config" ]; then
+    echo "config: cannot read $config" >&2
+    return 1
+  fi
+  if ! jq -e 'type == "object"' "$config" >/dev/null 2>&1; then
+    echo "config: invalid JSON object in $config" >&2
+    return 1
   fi
 
-  # Managed repo — check egregore.json for explicit base_branch
-  if [ -f "$config" ]; then
-    local base
-    base=$(jq -r --arg name "$repo_name" \
-      '(.repos[]? // empty) | select((if type == "object" then .name else . end) == $name) | if type == "object" then .base_branch // empty else empty end' \
-      "$config" 2>/dev/null || true)
-    if [ -n "$base" ]; then
-      echo "$base"
-      return
+  if [ -z "$repo_name" ]; then
+    # Core egregore repo — top-level base_branch. An absent value preserves
+    # the historical develop default; an explicitly invalid value is an error.
+    if jq -e 'has("base_branch")' "$config" >/dev/null 2>&1; then
+      if ! base=$(jq -er '.base_branch | select(type == "string")' "$config" 2>/dev/null); then
+        echo "config: base_branch must be a valid branch name" >&2
+        return 1
+      fi
+    else
+      base="develop"
+    fi
+  else
+    # Managed repo — its own entry under repos[]. Unknown/string-form entries
+    # retain the historical develop default.
+    local repo_json
+    repo_json=$(jq -c --arg name "$repo_name" \
+      'first(.repos[]? | select((if type == "object" then .name else . end) == $name)) // null' \
+      "$config" 2>/dev/null) || {
+        echo "config: cannot resolve managed repo $repo_name" >&2
+        return 1
+      }
+    if [ "$repo_json" != "null" ] \
+       && [ "$(printf '%s' "$repo_json" | jq -r 'type')" = "object" ] \
+       && printf '%s' "$repo_json" | jq -e 'has("base_branch")' >/dev/null 2>&1; then
+      if ! base=$(printf '%s' "$repo_json" | jq -er '.base_branch | select(type == "string")' 2>/dev/null); then
+        echo "config: base_branch for $repo_name must be a valid branch name" >&2
+        return 1
+      fi
+    else
+      base="develop"
     fi
   fi
 
-  # No explicit config — default to develop (backwards compatible)
-  echo "develop"
+  if [ -z "$base" ] || ! git check-ref-format --branch "$base" >/dev/null 2>&1; then
+    echo "config: base_branch must be a valid branch name" >&2
+    return 1
+  fi
+  echo "$base"
 }
 
 # Detect local vs connected mode