Merge branch 'canary' into bgw/worker-threads-version-check

Author: bgw

.agents/skills/pr-status-triage/SKILL.md

@@ -14,21 +14,24 @@ Use this skill when the user asks about PR status, CI failures, or review commen
 
 ## Workflow
 
-1. Run `node scripts/pr-status.js` (or `node scripts/pr-status.js <number>`).
-2. Read generated files in `scripts/pr-status/`.
+1. Run `node scripts/pr-status.js --wait` in the background (timeout 1 min), then read `scripts/pr-status/index.md`.
+2. Analyze each `job-{id}.md` and `thread-{N}.md` file for failures and review feedback.
 3. Prioritize blocking jobs first: build, lint, types, then test jobs.
 4. Treat failures as real until disproven; check the "Known Flaky Tests" section before calling anything flaky.
 5. Reproduce locally with the same mode and env vars as CI.
 6. After addressing review comments, reply to the thread describing what was done, then resolve it. See `thread-N.md` files for ready-to-use commands.
+7. When the only remaining failures are known flaky tests and no code changes are needed, retrigger the failing CI jobs with `gh run rerun <run-id> --failed`. Then wait 5 minutes and go back to step 1. Repeat this loop up to 5 times.
 
 ## Quick Commands
 
 ```bash
-node scripts/pr-status.js
-node scripts/pr-status.js <number>
+node scripts/pr-status.js                  # current branch PR
+node scripts/pr-status.js <number>         # specific PR
+node scripts/pr-status.js [PR] --wait      # background mode, waits for CI to finish
+node scripts/pr-status.js --skip-flaky-check  # skip flaky test detection
 ```
 
-## Detailed References
+## References
 
-- [workflow.md](./workflow.md) - prioritization and common failure patterns
-- [local-repro.md](./local-repro.md) - mode/env matching and isolation guidance
+- [workflow.md](./workflow.md) — prioritization, common failure patterns, resolving review threads
+- [local-repro.md](./local-repro.md) — mode/env matching and isolation guidance

.agents/skills/pr-status-triage/local-repro.md

@@ -7,12 +7,17 @@
 
 ## Match CI Environment Variables
 
-Read the job environment variables from `pr-status` output and mirror them locally.
+Read the "Job Environment Variables" section in `index.md` and mirror them locally. Key variables:
 
-Key variables to watch:
+- `IS_WEBPACK_TEST=1` — forces webpack mode (turbopack is default locally).
+- `NEXT_SKIP_ISOLATE=1` — skips package isolation; **never use** when verifying module resolution or build-time compilation fixes.
+- Feature flags like `__NEXT_USE_NODE_STREAMS=true`, `__NEXT_CACHE_COMPONENTS=true` change DefinePlugin replacements.
 
-- `IS_WEBPACK_TEST=1` forces webpack mode.
-- `NEXT_SKIP_ISOLATE=1` skips package isolation and can hide module-resolution issues.
+Example: a failure in "test node streams prod" needs:
+
+```bash
+IS_WEBPACK_TEST=1 __NEXT_USE_NODE_STREAMS=true __NEXT_CACHE_COMPONENTS=true NEXT_TEST_MODE=start
+```
 
 ## Isolation Rule
 

.agents/skills/pr-status-triage/workflow.md

@@ -28,7 +28,7 @@
 
 ## Resolving Review Threads
 
-After addressing a review comment (e.g., making the requested code change):
+After addressing a review comment (e.g., making the requested code change), or when you detect the current code already addresses it:
 
 1. Reply to the thread describing what action was taken:
    ```bash