jonah-fleet 1.8.0 → 1.9.0

package/templates/workflows/issues-housekeeping-cron.yml

@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -32,10 +33,13 @@ jobs:
           node-version: 22
 
       - name: Configure Git author identity
+        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
         id: cache-agy
@@ -69,7 +73,7 @@ jobs:
         id: routine-config
         run: |
           ROUTINE="issues-housekeeping"
-          DEFAULT_MODEL="gemini-3.7-flash"
+          DEFAULT_MODEL="gemini-3.8-flash-medium"
           DEFAULT_TIMEOUT="40"
 
           MODEL="$DEFAULT_MODEL"
@@ -104,6 +108,30 @@ jobs:
           echo "print_timeout=${TIMEOUT}m" >> "$GITHUB_OUTPUT"
           echo "Resolved routine configuration: model=$MODEL, timeout=${TIMEOUT}m"
 
+      - name: Initialize Routine Run Issue
+        id: run-issue
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          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="[issues-housekeeping] run ${TIMESTAMP}"
+          BODY="### Autonomous Routine Execution in Progress
+          - **Routine**: \`issues-housekeeping\`
+          - **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:issues-housekeeping,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 Issues Housekeeping
         timeout-minutes: 40
         env:
@@ -111,6 +139,9 @@ jobs:
           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 }}
+          MODEL: ${{ steps.routine-config.outputs.model || 'gemini-3.8-flash-medium' }}
+          PRINT_TIMEOUT: ${{ steps.routine-config.outputs.print_timeout || '40m' }}
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_RUN_ID: ${{ github.run_id }}
@@ -118,7 +149,62 @@ jobs:
           PROMPT="You are the Issues Housekeeping routine for this repository. Read and follow .github/prompts/issues-housekeeping.md exactly. Sweep open issues for staleness, duplicates, priority accuracy, and orphaned claims."
 
           agy -p "$PROMPT" \
-            --model "${{ steps.routine-config.outputs.model || 'gemini-3.7-flash' }}" \
+            --model "$MODEL" \
             --output-format text \
-            --print-timeout "${{ steps.routine-config.outputs.print_timeout || '40m' }}" \
+            --print-timeout "$PRINT_TIMEOUT" \
             --dangerously-skip-permissions
+
+      - name: Reconcile Routine Run Issue
+        if: always()
+        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**: \`issues-housekeeping\`
+          - **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**: \`issues-housekeeping\`
+- **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/prompt-optimizer-cron.yml

@@ -13,7 +13,7 @@ concurrency:
 jobs:
   run-optimizer:
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 45
     permissions:
       contents: write
       issues: write
@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -32,10 +33,13 @@ jobs:
           node-version: 22
 
       - name: Configure Git author identity
+        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
         id: cache-agy
@@ -69,7 +73,7 @@ jobs:
         id: routine-config
         run: |
           ROUTINE="optimizer"
-          DEFAULT_MODEL="gemini-3.7-flash-high"
+          DEFAULT_MODEL="gemini-3.8-flash-high"
           DEFAULT_TIMEOUT="35"
 
           MODEL="$DEFAULT_MODEL"
@@ -104,6 +108,30 @@ jobs:
           echo "print_timeout=${TIMEOUT}m" >> "$GITHUB_OUTPUT"
           echo "Resolved routine configuration: model=$MODEL, timeout=${TIMEOUT}m"
 
+      - name: Initialize Routine Run Issue
+        id: run-issue
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          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="[optimizer] run ${TIMESTAMP}"
+          BODY="### Autonomous Routine Execution in Progress
+          - **Routine**: \`optimizer\`
+          - **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:optimizer,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 Prompt Optimizer
         timeout-minutes: 35
         env:
@@ -111,6 +139,9 @@ jobs:
           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 }}
+          MODEL: ${{ steps.routine-config.outputs.model || 'gemini-3.8-flash-high' }}
+          PRINT_TIMEOUT: ${{ steps.routine-config.outputs.print_timeout || '35m' }}
           GITHUB_SERVER_URL: ${{ github.server_url }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_RUN_ID: ${{ github.run_id }}
@@ -118,17 +149,17 @@ jobs:
           PROMPT="You are the Prompt Optimizer routine for this repository. Read and follow .github/prompts/optimizer.md exactly. Diagnose failures, token anomalies, and review loops, and propose preventative prompt and test fixes."
 
           agy -p "$PROMPT" \
-            --model "${{ steps.routine-config.outputs.model || 'gemini-3.7-flash-high' }}" \
+            --model "$MODEL" \
             --output-format text \
-            --print-timeout "${{ steps.routine-config.outputs.print_timeout || '35m' }}" \
+            --print-timeout "$PRINT_TIMEOUT" \
             --dangerously-skip-permissions
 
       - name: Emit run summary
         if: always()
         run: |
-          LATEST_LOG=$(ls -t .github/prompts/logs/optimizer/*.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)
@@ -140,7 +171,62 @@ jobs:
           GITHUB_RUN_ID: ${{ github.run_id }}
           GITHUB_RUN_NUMBER: ${{ github.run_number }}
         run: |
-          LATEST_LOG=$(ls -t .github/prompts/logs/optimizer/*.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()
+        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**: \`optimizer\`
+          - **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**: \`optimizer\`
+- **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/sync-fleet.yml

@@ -19,6 +19,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -26,9 +27,12 @@ jobs:
           node-version: 22
 
       - name: Configure Git author identity
+        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"
+          gh auth setup-git
 
       - name: Run jonah-fleet sync
         id: sync

package/templates/workflows/trigger-autowork-manual.yml

@@ -29,7 +29,7 @@ concurrency:
 jobs:
   run-autowork:
     runs-on: ubuntu-latest
-    timeout-minutes: 65
+    timeout-minutes: 70
     permissions:
       contents: write
       issues: write
@@ -42,7 +42,7 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.GH_PAT || github.token }}
-
+          persist-credentials: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -50,10 +50,13 @@ jobs:
           node-version: 22
 
       - name: Configure Git author identity
+        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
         id: cache-agy
@@ -114,7 +117,7 @@ jobs:
         id: routine-config
         run: |
           ROUTINE="autowork"
-          DEFAULT_MODEL="gemini-3.7-flash-high"
+          DEFAULT_MODEL="gemini-3.8-flash-high"
           DEFAULT_TIMEOUT="60"
 
           MODEL="$DEFAULT_MODEL"
@@ -149,6 +152,35 @@ jobs:
           echo "print_timeout=${TIMEOUT}m" >> "$GITHUB_OUTPUT"
           echo "Resolved routine configuration: model=$MODEL, timeout=${TIMEOUT}m"
 
+      - name: Initialize Routine Run Issue
+        id: run-issue
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
+          TARGET_ARG: ${{ inputs.issue_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 "$TARGET_ARG" ]; then
+            TITLE="[autowork] run ${TIMESTAMP} (Issue #${TARGET_ARG})"
+          else
+            TITLE="[autowork] run ${TIMESTAMP}"
+          fi
+          BODY="### Autonomous Routine Execution in Progress
+          - **Routine**: \`autowork\`
+          - **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: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
         timeout-minutes: 60
         env:
@@ -157,9 +189,12 @@ jobs:
           ANTIGRAVITY_API_KEY: ${{ secrets.GEMINI_API_KEY }}
           GH_TOKEN: ${{ secrets.GH_PAT || github.token }}
           TARGET_ISSUE: ${{ inputs.issue_number }}
+          ROUTINE_ISSUE_NUMBER: ${{ steps.run-issue.outputs.issue_number }}
           MODE: ${{ inputs.mode || 'targeted' }}
           CUSTOM_PROMPT: ${{ inputs.custom_prompt }}
           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 }}
@@ -175,17 +210,31 @@ jobs:
           fi
 
           agy -p "$PROMPT" \
-            --model "${{ steps.routine-config.outputs.model || 'gemini-3.7-flash-high' }}" \
+            --model "$MODEL" \
             --output-format text \
-            --print-timeout "${{ steps.routine-config.outputs.print_timeout || '60m' }}" \
+            --print-timeout "$PRINT_TIMEOUT" \
             --dangerously-skip-permissions
 
       - name: Emit run summary
         if: always()
         run: |
-          LATEST_LOG=$(ls -t .github/prompts/logs/autowork/*.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)
+        if: always()
+        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)
@@ -193,10 +242,10 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          LATEST_LOG=$(ls -t .github/prompts/logs/autowork/*.md 2>/dev/null | head -n 1)
-          if [ -n "$LATEST_LOG" ]; then
-            if grep -q "Result.*SUCCESS" "$LATEST_LOG"; then
-              WORKED_BRANCH=$(grep -E '^\s*-\s*(Pushed branch|Branch):' "$LATEST_LOG" | head -n 1 | sed -E 's/.*`([^`]+)`.*/\1/')
+          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")
@@ -208,3 +257,58 @@ jobs:
               fi
             fi
           fi
+
+      - name: Reconcile Routine Run Issue
+        if: always()
+        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