ci(resolve): fix skip-report gating, route to ECS with cleanup, harden tests

- Report skipped request: add always() so the prepare-step EXIT trap's
  decision=failed is reported instead of skipped on a crash.
- Report skipped request: make gh pr comment best-effort with a ::warning
  fallback, matching the Report result step.
- Route resolve-pr to the self-hosted ECS pool (matching review-pr) and add a
  cleanup step that wipes stale ${WORKDIR} artifacts; these runners reuse
  workspace and /tmp and the verification gate builds untrusted PR code.
- Tests: pin the four verification-gate failure strings against regression.

.github/workflows/qwen-code-pr-review.yml

@@ -621,7 +621,12 @@ jobs:
           startsWith(github.event.comment.body, '@qwen-code /resolve ') ||
           startsWith(github.event.comment.body, format('@qwen-code /resolve{0}', '\n'))))
       )
-    runs-on: 'ubuntu-latest'
+    # Self-hosted ECS pool, matching review-pr. NOTE: unlike review-pr (which only
+    # checks out trusted base and never builds PR code), this job's verification
+    # gate runs the untrusted PR's build/typecheck/lint/test on a reused workspace.
+    # That isolation tradeoff is accepted deliberately; the cleanup step below keeps
+    # stale per-run artifacts from leaking between PRs.
+    runs-on: ['self-hosted', 'linux', 'x64', 'ecs-qwen']
     timeout-minutes: 90
     concurrency:
       group: 'qwen-resolve-${{ github.event.issue.number || github.event.inputs.pr_number }}'
@@ -638,6 +643,19 @@ jobs:
       WORKDIR: '/tmp/qwen-resolve'
       DRY_RUN: '${{ github.event.inputs.dry_run || false }}'
     steps:
+      # Self-hosted runners reuse the workspace and /tmp across jobs. A prior
+      # /resolve can leave stale ${WORKDIR} reports (failure.md, no-action.md, ...)
+      # that the verification gate would misread as this run's outcome, plus stale
+      # git worktrees that trip the checkout. Clean defensively; never fail the job.
+      - name: 'Clean stale resolve workspace'
+        run: |-
+          set -uo pipefail
+          rm -rf "${WORKDIR}" 2>/dev/null || true
+          if [ -e .git ]; then
+            git worktree prune -v || true
+          fi
+          echo "stale resolve workspace cleaned"
+
       - name: 'Acknowledge resolve request'
         if: "github.event_name == 'issue_comment'"
         env:
@@ -1022,7 +1040,10 @@ jobs:
           if-no-files-found: 'ignore'
 
       - name: 'Report skipped request'
-        if: "steps.prepare.outputs.decision == 'skip' || steps.prepare.outputs.decision == 'unsupported' || steps.prepare.outputs.decision == 'failed'"
+        # always(): the prepare step's EXIT trap writes decision=failed when it
+        # crashes, but a bare if implicitly requires success() — so without
+        # always() this step is skipped on the very crash it must report.
+        if: "${{ always() && (steps.prepare.outputs.decision == 'skip' || steps.prepare.outputs.decision == 'unsupported' || steps.prepare.outputs.decision == 'failed') }}"
         env:
           GH_TOKEN: '${{ secrets.CI_DEV_BOT_PAT }}'
           PR_NUMBER: '${{ steps.resolve.outputs.pr_number }}'
@@ -1035,7 +1056,10 @@ jobs:
             echo
             echo "${SKIP_REASON}"
           } > "${WORKDIR}/report.md"
-          gh pr comment "$PR_NUMBER" --repo "$REPO" --body-file "${WORKDIR}/report.md"
+          # Best-effort, matching 'Report result': a transient API error here must
+          # not abort the step under set -e and swallow the only failure signal.
+          gh pr comment "$PR_NUMBER" --repo "$REPO" --body-file "${WORKDIR}/report.md" ||
+            echo "::warning::Resolve was skipped, but posting the skip-reason comment failed."
 
       - name: 'Report result'
         if: "${{ always() && steps.prepare.outputs.decision == 'run' }}"

scripts/tests/qwen-resolve-workflow.test.js

@@ -103,6 +103,19 @@ describe('qwen resolve workflow', () => {
     expect(resolveJob).toContain('--force-with-lease');
   });
 
+  it('keeps the verification-gate failure checks on resolve-pr', () => {
+    // These guard against prompt-injection symptoms; a future edit that drops
+    // any of them from the credentialed conflict-resolution path must fail here.
+    expect(resolveJob).toContain(
+      'Leftover conflict markers found after resolution',
+    );
+    expect(resolveJob).toContain('Branch still has merge conflicts with');
+    expect(resolveJob).toContain('The top commit is a default merge commit');
+    expect(resolveJob).toContain(
+      'Branch unchanged and no no-action.md was written',
+    );
+  });
+
   it('runs the agent without any GitHub credentials', () => {
     const agentStep = resolveJob.slice(
       resolveJob.indexOf("- name: 'Resolve conflicts'"),