create-egregore 0.19.8 → 0.19.11

package/runtime/pi/.pi/extensions/egregore.ts

@@ -1,9 +1,10 @@
-import { existsSync, readFileSync, readdirSync } from "node:fs";
-import { join, relative } from "node:path";
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { isMutatingBash } from "../../bin/pi-branch-policy.mjs";
+import { isMutatingBash, isRuntimeStatePath, mutatesOnlyRuntimeState } from "../../bin/pi-branch-policy.mjs";
 import {
+  captureSessionEnd,
   createHandoff,
   parseViewRequest,
   publishScroll,
@@ -47,6 +48,32 @@ function errorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
 
+function nearestExistingDirectory(candidate) {
+  let cursor = resolve(candidate);
+  try {
+    if (existsSync(cursor) && !statSync(cursor).isDirectory()) cursor = dirname(cursor);
+  } catch {}
+  while (!existsSync(cursor)) {
+    const parent = dirname(cursor);
+    if (parent === cursor) break;
+    cursor = parent;
+  }
+  return cursor;
+}
+
+async function gitContext(pi, candidate) {
+  const probe = nearestExistingDirectory(candidate);
+  const topResult = await pi.exec("git", ["-C", probe, "rev-parse", "--show-toplevel"], { timeout: 5000 });
+  const top = String(topResult.stdout || "").trim();
+  if (!top) return null;
+  const commonResult = await pi.exec("git", ["-C", top, "rev-parse", "--git-common-dir"], { timeout: 5000 });
+  const commonRaw = String(commonResult.stdout || "").trim();
+  return {
+    top: resolve(top),
+    common: resolve(top, commonRaw || ".git"),
+  };
+}
+
 export default function egregore(pi) {
   const root = process.cwd();
   const skillsDir = join(root, ".codex", "skills");
@@ -297,6 +324,18 @@ export default function egregore(pi) {
     }
   });
 
