@codingame/monaco-vscode-katex-common 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatThinkingContentPart.js

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, clearNode } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, clearNode, hide } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ThinkingDisplayMode, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -12,11 +12,12 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import * as chatThinkingContent from './media/chatThinkingContent.css';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(chatThinkingContent);
@@ -24,22 +25,49 @@ function extractTextFromPart(content) {
     const raw = Array.isArray(content.value) ? content.value.join('') : (content.value || '');
     return raw.trim();
 }
+function getToolInvocationIcon(toolId) {
+    const lowerToolId = toolId.toLowerCase();
+    if (lowerToolId.includes('search') ||
+        lowerToolId.includes('grep') ||
+        lowerToolId.includes('find') ||
+        lowerToolId.includes('list') ||
+        lowerToolId.includes('semantic') ||
+        lowerToolId.includes('changes') ||
+        lowerToolId.includes('codebase')) {
+        return Codicon.search;
+    }
+    if (lowerToolId.includes('read') ||
+        lowerToolId.includes('get_file') ||
+        lowerToolId.includes('problems')) {
+        return Codicon.eye;
+    }
+    if (lowerToolId.includes('edit') ||
+        lowerToolId.includes('create')) {
+        return Codicon.pencil;
+    }
+    return Codicon.tools;
+}
+function createThinkingIcon(icon) {
+    const iconElement = $('span.chat-thinking-icon');
+    iconElement.classList.add(...ThemeIcon.asClassNameArray(icon));
+    return iconElement;
+}
 function extractTitleFromThinkingContent(content) {
     const headerMatch = content.match(/^\*\*([^*]+)\*\*/);
     return headerMatch ? headerMatch[1] : undefined;
 }
 let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsibleContentPart {
-    constructor(content, context, chatContentMarkdownRenderer, instantiationService, configurationService, chatMarkdownAnchorService, languageModelsService) {
+    constructor(content, context, chatContentMarkdownRenderer, instantiationService, configurationService, chatMarkdownAnchorService, languageModelsService, hoverService) {
         const initialText = extractTextFromPart(content);
         const extractedTitle = extractTitleFromThinkingContent(initialText)
             ?? 'Thinking...';
-        super(extractedTitle, context);
+        super(extractedTitle, context, undefined, hoverService);
         this.chatContentMarkdownRenderer = chatContentMarkdownRenderer;
         this.instantiationService = instantiationService;
         this.configurationService = configurationService;
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this.languageModelsService = languageModelsService;
-        this.defaultTitle = ( localize(5103, 'Thinking...'));
+        this.defaultTitle = ( localize(5673, 'Thinking...'));
         this.fixedScrollingMode = false;
         this.extractedTitles = [];
         this.toolInvocationCount = 0;
@@ -155,6 +183,7 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
         this.markdownResult = rendered;
         if (!target) {
             clearNode(this.textContainer);
+            this.textContainer.appendChild(createThinkingIcon(Codicon.comment));
             this.textContainer.appendChild(rendered.element);
         }
     }
@@ -248,10 +277,8 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
             super.setTitle(existingToolTitle);
             return;
         }
-        if (this.toolInvocationCount === 1 && this.extractedTitles.length === 1 && this.currentToolCallLabel && this.currentThinkingValue.trim() === '') {
-            const title = this.currentToolCallLabel;
-            this.currentTitle = title;
-            this.setTitleWithWidgets(( new MarkdownString(title)), this.instantiationService, this.chatMarkdownAnchorService, this.chatContentMarkdownRenderer);
+        if (this.toolInvocationCount === 1 && this.currentThinkingValue.trim() === '' && this.singleToolItemInfo) {
+            this.restoreSingleToolToOriginalPosition();
             return;
         }
         if (this.extractedTitles.length === 1 && this.toolInvocationCount === 0) {
@@ -328,15 +355,29 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
         }
         this.setFallbackTitle();
     }
+    restoreSingleToolToOriginalPosition() {
+        if (!this.singleToolItemInfo) {
+            return;
+        }
+        const { element, originalParent, originalNextSibling } = this.singleToolItemInfo;
+        if (originalNextSibling && originalNextSibling.parentNode === originalParent) {
+            originalParent.insertBefore(element, originalNextSibling);
+        }
+        else {
+            originalParent.appendChild(element);
+        }
+        hide(this.domNode);
+        this.singleToolItemInfo = undefined;
+    }
     setFallbackTitle() {
         const finalLabel = this.toolInvocationCount > 0
             ? ( localize(
-            5104,
+            5674,
             'Finished thinking and invoked {0} tool{1}',
             this.toolInvocationCount,
             this.toolInvocationCount === 1 ? '' : 's'
         ))
-            : ( localize(5105, 'Finished Thinking'));
+            : ( localize(5675, 'Finished Thinking'));
         this.currentTitle = finalLabel;
         this.wrapper.classList.remove('chat-thinking-streaming');
         this.streamingCompleted = true;
@@ -346,8 +387,23 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
         }
         this.updateDropdownClickability();
     }
