create-egregore 0.19.8 → 0.19.12

package/runtime/pi/bin/agent.sh

@@ -32,9 +32,13 @@ Runtime-neutral commands:
                                    Hybrid recall over shared memory (qmd)
   people                           List known people from memory/people
   branch --topic TEXT              Create or reuse a task branch/worktree
-  save [--message TEXT]            Commit and push current repo + memory changes
+  save [--message TEXT] [--pr-body TEXT|--pr-body-file PATH]
+                                   Commit and push current repo + memory changes;
+                                   PR body follows .claude/context/pr-format.md
+                                   (auto-generated skeleton if not provided)
   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]
@@ -331,13 +335,26 @@ ensure_working_branch() {
   echo "$branch"
 }
 
+build_pr_body() {
+  # Compliant fallback PR body (spec: .claude/context/pr-format.md) built
+  # from the commit log + diff when the calling agent supplies none.
+  local topic="${1:-portable save}" commits stat
+  commits="$(git -C "$SCRIPT_DIR" log --pretty='- %s' "origin/develop..HEAD" 2>/dev/null | head -8)"
+  [ -n "$commits" ] || commits="- (commit list unavailable — see the Files tab)"
+  stat="$(git -C "$SCRIPT_DIR" diff --shortstat "origin/develop...HEAD" 2>/dev/null | sed 's/^ *//')"
+  printf '## What\n%s\n\n## Why\nShell-agent session save — topic: %s. Body auto-generated by bin/agent.sh; pass --pr-body for a hand-written description.\n\n## Verification\nNot verified — auto-generated skeleton; review the diff before merging.%s\n\n🤖 Saved via bin/agent.sh\n' \
+    "$commits" "$topic" "${stat:+ ($stat)}"
+}
+
 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" pr_body="" pr_body_file=""
 
   while [ $# -gt 0 ]; do
     case "$1" in
       --message|-m) message="${2:-}"; shift 2 ;;
       --topic) topic="${2:-}"; shift 2 ;;
+      --pr-body) pr_body="${2:-}"; shift 2 ;;
+      --pr-body-file) pr_body_file="${2:-}"; shift 2 ;;
       --no-pr) no_pr=1; shift ;;
       *) die "unknown save option: $1" ;;
     esac
@@ -375,7 +392,31 @@ cmd_save() {
     if [ -n "$existing_pr" ]; then
       pr_url="$existing_pr"
     else
-      pr_url="$(gh pr create --base develop --head "$branch" --title "$message" --body "Saved via bin/agent.sh save." 2>/dev/null || true)"
+      if [ -z "$pr_body" ] && [ -n "$pr_body_file" ] && [ -f "$pr_body_file" ]; then
+        pr_body="$(cat "$pr_body_file")"
+      fi
+      [ -n "$pr_body" ] || pr_body="$(build_pr_body "$topic")"
+      pr_url="$(gh pr create --base develop --head "$branch" --title "$message" --body "$pr_body" 2>/dev/null || true)"
+    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
 
@@ -383,6 +424,7 @@ cmd_save() {
   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 +455,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 +498,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 +510,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 +534,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 +544,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 +566,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() {