[pull] main from microsoft:main

.github/workflows/check-clean-git-state.sh

@@ -2,5 +2,9 @@ R=`git status --porcelain | wc -l`
 if [ "$R" -ne "0" ]; then
   echo "The git repo is not clean after compiling the /build/ folder. Did you forget to commit .js output for .ts files?";
   git status --porcelain
+  echo "\nUnstaged diff:";
+  git --no-pager diff
+  echo "\nStaged diff:";
+  git --no-pager diff --cached
   exit 1;
 fi

.github/workflows/pr.yml

@@ -159,7 +159,7 @@ jobs:
 
   copilot-check-test-cache:
     name: Copilot - Check Test Cache
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       pull-requests: read
@@ -205,7 +205,7 @@ jobs:
 
   copilot-check-telemetry:
     name: Copilot - Check Telemetry
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     steps:
@@ -224,7 +224,7 @@ jobs:
 
   copilot-linux-tests:
     name: Copilot - Test (Linux)
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64 ]
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
     steps:
@@ -252,6 +252,11 @@ jobs:
       - name: Install setuptools
         run: pip install setuptools
 
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y xvfb libgtk-3-0 libgbm1
+
       - name: Restore build cache
         uses: actions/cache/restore@v4
         id: build-cache
@@ -332,7 +337,7 @@ jobs:
 
   copilot-windows-tests:
     name: Copilot - Test (Windows)
-    runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-windows-2022-x64 ]
+    runs-on: windows-2022
     permissions:
       contents: read
     steps:

.github/workflows/screenshot-test.yml

@@ -46,6 +46,9 @@ jobs:
         run: npm ci
         working-directory: build/rspack
 
+      - name: Copy codicons
+        run: cp node_modules/@vscode/codicons/dist/codicon.ttf src/vs/base/browser/ui/codicons/codicon/codicon.ttf
+
       - name: Transpile source
         run: npm run transpile-client
 
@@ -62,45 +65,17 @@ jobs:
             test/componentFixtures/.screenshots/current/manifest.json \
             test/componentFixtures/blocks-ci-screenshots.md \
             https://hediet-screenshots.azurewebsites.net \
-            --json \
-            > /tmp/blocks-ci-diff.json 2>/tmp/blocks-ci-stderr.txt \
+            > /tmp/blocks-ci-updated.md 2>/tmp/blocks-ci-stderr.txt \
             && echo "match=true" >> "$GITHUB_OUTPUT" \
             || {
               echo "match=false" >> "$GITHUB_OUTPUT"
               cat /tmp/blocks-ci-stderr.txt >&2
-              DIFF=$(cat /tmp/blocks-ci-diff.json)
-              echo "diff<<BLOCKS_CI_EOF" >> "$GITHUB_OUTPUT"
-              echo "$DIFF" >> "$GITHUB_OUTPUT"
+              CONTENT=$(cat /tmp/blocks-ci-updated.md)
+              echo "content<<BLOCKS_CI_EOF" >> "$GITHUB_OUTPUT"
+              echo "$CONTENT" >> "$GITHUB_OUTPUT"
               echo "BLOCKS_CI_EOF" >> "$GITHUB_OUTPUT"
             }
 
-      - name: Suggest blocks-ci screenshot update
-        if: github.event_name == 'pull_request' && steps.blocks-ci.outputs.match == 'false'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const diff = JSON.parse(process.env.DIFF_JSON);
-            const filePath = 'test/componentFixtures/blocks-ci-screenshots.md';
-            const marker = '<!-- blocks-ci-screenshot-suggestion -->';
-
-            await github.rest.pulls.createReview({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.issue.number,
-              commit_id: context.payload.pull_request.head.sha,
-              event: 'COMMENT',
-              body: `${marker}\n### blocks-ci screenshots changed\n\nApply the suggestion below to update the committed screenshots.`,
-              comments: [{
-                path: filePath,
-                start_line: diff.startLine < diff.endLine ? diff.startLine : undefined,
-                line: diff.endLine,
-                side: 'RIGHT',
-                body: `${marker}\nScreenshots for \`blocks-ci\` fixtures have changed. Apply this suggestion to accept:\n\n\`\`\`suggestion\n${diff.replacement}\n\`\`\``,
-              }],
-            });
-        env:
-          DIFF_JSON: ${{ steps.blocks-ci.outputs.diff }}
-
       - name: Upload screenshots
         uses: actions/upload-artifact@v7
         with:
