Upstream changes conflict with main. This PR is a review placeholder and intentionally does not include the conflicted upstream file changes yet.

To review and resolve locally:

gh pr checkout sync-upstream
npm run review-pr
code .

After resolving conflicts:

git add -A
git commit
git push --force-with-lease origin HEAD:sync-upstream

Conflicted files from the attempted merge:

CHANGELOG.md
package-lock.json
package.json
test/extension.test.ts