Fix merge queue checks by ensuring consistent job names across events

GitHub has a known bug where PRs that are up-to-date with the target
branch may trigger fast-forward merges. When this happens, GitHub looks
for check statuses on the PR commit instead of triggering merge_group
workflows.

Previously, claude-code-test.yml had different job names for PR vs
merge_group events:
- pr-check: ran on pull_request
- validate-generation: ran only on merge_group
- claude-code-e2e: ran only on merge_group

When GitHub's fast-forward optimization kicked in, it couldn't find
validate-generation or claude-code-e2e checks on the PR commit because
those jobs never ran for PRs.

Fix: Make validate-generation and claude-code-e2e run on BOTH events,
with step-level conditions to skip actual work on PRs. This ensures
the check names exist for PRs, working around GitHub's merge queue bug.

See: https://github.com/orgs/community/discussions/151100

Author: claude

.github/workflows/claude-code-test.yml

@@ -28,39 +28,42 @@ permissions:
   contents: read
 
 jobs:
-  # Job for PRs - always passes, actual validation happens in merge queue
-  pr-check:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
-    steps:
-      - name: PR Check
-        run: echo "Claude Code integration tests will run in the merge queue"
-
   # Job 1: Validate command generation from fixtures (no API key needed)
-  # Runs on merge_group and workflow_dispatch only
+  # Runs on all events, but actual work only happens in merge_group/workflow_dispatch
+  # This ensures the check name exists for PRs (needed for GitHub's merge queue)
   validate-generation:
     runs-on: ubuntu-latest
-    if: github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch'
     steps:
+      # For PRs: just pass quickly (actual tests run in merge queue)
+      - name: Skip on PR
+        if: github.event_name == 'pull_request'
+        run: echo "Validation will run in merge queue. Passing for PR."
+
       - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
 
       - name: Install uv
+        if: github.event_name != 'pull_request'
         uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
 
       - name: Set up Python
+        if: github.event_name != 'pull_request'
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
       - name: Install dependencies
+        if: github.event_name != 'pull_request'
         run: uv sync --extra dev
 
       - name: Run fruits workflow tests
+        if: github.event_name != 'pull_request'
         run: uv run pytest tests/integration/test_fruits_workflow.py -v
 
       - name: Generate commands and validate structure
+        if: github.event_name != 'pull_request'
         run: |
           # Create a test environment
           mkdir -p test_project/.deepwork/jobs
@@ -100,17 +103,24 @@ jobs:
 
   # Job 2: Full end-to-end test with Claude Code
   # Tests the COMPLETE workflow: define job -> implement -> execute
-  # Runs on merge_group and workflow_dispatch, skipped on PRs (shows as passing check)
+  # Runs on all events, but actual work only happens in merge_group/workflow_dispatch
+  # This ensures the check name exists for PRs (needed for GitHub's merge queue)
   claude-code-e2e:
     runs-on: ubuntu-latest
     needs: validate-generation
-    if: github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch'
     env:
       ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
     steps:
+      # For PRs: just pass quickly (actual tests run in merge queue)
+      - name: Skip on PR
+        if: github.event_name == 'pull_request'
+        run: echo "E2E tests will run in merge queue. Passing for PR."
+
       - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
 
       - name: Check for API key
+        if: github.event_name != 'pull_request'
         id: check-key
         run: |
           if [ -z "$ANTHROPIC_API_KEY" ]; then