@codingame/monaco-vscode-chat-service-override 33.0.8 → 34.0.0

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

@@ -0,0 +1,346 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { safeIntl } from '@codingame/monaco-vscode-api/vscode/vs/base/common/date';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { SELECTED_MODEL_STORAGE_KEY_PREFIX, getSelectedModelVendor } from '../common/chatSelectedModel.js';
+import { COPILOT_VENDOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
+import { ChatInputNotificationSeverity } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
+import { IChatInputNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service';
+
+const QUOTA_NOTIFICATION_ID = "copilot.quotaStatus";
+const THRESHOLDS = [50, 75, 90, 95];
+let ChatQuotaNotificationContribution = class ChatQuotaNotificationContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.chatQuotaNotification";
+    }
+    constructor(
+        _chatEntitlementService,
+        _chatInputNotificationService,
+        _contextKeyService,
+        _languageModelsService,
+        _storageService
+    ) {
+        super();
+        this._chatEntitlementService = _chatEntitlementService;
+        this._chatInputNotificationService = _chatInputNotificationService;
+        this._contextKeyService = _contextKeyService;
+        this._languageModelsService = _languageModelsService;
+        this._storageService = _storageService;
+        this._showingExhausted = false;
+        this._register(
+            this._chatEntitlementService.onDidChangeQuotaRemaining(() => this._update())
+        );
+        this._register(
+            this._chatEntitlementService.onDidChangeQuotaExceeded(() => this._update())
+        );
+        this._register(this._chatEntitlementService.onDidChangeEntitlement(() => this._update()));
+        const storageListener = this._register(( new DisposableStore()));
+        this._register(
+            this._storageService.onDidChangeValue(StorageScope.APPLICATION, undefined, storageListener)(e => {
+                if (e.key.startsWith(SELECTED_MODEL_STORAGE_KEY_PREFIX)) {
+                    this._update();
+                }
+            })
+        );
+        this._update();
+    }
+    _getRelevantSnapshot() {
+        const quotas = this._chatEntitlementService.quotas;
+        const entitlement = this._chatEntitlementService.entitlement;
+        if (entitlement === ChatEntitlement.Unknown || entitlement === ChatEntitlement.Free) {
+            return quotas.chat ?? quotas.premiumChat;
+        }
+        return quotas.premiumChat;
+    }
+    _isQuotaUsedUp() {
+        const snapshot = this._getRelevantSnapshot();
+        if (!snapshot) {
+            return false;
+        }
+        if (snapshot.unlimited) {
+            return snapshot.hasQuota === false;
+        }
+        return snapshot.percentRemaining <= 0;
+    }
+    _isUBBEligible() {
+        return this._chatEntitlementService.quotas.usageBasedBilling === true;
+    }
+    _update() {
+        const entitlement = this._chatEntitlementService.entitlement;
+        const isCopilot = this._isCopilotModelSelected();
+        if (!isCopilot) {
+            return;
+        }
+        const isQuotaNotificationEligible = entitlement === ChatEntitlement.Unknown || this._isUBBEligible();
+        if (this._isManagedPlan(entitlement) && this._isManagedPlanBlocked()) {
+            this._showManagedPlanBlockedNotification();
+            return;
+        }
+        if (isQuotaNotificationEligible && this._isQuotaUsedUp()) {
+            const quotas = this._chatEntitlementService.quotas;
+            const additionalUsageEnabled = quotas.additionalUsageEnabled ?? false;
+            const wasAdditionalUsageEnabled = this._prevAdditionalUsageEnabled;
+            this._prevAdditionalUsageEnabled = additionalUsageEnabled;
+            if (additionalUsageEnabled) {
+                if (this._prevQuotaPercentUsed !== undefined || wasAdditionalUsageEnabled === false) {
+                    this._showOverageActivationNotification();
+                }
+            } else {
+                this._showExhaustedNotification();
+            }
+            const exhaustedSnapshot = this._getRelevantSnapshot();
+            if (exhaustedSnapshot && !exhaustedSnapshot.unlimited) {
+                this._prevQuotaPercentUsed = 100 - exhaustedSnapshot.percentRemaining;
+            }
+            return;
+        }
+        if (isQuotaNotificationEligible) {
+            const quotaWarning = this._computeQuotaWarning();
+            if (quotaWarning) {
+                this._showQuotaApproachingWarning(quotaWarning);
+                return;
+            }
+        }
+        const rateLimitWarning = this._computeRateLimitWarning();
+        if (rateLimitWarning) {
+            this._showRateLimitWarning(rateLimitWarning);
+            return;
+        }
+        if (this._showingExhausted && !this._isQuotaUsedUp()) {
+            this._hideNotification();
+        }
+    }
+    _computeQuotaWarning() {
+        const snapshot = this._getRelevantSnapshot();
+        if (!snapshot || snapshot.unlimited) {
+            this._prevQuotaPercentUsed = undefined;
+            return undefined;
+        }
+        const percentUsed = 100 - snapshot.percentRemaining;
+        const crossed = this._findCrossedThreshold(percentUsed, this._prevQuotaPercentUsed);
+        this._prevQuotaPercentUsed = percentUsed;
+        if (crossed !== undefined) {
+            return {
+                percentUsed: Math.floor(percentUsed)
+            };
+        }
+        return undefined;
+    }
+    _findCrossedThreshold(current, previous) {
+        if (previous === undefined) {
+            return undefined;
+        }
+        for (let i = THRESHOLDS.length - 1; i >= 0; i--) {
+            const threshold = THRESHOLDS[i];
+            if (previous < threshold && current >= threshold) {
+                return threshold;
+            }
+        }
+        return undefined;
+    }
+    _showExhaustedNotification() {
+        this._showingExhausted = true;
+        const entitlement = this._chatEntitlementService.entitlement;
+        const quotas = this._chatEntitlementService.quotas;
+        const hadOverage = (quotas.additionalUsageCount ?? 0) > 0;
+        let description;
+        let actions;
+        if (entitlement === ChatEntitlement.Unknown) {
+            description = ( localize(6648, "Sign in to keep going."));
+            actions = [{
+                label: ( localize(6649, "Sign In")),
+                commandId: "workbench.action.chat.triggerSetup"
+            }];
+        } else if (entitlement === ChatEntitlement.Free) {
+            description = ( localize(6650, "Upgrade to keep going."));
+            actions = [{
+                label: ( localize(6651, "Upgrade")),
+                commandId: "workbench.action.chat.upgradePlan"
+            }];
+        } else if (this._isManagedPlan(entitlement)) {
+            description = ( localize(6652, "Contact your admin to increase your limits."));
+            actions = [];
+        } else if (hadOverage) {
+            description = ( localize(6653, "Increase your budget to keep building."));
+            actions = [{
+                label: ( localize(6654, "Manage Budget")),
+                commandId: "workbench.action.chat.manageAdditionalSpend"
+            }];
+        } else {
+            description = ( localize(6655, "Manage your budget to keep building."));
+            actions = [{
+                label: ( localize(6656, "Manage Budget")),
+                commandId: "workbench.action.chat.manageAdditionalSpend"
+            }];
+        }
+        this._setNotification({
+            id: QUOTA_NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Info,
+            message: ( localize(6657, "Credit Limit Reached")),
+            description,
+            actions,
+            dismissible: true,
+            autoDismissOnMessage: true
+        });
+    }
+    _showOverageActivationNotification() {
+        this._showingExhausted = true;
+        this._setNotification({
+            id: QUOTA_NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Info,
+            message: ( localize(6658, "Credit Limit Reached")),
+            description: ( localize(6659, "Additional budget is now covering extra usage.")),
+            actions: [],
+            dismissible: true,
+            autoDismissOnMessage: true
+        });
+    }
+    _showQuotaApproachingWarning(warning) {
+        this._showingExhausted = false;
+        const entitlement = this._chatEntitlementService.entitlement;
+        const quotas = this._chatEntitlementService.quotas;
+        let description;
+        let actions;
+        if (entitlement === ChatEntitlement.Unknown || entitlement === ChatEntitlement.Free) {
+            description = ( localize(6660, "Upgrade to continue past the limit."));
+            actions = [{
+                label: ( localize(6661, "Upgrade")),
+                commandId: "workbench.action.chat.upgradePlan"
+            }];
+        } else if (this._isManagedPlan(entitlement)) {
+            description = ( localize(6662, "Contact your admin to increase your limits."));
+            actions = [];
+        } else if (quotas.additionalUsageEnabled) {
+            description = ( localize(6663, "Additional budget is enabled to cover extra usage."));
+            actions = [];
+        } else {
+            description = ( localize(6664, "Set additional budget to cover extra usage."));
+            actions = [{
+                label: ( localize(6665, "Manage Budget")),
+                commandId: "workbench.action.chat.manageAdditionalSpend"
+            }];
+        }
+        this._setNotification({
+            id: QUOTA_NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Info,
+            message: ( localize(6666, "Credits at {0}%", warning.percentUsed)),
+            description,
+            actions,
+            dismissible: true,
+            autoDismissOnMessage: true
+        });
+    }
+    _computeRateLimitWarning() {
+        const quotas = this._chatEntitlementService.quotas;
+        const sessionResult = this._checkRateLimitCrossing(quotas.sessionRateLimit, this._prevSessionPercentUsed);
+        this._prevSessionPercentUsed = sessionResult.newPrev;
+        const weeklyResult = this._checkRateLimitCrossing(quotas.weeklyRateLimit, this._prevWeeklyPercentUsed);
+        this._prevWeeklyPercentUsed = weeklyResult.newPrev;
+        if (sessionResult.warning) {
+            return {
+                ...sessionResult.warning,
+                type: "session"
+            };
+        }
+        if (weeklyResult.warning) {
+            return {
+                ...weeklyResult.warning,
+                type: "weekly"
+            };
+        }
+        return undefined;
+    }
+    _checkRateLimitCrossing(snapshot, prevPercentUsed) {
+        if (!snapshot || snapshot.unlimited) {
+            return {
+                newPrev: undefined
+            };
+        }
+        const percentUsed = 100 - snapshot.percentRemaining;
+        const crossed = this._findCrossedThreshold(percentUsed, prevPercentUsed);
+        return {
+            newPrev: percentUsed,
+            warning: crossed !== undefined ? {
+                percentUsed: Math.floor(percentUsed),
+                resetDate: snapshot.resetDate
+            } : undefined
+        };
+    }
+    _showRateLimitWarning(warning) {
+        this._showingExhausted = false;
+        const message = warning.type === "session" ? ( localize(6667, "You've used {0}% of your session rate limit.", warning.percentUsed)) : ( localize(6668, "You've used {0}% of your weekly rate limit.", warning.percentUsed));
+        const description = warning.resetDate ? ( localize(6669, "Resets on {0}.", this._formatResetDate(warning.resetDate))) : undefined;
+        this._setNotification({
+            id: QUOTA_NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Info,
+            message,
+            description,
+            actions: [],
+            dismissible: true,
+            autoDismissOnMessage: true
+        });
+    }
+    _isCopilotModelSelected() {
+        const vendor = getSelectedModelVendor(this._contextKeyService, this._storageService, this._languageModelsService);
+        if (!vendor) {
+            return true;
+        }
+        return vendor === COPILOT_VENDOR_ID;
+    }
+    _isManagedPlan(entitlement) {
+        return entitlement === ChatEntitlement.Business || entitlement === ChatEntitlement.Enterprise;
+    }
+    _isManagedPlanBlocked() {
+        const snapshot = this._chatEntitlementService.quotas.premiumChat;
+        return !!snapshot && snapshot.hasQuota === false;
+    }
+    _showManagedPlanBlockedNotification() {
+        this._showingExhausted = true;
+        this._setNotification({
+            id: QUOTA_NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Info,
+            message: ( localize(6670, "Usage Blocked")),
+            description: ( localize(
+                6671,
+                "Your organization or enterprise has exceeded its Copilot budget. Contact your admin to resume usage."
+            )),
+            actions: [],
+            dismissible: true,
+            autoDismissOnMessage: true
+        });
+    }
+    _formatResetDate(isoDate) {
+        const resetDate = ( new Date(isoDate));
+        const now = ( new Date());
+        const includeYear = resetDate.getFullYear() !== now.getFullYear();
+        return safeIntl.DateTimeFormat(undefined, includeYear ? {
+            month: "long",
+            day: "numeric",
+            year: "numeric",
+            hour: "numeric",
+            minute: "2-digit"
+        } : {
+            month: "long",
+            day: "numeric",
+            hour: "numeric",
+            minute: "2-digit"
+        }).value.format(resetDate);
+    }
+    _setNotification(notification) {
+        this._chatInputNotificationService.setNotification(notification);
+    }
+    _hideNotification() {
+        this._showingExhausted = false;
+        this._chatInputNotificationService.deleteNotification(QUOTA_NOTIFICATION_ID);
+    }
+};
+ChatQuotaNotificationContribution = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IChatInputNotificationService)), ( __param(2, IContextKeyService)), ( __param(3, ILanguageModelsService)), ( __param(4, IStorageService))], ChatQuotaNotificationContribution));
+
+export { ChatQuotaNotificationContribution };

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

