@codingame/monaco-vscode-katex-common 26.2.2 → 27.0.0

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

@@ -3,12 +3,12 @@ import { IChatPullRequestContent } from "@codingame/monaco-vscode-api/vscode/vs/
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 export declare class ChatPullRequestContentPart extends Disposable implements IChatContentPart {
     private readonly pullRequestContent;
-    private readonly openerService;
+    private readonly commandService;
     readonly domNode: HTMLElement;
-    constructor(pullRequestContent: IChatPullRequestContent, openerService: IOpenerService);
+    constructor(pullRequestContent: IChatPullRequestContent, commandService: ICommandService);
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     addDisposable(disposable: IDisposable): void;
 }

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

@@ -6,14 +6,14 @@ import { $, append, addDisposableListener } from '@codingame/monaco-vscode-api/v
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 
 registerCss(chatPullRequestContent);
 let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Disposable {
-    constructor(pullRequestContent, openerService) {
+    constructor(pullRequestContent, commandService) {
         super();
         this.pullRequestContent = pullRequestContent;
-        this.openerService = openerService;
+        this.commandService = commandService;
         this.domNode = $(".chat-pull-request-content-part");
         const container = append(this.domNode, $(".container"));
         const contentContainer = append(container, $(".content-container"));
@@ -22,11 +22,16 @@ let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Dispos
         icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.gitPullRequest));
         const titleLink = append(titleContainer, $("a.title"));
         titleLink.textContent = `${this.pullRequestContent.title} - ${this.pullRequestContent.author}`;
-        titleLink.href = ( this.pullRequestContent.uri.toString());
+        if (this.pullRequestContent.uri) {
+            titleLink.href = this.pullRequestContent.uri?.toString();
+        }
         this._register(addDisposableListener(titleLink, "click", e => {
             e.preventDefault();
             e.stopPropagation();
-            this.openerService.open(this.pullRequestContent.uri);
+            this.commandService.executeCommand(
+                this.pullRequestContent.command.id,
+                ...(this.pullRequestContent.command.arguments ?? [])
+            );
         }));
     }
     hasSameContent(other, followingContent, element) {
@@ -36,6 +41,6 @@ let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Dispos
         this._register(disposable);
     }
 };
-ChatPullRequestContentPart = ( __decorate([( __param(1, IOpenerService))], ChatPullRequestContentPart));
+ChatPullRequestContentPart = ( __decorate([( __param(1, ICommandService))], ChatPullRequestContentPart));
 
 export { ChatPullRequestContentPart };

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

