diff --git a/extensions/copilot/chat-lib/package-lock.json b/extensions/copilot/chat-lib/package-lock.json
index 3f7179846e4..4ba70fc350c 100644
--- a/extensions/copilot/chat-lib/package-lock.json
+++ b/extensions/copilot/chat-lib/package-lock.json
@@ -12,7 +12,7 @@
 			"dependencies": {
 				"@microsoft/tiktokenizer": "^1.0.10",
 				"@sinclair/typebox": "^0.34.41",
-				"@vscode/copilot-api": "^0.2.12",
+				"@vscode/copilot-api": "^0.2.13",
 				"@vscode/l10n": "^0.0.18",
 				"@vscode/prompt-tsx": "^0.4.0-alpha.6",
 				"@vscode/tree-sitter-wasm": "0.0.5-php.2",
@@ -1328,9 +1328,9 @@
 			}
 		},
 		"node_modules/@vscode/copilot-api": {
-			"version": "0.2.12",
-			"resolved": "https://registry.npmjs.org/@vscode/copilot-api/-/copilot-api-0.2.12.tgz",
-			"integrity": "sha512-b98amJsB0GZDSLBWs68HYeN3Mwy4VnvWAVd/arT4L7m6gdeEV9KrfoXjIZhsJMnUL6+JheECZjLpjp8u1iNjlw==",
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/@vscode/copilot-api/-/copilot-api-0.2.13.tgz",
+			"integrity": "sha512-i8oMsurdFkEj7eDBt+1ZUJJGW5/2eDudc0767Szi/GxSXRFSjY/rmDxBxgcSAhtyNfb+FhdyFDx8dSPjZ/UdBA==",
 			"license": "SEE LICENSE"
 		},
 		"node_modules/@vscode/l10n": {
diff --git a/extensions/copilot/chat-lib/package.json b/extensions/copilot/chat-lib/package.json
index f531d024a78..78b367d6047 100644
--- a/extensions/copilot/chat-lib/package.json
+++ b/extensions/copilot/chat-lib/package.json
@@ -16,7 +16,7 @@
 	"dependencies": {
 		"@microsoft/tiktokenizer": "^1.0.10",
 		"@sinclair/typebox": "^0.34.41",
-		"@vscode/copilot-api": "^0.2.12",
+		"@vscode/copilot-api": "^0.2.13",
 		"@vscode/l10n": "^0.0.18",
 		"@vscode/prompt-tsx": "^0.4.0-alpha.6",
 		"@vscode/tree-sitter-wasm": "0.0.5-php.2",
diff --git a/extensions/copilot/package-lock.json b/extensions/copilot/package-lock.json
index 3711de28a05..2682b254176 100644
--- a/extensions/copilot/package-lock.json
+++ b/extensions/copilot/package-lock.json
@@ -19,7 +19,7 @@
 				"@microsoft/tiktokenizer": "^1.0.10",
 				"@modelcontextprotocol/sdk": "^1.25.2",
 				"@sinclair/typebox": "^0.34.41",
-				"@vscode/copilot-api": "^0.2.12",
+				"@vscode/copilot-api": "^0.2.13",
 				"@vscode/extension-telemetry": "^1.5.1",
 				"@vscode/l10n": "^0.0.18",
 				"@vscode/prompt-tsx": "^0.4.0-alpha.6",
@@ -6866,9 +6866,9 @@
 			}
 		},
 		"node_modules/@vscode/copilot-api": {
-			"version": "0.2.12",
-			"resolved": "https://registry.npmjs.org/@vscode/copilot-api/-/copilot-api-0.2.12.tgz",
-			"integrity": "sha512-b98amJsB0GZDSLBWs68HYeN3Mwy4VnvWAVd/arT4L7m6gdeEV9KrfoXjIZhsJMnUL6+JheECZjLpjp8u1iNjlw==",
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/@vscode/copilot-api/-/copilot-api-0.2.13.tgz",
+			"integrity": "sha512-i8oMsurdFkEj7eDBt+1ZUJJGW5/2eDudc0767Szi/GxSXRFSjY/rmDxBxgcSAhtyNfb+FhdyFDx8dSPjZ/UdBA==",
 			"license": "SEE LICENSE"
 		},
 		"node_modules/@vscode/debugadapter": {
diff --git a/extensions/copilot/package.json b/extensions/copilot/package.json
index 9622b2eeda5..bebe178fdac 100644
--- a/extensions/copilot/package.json
+++ b/extensions/copilot/package.json
@@ -5934,7 +5934,7 @@
 		"@microsoft/tiktokenizer": "^1.0.10",
 		"@modelcontextprotocol/sdk": "^1.25.2",
 		"@sinclair/typebox": "^0.34.41",
-		"@vscode/copilot-api": "^0.2.12",
+		"@vscode/copilot-api": "^0.2.13",
 		"@vscode/extension-telemetry": "^1.5.1",
 		"@vscode/l10n": "^0.0.18",
 		"@vscode/prompt-tsx": "^0.4.0-alpha.6",
diff --git a/extensions/copilot/src/extension/test/vscode-node/services.ts b/extensions/copilot/src/extension/test/vscode-node/services.ts
index 0b9c14f47c8..475f3642a31 100644
--- a/extensions/copilot/src/extension/test/vscode-node/services.ts
+++ b/extensions/copilot/src/extension/test/vscode-node/services.ts
@@ -221,4 +221,7 @@ class TestEnvService extends EnvServiceImpl {
 		return 'test-machine';
 	}
 
+	override get devDeviceId(): string {
+		return 'test-dev-device';
+	}
 }
diff --git a/extensions/copilot/src/platform/endpoint/common/capiClient.ts b/extensions/copilot/src/platform/endpoint/common/capiClient.ts
index ddcb7e2af96..99479467aed 100644
--- a/extensions/copilot/src/platform/endpoint/common/capiClient.ts
+++ b/extensions/copilot/src/platform/endpoint/common/capiClient.ts
@@ -29,6 +29,7 @@ export abstract class BaseCAPIClientService extends CAPIClient implements ICAPIC
 	) {
 		super({
 			machineId: envService.machineId,
+			deviceId: envService.devDeviceId,
 			sessionId: envService.sessionId,
 			vscodeVersion: envService.vscodeVersion,
 			buildType: envService.getBuildType(),