@codingame/monaco-vscode-katex-common 33.0.9 → 34.0.1

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

@@ -31,8 +31,7 @@ import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vs
 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 { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import * as chatQuestionCarousel from './media/chatQuestionCarousel.css';
 
 registerCss(chatQuestionCarousel);
@@ -49,7 +48,8 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         _contextKeyService,
         _keybindingService,
         _commandService,
-        _configurationService
+        _configurationService,
+        _terminalChatService
     ) {
         super();
         this.carousel = carousel;
@@ -61,6 +61,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._keybindingService = _keybindingService;
         this._commandService = _commandService;
         this._configurationService = _configurationService;
+        this._terminalChatService = _terminalChatService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._currentIndex = 0;
@@ -95,7 +96,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         });
         this.domNode.tabIndex = 0;
         this.domNode.setAttribute("role", "region");
-        this.domNode.setAttribute("aria-roledescription", ( localize(7221, "chat question")));
+        this.domNode.setAttribute("aria-roledescription", ( localize(7350, "chat question")));
         this._updateAriaLabel();
         if (carousel instanceof ChatQuestionCarouselData) {
             if (typeof carousel.draftCurrentIndex === "number") {
@@ -127,7 +128,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(7222, "Collapse Questions"));
+        const collapseToggleTitle = ( localize(7351, "Collapse Questions"));
         const collapseButton = interactiveStore.add(( new Button(this._headerActionsContainer, {
             ...defaultButtonStyles,
             secondary: true,
@@ -138,7 +139,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._collapseButton = collapseButton;
         if (carousel.allowSkip) {
             this._closeButtonContainer = $(".chat-question-close-container");
-            const skipAllTitle = ( localize(7223, "Skip all questions"));
+            const skipAllTitle = ( localize(7352, "Skip all questions"));
             const skipAllButton = interactiveStore.add(( new Button(this._closeButtonContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -154,9 +155,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         }
         if (carousel.terminalId) {
             this._focusTerminalButtonContainer = $(".chat-question-focus-terminal-container");
-            const focusTerminalTitle = ( localize(7224, "Focus Terminal"));
+            const focusTerminalTitle = ( localize(7353, "Focus Terminal"));
             const kbLabel = this._keybindingService.lookupKeybinding("workbench.action.chat.focusQuestionCarouselTerminal")?.getLabel();
-            const focusTerminalAriaLabel = kbLabel ? ( localize(7225, "Focus Terminal ({0})", kbLabel)) : focusTerminalTitle;
+            const focusTerminalAriaLabel = kbLabel ? ( localize(7354, "Focus Terminal ({0})", kbLabel)) : focusTerminalTitle;
             const focusTerminalButton = interactiveStore.add(( new Button(this._focusTerminalButtonContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -169,9 +170,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 content: focusTerminalTitle
             }));
             interactiveStore.add(focusTerminalButton.onDidClick(() => this._focusTerminal()));
-            const execution = RunInTerminalTool.getExecution(carousel.terminalId);
-            if (execution) {
-                interactiveStore.add(execution.instance.onDidInputData(() => {
+            const terminalInstance = this._terminalChatService.getTerminalInstanceByExecutionId(carousel.terminalId);
+            if (terminalInstance) {
+                interactiveStore.add(terminalInstance.onDidInputData(() => {
                     if (!this._isSkipped) {
                         if (carousel instanceof ChatQuestionCarouselData) {
                             carousel.dismissedByTerminalInput = true;
@@ -256,7 +257,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(7226, "Expand Questions")) : ( localize(7222, "Collapse Questions"));
+            const buttonTitle = collapsed ? ( localize(7355, "Expand Questions")) : ( localize(7351, "Collapse Questions"));
             const contentId = this.domNode.id;
             this._collapseButton.label = collapsed ? `$(${Codicon.chevronUp.id})` : `$(${Codicon.chevronDown.id})`;
             this._collapseButton.element.setAttribute("aria-label", buttonTitle);
@@ -311,7 +312,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             const messageContent = this.getQuestionText(questionText);
             const questionCount = this.carousel.questions.length;
             const alertMessage = questionCount === 1 ? messageContent : ( localize(
-                7227,
+                7356,
                 "Question {0} of {1}: {2}",
                 this._currentIndex + 1,
                 questionCount,
@@ -459,7 +460,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     _updateAriaLabel() {
         const question = this.carousel.questions[this._currentIndex];
         if (!question) {
-            this.domNode.setAttribute("aria-label", ( localize(7228, "Chat question")));
+            this.domNode.setAttribute("aria-label", ( localize(7357, "Chat question")));
             return;
         }
         const questionText = question.message ?? question.title;
@@ -467,10 +468,10 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         const questionCount = this.carousel.questions.length;
         let label;
         if (questionCount === 1) {
-            label = ( localize(7229, "Chat question: {0}", messageContent));
+            label = ( localize(7358, "Chat question: {0}", messageContent));
         } else {
             label = ( localize(
-                7230,
+                7359,
                 "Chat question {0} of {1}: {2}",
                 this._currentIndex + 1,
                 questionCount,
@@ -481,10 +482,10 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         if (verbose && this.carousel.terminalId) {
             const kbLabel = this._keybindingService.lookupKeybinding("workbench.action.chat.focusQuestionCarouselTerminal")?.getLabel();
             if (kbLabel) {
-                label = ( localize(7231, "{0} Use {1} to focus the terminal.", label, kbLabel));
+                label = ( localize(7360, "{0} Use {1} to focus the terminal.", label, kbLabel));
             } else {
                 label = ( localize(
-                    7232,
+                    7361,
                     "{0} Use the Focus Terminal from Question Carousel command to focus the terminal.",
                     label
                 ));
@@ -658,9 +659,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(7233, "Question navigation")));
+            leftControls.setAttribute("aria-label", ( localize(7362, "Question navigation")));
             const arrowsContainer = $(".chat-question-nav-arrows");
-            const previousLabel = this.getLabelWithKeybinding(( localize(7234, "Previous")), PREVIOUS_QUESTION_ACTION_ID);
+            const previousLabel = this.getLabelWithKeybinding(( localize(7363, "Previous")), PREVIOUS_QUESTION_ACTION_ID);
             const prevButton = interactiveStore.add(( new Button(arrowsContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -674,7 +675,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             }));
             interactiveStore.add(prevButton.onDidClick(() => this.navigate(-1)));
             this._prevButton = prevButton;
-            const nextLabel = this.getLabelWithKeybinding(( localize(7235, "Next")), NEXT_QUESTION_ACTION_ID);
+            const nextLabel = this.getLabelWithKeybinding(( localize(7364, "Next")), NEXT_QUESTION_ACTION_ID);
             const nextButton = interactiveStore.add(( new Button(arrowsContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -694,14 +695,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(7236, "⌘⏎ to submit")) : ( localize(7237, "Ctrl+Enter to submit"));
+            hint.textContent = isMacintosh ? ( localize(7365, "⌘⏎ to submit")) : ( localize(7366, "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(7238, "Submit"));
+            submitButton.label = ( localize(7367, "Submit"));
             interactiveStore.add(submitButton.onDidClick(() => this.submit()));
             this._submitButton = submitButton;
             this._footerRow.appendChild(rightControls);
@@ -722,7 +723,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             this._nextButton.enabled = canAdvance && (!question?.required || hasAnswer) && !hasValidationError;
         }
         if (this._stepIndicator) {
-            this._stepIndicator.textContent = ( localize(7239, "{0}/{1}", this._currentIndex + 1, this.carousel.questions.length));
+            this._stepIndicator.textContent = ( localize(7368, "{0}/{1}", this._currentIndex + 1, this.carousel.questions.length));
         }
         if (this._submitButton) {
             const isLastQuestion = this._currentIndex === this.carousel.questions.length - 1;
@@ -741,18 +742,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(7233, "Question navigation")));
+            leftControls.setAttribute("aria-label", ( localize(7362, "Question navigation")));
             this._footerRow.appendChild(leftControls);
             const rightControls = $(".chat-question-footer-right");
             const hint = $("span.chat-question-submit-hint");
-            hint.textContent = isMacintosh ? ( localize(7236, "⌘⏎ to submit")) : ( localize(7237, "Ctrl+Enter to submit"));
+            hint.textContent = isMacintosh ? ( localize(7365, "⌘⏎ to submit")) : ( localize(7366, "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(7238, "Submit"));
+            submitButton.label = ( localize(7367, "Submit"));
             interactiveStore.add(submitButton.onDidClick(() => this.submit()));
             this._submitButton = submitButton;
             this._footerRow.appendChild(rightControls);
@@ -761,7 +762,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     getLabelWithKeybinding(label, actionId) {
         const keybindingLabel = this._keybindingService.lookupKeybinding(actionId, this._contextKeyService)?.getLabel();
-        return keybindingLabel ? ( localize(7240, "{0} ({1})", label, keybindingLabel)) : label;
+        return keybindingLabel ? ( localize(7369, "{0} ({1})", label, keybindingLabel)) : label;
     }
     renderInput(container, question) {
         switch (question.type) {
@@ -790,7 +791,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     renderTextInput(container, question) {
         const inputBox = this._inputBoxes.add(( new InputBox(container, undefined, {
-            placeholder: ( localize(7241, "Enter your answer")),
+            placeholder: ( localize(7370, "Enter your answer")),
             inputBoxStyles: defaultInputBoxStyles,
             validationOptions: question.validation ? {
                 validation: value => {
@@ -881,7 +882,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(7242, "Option {0}: {1}", index + 1, option.label)));
+            listItem.setAttribute("aria-label", ( localize(7371, "Option {0}: {1}", index + 1, option.label)));
             listItem.id = `option-${question.id}-${index}`;
             listItem.tabIndex = -1;
             const number = $(".chat-question-list-number");
@@ -947,7 +948,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             freeformNumber.textContent = `${orderedOptions.length + 1}`;
             freeformContainer.appendChild(freeformNumber);
             freeformTextarea = $("textarea.chat-question-freeform-textarea");
-            freeformTextarea.placeholder = ( localize(7243, "Enter custom answer"));
+            freeformTextarea.placeholder = ( localize(7372, "Enter custom answer"));
             freeformTextarea.rows = 1;
             if (previousFreeform !== undefined) {
                 freeformTextarea.value = previousFreeform;
@@ -1059,7 +1060,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(7242, "Option {0}: {1}", index + 1, option.label)));
+            listItem.setAttribute("aria-label", ( localize(7371, "Option {0}: {1}", index + 1, option.label)));
             listItem.id = `option-${question.id}-${index}`;
             listItem.tabIndex = -1;
             const number = $(".chat-question-list-number");
@@ -1124,7 +1125,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             freeformNumber.textContent = `${orderedOptions.length + 1}`;
             freeformContainer.appendChild(freeformNumber);
             freeformTextarea = $("textarea.chat-question-freeform-textarea");
-            freeformTextarea.placeholder = ( localize(7243, "Enter custom answer"));
+            freeformTextarea.placeholder = ( localize(7372, "Enter custom answer"));
             freeformTextarea.rows = 1;
             if (previousFreeform !== undefined) {
                 freeformTextarea.value = previousFreeform;
@@ -1292,7 +1293,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(7244, "Deferring to user's input in the terminal")) : ( localize(7245, "Skipped"));
+        skippedMessage.textContent = isDismissedByTerminal ? ( localize(7373, "Deferring to user's input in the terminal")) : ( localize(7374, "Skipped"));
         skippedContainer.appendChild(skippedMessage);
         this.domNode.appendChild(skippedContainer);
     }
@@ -1311,16 +1312,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(7246, "Q: {0}", labelText));
+            questionRow.textContent = ( localize(7375, "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(7247, "A: {0}", formattedAnswer));
+                answerRow.textContent = ( localize(7376, "A: {0}", formattedAnswer));
                 summaryItem.appendChild(answerRow);
             } else {
                 const unanswered = $("div.chat-question-summary-unanswered");
-                unanswered.textContent = ( localize(7248, "Not answered yet"));
+                unanswered.textContent = ( localize(7377, "Not answered yet"));
                 summaryItem.appendChild(unanswered);
             }
             summaryContainer.appendChild(summaryItem);
@@ -1360,7 +1361,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                     if (freeformValue) {
                         labels.push(freeformValue);
                     }
-                    return labels.join(( localize(7249, ", ")));
+                    return labels.join(( localize(7378, ", ")));
                 }
                 return String(answer);
             }
@@ -1379,7 +1380,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         }
         const answer = this._answers.get(question.id);
         if (question.required && (answer === undefined || answer === "")) {
-            this.showValidationError(( localize(7250, "This field is required")));
+            this.showValidationError(( localize(7379, "This field is required")));
             return false;
         }
         if (question.type === "text" && question.validation && typeof answer === "string" && answer !== "") {
@@ -1404,7 +1405,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 this._currentIndex = i;
                 this.persistDraftState();
                 this.renderCurrentQuestion(true);
-                this.showValidationError(( localize(7250, "This field is required")));
+                this.showValidationError(( localize(7379, "This field is required")));
                 return false;
             }
         }
@@ -1412,34 +1413,34 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     getValidationError(value, validation) {
         if (validation.minLength !== undefined && value.length < validation.minLength) {
-            return localize(7251, "Minimum length is {0}", validation.minLength);
+            return localize(7380, "Minimum length is {0}", validation.minLength);
         }
         if (validation.maxLength !== undefined && value.length > validation.maxLength) {
-            return localize(7252, "Maximum length is {0}", validation.maxLength);
+            return localize(7381, "Maximum length is {0}", validation.maxLength);
         }
         if (validation.format) {
             switch (validation.format) {
             case "email":
                 if (!value.includes("@")) {
-                    return localize(7253, "Please enter a valid email address");
+                    return localize(7382, "Please enter a valid email address");
                 }
                 break;
             case "uri":
                 if (!URL.canParse(value)) {
-                    return localize(7254, "Please enter a valid URI");
+                    return localize(7383, "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(7255, "Please enter a valid date (YYYY-MM-DD)");
+                        return localize(7384, "Please enter a valid date (YYYY-MM-DD)");
                     }
                     break;
                 }
             case "date-time":
                 if (isNaN(( new Date(value)).getTime())) {
-                    return localize(7256, "Please enter a valid date-time");
+                    return localize(7385, "Please enter a valid date-time");
                 }
                 break;
             }
@@ -1447,16 +1448,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(7257, "Please enter a valid number");
+                return localize(7386, "Please enter a valid number");
             }
             if (validation.isInteger && !Number.isInteger(num)) {
-                return localize(7258, "Please enter a valid integer");
+                return localize(7387, "Please enter a valid integer");
             }
             if (validation.minimum !== undefined && num < validation.minimum) {
-                return localize(7259, "Minimum value is {0}", validation.minimum);
+                return localize(7388, "Minimum value is {0}", validation.minimum);
             }
             if (validation.maximum !== undefined && num > validation.maximum) {
-                return localize(7260, "Maximum value is {0}", validation.maximum);
+                return localize(7389, "Maximum value is {0}", validation.maximum);
             }
         }
         return undefined;
@@ -1491,6 +1492,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)), ( __param(9, IConfigurationService))], ChatQuestionCarouselPart));
+ChatQuestionCarouselPart = ( __decorate([( __param(3, IMarkdownRendererService)), ( __param(4, IHoverService)), ( __param(5, IAccessibilityService)), ( __param(6, IContextKeyService)), ( __param(7, IKeybindingService)), ( __param(8, ICommandService)), ( __param(9, IConfigurationService)), ( __param(10, ITerminalChatService))], ChatQuestionCarouselPart));
 
 export { ChatQuestionCarouselPart };

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

@@ -49,18 +49,22 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
         const messageContainer = append(this.domNode, $(".chat-quota-error-message"));
         const markdownContent = this._register(renderer.render(( new MarkdownString(errorDetails.message))));
         append(messageContainer, markdownContent.element);
+        const isAdditionalSpendLimitReached = errorDetails.code === "additional_spend_limit_reached";
         let primaryButtonLabel;
-        const isUsageBasedBilling = chatEntitlementService.quotas.usageBasedBilling === true;
-        switch (chatEntitlementService.entitlement) {
-        case ChatEntitlement.EDU:
-        case ChatEntitlement.Pro:
-        case ChatEntitlement.ProPlus:
-        case ChatEntitlement.Max:
-            primaryButtonLabel = isUsageBasedBilling ? ( localize(7261, "Configure Budget")) : ( localize(7262, "Configure Budget"));
-            break;
-        case ChatEntitlement.Free:
-            primaryButtonLabel = ( localize(7263, "Upgrade to GitHub Copilot Pro"));
-            break;
+        if (isAdditionalSpendLimitReached) {
+            primaryButtonLabel = ( localize(7390, "Upgrade"));
+        } else {
+            switch (chatEntitlementService.entitlement) {
+            case ChatEntitlement.EDU:
+            case ChatEntitlement.Pro:
+            case ChatEntitlement.ProPlus:
+            case ChatEntitlement.Max:
+                primaryButtonLabel = ( localize(7391, "Manage Budget"));
+                break;
+            case ChatEntitlement.Free:
+                primaryButtonLabel = ( localize(7392, "Upgrade to GitHub Copilot Pro"));
+                break;
+            }
         }
         let hasAddedWaitWarning = false;
         const addWaitWarningIfNeeded = () => {
@@ -68,7 +72,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 return;
             }
             hasAddedWaitWarning = true;
-            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(7264, "Changes may take a few minutes to take effect."))));
+            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(7393, "Changes may take a few minutes to take effect."))));
         };
         let hasAddedRetryButton = false;
         const addRetryButtonIfNeeded = () => {
@@ -81,7 +85,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 buttonForeground: asCssVariable(textLinkForeground)
             })));
             retryButton.element.classList.add("chat-quota-error-secondary-button");
-            retryButton.label = ( localize(7265, "Click to Retry"));
+            retryButton.label = ( localize(7394, "Click to Retry"));
             this._register(retryButton.onDidClick(() => {
                 const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
                 if (!widget) {
@@ -100,7 +104,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.manageAdditionalSpend";
+                const commandId = chatEntitlementService.entitlement === ChatEntitlement.Free || isAdditionalSpendLimitReached ? "workbench.action.chat.upgradePlan" : "workbench.action.chat.manageAdditionalSpend";
                 telemetryService.publicLog2("workbenchActionExecuted", {
                     id: commandId,
                     from: "chat-response"

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

@@ -57,7 +57,7 @@ let ChatCollapsibleListContentPart = class ChatCollapsibleListContentPart extend
         hoverService,
         configurationService
     ) {
-        super(labelOverride ?? (data.length > 1 ? ( localize(7266, "Used {0} references", data.length)) : ( localize(7267, "Used {0} reference", 1))), context, hoverMessage, hoverService, configurationService);
+        super(labelOverride ?? (data.length > 1 ? ( localize(7395, "Used {0} references", data.length)) : ( localize(7396, "Used {0} reference", 1))), context, hoverMessage, hoverService, configurationService);
         this.data = data;
         this.contentReferencesListPool = contentReferencesListPool;
         this.openerService = openerService;
@@ -215,7 +215,7 @@ let CollapsibleListPool = class CollapsibleListPool extends Disposable {
                             return basename(reference.uri.path);
                         }
                     },
-                    getWidgetAriaLabel: () => ( localize(7268, "Collapsible Chat References List"))
+                    getWidgetAriaLabel: () => ( localize(7397, "Collapsible Chat References List"))
                 },
                 dnd: {
                     getDragURI: element => getResourceForElement(element)?.toString() ?? null,
@@ -404,7 +404,7 @@ let CollapsibleListRenderer = class CollapsibleListRenderer {
                     name: settingId
                 }, {
                     icon: Codicon.settingsGear,
-                    title: ( localize(7269, "Open setting '{0}'", settingId)),
+                    title: ( localize(7398, "Open setting '{0}'", settingId)),
                     strikethrough: data.excluded,
                     extraClasses
                 });
@@ -449,7 +449,7 @@ let CollapsibleListRenderer = class CollapsibleListRenderer {
                     templateData.addedSpan.textContent = `+${diffMeta.added}`;
                     templateData.removedSpan.textContent = `-${diffMeta.removed}`;
                     templateData.fileDiffsContainer.setAttribute("aria-label", ( localize(
-                        7270,
+                        7399,
                         "{0} lines added, {1} lines removed",
                         diffMeta.added,
                         diffMeta.removed
@@ -530,7 +530,7 @@ registerAction2(class AddToChatAction extends Action2 {
         super({
             id: AddToChatAction.id,
             title: {
-                ...( localize2(7271, "Add File to Chat"))
+                ...( localize2(7400, "Add File to Chat"))
             },
             f1: false,
             menu: [{
@@ -560,7 +560,7 @@ registerAction2(class OpenChatReferenceLinkAction extends Action2 {
         super({
             id: OpenChatReferenceLinkAction.id,
             title: {
-                ...( localize2(7272, "Copy Link"))
+                ...( localize2(7401, "Copy Link"))
             },
             f1: false,
             menu: [{

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

@@ -6,7 +6,7 @@ import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { basename, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { basename, extname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
@@ -22,7 +22,7 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { REVEAL_IN_EXPLORER_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/fileConstants';
-import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { getAttachableImageExtension, CHAT_ATTACHABLE_IMAGE_MIME_TYPES } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatAttachmentsContentPart } from './chatAttachmentsContentPart.js';
 
 const IMAGE_DECODE_DELAY_MS = 100;
@@ -46,7 +46,8 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
         const deferredImageParts = [];
         for (let i = 0; i < parts.length; i++) {
             const part = parts[i];
-            if (part.mimeType && getAttachableImageExtension(part.mimeType)) {
+            const imageMimeType = getResourceImageMimeType(part);
+            if (imageMimeType) {
                 if (part.base64Value) {
                     entries.push({
                         kind: "file",
@@ -57,7 +58,8 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
                     });
                     deferredImageParts.push({
                         index: i,
-                        part
+                        part,
+                        mimeType: imageMimeType
                     });
                 } else if (part.value) {
                     entries.push({
@@ -65,7 +67,7 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
                         id: generateUuid(),
                         name: basename(part.uri),
                         value: part.value,
-                        mimeType: part.mimeType,
+                        mimeType: imageMimeType,
                         isURL: false,
                         references: [{
                             kind: "reference",
@@ -88,7 +90,7 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
                             id: generateUuid(),
                             name: basename(part.uri),
                             value,
-                            mimeType: part.mimeType,
+                            mimeType: imageMimeType,
                             isURL: false,
                             references: [{
                                 kind: "reference",
@@ -156,7 +158,8 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
             this._register(disposableTimeout(() => {
                 for (const {
                     index,
-                    part
+                    part,
+                    mimeType
                 } of deferredImageParts) {
                     try {
                         const value = decodeBase64(part.base64Value).buffer;
@@ -165,7 +168,7 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
                             id: generateUuid(),
                             name: basename(part.uri),
                             value,
-                            mimeType: part.mimeType,
+                            mimeType,
                             isURL: false,
                             references: [{
                                 kind: "reference",
@@ -181,6 +184,13 @@ let ChatResourceGroupWidget = class ChatResourceGroupWidget extends Disposable {
     }
 };
 ChatResourceGroupWidget = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IContextMenuService)), ( __param(3, IFileService))], ChatResourceGroupWidget));
+function getResourceImageMimeType(part) {
+    if (part.mimeType && getAttachableImageExtension(part.mimeType)) {
+        return part.mimeType;
+    }
+    const extension = extname(part.uri).slice(1).toLowerCase();
+    return CHAT_ATTACHABLE_IMAGE_MIME_TYPES[extension];
+}
 class SaveResourcesAction extends Action2 {
     static {
         this.ID = "chat.toolOutput.save";
@@ -188,7 +198,7 @@ class SaveResourcesAction extends Action2 {
     constructor() {
         super({
             id: SaveResourcesAction.ID,
-            title: ( localize2(7273, "Save...")),
+            title: ( localize2(7402, "Save...")),
             icon: Codicon.cloudDownload,
             menu: [{
                 id: MenuId.ChatToolOutputResourceToolbar,
@@ -218,14 +228,14 @@ class SaveResourcesAction extends Action2 {
                     await fileService.writeFile(target, contents.value);
                 }
             } catch (e) {
-                notificationService.error(( localize(7274, "Failed to save {0}: {1}", basename(part.uri), e)));
+                notificationService.error(( localize(7403, "Failed to save {0}: {1}", basename(part.uri), e)));
             }
         };
         const withProgress = async (thenReveal, todo) => {
             await progressService.withProgress({
                 location: ProgressLocation.Notification,
                 delay: 5_000,
-                title: ( localize(7275, "Saving resources..."))
+                title: ( localize(7404, "Saving resources..."))
             }, async report => {
                 for (const task of todo) {
                     await task();
@@ -238,7 +248,7 @@ class SaveResourcesAction extends Action2 {
             if (workspaceContextService.isInsideWorkspace(thenReveal)) {
                 commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, thenReveal);
             } else {
-                notificationService.info(( localize(7276, "Saved resources to {0}", labelService.getUriLabel(thenReveal))));
+                notificationService.info(( localize(7405, "Saved resources to {0}", labelService.getUriLabel(thenReveal))));
             }
         };
         if (context.parts.length === 1) {
@@ -250,7 +260,7 @@ class SaveResourcesAction extends Action2 {
             await withProgress(uri, [() => savePart(part, false, uri)]);
         } else {
             const uris = await fileDialog.showOpenDialog({
-                title: ( localize(7277, "Pick folder to save resources")),
+                title: ( localize(7406, "Pick folder to save resources")),
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,