@@ -148,12 +123,24 @@ jobs:
           SCREENSHOT_SERVICE_TOKEN: ${{ steps.oidc.outputs.token }}
 
       - name: Post PR comment
-        if: github.event_name == 'pull_request' && steps.diff.outputs.has_changes == 'true'
+        if: github.event_name == 'pull_request' && (steps.diff.outputs.has_changes == 'true' || steps.blocks-ci.outputs.match == 'false')
         uses: actions/github-script@v7
         with:
           script: |
             const marker = '<!-- screenshot-diff-report -->';
-            const body = process.env.COMMENT_BODY;
+            let body = process.env.COMMENT_BODY || '';
+            const blocksCiContent = process.env.BLOCKS_CI_CONTENT;
+
+            if (blocksCiContent) {
+              if (body) { body += '\n\n---\n\n'; }
+              body += '### blocks-ci screenshots changed\n\n';
+              body += 'Replace the contents of `test/componentFixtures/blocks-ci-screenshots.md` with:\n\n';
+              body += '<details>\n<summary>Updated blocks-ci-screenshots.md</summary>\n\n';
+              body += '```md\n' + blocksCiContent + '\n```\n\n';
+              body += '</details>';
+            }
+
+            body = marker + '\n' + body;
 
             const { data: comments } = await github.rest.issues.listComments({
               owner: context.repo.owner,
@@ -180,11 +167,12 @@ jobs:
             }
         env:
           COMMENT_BODY: ${{ steps.diff.outputs.body }}
+          BLOCKS_CI_CONTENT: ${{ steps.blocks-ci.outputs.content }}
 
       - name: Fail if blocks-ci hashes changed
         if: steps.blocks-ci.outputs.match == 'false'
         run: |
-          echo "::error::blocks-ci screenshot hashes do not match committed file. See PR review suggestion to update."
+          echo "::error::blocks-ci screenshot hashes do not match committed file. See PR comment for updated content."
           exit 1
 
       # - name: Compare screenshots

.vscode/launch.json

@@ -20,7 +20,8 @@
 			"port": 5870,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js",
-				"${workspaceFolder}/extensions/*/out/**/*.js"
+				"${workspaceFolder}/extensions/*/out/**/*.js",
+				"${workspaceFolder}/extensions/copilot/dist/**/*.js"
 			]
 		},
 		{

build/.moduleignore

@@ -99,6 +99,20 @@ kerberos/node_modules/**
 
 cpu-features/**
 
+# utf-8-validate and bufferutil are native modules pulled in by the websocket
+# package. They include prebuilds for multiple platforms which break cross-platform
+# bundling (rcedit fails on non-PE .node files). Both modules have pure JS fallbacks
+# that are sufficient for Node.js >= 18.14.0, so we strip all native artifacts.
+utf-8-validate/binding.gyp
+utf-8-validate/build/**
+utf-8-validate/prebuilds/**
+utf-8-validate/src/**
+
+bufferutil/binding.gyp
+bufferutil/build/**
+bufferutil/prebuilds/**
+bufferutil/src/**
+
 ssh2/lib/protocol/crypto/binding.gyp
 ssh2/lib/protocol/crypto/build/**
 ssh2/lib/protocol/crypto/src/**

build/azure-pipelines/common/downloadCopilotVsix.ts

@@ -52,7 +52,7 @@ async function checkCopilotJobFailed(): Promise<boolean> {
 			r => r.type === 'Job' && r.name === COPILOT_JOB_NAME
 		);
 
-		if (copilotJob && copilotJob.state === 'completed' && copilotJob.result !== 'succeeded') {
+		if (copilotJob && copilotJob.state === 'completed' && copilotJob.result !== 'succeeded' && copilotJob.result !== 'succeededWithIssues') {
 			return true;
 		}
 	} catch (err) {