@@ -15,6 +15,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/defaultLinesDi
 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 '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/text/positionToOffset';
 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 '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
@@ -127,13 +128,13 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         const registry = ( Registry.as(Extensions.Configuration));
         registry.registerConfiguration({
             id: "chatRepoInfo",
-            title: ( localize(6558, "Chat Repository Info")),
+            title: ( localize(6672, "Chat Repository Info")),
             type: "object",
             properties: {
                 [ChatConfiguration.RepoInfoEnabled]: {
                     type: "boolean",
                     description: ( localize(
-                        6559,
+                        6673,
                         "Controls whether lightweight repository metadata (branch, commit, remotes) is captured when a chat request is submitted for internal diagnostics."
                     )),
                     default: false

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

@@ -1,6 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
@@ -47,4 +46,3 @@ export declare class ChatTeardownContribution extends Disposable implements IWor
     private maybeHideAuxiliaryBar;
     private registerActions;
 }
-export declare function refreshTokens(commandService: ICommandService): void;

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

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, markAsSingleton, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -54,17 +55,18 @@ import { ChatModeKind, ChatAgentLocation, ChatConfiguration } from '@codingame/m
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_SUPPORT_ANONYMOUS_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatViewContainerId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatInputNotificationSeverity } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
+import { IChatInputNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service';
 import { chatViewsWelcomeRegistry } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
-import { ChatSetupAnonymous } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
+import { ChatSetupAnonymous, buildUpgradeUrlWithRedirect, refreshTokens } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatSetup/chatSetup';
 import { ChatSetupController } from './chatSetupController.js';
 import { GrowthSessionController, registerGrowthSession } from './chatSetupGrowthSession.js';
 import { SetupAgent, AINewSymbolNamesProvider, ChatCodeActionsProvider, AICodeActionsHelper } from './chatSetupProviders.js';
 import { ChatSetup } from './chatSetupRunner.js';
 
+var ChatSetupExtensionUrlHandler_1;
 const defaultChat = {
-    chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? "",
-    upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? "",
-    chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? ""
+    chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? ""
 };
 const SIGN_IN_TITLE_BAR_ACTION_ID = "workbench.action.chat.signInIndicator";
 let ChatSetupContribution = class ChatSetupContribution extends Disposable {
@@ -226,7 +228,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
             static {
-                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6607, "Use AI Features with Copilot for free..."));
+                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6721, "Use AI Features with Copilot for free..."));
             }
             constructor() {
                 super({
@@ -277,8 +279,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         confirmed
                     } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(6608, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(6609, "Retry"))
+                        message: ( localize(6722, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(6723, "Retry"))
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -323,7 +325,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupForceSignIn",
-                    title: ( localize2(6610, "Sign in to use AI features"))
+                    title: ( localize2(6724, "Sign in to use GitHub Copilot"))
                 });
             }
             async run(accessor) {
@@ -361,11 +363,11 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupFromAccounts",
-                    title: ( localize2(6611, "Sign in to use AI features...")),
+                    title: ( localize2(6725, "Sign in to use GitHub Copilot...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: "2_copilot",
-                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate()), ( ChatEntitlementContextKeys.hasByokModels.negate()), ChatContextKeys.Entitlement.signedOut))
+                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate()), ChatContextKeys.Entitlement.signedOut))
                     }
                 });
             }
