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

package/vscode/src/vs/workbench/contrib/chat/browser/{codeBlockPart.js → widget/chatContentParts/codeBlockPart.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 * as codeBlockPart from './codeBlockPart.css';
+import * as codeBlockPart from './media/codeBlockPart.css';
 import { $ as $$1, append, hide, show, clearNode, getTotalHeight, Dimension, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderFormattedText } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/formattedTextRenderer';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
@@ -55,8 +55,8 @@ import { InspectEditorTokensController } from '@codingame/monaco-vscode-api/vsco
 import { MenuPreventer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { SelectionClipboardContributionID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { getSimpleEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { emptyProgressRunner } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { IEditorProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { SuggestController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/suggest/browser/suggestController';
@@ -134,7 +134,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
                 multipleDefinitions: 'goto',
                 multipleImplementations: 'goto',
             },
-            ariaLabel: ( localize(5673, 'Code block')),
+            ariaLabel: ( localize(5697, 'Code block')),
             overflowWidgetsDomNode,
             tabFocusMode: true,
             ...this.getEditorOptionsFromConfig(),
@@ -309,11 +309,11 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         });
         if (!this.editor.getOption(EditorOption.ariaLabel)) {
             this.editor.updateOptions({
-                ariaLabel: ( localize(5674, "Code block {0}", data.codeBlockIndex + 1)),
+                ariaLabel: ( localize(5698, "Code block {0}", data.codeBlockIndex + 1)),
             });
         }
         this.layout(width);
-        this.toolbar.setAriaLabel(( localize(5675, "Code block {0}", data.codeBlockIndex + 1)));
+        this.toolbar.setAriaLabel(( localize(5699, "Code block {0}", data.codeBlockIndex + 1)));
         if (data.renderOptions?.hideToolbar) {
             hide(this.toolbar.getElement());
         }
@@ -332,6 +332,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         else {
             this.element.classList.add('no-vulns');
         }
+        this._onDidChangeContentHeight.fire();
     }
     reset() {
         this.clearWidgets();
@@ -359,8 +360,8 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
             return '';
         }
         const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ?
-            ( localize(5676, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) :
-            ( localize(5677, "{0} vulnerability", 1));
+            ( localize(5700, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) :
+            ( localize(5701, "{0} vulnerability", 1));
         const icon = (element) => element.vulnerabilitiesListExpanded ? Codicon.chevronDown : Codicon.chevronRight;
         return `${referencesLabel} $(${icon(this.currentCodeBlockData.element).id})`;
     }
@@ -460,7 +461,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 multipleDefinitions: 'goto',
                 multipleImplementations: 'goto',
             },
-            ariaLabel: ( localize(5673, 'Code block')),
+            ariaLabel: ( localize(5697, 'Code block')),
             overflowWidgetsDomNode,
             ...this.getEditorOptionsFromConfig(),
         });
@@ -530,8 +531,8 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             diffCodeLens: false,
             scrollBeyondLastLine: false,
             stickyScroll: { enabled: false },
-            originalAriaLabel: ( localize(5678, 'Original')),
-            modifiedAriaLabel: ( localize(5679, 'Modified')),
+            originalAriaLabel: ( localize(5702, 'Original')),
+            modifiedAriaLabel: ( localize(5703, 'Modified')),
             diffAlgorithm: 'advanced',
             readOnly: false,
             isInEmbeddedEditor: true,
