jonah-fleet 1.6.0 → 1.9.0

package/templates/workflows/trigger-autowork-on-merge.yml

@@ -4,18 +4,17 @@ on:
   pull_request:
     types: [closed]
 
-concurrency:
-  group: autowork-merge-pr-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
 jobs:
   fire-autowork:
     if: >-
       github.event.pull_request.merged == true &&
       github.event.pull_request.base.ref == 'main' &&
       github.event.pull_request.head.repo.full_name == github.repository
+    concurrency:
+      group: autowork-merge-pr-${{ github.event.pull_request.number }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
-    timeout-minutes: 35
+    timeout-minutes: 70
     permissions:
       contents: write
       issues: write
@@ -50,7 +49,7 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT || github.token }}
-
+          persist-credentials: false
 
       - name: Setup Node.js
         if: steps.pick.outputs.skip != 'true'
@@ -60,10 +59,13 @@ jobs:
 
       - name: Configure Git author identity
         if: steps.pick.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          gh auth setup-git
 
       - name: Cache Antigravity CLI
         if: steps.pick.outputs.skip != 'true'
@@ -110,15 +112,84 @@ jobs:
           fi
           echo "skills_prompt=$SKILLS_PROMPT" >> "$GITHUB_OUTPUT"
 
+      - name: Resolve routine configuration
+        if: steps.pick.outputs.skip != 'true'
+        id: routine-config
+        run: |
+          ROUTINE="autowork"
+          DEFAULT_MODEL="gemini-3.8-flash-high"
+          DEFAULT_TIMEOUT="60"
+
+          MODEL="$DEFAULT_MODEL"
+          TIMEOUT="$DEFAULT_TIMEOUT"
+
+          if [ -f "agents-manifest.json" ]; then
+            CONFIG_JSON=$(node -e '
+              try {
+                const fs = require("fs");
+                const m = JSON.parse(fs.readFileSync("agents-manifest.json", "utf8"));
+                const r = process.argv[1];
+                const model = m.models?.[r] || m.models?.default;
+                const timeout = m.budgets?.timeoutMinutes?.[r] || m.budgets?.timeoutMinutes?.default;
+                console.log(JSON.stringify({ model: model || "", timeout: timeout ? String(timeout) : "" }));
+              } catch (e) {
+                console.log(JSON.stringify({ model: "", timeout: "" }));
+              }
+            ' "$ROUTINE")
+
+            RESOLVED_MODEL=$(node -e "try { console.log(JSON.parse(process.argv[1]).model || ''); } catch {}" "$CONFIG_JSON")
+            RESOLVED_TIMEOUT=$(node -e "try { console.log(JSON.parse(process.argv[1]).timeout || ''); } catch {}" "$CONFIG_JSON")
+
+            if [ -n "$RESOLVED_MODEL" ]; then
+              MODEL="$RESOLVED_MODEL"
+            fi
+            if [ -n "$RESOLVED_TIMEOUT" ]; then
+              TIMEOUT="$RESOLVED_TIMEOUT"
+            fi
+          fi
+
+          echo "model=$MODEL" >> "$GITHUB_OUTPUT"
+          echo "print_timeout=${TIMEOUT}m" >> "$GITHUB_OUTPUT"
+          echo "Resolved routine configuration: model=$MODEL, timeout=${TIMEOUT}m"
+
+      - name: Initialize Routine Run Issue
+        if: steps.pick.outputs.skip != 'true'
+        id: run-issue
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          PR_NUM: ${{ github.event.pull_request.number }}
+          EVENT_NAME: ${{ github.event_name }}
+          RUN_ID: ${{ github.run_id }}
+          SERVER_URL: ${{ github.server_url }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          TIMESTAMP=$(date -u +"%Y-%m-%dT%H-%M-%SZ")
+          TITLE="[autowork] run ${TIMESTAMP} (on PR #${PR_NUM} merge)"
+          BODY="### Autonomous Routine Execution in Progress
+          - **Routine**: \`autowork\`
+          - **Timestamp**: \`${TIMESTAMP}\`
+          - **Trigger**: \`${EVENT_NAME}\` (PR #${PR_NUM} merged)
+          - **Run ID**: [\`${RUN_ID}\`](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})
+
+          ---
+          _Generated by [Antigravity](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})_"
+          ISSUE_URL=$(gh issue create --title "$TITLE" --body "$BODY" --label "routine-log,routine:autowork,status:running,runner:github-actions")
+          ISSUE_NUMBER=$(echo "$ISSUE_URL" | grep -oE '[0-9]+$')
+          echo "issue_number=$ISSUE_NUMBER" >> "$GITHUB_OUTPUT"
+          echo "ROUTINE_ISSUE_NUMBER=$ISSUE_NUMBER" >> "$GITHUB_ENV"
+
       - name: Run Autowork
         if: steps.pick.outputs.skip != 'true'
-        timeout-minutes: 30
+        timeout-minutes: 60
         env:
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
           GOOGLE_API_KEY: ${{ secrets.GEMINI_API_KEY }}
           ANTIGRAVITY_API_KEY: ${{ secrets.GEMINI_API_KEY }}
           GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          ROUTINE_ISSUE_NUMBER: ${{ steps.run-issue.outputs.issue_number }}
           SKILLS_PROMPT: ${{ steps.skills.outputs.skills_prompt }}
+          MODEL: ${{ steps.routine-config.outputs.model || 'gemini-3.8-flash-high' }}
+          PRINT_TIMEOUT: ${{ steps.routine-config.outputs.print_timeout || '60m' }}
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_RUN_ID: ${{ github.run_id }}
@@ -126,7 +197,105 @@ jobs:
           PROMPT="You are the Autowork routine for this repository. A PR was recently merged. Read and follow .github/prompts/autowork.md. ${SKILLS_PROMPT} You are in Scan mode: converge on open PRs, close merged issues, and pick the next unblocked priority issue."
 
           agy -p "$PROMPT" \
-            --model gemini-3.7-flash-high \
+            --model "$MODEL" \
             --output-format text \
-            --print-timeout 30m \
+            --print-timeout "$PRINT_TIMEOUT" \
             --dangerously-skip-permissions
+
+      - name: Emit run summary
+        if: always() && steps.pick.outputs.skip != 'true'
+        run: |
+          REPORT_FILE=".jonah-fleet/run-report.md"
+          if [ -f "$REPORT_FILE" ] && [ -n "$GITHUB_STEP_SUMMARY" ]; then
+            cat "$REPORT_FILE" >> "$GITHUB_STEP_SUMMARY"
+          fi
+
+      - name: Emit Fleet Telemetry (Opt-in)
+        if: always() && steps.pick.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          TELEMETRY_ENDPOINT: ${{ secrets.JONAH_FLEET_TELEMETRY_ENDPOINT }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_RUN_ID: ${{ github.run_id }}
+          GITHUB_RUN_NUMBER: ${{ github.run_number }}
+        run: |
+          REPORT_FILE=".jonah-fleet/run-report.md"
+          if [ -f "$REPORT_FILE" ]; then
+            npx --yes jonah-fleet telemetry --emit --log "$REPORT_FILE" --endpoint "$TELEMETRY_ENDPOINT" || true
+          fi
+
+      - name: Verify Atomic Handoff Invariant (PR Existence Guard)
+        if: always() && steps.pick.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          REPORT_FILE=".jonah-fleet/run-report.md"
+          if [ -f "$REPORT_FILE" ]; then
+            if grep -q "Result.*SUCCESS" "$REPORT_FILE"; then
+              WORKED_BRANCH=$(grep -E '^\s*-\s*(Pushed branch|Branch):' "$REPORT_FILE" | head -n 1 | sed -E 's/.*`([^`]+)`.*/\1/')
+              if [ -n "$WORKED_BRANCH" ] && [[ "$WORKED_BRANCH" =~ (feat|fix)/ ]]; then
+                echo "Verifying PR existence for branch: $WORKED_BRANCH"
+                PR_COUNT=$(gh pr list --head "$WORKED_BRANCH" --state all --json number --jq 'length' 2>/dev/null || echo "0")
+                if [ "$PR_COUNT" -eq 0 ]; then
+                  echo "::error::Atomic Handoff Invariant Violated: Branch '$WORKED_BRANCH' was implemented and pushed, but no pull request exists on GitHub!" >&2
+                  exit 1
+                fi
+                echo "✓ Verified pull request exists on GitHub for branch: $WORKED_BRANCH"
+              fi
+            fi
+          fi
+
+      - name: Reconcile Routine Run Issue
+        if: always() && steps.pick.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          ISSUE_NUMBER: ${{ steps.run-issue.outputs.issue_number }}
+          JOB_STATUS: ${{ job.status }}
+          EVENT_NAME: ${{ github.event_name }}
+          RUN_ID: ${{ github.run_id }}
+          SERVER_URL: ${{ github.server_url }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          if [ -z "$ISSUE_NUMBER" ]; then
+            echo "No routine issue to reconcile."
+            exit 0
+          fi
+
+          REPORT_FILE=".jonah-fleet/run-report.md"
+
+          if [ -f "$REPORT_FILE" ]; then
+            BODY_CONTENT=$(cat "$REPORT_FILE")
+          else
+            BODY_CONTENT="### Autonomous Routine Execution Completed (${JOB_STATUS})
+          - **Routine**: \`autowork\`
+          - **Run ID**: [\`${RUN_ID}\`](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})
+          - **Trigger**: \`${EVENT_NAME}\`"
+          fi
+
+          FINAL_BODY="${BODY_CONTENT}
+
+          ---
+          _Generated by [Antigravity](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})_"
+
+          TEMP_BODY=$(mktemp)
+          echo "$FINAL_BODY" > "$TEMP_BODY"
+          gh issue edit "$ISSUE_NUMBER" --body-file "$TEMP_BODY"
+          rm -f "$TEMP_BODY"
+
+          if [ "$JOB_STATUS" = "success" ]; then
+            gh issue edit "$ISSUE_NUMBER" --add-label "status:success" --remove-label "status:running"
+            gh issue close "$ISSUE_NUMBER" --reason completed
+            echo "✓ Routine run issue #$ISSUE_NUMBER closed as completed."
+          else
+            INTERRUPTION_BODY="### ❌ Milestone: Run Interrupted / Failed
+- **Routine**: \`autowork\`
+- **Status**: Workflow job failed or timed out (\`${JOB_STATUS}\`)
+- **Step**: Actions execution halted before normal completion
+- **Action Log**: [View GitHub Actions Run](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})
+
+---
+_Generated by [Antigravity](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})_"
+            gh issue comment "$ISSUE_NUMBER" --body "$INTERRUPTION_BODY" || true
+            gh issue edit "$ISSUE_NUMBER" --add-label "status:failure,needs-attention" --remove-label "status:running"
+            echo "⚠️ Routine run issue #$ISSUE_NUMBER left open for triage (status: $JOB_STATUS)."
+          fi

package/templates/workflows/trigger-review-routine.yml

@@ -3,8 +3,6 @@ name: Trigger Review Routine
 on:
   pull_request:
     types: [ready_for_review, opened, reopened, synchronize, review_requested]
-    paths-ignore:
-      - '.github/prompts/logs/**'
   schedule:
     # Periodic scan sweep every 2 hours to catch and recover any orphaned or unreviewed ready PRs
     - cron: '45 */2 * * *'
@@ -17,10 +15,6 @@ on:
   issue_comment:
     types: [created]
 
-concurrency:
-  group: review-routine-pr-${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number || 'scan' }}
-  cancel-in-progress: true
-
 jobs:
   trigger-routine:
     if: >-
@@ -42,8 +36,11 @@ jobs:
         contains(github.event.comment.body, '/peer-review') ||
         contains(github.event.comment.body, '/retrigger') ||
         contains(github.event.comment.body, '/re-review')))
+    concurrency:
+      group: review-routine-pr-${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number || 'scan' }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
-    timeout-minutes: 35
+    timeout-minutes: 65
     permissions:
       contents: write
       actions: read
@@ -56,12 +53,14 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           PR_NUM: ${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
+          EVENT_NAME: ${{ github.event_name }}
+          REPOSITORY: ${{ github.repository }}
         run: |
           if [ -z "$PR_NUM" ]; then
-            if [ "${{ github.event_name }}" = "schedule" ]; then
-              open_prs=$(gh api "repos/${{ github.repository }}/pulls?state=open&per_page=1" --jq 'length' 2>/dev/null || echo "0")
+            if [ "$EVENT_NAME" = "schedule" ]; then
+              open_prs=$(gh api "repos/${REPOSITORY}/pulls?state=open&per_page=1" --jq 'length' 2>/dev/null || echo "0")
               if [ "$open_prs" -eq "0" ]; then
-                echo "No open PRs found in ${{ github.repository }} — skipping scheduled review routine scan."
+                echo "No open PRs found in ${REPOSITORY} — skipping scheduled review routine scan."
                 echo "skip=true" >> "$GITHUB_OUTPUT"
                 exit 0
               fi
@@ -87,7 +86,7 @@ jobs:
             return 1
           }
 
-          if ! pr=$(gh_api_retry "repos/${{ github.repository }}/pulls/${PR_NUM}"); then
+          if ! pr=$(gh_api_retry "repos/${REPOSITORY}/pulls/${PR_NUM}"); then
             echo "skip=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
@@ -110,7 +109,7 @@ jobs:
           # Strict allowlist: only trigger immediate cloud review if explicitly labeled priority/P0 or priority/P1.
           # Untagged PRs and lower-priority PRs (P2/P3) skip immediate cloud review and are handled by local peer-review daemons
           # (cloud scheduled watchdog sweep will catch up if unreviewed > 48h).
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
+          if [ "$EVENT_NAME" = "pull_request" ]; then
             labels=$(echo "$pr" | jq -r '.labels[].name' 2>/dev/null || echo "")
             if ! echo "$labels" | grep -qE '^priority/P[01]$'; then
               echo "PR is not explicitly labeled priority/P0 or priority/P1 — skipping immediate cloud review for local peer-review daemon."
@@ -126,6 +125,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup Node.js
         if: steps.guard.outputs.skip != 'true'
@@ -135,10 +135,13 @@ jobs:
 
       - name: Configure Git author identity
         if: steps.guard.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          gh auth setup-git
 
       - name: Cache Antigravity CLI
         if: steps.guard.outputs.skip != 'true'
@@ -171,9 +174,79 @@ jobs:
           printf '%s' "$ANTIGRAVITY_OAUTH_TOKEN" > "$HOME/.gemini/antigravity-cli/antigravity-oauth-token"
           chmod 600 "$HOME/.gemini/antigravity-cli/antigravity-oauth-token"
 
+      - name: Resolve routine configuration
+        if: steps.guard.outputs.skip != 'true'
+        id: routine-config
+        run: |
+          ROUTINE="peer-review"
+          DEFAULT_MODEL="gemini-3.8-flash-high"
+          DEFAULT_TIMEOUT="55"
+
+          MODEL="$DEFAULT_MODEL"
+          TIMEOUT="$DEFAULT_TIMEOUT"
+
+          if [ -f "agents-manifest.json" ]; then
+            CONFIG_JSON=$(node -e '
+              try {
+                const fs = require("fs");
+                const m = JSON.parse(fs.readFileSync("agents-manifest.json", "utf8"));
+                const r = process.argv[1];
+                const model = m.models?.[r] || m.models?.default;
+                const timeout = m.budgets?.timeoutMinutes?.[r] || m.budgets?.timeoutMinutes?.default;
+                console.log(JSON.stringify({ model: model || "", timeout: timeout ? String(timeout) : "" }));
+              } catch (e) {
+                console.log(JSON.stringify({ model: "", timeout: "" }));
+              }
+            ' "$ROUTINE")
+
+            RESOLVED_MODEL=$(node -e "try { console.log(JSON.parse(process.argv[1]).model || ''); } catch {}" "$CONFIG_JSON")
+            RESOLVED_TIMEOUT=$(node -e "try { console.log(JSON.parse(process.argv[1]).timeout || ''); } catch {}" "$CONFIG_JSON")
+
+            if [ -n "$RESOLVED_MODEL" ]; then
+              MODEL="$RESOLVED_MODEL"
+            fi
+            if [ -n "$RESOLVED_TIMEOUT" ]; then
+              TIMEOUT="$RESOLVED_TIMEOUT"
+            fi
+          fi
+
+          echo "model=$MODEL" >> "$GITHUB_OUTPUT"
+          echo "print_timeout=${TIMEOUT}m" >> "$GITHUB_OUTPUT"
+          echo "Resolved routine configuration: model=$MODEL, timeout=${TIMEOUT}m"
+
+      - name: Initialize Routine Run Issue
+        if: steps.guard.outputs.skip != 'true'
+        id: run-issue
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          PR_ARG: ${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
+          EVENT_NAME: ${{ github.event_name }}
+          RUN_ID: ${{ github.run_id }}
+          SERVER_URL: ${{ github.server_url }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          TIMESTAMP=$(date -u +"%Y-%m-%dT%H-%M-%SZ")
+          if [ -n "$PR_ARG" ]; then
+            TITLE="[peer-review] run ${TIMESTAMP} (PR #${PR_ARG})"
+          else
+            TITLE="[peer-review] run ${TIMESTAMP}"
+          fi
+          BODY="### Autonomous Routine Execution in Progress
+          - **Routine**: \`peer-review\`
+          - **Timestamp**: \`${TIMESTAMP}\`
+          - **Trigger**: \`${EVENT_NAME}\`
+          - **Run ID**: [\`${RUN_ID}\`](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})
+
+          ---
+          _Generated by [Antigravity](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})_"
+          ISSUE_URL=$(gh issue create --title "$TITLE" --body "$BODY" --label "routine-log,routine:peer-review,status:running,runner:github-actions")
+          ISSUE_NUMBER=$(echo "$ISSUE_URL" | grep -oE '[0-9]+$')
+          echo "issue_number=$ISSUE_NUMBER" >> "$GITHUB_OUTPUT"
+          echo "ROUTINE_ISSUE_NUMBER=$ISSUE_NUMBER" >> "$GITHUB_ENV"
+
       - name: Run Peer Review
         if: steps.guard.outputs.skip != 'true'
-        timeout-minutes: 30
+        timeout-minutes: 55
         env:
           GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
           GOOGLE_API_KEY: ${{ secrets.GEMINI_API_KEY }}
@@ -181,6 +254,9 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
           PR_URL: ${{ github.event.pull_request.html_url || github.event.issue.html_url }}
+          ROUTINE_ISSUE_NUMBER: ${{ steps.run-issue.outputs.issue_number }}
+          MODEL: ${{ steps.routine-config.outputs.model || 'gemini-3.8-flash-high' }}
+          PRINT_TIMEOUT: ${{ steps.routine-config.outputs.print_timeout || '55m' }}
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_RUN_ID: ${{ github.run_id }}
@@ -194,10 +270,14 @@ jobs:
             PROMPT="You are the Peer Review routine for this repository. Read and follow the instructions in .github/prompts/peer-review.md exactly. You are in Scan mode: check open PRs and select the highest-priority PR to review."
           fi
 
+          if [ -n "$ROUTINE_ISSUE_NUMBER" ]; then
+            PROMPT="$PROMPT Tracking run log issue: #${ROUTINE_ISSUE_NUMBER}."
+          fi
+
           agy -p "$PROMPT" \
-            --model gemini-3.7-flash-high \
+            --model "$MODEL" \
             --output-format text \
-            --print-timeout 30m \
+            --print-timeout "$PRINT_TIMEOUT" \
             --dangerously-skip-permissions
 
       - name: Handle Review Failure & PR Notification
@@ -205,12 +285,17 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
           PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number || inputs.pr_number }}
+          ROUTINE_ISSUE_NUMBER: ${{ steps.run-issue.outputs.issue_number }}
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_RUN_ID: ${{ github.run_id }}
         run: |
           if [ -n "$PR_NUMBER" ]; then
-            gh pr comment "$PR_NUMBER" --body "⚠️ **Peer Review Routine Notice**: The automated review session encountered an execution error (e.g., API rate/quota limit or runner interruption). The review will be retried automatically on the next scheduled scan sweep or can be re-triggered immediately by commenting \`/review\` on this PR.
+            LOG_REF=""
+            if [ -n "$ROUTINE_ISSUE_NUMBER" ]; then
+              LOG_REF=" · [Run Log #${ROUTINE_ISSUE_NUMBER}](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/issues/${ROUTINE_ISSUE_NUMBER})"
+            fi
+            gh pr comment "$PR_NUMBER" --body "⚠️ **Peer Review Routine Notice**: The automated review session encountered an execution error (e.g., API rate/quota limit or runner interruption)${LOG_REF}. The review will be retried automatically on the next scheduled scan sweep or can be re-triggered immediately by commenting \`/review\` on this PR.
 
           _Generated by [Antigravity](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})_" || true
           fi
@@ -218,9 +303,9 @@ jobs:
       - name: Emit run summary
         if: always() && steps.guard.outputs.skip != 'true'
         run: |
-          LATEST_LOG=$(ls -t .github/prompts/logs/peer-review/*.md 2>/dev/null | head -n 1)
-          if [ -n "$LATEST_LOG" ] && [ -n "$GITHUB_STEP_SUMMARY" ]; then
-            cat "$LATEST_LOG" >> "$GITHUB_STEP_SUMMARY"
+          REPORT_FILE=".jonah-fleet/run-report.md"
+          if [ -f "$REPORT_FILE" ] && [ -n "$GITHUB_STEP_SUMMARY" ]; then
+            cat "$REPORT_FILE" >> "$GITHUB_STEP_SUMMARY"
           fi
 
       - name: Emit Fleet Telemetry (Opt-in)
@@ -232,7 +317,62 @@ jobs:
           GITHUB_RUN_ID: ${{ github.run_id }}
           GITHUB_RUN_NUMBER: ${{ github.run_number }}
         run: |
-          LATEST_LOG=$(ls -t .github/prompts/logs/peer-review/*.md 2>/dev/null | head -n 1)
-          if [ -n "$LATEST_LOG" ] && [ -f "$LATEST_LOG" ]; then
-            npx --yes jonah-fleet telemetry --emit --log "$LATEST_LOG" --endpoint "$TELEMETRY_ENDPOINT" || true
+          REPORT_FILE=".jonah-fleet/run-report.md"
+          if [ -f "$REPORT_FILE" ]; then
+            npx --yes jonah-fleet telemetry --emit --log "$REPORT_FILE" --endpoint "$TELEMETRY_ENDPOINT" || true
+          fi
+
+      - name: Reconcile Routine Run Issue
+        if: always() && steps.guard.outputs.skip != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          ISSUE_NUMBER: ${{ steps.run-issue.outputs.issue_number }}
+          JOB_STATUS: ${{ job.status }}
+          EVENT_NAME: ${{ github.event_name }}
+          RUN_ID: ${{ github.run_id }}
+          SERVER_URL: ${{ github.server_url }}
+          REPOSITORY: ${{ github.repository }}
+        run: |
+          if [ -z "$ISSUE_NUMBER" ]; then
+            echo "No routine issue to reconcile."
+            exit 0
+          fi
+
+          REPORT_FILE=".jonah-fleet/run-report.md"
+
+          if [ -f "$REPORT_FILE" ]; then
+            BODY_CONTENT=$(cat "$REPORT_FILE")
+          else
+            BODY_CONTENT="### Autonomous Routine Execution Completed (${JOB_STATUS})
+          - **Routine**: \`peer-review\`
+          - **Run ID**: [\`${RUN_ID}\`](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})
+          - **Trigger**: \`${EVENT_NAME}\`"
+          fi
+
+          FINAL_BODY="${BODY_CONTENT}
+
+          ---
+          _Generated by [Antigravity](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})_"
+
+          TEMP_BODY=$(mktemp)
+          echo "$FINAL_BODY" > "$TEMP_BODY"
+          gh issue edit "$ISSUE_NUMBER" --body-file "$TEMP_BODY"
+          rm -f "$TEMP_BODY"
+
+          if [ "$JOB_STATUS" = "success" ]; then
+            gh issue edit "$ISSUE_NUMBER" --add-label "status:success" --remove-label "status:running"
+            gh issue close "$ISSUE_NUMBER" --reason completed
+            echo "✓ Routine run issue #$ISSUE_NUMBER closed as completed."
+          else
+            INTERRUPTION_BODY="### ❌ Milestone: Run Interrupted / Failed
+- **Routine**: \`peer-review\`
+- **Status**: Workflow job failed or timed out (\`${JOB_STATUS}\`)
+- **Step**: Actions execution halted before normal completion
+- **Action Log**: [View GitHub Actions Run](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})
+
+---
+_Generated by [Antigravity](${SERVER_URL}/${REPOSITORY}/actions/runs/${RUN_ID})_"
+            gh issue comment "$ISSUE_NUMBER" --body "$INTERRUPTION_BODY" || true
+            gh issue edit "$ISSUE_NUMBER" --add-label "status:failure,needs-attention" --remove-label "status:running"
+            echo "⚠️ Routine run issue #$ISSUE_NUMBER left open for triage (status: $JOB_STATUS)."
           fi