@codingame/monaco-vscode-chat-service-override 32.0.1 → 33.0.4

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

@@ -7,24 +7,34 @@ import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 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 { WebviewContentPurpose } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { ExtensionKeyedWebviewOriginStore, WebviewContentPurpose } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatOutputRendererService = class ChatOutputRendererService extends Disposable {
-    constructor(_contextKeyService, _extensionService, _webviewService) {
+    constructor(
+        _contextKeyService,
+        _extensionService,
+        _webviewService,
+        _chatWidgetService,
+        storageService
+    ) {
         super();
         this._contextKeyService = _contextKeyService;
         this._extensionService = _extensionService;
         this._webviewService = _webviewService;
+        this._chatWidgetService = _chatWidgetService;
         this._contributions = ( new Map());
         this._renderers = ( new Map());
+        this._originStore = ( new ExtensionKeyedWebviewOriginStore("chatOutputRenderer.origins", storageService));
         this._register(chatOutputRenderContributionPoint.setHandler(extensions => {
             this.updateContributions(extensions);
         }));
@@ -41,18 +51,40 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
             }
         };
     }
+    hasCodeBlockRenderer(languageIdentifier) {
+        return ( Array.from(( this._contributions.values())).some(value => ( value.codeBlockLanguageIdentifiers.some(identifier => equalsIgnoreCase(identifier, languageIdentifier)))));
+    }
     async renderOutputPart(mime, data, parent, webviewOptions, token) {
-        const rendererData = await this.getRenderer(mime, token);
+        const rendererData = await this.getRendererForMime(mime, token);
         if (token.isCancellationRequested) {
             throw ( new CancellationError());
         }
         if (!rendererData) {
             throw ( new Error(`No renderer registered found for mime type: ${mime}`));
         }
+        return this.doRenderOutputPart(rendererData, mime, data, {}, parent, webviewOptions, token);
+    }
+    async renderCodeBlock(languageIdentifier, data, parent, webviewOptions, token) {
+        const rendererData = await this.getRendererForCodeBlock(languageIdentifier, token);
+        if (token.isCancellationRequested) {
+            throw ( new CancellationError());
+        }
+        if (!rendererData) {
+            throw ( new Error(
+                `No renderer registered found for code block language identifier: ${languageIdentifier}`
+            ));
+        }
+        return this.doRenderOutputPart(rendererData, "text/x-vscode-chat-code-block", data, {
+            codeBlockContext: {
+                languageIdentifier
+            }
+        }, parent, webviewOptions, token);
+    }
+    async doRenderOutputPart(rendererData, mime, data, context, parent, webviewOptions, token) {
         const store = ( new DisposableStore());
         const webview = store.add(this._webviewService.createWebviewElement({
-            title: "",
-            origin: webviewOptions.origin ?? generateUuid(),
+            title: webviewOptions.title ?? "",
+            origin: this.getOrigin(rendererData),
             providedViewType: rendererData.viewType,
             options: {
                 enableFindWidget: false,
@@ -63,6 +95,11 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
             extension: rendererData.options.extension ? rendererData.options.extension : undefined
         }));
         webview.setContextKeyService(store.add(this._contextKeyService.createScoped(parent)));
+        if (webviewOptions.chatSessionResource) {
+            store.add(
+                this.delegateScrollToChatWidget(webview, webviewOptions.chatSessionResource)
+            );
+        }
         const onDidChangeHeight = store.add(( new Emitter()));
         store.add(autorun(reader => {
             const height = reader.readObservable(webview.intrinsicContentSize);
@@ -75,7 +112,7 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
             webview.state = webviewOptions.webviewState;
         }
         webview.mountTo(parent, getWindow(parent));
-        await rendererData.renderer.renderOutputPart(mime, data, webview, token);
+        await rendererData.renderer.renderOutputPart(mime, data, webview, context, token);
         return {
             get webview() {
                 return webview;
@@ -89,10 +126,28 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
             }
         };
     }
-    async getRenderer(mime, token) {
+    delegateScrollToChatWidget(webview, chatSessionResource) {
+        return webview.onDidWheel(e => {
+            this._chatWidgetService.getWidgetBySessionResource(chatSessionResource)?.delegateScrollFromMouseWheelEvent({
+                ...e,
+                preventDefault: () => {},
+                stopPropagation: () => {}
+            });
+        });
+    }
+    getOrigin(rendererData) {
+        return rendererData.options.extension ? this._originStore.getOrigin(rendererData.viewType, rendererData.options.extension.id) : undefined;
+    }
+    async getRendererForMime(mime, token) {
+        return this.getRenderer(value => ( value.mimes.some(m => matchesMimeType(m, [mime]))), token);
+    }
+    async getRendererForCodeBlock(languageIdentifier, token) {
+        return this.getRenderer(value => ( value.codeBlockLanguageIdentifiers.some(identifier => equalsIgnoreCase(identifier, languageIdentifier))), token);
+    }
+    async getRenderer(matches, token) {
         await raceCancellationError(this._extensionService.whenInstalledExtensionsRegistered(), token);
         for (const [id, value] of this._contributions) {
-            if (( value.mimes.some(m => matchesMimeType(m, [mime])))) {
+            if (matches(value)) {
                 await raceCancellationError(
                     this._extensionService.activateByEvent(`onChatOutputRenderer:${id}`),
                     token
@@ -118,26 +173,44 @@ let ChatOutputRendererService = class ChatOutputRendererService extends Disposab
                     );
                     continue;
                 }
+                const mimeTypes = contribution.mimeTypes ?? [];
+                const codeBlockLanguageIdentifiers = contribution.codeBlockLanguageIdentifiers ?? [];
+                if (!mimeTypes.length && !codeBlockLanguageIdentifiers.length) {
+                    extension.collector.error(
+                        `Chat output renderer with view type '${contribution.viewType}' must specify at least one mime type or code block language identifier`
+                    );
+                    continue;
+                }
                 this._contributions.set(contribution.viewType, {
-                    mimes: contribution.mimeTypes
+                    mimes: mimeTypes,
+                    codeBlockLanguageIdentifiers
                 });
             }
         }
     }
 };
-ChatOutputRendererService = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IExtensionService)), ( __param(2, IWebviewService))], ChatOutputRendererService));
+ChatOutputRendererService = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IExtensionService)), ( __param(2, IWebviewService)), ( __param(3, IChatWidgetService)), ( __param(4, IStorageService))], ChatOutputRendererService));
 const chatOutputRendererContributionSchema = {
     type: "object",
     additionalProperties: false,
-    required: ["viewType", "mimeTypes"],
+    required: ["viewType"],
     properties: {
         viewType: {
             type: "string",
-            description: ( localize(6461, "Unique identifier for the renderer."))
+            description: ( localize(6523, "Unique identifier for the renderer."))
         },
         mimeTypes: {
             type: "array",
-            description: ( localize(6462, "MIME types that this renderer can handle")),
+            description: ( localize(6524, "MIME types that this renderer can handle")),
+            uniqueItems: true,
+            items: {
+                type: "string"
+            }
+        },
+        codeBlockLanguageIdentifiers: {
+            type: "array",
+            description: ( localize(6525, "Code block language identifiers that this renderer can handle")),
+            uniqueItems: true,
             items: {
                 type: "string"
             }
@@ -152,7 +225,10 @@ const chatOutputRenderContributionPoint = ExtensionsRegistry.registerExtensionPo
         }
     },
     jsonSchema: {
-        description: ( localize(6463, "Contributes a renderer for specific MIME types in chat outputs")),
+        description: ( localize(
+            6526,
+            "Contributes a renderer for specific MIME types and code block language identifiers in chat outputs"
+        )),
         type: "array",
         items: chatOutputRendererContributionSchema
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.js

@@ -29,10 +29,10 @@ import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vs
 import { ChatViewContainerId, ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatViewPane } from './widgetHosts/viewPane/chatViewPane.js';
 
-const chatViewIcon = registerIcon("chat-view-icon", Codicon.chatSparkle, ( localize(6464, "View icon of the chat view.")));
+const chatViewIcon = registerIcon("chat-view-icon", Codicon.chatSparkle, ( localize(6527, "View icon of the chat view.")));
 const chatViewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: ChatViewContainerId,
-    title: ( localize2(6465, "Chat")),
+    title: ( localize2(6528, "Chat")),
     icon: chatViewIcon,
     ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [ChatViewContainerId, {
         mergeViewWithContainerWhenSingleView: true
@@ -49,13 +49,13 @@ const chatViewDescriptor = {
     containerIcon: chatViewContainer.icon,
     containerTitle: chatViewContainer.title.value,
     singleViewPaneContainerTitle: chatViewContainer.title.value,
-    name: ( localize2(6465, "Chat")),
+    name: ( localize2(6528, "Chat")),
     canToggleVisibility: false,
     canMoveView: true,
     openCommandActionDescriptor: {
         id: ChatViewContainerId,
         title: chatViewContainer.title,
-        mnemonicTitle: ( localize(6466, "&&Chat")),
+        mnemonicTitle: ( localize(6529, "&&Chat")),
         keybindings: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
             mac: {
@@ -71,7 +71,7 @@ const chatViewDescriptor = {
 const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatParticipants",
     jsonSchema: {
-        description: ( localize(6467, "Contributes a chat participant")),
+        description: ( localize(6530, "Contributes a chat participant")),
         type: "array",
         items: {
             additionalProperties: false,
@@ -85,12 +85,12 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ["name", "id"],
             properties: {
                 id: {
-                    description: ( localize(6468, "A unique id for this chat participant.")),
+                    description: ( localize(6531, "A unique id for this chat participant.")),
                     type: "string"
                 },
                 name: {
                     description: ( localize(
-                        6469,
+                        6532,
                         "User-facing name for this chat participant. The user will use '@' with this name to invoke the participant. Name must not contain whitespace."
                     )),
                     type: "string",
@@ -98,37 +98,37 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 fullName: {
                     markdownDescription: ( localize(
-                        6470,
+                        6533,
                         "The full name of this chat participant, which is shown as the label for responses coming from this participant. If not provided, {0} is used.",
                         "`name`"
                     )),
                     type: "string"
                 },
                 description: {
-                    description: ( localize(6471, "A description of this chat participant, shown in the UI.")),
+                    description: ( localize(6534, "A description of this chat participant, shown in the UI.")),
                     type: "string"
                 },
                 isSticky: {
                     description: ( localize(
-                        6472,
+                        6535,
                         "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."
                     )),
                     type: "boolean"
                 },
                 sampleRequest: {
                     description: ( localize(
-                        6473,
+                        6536,
                         "When the user clicks this participant in `/help`, this text will be submitted to the participant."
                     )),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(6474, "A condition which must be true to enable this participant.")),
+                    description: ( localize(6537, "A condition which must be true to enable this participant.")),
                     type: "string"
                 },
                 disambiguation: {
                     description: ( localize(
-                        6475,
+                        6538,
                         "Metadata to help with automatically routing user questions to this chat participant."
                     )),
                     type: "array",
@@ -146,21 +146,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             category: {
                                 markdownDescription: ( localize(
-                                    6476,
+                                    6539,
                                     "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                 )),
                                 type: "string"
                             },
                             description: {
                                 description: ( localize(
-                                    6477,
+                                    6540,
                                     "A detailed description of the kinds of questions that are suitable for this chat participant."
                                 )),
                                 type: "string"
                             },
                             examples: {
                                 description: ( localize(
-                                    6478,
+                                    6541,
                                     "A list of representative example questions that are suitable for this chat participant."
                                 )),
                                 type: "array"
@@ -170,7 +170,7 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        6479,
+                        6542,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: "array",
@@ -187,36 +187,36 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             name: {
                                 description: ( localize(
-                                    6480,
+                                    6543,
                                     "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."
                                 )),
                                 type: "string"
                             },
                             description: {
-                                description: ( localize(6481, "A description of this command.")),
+                                description: ( localize(6544, "A description of this command.")),
                                 type: "string"
                             },
                             when: {
-                                description: ( localize(6482, "A condition which must be true to enable this command.")),
+                                description: ( localize(6545, "A condition which must be true to enable this command.")),
                                 type: "string"
                             },
                             sampleRequest: {
                                 description: ( localize(
-                                    6483,
+                                    6546,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: "string"
                             },
                             isSticky: {
                                 description: ( localize(
-                                    6472,
+                                    6535,
                                     "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."
                                 )),
                                 type: "boolean"
                             },
                             disambiguation: {
                                 description: ( localize(
-                                    6484,
+                                    6547,
                                     "Metadata to help with automatically routing user questions to this chat command."
                                 )),
                                 type: "array",
@@ -234,21 +234,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                                     properties: {
                                         category: {
                                             markdownDescription: ( localize(
-                                                6485,
+                                                6548,
                                                 "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                             )),
                                             type: "string"
                                         },
                                         description: {
                                             description: ( localize(
-                                                6486,
+                                                6549,
                                                 "A detailed description of the kinds of questions that are suitable for this chat command."
                                             )),
                                             type: "string"
                                         },
                                         examples: {
                                             description: ( localize(
-                                                6487,
+                                                6550,
                                                 "A list of representative example questions that are suitable for this chat command."
                                             )),
                                             type: "array"
@@ -399,9 +399,9 @@ let ChatCompatibilityNotifier = class ChatCompatibilityNotifier extends Disposab
             return;
         }
         this.registeredWelcomeView = true;
-        const showExtensionLabel = ( localize(6488, "Show Extension"));
+        const showExtensionLabel = ( localize(6551, "Show Extension"));
         const mainMessage = ( localize(
-            6489,
+            6552,
             "Chat failed to load because the installed version of the Copilot Chat extension is not compatible with this version of {0}. Please ensure that the Copilot Chat extension is up to date.",
             this.productService.nameLong
         ));
@@ -437,7 +437,7 @@ class ChatParticipantDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(6490, "Name")), ( localize(6491, "Full Name")), ( localize(6492, "Description")), ( localize(6493, "Commands"))];
+        const headers = [( localize(6553, "Name")), ( localize(6554, "Full Name")), ( localize(6555, "Description")), ( localize(6556, "Commands"))];
         const rows = ( nonDefaultContributions.map(d => {
             return [
                 "@" + d.name,
@@ -457,7 +457,7 @@ class ChatParticipantDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$1.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "chatParticipants",
-    label: ( localize(6494, "Chat Participants")),
+    label: ( localize(6557, "Chat Participants")),
     access: {
         canToggle: false
     },

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

@@ -127,13 +127,13 @@ let ChatRepoInfoContribution = class ChatRepoInfoContribution extends Disposable
         const registry = ( Registry.as(Extensions.Configuration));
         registry.registerConfiguration({
             id: "chatRepoInfo",
-            title: ( localize(6495, "Chat Repository Info")),
+            title: ( localize(6558, "Chat Repository Info")),
             type: "object",
             properties: {
                 [ChatConfiguration.RepoInfoEnabled]: {
                     type: "boolean",
                     description: ( localize(
-                        6496,
+                        6559,
                         "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.js

@@ -28,12 +28,14 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
+import { GitHubPaths } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount';
+import { IDefaultAccountService } from '@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ToggleTitleBarConfigAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/titlebar/titlebarActions';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
-import { ChatEntitlement, isProUser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
+import { ChatEntitlement, ChatEntitlementContextKeys, isProUser } 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 { EnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
@@ -61,7 +63,6 @@ import { ChatSetup } from './chatSetupRunner.js';
 
 const defaultChat = {
     chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? "",
-    manageOverageUrl: product.defaultChatAgent?.manageOverageUrl ?? "",
     upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? "",
     chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? ""
 };
@@ -225,7 +226,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
     registerActions(context, requests, controller) {
         class ChatSetupTriggerAction extends Action2 {
             static {
-                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6544, "Use AI Features with Copilot for free..."));
+                this.CHAT_SETUP_ACTION_LABEL = ( localize2(6607, "Use AI Features with Copilot for free..."));
             }
             constructor() {
                 super({
@@ -276,8 +277,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
                         confirmed
                     } = await dialogService.confirm({
                         type: Severity.Error,
-                        message: ( localize(6545, "Chat setup failed. Would you like to try again?")),
-                        primaryButton: ( localize(6546, "Retry"))
+                        message: ( localize(6608, "Chat setup failed. Would you like to try again?")),
+                        primaryButton: ( localize(6609, "Retry"))
                     });
                     if (confirmed) {
                         return Boolean(await commandService.executeCommand(CHAT_SETUP_ACTION_ID, mode, options));
@@ -322,7 +323,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupForceSignIn",
-                    title: ( localize2(6547, "Sign in to use AI features"))
+                    title: ( localize2(6610, "Sign in to use AI features"))
                 });
             }
             async run(accessor) {
@@ -360,11 +361,11 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.triggerSetupFromAccounts",
-                    title: ( localize2(6548, "Sign in to use AI features...")),
+                    title: ( localize2(6611, "Sign in to use AI features...")),
                     menu: {
                         id: MenuId.AccountsContext,
                         group: "2_copilot",
-                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate()), ChatContextKeys.Entitlement.signedOut))
+                        when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ChatContextKeys.Setup.completed.negate()), ( ChatEntitlementContextKeys.hasByokModels.negate()), ChatContextKeys.Entitlement.signedOut))
                     }
                 });
             }
@@ -385,12 +386,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: ChatSetupSignInTitleBarAction.ID,
-                    title: ( localize(6549, "Sign In")),
+                    title: ( localize(6612, "Sign In")),
                     f1: false,
                     menu: [{
                         id: MenuId.TitleBarAdjacentCenter,
                         order: 0,
-                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( ( ContextKeyExpr.has("updateTitleBar")).negate()), ( InEditorZenModeContext.negate())))
+                        when: ( ContextKeyExpr.and(( IsWebContext.negate()), ChatContextKeys.Entitlement.signedOut, ( ChatEntitlementContextKeys.hasByokModels.negate()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.TitleBarSignInEnabled}`, true)), ( ( ContextKeyExpr.has("updateTitleBar")).negate()), ( InEditorZenModeContext.negate())))
                     }]
                 });
             }
@@ -406,7 +407,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         }
         class ToggleSignInTitleBarAction extends ToggleTitleBarConfigAction {
             constructor() {
-                super(ChatConfiguration.TitleBarSignInEnabled, ( localize(6550, "Copilot Sign In")), ( localize(6551, "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(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()))));
             }
         }
         const windowFocusListener = this._register(( new MutableDisposable()));
@@ -414,8 +415,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.upgradePlan",
-                    title: ( localize2(6552, "Upgrade to GitHub Copilot Pro")),
-                    category: ( localize2(6553, "Chat")),
+                    title: ( localize2(6615, "Upgrade to GitHub Copilot Pro")),
+                    category: ( localize2(6616, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.canSignUp,
@@ -461,8 +462,8 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.chat.manageAdditionalSpend",
-                    title: ( localize2(6554, "Manage GitHub Copilot Additional Spend")),
-                    category: ( localize2(6553, "Chat")),
+                    title: ( localize2(6617, "Manage GitHub Copilot Budget")),
+                    category: ( localize2(6616, "Chat")),
                     f1: true,
                     precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( ContextKeyExpr.or(
                         ChatContextKeys.Entitlement.planPro,
@@ -489,11 +490,12 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
             async run(accessor) {
                 const openerService = accessor.get(IOpenerService);
                 const telemetryService = accessor.get(ITelemetryService);
+                const defaultAccountService = accessor.get(IDefaultAccountService);
                 telemetryService.publicLog2("workbenchActionExecuted", {
                     id: "workbench.action.chat.manageAdditionalSpend",
                     from: "command"
                 });
-                openerService.open(( URI.parse(defaultChat.manageOverageUrl)));
+                openerService.open(( URI.parse(defaultAccountService.resolveGitHubUrl(GitHubPaths.billingBudgets))));
             }
         }
         registerAction2(ChatSetupTriggerAction);
@@ -548,7 +550,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.explain",
-                title: ( localize(6555, "Explain"))
+                title: ( localize(6618, "Explain"))
             },
             group: "1_chat",
             order: 4,
@@ -557,7 +559,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.fix",
-                title: ( localize(6556, "Fix"))
+                title: ( localize(6619, "Fix"))
             },
             group: "1_chat",
             order: 5,
@@ -566,7 +568,7 @@ let ChatSetupContribution = class ChatSetupContribution extends Disposable {
         MenuRegistry.appendMenuItem(MenuId.EditorContext, {
             command: {
                 id: "chat.internal.review",
-                title: ( localize(6557, "Code Review"))
+                title: ( localize(6620, "Code Review"))
             },
             group: "1_chat",
             order: 6,
@@ -738,7 +740,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
         }
         await this.extensionsWorkbenchService.setEnablement([defaultChatExtension], state);
         await this.extensionsWorkbenchService.updateRunningExtensions(
-            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6558, "Enabling AI features")) : ( localize(6559, "Disabling AI features"))
+            state === EnablementState.EnabledGlobally || state === EnablementState.EnabledWorkspace ? ( localize(6621, "Enabling AI features")) : ( localize(6622, "Disabling AI features"))
         );
     }
     maybeHideAuxiliaryBar() {
@@ -756,7 +758,7 @@ let ChatTeardownContribution = class ChatTeardownContribution extends Disposable
                 this.ID = "workbench.action.chat.hideSetup";
             }
             static {
-                this.TITLE = ( localize2(6560, "Learn How to Hide AI Features"));
+                this.TITLE = ( localize2(6623, "Learn How to Hide AI Features"));
             }
             constructor() {
                 super({