-    appendItem(content, toolInvocationId, toolInvocation) {
-        this.wrapper.appendChild(content);
+    appendItem(content, toolInvocationId, toolInvocation, originalParent) {
+        if (this.toolInvocationCount === 0 && originalParent) {
+            this.singleToolItemInfo = {
+                element: content,
+                originalParent,
+                originalNextSibling: this.domNode
+            };
+        }
+        else {
+            this.singleToolItemInfo = undefined;
+        }
+        const itemWrapper = $('.chat-thinking-tool-wrapper');
+        const icon = toolInvocationId ? getToolInvocationIcon(toolInvocationId) : Codicon.tools;
+        const iconElement = createThinkingIcon(icon);
+        itemWrapper.appendChild(iconElement);
+        itemWrapper.appendChild(content);
+        this.wrapper.appendChild(itemWrapper);
         if (toolInvocationId) {
             this.toolInvocationCount++;
             let toolCallLabel;
@@ -358,9 +414,6 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
             else {
                 toolCallLabel = `Invoked \`${toolInvocationId}\``;
             }
-            if (toolInvocation?.pastTenseMessage) {
-                this.currentToolCallLabel = typeof toolInvocation.pastTenseMessage === 'string' ? toolInvocation.pastTenseMessage : toolInvocation.pastTenseMessage.value;
-            }
             if (toolInvocation) {
                 this.toolInvocations.push(toolInvocation);
             }
@@ -423,7 +476,8 @@ ChatThinkingContentPart = ( __decorate([
     ( __param(3, IInstantiationService)),
     ( __param(4, IConfigurationService)),
     ( __param(5, IChatMarkdownAnchorService)),
-    ( __param(6, ILanguageModelsService))
+    ( __param(6, ILanguageModelsService)),
+    ( __param(7, IHoverService))
 ], ChatThinkingContentPart));
 
 export { ChatThinkingContentPart };

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatTodoListWidget.d.ts

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service";
+import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 export declare class ChatTodoListWidget extends Disposable {
     private readonly chatTodoListService;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatTodoListWidget.js

@@ -11,9 +11,9 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
-import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { TodoListToolDescriptionFieldSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/manageTodoListTool';
+import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { TodoListToolDescriptionFieldSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 
 class TodoListDelegate {
@@ -49,8 +49,8 @@ class TodoListRenderer {
         iconLabel.setLabel(todo.title, undefined, { title });
         const statusText = this.getStatusText(todo.status);
         const ariaLabel = includeDescription && todo.description && todo.description.trim()
-            ? ( localize(5106, '{0}, {1}, {2}', todo.title, statusText, todo.description))
-            : ( localize(5107, '{0}, {1}', todo.title, statusText));
+            ? ( localize(5676, '{0}, {1}, {2}', todo.title, statusText, todo.description))
+            : ( localize(5677, '{0}, {1}', todo.title, statusText));
         todoElement.setAttribute('aria-label', ariaLabel);
     }
     disposeTemplate(templateData) {
@@ -59,12 +59,12 @@ class TodoListRenderer {
     getStatusText(status) {
         switch (status) {
             case 'completed':
-                return localize(5108, 'completed');
+                return localize(5678, 'completed');
             case 'in-progress':
-                return localize(5109, 'in progress');
+                return localize(5679, 'in progress');
             case 'not-started':
             default:
-                return localize(5110, 'not started');
+                return localize(5680, 'not started');
         }
     }
     getStatusIconClass(status) {
@@ -130,7 +130,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         this.expandIcon.setAttribute('aria-hidden', 'true');
         this.titleElement = $('.todo-list-title');
         this.titleElement.id = 'todo-list-title';
-        this.titleElement.textContent = ( localize(5111, 'Todos'));
+        this.titleElement.textContent = ( localize(5681, 'Todos'));
         this.clearButtonContainer = $('.todo-clear-button-container');
         this.createClearButton();
         titleSection.appendChild(this.expandIcon);
@@ -211,10 +211,10 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                         const statusText = this.getStatusText(todo.status);
                         const includeDescription = this.configurationService.getValue(TodoListToolDescriptionFieldSettingId) !== false;
                         return includeDescription && todo.description && todo.description.trim()
-                            ? ( localize(5106, '{0}, {1}, {2}', todo.title, statusText, todo.description))
-                            : ( localize(5107, '{0}, {1}', todo.title, statusText));
+                            ? ( localize(5676, '{0}, {1}, {2}', todo.title, statusText, todo.description))
+                            : ( localize(5677, '{0}, {1}', todo.title, statusText));
                     },
-                    getWidgetAriaLabel: () => ( localize(5112, 'Chat Todo List'))
+                    getWidgetAriaLabel: () => ( localize(5682, 'Chat Todo List'))
                 }
             }));
         }
@@ -266,10 +266,10 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const shouldDisable = isRequestInProgress && hasInProgressTask;
         this.clearButton.enabled = !shouldDisable;
         if (shouldDisable) {
-            this.clearButton.setTitle(( localize(5113, 'Cannot clear todos while a task is in progress')));
+            this.clearButton.setTitle(( localize(5683, 'Cannot clear todos while a task is in progress')));
         }
         else {
-            this.clearButton.setTitle(( localize(5114, 'Clear all todos')));
+            this.clearButton.setTitle(( localize(5684, 'Clear all todos')));
         }
     }
     updateTitleElement(titleElement, todoList) {
@@ -282,15 +282,15 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const firstNotStartedTodo = notStartedTodos.length > 0 ? notStartedTodos[0] : undefined;
         const currentTaskNumber = inProgressTodos.length > 0 ? completedCount + 1 : Math.max(1, completedCount);
         const expandButtonLabel = this._isExpanded
-            ? ( localize(5115, 'Collapse Todos'))
-            : ( localize(5116, 'Expand Todos'));
+            ? ( localize(5685, 'Collapse Todos'))
+            : ( localize(5686, 'Expand Todos'));
         this.expandoButton.element.setAttribute('aria-label', expandButtonLabel);
         this.expandoButton.element.setAttribute('aria-expanded', this._isExpanded ? 'true' : 'false');
         if (this._isExpanded) {
             const titleText = $('span');
             titleText.textContent = totalCount > 0 ?
-                ( localize(5117, 'Todos ({0}/{1})', currentTaskNumber, totalCount)) :
-                ( localize(5111, 'Todos'));
+                ( localize(5687, 'Todos ({0}/{1})', currentTaskNumber, totalCount)) :
+                ( localize(5681, 'Todos'));
             titleElement.appendChild(titleText);
         }
         else {
@@ -309,7 +309,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                 icon.style.verticalAlign = 'middle';
                 titleElement.appendChild(icon);
                 const todoText = $('span');
-                todoText.textContent = ( localize(5118, '{0} ({1}/{2})', todoToShow.title, currentTaskNumber, totalCount));
+                todoText.textContent = ( localize(5688, '{0} ({1}/{2})', todoToShow.title, currentTaskNumber, totalCount));
                 todoText.style.verticalAlign = 'middle';
                 todoText.style.overflow = 'hidden';
                 todoText.style.textOverflow = 'ellipsis';
@@ -319,7 +319,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
             }
             else if (completedCount > 0 && completedCount === totalCount) {
                 const doneText = $('span');
-                doneText.textContent = ( localize(5117, 'Todos ({0}/{1})', totalCount, totalCount));
+                doneText.textContent = ( localize(5687, 'Todos ({0}/{1})', totalCount, totalCount));
                 doneText.style.verticalAlign = 'middle';
                 titleElement.appendChild(doneText);
             }
@@ -328,12 +328,12 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
     getStatusText(status) {
         switch (status) {
             case 'completed':
-                return localize(5108, 'completed');
+                return localize(5678, 'completed');
             case 'in-progress':
-                return localize(5109, 'in progress');
+                return localize(5679, 'in progress');
             case 'not-started':
             default:
-                return localize(5110, 'not started');
+                return localize(5680, 'not started');
         }
     }
 };

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatToolInputOutputContentPart.d.ts

@@ -5,17 +5,18 @@ import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { LanguageModelPartAudience } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ChatTreeItem, IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { ICodeBlockRenderOptions } from "../codeBlockPart.js";
-import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { ICodeBlockRenderOptions } from "./codeBlockPart.js";
+import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export interface IChatCollapsibleIOCodePart {
     kind: "code";
     textModel: ITextModel;
     languageId: string;
     options: ICodeBlockRenderOptions;
     codeBlockInfo: IChatCodeBlockInfo;
+    title?: string | IMarkdownString;
 }
 export interface IChatCollapsibleIODataPart {
     kind: "data";

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatToolInputOutputContentPart.js

@@ -114,14 +114,14 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
             h('div@output'),
         ]);
         const { input, output } = this;
-        contents.inputTitle.textContent = ( localize(5119, "Input"));
+        contents.inputTitle.textContent = ( localize(5689, "Input"));
         this.addCodeBlock(input, contents.input);
         if (!output) {
             contents.output.remove();
             contents.outputTitle.remove();
         }
         else {
-            contents.outputTitle.textContent = ( localize(5120, "Output"));
+            contents.outputTitle.textContent = ( localize(5690, "Output"));
             const outputSubPart = this._register(this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts));
             this._outputSubPart = outputSubPart;
             this._register(outputSubPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatToolOutputContentSubPart.d.ts

@@ -3,8 +3,9 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { ChatCollapsibleIOPart } from "./chatToolInputOutputContentPart.js";
 /**
  * A reusable component for rendering tool output consisting of code blocks and/or resources.
@@ -13,17 +14,19 @@ import { ChatCollapsibleIOPart } from "./chatToolInputOutputContentPart.js";
 export declare class ChatToolOutputContentSubPart extends Disposable {
     private readonly context;
     private readonly parts;
-    private readonly contextKeyService;
     private readonly _instantiationService;
+    private readonly contextKeyService;
     private readonly _contextMenuService;
     private readonly _fileService;
+    private readonly _markdownRendererService;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private _currentWidth;
     private readonly _editorReferences;
     readonly domNode: HTMLElement;
     readonly codeblocks: IChatCodeBlockInfo[];
-    constructor(context: IChatContentPartRenderContext, parts: ChatCollapsibleIOPart[], contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, _contextMenuService: IContextMenuService, _fileService: IFileService);
+    constructor(context: IChatContentPartRenderContext, parts: ChatCollapsibleIOPart[], _instantiationService: IInstantiationService, contextKeyService: IContextKeyService, _contextMenuService: IContextMenuService, _fileService: IFileService, _markdownRendererService: IMarkdownRendererService);
+    private toMdString;
     private createOutputContents;
     private addResourceGroup;
     private fillInResourceGroup;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatToolOutputContentSubPart.js

@@ -21,18 +21,21 @@ 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/chatModel';
+import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { ChatAttachmentsContentPart } from './chatAttachmentsContentPart.js';
 
 let ChatToolOutputContentSubPart = class ChatToolOutputContentSubPart extends Disposable {
-    constructor(context, parts, contextKeyService, _instantiationService, _contextMenuService, _fileService) {
+    constructor(context, parts, _instantiationService, contextKeyService, _contextMenuService, _fileService, _markdownRendererService) {
         super();
         this.context = context;
         this.parts = parts;
-        this.contextKeyService = contextKeyService;
         this._instantiationService = _instantiationService;
+        this.contextKeyService = contextKeyService;
         this._contextMenuService = _contextMenuService;
         this._fileService = _fileService;
+        this._markdownRendererService = _markdownRendererService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._currentWidth = 0;
@@ -41,6 +44,12 @@ let ChatToolOutputContentSubPart = class ChatToolOutputContentSubPart extends Di
         this.domNode = this.createOutputContents();
         this._currentWidth = context.currentWidth();
     }
+    toMdString(value) {
+        if (typeof value === 'string') {
+            return ( new MarkdownString('')).appendText(value);
+        }
+        return ( new MarkdownString(value.value, { isTrusted: value.isTrusted }));
+    }
     createOutputContents() {
         const container = $('div');
         for (let i = 0; i < this.parts.length; i++) {
@@ -110,6 +119,12 @@ let ChatToolOutputContentSubPart = class ChatToolOutputContentSubPart extends Di
         toolbar.context = { parts };
     }
     addCodeBlock(part, container) {
+        if (part.title) {
+            const title = $('div.chat-confirmation-widget-title');
+            const renderedTitle = this._register(this._markdownRendererService.render(this.toMdString(part.title)));
+            title.appendChild(renderedTitle.element);
+            container.appendChild(title);
+        }
         const data = {
             languageId: part.languageId,
             textModel: Promise.resolve(part.textModel),
@@ -133,17 +148,18 @@ let ChatToolOutputContentSubPart = class ChatToolOutputContentSubPart extends Di
     }
 };
 ChatToolOutputContentSubPart = ( __decorate([
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IInstantiationService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IContextKeyService)),
     ( __param(4, IContextMenuService)),
-    ( __param(5, IFileService))
+    ( __param(5, IFileService)),
+    ( __param(6, IMarkdownRendererService))
 ], ChatToolOutputContentSubPart));
 class SaveResourcesAction extends Action2 {
     static { this.ID = 'chat.toolOutput.save'; }
     constructor() {
         super({
             id: SaveResourcesAction.ID,
-            title: ( localize2(5121, "Save As...")),
+            title: ( localize2(5691, "Save As...")),
             icon: Codicon.cloudDownload,
             menu: [{
                     id: MenuId.ChatToolOutputResourceToolbar,
@@ -175,14 +191,14 @@ class SaveResourcesAction extends Action2 {
                 }
             }
             catch (e) {
-                notificationService.error(( localize(5122, "Failed to save {0}: {1}", basename(part.uri), e)));
+                notificationService.error(( localize(5692, "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(5123, "Saving resources...")),
+                title: ( localize(5693, "Saving resources...")),
             }, async (report) => {
                 for (const task of todo) {
                     await task();
@@ -193,7 +209,7 @@ class SaveResourcesAction extends Action2 {
                 commandService.executeCommand(REVEAL_IN_EXPLORER_COMMAND_ID, thenReveal);
             }
             else {
-                notificationService.info(( localize(5124, "Saved resources to {0}", labelService.getUriLabel(thenReveal))));
+                notificationService.info(( localize(5694, "Saved resources to {0}", labelService.getUriLabel(thenReveal))));
             }
         };
         if (context.parts.length === 1) {
@@ -206,7 +222,7 @@ class SaveResourcesAction extends Action2 {
         }
         else {
             const uris = await fileDialog.showOpenDialog({
-                title: ( localize(5125, "Pick folder to save resources")),
+                title: ( localize(5695, "Pick folder to save resources")),
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatTreeContentPart.d.ts

@@ -7,9 +7,9 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IDisposableReference } from "./chatCollections.js";
-import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatResponseProgressFileTreeData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatResponseProgressFileTreeData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 export declare class ChatTreeContentPart extends Disposable implements IChatContentPart {
     private readonly openerService;
     readonly domNode: HTMLElement;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatTreeContentPart.js

@@ -81,7 +81,7 @@ let TreePool = class TreePool extends Disposable {
             },
             accessibilityProvider: {
                 getAriaLabel: (element) => element.label,
-                getWidgetAriaLabel: () => ( localize(5126, "File Tree"))
+                getWidgetAriaLabel: () => ( localize(5696, "File Tree"))
             },
             alwaysConsumeMouseWheel: false
         });

package/vscode/src/vs/workbench/contrib/chat/browser/{codeBlockPart.d.ts → widget/chatContentParts/codeBlockPart.d.ts}

@@ -20,12 +20,12 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { IMarkdownVulnerability } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/annotations";
-import { IChatResponseModel, IChatTextEditGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IMarkdownVulnerability } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/annotations";
+import { IChatResponseModel, IChatTextEditGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatResponseViewModel } 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 { IChatRendererDelegate } from "./chatListRenderer.js";
-import { ChatEditorOptions } from "./chatOptions.js";
+import { IChatRendererDelegate } from "../chatListRenderer.js";
+import { ChatEditorOptions } from "../chatOptions.js";
 export interface ICodeBlockData {
     readonly codeBlockIndex: number;
     readonly codeBlockPartIndex: number;