@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatProgressContentPart.js

@@ -16,12 +16,11 @@ import { getToolApprovalMessage } from './toolInvocationParts/chatToolPartUtilit
 import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { HoverStyle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { buildPhrasePool, defaultThinkingMessages } from './chatThinkingContentPart.js';
+import { maybePickFunWorkingMessage, buildPhrasePool, defaultThinkingMessages } from './chatThinkingContentPart.js';
 
 let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
     constructor(
@@ -137,6 +136,31 @@ let ChatProgressSubPart = class ChatProgressSubPart extends Disposable {
     }
 };
 ChatProgressSubPart = ( __decorate([( __param(3, IHoverService))], ChatProgressSubPart));
+const WORKING_LABEL_MIN_DWELL_MS = 1200;
+const lastPickedWorkingLabelByElement = ( new Map());
+function pickWorkingLabel(elementId, configurationService) {
+    const now = Date.now();
+    for (const [id, entry] of lastPickedWorkingLabelByElement) {
+        if (now - entry.pickedAt >= WORKING_LABEL_MIN_DWELL_MS) {
+            lastPickedWorkingLabelByElement.delete(id);
+        }
+    }
+    const existing = lastPickedWorkingLabelByElement.get(elementId);
+    if (existing && now - existing.pickedAt < WORKING_LABEL_MIN_DWELL_MS) {
+        existing.pickedAt = now;
+        return existing.label;
+    }
+    const fun = maybePickFunWorkingMessage();
+    const label = fun ?? (() => {
+        const pool = buildPhrasePool(defaultThinkingMessages, configurationService);
+        return pool[Math.floor(Math.random() * pool.length)];
+    })();
+    lastPickedWorkingLabelByElement.set(elementId, {
+        label,
+        pickedAt: now
+    });
+    return label;
+}
 let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extends Disposable {
     constructor(
         workingProgress,
@@ -149,13 +173,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
     ) {
         super();
         this.explicitContent = workingProgress.content;
-        const persistentProgressEnabled = configurationService.getValue(ChatConfiguration.ChatPersistentProgressEnabled) !== false;
-        if (persistentProgressEnabled) {
-            const pool = buildPhrasePool(defaultThinkingMessages, configurationService);
-            this.label = pool[Math.floor(Math.random() * pool.length)];
-        } else {
-            this.label = ( localize(6871, "Working"));
-        }
+        this.label = pickWorkingLabel(context.element.id, configurationService);
         this.domNode = $(".progress-container");
         const iconElement = $("div");
         const state = workingProgress.state;
@@ -184,7 +202,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
         }
         this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
             if (isEqual(context.element.sessionResource, e.sessionResource)) {
-                this.updateWorkingContent(( new MarkdownString(( localize(6872, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
+                this.updateWorkingContent(( new MarkdownString(( localize(7134, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
             }
         }));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.d.ts

@@ -10,6 +10,7 @@ import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.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";
 export interface IChatQuestionCarouselOptions {
     onSubmit: (answers: Map<string, IChatQuestionAnswerValue> | undefined) => void;
     shouldAutoFocus?: boolean;
@@ -23,6 +24,7 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
     private readonly _contextKeyService;
     private readonly _keybindingService;
     private readonly _commandService;
+    private readonly _configurationService;
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: Event<void>;
@@ -54,10 +56,11 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
      */
     private readonly _interactiveUIStore;
     private readonly _inChatQuestionCarouselContextKey;
+    private readonly _chatQuestionCarouselHasTerminalContextKey;
     private _validationMessageElement;
     private _currentValidationError;
     private _focusTerminalButtonContainer;
-    constructor(carousel: IChatQuestionCarousel, context: IChatContentPartRenderContext, _options: IChatQuestionCarouselOptions, _markdownRendererService: IMarkdownRendererService, _hoverService: IHoverService, _accessibilityService: IAccessibilityService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _commandService: ICommandService);
+    constructor(carousel: IChatQuestionCarousel, context: IChatContentPartRenderContext, _options: IChatQuestionCarouselOptions, _markdownRendererService: IMarkdownRendererService, _hoverService: IHoverService, _accessibilityService: IAccessibilityService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _commandService: ICommandService, _configurationService: IConfigurationService);
     /**
      * Saves the current question's answer to the answers map.
      */
@@ -131,6 +134,7 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
     hasFocus(): boolean;
     navigateToPreviousQuestion(): boolean;
     navigateToNextQuestion(): boolean;
+    focusTerminal(): boolean;
     private renderCurrentQuestion;
     /**
      * Renders or updates the persistent footer with nav arrows, step indicator, and submit button.

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuestionCarouselPart.js

@@ -27,8 +27,10 @@ import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/h
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 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 '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { RunInTerminalTool } from '../../../../terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.js';
 import * as chatQuestionCarousel from './media/chatQuestionCarousel.css';
@@ -46,7 +48,8 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         _accessibilityService,
         _contextKeyService,
         _keybindingService,
-        _commandService
+        _commandService,
+        _configurationService
     ) {
         super();
         this.carousel = carousel;
@@ -57,6 +60,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._contextKeyService = _contextKeyService;
         this._keybindingService = _keybindingService;
         this._commandService = _commandService;
+        this._configurationService = _configurationService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._currentIndex = 0;
@@ -73,19 +77,25 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this.domNode = $(".chat-question-carousel-container");
         this.domNode.id = generateUuid();
         this._inChatQuestionCarouselContextKey = ChatContextKeys.inChatQuestionCarousel.bindTo(this._contextKeyService);
+        this._chatQuestionCarouselHasTerminalContextKey = ChatContextKeys.chatQuestionCarouselHasTerminal.bindTo(this._contextKeyService);
         const focusTracker = this._register(trackFocus(this.domNode));
-        this._register(
-            focusTracker.onDidFocus(() => this._inChatQuestionCarouselContextKey.set(true))
-        );
-        this._register(
-            focusTracker.onDidBlur(() => this._inChatQuestionCarouselContextKey.set(false))
-        );
+        this._register(focusTracker.onDidFocus(() => {
+            this._inChatQuestionCarouselContextKey.set(true);
+            this._chatQuestionCarouselHasTerminalContextKey.set(!!this.carousel.terminalId);
+        }));
+        this._register(focusTracker.onDidBlur(() => {
+            this._inChatQuestionCarouselContextKey.set(false);
+            this._chatQuestionCarouselHasTerminalContextKey.reset();
+        }));
         this._register({
-            dispose: () => this._inChatQuestionCarouselContextKey.reset()
+            dispose: () => {
+                this._inChatQuestionCarouselContextKey.reset();
+                this._chatQuestionCarouselHasTerminalContextKey.reset();
+            }
         });
         this.domNode.tabIndex = 0;
         this.domNode.setAttribute("role", "region");
-        this.domNode.setAttribute("aria-roledescription", ( localize(6873, "chat question")));
+        this.domNode.setAttribute("aria-roledescription", ( localize(7135, "chat question")));
         this._updateAriaLabel();
         if (carousel instanceof ChatQuestionCarouselData) {
             if (typeof carousel.draftCurrentIndex === "number") {
@@ -117,7 +127,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._questionContainer = $(".chat-question-carousel-content");
         this.domNode.append(this._questionContainer);
         this._headerActionsContainer = $(".chat-question-header-actions");
-        const collapseToggleTitle = ( localize(6874, "Collapse Questions"));
+        const collapseToggleTitle = ( localize(7136, "Collapse Questions"));
         const collapseButton = interactiveStore.add(( new Button(this._headerActionsContainer, {
             ...defaultButtonStyles,
             secondary: true,
@@ -128,7 +138,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._collapseButton = collapseButton;
         if (carousel.allowSkip) {
             this._closeButtonContainer = $(".chat-question-close-container");
-            const skipAllTitle = ( localize(6875, "Skip all questions"));
+            const skipAllTitle = ( localize(7137, "Skip all questions"));
             const skipAllButton = interactiveStore.add(( new Button(this._closeButtonContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -144,7 +154,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         }
         if (carousel.terminalId) {
             this._focusTerminalButtonContainer = $(".chat-question-focus-terminal-container");
-            const focusTerminalTitle = ( localize(6876, "Focus Terminal"));
+            const focusTerminalTitle = ( localize(7138, "Focus Terminal"));
+            const kbLabel = this._keybindingService.lookupKeybinding("workbench.action.chat.focusQuestionCarouselTerminal")?.getLabel();
+            const focusTerminalAriaLabel = kbLabel ? ( localize(7139, "Focus Terminal ({0})", kbLabel)) : focusTerminalTitle;
             const focusTerminalButton = interactiveStore.add(( new Button(this._focusTerminalButtonContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -152,7 +164,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             })));
             focusTerminalButton.label = `$(${Codicon.terminal.id})`;
             focusTerminalButton.element.classList.add("chat-question-focus-terminal");
-            focusTerminalButton.element.setAttribute("aria-label", focusTerminalTitle);
+            focusTerminalButton.element.setAttribute("aria-label", focusTerminalAriaLabel);
             interactiveStore.add(this._hoverService.setupDelayedHover(focusTerminalButton.element, {
                 content: focusTerminalTitle
             }));
@@ -244,7 +256,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this.domNode.classList.toggle("chat-question-carousel-collapsed", this._isCollapsed);
         if (this._collapseButton) {
             const collapsed = this._isCollapsed;
-            const buttonTitle = collapsed ? ( localize(6877, "Expand Questions")) : ( localize(6874, "Collapse Questions"));
+            const buttonTitle = collapsed ? ( localize(7140, "Expand Questions")) : ( localize(7136, "Collapse Questions"));
             const contentId = this.domNode.id;
             this._collapseButton.label = collapsed ? `$(${Codicon.chevronUp.id})` : `$(${Codicon.chevronDown.id})`;
             this._collapseButton.element.setAttribute("aria-label", buttonTitle);
@@ -299,7 +311,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             const messageContent = this.getQuestionText(questionText);
             const questionCount = this.carousel.questions.length;
             const alertMessage = questionCount === 1 ? messageContent : ( localize(
-                6878,
+                7141,
                 "Question {0} of {1}: {2}",
                 this._currentIndex + 1,
                 questionCount,
@@ -447,23 +459,38 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     _updateAriaLabel() {
         const question = this.carousel.questions[this._currentIndex];
         if (!question) {
-            this.domNode.setAttribute("aria-label", ( localize(6879, "Chat question")));
+            this.domNode.setAttribute("aria-label", ( localize(7142, "Chat question")));
             return;
         }
         const questionText = question.message ?? question.title;
         const messageContent = this.getQuestionText(questionText);
         const questionCount = this.carousel.questions.length;
+        let label;
         if (questionCount === 1) {
-            this.domNode.setAttribute("aria-label", ( localize(6880, "Chat question: {0}", messageContent)));
+            label = ( localize(7143, "Chat question: {0}", messageContent));
         } else {
-            this.domNode.setAttribute("aria-label", ( localize(
-                6881,
+            label = ( localize(
+                7144,
                 "Chat question {0} of {1}: {2}",
                 this._currentIndex + 1,
                 questionCount,
                 messageContent
-            )));
+            ));
         }
+        const verbose = this._configurationService.getValue(AccessibilityVerbositySettingId.ChatQuestionCarousel);
+        if (verbose && this.carousel.terminalId) {
+            const kbLabel = this._keybindingService.lookupKeybinding("workbench.action.chat.focusQuestionCarouselTerminal")?.getLabel();
+            if (kbLabel) {
+                label = ( localize(7145, "{0} Use {1} to focus the terminal.", label, kbLabel));
+            } else {
+                label = ( localize(
+                    7146,
+                    "{0} Use the Focus Terminal from Question Carousel command to focus the terminal.",
+                    label
+                ));
+            }
+        }
+        this.domNode.setAttribute("aria-label", label);
     }
     focus() {
         this.domNode.focus();
@@ -485,6 +512,13 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this.navigate(1);
         return true;
     }
+    focusTerminal() {
+        if (!this.carousel.terminalId) {
+            return false;
+        }
+        this._focusTerminal();
+        return true;
+    }
     renderCurrentQuestion(focusContainerForScreenReader = false) {
         if (!this._questionContainer) {
             return;
@@ -585,7 +619,10 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 this.layoutInputScrollable(inputScrollable);
             });
         };
-        const inputResizeObserver = questionRenderStore.add(new DisposableResizeObserver(() => scheduleLayoutInputScrollable()));
+        const inputResizeObserver = questionRenderStore.add(new DisposableResizeObserver(
+            "ChatQuestionCarouselPart.inputScrollable",
+            () => scheduleLayoutInputScrollable()
+        ));
         questionRenderStore.add(inputResizeObserver.observe(inputScrollableNode));
         questionRenderStore.add(inputResizeObserver.observe(inputContainer));
         questionRenderStore.add(addDisposableListener(
@@ -621,9 +658,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             this._footerRow = $(".chat-question-footer-row");
             const leftControls = $(".chat-question-footer-left.chat-question-carousel-nav");
             leftControls.setAttribute("role", "navigation");
-            leftControls.setAttribute("aria-label", ( localize(6882, "Question navigation")));
+            leftControls.setAttribute("aria-label", ( localize(7147, "Question navigation")));
             const arrowsContainer = $(".chat-question-nav-arrows");
-            const previousLabel = this.getLabelWithKeybinding(( localize(6883, "Previous")), PREVIOUS_QUESTION_ACTION_ID);
+            const previousLabel = this.getLabelWithKeybinding(( localize(7148, "Previous")), PREVIOUS_QUESTION_ACTION_ID);
             const prevButton = interactiveStore.add(( new Button(arrowsContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -637,7 +674,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             }));
             interactiveStore.add(prevButton.onDidClick(() => this.navigate(-1)));
             this._prevButton = prevButton;
-            const nextLabel = this.getLabelWithKeybinding(( localize(6884, "Next")), NEXT_QUESTION_ACTION_ID);
+            const nextLabel = this.getLabelWithKeybinding(( localize(7149, "Next")), NEXT_QUESTION_ACTION_ID);
             const nextButton = interactiveStore.add(( new Button(arrowsContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -657,14 +694,14 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             this._footerRow.appendChild(leftControls);
             const rightControls = $(".chat-question-footer-right");
             const hint = $("span.chat-question-submit-hint");
-            hint.textContent = isMacintosh ? ( localize(6885, "⌘⏎ to submit")) : ( localize(6886, "Ctrl+Enter to submit"));
+            hint.textContent = isMacintosh ? ( localize(7150, "⌘⏎ to submit")) : ( localize(7151, "Ctrl+Enter to submit"));
             rightControls.appendChild(hint);
             this._submitHint = hint;
             const submitButton = interactiveStore.add(( new Button(rightControls, {
                 ...defaultButtonStyles
             })));
             submitButton.element.classList.add("chat-question-submit-button");
-            submitButton.label = ( localize(6887, "Submit"));
+            submitButton.label = ( localize(7152, "Submit"));
             interactiveStore.add(submitButton.onDidClick(() => this.submit()));
             this._submitButton = submitButton;
             this._footerRow.appendChild(rightControls);
@@ -685,7 +722,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             this._nextButton.enabled = canAdvance && (!question?.required || hasAnswer) && !hasValidationError;
         }
         if (this._stepIndicator) {
-            this._stepIndicator.textContent = ( localize(6888, "{0}/{1}", this._currentIndex + 1, this.carousel.questions.length));
+            this._stepIndicator.textContent = ( localize(7153, "{0}/{1}", this._currentIndex + 1, this.carousel.questions.length));
         }
         if (this._submitButton) {
             const isLastQuestion = this._currentIndex === this.carousel.questions.length - 1;
@@ -704,18 +741,18 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             this._footerRow = $(".chat-question-footer-row");
             const leftControls = $(".chat-question-footer-left.chat-question-carousel-nav");
             leftControls.setAttribute("role", "navigation");
-            leftControls.setAttribute("aria-label", ( localize(6882, "Question navigation")));
+            leftControls.setAttribute("aria-label", ( localize(7147, "Question navigation")));
             this._footerRow.appendChild(leftControls);
             const rightControls = $(".chat-question-footer-right");
             const hint = $("span.chat-question-submit-hint");
-            hint.textContent = isMacintosh ? ( localize(6885, "⌘⏎ to submit")) : ( localize(6886, "Ctrl+Enter to submit"));
+            hint.textContent = isMacintosh ? ( localize(7150, "⌘⏎ to submit")) : ( localize(7151, "Ctrl+Enter to submit"));
             rightControls.appendChild(hint);
             this._submitHint = hint;
             const submitButton = interactiveStore.add(( new Button(rightControls, {
                 ...defaultButtonStyles
             })));
             submitButton.element.classList.add("chat-question-submit-button");
-            submitButton.label = ( localize(6887, "Submit"));
+            submitButton.label = ( localize(7152, "Submit"));
             interactiveStore.add(submitButton.onDidClick(() => this.submit()));
             this._submitButton = submitButton;
             this._footerRow.appendChild(rightControls);
@@ -724,7 +761,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     getLabelWithKeybinding(label, actionId) {
         const keybindingLabel = this._keybindingService.lookupKeybinding(actionId, this._contextKeyService)?.getLabel();
-        return keybindingLabel ? ( localize(6889, "{0} ({1})", label, keybindingLabel)) : label;
+        return keybindingLabel ? ( localize(7154, "{0} ({1})", label, keybindingLabel)) : label;
     }
     renderInput(container, question) {
         switch (question.type) {
@@ -753,7 +790,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     renderTextInput(container, question) {
         const inputBox = this._inputBoxes.add(( new InputBox(container, undefined, {
-            placeholder: ( localize(6890, "Enter your answer")),
+            placeholder: ( localize(7155, "Enter your answer")),
             inputBoxStyles: defaultInputBoxStyles,
             validationOptions: question.validation ? {
                 validation: value => {
@@ -844,7 +881,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             const listItem = $(".chat-question-list-item");
             listItem.setAttribute("role", "option");
             listItem.setAttribute("aria-selected", String(isSelected));
-            listItem.setAttribute("aria-label", ( localize(6891, "Option {0}: {1}", index + 1, option.label)));
+            listItem.setAttribute("aria-label", ( localize(7156, "Option {0}: {1}", index + 1, option.label)));
             listItem.id = `option-${question.id}-${index}`;
             listItem.tabIndex = -1;
             const number = $(".chat-question-list-number");
@@ -910,7 +947,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             freeformNumber.textContent = `${orderedOptions.length + 1}`;
             freeformContainer.appendChild(freeformNumber);
             freeformTextarea = $("textarea.chat-question-freeform-textarea");
-            freeformTextarea.placeholder = ( localize(6892, "Enter custom answer"));
+            freeformTextarea.placeholder = ( localize(7157, "Enter custom answer"));
             freeformTextarea.rows = 1;
             if (previousFreeform !== undefined) {
                 freeformTextarea.value = previousFreeform;
@@ -1022,7 +1059,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             const listItem = $(".chat-question-list-item.multi-select");
             listItem.setAttribute("role", "option");
             listItem.setAttribute("aria-selected", String(isChecked));
-            listItem.setAttribute("aria-label", ( localize(6891, "Option {0}: {1}", index + 1, option.label)));
+            listItem.setAttribute("aria-label", ( localize(7156, "Option {0}: {1}", index + 1, option.label)));
             listItem.id = `option-${question.id}-${index}`;
             listItem.tabIndex = -1;
             const number = $(".chat-question-list-number");
@@ -1087,7 +1124,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             freeformNumber.textContent = `${orderedOptions.length + 1}`;
             freeformContainer.appendChild(freeformNumber);
             freeformTextarea = $("textarea.chat-question-freeform-textarea");
-            freeformTextarea.placeholder = ( localize(6892, "Enter custom answer"));
+            freeformTextarea.placeholder = ( localize(7157, "Enter custom answer"));
             freeformTextarea.rows = 1;
             if (previousFreeform !== undefined) {
                 freeformTextarea.value = previousFreeform;
@@ -1255,7 +1292,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         const skippedContainer = $(".chat-question-carousel-summary");
         const skippedMessage = $(".chat-question-summary-skipped");
         const isDismissedByTerminal = this.carousel instanceof ChatQuestionCarouselData && this.carousel.dismissedByTerminalInput;
-        skippedMessage.textContent = isDismissedByTerminal ? ( localize(6893, "Deferring to user's input in the terminal")) : ( localize(6894, "Skipped"));
+        skippedMessage.textContent = isDismissedByTerminal ? ( localize(7158, "Deferring to user's input in the terminal")) : ( localize(7159, "Skipped"));
         skippedContainer.appendChild(skippedMessage);
         this.domNode.appendChild(skippedContainer);
     }
@@ -1274,16 +1311,16 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             const questionText = question.message ?? question.title;
             let labelText = typeof questionText === "string" ? questionText : questionText.value;
             labelText = labelText.replace(/[:\s]+$/, "");
-            questionRow.textContent = ( localize(6895, "Q: {0}", labelText));
+            questionRow.textContent = ( localize(7160, "Q: {0}", labelText));
             summaryItem.appendChild(questionRow);
             if (answer !== undefined) {
                 const formattedAnswer = this.formatAnswerForSummary(question, answer);
                 const answerRow = $("div.chat-question-summary-answer-title");
-                answerRow.textContent = ( localize(6896, "A: {0}", formattedAnswer));
+                answerRow.textContent = ( localize(7161, "A: {0}", formattedAnswer));
                 summaryItem.appendChild(answerRow);
             } else {
                 const unanswered = $("div.chat-question-summary-unanswered");
-                unanswered.textContent = ( localize(6897, "Not answered yet"));
+                unanswered.textContent = ( localize(7162, "Not answered yet"));
                 summaryItem.appendChild(unanswered);
             }
             summaryContainer.appendChild(summaryItem);
@@ -1323,7 +1360,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                     if (freeformValue) {
                         labels.push(freeformValue);
                     }
-                    return labels.join(( localize(6898, ", ")));
+                    return labels.join(( localize(7163, ", ")));
                 }
                 return String(answer);
             }
@@ -1342,7 +1379,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         }
         const answer = this._answers.get(question.id);
         if (question.required && (answer === undefined || answer === "")) {
-            this.showValidationError(( localize(6899, "This field is required")));
+            this.showValidationError(( localize(7164, "This field is required")));
             return false;
         }
         if (question.type === "text" && question.validation && typeof answer === "string" && answer !== "") {
@@ -1367,7 +1404,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 this._currentIndex = i;
                 this.persistDraftState();
                 this.renderCurrentQuestion(true);
-                this.showValidationError(( localize(6899, "This field is required")));
+                this.showValidationError(( localize(7164, "This field is required")));
                 return false;
             }
         }
@@ -1375,34 +1412,34 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     getValidationError(value, validation) {
         if (validation.minLength !== undefined && value.length < validation.minLength) {
-            return localize(6900, "Minimum length is {0}", validation.minLength);
+            return localize(7165, "Minimum length is {0}", validation.minLength);
         }
         if (validation.maxLength !== undefined && value.length > validation.maxLength) {
-            return localize(6901, "Maximum length is {0}", validation.maxLength);
+            return localize(7166, "Maximum length is {0}", validation.maxLength);
         }
         if (validation.format) {
             switch (validation.format) {
             case "email":
                 if (!value.includes("@")) {
-                    return localize(6902, "Please enter a valid email address");
+                    return localize(7167, "Please enter a valid email address");
                 }
                 break;
             case "uri":
                 if (!URL.canParse(value)) {
-                    return localize(6903, "Please enter a valid URI");
+                    return localize(7168, "Please enter a valid URI");
                 }
                 break;
             case "date":
                 {
                     const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
                     if (!dateRegex.test(value) || isNaN(( new Date(value)).getTime())) {
-                        return localize(6904, "Please enter a valid date (YYYY-MM-DD)");
+                        return localize(7169, "Please enter a valid date (YYYY-MM-DD)");
                     }
                     break;
                 }
             case "date-time":
                 if (isNaN(( new Date(value)).getTime())) {
-                    return localize(6905, "Please enter a valid date-time");
+                    return localize(7170, "Please enter a valid date-time");
                 }
                 break;
             }
@@ -1410,16 +1447,16 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         if (validation.isInteger !== undefined || validation.minimum !== undefined || validation.maximum !== undefined) {
             const num = Number(value);
             if (isNaN(num)) {
-                return localize(6906, "Please enter a valid number");
+                return localize(7171, "Please enter a valid number");
             }
             if (validation.isInteger && !Number.isInteger(num)) {
-                return localize(6907, "Please enter a valid integer");
+                return localize(7172, "Please enter a valid integer");
             }
             if (validation.minimum !== undefined && num < validation.minimum) {
-                return localize(6908, "Minimum value is {0}", validation.minimum);
+                return localize(7173, "Minimum value is {0}", validation.minimum);
             }
             if (validation.maximum !== undefined && num > validation.maximum) {
-                return localize(6909, "Maximum value is {0}", validation.maximum);
+                return localize(7174, "Maximum value is {0}", validation.maximum);
             }
         }
         return undefined;
@@ -1454,6 +1491,6 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         super.dispose();
     }
 };
-ChatQuestionCarouselPart = ( __decorate([( __param(3, IMarkdownRendererService)), ( __param(4, IHoverService)), ( __param(5, IAccessibilityService)), ( __param(6, IContextKeyService)), ( __param(7, IKeybindingService)), ( __param(8, ICommandService))], ChatQuestionCarouselPart));
+ChatQuestionCarouselPart = ( __decorate([( __param(3, IMarkdownRendererService)), ( __param(4, IHoverService)), ( __param(5, IAccessibilityService)), ( __param(6, IContextKeyService)), ( __param(7, IKeybindingService)), ( __param(8, ICommandService)), ( __param(9, IConfigurationService))], ChatQuestionCarouselPart));
 
 export { ChatQuestionCarouselPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatQuotaExceededPart.js

@@ -50,14 +50,16 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
         const markdownContent = this._register(renderer.render(( new MarkdownString(errorDetails.message))));
         append(messageContainer, markdownContent.element);
         let primaryButtonLabel;
+        const isUsageBasedBilling = chatEntitlementService.quotas.usageBasedBilling === true;
         switch (chatEntitlementService.entitlement) {
         case ChatEntitlement.EDU:
         case ChatEntitlement.Pro:
         case ChatEntitlement.ProPlus:
-            primaryButtonLabel = ( localize(6910, "Manage Paid Premium Requests"));
+        case ChatEntitlement.Max:
+            primaryButtonLabel = isUsageBasedBilling ? ( localize(7175, "Configure Additional Spend")) : ( localize(7176, "Configure Budget"));
             break;
         case ChatEntitlement.Free:
-            primaryButtonLabel = ( localize(6911, "Upgrade to GitHub Copilot Pro"));
+            primaryButtonLabel = ( localize(7177, "Upgrade to GitHub Copilot Pro"));
             break;
         }
         let hasAddedWaitWarning = false;
@@ -66,7 +68,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 return;
             }
             hasAddedWaitWarning = true;
-            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(6912, "Changes may take a few minutes to take effect."))));
+            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(7178, "Changes may take a few minutes to take effect."))));
         };
         let hasAddedRetryButton = false;
         const addRetryButtonIfNeeded = () => {
@@ -79,7 +81,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 buttonForeground: asCssVariable(textLinkForeground)
             })));
             retryButton.element.classList.add("chat-quota-error-secondary-button");
-            retryButton.label = ( localize(6913, "Click to Retry"));
+            retryButton.label = ( localize(7179, "Click to Retry"));
             this._register(retryButton.onDidClick(() => {
                 const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
                 if (!widget) {
@@ -98,7 +100,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
             primaryButton.label = primaryButtonLabel;
             primaryButton.element.classList.add("chat-quota-error-button");
             this._register(primaryButton.onDidClick(async () => {
-                const commandId = chatEntitlementService.entitlement === ChatEntitlement.Free ? "workbench.action.chat.upgradePlan" : "workbench.action.chat.manageOverages";
+                const commandId = chatEntitlementService.entitlement === ChatEntitlement.Free ? "workbench.action.chat.upgradePlan" : "workbench.action.chat.manageAdditionalSpend";
                 telemetryService.publicLog2("workbenchActionExecuted", {
                     id: commandId,
                     from: "chat-response"