From 42f7302d6bca3980939ff6795e95bf8c2e1797c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dirk=20B=C3=A4umer?= <dirkb@microsoft.com>
Date: Wed, 10 Sep 2025 17:34:41 +0200
Subject: [PATCH 1/2] Wait maximum 3 seconds for the Copilot chat extension to
 activate. (#13918)

---
 Extension/src/LanguageServer/copilotProviders.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Extension/src/LanguageServer/copilotProviders.ts b/Extension/src/LanguageServer/copilotProviders.ts
index 31cf21f3e..c402afec8 100644
--- a/Extension/src/LanguageServer/copilotProviders.ts
+++ b/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;
         }

From a1fa61e73f43eeb9735e4eef05518c4595c162c7 Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Wed, 10 Sep 2025 08:43:37 -0700
Subject: [PATCH 2/2] Update changelog and version for 1.26.5.

---
 Extension/CHANGELOG.md | 6 ++++++
 Extension/package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
index 1a8a90771..b52d46eed 100644
--- a/Extension/CHANGELOG.md
+++ b/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)
 
diff --git a/Extension/package.json b/Extension/package.json
index 5cf239c94..5c6f3d876 100644
--- a/Extension/package.json
+++ b/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",