Resolves the eight conflicts from the first v2/main -> main milestone
merge on a branch cut from main, so v2/main's ancestry stays clean --
resolving them on the PR head would have back-merged main into v2/main,
which is exactly what #1868 was closed to avoid.
All eight took v2/main's side, each verifiably the newer content:
- README.md stale Mcp-Param-* callout; v2/main's is corrected
by #1847 (the Inspector builds the headers itself)
- SECURITY.md add/add (#1843 on main, #1867 on v2/main); differ
by one line, the CONTRIBUTORS.md -> CONTRIBUTING.md
rename from #1884
- clients/web/package.json vitest ^4.1.0 -> ^4.1.10, the #1899 fix
- the five package-lock.json files, then regenerated from a clean
install rather than hand-merged
main's release-workflow commits (#1831 least-privilege token, #1834
dist-tag derivation, #1836 OIDC trusted publishing) auto-merged and are
preserved -- .github/workflows/main.yml is the only file where the
merged tree differs from v2/main.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YAt8rqxysNbhYWLhoRm3fU
6233d8bb22