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

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

@@ -1,5 +1,7 @@
 
+import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import * as chatInlineAnchorWidget from './media/chatInlineAnchorWidget.css';
 import { $, addDisposableListener, EventType, getWindow, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
@@ -37,10 +39,11 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 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 { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from './chatAttachmentWidgets.js';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
+import { chatAttachmentResourceContextKey, hookUpSymbolAttachmentDragAndContextMenu } from '../../attachments/chatAttachmentWidgets.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 
 var InlineAnchorWidget_1;
+registerCss(chatInlineAnchorWidget);
 function renderFileWidgets(element, instantiationService, chatMarkdownAnchorService, disposables) {
     const links = element.querySelectorAll('a');
     links.forEach(a => {
@@ -141,11 +144,11 @@ let InlineAnchorWidget = class InlineAnchorWidget extends Disposable {
             }));
             if (location.range) {
                 if (location.range.startLineNumber === location.range.endLineNumber) {
-                    element.setAttribute('aria-label', ( localize(5294, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
+                    element.setAttribute('aria-label', ( localize(5619, "{0} line {1}", filePathLabel, location.range.startLineNumber)));
                 }
                 else {
                     element.setAttribute('aria-label', ( localize(
-                        5295,
+                        5620,
                         "{0} lines {1} to {2}",
                         filePathLabel,
                         location.range.startLineNumber,
@@ -204,7 +207,7 @@ registerAction2(class AddFileToChatAction extends Action2 {
     constructor() {
         super({
             id: AddFileToChatAction.id,
-            title: ( localize2(5296, "Add File to Chat")),
+            title: ( localize2(5621, "Add File to Chat")),
             menu: [{
                     id: MenuId.ChatInlineResourceAnchorContext,
                     group: 'chat',
@@ -226,7 +229,7 @@ registerAction2(class CopyResourceAction extends Action2 {
     constructor() {
         super({
             id: CopyResourceAction.id,
-            title: ( localize2(5297, "Copy")),
+            title: ( localize2(5622, "Copy")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -251,7 +254,7 @@ registerAction2(class OpenToSideResourceAction extends Action2 {
     constructor() {
         super({
             id: OpenToSideResourceAction.id,
-            title: ( localize2(5298, "Open to the Side")),
+            title: ( localize2(5623, "Open to the Side")),
             f1: false,
             precondition: chatAttachmentResourceContextKey,
             keybinding: {
@@ -304,8 +307,8 @@ registerAction2(class GoToDefinitionAction extends Action2 {
         super({
             id: GoToDefinitionAction.id,
             title: {
-                ...( localize2(5299, "Go to Definition")),
-                mnemonicTitle: ( localize(5300, "Go to &&Definition")),
+                ...( localize2(5624, "Go to Definition")),
+                mnemonicTitle: ( localize(5625, "Go to &&Definition")),
             },
             menu: ( [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
                 id,
@@ -348,8 +351,8 @@ registerAction2(class GoToTypeDefinitionsAction extends Action2 {
         super({
             id: GoToTypeDefinitionsAction.id,
             title: {
-                ...( localize2(5301, "Go to Type Definitions")),
-                mnemonicTitle: ( localize(5302, "Go to &&Type Definitions")),
+                ...( localize2(5626, "Go to Type Definitions")),
+                mnemonicTitle: ( localize(5627, "Go to &&Type Definitions")),
             },
             menu: ( [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
                 id,
@@ -369,8 +372,8 @@ registerAction2(class GoToImplementations extends Action2 {
         super({
             id: GoToImplementations.id,
             title: {
-                ...( localize2(5303, "Go to Implementations")),
-                mnemonicTitle: ( localize(5304, "Go to &&Implementations")),
+                ...( localize2(5628, "Go to Implementations")),
+                mnemonicTitle: ( localize(5629, "Go to &&Implementations")),
             },
             menu: ( [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
                 id,
@@ -390,8 +393,8 @@ registerAction2(class GoToReferencesAction extends Action2 {
         super({
             id: GoToReferencesAction.id,
             title: {
-                ...( localize2(5305, "Go to References")),
-                mnemonicTitle: ( localize(5306, "Go to &&References")),
+                ...( localize2(5630, "Go to References")),
+                mnemonicTitle: ( localize(5631, "Go to &&References")),
             },
             menu: ( [MenuId.ChatInlineSymbolAnchorContext, MenuId.ChatInputSymbolAttachmentContext].map(id => ({
                 id,

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

@@ -14,14 +14,14 @@ import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
-import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatMarkdownContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { CodeBlockModelCollection } from "../../common/codeBlockModelCollection.js";
+import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatMarkdownContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { CodeBlockModelCollection } from "../../../common/widget/codeBlockModelCollection.js";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { ICodeBlockRenderOptions } from "../codeBlockPart.js";
+import { ICodeBlockRenderOptions } from "./codeBlockPart.js";
 import { EditorPool } from "./chatContentCodePools.js";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export interface IChatMarkdownContentPartOptions {
     readonly codeBlockRenderOptions?: ICodeBlockRenderOptions;
     readonly allowInlineDiffs?: boolean;

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

@@ -31,7 +31,7 @@ import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/ac
 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 { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { registerOpenEditorListeners } from '../../../../../platform/editor/browser/editor.js';
+import { registerOpenEditorListeners } from '../../../../../../platform/editor/browser/editor.js';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 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';
@@ -40,16 +40,16 @@ import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/ser
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { MarkedKatexSupport } from '../../../markdown/browser/markedKatexSupport.js';
-import { extractCodeblockUrisFromText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/annotations';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { MarkedKatexSupport } from '../../../../markdown/browser/markedKatexSupport.js';
+import { extractCodeblockUrisFromText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/annotations';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { allowedChatMarkdownHtmlTags } from '../chatContentMarkdownRenderer.js';
-import { parseUnifiedDiff, MarkdownDiffBlockPart } from '../chatDiffBlockPart.js';
-import { ChatMarkdownDecorationsRenderer } from '../chatMarkdownDecorationsRenderer.js';
-import { localFileLanguageId, parseLocalFileData, CodeBlockPart } from '../codeBlockPart.js';
-import * as chatCodeBlockPill from '../media/chatCodeBlockPill.css';
+import { parseUnifiedDiff, MarkdownDiffBlockPart } from './chatDiffBlockPart.js';
+import { ChatMarkdownDecorationsRenderer } from './chatMarkdownDecorationsRenderer.js';
+import { localFileLanguageId, parseLocalFileData, CodeBlockPart } from './codeBlockPart.js';
+import * as chatCodeBlockPill from './media/chatCodeBlockPill.css';
 import { ChatExtensionsContentPart } from './chatExtensionsContentPart.js';
 import * as chatMarkdownPart from './media/chatMarkdownPart.css';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -486,7 +486,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(5057, 'Applying edits'));
+                statusLabelEl.textContent = ( localize(5632, 'Applying edits'));
                 const showAnimation = this.configurationService.getValue(ChatConfiguration.ShowCodeBlockProgressAnimation);
                 if (showAnimation) {
                     progressFill.style.width = `${rwRatio}%`;
@@ -496,14 +496,14 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 else {
                     progressFill.style.width = '0%';
                     this.pillElement.classList.remove('progress-filling');
-                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(5058, "Generating edits...")) : ( localize(5059, "({0}%)...", rwRatio));
+                    labelDetail.textContent = rwRatio === 0 || !rwRatio ? ( localize(5633, "Generating edits...")) : ( localize(5634, "({0}%)...", rwRatio));
                 }
             }
             else {
                 const statusCodeicon = Codicon.check;
                 statusIconClasses = ThemeIcon.asClassNameArray(statusCodeicon);
                 statusIconEl.classList.add(...statusIconClasses);
-                statusLabelEl.textContent = ( localize(5060, 'Edited'));
+                statusLabelEl.textContent = ( localize(5635, 'Edited'));
                 const fileKind = uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
                 pillIconClasses = getIconClasses(this.modelService, this.languageService, uri, fileKind);
                 iconEl.classList.add(...pillIconClasses);
@@ -523,10 +523,10 @@ let CollapsedCodeBlock = class CollapsedCodeBlock extends Disposable {
                 this.currentDiff = changes;
                 labelAdded.textContent = `+${changes.added}`;
                 labelRemoved.textContent = `-${changes.removed}`;
-                const insertionsFragment = changes.added === 1 ? ( localize(5061, "1 insertion")) : ( localize(5062, "{0} insertions", changes.added));
-                const deletionsFragment = changes.removed === 1 ? ( localize(5063, "1 deletion")) : ( localize(5064, "{0} deletions", changes.removed));
+                const insertionsFragment = changes.added === 1 ? ( localize(5636, "1 insertion")) : ( localize(5637, "{0} insertions", changes.added));
+                const deletionsFragment = changes.removed === 1 ? ( localize(5638, "1 deletion")) : ( localize(5639, "{0} deletions", changes.removed));
                 const summary = ( localize(
-                    5065,
+                    5640,
                     'Edited {0}, {1}, {2}',
                     iconText,
                     insertionsFragment,

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

@@ -6,14 +6,14 @@ import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscod
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { IChatAgentCommand, IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatMarkdownContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { IChatAgentCommand, IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes";
+import { IChatMarkdownContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-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";
 export declare function agentToMarkdown(agent: IChatAgentData, sessionResource: URI, isClickable: boolean, accessor: ServicesAccessor): string;
 export declare function agentSlashCommandToMarkdown(agent: IChatAgentData, command: IChatAgentCommand, sessionResource: URI): string;
 export interface IDecorationWidgetArgs {

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

@@ -1,5 +1,4 @@
 
-import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
@@ -15,20 +14,18 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import { contentRefUrl } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/annotations';
-import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { IChatAgentNameService, IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatSlashCommandForeground, chatSlashCommandBackground } from '../common/chatColors.js';
-import { chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestToolPart, chatAgentLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { contentRefUrl } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/annotations';
+import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
+import { IChatAgentNameService, IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { chatSlashCommandForeground, chatSlashCommandBackground } from '../../../common/widget/chatColors.js';
+import { chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestToolPart, chatAgentLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
+import { ChatAgentHover, getChatAgentHoverOptions } from '../chatAgentHover.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { InlineAnchorWidget } from './chatInlineAnchorWidget.js';
-import * as chatInlineAnchorWidget from './media/chatInlineAnchorWidget.css';
 
-registerCss(chatInlineAnchorWidget);
 const decorationRefUrl = `http://_vscodedecoration_`;
 const agentRefUrl = `http://_chatagent_`;
 const agentSlashRefUrl = `http://_chatslash_`;

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

@@ -3,9 +3,9 @@ import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
-import { IChatMcpServersStarting } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
+import { IChatMcpServersStarting } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatMcpServersInteractionContentPart extends Disposable implements IChatContentPart {
     private readonly data;
     private readonly context;

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

@@ -18,7 +18,7 @@ import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatProgressContentPart } from './chatProgressContentPart.js';
 import * as chatMcpServersInteractionContent from './media/chatMcpServersInteractionContent.css';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -100,16 +100,16 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
     }
     updateDetailedProgress(state) {
         const skipText = createMarkdownCommandLink({
-            title: ( localize(5066, 'Skip?')),
+            title: ( localize(5641, 'Skip?')),
             id: McpCommandIds.SkipCurrentAutostart,
         });
         let content;
         if (state.starting.length === 0) {
-            content = ( new MarkdownString(undefined, { isTrusted: true })).appendText(( localize(5067, 'Activating MCP extensions...')) + ' ').appendMarkdown(skipText);
+            content = ( new MarkdownString(undefined, { isTrusted: true })).appendText(( localize(5642, 'Activating MCP extensions...')) + ' ').appendMarkdown(skipText);
         }
         else {
             const serverLinks = this.createServerCommandLinks(state.starting);
-            content = ( new MarkdownString(undefined, { isTrusted: true })).appendMarkdown(( localize(5068, 'Starting MCP servers {0}...', serverLinks)) + ' ').appendMarkdown(skipText);
+            content = ( new MarkdownString(undefined, { isTrusted: true })).appendMarkdown(( localize(5643, 'Starting MCP servers {0}...', serverLinks)) + ' ').appendMarkdown(skipText);
         }
         if (this.workingProgressPart) {
             this.workingProgressPart.updateMessage(content);
@@ -143,13 +143,13 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
         const links = this.createServerCommandLinks(serversRequiringInteraction);
         const content = count === 1
             ? ( localize(
-            5069,
+            5644,
             'The MCP server {0} may have new tools and requires interaction to start. [Start it now?]({1})',
             links,
             '#start'
         ))
             : ( localize(
-            5070,
+            5645,
             'The MCP servers {0} may have new tools and require interaction to start. [Start them now?]({1})',
             links,
             '#start'
@@ -184,7 +184,7 @@ let ChatMcpServersInteractionContentPart = class ChatMcpServersInteractionConten
             const serversToStart = state.serversRequiringInteraction;
             for (let i = 0; i < serversToStart.length; i++) {
                 const serverInfo = serversToStart[i];
-                startLink.textContent = ( localize(5071, "Starting {0}...", serverInfo.label));
+                startLink.textContent = ( localize(5646, "Starting {0}...", serverInfo.label));
                 this._onDidChangeHeight.fire();
                 const server = this.mcpService.servers.get().find(s => s.definition.id === serverInfo.id);
                 if (server) {

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

@@ -1,21 +1,19 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.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 { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatMultiDiffData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatMultiDiffData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+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/chatContentParts/chatContentParts";
+import { IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 export declare class ChatMultiDiffContentPart extends Disposable implements IChatContentPart {
     private readonly content;
     private readonly _element;
     private readonly instantiationService;
     private readonly editorService;
     private readonly themeService;
-    private readonly menuService;
     private readonly contextKeyService;
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
@@ -24,7 +22,7 @@ export declare class ChatMultiDiffContentPart extends Disposable implements ICha
     private isCollapsed;
     private readonly readOnly;
     private readonly diffData;
-    constructor(content: IChatMultiDiffData, _element: ChatTreeItem, instantiationService: IInstantiationService, editorService: IEditorService, themeService: IThemeService, menuService: IMenuService, contextKeyService: IContextKeyService);
+    constructor(content: IChatMultiDiffData, _element: ChatTreeItem, instantiationService: IInstantiationService, editorService: IEditorService, themeService: IThemeService, contextKeyService: IContextKeyService);
     private renderHeader;
     private renderViewAllFileChangesButton;
     private renderContributedButtons;

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

@@ -1,7 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ as $$1, addDisposableListener, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { ActionBar, ActionsOrientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { ButtonWithIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -11,11 +10,12 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { WorkbenchList } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
@@ -24,8 +24,8 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { createFileIconThemableTreeContainerScope } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/views/explorerView';
 import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
 import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { isObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -34,14 +34,13 @@ const $ = $$1;
 const ELEMENT_HEIGHT = 22;
 const MAX_ITEMS_SHOWN = 6;
 let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable {
-    constructor(content, _element, instantiationService, editorService, themeService, menuService, contextKeyService) {
+    constructor(content, _element, instantiationService, editorService, themeService, contextKeyService) {
         super();
         this.content = content;
         this._element = _element;
         this.instantiationService = instantiationService;
         this.editorService = editorService;
         this.themeService = themeService;
-        this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
@@ -63,8 +62,8 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
         this._register(autorun(reader => {
             const fileCount = this.diffData.read(reader).resources.length;
             viewListButton.label = fileCount === 1
-                ? ( localize(5072, 'Changed 1 file'))
-                : ( localize(5073, 'Changed {0} files', fileCount));
+                ? ( localize(5647, 'Changed 1 file'))
+                : ( localize(5648, 'Changed {0} files', fileCount));
         }));
         const setExpansionState = () => {
             viewListButton.icon = this.isCollapsed ? Codicon.chevronRight : Codicon.chevronDown;
@@ -87,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(5074, 'Open Changes'));
+        button.title = ( localize(5649, 'Open Changes'));
         return addDisposableListener(button, 'click', (e) => {
             const source = ( URI.parse(`multi-diff-editor:${( ( new Date()).getMilliseconds().toString()) + ( Math.random().toString())}`));
             const { title, resources } = this.diffData.get();
@@ -100,28 +99,25 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
     renderContributedButtons(container) {
         const buttonsContainer = container.appendChild($('.chat-multidiff-contributed-buttons'));
         const disposables = ( new DisposableStore());
-        const actionBar = disposables.add(( new ActionBar(buttonsContainer, {
-            orientation: ActionsOrientation.HORIZONTAL
-        })));
-        const setupActionBar = () => {
-            actionBar.clear();
-            const type = getChatSessionType(this._element.sessionResource);
-            let marshalledUri = undefined;
-            let contextKeyService = this.contextKeyService;
-            contextKeyService = this.contextKeyService.createOverlay([
-                [ChatContextKeys.agentSessionType.key, type]
-            ]);
-            marshalledUri = {
-                ...this._element.sessionResource,
-                $mid: MarshalledId.Uri
-            };
-            const actions = this.menuService.getMenuActions(MenuId.ChatMultiDiffContext, contextKeyService, { arg: marshalledUri, shouldForwardArgs: true });
-            const allActions = actions.flatMap(([, actions]) => actions);
-            if (allActions.length > 0) {
-                actionBar.push(allActions, { icon: true, label: false });
-            }
+        const type = getChatSessionType(this._element.sessionResource);
+        const overlay = this.contextKeyService.createOverlay([
+            [ChatContextKeys.agentSessionType.key, type]
+        ]);
+        const nestedInsta = disposables.add(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, overlay]))));
+        const marshalledUri = {
+            ...this._element.sessionResource,
+            $mid: MarshalledId.Uri
         };
-        setupActionBar();
+        const toolbar = disposables.add(nestedInsta.createInstance(MenuWorkbenchToolBar, buttonsContainer, MenuId.ChatMultiDiffContext, {
+            menuOptions: {
+                arg: marshalledUri,
+                shouldForwardArgs: true,
+            },
+            toolbarOptions: {
+                primaryGroup: () => true,
+            },
+        }));
+        disposables.add(toolbar.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
         return disposables;
     }
     renderFilesList(container) {
@@ -140,7 +136,7 @@ let ChatMultiDiffContentPart = class ChatMultiDiffContentPart extends Disposable
             alwaysConsumeMouseWheel: false,
             accessibilityProvider: {
                 getAriaLabel: (element) => element.uri.path,
-                getWidgetAriaLabel: () => ( localize(5075, "File Changes"))
+                getWidgetAriaLabel: () => ( localize(5650, "File Changes"))
             }
         }));
         this._register(autorun(reader => {
@@ -205,8 +201,7 @@ ChatMultiDiffContentPart = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IEditorService)),
     ( __param(4, IThemeService)),
-    ( __param(5, IMenuService)),
-    ( __param(6, IContextKeyService))
+    ( __param(5, IContextKeyService))
 ], ChatMultiDiffContentPart));
 class ChatMultiDiffListDelegate {
     getHeight() {
@@ -236,7 +231,7 @@ class ChatMultiDiffListRenderer {
             title: element.uri.path
         });
         const labelElement = templateData.label.element;
-        labelElement.querySelector(`.${ChatMultiDiffListRenderer.CHANGES_SUMMARY_CLASS_NAME}`)?.remove();
+        templateData.changesElement?.remove();
         if (element.diff?.added || element.diff?.removed) {
             const changesSummary = labelElement.appendChild($(`.${ChatMultiDiffListRenderer.CHANGES_SUMMARY_CLASS_NAME}`));
             const addedElement = changesSummary.appendChild($('.insertions'));
@@ -244,11 +239,12 @@ class ChatMultiDiffListRenderer {
             const removedElement = changesSummary.appendChild($('.deletions'));
             removedElement.textContent = `-${element.diff.removed}`;
             changesSummary.setAttribute('aria-label', ( localize(
-                5076,
+                5651,
                 '{0} lines added, {1} lines removed',
                 element.diff.added,
                 element.diff.removed
             )));
+            templateData.changesElement = changesSummary;
         }
     }
     disposeTemplate(templateData) {

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

@@ -3,14 +3,14 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatProgressMessage, IChatTask, IChatTaskSerialized, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatProgressMessage, IChatTask, IChatTaskSerialized, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+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, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+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 { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 export declare class ChatProgressContentPart extends Disposable implements IChatContentPart {
     private readonly chatContentMarkdownRenderer;
     private readonly toolInvocation;