+  pi.on("session_shutdown", async (event, ctx) => {
+    // Reload keeps the same logical session alive. Every other graceful
+    // shutdown is Pi's equivalent of Claude Code's SessionEnd hook.
+    if (event?.reason === "reload") return;
+    try {
+      await captureSessionEnd(pi, root, ctx.sessionManager.getSessionFile(), undefined);
+    } catch {
+      // Loss-prevention capture must never prevent Pi from exiting. The
+      // attendant remains the fallback for interrupted or failed shutdowns.
+    }
+  });
+
   pi.on("agent_settled", async (_event, ctx) => {
     if (!activeWorkflow || !ctx.hasUI) return;
     activeWorkflow = "";
@@ -305,20 +344,71 @@ export default function egregore(pi) {
   });
 
   pi.on("tool_call", async (event, ctx) => {
-    const mutates = event.toolName === "write" || event.toolName === "edit" ||
-      (event.toolName === "bash" && isMutatingBash(String(event.input?.command || "")));
+    const isFileWrite = event.toolName === "write" || event.toolName === "edit";
+    const command = String(event.input?.command || "");
+    const mutates = isFileWrite || (event.toolName === "bash" && isMutatingBash(command));
     if (!mutates) return;
 
-    const result = await pi.exec("git", ["-C", ctx.cwd, "branch", "--show-current"], { timeout: 5000 });
+    // Resolve the branch in the git context the write actually lands in.
+    // Task worktrees from `bin/agent.sh branch` live outside ctx.cwd but sit
+    // on a task branch, so checking ctx.cwd alone blocks legitimate worktree
+    // edits whenever the session checkout itself is on develop. Memory and
+    // managed repos have a different Git common dir and are outside this guard.
+    const hub = await gitContext(pi, ctx.cwd);
+    if (event.toolName === "bash" && mutatesOnlyRuntimeState(command, hub?.top || ctx.cwd)) return;
+    let operation = hub;
+    if (isFileWrite) {
+      const targetPath = String(event.input?.path || "");
+      const abs = isAbsolute(targetPath) ? targetPath : join(ctx.cwd, targetPath);
+      if (hub && isRuntimeStatePath(abs, hub.top)) return;
+      operation = await gitContext(pi, abs);
+      if (!operation && hub) {
+        const rel = relative(hub.top, abs);
+        if (rel.startsWith("..") || isAbsolute(rel)) return;
+      }
+    } else {
+      // bash: `git -C PATH` or a leading `cd DIR &&` retargets the command
+      // away from ctx.cwd — resolve the branch where it actually runs so
+      // worktree commits (git -C $WT commit) aren't misjudged by the session
+      // checkout's branch.
+      const gitC = command.match(/(?:^|[;&|]\s*)git\s+-C\s+("[^"]*"|'[^']*'|\S+)/);
+      const cdAnd = command.match(/^\s*cd\s+("[^"]*"|'[^']*'|\S+)\s*&&/);
+      const raw = (gitC && gitC[1]) || (cdAnd && cdAnd[1]);
+      if (raw) {
+        const target = raw.replace(/^['"]|['"]$/g, "");
+        const abs = isAbsolute(target) ? target : join(ctx.cwd, target);
+        operation = await gitContext(pi, abs);
+      }
+    }
+
+    if (hub && operation && operation.common !== hub.common) return;
+    const gitDir = operation?.top || hub?.top || ctx.cwd;
+    const result = await pi.exec("git", ["-C", gitDir, "branch", "--show-current"], { timeout: 5000 });
     const branch = String(result.stdout || "").trim();
     if (!PROTECTED_BRANCHES.has(branch)) return;
 
-    const consentFile = join(ctx.cwd, ".egregore-branch-consent");
+    // The documented escape hatch must itself be runnable: recording consent
+    // (echo 'develop' into .egregore-branch-consent) contains a redirect and
+    // would otherwise be blocked by this very gate.
+    if (event.toolName === "bash") {
+      const consentCmd = new RegExp(
+        "^\\s*echo\\s+['\"]?" + branch + "['\"]?\\s*>\\s*\\.egregore-branch-consent\\s*$"
+      );
+      if (consentCmd.test(String(event.input?.command || "").trim())) return;
+    }
+
+    const consentFile = join(gitDir, ".egregore-branch-consent");
     if (existsSync(consentFile) && readFileSync(consentFile, "utf8").trim() === branch) return;
 
     return {
       block: true,
-      reason: `Protected branch (${branch}). Create a task worktree first with: bin/agent.sh branch --topic "<work topic>". Only if the user explicitly authorizes writing on ${branch}, record it with: echo '${branch}' > .egregore-branch-consent`,
+      reason: [
+        `Protected branch (${branch}). Move project work to a task branch before writing.`,
+        `If the work topic is clear, run bin/agent.sh branch --topic "<work topic>" automatically and continue in the printed worktree; do not ask for routine Git permission.`,
+        `Ask only when the topic is genuinely ambiguous.`,
+        `Only when the user explicitly requested ${branch}, record consent with: echo '${branch}' > .egregore-branch-consent`,
+        "Memory, managed-repo, and runtime-state writes should bypass this project guard.",
+      ].join("\n"),
     };
   });
 }

package/runtime/pi/.pi/spec-manifest.json

@@ -1,8 +1,8 @@
 {
   "generatedBy": "bin/pi-render-spec.mjs",
   "source": "AGENTS.md generated Codex spec",
-  "sourceHash": "4c268f3ebb13",
-  "outputHash": "2d0d2ac65e04",
+  "sourceHash": "e0336f66e9b4",
+  "outputHash": "da44541a50fb",
   "adaptations": [
     "Pi project trust and APPEND_SYSTEM delivery",
     "Pi tool_call branch gate",

package/runtime/pi/AGENTS.md

@@ -96,6 +96,24 @@ When a user reports broken or missing framework behavior, the first question is
 
 ---
 
+## Cross-Runtime Compatibility
+
+Framework behavior must work across Claude Code, Codex, and Pi Egregores. Put
+shared mechanics in runtime-neutral `bin/` scripts; keep `.claude/`, `.codex/`,
+and `.pi/` as thin adapters to those mechanics. When changing startup, session
+lifecycle, capture, skills, or commands, trace all three runtime entry points
+and add or update a parity test. Do not call a framework change complete based
+on one runtime alone. Regenerate derived Codex and Pi specifications or runtime
+bundles whenever their sources change.
+
+---
+
+## Voice
+
+Egregore's voice is governed by `.claude/rules/voice-bedrock.md` (always loaded). Register-specific skills: `egregore-voice` (external), `product-voice` (internal UX), `character-v4` (encounters), `alpha-openers` (outreach). See voice-bedrock for the full register map.
+
+---
+
 ## On Launch — MANDATORY FIRST ACTION
 
 The `egregore` launcher renders the Egregore startup card (identity, team momentum, and pending work) via `bin/codex-session-start.sh` before Codex starts, and installs project skills. Do not rerun startup checks and do not narrate startup. The card ends with **"What are you working on?"** — that question is already on screen; treat the user's first message as the answer to it. To re-show the card, run `bash bin/codex-session-start.sh --card`.
@@ -146,19 +164,22 @@ If on develop after two messages, create a branch immediately from whatever cont
 
 ### Branch-guard protocol
 
-The `.codex/hooks/branch-guard.js` PreToolUse hook (enabled by the launcher via `--enable hooks`) denies writes, patches, and commits on `develop`/`main`/`master`. When it fires, choose between two paths based on how clear the topic is:
+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:
 
-- **Topic is obvious from the last turn** (user said "fix X", "add Y feature") → auto-branch silently with `bin/agent.sh branch --topic "<topic>"` (or the git checkout fallback), then continue. Say one sentence ("Creating `dev/{author}/{slug}`.") so the user isn't confused about why a new branch appeared.
-- **Topic is ambiguous** (open-ended exploration, user didn't specify what we're building yet) → ask **before** branching, in plain text with numbered options (Codex has no structured question tool):
+- **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:
 
   ```text
-  Need a working branch first. Topic?
+  What should I call this work?
     1. <suggested slug from context>
     2. <alternative slug>
     3. Other: (name it)
   ```
 
   Wait for the reply, then branch.
+- **The user explicitly requested the protected branch** → that request is consent. Record it with `echo '{branch}' > .egregore-branch-consent`, then retry. Never create the marker merely to silence the hook.
+
+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.
 
@@ -179,7 +200,22 @@ In connected mode, infrastructure credentials (Neo4j, Telegram) live on the API
 
 ## Knowledge Graph
 
-**Connected mode only.** Always use `bin/graph.sh` for Neo4j queries — never construct curl calls directly. See DEVELOPMENT.md §1 for usage examples and current schema. In local mode there is no graph; read `memory/` directly.
+**Connected mode only.** For the following intents, the named read must be the
+first retrieval action. Run the exact command with its safe default limit before
+opening files, running broad grep, inspecting `graph-op.sh`, or writing Cypher:
+
+- current work addressed to someone → `bash bin/graph-op.sh open-handoffs "<user>"`
+- unanswered questions for someone → `bash bin/graph-op.sh pending-questions "<user>"`
+- handoff → implementation → branch/PR/direction → `bash bin/graph-op.sh lineage "<topic>"`
+- company/person/topic across meetings → `bash bin/graph-op.sh meeting-history "<entity-or-topic>"`
+
+A question about calls, meetings, transcripts, demos, or how a conversation
+evolved is always `meeting-history` intent when it names a company, person, or
+topic—even when it does not ask for "current" or "live" state. Pass the shortest
+discriminative entity or topic (for example, `meeting-history "42CAP"`), not the
+whole question.
+
+Run `catalog` only when the route is unclear. Named reads return bounded stable fields and exact canonical `evidencePath` pointers; open only the returned files needed to answer. When a read reports partial coverage, use `unprojectedPaths` rather than claiming those files are represented in the graph. Use `bin/graph.sh` for unsupported Neo4j queries and never construct curl calls directly. See DEVELOPMENT.md §1 for the schema. In local mode there is no graph; read `memory/` directly.
 
 ---
 
@@ -268,13 +304,13 @@ Invoke commands from user intent — don't wait for the slash. Each command file
 **Knowledge** — `$search` `$deep-reflect` `$archive` `$note` `$add` `$meeting` `$ingest` `$scroll`
 **Identity** — `$me` (view profile or set display name)
 **Coordination** — `$ask` `$quest` `$issue` `$invite` `$delete-user` `$announce`
-**Connectors** — `$telegram-connect` (Telegram group setup)
+**Connectors** — `$telegram-connect` (Telegram group setup) `$teams-connect` (Microsoft Teams channel setup)
 **Git** — `$branch` `$commit` `$push` `$pr` `$save` `$review-pr` `$contribute`
 **Spirits** — `$summon` (persistent agent processes)
 **Infra** — `$setup` `$update` `$pull` `$env` `$infra` `$sync-repos` `$release` `$checkup`
 
 **Disambiguation:**
-- Knowledge: `$reflect` (share-ready) · `$note` (half-baked) · `$deep-reflect` (cross-reference) · `$archive` (AI patterns)
+- Knowledge: `$reflect` (share-ready) · `$note` (half-baked) · `$deep-reflect` (deep research over memory — questions AND cross-referencing) · `$archive` (AI patterns)
 - Finding things — the retrieval layers: **Grep/ls** (Claude Code / Codex file ops — always available, OSS) · **`bin/graph.sh`** (indexed relevance + relationships/status — paid). Use grep proactively; the graph deepens it when connected. (Semantic `$search` is dormant — evals showed it only pays off on massive unstructured data.)
 - Finding **something you generated** (a scroll, handoff, emissary, decision, any hosted egregore.xyz link): `bash bin/artifacts.sh find <query>`. Every generative surface already records into memory — hosted artifacts self-register into `memory/artifacts/` at publish (and the record is committed+pushed, so it's findable from *any* session, not just the one that made it); handoffs land in `memory/handoffs/`, emissaries in `memory/handoffs/outbound/`, decisions/findings/patterns in `memory/knowledge/`. The finder searches **all** of them, ranks title/topic matches above passing body mentions, tags each hit by type (`[document]`/`[handoff]`/`[emissary]`/`[decision]`), and surfaces the shareable URL. Findable by **content, not just name**, across all three layers — grep-first for OSS, folding in search + graph when available. *"bring me the artifact where I laid out our GTM plan"* → this.
 - Artifacts with questions: `$scroll` (living paper + embedded harvest, updates in place) · `$view` (static render) · `$harvest` (elicitation, no published face)
@@ -282,8 +318,8 @@ Invoke commands from user intent — don't wait for the slash. Each command file
 - Ending: `$wrap` (personal closure) · `$handoff` (notes for others) · `$save` (still working)
 - Tasks: `$todo` (personal) · `$quest` (team exploration) · `$issue` (something broken)
 - Questions: `$ask [person]` (async) · just ask (agent answers from context)
-- Ingestion: `$ingest meeting` · `$ingest user-interview` · `$ingest google` · ambiguous → ask which type
-- Connectors: `$telegram-connect` (Telegram group) · `$ingest` (bring content in)
+- Ingestion: `$ingest <file-or-folder>` (org-scoped corpus intake) · `$ingest meeting` · `$ingest user-interview` · `$ingest google` · ambiguous → ask which type
+- Connectors: `$telegram-connect` (Telegram group) · `$teams-connect` (MS Teams channel) · `$ingest` (bring content in)
 - Identity: `$me` — "who am I", "call me oz"
 - People: `$invite` (add) · `$delete-user` (remove)
 - PRs: `$pr` (create) · `$review-pr` (review)

package/runtime/pi/bin/activity-data.sh

@@ -9,7 +9,7 @@ trap "rm -rf $TMPDIR" EXIT
 
 # --- Read config ---
 API_URL=$(jq -r '.api_url // empty' "$SCRIPT_DIR/egregore.json" 2>/dev/null)
-API_KEY=$(grep '^EGREGORE_API_KEY=' "$SCRIPT_DIR/.env" 2>/dev/null | cut -d'=' -f2-)
+API_KEY="${EGREGORE_API_KEY:-$(grep '^EGREGORE_API_KEY=' "$SCRIPT_DIR/.env" 2>/dev/null | cut -d'=' -f2-)}"
 ORG=$(jq -r '.org_name // "Egregore"' "$SCRIPT_DIR/egregore.json" 2>/dev/null || echo "Egregore")
 DATE=$(date '+%b %d')
 

package/runtime/pi/bin/agent.sh

@@ -34,7 +34,8 @@ Runtime-neutral commands:
   branch --topic TEXT              Create or reuse a task branch/worktree
   save [--message TEXT]            Commit and push current repo + memory changes
   wrap --topic T --summary TEXT    Write a session wrap to memory/wraps
-  handoff --from A --to B --topic T [--body TEXT|--body-file PATH] [--no-push] [--no-publish] [--no-notify] [--json]
+  handoff --from A --to B --topic T [--intent action|feedback|fyi]
+      [--body TEXT|--body-file PATH] [--no-push] [--no-publish] [--no-notify] [--json]
   ask --from A --to B --topic T --question TEXT [--no-push]
       [--harvest-id ID --harvest-session-id ID --turn N
        --question-intent TEXT --context-mode blind|disclosed|comparative]
@@ -332,7 +333,7 @@ ensure_working_branch() {
 }
 
 cmd_save() {
-  local message="" topic="" no_pr=0 branch pushed="false" committed="false" pr_url="" existing_pr=""
+  local message="" topic="" no_pr=0 branch pushed="false" committed="false" pr_url="" existing_pr="" pr_number="" non_md="" merged="false"
 
   while [ $# -gt 0 ]; do
     case "$1" in
@@ -379,10 +380,31 @@ cmd_save() {
     fi
   fi
 
+  # Non-coding saves auto-merge to develop (same rule as /save and the
+  # handoff helper; policy in bin/lib/noncode.sh). `--auto` needs repo
+  # auto-merge + pending required checks; without branch protection it always
+  # errors, so fall back to a direct merge.
+  if [ -n "$pr_url" ]; then
+    # 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
+    }
+    pr_number="${pr_url##*/}"
+    non_code="$(noncode_blockers origin/develop "$SCRIPT_DIR")"
+    if [ -z "$non_code" ] && [ -n "$pr_number" ]; then
+      if gh pr merge "$pr_number" --auto --merge >/dev/null 2>&1 \
+         || gh pr merge "$pr_number" --merge >/dev/null 2>&1; then
+        merged="true"
+      fi
+    fi
+  fi
+
   echo "branch: ${branch:-none}"
   echo "commit: $committed"
   echo "push: $pushed"
   [ -n "$pr_url" ] && echo "pr: $pr_url"
+  [ "$merged" = "true" ] && echo "merge: non-coding, merged to develop"
   return 0
 }
 
@@ -413,31 +435,38 @@ cmd_wrap() {
   fi
   [ -n "$body" ] || body="$summary"
 
-  local month rel abs slug now
-  month="$(date +%Y-%m)"
-  slug="$(slugify "$topic")"
-  [ -n "$slug" ] || slug="session"
-  rel="wraps/$month/$(date +%d)-${from}-${slug}.md"
-  abs="$MEMORY_DIR/$rel"
-  now="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-  mkdir -p "$(dirname "$abs")"
-
-  {
-    printf '# Wrap: %s\n\n' "$topic"
-    printf '**Date**: %s\n' "$(date +%Y-%m-%d)"
-    printf '**Author**: %s\n' "$from"
-    printf '**Wrapped At**: %s\n\n' "$now"
-    printf '## Summary\n\n%s\n\n' "$summary"
-    printf '## Notes\n\n%s\n' "$body"
-  } > "$abs"
-
-  NO_PUSH="$no_push" save_memory "Wrap: $topic" "$rel"
+  local tmpd result rel session_id branch
+  local capture_args=(--mode personal)
+  tmpd="$(mktemp -d -t egregore-agent-wrap-XXXXXX)"
+  trap 'rm -rf "$tmpd"' RETURN
+  session_id="$(cat "$SCRIPT_DIR/.egregore-session-id" 2>/dev/null || true)"
+  branch="$(git -C "$SCRIPT_DIR" branch --show-current 2>/dev/null || true)"
+  [ "$no_push" = "1" ] && capture_args+=(--no-push)
+
+  printf '%s\n' "$body" |
+    TMPDIR="$tmpd" bash "$SCRIPT_DIR/bin/capture-run.sh" \
+      "${capture_args[@]}" \
+      --author "$from" \
+      --topic "$topic" \
+      --summary "$summary" \
+      --session-id "$session_id" \
+      --branch "$branch" >/dev/null
+
+  result="$tmpd/capture-run-result.json"
+  rel="$(jq -r '.file // empty' "$result" 2>/dev/null || true)"
+  [ -n "$rel" ] || die "wrap was not created"
   echo "wrap: memory/$rel"
+
+  # Session close: non-coding core-repo changes save + merge themselves
+  # (gated inside session-autosave.sh — code is never auto-committed).
+  if [ "$no_push" = "0" ]; then
+    ( bash "$SCRIPT_DIR/bin/session-autosave.sh" --dir "$SCRIPT_DIR" >/dev/null 2>&1 & ) >/dev/null 2>&1
+  fi
 }
 
 cmd_handoff() {
   ensure_memory
-  local from="" to="" topic="" body="" body_file="" project=""
+  local from="" to="" topic="" body="" body_file="" project="" intent="action"
   local no_publish=0 no_notify=0 json=0
   NO_PUSH=0
 
@@ -449,6 +478,7 @@ cmd_handoff() {
       --body) body="${2:-}"; shift 2 ;;
       --body-file) body_file="${2:-}"; shift 2 ;;
       --project) project="${2:-}"; shift 2 ;;
+      --intent) intent="${2:-}"; shift 2 ;;
       --no-push) NO_PUSH=1; shift ;;
       --no-publish) no_publish=1; shift ;;
       --no-notify) no_notify=1; shift ;;
@@ -460,6 +490,10 @@ cmd_handoff() {
   [ -z "$from" ] && from="$(person_from_state)"
   [ -n "$from" ] || die "handoff requires --from"
   [ -n "$topic" ] || die "handoff requires --topic"
+  case "$intent" in
+    action|feedback|fyi) ;;
+    *) die "invalid --intent: $intent (action|feedback|fyi)" ;;
+  esac
   if [ -n "$body_file" ]; then
     [ -f "$body_file" ] || die "body file not found: $body_file"
     body="$(cat "$body_file")"
@@ -480,6 +514,7 @@ cmd_handoff() {
   [ -n "$project" ] && project_line="**Project**: $project"
   [ -n "$to" ] && handoff_args+=(--recipient "$to")
   [ -n "$project" ] && handoff_args+=(--project "$project")
+  handoff_args+=(--intent "$intent")
   [ "$NO_PUSH" = "1" ] && handoff_args+=(--no-push)
   [ "$no_publish" = "1" ] && handoff_args+=(--no-publish)
   [ "$no_notify" = "1" ] && handoff_args+=(--no-notify)
@@ -489,10 +524,12 @@ cmd_handoff() {
     printf '**Date**: %s\n' "$today"
     printf '**Author**: %s\n' "$from"
     [ -n "$to" ] && printf '**To**: %s\n' "$to"
+    printf '**Intent**: %s\n' "$intent"
     [ -n "$project_line" ] && printf '%s\n' "$project_line"
     printf '\n## Briefing\n\n%s\n\n' "$body"
     printf '## Next Steps\n\n- Continue from this handoff using the shared Egregore memory protocol.\n'
-  } | TMPDIR="$tmpd" bash "$SCRIPT_DIR/bin/handoff-run.sh" \
+  } | TMPDIR="$tmpd" bash "$SCRIPT_DIR/bin/capture-run.sh" \
+        --mode addressed \
         --author "$from" \
         --topic "$topic" \
         "${handoff_args[@]}" \
@@ -509,6 +546,12 @@ cmd_handoff() {
   [ -s "$stdout_file" ] && sed 's/^/status: /' "$stdout_file"
   echo "handoff: memory/$rel"
   echo "result: $result_out"
+
+  # Parity with the Claude /handoff skill: save core-repo session work in the
+  # background (non-coding diffs auto-merge to develop, code stays in a PR).
+  if [ "$NO_PUSH" = "0" ]; then
+    ( bash "$SCRIPT_DIR/bin/handoff-save-egregore.sh" "$from" "$topic" --repo-dir "$SCRIPT_DIR" >/dev/null 2>&1 & ) >/dev/null 2>&1
+  fi
 }
 
 cmd_ask() {