@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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

@@ -22,6 +22,7 @@ import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { ITerminalChatService, ITerminalService, ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { getTerminalCommandDecorationTooltip, getTerminalCommandDecorationState, DecorationSelector } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/decorationStyles';
 import { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
@@ -33,7 +34,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { IAccessibleViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibilityWorkbenchSettingId, AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror } from '../../../../../terminal/browser/chatTerminalCommandMirror.js';
@@ -56,10 +57,15 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(chatTerminalToolProgressPart);
 const MIN_OUTPUT_ROWS = 1;
 const MAX_OUTPUT_ROWS = 10;
+const MAX_COMMAND_TITLE_LENGTH = 50;
+const MAX_OUTPUT_POLL_RETRIES = 10;
+const OUTPUT_POLL_DELAY_MS = 100;
+const MIN_DATA_EVENTS_FOR_REAL_OUTPUT = 2;
 const expandedStateByInvocation = ( new WeakMap());
 let TerminalCommandDecoration = class TerminalCommandDecoration extends Disposable {
     constructor(_options, _hoverService) {
@@ -194,6 +200,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._continueInBackgroundAction = this._register(( new MutableDisposable()));
         this._userToggledOutput = false;
         this._isInThinkingContainer = false;
+        this._usesCollapsibleWrapper = false;
         this._elementIndex = context.elementIndex;
         this._contentIndex = context.contentIndex;
         this._sessionResource = context.element.sessionResource;
@@ -274,7 +281,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(6062, "{0}", stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(6681, "{0}", stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(
@@ -299,12 +306,24 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         ));
         this._decoration.update();
         const terminalToolsInThinking = this._configurationService.getValue(ChatConfiguration.TerminalToolsInThinking);
+        const isSimpleTerminal = this._configurationService.getValue(ChatConfiguration.SimpleTerminalCollapsible);
         const requiresConfirmation = toolInvocation.kind === "toolInvocation" && IChatToolInvocation.getConfirmationMessages(toolInvocation);
-        if (terminalToolsInThinking && !requiresConfirmation) {
-            this._isInThinkingContainer = true;
-            this.domNode = this._createCollapsibleWrapper(progressPart.domNode, command, toolInvocation, context);
+        this._isInThinkingContainer = terminalToolsInThinking && !requiresConfirmation;
+        this._usesCollapsibleWrapper = this._isInThinkingContainer || isSimpleTerminal;
+        if (this._usesCollapsibleWrapper) {
+            this.domNode = this._createCollapsibleWrapper(progressPart.domNode, displayCommand, toolInvocation, context);
         } else {
             this.domNode = progressPart.domNode;
+            const updateCheckmarks = () => this.domNode.classList.toggle(
+                "show-checkmarks",
+                !!this._configurationService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
+            );
+            updateCheckmarks();
+            this._register(this._configurationService.onDidChangeConfiguration(e => {
+                if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
+                    updateCheckmarks();
+                }
+            }));
         }
         const hasStoredOutput = !!terminalData.terminalCommandOutput;
         if (expandedStateByInvocation.get(toolInvocation) || (this._isInThinkingContainer && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
@@ -313,8 +332,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         this._register(this._terminalChatService.registerProgressPart(this));
     }
     _createCollapsibleWrapper(contentElement, commandText, toolInvocation, context) {
-        const maxCommandLength = 50;
-        const truncatedCommand = commandText.length > maxCommandLength ? commandText.substring(0, maxCommandLength) + "..." : commandText;
+        const truncatedCommand = commandText.length > MAX_COMMAND_TITLE_LENGTH ? commandText.substring(0, MAX_COMMAND_TITLE_LENGTH) + "..." : commandText;
         const isComplete = IChatToolInvocation.isComplete(toolInvocation);
         const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
         const hasError = autoExpandFailures && this._terminalData.terminalCommandState?.exitCode !== undefined && this._terminalData.terminalCommandState.exitCode !== 0;
@@ -328,6 +346,15 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             isComplete
         ));
         this._thinkingCollapsibleWrapper = wrapper;
+        let isFirstRun = true;
+        this._register(autorun(r => {
+            const expanded = wrapper.expanded.read(r);
+            if (isFirstRun) {
+                isFirstRun = false;
+                return;
+            }
+            this._toggleOutput(expanded);
+        }));
         return wrapper.domNode;
     }
     expandCollapsibleWrapper() {
@@ -441,7 +468,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         if (this._store.isDisposed) {
             return;
         }
-        if (this._isInThinkingContainer) {
+        if (this._usesCollapsibleWrapper) {
             return;
         }
         const resolvedCommand = command ?? this._getResolvedCommand();
@@ -492,6 +519,9 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         this._decoration.update();
     }
+    _shouldAutoExpand() {
+        return !this._outputView.isExpanded && !this._userToggledOutput && !this._store.isDisposed && !expandedStateByInvocation.get(this.toolInvocation);
+    }
     _registerInstanceListener(terminalInstance) {
         const commandDetectionListener = this._register(( new MutableDisposable()));
         const tryResolveCommand = async () => {
@@ -523,16 +553,16 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
                 if (cursorLine > command.executedMarker.line) {
                     return true;
                 }
-                return receivedDataCount > 2;
+                return receivedDataCount > MIN_DATA_EVENTS_FOR_REAL_OUTPUT;
             };
             const autoExpand = store.add(( new TerminalToolAutoExpand({
                 commandDetection,
                 onWillData: terminalInstance.onWillData,
-                shouldAutoExpand: () => !this._outputView.isExpanded && !this._userToggledOutput && !this._store.isDisposed && !expandedStateByInvocation.get(this.toolInvocation),
+                shouldAutoExpand: () => this._shouldAutoExpand(),
                 hasRealOutput
             })));
             store.add(autoExpand.onDidRequestExpand(() => {
-                if (this._isInThinkingContainer) {
+                if (this._usesCollapsibleWrapper) {
                     this.expandCollapsibleWrapper();
                 }
                 this._toggleOutput(true);
@@ -546,14 +576,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             store.add(commandDetection.onCommandFinished(() => {
                 this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
                 const resolvedCommand = this._getResolvedCommand(terminalInstance);
-                this.markCollapsibleWrapperComplete();
-                if (resolvedCommand?.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
-                    this._toggleOutput(false);
-                }
-                const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
-                if (autoExpandFailures && resolvedCommand?.exitCode !== undefined && resolvedCommand.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
-                    this.expandCollapsibleWrapper();
-                }
+                this._handleCommandCompletion(resolvedCommand);
                 if (resolvedCommand?.endMarker) {
                     commandDetectionListener.clear();
                 }
@@ -562,14 +585,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             const resolvedImmediately = await tryResolveCommand();
             if (resolvedImmediately?.endMarker) {
                 commandDetectionListener.clear();
-                this.markCollapsibleWrapperComplete();
-                if (resolvedImmediately.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
-                    this._toggleOutput(false);
-                }
-                const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
-                if (autoExpandFailures && resolvedImmediately.exitCode !== undefined && resolvedImmediately.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
-                    this.expandCollapsibleWrapper();
-                }
+                this._handleCommandCompletion(resolvedImmediately);
                 return;
             }
         };
@@ -623,6 +639,16 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         }
         this._continueInBackgroundAction.clear();
     }
+    _handleCommandCompletion(resolvedCommand) {
+        this.markCollapsibleWrapperComplete();
+        if (resolvedCommand?.exitCode === 0 && this._outputView.isExpanded && !this._userToggledOutput) {
+            this._toggleOutput(false);
+        }
+        const autoExpandFailures = this._configurationService.getValue(ChatConfiguration.AutoExpandToolFailures);
+        if (autoExpandFailures && resolvedCommand?.exitCode !== undefined && resolvedCommand.exitCode !== 0 && this._thinkingCollapsibleWrapper) {
+            this.expandCollapsibleWrapper();
+        }
+    }
     async _toggleOutput(expanded) {
         const didChange = await this._outputView.toggle(expanded);
         const isExpanded = this._outputView.isExpanded;
@@ -835,7 +861,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(6063, "Terminal output for {0}", commandText));
+        const ariaLabel = ( localize(6682, "Terminal output for {0}", commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute("role", "region");
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -848,26 +874,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(6064, "Command: {0}", commandText));
+        const commandHeader = ( localize(6683, "Command: {0}", commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(6065, "No output was produced by the command."))}`;
+                return `${commandHeader}\n${( localize(6684, "No output was produced by the command."))}`;
             }
             const lines = rawOutput.split("\n");
             return `${commandHeader}\n${lines.join("\n").trimEnd()}`;
         }
         const snapshot = this._getTerminalCommandOutput();
         if (!snapshot) {
-            return `${commandHeader}\n${( localize(6066, "Command output is no longer available."))}`;
+            return `${commandHeader}\n${( localize(6685, "Command output is no longer available."))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ""));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(6065, "No output was produced by the command."))}`;
+            return `${commandHeader}\n${( localize(6684, "No output was produced by the command."))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(6067, "Output truncated."))}`;
+            outputText += `\n${( localize(6686, "Output truncated."))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -946,7 +972,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             if (result.lineCount && result.lineCount > 0) {
                 this._hideEmptyMessage();
             }
-            this._layoutOutput(result.lineCount, result.maxColumnWidth);
+            this._layoutOutput(result.lineCount);
             if (this._isAtBottom) {
                 this._scrollOutputToBottom();
             }
@@ -961,9 +987,8 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         let commandFinished = !!command.endMarker;
         let hasOutput = result && result.lineCount && result.lineCount > 0;
         if (!hasOutput) {
-            const maxRetries = 10;
-            for (let retry = 0; retry < maxRetries && !hasOutput; retry++) {
-                await timeout(100);
+            for (let retry = 0; retry < MAX_OUTPUT_POLL_RETRIES && !hasOutput; retry++) {
+                await timeout(OUTPUT_POLL_DELAY_MS);
                 if (this._store.isDisposed) {
                     return true;
                 }
@@ -977,17 +1002,17 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         }
         if (!hasOutput) {
             if (commandFinished) {
-                this._showEmptyMessage(( localize(6065, "No output was produced by the command.")));
+                this._showEmptyMessage(( localize(6684, "No output was produced by the command.")));
             }
         } else {
             this._hideEmptyMessage();
         }
-        this._layoutOutput(result?.lineCount ?? 0, result?.maxColumnWidth);
+        this._layoutOutput(result?.lineCount ?? 0);
         return true;
     }
     async _renderSnapshotOutput(snapshot) {
         if (this._snapshotMirror) {
-            this._layoutOutput(snapshot.lineCount ?? 0, this._lastRenderedMaxColumnWidth);
+            this._layoutOutput(snapshot.lineCount ?? 0);
             return;
         }
         if (this._store.isDisposed) {
@@ -1004,18 +1029,18 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (hasText) {
             this._hideEmptyMessage();
         } else {
-            this._showEmptyMessage(( localize(6065, "No output was produced by the command.")));
+            this._showEmptyMessage(( localize(6684, "No output was produced by the command.")));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
-        this._layoutOutput(lineCount, result?.maxColumnWidth);
+        this._layoutOutput(lineCount);
     }
     _renderUnavailableMessage(liveTerminalInstance) {
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(6068, "Terminal is no longer available.")));
+            this._showEmptyMessage(( localize(6687, "Terminal is no longer available.")));
         } else {
-            this._showEmptyMessage(( localize(6069, "Command information is not available.")));
+            this._showEmptyMessage(( localize(6688, "Command information is not available.")));
         }
     }
     async _resolveLiveTerminal() {
@@ -1055,7 +1080,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             this._scrollableContainer.scanDomNode();
         }
     }
-    _layoutOutput(lineCount, maxColumnWidth) {
+    _layoutOutput(lineCount) {
         if (!this._scrollableContainer) {
             return;
         }
@@ -1064,17 +1089,11 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         } else {
             lineCount = this._lastRenderedLineCount;
         }
-        if (maxColumnWidth !== undefined) {
-            this._lastRenderedMaxColumnWidth = maxColumnWidth;
-        } else {
-            maxColumnWidth = this._lastRenderedMaxColumnWidth;
-        }
         this._scrollableContainer.scanDomNode();
         if (!this.isExpanded || lineCount === undefined) {
             return;
         }
         const scrollableDomNode = this._scrollableContainer.getDomNode();
-        this._applyContentWidth(maxColumnWidth);
         const rowHeight = this._computeRowHeightPx();
         const padding = this._getOutputPadding();
         const minHeight = rowHeight * MIN_OUTPUT_ROWS + padding;
@@ -1117,34 +1136,6 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         const paddingBottom = Number.parseFloat(style.paddingBottom || "0");
         return paddingTop + paddingBottom;
     }
-    _applyContentWidth(maxColumnWidth) {
-        if (!this._scrollableContainer) {
-            return;
-        }
-        const window = getActiveWindow();
-        const font = this._terminalConfigurationService.getFont(window);
-        const charWidth = font.charWidth;
-        if (!charWidth || !maxColumnWidth || maxColumnWidth <= 0) {
-            return;
-        }
-        const horizontalPadding = 24;
-        const cursorWidth = charWidth;
-        const contentWidth = Math.ceil(maxColumnWidth * charWidth) + horizontalPadding + cursorWidth;
-        const parentWidth = this.domNode.parentElement?.clientWidth ?? 0;
-        const scrollableDomNode = this._scrollableContainer.getDomNode();
-        if (parentWidth > 0 && contentWidth < parentWidth) {
-            scrollableDomNode.style.width = `${contentWidth}px`;
-            this._outputBody.style.width = `${contentWidth}px`;
-            this._terminalContainer.style.width = `${contentWidth}px`;
-            this._terminalContainer.classList.add("chat-terminal-output-terminal-clipped");
-        } else {
-            scrollableDomNode.style.width = "";
-            this._outputBody.style.width = "";
-            this._terminalContainer.style.width = "";
-            this._terminalContainer.classList.remove("chat-terminal-output-terminal-clipped");
-        }
-        this._scrollableContainer.scanDomNode();
-    }
     _computeRowHeightPx() {
         const window = getActiveWindow();
         const font = this._terminalConfigurationService.getFont(window);
@@ -1168,7 +1159,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
 ChatTerminalToolOutputSection = ( __decorate([( __param(5, IAccessibleViewService)), ( __param(6, IInstantiationService)), ( __param(7, ITerminalConfigurationService)), ( __param(8, IThemeService)), ( __param(9, IContextKeyService))], ChatTerminalToolOutputSection));
 let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extends Action {
     constructor(_toggle, _keybindingService, _telemetryService) {
-        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6070, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
+        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(6689, "Show Output")), ThemeIcon.asClassName(Codicon.chevronRight), true);
         this._toggle = _toggle;
         this._keybindingService = _keybindingService;
         this._telemetryService = _telemetryService;
@@ -1191,10 +1182,10 @@ let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extend
     }
     _updatePresentation() {
         if (this._expanded) {
-            this.label = ( localize(6071, "Hide Output"));
+            this.label = ( localize(6690, "Hide Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronDown);
         } else {
-            this.label = ( localize(6070, "Show Output"));
+            this.label = ( localize(6689, "Show Output"));
             this.class = ThemeIcon.asClassName(Codicon.chevronRight);
         }
     }
@@ -1218,7 +1209,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
     ) {
         super(
             TerminalContribCommandId.FocusChatInstanceAction,
-            isTerminalHidden ? ( localize(6072, "Show and Focus Terminal")) : ( localize(6073, "Focus Terminal")),
+            isTerminalHidden ? ( localize(6691, "Show and Focus Terminal")) : ( localize(6692, "Focus Terminal")),
             ThemeIcon.asClassName(Codicon.openInProduct),
             true
         );
@@ -1234,7 +1225,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
         this._updateTooltip();
     }
     async run() {
-        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6074, "Show and Focus Terminal")) : ( localize(6073, "Focus Terminal"));
+        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(6693, "Show and Focus Terminal")) : ( localize(6692, "Focus Terminal"));
         this._updateTooltip();
         let target = "none";
         let location = "panel";
@@ -1291,7 +1282,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
 FocusChatInstanceAction = ( __decorate([( __param(5, ITerminalService)), ( __param(6, ITerminalEditorService)), ( __param(7, ITerminalGroupService)), ( __param(8, IKeybindingService)), ( __param(9, ITelemetryService))], FocusChatInstanceAction));
 let ContinueInBackgroundAction = class ContinueInBackgroundAction extends Action {
     constructor(_terminalToolSessionId, _terminalChatService) {
-        super(TerminalContribCommandId.ContinueInBackground, ( localize(6075, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
+        super(TerminalContribCommandId.ContinueInBackground, ( localize(6694, "Continue in Background")), ThemeIcon.asClassName(Codicon.debugContinue), true);
         this._terminalToolSessionId = _terminalToolSessionId;
         this._terminalChatService = _terminalChatService;
     }
@@ -1307,14 +1298,18 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         context,
         initialExpanded,
         isComplete,
-        hoverService
+        hoverService,
+        configurationService
     ) {
         const title = isComplete ? `Ran \`${commandText}\`` : `Running \`${commandText}\``;
-        super(title, context, undefined, hoverService);
+        super(title, context, undefined, hoverService, configurationService);
         this._terminalContentElement = contentElement;
         this._commandText = commandText;
         this._isComplete = isComplete;
         this.domNode.classList.add("chat-terminal-thinking-collapsible");
+        if (isComplete) {
+            this.icon = Codicon.check;
+        }
         this._setCodeFormattedTitle();
         this.setExpanded(initialExpanded);
     }
@@ -1324,7 +1319,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         }
         const labelElement = this._collapseButton.labelElement;
         labelElement.textContent = "";
-        const prefixText = this._isComplete ? ( localize(6076, "Ran ")) : ( localize(6077, "Running "));
+        const prefixText = this._isComplete ? ( localize(6695, "Ran ")) : ( localize(6696, "Running "));
         const ranText = createTextNode(prefixText);
         const codeElement = createElement("code");
         codeElement.textContent = this._commandText;
@@ -1336,6 +1331,7 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
             return;
         }
         this._isComplete = true;
+        this.icon = Codicon.check;
         this._setCodeFormattedTitle();
     }
     initContent() {
@@ -1350,6 +1346,6 @@ let ChatTerminalThinkingCollapsibleWrapper = class ChatTerminalThinkingCollapsib
         return false;
     }
 };
-ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(5, IHoverService))], ChatTerminalThinkingCollapsibleWrapper));
+ChatTerminalThinkingCollapsibleWrapper = ( __decorate([( __param(5, IHoverService)), ( __param(6, IConfigurationService))], ChatTerminalThinkingCollapsibleWrapper));
 
 export { ChatTerminalToolProgressPart, ContinueInBackgroundAction, FocusChatInstanceAction, ToggleChatTerminalOutputAction };

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

@@ -1,6 +1,5 @@
 import { Separator } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 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 { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.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";
@@ -13,7 +12,7 @@ import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/
 import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service";
 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 { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext } from "../chatContentParts.js";
 import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 import { AbstractToolConfirmationSubPart } from "./abstractToolConfirmationSubPart.js";
 import { EditorPool } from "../chatContentCodePools.js";
@@ -23,7 +22,6 @@ export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSub
     private readonly currentWidthDelegate;
     private readonly codeBlockModelCollection;
     private readonly codeBlockStartIndex;
-    private readonly modelService;
     private readonly languageService;
     private readonly commandService;
     private readonly markerService;
@@ -31,8 +29,8 @@ export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSub
     private readonly confirmationService;
     private markdownParts;
     get codeblocks(): IChatCodeBlockInfo[];
-    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockModelCollection: CodeBlockModelCollection, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, modelService: IModelService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, commandService: ICommandService, markerService: IMarkerService, languageModelToolsService: ILanguageModelToolsService, chatMarkdownAnchorService: IChatMarkdownAnchorService, confirmationService: ILanguageModelToolsConfirmationService);
-    protected additionalPrimaryActions(): (Separator | import("../chatConfirmationWidget.js").IChatConfirmationButton<() => void>)[];
+    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockModelCollection: CodeBlockModelCollection, codeBlockStartIndex: number, instantiationService: IInstantiationService, keybindingService: IKeybindingService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, commandService: ICommandService, markerService: IMarkerService, languageModelToolsService: ILanguageModelToolsService, chatMarkdownAnchorService: IChatMarkdownAnchorService, confirmationService: ILanguageModelToolsConfirmationService);
+    protected additionalPrimaryActions(): (Separator | import("./abstractToolConfirmationSubPart.js").IAbstractToolPrimaryAction)[];
     protected createContentElement(): HTMLElement | string;
     protected getTitle(): string;
     private _makeMarkdownPart;

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