@@ -1,10 +1,14 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IChatQuestionCarousel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+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";
 export interface IChatQuestionCarouselOptions {
     onSubmit: (answers: Map<string, unknown> | undefined) => void;
     shouldAutoFocus?: boolean;
@@ -12,7 +16,11 @@ export interface IChatQuestionCarouselOptions {
 export declare class ChatQuestionCarouselPart extends Disposable implements IChatContentPart {
     readonly carousel: IChatQuestionCarousel;
     private readonly _options;
+    private readonly _markdownRendererService;
     private readonly _hoverService;
+    private readonly _accessibilityService;
+    private readonly _contextKeyService;
+    private readonly _keybindingService;
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: Event<void>;
@@ -33,12 +41,14 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
     private readonly _multiSelectCheckboxes;
     private readonly _freeformTextareas;
     private readonly _inputBoxes;
+    private readonly _questionRenderStore;
     /**
      * Disposable store for interactive UI components (header, nav buttons, etc.)
      * that should be disposed when transitioning to summary view.
      */
     private readonly _interactiveUIStore;
-    constructor(carousel: IChatQuestionCarousel, context: IChatContentPartRenderContext, _options: IChatQuestionCarouselOptions, _hoverService: IHoverService);
+    private readonly _inChatQuestionCarouselContextKey;
+    constructor(carousel: IChatQuestionCarousel, context: IChatContentPartRenderContext, _options: IChatQuestionCarouselOptions, _markdownRendererService: IMarkdownRendererService, _hoverService: IHoverService, _accessibilityService: IAccessibilityService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService);
     /**
      * Saves the current question's answer to the answers map.
      */
@@ -53,6 +63,10 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
      * Either advances to the next question or submits.
      */
     private handleNext;
+    /**
+     * Focuses the container element and announces the question for screen reader users.
+     */
+    private _focusContainerAndAnnounce;
     /**
      * Hides the carousel UI and shows a summary of answers.
      */
@@ -80,7 +94,27 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
      * Gets the default answer for a specific question.
      */
     private getDefaultAnswerForQuestion;
+    /**
+     * Returns whether auto-focus should be enabled.
+     * Disabled when screen reader mode is active or when explicitly disabled via options.
+     */
+    private _shouldAutoFocus;
+    /**
+     * Updates the aria-label of the carousel container based on the current question.
+     */
+    private _updateAriaLabel;
+    /**
+     * Focuses the carousel container element.
+     */
+    focus(): void;
+    /**
+     * Returns whether the carousel container has focus.
+     */
+    hasFocus(): boolean;
+    navigateToPreviousQuestion(): boolean;
+    navigateToNextQuestion(): boolean;
     private renderCurrentQuestion;
+    private getLabelWithKeybinding;
     private renderInput;
     /**
      * Sets up auto-resize behavior for a textarea element.
@@ -103,6 +137,7 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
      * Formats an answer for display in the summary.
      */
     private formatAnswerForSummary;
+    private getQuestionText;
     hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     addDisposable(disposable: {
         dispose(): void;

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

@@ -1,13 +1,17 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, addDisposableListener, EventType, clearNode, runAtThisOrScheduleAtNextAnimationFrame, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, trackFocus, addDisposableListener, EventType, clearNode, isAncestorOfActiveElement, runAtThisOrScheduleAtNextAnimationFrame, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { defaultButtonStyles, defaultInputBoxStyles, defaultCheckboxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { InputBox } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/inputbox/inputBox';
@@ -16,15 +20,33 @@ import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+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 * as chatQuestionCarousel from './media/chatQuestionCarousel.css';
 
 registerCss(chatQuestionCarousel);
+const PREVIOUS_QUESTION_ACTION_ID = "workbench.action.chat.previousQuestion";
+const NEXT_QUESTION_ACTION_ID = "workbench.action.chat.nextQuestion";
 let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable {
-    constructor(carousel, context, _options, _hoverService) {
+    constructor(
+        carousel,
+        context,
+        _options,
+        _markdownRendererService,
+        _hoverService,
+        _accessibilityService,
+        _contextKeyService,
+        _keybindingService
+    ) {
         super();
         this.carousel = carousel;
         this._options = _options;
+        this._markdownRendererService = _markdownRendererService;
         this._hoverService = _hoverService;
+        this._accessibilityService = _accessibilityService;
+        this._contextKeyService = _contextKeyService;
+        this._keybindingService = _keybindingService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._currentIndex = 0;
@@ -36,8 +58,24 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._multiSelectCheckboxes = ( new Map());
         this._freeformTextareas = ( new Map());
         this._inputBoxes = this._register(( new DisposableStore()));
+        this._questionRenderStore = this._register(( new MutableDisposable()));
         this._interactiveUIStore = this._register(( new MutableDisposable()));
         this.domNode = $(".chat-question-carousel-container");
+        this._inChatQuestionCarouselContextKey = ChatContextKeys.inChatQuestionCarousel.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({
+            dispose: () => this._inChatQuestionCarouselContextKey.reset()
+        });
+        this.domNode.tabIndex = 0;
+        this.domNode.setAttribute("role", "region");
+        this.domNode.setAttribute("aria-roledescription", ( localize(6452, "chat question")));
+        this._updateAriaLabel();
         if (carousel.data) {
             for (const [key, value] of Object.entries(carousel.data)) {
                 this._answers.set(key, value);
@@ -56,7 +94,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this.domNode.append(this._questionContainer);
         if (carousel.allowSkip) {
             this._closeButtonContainer = $(".chat-question-close-container");
-            const skipAllTitle = ( localize(5948, "Skip all questions"));
+            const skipAllTitle = ( localize(6453, "Skip all questions"));
             const skipAllButton = interactiveStore.add(( new Button(this._closeButtonContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
@@ -75,9 +113,10 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._footerRow.appendChild(this._stepIndicator);
         this._navigationButtons = $(".chat-question-carousel-nav");
         this._navigationButtons.setAttribute("role", "navigation");
-        this._navigationButtons.setAttribute("aria-label", ( localize(5949, "Question navigation")));
+        this._navigationButtons.setAttribute("aria-label", ( localize(6454, "Question navigation")));
         const arrowsContainer = $(".chat-question-nav-arrows");
-        const previousLabel = ( localize(5950, "Previous"));
+        const previousLabel = ( localize(6455, "Previous"));
+        const previousLabelWithKeybinding = this.getLabelWithKeybinding(previousLabel, PREVIOUS_QUESTION_ACTION_ID);
         const prevButton = interactiveStore.add(( new Button(arrowsContainer, {
             ...defaultButtonStyles,
             secondary: true,
@@ -85,9 +124,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         })));
         prevButton.element.classList.add("chat-question-nav-arrow", "chat-question-nav-prev");
         prevButton.label = `$(${Codicon.chevronLeft.id})`;
-        prevButton.element.setAttribute("aria-label", previousLabel);
+        prevButton.element.setAttribute("aria-label", previousLabelWithKeybinding);
         interactiveStore.add(this._hoverService.setupDelayedHover(prevButton.element, {
-            content: previousLabel
+            content: previousLabelWithKeybinding
         }));
         this._prevButton = prevButton;
         const nextButton = interactiveStore.add(( new Button(arrowsContainer, {
@@ -139,19 +178,36 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         if (newIndex >= 0 && newIndex < this.carousel.questions.length) {
             this.saveCurrentAnswer();
             this._currentIndex = newIndex;
-            this.renderCurrentQuestion();
+            this.renderCurrentQuestion(true);
         }
     }
     handleNext() {
         this.saveCurrentAnswer();
         if (this._currentIndex < this.carousel.questions.length - 1) {
             this._currentIndex++;
-            this.renderCurrentQuestion();
+            this.renderCurrentQuestion(true);
         } else {
             this._options.onSubmit(this._answers);
             this.hideAndShowSummary();
         }
     }
+    _focusContainerAndAnnounce() {
+        this.domNode.focus();
+        const question = this.carousel.questions[this._currentIndex];
+        if (question) {
+            const questionText = question.message ?? question.title;
+            const messageContent = this.getQuestionText(questionText);
+            const questionCount = this.carousel.questions.length;
+            const alertMessage = questionCount === 1 ? messageContent : ( localize(
+                6456,
+                "Question {0} of {1}: {2}",
+                this._currentIndex + 1,
+                questionCount,
+                messageContent
+            ));
+            this._accessibilityService.alert(alertMessage);
+        }
+    }
     hideAndShowSummary() {
         this._isSkipped = true;
         this.domNode.classList.add("chat-question-carousel-used");
@@ -162,6 +218,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     clearInteractiveResources() {
         this._interactiveUIStore.clear();
+        this._questionRenderStore.clear();
         this._inputBoxes.clear();
         this._textInputBoxes.clear();
         this._singleSelectItems.clear();
@@ -239,10 +296,59 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             return question.defaultValue;
         }
     }
-    renderCurrentQuestion() {
+    _shouldAutoFocus() {
+        if (this._options.shouldAutoFocus === false) {
+            return false;
+        }
+        return !this._accessibilityService.isScreenReaderOptimized();
+    }
+    _updateAriaLabel() {
+        const question = this.carousel.questions[this._currentIndex];
+        if (!question) {
+            this.domNode.setAttribute("aria-label", ( localize(6457, "Chat question")));
+            return;
+        }
+        const questionText = question.message ?? question.title;
+        const messageContent = this.getQuestionText(questionText);
+        const questionCount = this.carousel.questions.length;
+        if (questionCount === 1) {
+            this.domNode.setAttribute("aria-label", ( localize(6458, "Chat question: {0}", messageContent)));
+        } else {
+            this.domNode.setAttribute("aria-label", ( localize(
+                6459,
+                "Chat question {0} of {1}: {2}",
+                this._currentIndex + 1,
+                questionCount,
+                messageContent
+            )));
+        }
+    }
+    focus() {
+        this.domNode.focus();
+    }
+    hasFocus() {
+        return isAncestorOfActiveElement(this.domNode);
+    }
+    navigateToPreviousQuestion() {
+        if (this._currentIndex <= 0) {
+            return false;
+        }
+        this.navigate(-1);
+        return true;
+    }
+    navigateToNextQuestion() {
+        if (this._currentIndex >= this.carousel.questions.length - 1) {
+            return false;
+        }
+        this.navigate(1);
+        return true;
+    }
+    renderCurrentQuestion(focusContainerForScreenReader = false) {
         if (!this._questionContainer || !this._prevButton || !this._nextButton) {
             return;
         }
+        const questionRenderStore = ( new DisposableStore());
+        this._questionRenderStore.value = questionRenderStore;
         this._inputBoxes.clear();
         this._textInputBoxes.clear();
         this._singleSelectItems.clear();
@@ -257,18 +363,24 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         const questionText = question.message ?? question.title;
         if (questionText) {
             const title = $(".chat-question-title");
-            const messageContent = typeof questionText === "string" ? questionText : questionText.value;
+            const messageContent = this.getQuestionText(questionText);
             title.setAttribute("aria-label", messageContent);
-            const parenMatch = messageContent.match(/^(.+?)\s*(\([^)]+\))\s*$/);
-            if (parenMatch) {
-                const mainTitle = $("span.chat-question-title-main");
-                mainTitle.textContent = parenMatch[1];
-                title.appendChild(mainTitle);
-                const subtitle = $("span.chat-question-title-subtitle");
-                subtitle.textContent = " " + parenMatch[2];
-                title.appendChild(subtitle);
+            if (question.message !== undefined) {
+                const messageMd = isMarkdownString(questionText) ? MarkdownString.lift(questionText) : ( new MarkdownString(questionText));
+                const renderedTitle = questionRenderStore.add(this._markdownRendererService.render(messageMd));
+                title.appendChild(renderedTitle.element);
             } else {
-                title.textContent = messageContent;
+                const parenMatch = messageContent.match(/^(.+?)\s*(\([^)]+\))\s*$/);
+                if (parenMatch) {
+                    const mainTitle = $("span.chat-question-title-main");
+                    mainTitle.textContent = parenMatch[1];
+                    title.appendChild(mainTitle);
+                    const subtitle = $("span.chat-question-title-subtitle");
+                    subtitle.textContent = " " + parenMatch[2];
+                    title.appendChild(subtitle);
+                } else {
+                    title.textContent = messageContent;
+                }
             }
             headerRow.appendChild(title);
         }
@@ -287,8 +399,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._prevButton.enabled = this._currentIndex > 0;
         this._prevButton.element.style.display = isSingleQuestion ? "none" : "";
         const isLastQuestion = this._currentIndex === this.carousel.questions.length - 1;
-        const submitLabel = ( localize(5951, "Submit"));
-        const nextLabel = ( localize(5952, "Next"));
+        const submitLabel = ( localize(6460, "Submit"));
+        const nextLabel = ( localize(6461, "Next"));
+        const nextLabelWithKeybinding = this.getLabelWithKeybinding(nextLabel, NEXT_QUESTION_ACTION_ID);
         if (isLastQuestion) {
             this._nextButton.label = submitLabel;
             this._nextButton.element.setAttribute("aria-label", submitLabel);
@@ -298,14 +411,22 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             });
         } else {
             this._nextButton.label = `$(${Codicon.chevronRight.id})`;
-            this._nextButton.element.setAttribute("aria-label", nextLabel);
+            this._nextButton.element.setAttribute("aria-label", nextLabelWithKeybinding);
             this._nextButton.element.classList.remove("chat-question-nav-submit");
             this._nextButtonHover.value = this._hoverService.setupDelayedHover(this._nextButton.element, {
-                content: nextLabel
+                content: nextLabelWithKeybinding
             });
         }
+        this._updateAriaLabel();
+        if (focusContainerForScreenReader && this._accessibilityService.isScreenReaderOptimized()) {
+            this._focusContainerAndAnnounce();
+        }
         this._onDidChangeHeight.fire();
     }
+    getLabelWithKeybinding(label, actionId) {
+        const keybindingLabel = this._keybindingService.lookupKeybinding(actionId, this._contextKeyService)?.getLabel();
+        return keybindingLabel ? ( localize(6462, "{0} ({1})", label, keybindingLabel)) : label;
+    }
     renderInput(container, question) {
         switch (question.type) {
         case "text":
@@ -330,7 +451,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     }
     renderTextInput(container, question) {
         const inputBox = this._inputBoxes.add(( new InputBox(container, undefined, {
-            placeholder: ( localize(5953, "Enter your answer")),
+            placeholder: ( localize(6463, "Enter your answer")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         const previousAnswer = this._answers.get(question.id);
@@ -340,7 +461,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             inputBox.value = String(question.defaultValue);
         }
         this._textInputBoxes.set(question.id, inputBox);
-        if (this._options.shouldAutoFocus !== false) {
+        if (this._shouldAutoFocus()) {
             this._inputBoxes.add(
                 runAtThisOrScheduleAtNextAnimationFrame(getWindow(inputBox.element), () => inputBox.focus())
             );
@@ -393,7 +514,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(5954, "Option {0}: {1}", index + 1, option.label)));
+            listItem.setAttribute("aria-label", ( localize(6464, "Option {0}: {1}", index + 1, option.label)));
             listItem.id = `option-${question.id}-${index}`;
             listItem.tabIndex = -1;
             const number = $(".chat-question-list-number");
@@ -455,7 +576,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         freeformNumber.textContent = `${options.length + 1}`;
         freeformContainer.appendChild(freeformNumber);
         const freeformTextarea = $("textarea.chat-question-freeform-textarea");
-        freeformTextarea.placeholder = ( localize(5955, "Enter custom answer"));
+        freeformTextarea.placeholder = ( localize(6465, "Enter custom answer"));
         freeformTextarea.rows = 1;
         if (previousFreeform !== undefined) {
             freeformTextarea.value = previousFreeform;
@@ -508,7 +629,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 runAtThisOrScheduleAtNextAnimationFrame(getWindow(freeformTextarea), () => autoResize())
             );
         }
-        if (this._options.shouldAutoFocus !== false) {
+        if (this._shouldAutoFocus()) {
             if (previousFreeform) {
                 this._inputBoxes.add(
                     runAtThisOrScheduleAtNextAnimationFrame(getWindow(freeformTextarea), () => {
@@ -558,7 +679,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(5954, "Option {0}: {1}", index + 1, option.label)));
+            listItem.setAttribute("aria-label", ( localize(6464, "Option {0}: {1}", index + 1, option.label)));
             listItem.id = `option-${question.id}-${index}`;
             listItem.tabIndex = -1;
             const number = $(".chat-question-list-number");
@@ -616,7 +737,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         freeformNumber.textContent = `${options.length + 1}`;
         freeformContainer.appendChild(freeformNumber);
         const freeformTextarea = $("textarea.chat-question-freeform-textarea");
-        freeformTextarea.placeholder = ( localize(5955, "Enter custom answer"));
+        freeformTextarea.placeholder = ( localize(6465, "Enter custom answer"));
         freeformTextarea.rows = 1;
         if (previousFreeform !== undefined) {
             freeformTextarea.value = previousFreeform;
@@ -663,7 +784,7 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 runAtThisOrScheduleAtNextAnimationFrame(getWindow(freeformTextarea), () => autoResize())
             );
         }
-        if (this._options.shouldAutoFocus !== false) {
+        if (this._shouldAutoFocus()) {
             if (previousFreeform) {
                 this._inputBoxes.add(
                     runAtThisOrScheduleAtNextAnimationFrame(getWindow(freeformTextarea), () => {
@@ -735,15 +856,9 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                 }
                 const freeformTextarea = this._freeformTextareas.get(question.id);
                 const freeformValue = freeformTextarea?.value !== "" ? freeformTextarea?.value : undefined;
-                let finalSelectedValues = selectedValues;
-                if (selectedValues.length === 0 && !freeformValue && question.defaultValue !== undefined) {
-                    const defaultIds = Array.isArray(question.defaultValue) ? question.defaultValue : [question.defaultValue];
-                    const defaultValues = question.options?.filter(opt => defaultIds.includes(opt.id)).map(opt => opt.value);
-                    finalSelectedValues = defaultValues?.filter(v => v !== undefined) || [];
-                }
-                if (freeformValue || finalSelectedValues.length > 0) {
+                if (freeformValue || selectedValues.length > 0) {
                     return {
-                        selectedValues: finalSelectedValues,
+                        selectedValues,
                         freeformValue
                     };
                 }
@@ -756,13 +871,15 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
     renderSkippedMessage() {
         const skippedContainer = $(".chat-question-carousel-summary");
         const skippedMessage = $(".chat-question-summary-skipped");
-        skippedMessage.textContent = ( localize(5956, "Skipped"));
+        skippedMessage.textContent = ( localize(6466, "Skipped"));
         skippedContainer.appendChild(skippedMessage);
         this.domNode.appendChild(skippedContainer);
     }
     renderSummary() {
         if (this._answers.size === 0) {
-            this.renderSkippedMessage();
+            if (this.carousel.isUsed) {
+                this.renderSkippedMessage();
+            }
             return;
         }
         const summaryContainer = $(".chat-question-carousel-summary");
@@ -831,10 +948,10 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
                     if (freeformValue) {
                         labels.push(freeformValue);
                     }
-                    return labels.join(( localize(5957, ", ")));
+                    return labels.join(( localize(6467, ", ")));
                 }
                 if (Array.isArray(answer)) {
-                    return ( answer.map(v => question.options?.find(opt => opt.value === v)?.label ?? String(v))).join(( localize(5957, ", ")));
+                    return ( answer.map(v => question.options?.find(opt => opt.value === v)?.label ?? String(v))).join(( localize(6467, ", ")));
                 }
                 return String(answer);
             }
@@ -842,6 +959,10 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
             return String(answer);
         }
     }
+    getQuestionText(questionText) {
+        const md = typeof questionText === "string" ? ( new MarkdownString(questionText)) : questionText;
+        return renderAsPlaintext(md);
+    }
     hasSameContent(other, _followingContent, element) {
         if (!this._isSkipped && !this.carousel.isUsed && isResponseVM(element) && element.isComplete) {
             return false;
@@ -852,6 +973,6 @@ let ChatQuestionCarouselPart = class ChatQuestionCarouselPart extends Disposable
         this._register(disposable);
     }
 };
-ChatQuestionCarouselPart = ( __decorate([( __param(3, IHoverService))], ChatQuestionCarouselPart));
+ChatQuestionCarouselPart = ( __decorate([( __param(3, IMarkdownRendererService)), ( __param(4, IHoverService)), ( __param(5, IAccessibilityService)), ( __param(6, IContextKeyService)), ( __param(7, IKeybindingService))], ChatQuestionCarouselPart));
 
 export { ChatQuestionCarouselPart };

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

@@ -53,10 +53,10 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
         switch (chatEntitlementService.entitlement) {
         case ChatEntitlement.Pro:
         case ChatEntitlement.ProPlus:
-            primaryButtonLabel = ( localize(5958, "Manage Paid Premium Requests"));
+            primaryButtonLabel = ( localize(6468, "Manage Paid Premium Requests"));
             break;
         case ChatEntitlement.Free:
-            primaryButtonLabel = ( localize(5959, "Upgrade to GitHub Copilot Pro"));
+            primaryButtonLabel = ( localize(6469, "Upgrade to GitHub Copilot Pro"));
             break;
         }
         let hasAddedWaitWarning = false;
@@ -65,7 +65,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 return;
             }
             hasAddedWaitWarning = true;
-            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(5960, "Changes may take a few minutes to take effect."))));
+            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(6470, "Changes may take a few minutes to take effect."))));
         };
         let hasAddedRetryButton = false;
         const addRetryButtonIfNeeded = () => {
@@ -78,7 +78,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 buttonForeground: asCssVariable(textLinkForeground)
             })));
             retryButton.element.classList.add("chat-quota-error-secondary-button");
-            retryButton.label = ( localize(5961, "Click to Retry"));
+            retryButton.label = ( localize(6471, "Click to Retry"));
             this._register(retryButton.onDidClick(() => {
                 const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
                 if (!widget) {

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

@@ -18,6 +18,7 @@ import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
 import { IDisposableReference } from "./chatCollections.js";
 import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export interface IChatReferenceListItem extends IChatContentReference {
     title?: string;
     description?: string;
@@ -32,7 +33,7 @@ export declare class ChatCollapsibleListContentPart extends ChatCollapsibleConte
     private readonly menuService;
     private readonly instantiationService;
     private readonly contextMenuService;
-    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, hoverMessage: IMarkdownString | undefined, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, hoverService: IHoverService);
+    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, hoverMessage: IMarkdownString | undefined, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, hoverService: IHoverService, configurationService: IConfigurationService);
     protected initContent(): HTMLElement;
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
 }
@@ -41,7 +42,7 @@ export interface IChatUsedReferencesListOptions {
 }
 export declare class ChatUsedReferencesListContentPart extends ChatCollapsibleListContentPart {
     private readonly options;
-    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, options: IChatUsedReferencesListOptions, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, hoverService: IHoverService);
+    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, options: IChatUsedReferencesListOptions, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, hoverService: IHoverService, configurationService: IConfigurationService);
     protected isExpanded(): boolean;
     protected setExpanded(value: boolean): void;
 }