@codingame/monaco-vscode-katex-common 28.4.1 → 29.0.0

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

@@ -41,10 +41,12 @@ import { globMatchesResource } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
 import { ExplorerFolderContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { IChatImageCarouselService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageCarouselService.service';
 import { hookUpSymbolAttachmentDragAndContextMenu, chatAttachmentResourceContextKey } from '../../attachments/chatAttachmentWidgets.js';
 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 { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { getMediaMime } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
 
 var InlineAnchorWidget_1;
 registerCss(chatInlineAnchorWidget);
@@ -82,6 +84,11 @@ function renderFileWidgets(element, instantiationService, chatMarkdownAnchorServ
                     linkText
                 };
                 shouldRenderWidget = true;
+                searchParams.delete("vscodeLinkType");
+                const remainingQuery = ( searchParams.toString());
+                uri = uri.with({
+                    query: remainingQuery
+                });
             }
         }
         if (shouldRenderWidget && uri?.scheme) {
@@ -105,6 +112,7 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
         element,
         inlineReference,
         metadata,
+        chatImageCarouselService,
         configurationService,
         originalContextKeyService,
         contextMenuService,
@@ -124,6 +132,7 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
         this.element = element;
         this.inlineReference = inlineReference;
         this.metadata = metadata;
+        this.chatImageCarouselService = chatImageCarouselService;
         this.configurationService = configurationService;
         this.notebookDocumentService = notebookDocumentService;
         this.openerService = openerService;
@@ -180,9 +189,6 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                 iconClasses = recomputeIconClasses();
                 iconEl.classList.add(...iconClasses);
             };
-            this._register(themeService.onDidFileIconThemeChange(() => {
-                refreshIconClasses();
-            }));
             let isDirectory = false;
             fileService.stat(location.uri).then(stat => {
                 isDirectory = stat.isDirectory;
@@ -191,17 +197,25 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                     refreshIconClasses();
                 }
             }).catch(() => {});
-            const contextKeyService = this._register(originalContextKeyService.createScoped(element));
-            chatAttachmentResourceContextKey.bindTo(contextKeyService).set(( location.uri.toString()));
-            const isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+            let contextKeyService;
+            let isFolderContext;
             let contextMenuInitialized = false;