@@ -10,7 +10,6 @@ import { isEmptyObject } from '@codingame/monaco-vscode-api/vscode/vs/base/commo
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { ElementSizeObserver } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/config/elementSizeObserver';
 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 { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -44,7 +43,6 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         codeBlockStartIndex,
         instantiationService,
         keybindingService,
-        modelService,
         languageService,
         contextKeyService,
         chatWidgetService,
@@ -72,7 +70,6 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.currentWidthDelegate = currentWidthDelegate;
         this.codeBlockModelCollection = codeBlockModelCollection;
         this.codeBlockStartIndex = codeBlockStartIndex;
-        this.modelService = modelService;
         this.languageService = languageService;
         this.commandService = commandService;
         this.markerService = markerService;
@@ -82,8 +79,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: state.confirmationMessages.confirmResults ? ( localize(6078, "Allow and Review")) : ( localize(6079, "Allow")),
-            skipLabel: ( localize(6080, "Proceed without running this tool")),
+            allowLabel: state.confirmationMessages.confirmResults ? ( localize(6697, "Allow and Review Once")) : ( localize(6698, "Allow Once")),
+            skipLabel: ( localize(6699, "Proceed without running this tool")),
             partType: "chatToolConfirmation",
             subtitle: typeof toolInvocation.originMessage === "string" ? toolInvocation.originMessage : toolInvocation.originMessage?.value
         });
