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

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

@@ -3,20 +3,20 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { $, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { createMarkdownCommandLink, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { getToolApprovalMessage } from './toolInvocationParts/chatToolPartUtilities.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 { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 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/languageModelToolsService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 
 let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
     constructor(progress, chatContentMarkdownRenderer, context, forceShowSpinner, forceShowMessage, icon, toolInvocation, instantiationService, chatMarkdownAnchorService, configurationService) {
@@ -69,40 +69,7 @@ let ChatProgressContentPart = class ChatProgressContentPart extends Disposable {
         return other.kind === 'progressMessage' && this.showSpinner === showSpinner;
     }
     createApprovalMessage() {
-        if (!this.toolInvocation) {
-            return undefined;
-        }
-        const reason = IChatToolInvocation.executionConfirmedOrDenied(this.toolInvocation);
-        if (!reason || typeof reason === 'boolean') {
-            return undefined;
-        }
-        let md;
-        switch (reason.type) {
-            case ToolConfirmKind.Setting:
-                md = ( localize(
-                    5077,
-                    'Auto approved by {0}',
-                    createMarkdownCommandLink({ title: '`' + reason.id + '`', id: 'workbench.action.openSettings', arguments: [reason.id] }, false)
-                ));
-                break;
-            case ToolConfirmKind.LmServicePerTool:
-                md = reason.scope === 'session'
-                    ? ( localize(5078, 'Auto approved for this session'))
-                    : reason.scope === 'workspace'
-                        ? ( localize(5079, 'Auto approved for this workspace'))
-                        : ( localize(5080, 'Auto approved for this profile'));
-                md += ' (' + createMarkdownCommandLink({ title: ( localize(5081, 'Edit')), id: 'workbench.action.chat.editToolApproval', arguments: [reason.scope] }) + ')';
-                break;
-            case ToolConfirmKind.UserAction:
-            case ToolConfirmKind.Denied:
-            case ToolConfirmKind.ConfirmationNotNeeded:
-            default:
-                return;
-        }
-        if (!md) {
-            return undefined;
-        }
-        return ( new MarkdownString(md, { isTrusted: true }));
+        return this.toolInvocation && getToolApprovalMessage(this.toolInvocation);
     }
 };
 ChatProgressContentPart = ( __decorate([
@@ -137,12 +104,12 @@ let ChatWorkingProgressContentPart = class ChatWorkingProgressContentPart extend
     constructor(_workingProgress, chatContentMarkdownRenderer, context, instantiationService, chatMarkdownAnchorService, configurationService, languageModelToolsService) {
         const progressMessage = {
             kind: 'progressMessage',
-            content: ( new MarkdownString()).appendText(( localize(5082, "Working...")))
+            content: ( new MarkdownString()).appendText(( localize(5652, "Working...")))
         };
         super(progressMessage, chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, instantiationService, chatMarkdownAnchorService, configurationService);
         this._register(languageModelToolsService.onDidPrepareToolCallBecomeUnresponsive(e => {
             if (context.element.sessionId === e.sessionId) {
-                this.updateMessage(( new MarkdownString(( localize(5083, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
+                this.updateMessage(( new MarkdownString(( localize(5653, "Waiting for tool '{0}' to respond...", e.toolData.displayName)))));
             }
         }));
     }

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

@@ -1,8 +1,8 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatPullRequestContent } 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 { IChatPullRequestContent } 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";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 export declare class ChatPullRequestContentPart extends Disposable implements IChatContentPart {
     private readonly pullRequestContent;

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

@@ -33,7 +33,7 @@ let ChatPullRequestContentPart = class ChatPullRequestContentPart extends Dispos
         descriptionWrapper.textContent = plainText;
         const seeMoreContainer = append(descriptionElement, $('.see-more'));
         const seeMore = append(seeMoreContainer, $('a'));
-        seeMore.textContent = ( localize(5084, 'See more'));
+        seeMore.textContent = ( localize(5654, 'See more'));
         this._register(addDisposableListener(seeMore, 'click', (e) => {
             e.preventDefault();
             e.stopPropagation();

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

@@ -3,9 +3,9 @@ import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
-import { IChatErrorDetailsPart, IChatRendererContent, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatErrorDetailsPart, IChatRendererContent, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-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 ChatQuotaExceededPart extends Disposable implements IChatContentPart {
     private readonly content;
     readonly domNode: HTMLElement;

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

@@ -48,10 +48,10 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
         switch (chatEntitlementService.entitlement) {
             case ChatEntitlement.Pro:
             case ChatEntitlement.ProPlus:
-                primaryButtonLabel = ( localize(5085, "Manage Paid Premium Requests"));
+                primaryButtonLabel = ( localize(5655, "Manage Paid Premium Requests"));
                 break;
             case ChatEntitlement.Free:
-                primaryButtonLabel = ( localize(5086, "Upgrade to GitHub Copilot Pro"));
+                primaryButtonLabel = ( localize(5656, "Upgrade to GitHub Copilot Pro"));
                 break;
         }
         let hasAddedWaitWarning = false;
@@ -60,7 +60,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 return;
             }
             hasAddedWaitWarning = true;
-            append(messageContainer, $('.chat-quota-wait-warning', undefined, ( localize(5087, "Changes may take a few minutes to take effect."))));
+            append(messageContainer, $('.chat-quota-wait-warning', undefined, ( localize(5657, "Changes may take a few minutes to take effect."))));
         };
         let hasAddedRetryButton = false;
         const addRetryButtonIfNeeded = () => {
@@ -73,7 +73,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 buttonForeground: asCssVariable(textLinkForeground)
             })));
             retryButton.element.classList.add('chat-quota-error-secondary-button');
-            retryButton.label = ( localize(5088, "Click to Retry"));
+            retryButton.label = ( localize(5658, "Click to Retry"));
             this._onDidChangeHeight.fire();
             this._register(retryButton.onDidClick(() => {
                 const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);

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

@@ -10,13 +10,14 @@ import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { WorkbenchList } from "@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
-import { IChatContentReference, IChatWarningMessage } 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 { ModifiedFileEntryState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatContentReference, IChatWarningMessage } 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 { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
 import { IDisposableReference } from "./chatCollections.js";
-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 { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 export interface IChatReferenceListItem extends IChatContentReference {
     title?: string;
     description?: string;
@@ -38,7 +39,7 @@ export declare class ChatCollapsibleListContentPart extends ChatCollapsibleConte
     private readonly menuService;
     private readonly instantiationService;
     private readonly contextMenuService;
-    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService);
+    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, hoverMessage: IMarkdownString | undefined, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, hoverService: IHoverService);
     protected initContent(): HTMLElement;
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
 }
@@ -47,7 +48,7 @@ export interface IChatUsedReferencesListOptions {
 }
 export declare class ChatUsedReferencesListContentPart extends ChatCollapsibleListContentPart {
     private readonly options;
-    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, options: IChatUsedReferencesListOptions, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService);
+    constructor(data: ReadonlyArray<IChatCollapsibleListItem>, labelOverride: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, contentReferencesListPool: CollapsibleListPool, options: IChatUsedReferencesListOptions, openerService: IOpenerService, menuService: IMenuService, instantiationService: IInstantiationService, contextMenuService: IContextMenuService, hoverService: IHoverService);
     protected isExpanded(): boolean;
     protected setExpanded(value: boolean): void;
 }

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

@@ -33,19 +33,20 @@ import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { SETTINGS_AUTHORITY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences';
 import { createFileIconThemableTreeContainerScope } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/browser/views/explorerView';
 import { ExplorerFolderContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
-import { chatEditingWidgetFileStateContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-import { ChatResponseReferencePartStatusKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { chatEditingWidgetFileStateContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { ChatResponseReferencePartStatusKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import { ResourcePool } from './chatCollections.js';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 
 var CollapsibleListRenderer_1, DividerRenderer_1;
 const $ = $$1;
 let ChatCollapsibleListContentPart = class ChatCollapsibleListContentPart extends ChatCollapsibleContentPart {
-    constructor(data, labelOverride, context, contentReferencesListPool, openerService, menuService, instantiationService, contextMenuService) {
+    constructor(data, labelOverride, context, contentReferencesListPool, hoverMessage, openerService, menuService, instantiationService, contextMenuService, hoverService) {
         super(labelOverride ?? (data.length > 1 ?
-            ( localize(5089, "Used {0} references", data.length)) :
-            ( localize(5090, "Used {0} reference", 1))), context);
+            ( localize(5659, "Used {0} references", data.length)) :
+            ( localize(5660, "Used {0} reference", 1))), context, hoverMessage, hoverService);
         this.data = data;
         this.contentReferencesListPool = contentReferencesListPool;
         this.openerService = openerService;
@@ -108,14 +109,15 @@ let ChatCollapsibleListContentPart = class ChatCollapsibleListContentPart extend
     }
 };
 ChatCollapsibleListContentPart = ( __decorate([
-    ( __param(4, IOpenerService)),
-    ( __param(5, IMenuService)),
-    ( __param(6, IInstantiationService)),
-    ( __param(7, IContextMenuService))
+    ( __param(5, IOpenerService)),
+    ( __param(6, IMenuService)),
+    ( __param(7, IInstantiationService)),
+    ( __param(8, IContextMenuService)),
+    ( __param(9, IHoverService))
 ], ChatCollapsibleListContentPart));
 let ChatUsedReferencesListContentPart = class ChatUsedReferencesListContentPart extends ChatCollapsibleListContentPart {
-    constructor(data, labelOverride, context, contentReferencesListPool, options, openerService, menuService, instantiationService, contextMenuService) {
-        super(data, labelOverride, context, contentReferencesListPool, openerService, menuService, instantiationService, contextMenuService);
+    constructor(data, labelOverride, context, contentReferencesListPool, options, openerService, menuService, instantiationService, contextMenuService, hoverService) {
+        super(data, labelOverride, context, contentReferencesListPool, undefined, openerService, menuService, instantiationService, contextMenuService, hoverService);
         this.options = options;
         if (data.length === 0) {
             hide(this.domNode);
@@ -134,7 +136,8 @@ ChatUsedReferencesListContentPart = ( __decorate([
     ( __param(5, IOpenerService)),
     ( __param(6, IMenuService)),
     ( __param(7, IInstantiationService)),
-    ( __param(8, IContextMenuService))
+    ( __param(8, IContextMenuService)),
+    ( __param(9, IHoverService))
 ], ChatUsedReferencesListContentPart));
 let CollapsibleListPool = class CollapsibleListPool extends Disposable {
     get inUse() {
@@ -179,7 +182,7 @@ let CollapsibleListPool = class CollapsibleListPool extends Disposable {
                         return basename(reference.uri.path);
                     }
                 },
-                getWidgetAriaLabel: () => ( localize(5091, "Collapsible Chat References List"))
+                getWidgetAriaLabel: () => ( localize(5661, "Collapsible Chat References List"))
             },
             dnd: {
                 getDragURI: (element) => getResourceForElement(element)?.toString() ?? null,
@@ -327,7 +330,7 @@ let CollapsibleListRenderer = class CollapsibleListRenderer {
             }
             else if (uri.scheme === this.productService.urlProtocol && isEqualAuthority(uri.authority, SETTINGS_AUTHORITY)) {
                 const settingId = uri.path.substring(1);
-                templateData.label.setResource({ resource: uri, name: settingId }, { icon: Codicon.settingsGear, title: ( localize(5092, "Open setting '{0}'", settingId)), strikethrough: data.excluded, extraClasses });
+                templateData.label.setResource({ resource: uri, name: settingId }, { icon: Codicon.settingsGear, title: ( localize(5662, "Open setting '{0}'", settingId)), strikethrough: data.excluded, extraClasses });
             }
             else if (matchesSomeScheme(uri, Schemas.mailto, Schemas.http, Schemas.https)) {
                 templateData.label.setResource({ resource: uri, name: ( uri.toString(true)) }, { icon: icon ?? Codicon.globe, title: data.options?.status?.description ?? data.title ?? ( uri.toString(true)), strikethrough: data.excluded, extraClasses });
@@ -364,7 +367,7 @@ let CollapsibleListRenderer = class CollapsibleListRenderer {
                     templateData.addedSpan.textContent = `+${diffMeta.added}`;
                     templateData.removedSpan.textContent = `-${diffMeta.removed}`;
                     templateData.fileDiffsContainer.setAttribute('aria-label', ( localize(
-                        5093,
+                        5663,
                         '{0} lines added, {1} lines removed',
                         diffMeta.added,
                         diffMeta.removed
@@ -481,7 +484,7 @@ registerAction2(class AddToChatAction extends Action2 {
         super({
             id: AddToChatAction.id,
             title: {
-                ...( localize2(5094, "Add File to Chat")),
+                ...( localize2(5664, "Add File to Chat")),
             },
             f1: false,
             menu: [{
@@ -509,7 +512,7 @@ registerAction2(class OpenChatReferenceLinkAction extends Action2 {
         super({
             id: OpenChatReferenceLinkAction.id,
             title: {
-                ...( localize2(5095, "Copy Link")),
+                ...( localize2(5665, "Copy Link")),
             },
             f1: false,
             menu: [{

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

@@ -42,8 +42,8 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
             return;
         }
         this._currentMode = mode;
-        const modeName = mode.name.get() || mode.label.get() || ( localize(5096, 'current mode'));
-        this.titleElement.textContent = ( localize(5097, 'Proceed from {0}', modeName));
+        const modeName = mode.name.get() || mode.label.get() || ( localize(5666, 'current mode'));
+        this.titleElement.textContent = ( localize(5667, 'Proceed from {0}', modeName));
         const childrenToRemove = [];
         for (let i = 1; i < this.promptsContainer.children.length; i++) {
             childrenToRemove.push(this.promptsContainer.children[i]);
@@ -68,7 +68,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
         const button = $('.chat-welcome-view-suggested-prompt');
         button.setAttribute('tabindex', '0');
         button.setAttribute('role', 'button');
-        button.setAttribute('aria-label', ( localize(5098, '{0}', handoff.label)));
+        button.setAttribute('aria-label', ( localize(5668, '{0}', handoff.label)));
         const titleElement = append(button, $('.chat-welcome-view-suggested-prompt-title'));
         titleElement.textContent = handoff.label;
         const showContinueOn = handoff.showContinueOn ?? true;
@@ -79,7 +79,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
             const dropdownContainer = append(button, $('.chat-suggest-next-dropdown'));
             dropdownContainer.setAttribute('tabindex', '0');
             dropdownContainer.setAttribute('role', 'button');
-            dropdownContainer.setAttribute('aria-label', ( localize(5099, 'More options for {0}', handoff.label)));
+            dropdownContainer.setAttribute('aria-label', ( localize(5669, 'More options for {0}', handoff.label)));
             dropdownContainer.setAttribute('aria-haspopup', 'true');
             const separator = append(dropdownContainer, $('.chat-suggest-next-separator'));
             separator.setAttribute('aria-hidden', 'true');
@@ -94,7 +94,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
                     const name = getAgentSessionProviderName(provider);
                     return (new Action(
                         contrib.type,
-                        localize(5100, "Continue in {0}", name),
+                        localize(5670, "Continue in {0}", name),
                         ThemeIcon.isThemeIcon(icon) ? ThemeIcon.asClassName(icon) : undefined,
                         true,
                         () => {

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

@@ -2,9 +2,9 @@ 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 { 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 { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatTask, IChatTaskSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatContentPart, IChatContentPartRenderContext } 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/model/chatModel";
+import { IChatTask, IChatTaskSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { CollapsibleListPool } from "./chatReferencesContentPart.js";
 export declare class ChatTaskContentPart extends Disposable implements IChatContentPart {
     private readonly task;

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

@@ -13,7 +13,7 @@ let ChatTaskContentPart = class ChatTaskContentPart extends Disposable {
         this.task = task;
         if (task.progress.length) {
             this.isSettled = true;
-            const refsPart = this._register(instantiationService.createInstance(ChatCollapsibleListContentPart, task.progress, task.content.value, context, contentReferencesListPool));
+            const refsPart = this._register(instantiationService.createInstance(ChatCollapsibleListContentPart, task.progress, task.content.value, context, contentReferencesListPool, undefined));
             this.domNode = $('.chat-progress-task');
             this.domNode.appendChild(refsPart.domNode);
             this.onDidChangeHeight = refsPart.onDidChangeHeight;

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

@@ -1,9 +1,9 @@
 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 { IChatProgressRenderableResponseContent, IChatTextEditGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatProgressRenderableResponseContent, IChatTextEditGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatListItemRendererOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { DiffEditorPool } 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";
 import { ICodeCompareModelService } from "./chatTextEditContentPart.service.js";
 export declare class ChatTextEditContentPart extends Disposable implements IChatContentPart {
     private readonly codeCompareModelService;

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

@@ -18,7 +18,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/modelService';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-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 { ICodeCompareModelService } from './chatTextEditContentPart.service.js';
 
 const $ = $$1;
@@ -35,8 +35,8 @@ let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
                 this.domNode = $('.interactive-edits-summary', undefined, !element.isComplete
                     ? ''
                     : element.isCanceled
-                        ? ( localize(5101, "Making changes was aborted."))
-                        : ( localize(5102, "Made changes.")));
+                        ? ( localize(5671, "Making changes was aborted."))
+                        : ( localize(5672, "Made changes.")));
             }
             else {
                 this.domNode = $('div');

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

@@ -1,7 +1,7 @@
 import { IReference } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
-import { 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 { 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";
 export declare const ICodeCompareModelService: import("@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation").ServiceIdentifier<ICodeCompareModelService>;
 export interface ICodeCompareModelService {
     _serviceBrand: undefined;

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

@@ -1,13 +1,14 @@
-import { IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatContentPartRenderContext, IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts";
-import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatContentPartRenderContext, IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { 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";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
-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 { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
+import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart implements IChatContentPart {
     private readonly chatContentMarkdownRenderer;
     private readonly instantiationService;
@@ -30,9 +31,9 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
     private toolInvocationCount;
     private streamingCompleted;
     private isActive;
-    private currentToolCallLabel;
     private toolInvocations;
-    constructor(content: IChatThinkingPart, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, instantiationService: IInstantiationService, configurationService: IConfigurationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, languageModelsService: ILanguageModelsService);
+    private singleToolItemInfo;
+    constructor(content: IChatThinkingPart, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, instantiationService: IInstantiationService, configurationService: IConfigurationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, languageModelsService: ILanguageModelsService, hoverService: IHoverService);
     protected initContent(): HTMLElement;
     private renderMarkdown;
     private setDropdownClickable;
@@ -45,8 +46,9 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
     finalizeTitleIfDefault(): void;
     private setGeneratedTitleOnToolInvocations;
     private generateTitleViaLLM;
+    private restoreSingleToolToOriginalPosition;
     private setFallbackTitle;
-    appendItem(content: HTMLElement, toolInvocationId?: string, toolInvocation?: IChatToolInvocation | IChatToolInvocationSerialized): void;
+    appendItem(content: HTMLElement, toolInvocationId?: string, toolInvocation?: IChatToolInvocation | IChatToolInvocationSerialized, originalParent?: HTMLElement): void;
     setupThinkingContainer(content: IChatThinkingPart, context: IChatContentPartRenderContext): void;
     protected setTitle(title: string, omitPrefix?: boolean): void;
     hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;