Merge branch 'main' into fix/keepalive-timeout-detection

Author: alexdima

.github/CODENOTIFY

@@ -1,19 +1,8 @@
 # Base Utilities
-src/vs/base/common/extpath.ts @bpasero
-src/vs/base/common/fuzzyScorer.ts @bpasero
-src/vs/base/common/glob.ts @bpasero
 src/vs/base/common/oauth.ts @TylerLeonhardt
-src/vs/base/common/path.ts @bpasero
-src/vs/base/common/stream.ts @bpasero
 src/vs/base/common/uri.ts @jrieken
 src/vs/base/browser/domSanitize.ts @mjbvz
-src/vs/base/node/pfs.ts @bpasero
-src/vs/base/node/unc.ts @bpasero
-src/vs/base/parts/contextmenu/** @bpasero
-src/vs/base/parts/ipc/** @bpasero
 src/vs/base/parts/quickinput/** @TylerLeonhardt
-src/vs/base/parts/sandbox/** @bpasero
-src/vs/base/parts/storage/** @bpasero
 
 # Base Widgets
 src/vs/base/browser/ui/grid/** @joaomoreno @benibenj
@@ -24,30 +13,11 @@ src/vs/base/browser/ui/table/** @joaomoreno @benibenj
 src/vs/base/browser/ui/tree/** @joaomoreno @benibenj
 
 # Platform
-src/vs/platform/auxiliaryWindow/** @bpasero
-src/vs/platform/backup/** @bpasero
 src/vs/platform/browserView/** @kycutler @jruales
-src/vs/platform/dialogs/** @bpasero
-src/vs/platform/editor/** @bpasero
-src/vs/platform/environment/** @bpasero
-src/vs/platform/files/** @bpasero
-src/vs/platform/ipc/** @bpasero
-src/vs/platform/launch/** @bpasero
-src/vs/platform/lifecycle/** @bpasero
-src/vs/platform/menubar/** @bpasero
-src/vs/platform/native/** @bpasero
 src/vs/platform/quickinput/** @TylerLeonhardt
 src/vs/platform/secrets/** @TylerLeonhardt
-src/vs/platform/sharedProcess/** @bpasero
-src/vs/platform/state/** @bpasero
-src/vs/platform/storage/** @bpasero
 src/vs/platform/terminal/electron-main/** @anthonykim1
 src/vs/platform/terminal/node/** @anthonykim1
-src/vs/platform/utilityProcess/** @bpasero
-src/vs/platform/window/** @bpasero
-src/vs/platform/windows/** @bpasero
-src/vs/platform/workspace/** @bpasero
-src/vs/platform/workspaces/** @bpasero
 src/vs/platform/actions/common/menuService.ts @jrieken
 src/vs/platform/instantiation/** @jrieken
 
@@ -56,51 +26,20 @@ src/vs/editor/contrib/snippet/** @jrieken
 src/vs/editor/contrib/suggest/** @jrieken
 src/vs/editor/contrib/format/** @jrieken
 
-# Bootstrap
-src/*.ts @bpasero
-
 # Electron Main
-src/vs/code/** @bpasero @deepak1556
+src/vs/code/** @deepak1556
 
 # Workbench Services
-src/vs/workbench/services/activity/** @bpasero
 src/vs/workbench/services/authentication/** @TylerLeonhardt
-src/vs/workbench/services/auxiliaryWindow/** @bpasero
 src/vs/workbench/services/browserView/** @kycutler @jruales
-src/vs/workbench/services/contextmenu/** @bpasero
-src/vs/workbench/services/dialogs/** @alexr00 @bpasero
-src/vs/workbench/services/editor/** @bpasero
+src/vs/workbench/services/dialogs/** @alexr00
 src/vs/workbench/services/editor/common/customEditorLabelService.ts @benibenj
-src/vs/workbench/services/environment/** @bpasero
-src/vs/workbench/services/files/** @bpasero
-src/vs/workbench/services/filesConfiguration/** @bpasero
-src/vs/workbench/services/history/** @bpasero
-src/vs/workbench/services/host/** @bpasero
-src/vs/workbench/services/label/** @bpasero
 src/vs/workbench/services/languageDetection/** @TylerLeonhardt
-src/vs/workbench/services/layout/** @bpasero
-src/vs/workbench/services/lifecycle/** @bpasero
-src/vs/workbench/services/notification/** @bpasero
-src/vs/workbench/services/path/** @bpasero
-src/vs/workbench/services/progress/** @bpasero
-src/vs/workbench/services/storage/** @bpasero
-src/vs/workbench/services/textfile/** @bpasero
-src/vs/workbench/services/textmodelResolver/** @bpasero
-src/vs/workbench/services/untitled/** @bpasero
-src/vs/workbench/services/utilityProcess/** @bpasero
-src/vs/workbench/services/views/** @sandy081 @benibenj @bpasero
-src/vs/workbench/services/workingCopy/** @bpasero
-src/vs/workbench/services/workspaces/** @bpasero
-
-# Workbench Core
-src/vs/workbench/common/** @bpasero
-src/vs/workbench/browser/** @bpasero
-src/vs/workbench/electron-browser/** @bpasero
+src/vs/workbench/services/views/** @sandy081 @benibenj
 
 # Workbench Contributions
 src/vs/workbench/contrib/authentication/** @TylerLeonhardt
 src/vs/workbench/contrib/browserView/** @kycutler @jruales
-src/vs/workbench/contrib/files/** @bpasero
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @roblourens
 src/vs/workbench/contrib/localization/** @TylerLeonhardt
 src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts @TylerLeonhardt

.github/skills/add-policy/SKILL.md

@@ -86,6 +86,8 @@ If you need a new field on `IPolicyData`, add it to the interface in `src/vs/bas
 
 **Optional: `enumDescriptions` for enum/string policies:**
 
+**IMPORTANT:** If the configuration property has `type: 'string'` and an `enum` array, you **must** include `enumDescriptions` in the `localization` block with the same number of entries as the `enum` array. Without this, `npm run export-policy-data` will fail with: `enumDescriptions must exist and have the same length as enum for policy "..."`.
+
 ```typescript
 localization: {
     description: { key: '...', value: nls.localize('...', "...") },

.github/workflows/api-proposal-version-check.yml

@@ -35,7 +35,7 @@ jobs:
     steps:
       - name: Get PR info
         id: pr_info
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             let prNumber, headSha, baseSha;
@@ -62,7 +62,7 @@ jobs:
 
       - name: Check for override comment
         id: check_override
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const prNumber = ${{ steps.pr_info.outputs.number }};
@@ -130,7 +130,7 @@ jobs:
           (github.event.comment.author_association == 'OWNER' ||
            github.event.comment.author_association == 'MEMBER' ||
            github.event.comment.author_association == 'COLLABORATOR')
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const headSha = '${{ steps.pr_info.outputs.head_sha }}';
@@ -241,7 +241,7 @@ jobs:
 
       - name: Post warning comment
         if: steps.check_override.outputs.override_found != 'true' && steps.version_check.outputs.version_changed == 'true'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const prNumber = ${{ steps.pr_info.outputs.number }};

.github/workflows/screenshot-test.yml

@@ -160,7 +160,7 @@ jobs:
 
       - name: Post PR comment
         if: github.event_name == 'pull_request' && (steps.diff.outputs.has_changes == 'true' || steps.blocks-ci.outputs.match == 'false')
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             const marker = '<!-- screenshot-diff-report -->';

.gitignore

@@ -31,6 +31,7 @@ test/componentFixtures/.screenshots/*
 !test/componentFixtures/.screenshots/baseline/
 dist
 .playwright-cli
+.playwright-mcp
 .claude/
 .agents/agents/*.local.md
 .github/agents/*.local.md

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
 target="39.8.7"
-ms_build_id="13797146"
+ms_build_id="13841579"
 runtime="electron"
 ignore-scripts=false
 build_from_source="true"

build/azure-pipelines/alpine/product-build-alpine-node-modules.yml

@@ -69,6 +69,16 @@ jobs:
         displayName: "Pull image"
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - task: Docker@1
+        inputs:
+          azureSubscriptionEndpoint: vscode
+          azureContainerRegistry: vscodehub.azurecr.io
+          command: "Run an image"
+          imageName: "multiarch/qemu-user-static@sha256:fe60359c92e86a43cc87b3d906006245f77bfc0565676b80004cc666e4feb9f0"
+          containerCommand: uname
+        displayName: "Pull qemu-user-static image"
+        condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['NPM_ARCH'], 'arm64'))
+
       - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev
         displayName: Install build dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

build/azure-pipelines/alpine/product-build-alpine.yml

@@ -109,6 +109,16 @@ jobs:
         displayName: "Pull image"
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
+      - task: Docker@1
+        inputs:
+          azureSubscriptionEndpoint: vscode
+          azureContainerRegistry: vscodehub.azurecr.io
+          command: "Run an image"
+          imageName: "multiarch/qemu-user-static@sha256:fe60359c92e86a43cc87b3d906006245f77bfc0565676b80004cc666e4feb9f0"
+          containerCommand: uname
+        displayName: "Pull qemu-user-static image"
+        condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['NPM_ARCH'], 'arm64'))
+
       - script: sudo apt-get update && sudo apt-get install -y libkrb5-dev
         displayName: Install build dependencies
         condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

build/azure-pipelines/common/sanity-tests.yml

@@ -14,9 +14,6 @@ parameters:
   - name: arch
     type: string
     default: amd64
-  - name: baseImage
-    type: string
-    default: ""
   - name: args
     type: string
     default: ""
@@ -42,8 +39,6 @@ jobs:
       TEST_DIR: $(Build.SourcesDirectory)/test/sanity
       LOG_FILE: $(TEST_DIR)/results.xml
       SCREENSHOTS_DIR: $(TEST_DIR)/screenshots
-      DOCKER_CACHE_DIR: $(Pipeline.Workspace)/docker-cache
-      DOCKER_CACHE_FILE: $(DOCKER_CACHE_DIR)/${{ parameters.container }}.tar
     steps:
       - checkout: self
         fetchDepth: 1
@@ -94,10 +89,9 @@ jobs:
           displayName: Install Node.js (Windows ARM64)
 
       - ${{ else }}:
-        - task: NodeTool@0
+        - task: UseNode@1
           inputs:
-            versionSource: fromFile
-            versionFilePath: .nvmrc
+            version: '22.22.0'
           displayName: Install Node.js
 
       - script: npm config set registry "$(NPM_REGISTRY)" --location=project
@@ -153,25 +147,17 @@ jobs:
 
       # Linux Docker container
       - ${{ if ne(parameters.container, '') }}:
-        - task: Cache@2
+        - task: Docker@1
+          displayName: Login to Container Registry
           inputs:
-            key: 'docker-v3 | "${{ parameters.container }}" | "${{ parameters.arch }}" | "$(Agent.OS)" | $(TEST_DIR)/containers/${{ parameters.container }}.dockerfile'
-            path: $(DOCKER_CACHE_DIR)
-            restoreKeys: docker-v3 | "${{ parameters.container }}" | "${{ parameters.arch }}" | "$(Agent.OS)"
-            cacheHitVar: DOCKER_CACHE_HIT
-          displayName: Download Docker Image
-
-        - bash: |
-            docker load -i "$(DOCKER_CACHE_FILE)"
-            rm -f "$(DOCKER_CACHE_FILE)"
-          condition: eq(variables.DOCKER_CACHE_HIT, 'true')
-          displayName: Load Docker Image
+            azureSubscriptionEndpoint: vscode
+            azureContainerRegistry: vscodehub.azurecr.io
+            command: login
 
         - bash: |
             $(TEST_DIR)/scripts/run-docker.sh \
               --container "${{ parameters.container }}" \
               --arch "${{ parameters.arch }}" \
-              --base-image "${{ parameters.baseImage }}" \
               --quality "$(BUILD_QUALITY)" \
               --commit "$(BUILD_COMMIT)" \
               --test-results "/root/results.xml" \
@@ -184,12 +170,6 @@ jobs:
             GITHUB_ACCOUNT: $(sanity-tests-account)
             GITHUB_PASSWORD: $(sanity-tests-password)
 
-        - bash: |
-            mkdir -p "$(DOCKER_CACHE_DIR)"
-            docker save -o "$(DOCKER_CACHE_FILE)" "${{ parameters.container }}"
-          condition: and(succeeded(), ne(variables.DOCKER_CACHE_HIT, 'true'))
-          displayName: Save Docker Image
-
       - ${{ if eq(parameters.os, 'windows') }}:
         - script: |
             @echo off

build/azure-pipelines/product-build.yml

@@ -578,8 +578,7 @@ extends:
                   name: fedora_36_amd64
                   displayName: Fedora 36 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: fedora
-                  baseImage: fedora:36
+                  container: fedora-36
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
@@ -588,8 +587,7 @@ extends:
                   name: fedora_36_arm64
                   displayName: Fedora 36 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: fedora
-                  baseImage: fedora:36
+                  container: fedora-36
                   arch: arm64
 
             # Fedora 40
@@ -599,8 +597,7 @@ extends:
                   name: fedora_40_amd64
                   displayName: Fedora 40 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: fedora
-                  baseImage: fedora:40
+                  container: fedora-40
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
@@ -609,8 +606,7 @@ extends:
                   name: fedora_40_arm64
                   displayName: Fedora 40 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: fedora
-                  baseImage: fedora:40
+                  container: fedora-40
                   arch: arm64
 
             # openSUSE Leap 16.0
@@ -667,8 +663,7 @@ extends:
                   name: ubuntu_22_04_amd64
                   displayName: Ubuntu 22.04 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: ubuntu
-                  baseImage: ubuntu:22.04
+                  container: ubuntu-22
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
@@ -677,8 +672,7 @@ extends:
                   name: ubuntu_22_04_arm32
                   displayName: Ubuntu 22.04 arm32
                   poolName: 1es-azure-linux-3-arm64
-                  container: ubuntu
-                  baseImage: ubuntu:22.04
+                  container: ubuntu-22
                   arch: arm
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
@@ -687,8 +681,7 @@ extends:
                   name: ubuntu_22_04_arm64
                   displayName: Ubuntu 22.04 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: ubuntu
-                  baseImage: ubuntu:22.04
+                  container: ubuntu-22
                   arch: arm64
 
             # Ubuntu 24.04
@@ -698,8 +691,7 @@ extends:
                   name: ubuntu_24_04_amd64
                   displayName: Ubuntu 24.04 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: ubuntu
-                  baseImage: ubuntu:24.04
+                  container: ubuntu-24
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
@@ -708,8 +700,7 @@ extends:
                   name: ubuntu_24_04_arm32
                   displayName: Ubuntu 24.04 arm32
                   poolName: 1es-azure-linux-3-arm64
-                  container: ubuntu
-                  baseImage: ubuntu:24.04
+                  container: ubuntu-24
                   arch: arm
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
@@ -718,8 +709,7 @@ extends:
                   name: ubuntu_24_04_arm64
                   displayName: Ubuntu 24.04 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: ubuntu
-                  baseImage: ubuntu:24.04
+                  container: ubuntu-24
                   arch: arm64
 
         - ${{ if and(parameters.VSCODE_RELEASE, eq(variables['VSCODE_PRIVATE_BUILD'], false), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}: