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

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

@@ -31,8 +31,8 @@ import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/work
 import { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalContribSettingId, TerminalContribCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
 import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
-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 { 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 { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatCustomConfirmationWidget } from '../chatConfirmationWidget.js';
@@ -79,7 +79,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             moreActions = [];
             if (!autoApproveWarningAccepted) {
                 moreActions.push({
-                    label: ( localize(5137, 'Enable Auto Approve...')),
+                    label: ( localize(5716, 'Enable Auto Approve...')),
                     data: {
                         type: 'enable'
                     }
@@ -112,7 +112,8 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             }
         };
         const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
-        const model = this._register(this.modelService.createModel(terminalData.commandLine.toolEdited ?? terminalData.commandLine.original, this.languageService.createById(languageId), this._getUniqueCodeBlockUri(), true));
+        const initialContent = (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
+        const model = this._register(this.modelService.createModel(initialContent, this.languageService.createById(languageId), this._getUniqueCodeBlockUri(), true));
         thenRegisterOrDispose(textModelService.createModelReference(model.uri), this._store);
         const editor = this._register(this.editorPool.get());
         const renderPromise = editor.object.render({
@@ -140,7 +141,8 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             this._onDidChangeHeight.fire();
         }));
         this._register(model.onDidChangeContent(e => {
-            terminalData.commandLine.userEdited = model.getValue();
+            const currentValue = model.getValue();
+            terminalData.commandLine.userEdited = currentValue !== initialContent ? currentValue : undefined;
         }));
         const elements = h('.chat-confirmation-message-terminal', [
             h('.chat-confirmation-message-terminal-editor@editor'),
@@ -182,10 +184,10 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                         const optedIn = await this._showAutoApproveWarning();
                         if (optedIn) {
                             this.storageService.store(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, true, StorageScope.APPLICATION, StorageTarget.USER);
-                            if (!terminalCustomActions) {
+                            if (terminalData.autoApproveInfo) {
                                 toolConfirmKind = ToolConfirmKind.UserAction;
                             }
-                            else {
+                            else if (terminalCustomActions) {
                                 for (const action of terminalCustomActions) {
                                     if (!(action instanceof Separator)) {
                                         action.disabled = false;
@@ -206,30 +208,59 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                     }
                     case 'newRule': {
                         const newRules = asArray(data.rule);
-                        const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
-                        const oldValue = inspect.user?.value ?? {};
-                        let newValue;
-                        if (isObject(oldValue)) {
-                            newValue = { ...oldValue };
-                            for (const newRule of newRules) {
-                                newValue[newRule.key] = newRule.value;
+                        const sessionRules = newRules.filter(r => r.scope === 'session');
+                        const workspaceRules = newRules.filter(r => r.scope === 'workspace');
+                        const userRules = newRules.filter(r => r.scope === 'user');
+                        const chatSessionId = this.context.element.sessionId;
+                        for (const rule of sessionRules) {
+                            this.terminalChatService.addSessionAutoApproveRule(chatSessionId, rule.key, rule.value);
+                        }
+                        if (workspaceRules.length > 0) {
+                            const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
+                            const oldValue = inspect.workspaceValue ?? {};
+                            if (isObject(oldValue)) {
+                                const newValue = { ...oldValue };
+                                for (const rule of workspaceRules) {
+                                    newValue[rule.key] = rule.value;
+                                }
+                                await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.WORKSPACE);
+                            }
+                            else {
+                                this.preferencesService.openSettings({
+                                    jsonEditor: true,
+                                    target: ConfigurationTarget.WORKSPACE,
+                                    revealSetting: { key: TerminalContribSettingId.AutoApprove },
+                                });
+                                throw ( new ErrorNoTelemetry(`Cannot add new rule, existing workspace setting is unexpected format`));
                             }
                         }
-                        else {
-                            this.preferencesService.openSettings({
-                                jsonEditor: true,
-                                target: ConfigurationTarget.USER,
-                                revealSetting: {
-                                    key: TerminalContribSettingId.AutoApprove
-                                },
-                            });
-                            throw ( new ErrorNoTelemetry(`Cannot add new rule, existing setting is unexpected format`));
+                        if (userRules.length > 0) {
+                            const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
+                            const oldValue = inspect.userValue ?? {};
+                            if (isObject(oldValue)) {
+                                const newValue = { ...oldValue };
+                                for (const rule of userRules) {
+                                    newValue[rule.key] = rule.value;
+                                }
+                                await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.USER);
+                            }
+                            else {
+                                this.preferencesService.openSettings({
+                                    jsonEditor: true,
+                                    target: ConfigurationTarget.USER,
+                                    revealSetting: { key: TerminalContribSettingId.AutoApprove },
+                                });
+                                throw ( new ErrorNoTelemetry(`Cannot add new rule, existing setting is unexpected format`));
+                            }
                         }
-                        await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.USER);
-                        function formatRuleLinks(newRules) {
-                            return ( newRules.map(e => {
-                                const settingsUri = createCommandUri(TerminalContribCommandId.OpenTerminalSettingsLink, ConfigurationTarget.USER);
-                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(5138, 'View rule in settings'))}")`;
+                        function formatRuleLinks(rules, scope) {
+                            return ( rules.map(e => {
+                                if (scope === 'session') {
+                                    return `\`${e.key}\``;
+                                }
+                                const target = scope === 'workspace' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+                                const settingsUri = createCommandUri(TerminalContribCommandId.OpenTerminalSettingsLink, target);
+                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(5717, 'View rule in settings'))}")`;
                             })).join(', ');
                         }
                         const mdTrustSettings = {
@@ -237,11 +268,48 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 enabledCommands: [TerminalContribCommandId.OpenTerminalSettingsLink]
                             }
                         };
-                        if (newRules.length === 1) {
-                            terminalData.autoApproveInfo = ( new MarkdownString(( localize(5139, 'Auto approve rule {0} added', formatRuleLinks(newRules))), mdTrustSettings));
+                        const parts = [];
+                        if (sessionRules.length > 0) {
+                            parts.push(sessionRules.length === 1
+                                ? ( localize(
+                                5718,
+                                'Session auto approve rule {0} added',
+                                formatRuleLinks(sessionRules, 'session')
+                            ))
+                                : ( localize(
+                                5719,
+                                'Session auto approve rules {0} added',
+                                formatRuleLinks(sessionRules, 'session')
+                            )));
+                        }
+                        if (workspaceRules.length > 0) {
+                            parts.push(workspaceRules.length === 1
+                                ? ( localize(
+                                5720,
+                                'Workspace auto approve rule {0} added',
+                                formatRuleLinks(workspaceRules, 'workspace')
+                            ))
+                                : ( localize(
+                                5721,
+                                'Workspace auto approve rules {0} added',
+                                formatRuleLinks(workspaceRules, 'workspace')
+                            )));
+                        }
+                        if (userRules.length > 0) {
+                            parts.push(userRules.length === 1
+                                ? ( localize(
+                                5722,
+                                'User auto approve rule {0} added',
+                                formatRuleLinks(userRules, 'user')
+                            ))
+                                : ( localize(
+                                5723,
+                                'User auto approve rules {0} added',
+                                formatRuleLinks(userRules, 'user')
+                            )));
                         }
-                        else if (newRules.length > 1) {
-                            terminalData.autoApproveInfo = ( new MarkdownString(( localize(5140, 'Auto approve rules {0} added', formatRuleLinks(newRules))), mdTrustSettings));
+                        if (parts.length > 0) {
+                            terminalData.autoApproveInfo = ( new MarkdownString(parts.join(', '), mdTrustSettings));
                         }
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
@@ -263,7 +331,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
                             }
                         };
-                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(5141, 'All commands will be auto approved for this session'))} ([${( localize(5142, 'Disable'))}](${( disableUri.toString())}))`, mdTrustSettings));
+                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(5724, 'All commands will be auto approved for this session'))} ([${( localize(5725, 'Disable'))}](${( disableUri.toString())}))`, mdTrustSettings));
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
@@ -285,12 +353,12 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         };
         return [
             {
-                ...getLabelAndTooltip(( localize(5143, "Allow")), AcceptToolConfirmationActionId),
+                ...getLabelAndTooltip(( localize(5726, "Allow")), AcceptToolConfirmationActionId),
                 data: true,
                 moreActions,
             },
             {
-                ...getLabelAndTooltip(( localize(5144, "Skip")), SkipToolConfirmationActionId, ( localize(5145, 'Proceed without executing this command'))),
+                ...getLabelAndTooltip(( localize(5727, "Skip")), SkipToolConfirmationActionId, ( localize(5728, 'Proceed without executing this command'))),
                 data: { type: 'skip' },
                 isSecondary: true,
             },
@@ -299,9 +367,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
     async _showAutoApproveWarning() {
         const promptResult = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(5146, 'Enable terminal auto approve?')),
+            message: ( localize(5729, 'Enable terminal auto approve?')),
             buttons: [{
-                    label: ( localize(5147, 'Enable')),
+                    label: ( localize(5730, 'Enable')),
                     run: () => true
                 }],
             cancelButton: true,
@@ -309,11 +377,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 icon: Codicon.shield,
                 markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            5148,
+                            5731,
                             'This will enable a configurable subset of commands to run in the terminal autonomously. It provides *best effort protections* and assumes the agent is not acting maliciously.'
                         )))),
                     }, {
-                        markdown: ( new MarkdownString(`[${( localize(5149, 'Learn more about the potential risks and how to avoid them.'))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
+                        markdown: ( new MarkdownString(`[${( localize(5732, 'Learn more about the potential risks and how to avoid them.'))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
                     }],
             }
         });

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

@@ -1,9 +1,9 @@
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { CodeBlockModelCollection } from "../../../common/codeBlockModelCollection.js";
+import { IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { 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 { 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";
 import { Action, IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { IChatTerminalToolProgressPart, ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";

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

@@ -28,18 +28,15 @@ import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/i
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+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 } from '../../../../terminal/browser/chatTerminalCommandMirror.js';
-import { DetachedProcessInfo } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/detachedTerminal';
+import { DetachedTerminalCommandMirror, DetachedTerminalSnapshotMirror } from '../../../../../terminal/browser/chatTerminalCommandMirror.js';
 import { TerminalLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { TerminalContribCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { removeAnsiEscapeCodes } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
-import { TERMINAL_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
 import { PANEL_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
@@ -186,7 +183,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
             h('.chat-terminal-content-message@message')
         ]);
         this._titleElement = elements.title;
-        const command = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+        const command = (terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
         this._commandText = command;
         this._terminalOutputContextKey = ChatContextKeys.inChatTerminalToolOutput.bindTo(this._contextKeyService);
         this._decoration = this._register(this._instantiationService.createInstance(TerminalCommandDecoration, {
@@ -241,7 +238,7 @@ let ChatTerminalToolProgressPart = class ChatTerminalToolProgressPart extends Ba
         const markdownOptions = {
             codeBlockRenderOptions,
             accessibilityOptions: pastTenseMessage ? {
-                statusMessage: ( localize(5150, '{0}', stripIcons(pastTenseMessage)))
+                statusMessage: ( localize(5733, '{0}', stripIcons(pastTenseMessage)))
             } : undefined
         };
         this.markdownPart = this._register(_instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, context, editorPool, false, codeBlockStartIndex, renderer, {}, currentWidthDelegate(), codeBlockModelCollection, markdownOptions));
@@ -614,7 +611,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return;
         }
-        const ariaLabel = ( localize(5151, 'Terminal output for {0}', commandText));
+        const ariaLabel = ( localize(5734, 'Terminal output for {0}', commandText));
         const scrollableDomNode = this._scrollableContainer.getDomNode();
         scrollableDomNode.setAttribute('role', 'region');
         const accessibleViewHint = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.TerminalChatOutput);
@@ -629,26 +626,26 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         if (!commandText) {
             return undefined;
         }
-        const commandHeader = ( localize(5152, 'Command: {0}', commandText));
+        const commandHeader = ( localize(5735, 'Command: {0}', commandText));
         if (command) {
             const rawOutput = command.getOutput();
             if (!rawOutput || rawOutput.trim().length === 0) {
-                return `${commandHeader}\n${( localize(5153, 'No output was produced by the command.'))}`;
+                return `${commandHeader}\n${( localize(5736, '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(5154, 'Command output is no longer available.'))}`;
+            return `${commandHeader}\n${( localize(5737, 'Command output is no longer available.'))}`;
         }
         const plain = removeAnsiEscapeCodes((snapshot.text ?? ''));
         if (!plain.trim().length) {
-            return `${commandHeader}\n${( localize(5153, 'No output was produced by the command.'))}`;
+            return `${commandHeader}\n${( localize(5736, 'No output was produced by the command.'))}`;
         }
         let outputText = plain.trimEnd();
         if (snapshot.truncated) {
-            outputText += `\n${( localize(5155, 'Output truncated.'))}`;
+            outputText += `\n${( localize(5738, 'Output truncated.'))}`;
         }
         return `${commandHeader}\n${outputText}`;
     }
@@ -697,7 +694,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         await this._mirror.attach(this._terminalContainer);
         const result = await this._mirror.renderCommand();
         if (!result || result.lineCount === 0) {
-            this._showEmptyMessage(( localize(5153, 'No output was produced by the command.')));
+            this._showEmptyMessage(( localize(5736, 'No output was produced by the command.')));
         }
         else {
             this._hideEmptyMessage();
@@ -720,7 +717,7 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
             this._hideEmptyMessage();
         }
         else {
-            this._showEmptyMessage(( localize(5153, 'No output was produced by the command.')));
+            this._showEmptyMessage(( localize(5736, 'No output was produced by the command.')));
         }
         const lineCount = result?.lineCount ?? snapshot.lineCount ?? 0;
         this._layoutOutput(lineCount);
@@ -729,10 +726,10 @@ let ChatTerminalToolOutputSection = class ChatTerminalToolOutputSection extends
         clearNode(this._terminalContainer);
         this._lastRenderedLineCount = undefined;
         if (!liveTerminalInstance) {
-            this._showEmptyMessage(( localize(5156, 'Terminal is no longer available.')));
+            this._showEmptyMessage(( localize(5739, 'Terminal is no longer available.')));
         }
         else {
-            this._showEmptyMessage(( localize(5157, 'Command information is not available.')));
+            this._showEmptyMessage(( localize(5740, 'Command information is not available.')));
         }
     }
     async _resolveLiveTerminal() {
@@ -848,119 +845,9 @@ ChatTerminalToolOutputSection = ( __decorate([
     ( __param(9, IThemeService)),
     ( __param(10, IContextKeyService))
 ], ChatTerminalToolOutputSection));
-let DetachedTerminalSnapshotMirror = class DetachedTerminalSnapshotMirror extends Disposable {
-    constructor(output, _getTheme, _terminalService, _contextKeyService) {
-        super();
-        this._getTheme = _getTheme;
-        this._terminalService = _terminalService;
-        this._contextKeyService = _contextKeyService;
-        this._dirty = true;
-        this._output = output;
-    }
-    setOutput(output) {
-        this._output = output;
-        this._dirty = true;
-    }
-    async attach(container) {
-        const terminal = await this._getTerminal();
-        container.classList.add('chat-terminal-output-terminal');
-        if (this._attachedContainer !== container || container.firstChild === null) {
-            terminal.attachToElement(container);
-            this._attachedContainer = container;
-        }
-        this._container = container;
-        this._applyTheme(container);
-    }
-    async render() {
-        const output = this._output;
-        if (!output) {
-            return undefined;
-        }
-        if (!this._dirty) {
-            return { lineCount: this._lastRenderedLineCount ?? output.lineCount };
-        }
-        const terminal = await this._getTerminal();
-        terminal.xterm.clearBuffer();
-        terminal.xterm.clearSearchDecorations?.();
-        if (this._container) {
-            this._applyTheme(this._container);
-        }
-        const text = output.text ?? '';
-        const lineCount = output.lineCount ?? this._estimateLineCount(text);
-        if (!text) {
-            this._dirty = false;
-            this._lastRenderedLineCount = lineCount;
-            return { lineCount: 0 };
-        }
-        await ( new Promise(resolve => terminal.xterm.write(text, resolve)));
-        this._dirty = false;
-        this._lastRenderedLineCount = lineCount;
-        return { lineCount };
-    }
-    _estimateLineCount(text) {
-        if (!text) {
-            return 0;
-        }
-        const sanitized = text.replace(/\r/g, '');
-        const segments = sanitized.split('\n');
-        const count = sanitized.endsWith('\n') ? segments.length - 1 : segments.length;
-        return Math.max(count, 1);
-    }
-    _applyTheme(container) {
-        const theme = this._getTheme();
-        if (!theme) {
-            container.style.removeProperty('background-color');
-            container.style.removeProperty('color');
-            return;
-        }
-        if (theme.background) {
-            container.style.backgroundColor = theme.background;
-        }
-        if (theme.foreground) {
-            container.style.color = theme.foreground;
-        }
-    }
-    async _getTerminal() {
-        if (!this._detachedTerminal) {
-            this._detachedTerminal = this._createTerminal();
-        }
-        return this._detachedTerminal;
-    }
-    async _createTerminal() {
-        const terminal = await this._terminalService.createDetachedTerminal({
-            cols: 80,
-            rows: 10,
-            readonly: true,
-            processInfo: ( new DetachedProcessInfo({ initialCwd: '' })),
-            disableOverviewRuler: true,
-            colorProvider: {
-                getBackgroundColor: theme => {
-                    const storedBackground = this._getTheme()?.background;
-                    if (storedBackground) {
-                        const color = ( Color.fromHex(storedBackground));
-                        if (color) {
-                            return color;
-                        }
-                    }
-                    const terminalBackground = theme.getColor(TERMINAL_BACKGROUND_COLOR);
-                    if (terminalBackground) {
-                        return terminalBackground;
-                    }
-                    const isInEditor = ChatContextKeys.inChatEditor.getValue(this._contextKeyService);
-                    return theme.getColor(isInEditor ? editorBackground : PANEL_BACKGROUND);
-                }
-            }
-        });
-        return this._register(terminal);
-    }
-};
-DetachedTerminalSnapshotMirror = ( __decorate([
-    ( __param(2, ITerminalService)),
-    ( __param(3, IContextKeyService))
-], DetachedTerminalSnapshotMirror));
 let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extends Action {
     constructor(_toggle, _keybindingService, _telemetryService) {
-        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(5158, 'Show Output')), ThemeIcon.asClassName(Codicon.chevronRight), true);
+        super(TerminalContribCommandId.ToggleChatTerminalOutput, ( localize(5741, 'Show Output')), ThemeIcon.asClassName(Codicon.chevronRight), true);
         this._toggle = _toggle;
         this._keybindingService = _keybindingService;
         this._telemetryService = _telemetryService;
@@ -983,11 +870,11 @@ let ToggleChatTerminalOutputAction = class ToggleChatTerminalOutputAction extend
     }
     _updatePresentation() {
         if (this._expanded) {
-            this.label = ( localize(5159, 'Hide Output'));
+            this.label = ( localize(5742, 'Hide Output'));
             this.class = ThemeIcon.asClassName(Codicon.chevronDown);
         }
         else {
-            this.label = ( localize(5158, 'Show Output'));
+            this.label = ( localize(5741, 'Show Output'));
             this.class = ThemeIcon.asClassName(Codicon.chevronRight);
         }
     }
@@ -1003,7 +890,7 @@ ToggleChatTerminalOutputAction = ( __decorate([
 ], ToggleChatTerminalOutputAction));
 let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
     constructor(_instance, _command, _commandUri, _commandId, isTerminalHidden, _terminalService, _terminalEditorService, _terminalGroupService, _keybindingService, _telemetryService) {
-        super(TerminalContribCommandId.FocusChatInstanceAction, isTerminalHidden ? ( localize(5160, 'Show and Focus Terminal')) : ( localize(5161, 'Focus Terminal')), ThemeIcon.asClassName(Codicon.openInProduct), true);
+        super(TerminalContribCommandId.FocusChatInstanceAction, isTerminalHidden ? ( localize(5743, 'Show and Focus Terminal')) : ( localize(5744, 'Focus Terminal')), ThemeIcon.asClassName(Codicon.openInProduct), true);
         this._instance = _instance;
         this._command = _command;
         this._commandUri = _commandUri;
@@ -1016,7 +903,7 @@ let FocusChatInstanceAction = class FocusChatInstanceAction extends Action {
         this._updateTooltip();
     }
     async run() {
-        this.label = ( localize(5161, 'Focus Terminal'));
+        this.label = this._instance?.shellLaunchConfig.hideFromUser ? ( localize(5745, 'Show and Focus Terminal')) : ( localize(5744, 'Focus Terminal'));
         this._updateTooltip();
         let target = 'none';
         let location = 'panel';

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

@@ -7,14 +7,14 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IMarkerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service";
-import { IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { CodeBlockModelCollection } from "../../../common/codeBlockModelCollection.js";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
-import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service";
+import { IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { CodeBlockModelCollection } from "../../../../common/widget/codeBlockModelCollection.js";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+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/chatContentParts/chatContentParts";
-import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service";
+import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatMarkdownAnchorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service";
 import { AbstractToolConfirmationSubPart } from "./abstractToolConfirmationSubPart.js";
 import { EditorPool } from "../chatContentCodePools.js";
 export declare class ToolConfirmationSubPart extends AbstractToolConfirmationSubPart {

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

@@ -18,14 +18,14 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
-import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { createToolInputUri, createToolSchemaUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service';
+import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { createToolInputUri, createToolSchemaUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
 import { SkipToolConfirmationActionId, AcceptToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { renderFileWidgets } from '../../chatInlineAnchorWidget.js';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
+import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
 import { AbstractToolConfirmationSubPart } from './abstractToolConfirmationSubPart.js';
 
@@ -54,8 +54,8 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: toolInvocation.confirmationMessages.confirmResults ? ( localize(5162, "Allow and Review")) : ( localize(5163, "Allow")),
-            skipLabel: ( localize(5164, 'Proceed without running this tool')),
+            allowLabel: toolInvocation.confirmationMessages.confirmResults ? ( localize(5746, "Allow and Review")) : ( localize(5747, "Allow")),
+            skipLabel: ( localize(5748, 'Proceed without running this tool')),
             partType: 'chatToolConfirmation',
             subtitle: typeof toolInvocation.originMessage === 'string' ? toolInvocation.originMessage : toolInvocation.originMessage?.value,
         });
@@ -89,7 +89,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
         }
         if (this.toolInvocation.confirmationMessages?.confirmResults) {
             actions.unshift({
-                label: ( localize(5165, 'Allow and Skip Reviewing Result')),
+                label: ( localize(5749, 'Allow and Skip Reviewing Result')),
                 data: () => {
                     this.toolInvocation.confirmationMessages.confirmResults = undefined;
                     this.confirmWith(this.toolInvocation, { type: ToolConfirmKind.UserAction });
@@ -118,7 +118,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
                 h('.message@messageContainer', [
                     h('.message-wrapper@message'),
                     h('.see-more@showMore', [
-                        h('a', [( localize(5166, "Show More"))])
+                        h('a', [( localize(5750, "Show More"))])
                     ]),
                 ]),
                 h('.editor@editor'),
@@ -126,7 +126,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
             ]);
             if (toolInvocation.toolSpecificData?.kind === 'input' && toolInvocation.toolSpecificData.rawInput && !isEmptyObject(toolInvocation.toolSpecificData.rawInput)) {
                 const titleEl = createElement('h3');
-                titleEl.textContent = ( localize(5167, "Input"));
+                titleEl.textContent = ( localize(5751, "Input"));
                 elements.editor.appendChild(titleEl);
                 const inputData = toolInvocation.toolSpecificData;
                 const codeBlockRenderOptions = {
@@ -203,7 +203,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(5168, "See more"));
+                    seeMore.link.textContent = ( localize(5752, "See more"));
                     this._register(addDisposableGenericMouseDownListener(seeMore.link, () => {
                         try {
                             const parsed = JSON.parse(model.getValue());
@@ -250,7 +250,7 @@ let ToolConfirmationSubPart = class ToolConfirmationSubPart extends AbstractTool
     _makeMarkdownPart(container, message, codeBlockRenderOptions) {
         const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, {
             kind: 'markdownContent',
-            content: typeof message === 'string' ? ( new MarkdownString()).appendMarkdown(message) : message
+            content: typeof message === 'string' ? ( new MarkdownString()).appendMarkdown(message) : message,
         }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
         renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);
         container.append(part.domNode);