Merge origin/main and resolve chatWidget unlockFromCodingAgent conflict

Agent-Logs-Url: https://github.com/microsoft/vscode/sessions/f087fc87-4cbd-45a1-b76a-445fbcde48ab

Co-authored-by: bryanchen-d <41454397+bryanchen-d@users.noreply.github.com>

Author: Copilot

.github/copilot-instructions.md

@@ -150,3 +150,4 @@ function f(x: number, y: string): void { }
 
 ## Learnings
 - Minimize the amount of assertions in tests. Prefer one snapshot-style `assert.deepStrictEqual` over multiple precise assertions, as they are much more difficult to understand and to update.
+- Do not stub a global object (e.g. `(mainWindow as any).ResizeObserver = ...`) or use `any` casts to install fakes in tests. Instead, make the dependency injectable: add an optional constructor parameter on the production class that defaults to the real implementation (e.g. `targetWindow.ResizeObserver`), and have the test pass a fake that implements the real interface.

.github/hooks/hooks.json

@@ -28,21 +28,46 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - name: Prepare node_modules cache key
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts compile $(node -p process.arch) > .build/packagelockhash
+
+      - name: Restore node_modules cache
+        id: cache-node-modules
+        uses: actions/cache@v5
+        with:
+          path: .build/node_modules_cache
+          key: "node_modules-compile-${{ hashFiles('.build/packagelockhash') }}"
+
+      - name: Extract node_modules cache
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: tar -xzf .build/node_modules_cache/cache.tgz
+
       - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci --ignore-scripts
         env:
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install build dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
         working-directory: build
 
       - name: Install rspack dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
         working-directory: build/rspack
 
+      - name: Create node_modules archive
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: |
+          set -e
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
+          mkdir -p .build/node_modules_cache
+          tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+
       - name: Transpile source
         run: npm run transpile-client
 

.github/workflows/component-fixture-tests.yml

@@ -36,21 +36,46 @@ jobs:
         with:
           node-version-file: .nvmrc
 
+      - name: Prepare node_modules cache key
+        run: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.ts compile $(node -p process.arch) > .build/packagelockhash
+
+      - name: Restore node_modules cache
+        id: cache-node-modules
+        uses: actions/cache@v5
+        with:
+          path: .build/node_modules_cache
+          key: "node_modules-compile-${{ hashFiles('.build/packagelockhash') }}"
+
+      - name: Extract node_modules cache
+        if: steps.cache-node-modules.outputs.cache-hit == 'true'
+        run: tar -xzf .build/node_modules_cache/cache.tgz
+
       - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci --ignore-scripts
         env:
           ELECTRON_SKIP_BINARY_DOWNLOAD: 1
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install build dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
         working-directory: build
 
       - name: Install rspack dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci
         working-directory: build/rspack
 
+      - name: Create node_modules archive
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: |
+          set -e
+          node build/azure-pipelines/common/listNodeModules.ts .build/node_modules_list.txt
+          mkdir -p .build/node_modules_cache
+          tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+
       - name: Copy codicons
         run: cp node_modules/@vscode/codicons/dist/codicon.ttf src/vs/base/browser/ui/codicons/codicon/codicon.ttf
 
@@ -82,12 +107,14 @@ jobs:
             if (!errs.length) { console.log('No fixture errors.'); process.exit(0); }
             console.log(errs.length + ' fixture(s) with errors:');
             for (const f of errs) {
-              const msg = f.error?.message || (typeof f.error === 'string' ? f.error : null) || 'unknown error';
+              const errorEvents = (f.events || []).filter(e => e.isError);
+              const msg = errorEvents.map(e => e.message).join('; ') || 'unknown error';
               console.log('::error::' + f.fixtureId + ': ' + msg);
-              if (f.error?.stack) { console.log('  stack: ' + f.error.stack); }
-              if (f.events?.length) {
-                for (const e of f.events) { console.log('  event: ' + JSON.stringify(e)); }
+              for (const e of errorEvents) {
+                if (e.stack) { console.log('  stack: ' + e.stack); }
               }
+              const nonErrorEvents = (f.events || []).filter(e => !e.isError);
+              for (const e of nonErrorEvents) { console.log('  event: ' + JSON.stringify(e)); }
             }
             process.exit(1);
           "; then
@@ -328,11 +355,11 @@ jobs:
           diff -u test/componentFixtures/blocks-ci-screenshots.md /tmp/blocks-ci-updated.md || true
           exit 1
 
-      # - name: Fail if fixtures had errors
-      #   if: always() && steps.fixture_errors.outputs.has_errors == 'true'
-      #   run: |
-      #     echo "::error::One or more component fixtures failed to render. See the 'Check fixture errors' step for details."
-      #     exit 1
+      - name: Fail if fixtures had errors
+        if: always() && steps.fixture_errors.outputs.has_errors == 'true'
+        run: |
+          echo "::error::One or more component fixtures failed to render. See the 'Check fixture errors' step for details."
+          exit 1
 
 
       # - name: Prepare explorer artifact

.github/workflows/screenshot-test.yml

@@ -1 +1 @@
-2026-04-06T18:11:48.597Z
+2026-05-07T18:45:07.002Z

.vscode/extensions/vscode-pr-pinger/package-lock.json

@@ -238,3 +238,8 @@ zone.js/dist/**
 @github/copilot-sdk/node_modules/@github/copilot-linux-x64/**
 @github/copilot-sdk/node_modules/@github/copilot-win32-arm64/**
 @github/copilot-sdk/node_modules/@github/copilot-win32-x64/**
+
+# es5-ext is quarantined protestware (sonatype-2022-2248). It is only consumed
+# in websocket's browser.js inside a try/catch with a globalThis fallback,
+# so it is unnecessary in the browsers/runtimes VS Code supports.
+es5-ext/**