Bump Copilot CLI SDK packages to 1.0.64-1 / 1.0.3

build/darwin/create-universal-app.ts

@@ -121,7 +121,7 @@ async function main(buildDir?: string) {
 		outAppPath,
 		force: true,
 		mergeASARs: true,
-		x64ArchFiles: '{*/kerberos.node,**/extensions/microsoft-authentication/dist/libmsalruntime.dylib,**/extensions/microsoft-authentication/dist/msal-node-runtime.node,**/node_modules/@github/copilot-darwin-*/copilot,**/node_modules/@github/copilot/prebuilds/darwin-*/*,**/node_modules/@github/copilot/tgrep/bin/darwin-*/*,**/node_modules/@github/copilot/sdk/tgrep/bin/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot-darwin-*/copilot,**/node_modules.asar.unpacked/@github/copilot/prebuilds/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot/tgrep/bin/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot/sdk/tgrep/bin/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/sdk/prebuilds/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/sdk/ripgrep/bin/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/sdk/tgrep/bin/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/tgrep/bin/darwin-*/*,**/node_modules/@vscode/ripgrep-universal/bin/darwin-*/*,**/node_modules.asar.unpacked/@vscode/ripgrep-universal/bin/darwin-*/*,**/node_modules/@microsoft/mxc-sdk/bin/**,**/node_modules.asar.unpacked/@microsoft/mxc-sdk/bin/**}',
+		x64ArchFiles: '{*/kerberos.node,**/extensions/microsoft-authentication/dist/libmsalruntime.dylib,**/extensions/microsoft-authentication/dist/msal-node-runtime.node,**/node_modules/@github/copilot-darwin-*/**,**/node_modules/@github/copilot/prebuilds/darwin-*/*,**/node_modules/@github/copilot/tgrep/bin/darwin-*/*,**/node_modules/@github/copilot/sdk/tgrep/bin/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot-darwin-*/**,**/node_modules.asar.unpacked/@github/copilot/prebuilds/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot/tgrep/bin/darwin-*/*,**/node_modules.asar.unpacked/@github/copilot/sdk/tgrep/bin/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/sdk/prebuilds/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/sdk/ripgrep/bin/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/sdk/tgrep/bin/darwin-*/*,**/extensions/copilot/node_modules/@github/copilot/tgrep/bin/darwin-*/*,**/node_modules/@vscode/ripgrep-universal/bin/darwin-*/*,**/node_modules.asar.unpacked/@vscode/ripgrep-universal/bin/darwin-*/*,**/node_modules/@microsoft/mxc-sdk/bin/**,**/node_modules.asar.unpacked/@microsoft/mxc-sdk/bin/**}',
 		filesToSkipComparison: (file: string) => {
 			for (const expected of filesToSkip) {
 				if (minimatch(file, expected)) {

build/gulpfile.reh.ts

@@ -31,7 +31,7 @@ import log from 'fancy-log';
 import buildfile from './buildfile.ts';
 import { fetchUrls } from './lib/fetch.ts';
 import { downloadFeedPackage } from './lib/azureFeed.ts';
-import { getCopilotExcludeFilter, getCopilotRuntimePrebuildFiles, getCopilotTgrepExcludeFilter, getRipgrepExcludeFilter, prepareBuiltInCopilotRipgrepShim } from './lib/copilot.ts';
+import { ensureCopilotPlatformPackage, getCopilotExcludeFilter, getCopilotRuntimePrebuildFiles, getCopilotTgrepExcludeFilter, getRipgrepExcludeFilter, prepareBuiltInCopilotRipgrepShim } from './lib/copilot.ts';
 import { readAgentSdkResults } from './agent-sdk/common.ts';
 
 
@@ -442,6 +442,7 @@ function packageTask(type: string, platform: string, arch: string, sourceFolderN
 			.pipe(filter(['**', '!**/package-lock.json', '!**/*.{js,css}.map']))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, `.moduleignore.${process.platform}`)));
+		ensureCopilotPlatformPackage(platform, arch, 'remote/node_modules');
 		const copilotRuntimePrebuilds = gulp.src(getCopilotRuntimePrebuildFiles(platform, arch, 'remote/node_modules'), { base: 'remote', dot: true, allowEmpty: true });
 		const deps = es.merge(cleanedDeps, copilotRuntimePrebuilds)
 			.pipe(filter(getCopilotExcludeFilter(platform, arch)))

build/gulpfile.vscode.ts

@@ -28,7 +28,7 @@ import minimist from 'minimist';
 import { compileBuildWithoutManglingTask, compileBuildWithManglingTask } from './gulpfile.compile.ts';
 import { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask, compileCopilotExtensionBuildTask } from './gulpfile.extensions.ts';
 import { copyCodiconsTask } from './lib/compilation.ts';
-import { getCopilotExcludeFilter, getCopilotRuntimePrebuildFiles, getCopilotTgrepExcludeFilter, getRipgrepExcludeFilter, prepareBuiltInCopilotRipgrepShim } from './lib/copilot.ts';
+import { ensureCopilotPlatformPackage, getCopilotExcludeFilter, getCopilotRuntimePrebuildFiles, getCopilotTgrepExcludeFilter, getRipgrepExcludeFilter, prepareBuiltInCopilotRipgrepShim } from './lib/copilot.ts';
 import { readAgentSdkResults } from './agent-sdk/common.ts';
 import { useEsbuildTranspile } from './buildConfig.ts';
 import { promisify } from 'util';
@@ -340,6 +340,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 			.pipe(filter(depFilterPattern))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, '.moduleignore')))
 			.pipe(util.cleanNodeModules(path.join(import.meta.dirname, `.moduleignore.${process.platform}`)));
