@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatRepoInfo.js

@@ -1,11 +1,24 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { relativePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { linesDiffComputers } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/linesDiffComputers';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/diff/diff';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/ranges/lineRange';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/text/textLength';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/text/positionToOffsetImpl';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/defaultLinesDiffComputer/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
-import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/encoding';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
@@ -14,256 +27,7 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
-const MAX_CHANGES = 100;
-const MAX_DIFFS_SIZE_BYTES = 900 * 1024;
-const MAX_SESSIONS_WITH_FULL_DIFFS = 5;
-const RemoteMatcher = /^\s*url\s*=\s*(.+\S)\s*$/mg;
-function getRawRemotes(text) {
-    const remotes = [];
-    let match;
-    while (match = RemoteMatcher.exec(text)) {
-        remotes.push(match[1]);
-    }
-    return remotes;
-}
-function getRemoteHost(remoteUrl) {
-    try {
-        const url = ( new URL(remoteUrl));
-        return url.hostname.toLowerCase();
-    } catch {
-        const atIndex = remoteUrl.lastIndexOf("@");
-        const hostAndPath = atIndex !== -1 ? remoteUrl.slice(atIndex + 1) : remoteUrl;
-        const colonIndex = hostAndPath.indexOf(":");
-        if (colonIndex !== -1) {
-            const host = hostAndPath.slice(0, colonIndex);
-            return host ? host.toLowerCase() : undefined;
-        }
-        const slashIndex = hostAndPath.indexOf("/");
-        if (slashIndex !== -1) {
-            const host = hostAndPath.slice(0, slashIndex);
-            return host ? host.toLowerCase() : undefined;
-        }
-        return undefined;
-    }
-}
-function determineChangeType(resource, groupId) {
-    const contextValue = resource.contextValue?.toLowerCase() ?? "";
-    const groupIdLower = groupId.toLowerCase();
-    if (contextValue.includes("untracked") || contextValue.includes("add")) {
-        return "added";
-    }
-    if (contextValue.includes("delete")) {
-        return "deleted";
-    }
-    if (contextValue.includes("rename")) {
-        return "renamed";
-    }
-    if (groupIdLower.includes("untracked")) {
-        return "added";
-    }
-    if (resource.decorations.strikeThrough) {
-        return "deleted";
-    }
-    if (!resource.multiDiffEditorOriginalUri) {
-        return "added";
-    }
-    return "modified";
-}
-async function generateUnifiedDiff(fileService, relPath, originalUri, modifiedUri, changeType) {
-    try {
-        let originalContent = "";
-        let modifiedContent = "";
-        if (originalUri && changeType !== "added") {
-            try {
-                const originalFile = await fileService.readFile(originalUri);
-                originalContent = ( originalFile.value.toString());
-            } catch {
-                if (changeType === "modified") {
-                    return undefined;
-                }
-            }
-        }
-        if (changeType !== "deleted") {
-            try {
-                const modifiedFile = await fileService.readFile(modifiedUri);
-                modifiedContent = ( modifiedFile.value.toString());
-            } catch {
-                return undefined;
-            }
-        }
-        const originalLines = originalContent.split("\n");
-        const modifiedLines = modifiedContent.split("\n");
-        const originalEndsWithNewline = originalContent.length > 0 && originalContent.endsWith("\n");
-        const modifiedEndsWithNewline = modifiedContent.length > 0 && modifiedContent.endsWith("\n");
-        if (originalEndsWithNewline && originalLines.length > 0 && originalLines[originalLines.length - 1] === "") {
-            originalLines.pop();
-        }
-        if (modifiedEndsWithNewline && modifiedLines.length > 0 && modifiedLines[modifiedLines.length - 1] === "") {
-            modifiedLines.pop();
-        }
-        const diffLines = [];
-        const aPath = changeType === "added" ? "/dev/null" : `a/${relPath}`;
-        const bPath = changeType === "deleted" ? "/dev/null" : `b/${relPath}`;
-        diffLines.push(`--- ${aPath}`);
-        diffLines.push(`+++ ${bPath}`);
-        if (changeType === "added") {
-            if (modifiedLines.length > 0) {
-                diffLines.push(`@@ -0,0 +1,${modifiedLines.length} @@`);
-                for (const line of modifiedLines) {
-                    diffLines.push(`+${line}`);
-                }
-                if (!modifiedEndsWithNewline) {
-                    diffLines.push("\");
-                }
-            }
-        } else if (changeType === "deleted") {
-            if (originalLines.length > 0) {
-                diffLines.push(`@@ -1,${originalLines.length} +0,0 @@`);
-                for (const line of originalLines) {
-                    diffLines.push(`-${line}`);
-                }
-                if (!originalEndsWithNewline) {
-                    diffLines.push("\");
-                }
-            }
-        } else {
-            const hunks = computeDiffHunks(
-                originalLines,
-                modifiedLines,
-                originalEndsWithNewline,
-                modifiedEndsWithNewline
-            );
-            for (const hunk of hunks) {
-                diffLines.push(hunk);
-            }
-        }
-        return diffLines.join("\n");
-    } catch {
-        return undefined;
-    }
-}
-function computeDiffHunks(
-    originalLines,
-    modifiedLines,
-    originalEndsWithNewline,
-    modifiedEndsWithNewline
-) {
-    const contextSize = 3;
-    const result = [];
-    const diffComputer = linesDiffComputers.getDefault();
-    const diffResult = diffComputer.computeDiff(originalLines, modifiedLines, {
-        ignoreTrimWhitespace: false,
-        maxComputationTimeMs: 1000,
-        computeMoves: false
-    });
-    if (diffResult.changes.length === 0) {
-        return result;
-    }
-    const hunkGroups = [];
-    let currentGroup = [];
-    for (const change of diffResult.changes) {
-        if (currentGroup.length === 0) {
-            currentGroup.push(change);
-        } else {
-            const lastChange = currentGroup[currentGroup.length - 1];
-            const lastContextEnd = lastChange.original.endLineNumberExclusive - 1 + contextSize;
-            const currentContextStart = change.original.startLineNumber - contextSize;
-            if (currentContextStart <= lastContextEnd + 1) {
-                currentGroup.push(change);
-            } else {
-                hunkGroups.push(currentGroup);
-                currentGroup = [change];
-            }
-        }
-    }
-    if (currentGroup.length > 0) {
-        hunkGroups.push(currentGroup);
-    }
-    for (const group of hunkGroups) {
-        const firstChange = group[0];
-        const lastChange = group[group.length - 1];
-        const hunkOrigStart = Math.max(1, firstChange.original.startLineNumber - contextSize);
-        const hunkOrigEnd = Math.min(
-            originalLines.length,
-            lastChange.original.endLineNumberExclusive - 1 + contextSize
-        );
-        const hunkModStart = Math.max(1, firstChange.modified.startLineNumber - contextSize);
-        const hunkLines = [];
-        let lastOriginalLineIndex = -1;
-        let lastModifiedLineIndex = -1;
-        let origLineNum = hunkOrigStart;
-        let origCount = 0;
-        let modCount = 0;
-        for (const change of group) {
-            const origStart = change.original.startLineNumber;
-            const origEnd = change.original.endLineNumberExclusive;
-            const modStart = change.modified.startLineNumber;
-            const modEnd = change.modified.endLineNumberExclusive;
-            while (origLineNum < origStart) {
-                const idx = hunkLines.length;
-                hunkLines.push(` ${originalLines[origLineNum - 1]}`);
-                if (origLineNum === originalLines.length) {
-                    lastOriginalLineIndex = idx;
-                }
-                const modLineNum = hunkModStart + modCount;
-                if (modLineNum === modifiedLines.length) {
-                    lastModifiedLineIndex = idx;
-                }
-                origLineNum++;
-                origCount++;
-                modCount++;
-            }
-            for (let i = origStart; i < origEnd; i++) {
-                const idx = hunkLines.length;
-                hunkLines.push(`-${originalLines[i - 1]}`);
-                if (i === originalLines.length) {
-                    lastOriginalLineIndex = idx;
-                }
-                origLineNum++;
-                origCount++;
-            }
-            for (let i = modStart; i < modEnd; i++) {
-                const idx = hunkLines.length;
-                hunkLines.push(`+${modifiedLines[i - 1]}`);
-                if (i === modifiedLines.length) {
-                    lastModifiedLineIndex = idx;
-                }
-                modCount++;
-            }
-        }
-        while (origLineNum <= hunkOrigEnd) {
-            const idx = hunkLines.length;
-            hunkLines.push(` ${originalLines[origLineNum - 1]}`);
-            if (origLineNum === originalLines.length) {
-                lastOriginalLineIndex = idx;
-            }
-            const modLineNum = hunkModStart + modCount;
-            if (modLineNum === modifiedLines.length) {
-                lastModifiedLineIndex = idx;
-            }
-            origLineNum++;
-            origCount++;
-            modCount++;
-        }
-        result.push(`@@ -${hunkOrigStart},${origCount} +${hunkModStart},${modCount} @@`);
-        for (let i = 0; i < hunkLines.length; i++) {
-            result.push(hunkLines[i]);
-            const isLastOriginal = i === lastOriginalLineIndex;
-            const isLastModified = i === lastModifiedLineIndex;
-            if (isLastOriginal && isLastModified) {
-                if (!originalEndsWithNewline || !modifiedEndsWithNewline) {
-                    result.push("\");
-                }
-            } else if (isLastOriginal && !originalEndsWithNewline) {
-                result.push("\");
-            } else if (isLastModified && !modifiedEndsWithNewline) {
-                result.push("\");
-            }
-        }
-    }
-    return result;
-}
-async function captureRepoInfo(scmService, fileService) {
+function captureRepoMetadata(scmService) {
     const repositories = [...scmService.repositories];
     if (repositories.length === 0) {
         return undefined;
@@ -273,32 +37,6 @@ async function captureRepoInfo(scmService, fileService) {
     if (!rootUri) {
         return undefined;
     }
-    let hasGit = false;
-    try {
-        const gitDirUri = rootUri.with({
-            path: `${rootUri.path}/.git`
-        });
-        hasGit = await fileService.exists(gitDirUri);
-    } catch {}
-    if (!hasGit) {
-        return {
-            workspaceType: "plain-folder",
-            syncStatus: "no-git",
-            diffs: undefined
-        };
-    }
-    let remoteUrl;
-    try {
-        const gitConfigUri = rootUri.with({
-            path: `${rootUri.path}/.git/config`
-        });
-        const exists = await fileService.exists(gitConfigUri);
-        if (exists) {
-            const content = await fileService.readFile(gitConfigUri);
-            const remotes = getRawRemotes(( content.value.toString()));
-            remoteUrl = remotes[0];
-        }
-    } catch {}
     let localBranch;
     let localHeadCommit;
     let remoteTrackingBranch;
@@ -321,106 +59,28 @@ async function captureRepoInfo(scmService, fileService) {
     }
     let workspaceType;
     let syncStatus;
-    if (!remoteUrl) {
-        workspaceType = "local-git";
-        syncStatus = "local-only";
-    } else {
+    if (remoteTrackingBranch || remoteHeadCommit || remoteBaseBranch) {
         workspaceType = "remote-git";
         if (!remoteTrackingBranch) {
             syncStatus = "unpublished";
-        } else if (localHeadCommit === remoteHeadCommit) {
+        } else if (localHeadCommit && remoteHeadCommit && localHeadCommit === remoteHeadCommit) {
             syncStatus = "synced";
         } else {
             syncStatus = "unpushed";
         }
+    } else {
+        workspaceType = "local-git";
+        syncStatus = "local-only";
     }
-    let remoteVendor;
-    if (remoteUrl) {
-        const host = getRemoteHost(remoteUrl);
-        if (host === "github.com") {
-            remoteVendor = "github";
-        } else if (host === "dev.azure.com" || (host && host.endsWith(".visualstudio.com"))) {
-            remoteVendor = "ado";
-        } else {
-            remoteVendor = "other";
-        }
-    }
-    let totalChangeCount = 0;
-    for (const group of repository.provider.groups) {
-        totalChangeCount += group.resources.length;
-    }
-    const baseRepoData = {
+    return {
         workspaceType,
         syncStatus,
-        remoteUrl,
-        remoteVendor,
         localBranch,
         remoteTrackingBranch,
         remoteBaseBranch,
         localHeadCommit,
-        remoteHeadCommit
-    };
-    if (totalChangeCount === 0) {
-        return {
-            ...baseRepoData,
-            diffs: undefined,
-            diffsStatus: "noChanges",
-            changedFileCount: 0
-        };
-    }
-    if (totalChangeCount > MAX_CHANGES) {
-        return {
-            ...baseRepoData,
-            diffs: undefined,
-            diffsStatus: "tooManyChanges",
-            changedFileCount: totalChangeCount
-        };
-    }
-    const diffs = [];
-    const diffPromises = [];
-    for (const group of repository.provider.groups) {
-        for (const resource of group.resources) {
-            const relPath = relativePath(rootUri, resource.sourceUri) ?? resource.sourceUri.path;
-            const changeType = determineChangeType(resource, group.id);
-            const diffPromise = (async () => {
-                const unifiedDiff = await generateUnifiedDiff(
-                    fileService,
-                    relPath,
-                    resource.multiDiffEditorOriginalUri,
-                    resource.sourceUri,
-                    changeType
-                );
-                return {
-                    relativePath: relPath,
-                    changeType,
-                    status: group.label || group.id,
-                    unifiedDiff
-                };
-            })();
-            diffPromises.push(diffPromise);
-        }
-    }
-    const generatedDiffs = await Promise.all(diffPromises);
-    for (const diff of generatedDiffs) {
-        if (diff) {
-            diffs.push(diff);
-        }
-    }
-    const diffsJson = JSON.stringify(diffs);
-    const diffsSizeBytes = ( new TextEncoder()).encode(diffsJson).length;
-    if (diffsSizeBytes > MAX_DIFFS_SIZE_BYTES) {
-        return {
-            ...baseRepoData,
-            diffs: undefined,
-            diffsStatus: "tooLarge",
-            changedFileCount: totalChangeCount
-        };
-    }
-    return {
-        ...baseRepoData,
-        diffs,
-        diffsStatus: "included",
-        changedFileCount: totalChangeCount
+        remoteHeadCommit,
+        diffsStatus: "notCaptured"
     };
 }
 let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable {
@@ -431,7 +91,6 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         chatService,
         chatEntitlementService,
         scmService,
-        fileService,
         logService,
         configurationService
     ) {
@@ -439,7 +98,6 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         this.chatService = chatService;
         this.chatEntitlementService = chatEntitlementService;
         this.scmService = scmService;
-        this.fileService = fileService;
         this.logService = logService;
         this.configurationService = configurationService;
         this._configurationRegistered = false;
@@ -447,7 +105,7 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         this._register(this.chatEntitlementService.onDidChangeEntitlement(() => {
             this.registerConfigurationIfInternal();
         }));
-        this._register(this.chatService.onDidSubmitRequest(async (
+        this._register(this.chatService.onDidSubmitRequest((
             {
                 chatSessionResource
             }
@@ -456,7 +114,7 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
             if (!model) {
                 return;
             }
-            await this.captureAndSetRepoData(model);
+            this.captureAndSetRepoMetadata(model);
         }));
     }
     registerConfigurationIfInternal() {
@@ -469,23 +127,23 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         const registry = ( Registry.as(Extensions.Configuration));
         registry.registerConfiguration({
             id: "chatRepoInfo",
-            title: ( localize(5505, "Chat Repository Info")),
+            title: ( localize(6007, "Chat Repository Info")),
             type: "object",
             properties: {
                 [ChatConfiguration.RepoInfoEnabled]: {
                     type: "boolean",
                     description: ( localize(
-                        5506,
-                        "Controls whether repository information (branch, commit, working tree diffs) is captured at the start of chat sessions for internal diagnostics."
+                        6008,
+                        "Controls whether lightweight repository metadata (branch, commit, remotes) is captured when a chat request is submitted for internal diagnostics."
                     )),
-                    default: true
+                    default: false
                 }
             }
         });
         this._configurationRegistered = true;
         this.logService.debug("[ChatRepoInfo] Configuration registered for internal user");
     }
-    async captureAndSetRepoData(model) {
+    captureAndSetRepoMetadata(model) {
         if (!this.chatEntitlementService.isInternal) {
             return;
         }
@@ -496,53 +154,22 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
             return;
         }
         try {
-            const repoData = await captureRepoInfo(this.scmService, this.fileService);
-            if (repoData) {
-                model.setRepoData(repoData);
-                if (!repoData.localHeadCommit && repoData.workspaceType !== "plain-folder") {
+            const metadata = captureRepoMetadata(this.scmService);
+            if (metadata) {
+                model.setRepoData(metadata);
+                if (!metadata.localHeadCommit) {
                     this.logService.warn(
-                        "[ChatRepoInfo] Captured repo data without commit hash - git history may not be ready"
+                        "[ChatRepoInfo] Captured repo metadata without commit hash - git history may not be ready"
                     );
                 }
-                this.trimOldSessionDiffs();
             } else {
                 this.logService.debug("[ChatRepoInfo] No SCM repository available for chat session");
             }
         } catch (error) {
-            this.logService.warn("[ChatRepoInfo] Failed to capture repo info:", error);
-        }
-    }
-    trimOldSessionDiffs() {
-        try {
-            const sessionsWithDiffs = [];
-            for (const model of this.chatService.chatModels.get()) {
-                if (model.repoData?.diffs && model.repoData.diffs.length > 0 && model.repoData.diffsStatus === "included") {
-                    sessionsWithDiffs.push({
-                        model,
-                        timestamp: model.timestamp
-                    });
-                }
-            }
-            sessionsWithDiffs.sort((a, b) => b.timestamp - a.timestamp);
-            for (let i = MAX_SESSIONS_WITH_FULL_DIFFS; i < sessionsWithDiffs.length; i++) {
-                const {
-                    model
-                } = sessionsWithDiffs[i];
-                if (model.repoData) {
-                    const trimmedRepoData = {
-                        ...model.repoData,
-                        diffs: undefined,
-                        diffsStatus: "trimmedForStorage"
-                    };
-                    model.setRepoData(trimmedRepoData);
-                    this.logService.trace(`[ChatRepoInfo] Trimmed diffs from older session: ${( model.sessionResource.toString())}`);
-                }
-            }
-        } catch (error) {
-            this.logService.warn("[ChatRepoInfo] Failed to trim old session diffs:", error);
+            this.logService.warn("[ChatRepoInfo] Failed to capture repo metadata:", error);
         }
     }
 };
-ChatRepoInfoContribution = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatEntitlementService)), ( __param(2, ISCMService)), ( __param(3, IFileService)), ( __param(4, ILogService)), ( __param(5, IConfigurationService))], ChatRepoInfoContribution));
+ChatRepoInfoContribution = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatEntitlementService)), ( __param(2, ISCMService)), ( __param(3, ILogService)), ( __param(4, IConfigurationService))], ChatRepoInfoContribution));
 
-export { ChatRepoInfoContribution, captureRepoInfo };
+export { ChatRepoInfoContribution, captureRepoMetadata };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetup.d.ts

@@ -1,4 +1,6 @@
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 export type InstallChatClassification = {
     owner: "bpasero";
     comment: "Provides insight into chat installation.";
@@ -53,3 +55,11 @@ export interface IChatSetupResult {
     readonly dialogSkipped: boolean;
 }
 export declare function refreshTokens(commandService: ICommandService): void;
+/**
+ * Ensures the authentication provider extension is enabled.
+ * If the extension is found locally but disabled, it will be
+ * re-enabled and running extensions will be updated.
+ *
+ * @returns `true` if the extension was re-enabled, `false` otherwise.
+ */
+export declare function maybeEnableAuthExtension(extensionsWorkbenchService: IExtensionsWorkbenchService, logService: ILogService): Promise<boolean>;

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetup.js

@@ -1,24 +1,28 @@
 
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 
 const defaultChat = {
-    completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
-    chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
+    completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? "",
+    chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? "",
+    providerExtensionId: product.defaultChatAgent?.providerExtensionId ?? ""
 };
 var ChatSetupAnonymous;
-(function (ChatSetupAnonymous) {
+(function(ChatSetupAnonymous) {
     ChatSetupAnonymous[ChatSetupAnonymous["Disabled"] = 0] = "Disabled";
     ChatSetupAnonymous[ChatSetupAnonymous["EnabledWithDialog"] = 1] = "EnabledWithDialog";
     ChatSetupAnonymous[ChatSetupAnonymous["EnabledWithoutDialog"] = 2] = "EnabledWithoutDialog";
 })(ChatSetupAnonymous || (ChatSetupAnonymous = {}));
 var ChatSetupStep;
-(function (ChatSetupStep) {
+(function(ChatSetupStep) {
     ChatSetupStep[ChatSetupStep["Initial"] = 1] = "Initial";
     ChatSetupStep[ChatSetupStep["SigningIn"] = 2] = "SigningIn";
     ChatSetupStep[ChatSetupStep["Installing"] = 3] = "Installing";
 })(ChatSetupStep || (ChatSetupStep = {}));
 var ChatSetupStrategy;
-(function (ChatSetupStrategy) {
+(function(ChatSetupStrategy) {
     ChatSetupStrategy[ChatSetupStrategy["Canceled"] = 0] = "Canceled";
     ChatSetupStrategy[ChatSetupStrategy["DefaultSetup"] = 1] = "DefaultSetup";
     ChatSetupStrategy[ChatSetupStrategy["SetupWithoutEnterpriseProvider"] = 2] = "SetupWithoutEnterpriseProvider";
@@ -30,5 +34,33 @@ function refreshTokens(commandService) {
     commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
     commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
 }
+async function maybeEnableAuthExtension(extensionsWorkbenchService, logService) {
+    if (!defaultChat.providerExtensionId) {
+        return false;
+    }
+    const providerExtension = extensionsWorkbenchService.local.find(
+        e => ExtensionIdentifier.equals(e.identifier.id, defaultChat.providerExtensionId)
+    );
+    if (!providerExtension) {
+        return false;
+    }
+    if (providerExtension.enablementState === EnablementState.DisabledGlobally || providerExtension.enablementState === EnablementState.DisabledWorkspace) {
+        logService.info(
+            `[chat setup] auth provider extension '${defaultChat.providerExtensionId}' is disabled, re-enabling it`
+        );
+        try {
+            await extensionsWorkbenchService.setEnablement([providerExtension], EnablementState.EnabledGlobally);
+            await extensionsWorkbenchService.updateRunningExtensions(( localize(6060, "Enabling GitHub Authentication")));
+            return true;
+        } catch (error) {
+            logService.error(
+                `[chat setup] failed to re-enable auth provider extension '${defaultChat.providerExtensionId}'`,
+                error
+            );
+            return false;
+        }
+    }
+    return false;
+}
 
-export { ChatSetupAnonymous, ChatSetupStep, ChatSetupStrategy, refreshTokens };
+export { ChatSetupAnonymous, ChatSetupStep, ChatSetupStrategy, maybeEnableAuthExtension, refreshTokens };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupContributions.d.ts

@@ -12,6 +12,7 @@ import { IWorkbenchExtensionEnablementService } from "@codingame/monaco-vscode-a
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 export declare class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
     private readonly instantiationService;
     private readonly logService;
@@ -20,9 +21,12 @@ export declare class ChatSetupContribution extends Disposable implements IWorkbe
     private readonly extensionsWorkbenchService;
     private readonly extensionService;
     private readonly environmentService;
+    private readonly chatSessionsService;
+    private readonly configurationService;
     static readonly ID = "workbench.contrib.chatSetup";
-    constructor(instantiationService: IInstantiationService, chatEntitlementService: ChatEntitlementService, logService: ILogService, contextKeyService: IContextKeyService, extensionEnablementService: IWorkbenchExtensionEnablementService, extensionsWorkbenchService: IExtensionsWorkbenchService, extensionService: IExtensionService, environmentService: IEnvironmentService);
+    constructor(instantiationService: IInstantiationService, chatEntitlementService: ChatEntitlementService, logService: ILogService, contextKeyService: IContextKeyService, extensionEnablementService: IWorkbenchExtensionEnablementService, extensionsWorkbenchService: IExtensionsWorkbenchService, extensionService: IExtensionService, environmentService: IEnvironmentService, chatSessionsService: IChatSessionsService, configurationService: IConfigurationService);
     private registerSetupAgents;
+    private registerGrowthSession;
     private registerActions;
     private registerUrlLinkHandler;
     private checkExtensionInstallation;