Merge branch 'main' into anthonykim1/copilotCLIsystemPrompt

Author: anthonykim1

.github/workflows/screenshot-test.yml

@@ -107,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

build/.cachesalt

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

build/.moduleignore

@@ -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/**

build/lib/extensions.ts

@@ -430,6 +430,7 @@ function doPackageLocalExtensionsStream(forWeb: boolean, disableMangle: boolean,
 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
 			.filter(({ manifestPath }) => (forWeb ? isWebExtension(require(manifestPath)) : true))
 	);
+
 	const localExtensionsStream = minifyExtensionResources(
 		es.merge(
 			...localExtensionsDescriptions.map(extension => {
@@ -447,11 +448,15 @@ function doPackageLocalExtensionsStream(forWeb: boolean, disableMangle: boolean,
 		const productionDependencies = getProductionDependencies('extensions/');
 		const dependenciesSrc = productionDependencies.map(d => path.relative(root, d)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]).flat();
 
-		result = es.merge(
-			localExtensionsStream,
-			gulp.src(dependenciesSrc, { base: '.' })
-				.pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
-				.pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))));
+		if (dependenciesSrc.length) {
+			result = es.merge(
+				localExtensionsStream,
+				gulp.src(dependenciesSrc, { base: '.' })
+					.pipe(util2.cleanNodeModules(path.join(root, 'build', '.moduleignore')))
+					.pipe(util2.cleanNodeModules(path.join(root, 'build', `.moduleignore.${process.platform}`))));
+		} else {
+			result = localExtensionsStream;
+		}
 	}
 
 	return (

build/lib/screenshotDiffReport.ts

@@ -194,13 +194,21 @@ async function computePixelDiffs(
 	return results;
 }
 
+interface ManifestEvent {
+	readonly type?: string;
+	readonly message?: string;
+	readonly stack?: string;
+	readonly phase?: string;
+	readonly isError?: boolean;
+}
+
 interface LocalManifestFixture {
 	readonly fixtureId: string;
 	readonly imageHash?: string;
 	readonly imagePath?: string;
 	readonly labels?: readonly string[];
 	readonly hasError?: boolean;
-	readonly error?: { readonly message?: string; readonly stack?: string } | string;
+	readonly events?: readonly ManifestEvent[];
 }
 
 interface LocalManifest {
@@ -271,11 +279,10 @@ function diffManifests(local: LocalManifest, base: BaseCommitResponse): DiffResu
 
 	for (const cur of local.fixtures) {
 		if (cur.hasError || !cur.imageHash || !cur.imagePath) {
-			const rawError = cur.error;
-			const errorMessage = typeof rawError === 'string'
-				? rawError
-				: rawError?.message ?? 'unknown error (no image hash produced)';
-			const errorStack = typeof rawError === 'object' ? rawError?.stack : undefined;
+			const errorEvents = (cur.events ?? []).filter(e => e.isError);
+			const errorMessage = errorEvents.map(e => e.message).filter(Boolean).join('; ')
+				|| 'unknown error (no image hash produced)';
+			const errorStack = errorEvents.map(e => e.stack).find(s => s !== undefined);
 			errored.push({
 				fixtureId: cur.fixtureId,
 				labels: cur.labels,

build/rspack/package-lock.json

@@ -13,7 +13,7 @@
     "source-map-loader": "^5.0.0"
   },
   "dependencies": {
-    "@vscode/component-explorer": "^0.2.1-26",
-    "@vscode/component-explorer-webpack-plugin": "^0.3.1-23"
+    "@vscode/component-explorer": "^0.2.1-27",
+    "@vscode/component-explorer-webpack-plugin": "^0.3.1-24"
   }
 }

build/rspack/package.json

@@ -112,8 +112,8 @@ export default {
 	devServer: {
 		host: 'localhost',
 		port,
-		hot: 'only',
-		liveReload: false,
+		hot: true,
+		liveReload: true,
 		compress: false,
 		headers: {
 			'Access-Control-Allow-Origin': '*',

build/rspack/rspack.serve-out.config.mts

@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@vscode/component-explorer": "^0.2.1-26",
-    "@vscode/component-explorer-vite-plugin": "^0.2.1-25",
+    "@vscode/component-explorer": "^0.2.1-27",
+    "@vscode/component-explorer-vite-plugin": "^0.2.1-26",
     "@vscode/rollup-plugin-esm-url": "^1.0.1-1",
     "rollup": "*",
     "vite": "npm:rolldown-vite@latest"