Merge pull request #13919 from microsoft/seanmcm/1_26_5_release

Cherry-pick for 1.26.5

Author: sean-mcmanus

Extension/CHANGELOG.md

@@ -1,6 +1,12 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.26.5: September 10, 2025
+### Bug Fix
+* Fix extension activation getting stuck by GitHub Copilot activation. [#13914](https://github.com/microsoft/vscode-cpptools/issues/13914)
+  * Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer) [PR #13918](https://github.com/microsoft/vscode-cpptools/pull/13918)
+
 ## Version 1.26.4: September 8, 2025
+### Enhancement
 * Update GitHub Copilot APIs. [PR #13877](https://github.com/microsoft/vscode-cpptools/pull/13877)
   * Thank you for the contribution. [@dbaeumer (Dirk Bäumer)](https://github.com/dbaeumer)
 

Extension/package.json

@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.26.4-main",
+    "version": "1.26.5-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",

Extension/src/LanguageServer/copilotProviders.ts

@@ -159,7 +159,14 @@ export async function getCopilotChatApi(): Promise<CopilotContextProviderAPI | u
     let exports: CopilotChatApi | undefined;
     if (!copilotExtension.isActive) {
         try {
-            exports = await copilotExtension.activate();
+            exports = await Promise.race([
+                copilotExtension.activate(),
+                new Promise<undefined>(resolve => {
+                    setTimeout(() => {
+                        resolve(undefined);
+                    }, 3000);
+                })
+            ]);
         } catch {
             return undefined;
         }