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

Cherry-pick for 1.26.5

Extension/CHANGELOG.md

@@ -1,5 +1,15 @@
 # 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)
+
 ## Version 1.26.3: June 24, 2025
 ### New Feature
 * Improve the context provided for C++ Copilot suggestions.

Extension/package.json

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

Extension/src/LanguageServer/client.ts

@@ -59,7 +59,7 @@ import { CopilotCompletionContextFeatures, CopilotCompletionContextProvider } fr
 import { CustomConfigurationProvider1, getCustomConfigProviders, isSameProviderExtensionId } from './customProviders';
 import { DataBinding } from './dataBinding';
 import { cachedEditorConfigSettings, getEditorConfigSettings } from './editorConfig';
-import { CppSourceStr, clients, configPrefix, initializeIntervalTimer, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
+import { CppSourceStr, clients, configPrefix, initializeIntervalTimer, isWritingCrashCallStack, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
 import { LocalizeStringParams, getLocaleId, getLocalizedString } from './localization';
 import { PersistentFolderState, PersistentState, PersistentWorkspaceState } from './persistentState';
 import { RequestCancelled, ServerCancelled, createProtocolFilter } from './protocolFilter';
@@ -942,6 +942,8 @@ export class DefaultClient implements Client {
     public getShowConfigureIntelliSenseButton(): boolean { return this.showConfigureIntelliSenseButton; }
     public setShowConfigureIntelliSenseButton(show: boolean): void { this.showConfigureIntelliSenseButton = show; }
 
+    private lastInvokedLspMessage: string = ""; // e.g. cpptools/hover
+
     /**
      * don't use this.rootFolder directly since it can be undefined
      */
@@ -1677,7 +1679,6 @@ export class DefaultClient implements Client {
                 closed: () => {
                     languageClientCrashTimes.push(Date.now());
                     languageClientCrashedNeedsRestart = true;
-                    telemetry.logLanguageServerEvent("languageClientCrash");
                     let restart: boolean = true;
                     if (languageClientCrashTimes.length < 5) {
                         void clients.recreateClients();
@@ -1691,6 +1692,27 @@ export class DefaultClient implements Client {
                             void clients.recreateClients();
                         }
                     }
+
+                    // Wait 1 second to allow time for the file watcher to signal a crash call stack write has occurred.
+                    setTimeout(() => {
+                        const sanitizedLspMessage = this.lastInvokedLspMessage.replace('/', '.');
+                        telemetry.logLanguageServerEvent("languageClientCrash",
+                            {
+                                lastInvokedLspMessage: sanitizedLspMessage
+                            },
+                            {
+                                restarting: Number(restart),
+                                writingCrashCallStack: Number(isWritingCrashCallStack),
+                                initializingWorkspace: Number(this.model.isInitializingWorkspace.Value),
+                                indexingWorkspace: Number(this.model.isIndexingWorkspace.Value),
+                                parsingWorkspace: Number(this.model.isParsingWorkspace.Value),
+                                parsingFiles: Number(this.model.isParsingFiles.Value),
+                                updatingIntelliSense: Number(this.model.isUpdatingIntelliSense.Value),
+                                runningCodeAnalysis: Number(this.model.isRunningCodeAnalysis.Value)
+                            }
+                        );
+                    }, 1000);
+
                     const message: string = restart ? localize('server.crashed.restart', 'The language server crashed. Restarting...')
                         : localize('server.crashed2', 'The language server crashed 5 times in the last 3 minutes. It will not be restarted.');
 
@@ -2747,55 +2769,59 @@ export class DefaultClient implements Client {
         const message: string = notificationBody.status;
         util.setProgress(util.getProgressExecutableSuccess());
         const testHook: TestHook = getTestHook();
-        if (message.endsWith("Idle")) {
-            const status: IntelliSenseStatus = { status: Status.Idle };
-            testHook.updateStatus(status);
-        } else if (message.endsWith("Parsing")) {
-            this.model.isParsingWorkspace.Value = true;
-            this.model.isInitializingWorkspace.Value = false;
-            this.model.isIndexingWorkspace.Value = false;
-            const status: IntelliSenseStatus = { status: Status.TagParsingBegun };
-            testHook.updateStatus(status);
-        } else if (message.endsWith("Initializing")) {
-            this.model.isInitializingWorkspace.Value = true;
-            this.model.isIndexingWorkspace.Value = false;
-            this.model.isParsingWorkspace.Value = false;
-        } else if (message.endsWith("Indexing")) {
-            this.model.isIndexingWorkspace.Value = true;
-            this.model.isInitializingWorkspace.Value = false;
-            this.model.isParsingWorkspace.Value = false;
-        } else if (message.endsWith("files")) {
-            this.model.isParsingFiles.Value = true;
-        } else if (message.endsWith("IntelliSense")) {
-            timeStamp = Date.now();
-            this.model.isUpdatingIntelliSense.Value = true;
-            const status: IntelliSenseStatus = { status: Status.IntelliSenseCompiling };
-            testHook.updateStatus(status);
-        } else if (message.endsWith("IntelliSense done")) {
-            getOutputChannelLogger().appendLineAtLevel(6, localize("update.intellisense.time", "Update IntelliSense time (sec): {0}", (Date.now() - timeStamp) / 1000));
-            this.model.isUpdatingIntelliSense.Value = false;
-            const status: IntelliSenseStatus = { status: Status.IntelliSenseReady };
-            testHook.updateStatus(status);
-        } else if (message.endsWith("Parsing done")) { // Tag Parser Ready
-            this.model.isParsingWorkspace.Value = false;
-            const status: IntelliSenseStatus = { status: Status.TagParsingDone };
-            testHook.updateStatus(status);
-            util.setProgress(util.getProgressParseRootSuccess());
-        } else if (message.endsWith("files done")) {
-            this.model.isParsingFiles.Value = false;
-        } else if (message.endsWith("Analysis")) {
-            this.model.isRunningCodeAnalysis.Value = true;
-            this.model.codeAnalysisTotal.Value = 1;
-            this.model.codeAnalysisProcessed.Value = 0;
-        } else if (message.endsWith("Analysis done")) {
-            this.model.isRunningCodeAnalysis.Value = false;
-        } else if (message.includes("Squiggles Finished - File name:")) {
-            const index: number = message.lastIndexOf(":");
-            const name: string = message.substring(index + 2);
-            const status: IntelliSenseStatus = { status: Status.IntelliSenseReady, filename: name };
-            testHook.updateStatus(status);
-        } else if (message.endsWith("No Squiggles")) {
-            util.setIntelliSenseProgress(util.getProgressIntelliSenseNoSquiggles());
+        if (message.startsWith("C_Cpp: ")) {
+            if (message.endsWith("Idle")) {
+                const status: IntelliSenseStatus = { status: Status.Idle };
+                testHook.updateStatus(status);
+            } else if (message.endsWith("Parsing")) {
+                this.model.isParsingWorkspace.Value = true;
+                this.model.isInitializingWorkspace.Value = false;
+                this.model.isIndexingWorkspace.Value = false;
+                const status: IntelliSenseStatus = { status: Status.TagParsingBegun };
+                testHook.updateStatus(status);
+            } else if (message.endsWith("Initializing")) {
+                this.model.isInitializingWorkspace.Value = true;
+                this.model.isIndexingWorkspace.Value = false;
+                this.model.isParsingWorkspace.Value = false;
+            } else if (message.endsWith("Indexing")) {
+                this.model.isIndexingWorkspace.Value = true;
+                this.model.isInitializingWorkspace.Value = false;
+                this.model.isParsingWorkspace.Value = false;
+            } else if (message.endsWith("files")) {
+                this.model.isParsingFiles.Value = true;
+            } else if (message.endsWith("IntelliSense")) {
+                timeStamp = Date.now();
+                this.model.isUpdatingIntelliSense.Value = true;
+                const status: IntelliSenseStatus = { status: Status.IntelliSenseCompiling };
+                testHook.updateStatus(status);
+            } else if (message.endsWith("IntelliSense done")) {
+                getOutputChannelLogger().appendLineAtLevel(6, localize("update.intellisense.time", "Update IntelliSense time (sec): {0}", (Date.now() - timeStamp) / 1000));
+                this.model.isUpdatingIntelliSense.Value = false;
+                const status: IntelliSenseStatus = { status: Status.IntelliSenseReady };
+                testHook.updateStatus(status);
+            } else if (message.endsWith("Parsing done")) { // Tag Parser Ready
+                this.model.isParsingWorkspace.Value = false;
+                const status: IntelliSenseStatus = { status: Status.TagParsingDone };
+                testHook.updateStatus(status);
+                util.setProgress(util.getProgressParseRootSuccess());
+            } else if (message.endsWith("files done")) {
+                this.model.isParsingFiles.Value = false;
+            } else if (message.endsWith("Analysis")) {
+                this.model.isRunningCodeAnalysis.Value = true;
+                this.model.codeAnalysisTotal.Value = 1;
+                this.model.codeAnalysisProcessed.Value = 0;
+            } else if (message.endsWith("Analysis done")) {
+                this.model.isRunningCodeAnalysis.Value = false;
+            } else if (message.includes("Squiggles Finished - File name:")) {
+                const index: number = message.lastIndexOf(":");
+                const name: string = message.substring(index + 2);
+                const status: IntelliSenseStatus = { status: Status.IntelliSenseReady, filename: name };
+                testHook.updateStatus(status);
+            } else if (message.endsWith("No Squiggles")) {
+                util.setIntelliSenseProgress(util.getProgressIntelliSenseNoSquiggles());
+            }
+        } else if (message.includes("/")) {
+            this.lastInvokedLspMessage = message;
         }
     }
 

Extension/src/LanguageServer/copilotCompletionContextProvider.ts

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation. All Rights Reserved.
  * See 'LICENSE' in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { ContextResolver, ResolveRequest, SupportedContextItem } from '@github/copilot-language-server';
+import { ContextResolver, ResolveRequest, SupportedContextItem, type ContextProvider } from '@github/copilot-language-server';
 import { randomUUID } from 'crypto';
 import * as vscode from 'vscode';
 import { DocumentSelector } from 'vscode-languageserver-protocol';
@@ -11,7 +11,7 @@ import { getOutputChannelLogger, Logger } from '../logger';
 import * as telemetry from '../telemetry';
 import { CopilotCompletionContextResult } from './client';
 import { CopilotCompletionContextTelemetry } from './copilotCompletionContextTelemetry';
-import { getCopilotApi } from './copilotProviders';
+import { getCopilotChatApi, getCopilotClientApi, type CopilotContextProviderAPI } from './copilotProviders';
 import { clients } from './extension';
 import { CppSettings } from './settings';
 
@@ -83,7 +83,7 @@ export class CopilotCompletionContextProvider implements ContextResolver<Support
     private static readonly defaultMaxSnippetLength = 3 * 1024;
     private static readonly defaultDoAggregateSnippets = true;
     private completionContextCancellation = new vscode.CancellationTokenSource();
-    private contextProviderDisposable: vscode.Disposable | undefined;
+    private contextProviderDisposables: vscode.Disposable[] | undefined;
     static readonly CppContextProviderEnabledFeatures = 'enabledFeatures';
     static readonly CppContextProviderTimeBudgetMs = 'timeBudgetMs';
     static readonly CppContextProviderMaxSnippetCount = 'maxSnippetCount';
@@ -312,7 +312,12 @@ export class CopilotCompletionContextProvider implements ContextResolver<Support
 
     public dispose(): void {
         this.completionContextCancellation.cancel();
-        this.contextProviderDisposable?.dispose();
+        if (this.contextProviderDisposables) {
+            for (const disposable of this.contextProviderDisposables) {
+                disposable.dispose();
+            }
+            this.contextProviderDisposables = undefined;
+        }
     }
 
     public removeFile(fileUri: string): void {
@@ -444,18 +449,32 @@ ${copilotCompletionContext?.areSnippetsMissing ? "(missing code snippets)" : ""}
         const properties: Record<string, string> = {};
         const registerCopilotContextProvider = 'registerCopilotContextProvider';
         try {
-            const copilotApi = await getCopilotApi();
-            if (!copilotApi) { throw new CopilotContextProviderException("getCopilotApi() returned null, Copilot is missing or inactive."); }
-            const hasGetContextProviderAPI = "getContextProviderAPI" in copilotApi;
-            if (!hasGetContextProviderAPI) { throw new CopilotContextProviderException("getContextProviderAPI() is not available."); }
-            const contextAPI = await copilotApi.getContextProviderAPI("v1");
-            if (!contextAPI) { throw new CopilotContextProviderException("getContextProviderAPI(v1) returned null."); }
-            this.contextProviderDisposable = contextAPI.registerContextProvider({
+            const copilotApi = await getCopilotClientApi();
+            const copilotChatApi = await getCopilotChatApi();
+            if (!copilotApi && !copilotChatApi) { throw new CopilotContextProviderException("getCopilotApi() returned null, Copilot is missing or inactive."); }
+            const contextProvider = {
                 id: CopilotCompletionContextProvider.providerId,
                 selector: CopilotCompletionContextProvider.defaultCppDocumentSelector,
                 resolver: this
-            });
-            properties["cppCodeSnippetsProviderRegistered"] = "true";
+            };
+            type InstallSummary = { hasGetContextProviderAPI: boolean; hasAPI: boolean };
+            const installSummary: { client?: InstallSummary; chat?: InstallSummary } = {};
+            if (copilotApi) {
+                installSummary.client = await this.installContextProvider(copilotApi, contextProvider);
+            }
+            if (copilotChatApi) {
+                installSummary.chat = await this.installContextProvider(copilotChatApi, contextProvider);
+            }
+            if (installSummary.client?.hasAPI || installSummary.chat?.hasAPI) {
+                properties["cppCodeSnippetsProviderRegistered"] = "true";
+            } else {
+                if (installSummary.client?.hasGetContextProviderAPI === false &&
+                    installSummary.chat?.hasGetContextProviderAPI === false) {
+                    throw new CopilotContextProviderException("getContextProviderAPI() is not available.");
+                } else {
+                    throw new CopilotContextProviderException("getContextProviderAPI(v1) returned null.");
+                }
+            }
         } catch (e) {
             console.debug("Failed to register the Copilot Context Provider.");
             properties["error"] = "Failed to register the Copilot Context Provider";
@@ -466,4 +485,18 @@ ${copilotCompletionContext?.areSnippetsMissing ? "(missing code snippets)" : ""}
             telemetry.logCopilotEvent(registerCopilotContextProvider, { ...properties });
         }
     }
+
+    private async installContextProvider(copilotAPI: CopilotContextProviderAPI, contextProvider: ContextProvider<SupportedContextItem>): Promise<{ hasGetContextProviderAPI: boolean; hasAPI: boolean }> {
+        const hasGetContextProviderAPI = typeof copilotAPI.getContextProviderAPI === 'function';
+        if (hasGetContextProviderAPI) {
+            const contextAPI = await copilotAPI.getContextProviderAPI("v1");
+            if (contextAPI) {
+                this.contextProviderDisposables = this.contextProviderDisposables ?? [];
+                this.contextProviderDisposables.push(contextAPI.registerContextProvider(contextProvider));
+            }
+            return { hasGetContextProviderAPI, hasAPI: contextAPI !== undefined };
+        } else {
+            return { hasGetContextProviderAPI: false, hasAPI: false };
+        }
+    }
 }

Extension/src/LanguageServer/copilotProviders.ts

@@ -24,7 +24,11 @@ export interface CopilotTrait {
     promptTextOverride?: string;
 }
 
-export interface CopilotApi {
+export interface CopilotContextProviderAPI {
+    getContextProviderAPI(version: string): Promise<ContextProviderApiV1 | undefined>;
+}
+
+export interface CopilotApi extends CopilotContextProviderAPI {
     registerRelatedFilesProvider(
         providerId: { extensionId: string; languageId: string },
         callback: (
@@ -33,11 +37,10 @@ export interface CopilotApi {
             cancellationToken: vscode.CancellationToken
         ) => Promise<{ entries: vscode.Uri[]; traits?: CopilotTrait[] } | undefined>
     ): Disposable;
-    getContextProviderAPI(version: string): Promise<ContextProviderApiV1 | undefined>;
 }
 
 export async function registerRelatedFilesProvider(): Promise<void> {
-    const api = await getCopilotApi();
+    const api = await getCopilotClientApi();
     if (util.extensionContext && api) {
         try {
             for (const languageId of ['c', 'cpp', 'cuda-cpp']) {
@@ -129,7 +132,7 @@ async function getIncludes(uri: vscode.Uri, maxDepth: number): Promise<GetInclud
     return includes;
 }
 
-export async function getCopilotApi(): Promise<CopilotApi | undefined> {
+export async function getCopilotClientApi(): Promise<CopilotApi | undefined> {
     const copilotExtension = vscode.extensions.getExtension<CopilotApi>('github.copilot');
     if (!copilotExtension) {
         return undefined;
@@ -145,3 +148,38 @@ export async function getCopilotApi(): Promise<CopilotApi | undefined> {
         return copilotExtension.exports;
     }
 }
+
+export async function getCopilotChatApi(): Promise<CopilotContextProviderAPI | undefined> {
+    type CopilotChatApi = { getAPI?(version: number): CopilotContextProviderAPI | undefined };
+    const copilotExtension = vscode.extensions.getExtension<CopilotChatApi>('github.copilot-chat');
+    if (!copilotExtension) {
+        return undefined;
+    }
+
+    let exports: CopilotChatApi | undefined;
+    if (!copilotExtension.isActive) {
+        try {
+            exports = await Promise.race([
+                copilotExtension.activate(),
+                new Promise<undefined>(resolve => {
+                    setTimeout(() => {
+                        resolve(undefined);
+                    }, 3000);
+                })
+            ]);
+        } catch {
+            return undefined;
+        }
+    } else {
+        exports = copilotExtension.exports;
+    }
+    if (!exports || typeof exports.getAPI !== 'function') {
+        return undefined;
+    }
+    const result = exports.getAPI(1);
+    return result;
+}
+
+interface Disposable {
+    dispose(): void;
+}

Extension/src/LanguageServer/extension.ts

@@ -55,6 +55,7 @@ let languageConfigurations: vscode.Disposable[] = [];
 let intervalTimer: NodeJS.Timeout;
 let codeActionProvider: vscode.Disposable;
 export const intelliSenseDisabledError: string = "Do not activate the extension when IntelliSense is disabled.";
+export let isWritingCrashCallStack: boolean = false;
 
 type VcpkgDatabase = Record<string, string[]>; // Stored as <header file entry> -> [<port name>]
 let vcpkgDbPromise: Promise<VcpkgDatabase>;
@@ -1023,9 +1024,11 @@ export function watchForCrashes(crashDirectory: string): void {
                         return;
                     }
                     const crashDate: Date = new Date();
+                    isWritingCrashCallStack = true;
 
                     // Wait 5 seconds to allow time for the crash log to finish being written.
                     setTimeout(() => {
+                        isWritingCrashCallStack = false;
                         fs.readFile(path.resolve(crashDirectory, filename), 'utf8', (err, data) => {
                             void handleCrashFileRead(crashDirectory, filename, crashDate, err, data);
                         });