@@ -563,7 +564,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         const toolbarElt = this.toolbar.getElement();
         if (this.accessibilityService.isScreenReaderOptimized()) {
             toolbarElt.style.display = 'block';
-            toolbarElt.ariaLabel = ( localize(5680, 'Code block toolbar'));
+            toolbarElt.ariaLabel = ( localize(5704, 'Code block toolbar'));
         }
         else {
             toolbarElt.style.display = '';
@@ -605,7 +606,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         await this.updateEditor(data, token);
         this.layout(width);
         this.diffEditor.updateOptions({
-            ariaLabel: ( localize(5681, "Code Edits")),
+            ariaLabel: ( localize(5705, "Code Edits")),
             readOnly: !!data.isReadOnly,
         });
         this.resourceLabel.element.setFile(data.edit.uri, {
@@ -635,14 +636,14 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             const uriLabel = this.labelService.getUriLabel(data.edit.uri, { relative: true, noPrefix: true });
             let template;
             if (data.edit.state.applied === 1) {
-                template = ( localize(5682, "Applied 1 change in [[``{0}``]]", uriLabel));
+                template = ( localize(5706, "Applied 1 change in [[``{0}``]]", uriLabel));
             }
             else if (data.edit.state.applied < 0) {
-                template = ( localize(5683, "Edits in [[``{0}``]] have been rejected", uriLabel));
+                template = ( localize(5707, "Edits in [[``{0}``]] have been rejected", uriLabel));
             }
             else {
                 template = ( localize(
-                    5684,
+                    5708,
                     "Applied {0} changes in [[``{1}``]]",
                     data.edit.state.applied,
                     uriLabel
@@ -769,8 +770,8 @@ let DefaultChatTextEditor = class DefaultChatTextEditor {
     async _checkSha1(model, item) {
         if (item.state?.sha1 && this._sha1.computeSHA1(model) && this._sha1.computeSHA1(model) !== item.state.sha1) {
             const result = await this.dialogService.confirm({
-                message: ( localize(5685, "The original file has been modified.")),
-                detail: ( localize(5686, "Do you want to apply the changes anyway?")),
+                message: ( localize(5709, "The original file has been modified.")),
+                detail: ( localize(5710, "Do you want to apply the changes anyway?")),
             });
             if (!result.confirmed) {
                 return false;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/media/chatThinkingContent.css

@@ -39,11 +39,11 @@
 				padding-left: 2px;
 			}
 
-			.progress-container {
+			.progress-container, .chat-confirmation-widget-container {
 				margin: 0 0 2px 6px;
 			}
 
-			.codicon {
+			.codicon:not(.chat-thinking-icon) {
 				display: none;
 			}
 		}
@@ -62,13 +62,15 @@
 				background-color: var(--vscode-textPreformat-background);
 				padding: 1px 3px;
 				border-radius: 4px;
+				border: 1px solid var(--vscode-textPreformat-border);
 				white-space: pre-wrap;
 			}
 		}
 
 		/* chain of thought lines */
-		.chat-tool-invocation-part,
+		.chat-thinking-tool-wrapper,
 		.chat-thinking-item.markdown-content {
+			position: relative;
 
 			&::before {
 				content: '';
@@ -79,15 +81,15 @@
 				width: 1px;
 				border-radius: 0;
 				background-color: var(--vscode-chat-requestBorder);
-				mask-image: linear-gradient(to bottom, #000 0 9px, transparent 9px 21px, #000 21px 100%);
+				mask-image: linear-gradient(to bottom, #000 0 5px, transparent 5px 25px, #000 24px 100%);
 			}
 
 			&:first-child::before {
-				mask-image: linear-gradient(to bottom, transparent 0 21px, #000 21px 100%);
+				mask-image: linear-gradient(to bottom, transparent 0 25px, #000 25px 100%);
 			}
 
 			&:last-child::before {
-				mask-image: linear-gradient(to bottom, #000 0 9px, transparent 9px 100%);
+				mask-image: linear-gradient(to bottom, #000 0 5px, transparent 5px 100%);
 			}
 
 			&:only-child::before {
@@ -95,15 +97,16 @@
 				mask-image: none;
 			}
 
-			&::after {
-				content: '';
+			> .chat-thinking-icon {
 				position: absolute;
-				left: 8px;
-				top: 12px;
-				width: 6px;
-				height: 6px;
-				border-radius: 50%;
-				background-color: var(--vscode-chat-requestBorder);
+				left: 5px;
+				top: 9px;
+				width: 12px;
+				height: 12px;
+				font-size: 12px;
+				line-height: 12px;
+				text-align: center;
+				color: var(--vscode-descriptionForeground);
 			}
 
 		}

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

@@ -2,11 +2,11 @@ import { Separator } from "@codingame/monaco-vscode-api/vscode/vs/base/common/ac
 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 { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { ConfirmedReason, IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ConfirmedReason, IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+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 { IChatConfirmationButton } from "../chatConfirmationWidget.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 { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export interface IToolConfirmationConfig {
     allowActionId: string;

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

@@ -6,9 +6,9 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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 { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ToolConfirmKind, IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ToolConfirmKind, IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+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 { ChatCustomConfirmationWidget } from '../chatConfirmationWidget.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
@@ -44,7 +44,7 @@ let AbstractToolConfirmationSubPart = class AbstractToolConfirmationSubPart exte
                 moreActions: additionalActions.length > 0 ? additionalActions : undefined,
             },
             {
-                label: ( localize(5127, "Skip")),
+                label: ( localize(5711, "Skip")),
                 tooltip: skipTooltip,
                 data: () => {
                     this.confirmWith(toolInvocation, { type: ToolConfirmKind.Skipped });

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

@@ -2,9 +2,9 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IExtensionManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatToolInvocation } 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 { 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 { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare class ExtensionsInstallConfirmationWidgetSubPart extends BaseChatToolInvocationSubPart {
     readonly domNode: HTMLElement;

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

@@ -9,10 +9,10 @@ import { IExtensionManagementService } from '@codingame/monaco-vscode-api/vscode
 import { areSameExtensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { CancelChatActionId } from '../../../actions/chatExecuteActions.js';
 import { AcceptToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
-import { CancelChatActionId } from '../../actions/chatExecuteActions.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatConfirmationWidget } from '../chatConfirmationWidget.js';
 import { ChatExtensionsContentPart } from '../chatExtensionsContentPart.js';
@@ -36,10 +36,10 @@ let ExtensionsInstallConfirmationWidgetSubPart = class ExtensionsInstallConfirma
         this._register(chatExtensionsContentPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
         append(this.domNode, chatExtensionsContentPart.domNode);
         if (toolInvocation.state.get().type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-            const allowLabel = ( localize(5128, "Allow"));
+            const allowLabel = ( localize(5712, "Allow"));
             const allowKeybinding = keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
             const allowTooltip = allowKeybinding ? `${allowLabel} (${allowKeybinding})` : allowLabel;
-            const cancelLabel = ( localize(5129, "Cancel"));
+            const cancelLabel = ( localize(5713, "Cancel"));
             const cancelKeybinding = keybindingService.lookupKeybinding(CancelChatActionId)?.getLabel();
             const cancelTooltip = cancelKeybinding ? `${cancelLabel} (${cancelKeybinding})` : cancelLabel;
             const enableAllowButtonEvent = this._register(( new Emitter()));
@@ -59,9 +59,9 @@ let ExtensionsInstallConfirmationWidgetSubPart = class ExtensionsInstallConfirma
                 }
             ];
             const confirmWidget = this._register(instantiationService.createInstance((ChatConfirmationWidget), context, {
-                title: toolInvocation.confirmationMessages?.title ?? ( localize(5130, "Install Extensions")),
+                title: toolInvocation.confirmationMessages?.title ?? ( localize(5714, "Install Extensions")),
                 message: toolInvocation.confirmationMessages?.message ?? ( localize(
-                    5131,
+                    5715,
                     "Click the Install button on the extension and then press Allow when finished."
                 )),
                 buttons,

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

@@ -2,10 +2,10 @@ import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IToolResultInputOutputDetails } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IToolResultInputOutputDetails } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 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 { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare class ChatInputOutputMarkdownProgressPart extends BaseChatToolInvocationSubPart {
     /** Remembers expanded tool parts on re-render */

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

@@ -2,7 +2,6 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ProgressBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/progressbar/progressbar';
 import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { createMarkdownCommandLink, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { getExtensionForMimeType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/mime';
@@ -10,12 +9,12 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatCollapsibleInputOutputContentPart } from '../chatToolInputOutputContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { getToolApprovalMessage } from './chatToolPartUtilities.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ChatInputOutputMarkdownProgressPart_1;
@@ -108,34 +107,7 @@ let ChatInputOutputMarkdownProgressPart = class ChatInputOutputMarkdownProgressP
         this.domNode = collapsibleListPart.domNode;
     }
     getAutoApproveMessageContent() {
-        const reason = IChatToolInvocation.executionConfirmedOrDenied(this.toolInvocation);
-        if (!reason || typeof reason === 'boolean') {
-            return;
-        }
-        let md;
-        switch (reason.type) {
-            case ToolConfirmKind.Setting:
-                md = ( localize(
-                    5132,
-                    '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(5133, 'Auto approved for this session'))
-                    : reason.scope === 'workspace'
-                        ? ( localize(5134, 'Auto approved for this workspace'))
-                        : ( localize(5135, 'Auto approved for this profile'));
-                md += ' (' + createMarkdownCommandLink({ title: ( localize(5136, 'Edit')), id: 'workbench.action.chat.editToolApproval', arguments: [reason.scope] }) + ')';
-                break;
-            case ToolConfirmKind.UserAction:
-            case ToolConfirmKind.Denied:
-            case ToolConfirmKind.ConfirmationNotNeeded:
-            default:
-                return;
-        }
-        return ( new MarkdownString(md, { isTrusted: true }));
+        return getToolApprovalMessage(this.toolInvocation);
     }
 };
 ChatInputOutputMarkdownProgressPart = ChatInputOutputMarkdownProgressPart_1 = ( __decorate([

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

@@ -2,9 +2,9 @@ import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 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 { CollapsibleListPool } from "../chatReferencesContentPart.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare class ChatResultListSubPart extends BaseChatToolInvocationSubPart {

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

@@ -1,8 +1,10 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ChatCollapsibleListContentPart } from '../chatReferencesContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { getToolApprovalMessage } from './chatToolPartUtilities.js';
 
 let ChatResultListSubPart = class ChatResultListSubPart extends BaseChatToolInvocationSubPart {
     constructor(toolInvocation, context, message, toolDetails, listPool, instantiationService) {
@@ -11,7 +13,8 @@ let ChatResultListSubPart = class ChatResultListSubPart extends BaseChatToolInvo
         const collapsibleListPart = this._register(instantiationService.createInstance(ChatCollapsibleListContentPart, ( toolDetails.map(detail => ({
             kind: 'reference',
             reference: detail,
-        }))), message, context, listPool));
+        }))), message, context, listPool, getToolApprovalMessage(toolInvocation)));
+        collapsibleListPart.icon = Codicon.check;
         this._register(collapsibleListPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
         this.domNode = collapsibleListPart.domNode;
     }

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

@@ -11,12 +11,12 @@ import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IPreferencesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service";
 import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
-import { IChatToolInvocation, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import type { CodeBlockModelCollection } from "../../../common/codeBlockModelCollection.js";
+import { IChatToolInvocation, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import type { CodeBlockModelCollection } from "../../../../common/widget/codeBlockModelCollection.js";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { EditorPool } from "../chatContentCodePools.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 { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 export declare enum TerminalToolConfirmationStorageKeys {
     TerminalAutoApproveWarningAccepted = "chat.tools.terminal.autoApprove.warningAccepted"
@@ -27,6 +27,7 @@ export interface ITerminalNewAutoApproveRule {
         approve: boolean;
         matchCommandLine?: boolean;
     };
+    scope: "session" | "workspace" | "user";
 }
 export type TerminalNewAutoApproveButtonData = ({
     type: "enable";