+		ensureCopilotPlatformPackage(platform, arch);
 		const copilotRuntimePrebuilds = gulp.src(getCopilotRuntimePrebuildFiles(platform, arch), { base: '.', dot: true, allowEmpty: true });
 		const deps = es.merge(cleanedDeps, copilotRuntimePrebuilds)
 			.pipe(filter(getCopilotExcludeFilter(platform, arch)))

build/lib/copilot.ts

@@ -4,7 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
+import { createHash } from 'crypto';
+import { execFileSync } from 'child_process';
+import * as os from 'os';
 import * as path from 'path';
+import { extract } from 'tar';
 
 /**
  * The platforms that @github/copilot ships platform-specific packages for.
@@ -13,6 +17,7 @@ import * as path from 'path';
 export const copilotPlatforms = [
 	'darwin-arm64', 'darwin-x64',
 	'linux-arm64', 'linux-x64',
+	'linuxmusl-arm64', 'linuxmusl-x64',
 	'win32-arm64', 'win32-x64',
 ];
 
@@ -73,6 +78,38 @@ function toCopilotTgrepPlatformArch(platform: string, arch: string): string {
 	return `${nodePlatform}-${nodeArch}`;
 }
 
+function toCopilotPackagePlatformArch(platform: string, arch: string): string {
+	if (platform === 'alpine') {
+		return `linuxmusl-${arch}`;
+	}
+	if (arch === 'alpine') {
+		return 'linuxmusl-x64';
+	}
+
+	const { nodePlatform, nodeArch } = toNodePlatformArch(platform, arch);
+	return `${nodePlatform}-${nodeArch}`;
+}
+
+const copilotOptionalNativePayloadDirs = [
+	'clipboard',
+	'foundry-local-sdk',
+	'mxc-bin',
+	'pvrecorder',
+];
+
+function getCopilotOptionalNativePayloadFiles(platform: string): string[] {
+	const files = [
+		'prebuilds/*/computer.node',
+		'prebuilds/*/keytar.node',
+	];
+
+	if (platform !== 'win32') {
+		files.push('prebuilds/*/cli-native.node');
+	}
+
+	return files;
+}
+
 /**
  * Returns a glob filter that strips @vscode/ripgrep-universal bin directories
  * for architectures other than the build target.
@@ -102,14 +139,13 @@ export function getCopilotTgrepExcludeFilter(platform: string, arch: string): st
  * Returns a glob filter that strips @github/copilot platform packages
  * for architectures other than the build target.
  *
- * For platforms the copilot SDK doesn't natively support (e.g. alpine, armhf),
- * ALL platform packages are stripped - that's fine because the copilot CLI SDK
- * resolves `node-pty` from the embedder (VS Code) first via `hostRequire`,
- * falling back to its bundled copy only if the embedder can't provide it.
+ * Alpine uses the linuxmusl-* packages. Other platform package names follow
+ * Node's `${process.platform}-${process.arch}` naming. If Copilot does not
+ * ship the computed platform package (for example linux-arm for armhf builds),
+ * this strips every known @github/copilot-* platform package.
  */
 export function getCopilotExcludeFilter(platform: string, arch: string): string[] {
-	const { nodePlatform, nodeArch } = toNodePlatformArch(platform, arch);
-	const targetPlatformArch = `${nodePlatform}-${nodeArch}`;
+	const targetPlatformArch = toCopilotPackagePlatformArch(platform, arch);
 	const nonTargetPlatforms = copilotPlatforms.filter(p => p !== targetPlatformArch);
 
 	// Strip wrong-architecture @github/copilot-{platform} packages.
@@ -119,55 +155,121 @@ export function getCopilotExcludeFilter(platform: string, arch: string): string[
 }
 
 /**
- * Returns the public @github/copilot-sdk runtime native addon files that must
- * survive app/remote packaging for the target platform.
+ * Returns the public @github/copilot package files that must survive
+ * app/remote packaging for the target platform.
  *
- * .moduleignore strips @github/copilot/prebuilds/** globally because the
- * internal extension SDK uses a copied sdk/prebuilds layout. Agent Host uses
- * the public SDK, whose runtime addon loader expects runtime.node in the root
- * prebuilds layout. The SDK's built-in shell tool additionally spawns commands
- * through node-pty, whose native binaries live in the same root prebuilds
- * layout, so those must be preserved too (otherwise the sandboxed shell fails
- * with `Cannot find module './prebuilds/<platform>/pty.node'` — or conpty.node
- * on Windows).
+ * .moduleignore strips all @github/copilot-* platform packages globally.
+ * Re-add the selected runtime package so Agent Host can launch its index.js
+ * entrypoint and load runtime prebuilds. Keep the standalone SEA executable
+ * and optional native payload trees out of the product build.
  */
 export function getCopilotRuntimePrebuildFiles(platform: string, arch: string, nodeModulesRoot = 'node_modules'): string[] {
-	const { nodePlatform, nodeArch } = toNodePlatformArch(platform, arch);
-	const targetPlatformArch = `${nodePlatform}-${nodeArch}`;
-	const prebuildDir = path.posix.join(nodeModulesRoot, '@github', 'copilot', 'prebuilds', targetPlatformArch);
+	const copilotPackagePlatformArch = toCopilotPackagePlatformArch(platform, arch);
+	const copilotPlatformPackageDir = path.posix.join(nodeModulesRoot, '@github', `copilot-${copilotPackagePlatformArch}`);
 
-	const files = [
-		path.posix.join(prebuildDir, 'runtime.node'),
+	return [
+		path.posix.join(copilotPlatformPackageDir, '**'),
+		`!${path.posix.join(copilotPlatformPackageDir, 'copilot')}`,
+		`!${path.posix.join(copilotPlatformPackageDir, 'copilot.exe')}`,
+		...copilotOptionalNativePayloadDirs.map(dir => `!${path.posix.join(copilotPlatformPackageDir, dir, '**')}`),
+		...getCopilotOptionalNativePayloadFiles(platform).map(file => `!${path.posix.join(copilotPlatformPackageDir, file)}`),
 	];
+}
 
-	// node-pty native binaries for the SDK's built-in shell tool. Windows uses
-	// ConPTY (conpty.node plus the conpty/ helpers); darwin/linux use pty.node,
-	// and darwin additionally ships the spawn-helper executable.
-	if (nodePlatform === 'win32') {
-		files.push(
-			path.posix.join(prebuildDir, 'conpty.node'),
-			path.posix.join(prebuildDir, 'conpty_console_list.node'),
-			path.posix.join(prebuildDir, 'conpty', 'OpenConsole.exe'),
-			path.posix.join(prebuildDir, 'conpty', 'conpty.dll'),
-		);
-	} else {
-		files.push(path.posix.join(prebuildDir, 'pty.node'));
-		if (nodePlatform === 'darwin') {
-			files.push(path.posix.join(prebuildDir, 'spawn-helper'));
-		}
+interface NpmPackageLock {
+	packages?: Record<string, {
+		version?: string;
+		integrity?: string;
+	}>;
+}
+
+interface EnsureCopilotPlatformPackageOptions {
+	packPackage?: (packageName: string, version: string, tempDir: string) => string;
+}
+
+/**
+ * Ensures the selected @github/copilot-{platform} package is present before
+ * packaging. npm only installs the host-compatible optional dependency, but
+ * VS Code packaging can cross-build targets such as darwin-x64 on arm64 hosts.
+ */
+export function ensureCopilotPlatformPackage(platform: string, arch: string, nodeModulesRoot = 'node_modules', options: EnsureCopilotPlatformPackageOptions = {}): void {
+	const copilotPackagePlatformArch = toCopilotPackagePlatformArch(platform, arch);
+	if (!copilotPlatforms.includes(copilotPackagePlatformArch)) {
+		return;
 	}
 
-	return files;
+	const packageName = `@github/copilot-${copilotPackagePlatformArch}`;
+	const packageDir = path.join(nodeModulesRoot, '@github', `copilot-${copilotPackagePlatformArch}`);
+	if (fs.existsSync(packageDir)) {
+		return;
+	}
+
+	const lockFilePath = path.join(path.dirname(nodeModulesRoot), 'package-lock.json');
+	const lockPackageKey = path.posix.join('node_modules', '@github', `copilot-${copilotPackagePlatformArch}`);
+	const lockPackage = readNpmPackageLock(lockFilePath).packages?.[lockPackageKey];
+	if (!lockPackage?.version) {
+		throw new Error(`[ensureCopilotPlatformPackage] Missing ${lockPackageKey} in ${lockFilePath}. Run npm install to refresh the lockfile.`);
+	}
+
+	const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-copilot-platform-'));
+	try {
+		const tarballPath = (options.packPackage ?? packCopilotPlatformPackage)(packageName, lockPackage.version, tempDir);
+		verifyNpmIntegrity(tarballPath, lockPackage.integrity);
+
+		fs.mkdirSync(packageDir, { recursive: true });
+		extract({ file: tarballPath, cwd: packageDir, strip: 1, sync: true });
+		console.log(`[ensureCopilotPlatformPackage] Materialized ${packageName}@${lockPackage.version} in ${packageDir}`);
+	} catch (err) {
+		fs.rmSync(packageDir, { recursive: true, force: true });
+		throw new Error(`[ensureCopilotPlatformPackage] Failed to materialize ${packageName}@${lockPackage.version}: ${err instanceof Error ? err.message : String(err)}`);
+	} finally {
+		fs.rmSync(tempDir, { recursive: true, force: true });
+	}
+}
+
+function packCopilotPlatformPackage(packageName: string, version: string, tempDir: string): string {
+	execFileSync(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['pack', `${packageName}@${version}`, '--pack-destination', tempDir, '--silent'], { stdio: 'pipe', shell: process.platform === 'win32' });
+
+	const tarball = fs.readdirSync(tempDir).find(name => name.endsWith('.tgz'));
+	if (!tarball) {
+		throw new Error(`npm pack did not produce a tarball in ${tempDir}`);
+	}
+
+	return path.join(tempDir, tarball);
+}
+
+function readNpmPackageLock(lockFilePath: string): NpmPackageLock {
+	try {
+		return JSON.parse(fs.readFileSync(lockFilePath, 'utf8'));
+	} catch (err) {
+		throw new Error(`[ensureCopilotPlatformPackage] Failed to read ${lockFilePath}: ${err instanceof Error ? err.message : String(err)}`);
+	}
+}
+
+function verifyNpmIntegrity(tarballPath: string, integrity: string | undefined): void {
+	if (!integrity) {
+		return;
+	}
+
+	const sha512Integrity = integrity.split(/\s+/).find(entry => entry.startsWith('sha512-'));
+	if (!sha512Integrity) {
+		return;
+	}
+
+	const expected = sha512Integrity.slice('sha512-'.length);
+	const actual = createHash('sha512').update(fs.readFileSync(tarballPath)).digest('base64');
+	if (actual !== expected) {
+		throw new Error(`integrity mismatch for ${tarballPath}`);
+	}
 }
 
 /**
- * Materializes the copilot CLI ripgrep shim directly inside the built-in copilot extension.
+ * Materializes target-platform Copilot CLI SDK files directly inside the built-in copilot extension.
  *
  * This is used when copilot is shipped as a built-in extension so startup does
- * not need to create the shim at runtime. The destination layout matches the
- * runtime shim logic in the copilot extension:
- * - ripgrep:  node_modules/@github/copilot/sdk/ripgrep/bin/{platform-arch}
- * - marker:   node_modules/@github/copilot/shims.txt
+ * not need to create the shim at runtime. The Copilot VSIX is built once on the
+ * Linux x64 host, so product packaging also restores target-platform SDK
+ * natives from the selected @github/copilot-{platform} package.
  *
  * Note: `node-pty` is no longer shimmed. The copilot CLI SDK resolves
  * `node-pty` from the embedder (VS Code) via `hostRequire` and falls back to
@@ -179,6 +281,7 @@ export function getCopilotRuntimePrebuildFiles(platform: string, arch: string, n
 export function prepareBuiltInCopilotRipgrepShim(platform: string, arch: string, builtInCopilotExtensionDir: string, appNodeModulesDir: string): void {
 	const { nodePlatform, nodeArch } = toNodePlatformArch(platform, arch);
 	const platformArch = `${nodePlatform}-${nodeArch}`;
+	const copilotPackagePlatformArch = toCopilotPackagePlatformArch(platform, arch);
 	const tgrepPlatformArch = toCopilotTgrepPlatformArch(platform, arch);
 
 	const extensionNodeModules = path.join(builtInCopilotExtensionDir, 'node_modules');
@@ -187,7 +290,8 @@ export function prepareBuiltInCopilotRipgrepShim(platform: string, arch: string,
 	if (!fs.existsSync(copilotSdkBase)) {
 		throw new Error(`[prepareBuiltInCopilotRipgrepShim] Copilot SDK directory not found at ${copilotSdkBase}`);
 	}
-	pruneNonTargetCopilotSdkPrebuilds(platformArch, path.join(copilotSdkBase, 'prebuilds'), copilotPlatforms);
+	materializeBuiltInCopilotSdkPlatformFiles(copilotPackagePlatformArch, tgrepPlatformArch, copilotBase, appNodeModulesDir);
+	pruneNonTargetCopilotSdkPrebuilds(copilotPackagePlatformArch, path.join(copilotSdkBase, 'prebuilds'), copilotPlatforms);
 	pruneNonTargetCopilotSdkPrebuilds(tgrepPlatformArch, path.join(copilotSdkBase, path.join('tgrep', 'bin')), copilotTgrepPlatforms);
 	pruneNonTargetCopilotSdkPrebuilds(tgrepPlatformArch, path.join(copilotBase, path.join('tgrep', 'bin')), copilotTgrepPlatforms);
 
@@ -219,6 +323,49 @@ export function prepareBuiltInCopilotRipgrepShim(platform: string, arch: string,
 	}
 }
 
+function materializeBuiltInCopilotSdkPlatformFiles(copilotPackagePlatformArch: string, tgrepPlatformArch: string, copilotBase: string, appNodeModulesDir: string): void {
+	if (!copilotPlatforms.includes(copilotPackagePlatformArch)) {
+		return;
+	}
+
+	const platformPackageDir = path.join(appNodeModulesDir, '@github', `copilot-${copilotPackagePlatformArch}`);
+	if (!fs.existsSync(platformPackageDir)) {
+		throw new Error(`[prepareBuiltInCopilotRipgrepShim] Copilot platform package not found at ${platformPackageDir}`);
+	}
+
+	copyRequiredDirectory(
+		path.join(platformPackageDir, 'prebuilds', copilotPackagePlatformArch),
+		path.join(copilotBase, 'sdk', 'prebuilds', copilotPackagePlatformArch),
+		`Copilot SDK native prebuilds for ${copilotPackagePlatformArch}`
+	);
+
+	if (!copilotTgrepPlatforms.includes(tgrepPlatformArch)) {
+		return;
+	}
+
+	const tgrepSource = path.join(platformPackageDir, 'tgrep', 'bin', tgrepPlatformArch);
+	copyRequiredDirectory(
+		tgrepSource,
+		path.join(copilotBase, 'tgrep', 'bin', tgrepPlatformArch),
+		`Copilot tgrep for ${tgrepPlatformArch}`
+	);
+	copyRequiredDirectory(
+		tgrepSource,
+		path.join(copilotBase, 'sdk', 'tgrep', 'bin', tgrepPlatformArch),
+		`Copilot SDK tgrep for ${tgrepPlatformArch}`
+	);
+}
+
+function copyRequiredDirectory(source: string, target: string, description: string): void {
+	if (!fs.existsSync(source)) {
+		throw new Error(`[prepareBuiltInCopilotRipgrepShim] ${description} not found at ${source}`);
+	}
+
+	fs.rmSync(target, { recursive: true, force: true });
+	fs.mkdirSync(path.dirname(target), { recursive: true });
+	fs.cpSync(source, target, { recursive: true });
+}
+
 function pruneNonTargetCopilotSdkPrebuilds(targetPlatformArch: string, prebuildsDir: string, platformArchs: string[]): void {
 	if (!fs.existsSync(prebuildsDir)) {
 		return;