+            const ensureContextKeyService = () => {
+                if (!contextKeyService) {
+                    contextKeyService = this._register(originalContextKeyService.createScoped(element));
+                    chatAttachmentResourceContextKey.bindTo(contextKeyService).set(( location.uri.toString()));
+                    isFolderContext = ExplorerFolderContext.bindTo(contextKeyService);
+                }
+                return contextKeyService;
+            };
             this._register(
                 addDisposableListener(element, EventType.CONTEXT_MENU, async domEvent => {
                     const event = ( new StandardMouseEvent(getWindow(domEvent), domEvent));
                     EventHelper.stop(domEvent, true);
+                    const cks = ensureContextKeyService();
                     if (!contextMenuInitialized) {
                         contextMenuInitialized = true;
-                        const resourceContextKey = ( new StaticResourceContextKey(contextKeyService, fileService, languageService, modelService));
+                        const resourceContextKey = ( new StaticResourceContextKey(cks, fileService, languageService, modelService));
                         resourceContextKey.set(location.uri);
                     }
                     isFolderContext.set(isDirectory);
@@ -209,10 +223,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
                         return;
                     }
                     contextMenuService.showContextMenu({
-                        contextKeyService,
+                        contextKeyService: cks,
                         getAnchor: () => event,
                         getActions: () => {
-                            const menu = menuService.getMenuActions(MenuId.ChatInlineResourceAnchorContext, contextKeyService, {
+                            const menu = menuService.getMenuActions(MenuId.ChatInlineResourceAnchorContext, cks, {
                                 arg: location.uri
                             });
                             return getFlatContextMenuActions(menu);
@@ -222,10 +236,10 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             );
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute("aria-label", ( localize(6507, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute("aria-label", ( localize(6679, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 } else {
                     element.setAttribute("aria-label", ( localize(
-                        6508,
+                        6680,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -247,12 +261,6 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
         this._register(
             hoverService.setupManagedHover(getDefaultHoverDelegate("element"), element, relativeLabel)
         );
-        this.updateAppearance();
-        this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(ChatConfiguration.InlineReferencesStyle)) {
-                this.updateAppearance();
-            }
-        }));
         if (this.data.kind !== "symbol") {
             element.draggable = true;
             this._register(addDisposableListener(element, "dragstart", e => {
@@ -266,6 +274,11 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
         }
         this._register(addDisposableListener(element, "click", async e => {
             EventHelper.stop(e, true);
+            const mimeType = getMediaMime(location.uri.path);
+            if (mimeType?.startsWith("image/") && this.configurationService.getValue(ChatConfiguration.ImageCarouselEnabled)) {
+                await this.chatImageCarouselService.openCarouselAtResource(location.uri);
+                return;
+            }
             const editorOverride = getEditorOverrideForChatResource(location.uri, this.configurationService);
             const editorOptions = {
                 override: editorOverride
@@ -282,18 +295,13 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
     getHTMLElement() {
         return this.element;
     }
-    updateAppearance() {
-        const style = this.configurationService.getValue(ChatConfiguration.InlineReferencesStyle);
-        const useLinkStyle = style === "link";
-        this.element.classList.toggle("link-style", useLinkStyle);
-    }
     getCellIndex(location) {
         const notebook = this.notebookDocumentService.getNotebook(location);
         const index = notebook?.getCellIndex(location) ?? -1;
         return index >= 0 ? ` ${index + 1}` : "";
     }
 };
-InlineAnchorWidget = InlineAnchorWidget_1 = ( __decorate([( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IContextMenuService)), ( __param(6, IFileService)), ( __param(7, IHoverService)), ( __param(8, IInstantiationService)), ( __param(9, ILabelService)), ( __param(10, ILanguageService)), ( __param(11, IMenuService)), ( __param(12, IModelService)), ( __param(13, ITelemetryService)), ( __param(14, IThemeService)), ( __param(15, INotebookDocumentService)), ( __param(16, IOpenerService))], InlineAnchorWidget));
+InlineAnchorWidget = InlineAnchorWidget_1 = ( __decorate([( __param(3, IChatImageCarouselService)), ( __param(4, IConfigurationService)), ( __param(5, IContextKeyService)), ( __param(6, IContextMenuService)), ( __param(7, IFileService)), ( __param(8, IHoverService)), ( __param(9, IInstantiationService)), ( __param(10, ILabelService)), ( __param(11, ILanguageService)), ( __param(12, IMenuService)), ( __param(13, IModelService)), ( __param(14, ITelemetryService)), ( __param(15, IThemeService)), ( __param(16, INotebookDocumentService)), ( __param(17, IOpenerService))], InlineAnchorWidget));
 registerAction2(class AddFileToChatAction extends Action2 {
     static {
         this.id = "chat.inlineResourceAnchor.addFileToChat";
@@ -301,7 +309,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(6509, "Add File to Chat")),
+            title: ( localize2(6681, "Add File to Chat")),
             menu: [{
                 id: MenuId.ChatInlineResourceAnchorContext,
                 group: "chat",
@@ -325,7 +333,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(6510, "Copy")),
+            title: ( localize2(6682, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -352,7 +360,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(6511, "Open to the Side")),
+            title: ( localize2(6683, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -418,8 +426,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(6512, "Go to Definition")),
-                mnemonicTitle: ( localize(6513, "Go to &&Definition"))
+                ...( localize2(6684, "Go to Definition")),
+                mnemonicTitle: ( localize(6685, "Go to &&Definition"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -476,8 +484,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(6514, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(6515, "Go to &&Type Definitions"))
+                ...( localize2(6686, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(6687, "Go to &&Type Definitions"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -502,8 +510,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(6516, "Go to Implementations")),
-                mnemonicTitle: ( localize(6517, "Go to &&Implementations"))
+                ...( localize2(6688, "Go to Implementations")),
+                mnemonicTitle: ( localize(6689, "Go to &&Implementations"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,
@@ -528,8 +536,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(6518, "Go to References")),
-                mnemonicTitle: ( localize(6519, "Go to &&References"))
+                ...( localize2(6690, "Go to References")),
+                mnemonicTitle: ( localize(6691, "Go to &&References"))
             },
             menu: ( [
                 MenuId.ChatInlineSymbolAnchorContext,

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

@@ -53,6 +53,7 @@ export declare class ChatMarkdownContentPart extends Disposable implements IChat
     get codeblocks(): IChatCodeBlockInfo[];
     private readonly mathLayoutParticipants;
     constructor(markdown: IChatMarkdownContent, context: IChatContentPartRenderContext, editorPool: EditorPool, fillInIncompleteTokens: boolean | undefined, codeBlockStartIndex: number | undefined, renderer: IMarkdownRenderer, markdownRenderOptions: MarkdownRenderOptions | undefined, currentWidth: number, codeBlockModelCollection: CodeBlockModelCollection, rendererOptions: IChatMarkdownContentPartOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, textModelService: ITextModelService, instantiationService: IInstantiationService, aiEditTelemetryService: IAiEditTelemetryService);
+    dispose(): void;
     private renderCodeBlockPill;
     private renderCodeBlock;
     hasSameContent(other: IChatProgressRenderableResponseContent): boolean;

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

@@ -13,12 +13,13 @@ import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arr
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
-import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, MutableDisposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import { equalsIgnoreCase } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
@@ -374,6 +375,11 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
             });
         }
     }
+    dispose() {
+        super.dispose();
+        dispose(this.allRefs);
+        this.allRefs.length = 0;
+    }
     renderCodeBlockPill(sessionResource, requestId, inUndoStop, codemapperUri) {
         const codeBlock = this.instantiationService.createInstance(CollapsedCodeBlock, sessionResource, requestId, inUndoStop);
         if (codemapperUri) {
@@ -423,7 +429,7 @@ let ChatMarkdownContentPart = class ChatMarkdownContentPart extends Disposable {
                 ref.object.layout(width);
             } else if (ref.object instanceof CollapsedCodeBlock) {
                 const codeblockModel = this._codeblocks[index];
-                if (codeblockModel.codemapperUri && ref.object.uri?.toString() !== ( codeblockModel.codemapperUri.toString())) {
+                if (codeblockModel.codemapperUri && !isEqual(ref.object.uri, codeblockModel.codemapperUri)) {
                     ref.object.render(codeblockModel.codemapperUri);
                 }
             }
@@ -489,16 +495,6 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
         this.pillElement.role = "button";
         this.element.appendChild(this.statusIndicatorContainer);
         this.element.appendChild(this.pillElement);
-        const updateCheckmarks = () => this.element.classList.toggle(
-            "show-checkmarks",
-            !!this.configurationService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
-        );
-        updateCheckmarks();
-        this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-                updateCheckmarks();
-            }
-        }));
         this.registerListeners();
     }
     registerListeners() {
@@ -592,7 +588,7 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 statusIconEl.classList.add(...statusIconClasses);
                 const entry = editSession.readEntry(uri, r);
                 const rwRatio = Math.floor((entry?.rewriteRatio.read(r) || 0) * 100);
-                statusLabelEl.textContent = ( localize(6520, "Applying edits"));
+                statusLabelEl.textContent = ( localize(6692, "Applying edits"));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -601,13 +597,13 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 } else {
                     progressFill.style.width = "0%";
                     this.pillElement.classList.remove("progress-filling");
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6521, "Generating edits...")) : ( localize(6522, "({0}%)...", rwRatio));
+                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(6693, "Generating edits...")) : ( localize(6694, "({0}%)...", rwRatio));
                 }
             } else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(6523, "Edited"));
+                statusLabelEl.textContent = ( localize(6695, "Edited"));
                 const fileKind = uri.path.endsWith("/") ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -627,10 +623,10 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 this.currentDiff = changes;
                 labelAdded.textContent = `+${changes.added}`;
                 labelRemoved.textContent = `-${changes.removed}`;
-                const insertionsFragment = changes.added === 1 ? ( localize(6524, "1 insertion")) : ( localize(6525, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(6526, "1 deletion")) : ( localize(6527, "{0} deletions", changes.removed));
+                const insertionsFragment = changes.added === 1 ? ( localize(6696, "1 insertion")) : ( localize(6697, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(6698, "1 deletion")) : ( localize(6699, "{0} deletions", changes.removed));
                 const summary = ( localize(
-                    6528,
+                    6700,
                     "Edited {0}, {1}, {2}",
                     iconText,
                     insertionsFragment,

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

@@ -89,26 +89,28 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
     }
     createServerCommandLinks(servers) {
         return ( servers.map(s => createMarkdownCommandLink({
-            title: "`" + escapeMarkdownSyntaxTokens(s.label) + "`",
+            text: "`" + escapeMarkdownSyntaxTokens(s.label) + "`",
             id: McpCommandIds.ServerOptions,
-            arguments: [s.id]
+            arguments: [s.id],
+            tooltip: ( localize(6701, "Show options for {0}", s.label))
         }, false))).join(", ");
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            title: ( localize(6529, "Skip?")),
-            id: McpCommandIds.SkipCurrentAutostart
+            text: ( localize(6702, "Skip?")),
+            id: McpCommandIds.SkipCurrentAutostart,
+            tooltip: ( localize(6703, "Skip starting this MCP server"))
         });
         let content;
         if (state.starting.length === 0) {
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendText(( localize(6530, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
+            })).appendText(( localize(6704, "Activating MCP extensions...")) + " ").appendMarkdown(skipText);
         } else {
             const serverLinks = this.createServerCommandLinks(state.starting);
             content = ( new MarkdownString(undefined, {
                 isTrusted: true
-            })).appendMarkdown(( localize(6531, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
+            })).appendMarkdown(( localize(6705, "Starting MCP servers {0}...", serverLinks)) + " ").appendMarkdown(skipText);
         }
         if (this.workingProgressPart) {
             this.workingProgressPart.updateMessage(content);
@@ -147,12 +149,12 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
         const count = serversRequiringInteraction.length;
         const links = this.createServerCommandLinks(serversRequiringInteraction);
         const content = count === 1 ? ( localize(
-            6532,
+            6706,
             "The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})",
             links,
             "#start"
         )) : ( localize(
-            6533,
+            6707,
             "The MCP servers {0} may have new tools and require interaction to start. [Start them now?]({1})",
             links,
             "#start"
@@ -194,7 +196,7 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             const serversToStart = state.serversRequiringInteraction;
             for (let i = 0; i < serversToStart.length; i++) {
                 const serverInfo = serversToStart[i];
-                startLink.textContent = ( localize(6534, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(6708, "Starting {0}...", serverInfo.label));
                 const server = this.mcpService.servers.get().find(s => s.definition.id === serverInfo.id);
                 if (server) {
                     await startServerAndWaitForLiveTools(server, {

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

@@ -64,7 +64,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
         const viewListButton = ( new ButtonWithIcon(viewListButtonContainer, {}));
         this._register(autorun(reader => {
             const fileCount = this.diffData.read(reader).resources.length;
-            viewListButton.label = fileCount === 1 ? ( localize(6535, "Changed 1 file")) : ( localize(6536, "Changed {0} files", fileCount));
+            viewListButton.label = fileCount === 1 ? ( localize(6709, "Changed 1 file")) : ( localize(6710, "Changed {0} files", fileCount));
         }));
         const setExpansionState = () => {
             viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
@@ -86,7 +86,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
     renderViewAllFileChangesButton(container) {
         const button = container.appendChild($(".chat-view-changes-icon"));
         button.classList.add(...ThemeIcon.asClassNameArray(Codicon.diffMultiple));
-        button.title = ( localize(6537, "Open Changes"));
+        button.title = ( localize(6711, "Open Changes"));
         return addDisposableListener(button, "click", e => {
             const source = ( URI.parse(`multi-diff-editor:${( ( new Date()).getMilliseconds().toString()) + ( Math.random().toString())}`));
             const {
@@ -143,7 +143,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
                 alwaysConsumeMouseWheel: false,
                 accessibilityProvider: {
                     getAriaLabel: element => element.uri.path,
-                    getWidgetAriaLabel: () => ( localize(6538, "File Changes"))
+                    getWidgetAriaLabel: () => ( localize(6712, "File Changes"))
                 }
             })
         );
@@ -259,7 +259,7 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($(".deletions"));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute("aria-label", ( localize(
-                6539,
+                6713,
                 "{0} lines added, {1} lines removed",
                 element.diff.added,
                 element.diff.removed

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

@@ -20,6 +20,7 @@ import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/h
 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 } from './chatThinkingContentPart.js';
 
 let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
     constructor(
@@ -145,9 +146,12 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
         configurationService,
         languageModelToolsService
     ) {
+        const defaultLabel = ( localize(6714, "Working"));
+        const pool = buildPhrasePool([defaultLabel], configurationService);
+        const label = pool[Math.floor(Math.random() * pool.length)];
         const progressMessage = {
             kind: "progressMessage",
-            content: ( new MarkdownString()).appendText(( localize(6540, "Working")))
+            content: ( new MarkdownString()).appendText(label)
         };
         super(
             progressMessage,
@@ -164,7 +168,7 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
         );
         this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
             if (isEqual(context.element.sessionResource, e.sessionResource)) {
-                this.updateMessage(( new MarkdownString(( localize(6541, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
+                this.updateMessage(( new MarkdownString(( localize(6715, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
             }
         }));
     }

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

@@ -2,7 +2,7 @@ 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 { IChatQuestionCarousel, IChatQuestionAnswerValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 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";
@@ -10,7 +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";
 export interface IChatQuestionCarouselOptions {
-    onSubmit: (answers: Map<string, unknown> | undefined) => void;
+    onSubmit: (answers: Map<string, IChatQuestionAnswerValue> | undefined) => void;
     shouldAutoFocus?: boolean;
 }
 export declare class ChatQuestionCarouselPart extends Disposable implements IChatContentPart {
@@ -26,12 +26,15 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
     readonly onDidChangeHeight: Event<void>;
     private _currentIndex;
     private readonly _answers;
+    private _isCollapsed;
     private _questionContainer;
+    private _headerActionsContainer;
     private _closeButtonContainer;
     private _footerRow;
     private _stepIndicator;
     private _submitHint;
     private _submitButton;
+    private _collapseButton;
     private _prevButton;
     private _nextButton;
     private _skipAllButton;
@@ -49,12 +52,16 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
      */
     private readonly _interactiveUIStore;
     private readonly _inChatQuestionCarouselContextKey;
+    private _validationMessageElement;
+    private _currentValidationError;
     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.
      */
     private saveCurrentAnswer;
     private persistDraftState;
+    private toggleCollapsed;
+    private updateCollapsedPresentation;
     /**
      * Navigates the carousel by the given delta.
      * @param delta Negative for previous, positive for next
@@ -157,6 +164,22 @@ export declare class ChatQuestionCarouselPart extends Disposable implements ICha
      */
     private formatAnswerForSummary;
     private getQuestionText;
+    /**
+     * Validates the current question's answer against its validation rules.
+     * Returns true if valid, false if validation errors were shown.
+     */
+    private validateCurrentQuestion;
+    /**
+     * Validates that all required questions have been answered.
+     * Returns true if all required fields are satisfied.
+     */
+    private validateRequiredFields;
+    /**
+     * Returns a validation error message for the given value, or undefined if valid.
+     */
+    private getValidationError;
+    private showValidationError;
+    private clearValidationError;
     hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     addDisposable(disposable: {
         dispose(): void;