@@ -386,7 +388,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: ChatSetupSignInTitleBarAction.ID,
-                    title: ( localize(6612, "Sign In")),
+                    title: ( localize(6726, "Sign In")),
                     f1: false,
                     menu: [{
                         id: MenuId.TitleBarAdjacentCenter,
@@ -407,7 +409,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ToggleSignInTitleBarAction extends ToggleTitleBarConfigAction {
             constructor() {
-                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(6613, "Copilot Sign In")), ( localize(6614, "Toggle visibility of the Copilot Sign In button in title bar")), 3, ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))));
+                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(6727, "Copilot Sign In")), ( localize(6728, "Toggle visibility of the Copilot Sign In button in title bar")), 3, ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))));
             }
         }
         const windowFocusListener = this._register(( new MutableDisposable()));
@@ -415,8 +417,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.upgradePlan",
-                    title: ( localize2(6615, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(6616, "Chat")),
+                    title: ( localize2(6729, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(6730, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
@@ -438,11 +440,15 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                 const hostService = accessor.get(IHostService);
                 const commandService = accessor.get(ICommandService);
                 const telemetryService = accessor.get(ITelemetryService);
+                const defaultAccountService = accessor.get(IDefaultAccountService);
+                const productService = accessor.get(IProductService);
                 telemetryService.publicLog2("workbenchActionExecuted", {
                     id: "workbench.action.chat.upgradePlan",
                     from: "command"
                 });
-                openerService.open(( URI.parse(defaultChat.upgradePlanUrl)));
+                const baseUrl = defaultAccountService.resolveGitHubUrl(GitHubPaths.copilotUpgrade);
+                const upgradeUrl = buildUpgradeUrlWithRedirect(baseUrl, productService.urlProtocol, productService.quality);
+                openerService.open(upgradeUrl);
                 const entitlement = context.state.entitlement;
                 if (!isProUser(entitlement)) {
                     windowFocusListener.value = hostService.onDidChangeFocus(focus => this.onWindowFocus(focus, commandService));
@@ -462,8 +468,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.manageAdditionalSpend",
-                    title: ( localize2(6617, "Manage GitHub Copilot Budget")),
-                    category: ( localize2(6616, "Chat")),
+                    title: ( localize2(6731, "Manage GitHub Copilot Budget")),
+                    category: ( localize2(6730, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
@@ -550,7 +556,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.explain",
-                title: ( localize(6618, "Explain"))
+                title: ( localize(6732, "Explain"))
             },
             group: "1_chat",
             order: 4,
@@ -559,7 +565,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.fix",
-                title: ( localize(6619, "Fix"))
+                title: ( localize(6733, "Fix"))
             },
             group: "1_chat",
             order: 5,
@@ -568,7 +574,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.review",
-                title: ( localize(6620, "Code Review"))
+                title: ( localize(6734, "Code Review"))
             },
             group: "1_chat",
             order: 6,
@@ -639,15 +645,32 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
 };
 ChatSetupContribution = ( __decorate([( __param(0, IActionViewItemService)), ( __param(1, IInstantiationService)), ( __param(2, IChatEntitlementService)), ( __param(3, ILogService)), ( __param(4, IContextKeyService)), ( __param(5, IWorkbenchExtensionEnablementService)), ( __param(6, IExtensionsWorkbenchService)), ( __param(7, IExtensionService)), ( __param(8, IEnvironmentService)), ( __param(9, IChatSessionsService)), ( __param(10, IConfigurationService))], ChatSetupContribution));
 let ChatSetupExtensionUrlHandler = class ChatSetupExtensionUrlHandler {
-    constructor(productService, commandService, telemetryService) {
+    static {
+        ChatSetupExtensionUrlHandler_1 = this;
+    }
+    static {
+        this.UPGRADE_SUCCESS_NOTIFICATION_ID = "copilot.upgradeSuccess";
+    }
+    constructor(
+        productService,
+        commandService,
+        telemetryService,
+        chatEntitlementService,
+        chatInputNotificationService
+    ) {
         this.productService = productService;
         this.commandService = commandService;
         this.telemetryService = telemetryService;
+        this.chatEntitlementService = chatEntitlementService;
+        this.chatInputNotificationService = chatInputNotificationService;
     }
     canHandleURL(url) {
         return url.scheme === this.productService.urlProtocol && equalsIgnoreCase(url.authority, defaultChat.chatExtensionId);
     }
     async handleURL(url) {
+        if (url.path === "/upgrade-success") {
+            return this._handleUpgradeSuccess();
+        }
         const params = ( new URLSearchParams(url.query));
         this.telemetryService.publicLog2("workbenchActionExecuted", {
             id: CHAT_SETUP_ACTION_ID,
@@ -664,8 +687,26 @@ let ChatSetupExtensionUrlHandler = class ChatSetupExtensionUrlHandler {
         } : undefined);
         return true;
     }
+    async _handleUpgradeSuccess() {
+        this.telemetryService.publicLog2("workbenchActionExecuted", {
+            id: "workbench.action.chat.upgradePlan",
+            from: "redirect"
+        });
+        await this.chatEntitlementService.update(CancellationToken.None);
+        refreshTokens(this.commandService);
+        this.chatInputNotificationService.setNotification({
+            id: ChatSetupExtensionUrlHandler_1.UPGRADE_SUCCESS_NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Info,
+            message: ( localize(6735, "Upgrade Successful")),
+            description: ( localize(6736, "Please wait up to 10 minutes for your new plan to apply.")),
+            actions: [],
+            dismissible: true,
+            autoDismissOnMessage: true
+        });
+        return true;
+    }
 };
-ChatSetupExtensionUrlHandler = ( __decorate([( __param(0, IProductService)), ( __param(1, ICommandService)), ( __param(2, ITelemetryService))], ChatSetupExtensionUrlHandler));
+ChatSetupExtensionUrlHandler = ChatSetupExtensionUrlHandler_1 = ( __decorate([( __param(0, IProductService)), ( __param(1, ICommandService)), ( __param(2, ITelemetryService)), ( __param(3, IChatEntitlementService)), ( __param(4, IChatInputNotificationService))], ChatSetupExtensionUrlHandler));
 let ChatTeardownContribution = class ChatTeardownContribution extends Disposable {
     static {
         this.ID = "workbench.contrib.chatTeardown";
@@ -735,12 +776,17 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         const defaultChatExtension = this.extensionsWorkbenchService.local.find(
             value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.chatExtensionId)
         );
-        if (!defaultChatExtension) {
+        if (!defaultChatExtension?.local) {
+            return;
+        }
+        const workspace = state === EnablementState.EnabledWorkspace || state === EnablementState.DisabledWorkspace;
+        const canChange = workspace ? this.extensionEnablementService.canChangeWorkspaceEnablement(defaultChatExtension.local) : this.extensionEnablementService.canChangeEnablement(defaultChatExtension.local);
+        if (!canChange) {
             return;
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
         await this.extensionsWorkbenchService.updateRunningExtensions(
-            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6621, "Enabling AI features")) : ( localize(6622, "Disabling AI features"))
+            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6737, "Enabling AI features")) : ( localize(6738, "Disabling AI features"))
         );
     }
     maybeHideAuxiliaryBar() {
@@ -758,7 +804,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 this.ID = "workbench.action.chat.hideSetup";
             }
             static {
-                this.TITLE = ( localize2(6623, "Learn How to Hide AI Features"));
+                this.TITLE = ( localize2(6739, "Learn How to Hide AI Features"));
             }
             constructor() {
                 super({
@@ -787,9 +833,6 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
     }
 };
 ChatTeardownContribution = ( __decorate([( __param(0, IChatEntitlementService)), ( __param(1, IConfigurationService)), ( __param(2, IExtensionsWorkbenchService)), ( __param(3, IWorkbenchExtensionEnablementService)), ( __param(4, IViewDescriptorService)), ( __param(5, IWorkbenchLayoutService))], ChatTeardownContribution));
-function refreshTokens(commandService) {
-    commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
-}
 class SignInTitleBarEntry extends BaseActionViewItem {
     constructor(action, options) {
         super(undefined, action, options);
@@ -817,4 +860,4 @@ class SignInTitleBarEntry extends BaseActionViewItem {
     }
 }
 
-export { ChatSetupContribution, ChatTeardownContribution, refreshTokens };
+export { ChatSetupContribution, ChatTeardownContribution };