diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
index ca6db21c..51247041 100644
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -38,6 +38,13 @@ jobs:
       - name: Run Claude Code Review
         id: claude-review
         uses: anthropics/claude-code-action@v1
+        # In that run the Agent call left run_in_background unset and the harness
+        # still started it in the background (subagent_stats: requested unset 1,
+        # started_in_background 1). This variable is the CLI's switch for turning
+        # background task functionality off; the appended system prompt below is
+        # the backup if the variable does not reach the CLI process.
+        env:
+          CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: '1'
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
@@ -47,6 +54,9 @@ jobs:
           prompt: '/code-review:code-review ${{ github.repository }}/pull/${{ github.event.pull_request.number }} --comment'
           # The inline-comment MCP server is only installed when its tool is
           # listed here; tool list from the action's docs/solutions.md review example.
+          # Run 37478584859 (job 112320461611) ended while an eligibility
+          # subagent was still running. The documented environment control above
+          # forces Agent calls to stay in the foreground for this headless job.
           claude_args: |
             --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*)"
           # Without this the job log hides the whole run ("full output hidden for