@@ -108,6 +105,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                 actions.push({
                     label: action.label,
                     tooltip: action.detail,
+                    scope: action.scope,
                     data: async () => {
                         const shouldConfirm = await action.select();
                         if (shouldConfirm) {
@@ -121,7 +119,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         if (state.confirmationMessages?.confirmResults) {
             actions.unshift({
-                label: ( localize(6081, "Allow and Skip Reviewing Result")),
+                label: ( localize(6700, "Allow and Skip Reviewing Result")),
                 data: () => {
                     state.confirmationMessages.confirmResults = undefined;
                     this.confirmWith(this.toolInvocation, {
@@ -156,11 +154,11 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
             };
             const elements = h("div", [h(".message@messageContainer", [
                 h(".message-wrapper@message"),
-                h(".see-more@showMore", [h("a", [( localize(6082, "Show More"))])])
+                h(".see-more@showMore", [h("a", [( localize(6701, "Show More"))])])
             ]), h(".editor@editor"), h(".disclaimer@disclaimer")]);
             if (toolInvocation.toolSpecificData?.kind === "input" && toolInvocation.toolSpecificData.rawInput && !isEmptyObject(toolInvocation.toolSpecificData.rawInput)) {
                 const titleEl = createElement("h3");
-                titleEl.textContent = ( localize(6083, "Input"));
+                titleEl.textContent = ( localize(6702, "Input"));
                 elements.editor.appendChild(titleEl);
                 const inputData = toolInvocation.toolSpecificData;
                 const codeBlockRenderOptions = {
@@ -177,10 +175,13 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                 const langId = this.languageService.getLanguageIdByLanguageName("json");
                 const rawJsonInput = JSON.stringify(inputData.rawInput ?? {}, null, 1);
                 const canSeeMore = count(rawJsonInput, "\n") > 2;
-                const model = this._register(
-                    this.modelService.createModel(
-                    rawJsonInput.replace(/\n */g, " "), this.languageService.createById(langId), createToolInputUri(toolInvocation.toolCallId), true)
-                );
+                const modelRef = this._register(this.context.inlineTextModels.acquire(
+                    createToolInputUri(toolInvocation.toolCallId),
+                    rawJsonInput.replace(/\n */g, " "),
+                    this.languageService.createById(langId),
+                    true
+                ));
+                const model = modelRef.object;
                 const markerOwner = generateUuid();
                 const schemaUri = createToolSchemaUri(toolInvocation.toolId);
                 const validator = ( new RunOnceScheduler(async () => {
@@ -225,9 +226,6 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                     uriPromise: Promise.resolve(model.uri),
                     chatSessionResource: this.context.element.sessionResource
                 });
-                this._register(editor.object.onDidChangeContentHeight(() => {
-                    editor.object.layout(this.currentWidthDelegate());
-                }));
                 this._register(model.onDidChangeContent(e => {
                     try {
                         inputData.rawInput = JSON.parse(model.getValue());
@@ -236,7 +234,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                 elements.editor.append(editor.object.element);
                 if (canSeeMore) {
                     const seeMore = h("div.see-more", [h("a@link")]);
-                    seeMore.link.textContent = ( localize(6084, "See more"));
+                    seeMore.link.textContent = ( localize(6703, "See more"));
                     this._register(addDisposableGenericMouseDownListener(seeMore.link, () => {
                         try {
                             const parsed = JSON.parse(model.getValue());
@@ -303,6 +301,6 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         return part;
     }
 };
-ToolConfirmationSubPart = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, IKeybindingService)), ( __param(9, IModelService)), ( __param(10, ILanguageService)), ( __param(11, IContextKeyService)), ( __param(12, IChatWidgetService)), ( __param(13, ICommandService)), ( __param(14, IMarkerService)), ( __param(15, ILanguageModelToolsService)), ( __param(16, IChatMarkdownAnchorService)), ( __param(17, ILanguageModelToolsConfirmationService))], ToolConfirmationSubPart));
+ToolConfirmationSubPart = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, IKeybindingService)), ( __param(9, ILanguageService)), ( __param(10, IContextKeyService)), ( __param(11, IChatWidgetService)), ( __param(12, ICommandService)), ( __param(13, IMarkerService)), ( __param(14, ILanguageModelToolsService)), ( __param(15, IChatMarkdownAnchorService)), ( __param(16, ILanguageModelToolsConfirmationService))], ToolConfirmationSubPart));
 
 export { ToolConfirmationSubPart };

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

@@ -3,10 +3,11 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { 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 { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service";
 import { CodeBlockModelCollection } from "../../../../common/widget/codeBlockModelCollection.js";
 import { ChatTreeItem, IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { EditorPool } from "../chatContentCodePools.js";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "../chatContentParts.js";
 import { CollapsibleListPool } from "../chatReferencesContentPart.js";
 export declare class ChatToolInvocationPart extends Disposable implements IChatContentPart {
     private readonly toolInvocation;
@@ -19,13 +20,14 @@ export declare class ChatToolInvocationPart extends Disposable implements IChatC
     private readonly announcedToolProgressKeys;
     private readonly codeBlockStartIndex;
     private readonly instantiationService;
+    private readonly chatTodoListService;
     readonly domNode: HTMLElement;
     get codeblocks(): IChatCodeBlockInfo[];
     get codeblocksPartId(): string | undefined;
     private subPart;
     private mcpAppPart;
     private readonly _onDidRemount;
-    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, listPool: CollapsibleListPool, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockModelCollection: CodeBlockModelCollection, announcedToolProgressKeys: Set<string> | undefined, codeBlockStartIndex: number, instantiationService: IInstantiationService);
+    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, listPool: CollapsibleListPool, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockModelCollection: CodeBlockModelCollection, announcedToolProgressKeys: Set<string> | undefined, codeBlockStartIndex: number, instantiationService: IInstantiationService, chatTodoListService: IChatTodoListService);
     private createToolInvocationSubPart;
     /**
      * Gets MCP App render data if this tool invocation has MCP App UI.