diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a125c460..9c9dbacd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -17,7 +17,7 @@ body:
         - CLI (`opfor run` / `opfor setup`)
         - CLI — Autonomous mode (`opfor hunt`)
         - MCP Server (`@keyvaluesystems/agent-opfor-mcp`)
-        - Browser Extension
+        - Browser Extension (`@keyvaluesystems/agent-opfor-extension`)
         - SDK (`@keyvaluesystems/agent-opfor-sdk`)
         - Evaluators / Suites
         - Judge (LLM-as-judge)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 77d88430..560ac885 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,26 +1,23 @@
 ## Problem
 
-Briefly describe the issue or feature being addressed.
+<!-- What was broken or missing? -->
 
 ## Solution
 
-Explain your approach and any important design decisions.
+<!-- How does this PR fix it? -->
 
-<!-- Required: explain what this PR does and the motivation behind it. -->
+## Changes
 
-## Checklist
+<!-- Packages and files affected -->
 
-- [ ] `npm run build` passes
-- [ ] `npm run typecheck` passes
-- [ ] `npm run build:catalog:check` passes _(if evaluators or suites changed)_
-- [ ] Tested against a local target _(if evaluator added or changed)_
-- [ ] No secrets, `.env`, or `.opfor/` artifacts committed
-- [ ] PR title follows `<type>: <what changed>` — e.g. `feat: add SSRF evaluator`
+## Issue
 
-## Evaluator checklist _(skip if no evaluator added)_
+<!-- Closes #123 / N/A -->
 
-- [ ] `id` is unique across all evaluators
-- [ ] `pass_criteria` and `fail_criteria` are specific, not vague
-- [ ] `severity` matches actual risk (`critical` = RCE / data breach)
-- [ ] `standards` mapping is correct
-- [ ] `.test.yaml` fixture included
+## How to test
+
+<!-- Steps for the maintainer to verify this works -->
+
+## Screenshots
+
+<!-- If applicable — report HTML, extension UI, CLI output -->
diff --git a/.github/workflows/commit-lint.yml b/.github/workflows/commit-lint.yml
index dabfaf56..1e49e988 100644
--- a/.github/workflows/commit-lint.yml
+++ b/.github/workflows/commit-lint.yml
@@ -2,7 +2,7 @@ name: Commit Lint
 
 on:
   pull_request:
-    branches: [master]
+    branches: [master, main]
 
 jobs:
   branch-name:
@@ -41,7 +41,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
 
       - name: Install dependencies
diff --git a/core/tests/evaluators.judge.test.ts b/core/tests/evaluators.judge.test.ts
index 65672d69..2e3f1b58 100644
--- a/core/tests/evaluators.judge.test.ts
+++ b/core/tests/evaluators.judge.test.ts
@@ -1,3 +1,5 @@
+(globalThis as Record<string, unknown>).AI_SDK_LOG_WARNINGS = false;
+
 /**
  * Evaluator judge smoke tests.
  *
diff --git a/package-lock.json b/package-lock.json
index 5858c174..6d7e4201 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5752,6 +5752,9 @@
         "esbuild": "^0.25.0",
         "tsx": "^4.20.0",
         "typescript": "^5.8.3"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "runners/cli/node_modules/@esbuild/aix-ppc64": {
@@ -6758,6 +6761,9 @@
         "esbuild": "^0.25.0",
         "tsx": "^4.20.0",
         "typescript": "^5.8.3"
+      },
+      "engines": {
+        "node": ">=20"
       }
     },
     "runners/mcp/node_modules/@esbuild/aix-ppc64": {
@@ -7258,6 +7264,9 @@
         "tsx": "^4.20.0",
         "typescript": "^5.8.3"
       },
+      "engines": {
+        "node": ">=20"
+      },
       "peerDependencies": {
         "typescript": ">=5.0.0"
       },