diff --git a/.github/workflows/evergreen.lock.yml b/.github/workflows/evergreen.lock.yml
index 703bf2c5..7ab33203 100644
--- a/.github/workflows/evergreen.lock.yml
+++ b/.github/workflows/evergreen.lock.yml
@@ -28,7 +28,7 @@
 #   Imports:
 #     - shared/reporting.md
 #
-# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"fdc470cbbb93445cdc31d03533b3983d30603af2cbc207a06bc506a93d186f95","compiler_version":"v0.65.6","strict":true,"agent_id":"copilot"}
+# gh-aw-metadata: {"schema_version":"v3","frontmatter_hash":"919735cc1347eaea63d833b32d6e1e5db085794fce29c591f00211cad951a499","compiler_version":"v0.65.6","strict":true,"agent_id":"copilot"}
 
 name: "Evergreen — PR Health Keeper"
 "on":
@@ -141,20 +141,20 @@ jobs:
         run: |
           bash ${RUNNER_TEMP}/gh-aw/actions/create_prompt_first.sh
           {
-          cat << 'GH_AW_PROMPT_c90257464e463e6f_EOF'
+          cat << 'GH_AW_PROMPT_bea897f24b8e04f2_EOF'
           <system>
-          GH_AW_PROMPT_c90257464e463e6f_EOF
+          GH_AW_PROMPT_bea897f24b8e04f2_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/xpia.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/temp_folder_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/markdown.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/repo_memory_prompt.md"
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_prompt.md"
-          cat << 'GH_AW_PROMPT_c90257464e463e6f_EOF'
+          cat << 'GH_AW_PROMPT_bea897f24b8e04f2_EOF'
           <safe-output-tools>
           Tools: add_comment(max:3), push_to_pull_request_branch(max:3), missing_tool, missing_data, noop
-          GH_AW_PROMPT_c90257464e463e6f_EOF
+          GH_AW_PROMPT_bea897f24b8e04f2_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/safe_outputs_push_to_pr_branch.md"
-          cat << 'GH_AW_PROMPT_c90257464e463e6f_EOF'
+          cat << 'GH_AW_PROMPT_bea897f24b8e04f2_EOF'
           </safe-output-tools>
           <github-context>
           The following GitHub context information is available for this workflow:
@@ -187,13 +187,13 @@ jobs:
             - **Note**: If a branch you need is not in the list above and is not listed as an additional fetched ref, it has NOT been checked out. For private repositories you cannot fetch it without proper authentication. If the branch is required and not available, exit with an error and ask the user to add it to the `fetch:` option of the `checkout:` configuration (e.g., `fetch: ["refs/pulls/open/*"]` for all open PR refs, or `fetch: ["main", "feature/my-branch"]` for specific branches).
           </github-context>
           
-          GH_AW_PROMPT_c90257464e463e6f_EOF
+          GH_AW_PROMPT_bea897f24b8e04f2_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          cat << 'GH_AW_PROMPT_c90257464e463e6f_EOF'
+          cat << 'GH_AW_PROMPT_bea897f24b8e04f2_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
           {{#runtime-import .github/workflows/evergreen.md}}
-          GH_AW_PROMPT_c90257464e463e6f_EOF
+          GH_AW_PROMPT_bea897f24b8e04f2_EOF
           } > "$GH_AW_PROMPT"
       - name: Interpolate variables and render templates
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
@@ -339,7 +339,7 @@ jobs:
           GITHUB_REPOSITORY: ${{ github.repository }}
           GITHUB_TOKEN: ${{ github.token }}
         name: Find a PR that needs attention
-        run: "python3 - << 'PYEOF'\nimport os, json, re, sys\nimport urllib.request, urllib.error\n\ntoken = os.environ.get(\"GITHUB_TOKEN\", \"\")\nrepo = os.environ.get(\"GITHUB_REPOSITORY\", \"\")\nforced_pr = os.environ.get(\"FORCED_PR\", \"\").strip()\n\nrepo_memory_dir = \"/tmp/gh-aw/repo-memory/evergreen\"\noutput_file = \"/tmp/gh-aw/evergreen.json\"\nos.makedirs(\"/tmp/gh-aw\", exist_ok=True)\n\nMAX_ATTEMPTS = 5\n\ndef api_get(url):\n    \"\"\"Make an authenticated GET request to the GitHub API.\"\"\"\n    req = urllib.request.Request(url, headers={\n        \"Authorization\": f\"token {token}\",\n        \"Accept\": \"application/vnd.github.v3+json\",\n    })\n    with urllib.request.urlopen(req, timeout=30) as resp:\n        return json.loads(resp.read().decode())\n\ndef get_all_open_prs():\n    \"\"\"Fetch all open PRs, paginated.\"\"\"\n    prs = []\n    page = 1\n    while True:\n        url = f\"https://api.github.com/repos/{repo}/pulls?state=open&per_page=100&page={page}&sort=number&direction=asc\"\n        batch = api_get(url)\n        if not batch:\n            break\n        prs.extend(batch)\n        if len(batch) < 100:\n            break\n        page += 1\n    return prs\n\ndef get_check_status(pr):\n    \"\"\"Get combined CI check status for a PR's head commit.\"\"\"\n    head_sha = pr[\"head\"][\"sha\"]\n    url = f\"https://api.github.com/repos/{repo}/commits/{head_sha}/status\"\n    try:\n        status = api_get(url)\n        return status.get(\"state\", \"unknown\")\n    except Exception as e:\n        print(f\"  Warning: could not fetch status for PR #{pr['number']}: {e}\")\n        return \"unknown\"\n\ndef get_check_runs(pr):\n    \"\"\"Get check runs for a PR's head commit.\"\"\"\n    head_sha = pr[\"head\"][\"sha\"]\n    url = f\"https://api.github.com/repos/{repo}/commits/{head_sha}/check-runs\"\n    try:\n        data = api_get(url)\n        return data.get(\"check_runs\", [])\n    except Exception as e:\n        print(f\"  Warning: could not fetch check runs for PR #{pr['number']}: {e}\")\n        return []\n\ndef read_attempt_state(pr_number):\n    \"\"\"Read attempt tracking state from repo-memory.\"\"\"\n    state_file = os.path.join(repo_memory_dir, f\"pr-{pr_number}.md\")\n    if not os.path.isfile(state_file):\n        return {\"attempts\": 0, \"head_sha\": None}\n    with open(state_file, encoding=\"utf-8\") as f:\n        content = f.read()\n    state = {\"attempts\": 0, \"head_sha\": None}\n    m = re.search(r'\\|\\s*head_sha\\s*\\|\\s*(\\S+)\\s*\\|', content)\n    if m:\n        state[\"head_sha\"] = m.group(1)\n    m = re.search(r'\\|\\s*attempts\\s*\\|\\s*(\\d+)\\s*\\|', content)\n    if m:\n        state[\"attempts\"] = int(m.group(1))\n    return state\n\ndef pr_needs_attention(pr):\n    \"\"\"Check if a PR has merge conflicts or failing CI. Returns a list of issues.\"\"\"\n    issues = []\n\n    # Check mergeable state\n    # Need to fetch full PR details for mergeable info\n    pr_url = f\"https://api.github.com/repos/{repo}/pulls/{pr['number']}\"\n    try:\n        full_pr = api_get(pr_url)\n        mergeable = full_pr.get(\"mergeable\")\n        mergeable_state = full_pr.get(\"mergeable_state\", \"unknown\")\n        if mergeable is False:\n            issues.append(\"merge_conflict\")\n        elif mergeable_state == \"dirty\":\n            issues.append(\"merge_conflict\")\n    except Exception as e:\n        print(f\"  Warning: could not fetch mergeable state for PR #{pr['number']}: {e}\")\n\n    # Check CI status via check runs\n    check_runs = get_check_runs(pr)\n    failed_checks = []\n    for cr in check_runs:\n        conclusion = cr.get(\"conclusion\")\n        status = cr.get(\"status\")\n        name = cr.get(\"name\", \"unknown\")\n        if conclusion in (\"failure\", \"timed_out\", \"action_required\"):\n            failed_checks.append(name)\n        elif status == \"completed\" and conclusion not in (\"success\", \"neutral\", \"skipped\"):\n            if conclusion is not None:\n                failed_checks.append(name)\n    if failed_checks:\n        issues.append(f\"failing_checks: {', '.join(failed_checks)}\")\n\n    # Also check commit status API (some checks use the older status API)\n    combined_status = get_check_status(pr)\n    if combined_status == \"failure\":\n        if not failed_checks:\n            issues.append(\"failing_status\")\n\n    return issues\n\n# --- Main logic ---\n\nprint(\"=== Evergreen PR Health Check ===\")\nprint(f\"Repository: {repo}\")\n\nprs = get_all_open_prs()\nprint(f\"Found {len(prs)} open PR(s)\")\n\nif not prs:\n    print(\"No open PRs. Exiting.\")\n    with open(output_file, \"w\") as f:\n        json.dump({\"selected\": None, \"reason\": \"no_open_prs\"}, f)\n    sys.exit(1)\n\n# Evaluate each PR deterministically (sorted by PR number ascending)\ncandidates = []\nskipped = []\n\n# If a specific PR is forced, only check that one\nif forced_pr:\n    prs = [pr for pr in prs if str(pr[\"number\"]) == forced_pr]\n    if not prs:\n        print(f\"ERROR: PR #{forced_pr} not found among open PRs.\")\n        sys.exit(1)\n    print(f\"FORCED: checking only PR #{forced_pr}\")\n\nfor pr in sorted(prs, key=lambda p: p[\"number\"]):\n    pr_num = pr[\"number\"]\n    head_sha = pr[\"head\"][\"sha\"]\n    print(f\"\\nChecking PR #{pr_num}: {pr['title'][:60]}...\")\n    print(f\"  Head SHA: {head_sha[:12]}\")\n\n    issues = pr_needs_attention(pr)\n    if not issues:\n        print(f\"  Status: healthy (no issues)\")\n        continue\n\n    print(f\"  Issues: {issues}\")\n\n    # Check attempt tracking\n    attempt_state = read_attempt_state(pr_num)\n    if attempt_state[\"head_sha\"] == head_sha:\n        attempts = attempt_state[\"attempts\"]\n        print(f\"  Attempts on this SHA: {attempts}/{MAX_ATTEMPTS}\")\n        if attempts >= MAX_ATTEMPTS:\n            skipped.append({\n                \"pr\": pr_num,\n                \"reason\": f\"max attempts ({MAX_ATTEMPTS}) reached on SHA {head_sha[:12]}\",\n            })\n            print(f\"  SKIPPED: max attempts reached\")\n            continue\n    else:\n        attempts = 0\n        print(f\"  New SHA detected — resetting attempt counter\")\n\n    candidates.append({\n        \"pr_number\": pr_num,\n        \"title\": pr[\"title\"],\n        \"head_sha\": head_sha,\n        \"base_branch\": pr[\"base\"][\"ref\"],\n        \"head_branch\": pr[\"head\"][\"ref\"],\n        \"issues\": issues,\n        \"attempts\": attempts,\n    })\n\n# Select the first candidate (lowest PR number — deterministic)\nselected = candidates[0] if candidates else None\n\nresult = {\n    \"selected\": selected,\n    \"skipped\": skipped,\n    \"total_open_prs\": len(prs),\n    \"candidates_found\": len(candidates),\n}\n\nwith open(output_file, \"w\") as f:\n    json.dump(result, f, indent=2)\n\nif selected:\n    print(f\"\\n>>> Selected PR #{selected['pr_number']}: {selected['title']}\")\n    print(f\"    Issues: {selected['issues']}\")\n    print(f\"    Attempt: {selected['attempts'] + 1}/{MAX_ATTEMPTS}\")\nelse:\n    print(\"\\nNo PRs need attention. Exiting.\")\n    sys.exit(1)\nPYEOF\n"
+        run: "python3 - << 'PYEOF'\nimport os, json, re, subprocess, sys\nimport urllib.request, urllib.error\n\ntoken = os.environ.get(\"GITHUB_TOKEN\", \"\")\nrepo = os.environ.get(\"GITHUB_REPOSITORY\", \"\")\nforced_pr = os.environ.get(\"FORCED_PR\", \"\").strip()\n\nrepo_memory_dir = \"/tmp/gh-aw/repo-memory/evergreen\"\noutput_file = \"/tmp/gh-aw/evergreen.json\"\nos.makedirs(\"/tmp/gh-aw\", exist_ok=True)\n\nMAX_ATTEMPTS = 5\n\ndef api_get(url):\n    \"\"\"Make an authenticated GET request to the GitHub API.\"\"\"\n    req = urllib.request.Request(url, headers={\n        \"Authorization\": f\"token {token}\",\n        \"Accept\": \"application/vnd.github.v3+json\",\n    })\n    with urllib.request.urlopen(req, timeout=30) as resp:\n        return json.loads(resp.read().decode())\n\ndef get_all_open_prs():\n    \"\"\"Fetch all open PRs, paginated.\"\"\"\n    prs = []\n    page = 1\n    while True:\n        url = f\"https://api.github.com/repos/{repo}/pulls?state=open&per_page=100&page={page}&sort=number&direction=asc\"\n        batch = api_get(url)\n        if not batch:\n            break\n        prs.extend(batch)\n        if len(batch) < 100:\n            break\n        page += 1\n    return prs\n\ndef get_check_status(pr):\n    \"\"\"Get combined CI check status for a PR's head commit.\"\"\"\n    head_sha = pr[\"head\"][\"sha\"]\n    url = f\"https://api.github.com/repos/{repo}/commits/{head_sha}/status\"\n    try:\n        status = api_get(url)\n        return status.get(\"state\", \"unknown\")\n    except Exception as e:\n        print(f\"  Warning: could not fetch status for PR #{pr['number']}: {e}\")\n        return \"unknown\"\n\ndef get_check_runs(pr):\n    \"\"\"Get check runs for a PR's head commit.\"\"\"\n    head_sha = pr[\"head\"][\"sha\"]\n    url = f\"https://api.github.com/repos/{repo}/commits/{head_sha}/check-runs\"\n    try:\n        data = api_get(url)\n        return data.get(\"check_runs\", [])\n    except Exception as e:\n        print(f\"  Warning: could not fetch check runs for PR #{pr['number']}: {e}\")\n        return []\n\ndef read_attempt_state(pr_number):\n    \"\"\"Read attempt tracking state from repo-memory.\"\"\"\n    state_file = os.path.join(repo_memory_dir, f\"pr-{pr_number}.md\")\n    if not os.path.isfile(state_file):\n        return {\"attempts\": 0, \"head_sha\": None}\n    with open(state_file, encoding=\"utf-8\") as f:\n        content = f.read()\n    state = {\"attempts\": 0, \"head_sha\": None}\n    m = re.search(r'\\|\\s*head_sha\\s*\\|\\s*(\\S+)\\s*\\|', content)\n    if m:\n        state[\"head_sha\"] = m.group(1)\n    m = re.search(r'\\|\\s*attempts\\s*\\|\\s*(\\d+)\\s*\\|', content)\n    if m:\n        state[\"attempts\"] = int(m.group(1))\n    return state\n\ndef pr_needs_attention(pr):\n    \"\"\"Check if a PR has merge conflicts or failing CI. Returns a list of issues.\"\"\"\n    issues = []\n\n    # Check mergeable state\n    # Need to fetch full PR details for mergeable info\n    pr_url = f\"https://api.github.com/repos/{repo}/pulls/{pr['number']}\"\n    try:\n        full_pr = api_get(pr_url)\n        mergeable = full_pr.get(\"mergeable\")\n        mergeable_state = full_pr.get(\"mergeable_state\", \"unknown\")\n        if mergeable is False:\n            issues.append(\"merge_conflict\")\n        elif mergeable_state == \"dirty\":\n            issues.append(\"merge_conflict\")\n    except Exception as e:\n        print(f\"  Warning: could not fetch mergeable state for PR #{pr['number']}: {e}\")\n\n    # Check CI status via check runs\n    check_runs = get_check_runs(pr)\n    failed_checks = []\n    for cr in check_runs:\n        conclusion = cr.get(\"conclusion\")\n        status = cr.get(\"status\")\n        name = cr.get(\"name\", \"unknown\")\n        if conclusion in (\"failure\", \"timed_out\", \"action_required\"):\n            failed_checks.append(name)\n        elif status == \"completed\" and conclusion not in (\"success\", \"neutral\", \"skipped\"):\n            if conclusion is not None:\n                failed_checks.append(name)\n    if failed_checks:\n        issues.append(f\"failing_checks: {', '.join(failed_checks)}\")\n\n    # Also check commit status API (some checks use the older status API)\n    combined_status = get_check_status(pr)\n    if combined_status == \"failure\":\n        if not failed_checks:\n            issues.append(\"failing_status\")\n\n    return issues\n\n# --- Main logic ---\n\nprint(\"=== Evergreen PR Health Check ===\")\nprint(f\"Repository: {repo}\")\n\nprs = get_all_open_prs()\nprint(f\"Found {len(prs)} open PR(s)\")\n\nif not prs:\n    print(\"No open PRs. Exiting.\")\n    with open(output_file, \"w\") as f:\n        json.dump({\"selected\": None, \"reason\": \"no_open_prs\"}, f)\n    sys.exit(1)\n\n# Evaluate each PR deterministically (sorted by PR number ascending)\ncandidates = []\nskipped = []\n\n# If a specific PR is forced, only check that one\nif forced_pr:\n    prs = [pr for pr in prs if str(pr[\"number\"]) == forced_pr]\n    if not prs:\n        print(f\"ERROR: PR #{forced_pr} not found among open PRs.\")\n        sys.exit(1)\n    print(f\"FORCED: checking only PR #{forced_pr}\")\n\nfor pr in sorted(prs, key=lambda p: p[\"number\"]):\n    pr_num = pr[\"number\"]\n    head_sha = pr[\"head\"][\"sha\"]\n    print(f\"\\nChecking PR #{pr_num}: {pr['title'][:60]}...\")\n    print(f\"  Head SHA: {head_sha[:12]}\")\n\n    issues = pr_needs_attention(pr)\n    if not issues:\n        print(f\"  Status: healthy (no issues)\")\n        continue\n\n    print(f\"  Issues: {issues}\")\n\n    # Check attempt tracking\n    attempt_state = read_attempt_state(pr_num)\n    if attempt_state[\"head_sha\"] == head_sha:\n        attempts = attempt_state[\"attempts\"]\n        print(f\"  Attempts on this SHA: {attempts}/{MAX_ATTEMPTS}\")\n        if attempts >= MAX_ATTEMPTS:\n            skipped.append({\n                \"pr\": pr_num,\n                \"reason\": f\"max attempts ({MAX_ATTEMPTS}) reached on SHA {head_sha[:12]}\",\n            })\n            print(f\"  SKIPPED: max attempts reached\")\n            continue\n    else:\n        attempts = 0\n        print(f\"  New SHA detected — resetting attempt counter\")\n\n    candidates.append({\n        \"pr_number\": pr_num,\n        \"title\": pr[\"title\"],\n        \"head_sha\": head_sha,\n        \"base_branch\": pr[\"base\"][\"ref\"],\n        \"head_branch\": pr[\"head\"][\"ref\"],\n        \"issues\": issues,\n        \"attempts\": attempts,\n    })\n\n# Select the first candidate (lowest PR number — deterministic)\nselected = candidates[0] if candidates else None\n\nresult = {\n    \"selected\": selected,\n    \"skipped\": skipped,\n    \"total_open_prs\": len(prs),\n    \"candidates_found\": len(candidates),\n}\n\nwith open(output_file, \"w\") as f:\n    json.dump(result, f, indent=2)\n\nif selected:\n    branch = selected[\"head_branch\"]\n    print(f\"Checking out PR branch before agent run: {branch}\")\n    subprocess.check_call([\"git\", \"checkout\", \"-B\", branch, f\"origin/{branch}\"])\n    subprocess.check_call([\"git\", \"branch\", \"--set-upstream-to\", f\"origin/{branch}\", branch])\n    print(f\"\\n>>> Selected PR #{selected['pr_number']}: {selected['title']}\")\n    print(f\"    Issues: {selected['issues']}\")\n    print(f\"    Attempt: {selected['attempts'] + 1}/{MAX_ATTEMPTS}\")\nelse:\n    print(\"\\nNo PRs need attention. Exiting.\")\n    sys.exit(1)\nPYEOF\n"
 
       # Repo memory git-based storage configuration from frontmatter processed below
       - name: Clone repo-memory branch (default)
@@ -398,12 +398,12 @@ jobs:
           mkdir -p ${RUNNER_TEMP}/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/safeoutputs
           mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > ${RUNNER_TEMP}/gh-aw/safeoutputs/config.json << 'GH_AW_SAFE_OUTPUTS_CONFIG_ec5103758147a5b8_EOF'
+          cat > ${RUNNER_TEMP}/gh-aw/safeoutputs/config.json << 'GH_AW_SAFE_OUTPUTS_CONFIG_81e0c890ef7259d9_EOF'
           {"add_comment":{"max":3,"target":"*"},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"push_repo_memory":{"memories":[{"dir":"/tmp/gh-aw/repo-memory/default","id":"default","max_file_count":100,"max_file_size":10240,"max_patch_size":10240}]},"push_to_pull_request_branch":{"if_no_changes":"warn","max":3,"max_patch_size":1024,"protected_files":["package.json","bun.lockb","bunfig.toml","deno.json","deno.jsonc","deno.lock","global.json","NuGet.Config","Directory.Packages.props","mix.exs","mix.lock","go.mod","go.sum","stack.yaml","stack.yaml.lock","pom.xml","build.gradle","build.gradle.kts","settings.gradle","settings.gradle.kts","gradle.properties","package-lock.json","yarn.lock","pnpm-lock.yaml","npm-shrinkwrap.json","requirements.txt","Pipfile","Pipfile.lock","pyproject.toml","setup.py","setup.cfg","Gemfile","Gemfile.lock","uv.lock","CODEOWNERS"],"protected_files_policy":"allowed","protected_path_prefixes":[".github/",".agents/"],"target":"*"}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_ec5103758147a5b8_EOF
+          GH_AW_SAFE_OUTPUTS_CONFIG_81e0c890ef7259d9_EOF
       - name: Write Safe Outputs Tools
         run: |
-          cat > ${RUNNER_TEMP}/gh-aw/safeoutputs/tools_meta.json << 'GH_AW_SAFE_OUTPUTS_TOOLS_META_0b11521b2b188ecd_EOF'
+          cat > ${RUNNER_TEMP}/gh-aw/safeoutputs/tools_meta.json << 'GH_AW_SAFE_OUTPUTS_TOOLS_META_ab5d40e79b692271_EOF'
           {
             "description_suffixes": {
               "add_comment": " CONSTRAINTS: Maximum 3 comment(s) can be added. Target: *.",
@@ -412,8 +412,8 @@ jobs:
             "repo_params": {},
             "dynamic_tools": []
           }
-          GH_AW_SAFE_OUTPUTS_TOOLS_META_0b11521b2b188ecd_EOF
-          cat > ${RUNNER_TEMP}/gh-aw/safeoutputs/validation.json << 'GH_AW_SAFE_OUTPUTS_VALIDATION_4f2d89a889ce19de_EOF'
+          GH_AW_SAFE_OUTPUTS_TOOLS_META_ab5d40e79b692271_EOF
+          cat > ${RUNNER_TEMP}/gh-aw/safeoutputs/validation.json << 'GH_AW_SAFE_OUTPUTS_VALIDATION_5a3b9b9612f3c087_EOF'
           {
             "add_comment": {
               "defaultMax": 1,
@@ -511,7 +511,7 @@ jobs:
               }
             }
           }
-          GH_AW_SAFE_OUTPUTS_VALIDATION_4f2d89a889ce19de_EOF
+          GH_AW_SAFE_OUTPUTS_VALIDATION_5a3b9b9612f3c087_EOF
           node ${RUNNER_TEMP}/gh-aw/actions/generate_safe_outputs_tools.cjs
       - name: Generate Safe Outputs MCP Server Config
         id: safe-outputs-config
@@ -581,7 +581,7 @@ jobs:
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e GH_AW_SAFE_OUTPUTS_PORT -e GH_AW_SAFE_OUTPUTS_API_KEY -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.2.11'
           
           mkdir -p /home/runner/.copilot
-          cat << GH_AW_MCP_CONFIG_e92a5aad7336713f_EOF | bash ${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.sh
+          cat << GH_AW_MCP_CONFIG_5b3ae892e0dc086c_EOF | bash ${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.sh
           {
             "mcpServers": {
               "github": {
@@ -622,7 +622,7 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_e92a5aad7336713f_EOF
+          GH_AW_MCP_CONFIG_5b3ae892e0dc086c_EOF
       - name: Download activation artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
diff --git a/.github/workflows/evergreen.md b/.github/workflows/evergreen.md
index 481eae1c..f52b6169 100644
--- a/.github/workflows/evergreen.md
+++ b/.github/workflows/evergreen.md
@@ -54,7 +54,7 @@ steps:
       FORCED_PR: ${{ github.event.inputs.pr_number }}
     run: |
       python3 - << 'PYEOF'
-      import os, json, re, sys
+      import os, json, re, subprocess, sys
       import urllib.request, urllib.error
 
       token = os.environ.get("GITHUB_TOKEN", "")
@@ -249,6 +249,10 @@ steps:
           json.dump(result, f, indent=2)
 
       if selected:
+          branch = selected["head_branch"]
+          print(f"Checking out PR branch before agent run: {branch}")
+          subprocess.check_call(["git", "checkout", "-B", branch, f"origin/{branch}"])
+          subprocess.check_call(["git", "branch", "--set-upstream-to", f"origin/{branch}", branch])
           print(f"\n>>> Selected PR #{selected['pr_number']}: {selected['title']}")
           print(f"    Issues: {selected['issues']}")
           print(f"    Attempt: {selected['attempts'] + 1}/{MAX_ATTEMPTS}")
@@ -279,11 +283,7 @@ A pre-flight step has already identified a PR that needs attention. Read the sel
    - `selected.base_branch` — the target branch (usually `main`)
    - `selected.attempts` — how many times we've already tried on this SHA
 
-2. **Check out the PR branch** as a local tracking branch so the push tool can find it:
-   ```bash
-   git checkout -b <head_branch> origin/<head_branch>
-   ```
-   where `<head_branch>` is `selected.head_branch` from the selection file. **Do not** use a detached HEAD checkout — the `push-to-pull-request-branch` tool requires a named local branch.
+2. The pre-flight step already checks out `selected.head_branch` as a named local tracking branch before you start. Keep working on that branch (do not switch back to `main` or use detached HEAD).
 
 3. **Fix the issues**: