@codingame/monaco-vscode-katex-common 25.1.1 → 26.0.0

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

@@ -8,7 +8,7 @@ import { asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arra
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { createCommandUri, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { thenRegisterOrDispose, thenIfNotDisposed, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { thenRegisterOrDispose, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
@@ -30,9 +30,9 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 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 { 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/actions/chatContextKeys';
-import { ToolConfirmKind, IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
+import { IChatToolInvocation, ToolConfirmKind } 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';
@@ -40,11 +40,35 @@ import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
 
 var TerminalToolConfirmationStorageKeys;
-(function (TerminalToolConfirmationStorageKeys) {
+(function(TerminalToolConfirmationStorageKeys) {
     TerminalToolConfirmationStorageKeys["TerminalAutoApproveWarningAccepted"] = "chat.tools.terminal.autoApprove.warningAccepted";
-})(TerminalToolConfirmationStorageKeys || (TerminalToolConfirmationStorageKeys = {}));
+})(
+    TerminalToolConfirmationStorageKeys || (TerminalToolConfirmationStorageKeys = {})
+);
 let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
-    constructor(toolInvocation, terminalData, context, renderer, editorPool, currentWidthDelegate, codeBlockModelCollection, codeBlockStartIndex, instantiationService, dialogService, keybindingService, modelService, languageService, configurationService, contextKeyService, chatWidgetService, preferencesService, storageService, terminalChatService, textModelService, hoverService) {
+    constructor(
+        toolInvocation,
+        terminalData,
+        context,
+        renderer,
+        editorPool,
+        currentWidthDelegate,
+        codeBlockModelCollection,
+        codeBlockStartIndex,
+        instantiationService,
+        dialogService,
+        keybindingService,
+        modelService,
+        languageService,
+        configurationService,
+        contextKeyService,
+        chatWidgetService,
+        preferencesService,
+        storageService,
+        terminalChatService,
+        textModelService,
+        hoverService
+    ) {
         super(toolInvocation);
         this.context = context;
         this.renderer = renderer;
@@ -64,24 +88,34 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         this.storageService = storageService;
         this.terminalChatService = terminalChatService;
         this.codeblocks = [];
-        if (toolInvocation.fromSubAgent) {
-            context.container.classList.add('from-sub-agent');
-        }
-        if (!toolInvocation.confirmationMessages?.title) {
-            throw ( new Error('Confirmation messages are missing'));
+        const state = toolInvocation.state.get();
+        if (state.type !== IChatToolInvocation.StateKind.WaitingForConfirmation || !state.confirmationMessages?.title) {
+            throw ( new Error("Confirmation messages are missing"));
         }
         terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
-        const { title, message, disclaimer, terminalCustomActions } = toolInvocation.confirmationMessages;
+        const {
+            title,
+            message,
+            disclaimer,
+            terminalCustomActions
+        } = state.confirmationMessages;
+        const initialContent = terminalData.presentationOverrides?.commandLine ?? terminalData.confirmation?.commandLine ?? (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
+        const cdPrefix = terminalData.confirmation?.cdPrefix ?? "";
+        const isReadOnly = !!terminalData.presentationOverrides;
         const autoApproveEnabled = this.configurationService.getValue(TerminalContribSettingId.EnableAutoApprove) === true;
-        const autoApproveWarningAccepted = this.storageService.getBoolean(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, StorageScope.APPLICATION, false);
+        const autoApproveWarningAccepted = this.storageService.getBoolean(
+            TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted,
+            StorageScope.APPLICATION,
+            false
+        );
         let moreActions = undefined;
         if (autoApproveEnabled) {
             moreActions = [];
             if (!autoApproveWarningAccepted) {
                 moreActions.push({
-                    label: ( localize(5716, 'Enable Auto Approve...')),
+                    label: ( localize(5969, "Enable Auto Approve...")),
                     data: {
-                        type: 'enable'
+                        type: "enable"
                     }
                 });
                 moreActions.push(( new Separator()));
@@ -105,18 +139,24 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             reserveWidth: 19,
             verticalPadding: 5,
             editorOptions: {
-                wordWrap: 'on',
-                readOnly: false,
+                wordWrap: "on",
+                readOnly: isReadOnly,
                 tabFocusMode: true,
-                ariaLabel: typeof title === 'string' ? title : title.value
+                ariaLabel: typeof title === "string" ? title : title.value
             }
         };
-        const languageId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
-        const initialContent = (terminalData.commandLine.toolEdited ?? terminalData.commandLine.original).trimStart();
-        const model = this._register(this.modelService.createModel(initialContent, this.languageService.createById(languageId), this._getUniqueCodeBlockUri(), true));
+        const languageId = this.languageService.getLanguageIdByLanguageName(
+            terminalData.presentationOverrides?.language ?? terminalData.language ?? "sh"
+        ) ?? "shellscript";
+        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({
+        editor.object.render({
             codeBlockIndex: this.codeBlockStartIndex,
             codeBlockPartIndex: 0,
             element: this.context.element,
@@ -125,7 +165,6 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             textModel: Promise.resolve(model),
             chatSessionResource: this.context.element.sessionResource
         }, this.currentWidthDelegate());
-        this._register(thenIfNotDisposed(renderPromise, () => this._onDidChangeHeight.fire()));
         this.codeblocks.push({
             codeBlockIndex: this.codeBlockStartIndex,
             codemapperUri: undefined,
@@ -138,52 +177,64 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         });
         this._register(editor.object.onDidChangeContentHeight(() => {
             editor.object.layout(this.currentWidthDelegate());
-            this._onDidChangeHeight.fire();
         }));
         this._register(model.onDidChangeContent(e => {
             const currentValue = model.getValue();
-            terminalData.commandLine.userEdited = currentValue !== initialContent ? currentValue : undefined;
+            if (currentValue !== initialContent) {
+                terminalData.commandLine.userEdited = cdPrefix + currentValue;
+            } else {
+                terminalData.commandLine.userEdited = undefined;
+            }
         }));
-        const elements = h('.chat-confirmation-message-terminal', [
-            h('.chat-confirmation-message-terminal-editor@editor'),
-            h('.chat-confirmation-message-terminal-disclaimer@disclaimer'),
+        const elements = h(".chat-confirmation-message-terminal", [
+            h(".chat-confirmation-message-terminal-editor@editor"),
+            h(".chat-confirmation-message-terminal-disclaimer@disclaimer")
         ]);
         append(elements.editor, editor.object.element);
         this._register(hoverService.setupDelayedHover(elements.editor, {
-            content: message || '',
+            content: message || "",
             style: HoverStyle.Pointer,
-            position: { hoverPosition: HoverPosition.LEFT },
-        }));
-        const confirmWidget = this._register(this.instantiationService.createInstance((ChatCustomConfirmationWidget), this.context, {
-            title,
-            icon: Codicon.terminal,
-            message: elements.root,
-            buttons: this._createButtons(moreActions)
+            position: {
+                hoverPosition: HoverPosition.LEFT
+            }
         }));
+        const confirmWidget = this._register(
+            this.instantiationService.createInstance(ChatCustomConfirmationWidget, this.context, {
+                title,
+                icon: Codicon.terminal,
+                message: elements.root,
+                buttons: this._createButtons(moreActions)
+            })
+        );
         if (disclaimer) {
             this._appendMarkdownPart(elements.disclaimer, disclaimer, codeBlockRenderOptions);
         }
         const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
         hasToolConfirmationKey.set(true);
         this._register(toDisposable(() => hasToolConfirmationKey.reset()));
-        this._register(confirmWidget.onDidClick(async (button) => {
+        this._register(confirmWidget.onDidClick(async button => {
             let doComplete = true;
             const data = button.data;
             let toolConfirmKind = ToolConfirmKind.Denied;
-            if (typeof data === 'boolean') {
+            if (typeof data === "boolean") {
                 if (data) {
                     toolConfirmKind = ToolConfirmKind.UserAction;
                     if (terminalData.autoApproveInfo) {
                         terminalData.autoApproveInfo = undefined;
                     }
                 }
-            }
-            else if (typeof data !== 'boolean') {
+            } else if (typeof data !== "boolean") {
                 switch (data.type) {
-                    case 'enable': {
+                case "enable":
+                    {
                         const optedIn = await this._showAutoApproveWarning();
                         if (optedIn) {
-                            this.storageService.store(TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted, true, StorageScope.APPLICATION, StorageTarget.USER);
+                            this.storageService.store(
+                                TerminalToolConfirmationStorageKeys.TerminalAutoApproveWarningAccepted,
+                                true,
+                                StorageScope.APPLICATION,
+                                StorageTarget.USER
+                            );
                             if (terminalData.autoApproveInfo) {
                                 toolConfirmKind = ToolConfirmKind.UserAction;
                             }
@@ -196,40 +247,48 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 confirmWidget.updateButtons(this._createButtons(terminalCustomActions));
                                 doComplete = false;
                             }
-                        }
-                        else {
+                        } else {
                             doComplete = false;
                         }
                         break;
                     }
-                    case 'skip': {
+                case "skip":
+                    {
                         toolConfirmKind = ToolConfirmKind.Skipped;
                         break;
                     }
-                    case 'newRule': {
+                case "newRule":
+                    {
                         const newRules = asArray(data.rule);
-                        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;
+                        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 chatSessionResource = this.context.element.sessionResource;
                         for (const rule of sessionRules) {
-                            this.terminalChatService.addSessionAutoApproveRule(chatSessionId, rule.key, rule.value);
+                            this.terminalChatService.addSessionAutoApproveRule(chatSessionResource, 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 };
+                                const newValue = {
+                                    ...oldValue
+                                };
                                 for (const rule of workspaceRules) {
                                     newValue[rule.key] = rule.value;
                                 }
-                                await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.WORKSPACE);
-                            }
-                            else {
+                                await this.configurationService.updateValue(
+                                    TerminalContribSettingId.AutoApprove,
+                                    newValue,
+                                    ConfigurationTarget.WORKSPACE
+                                );
+                            } else {
                                 this.preferencesService.openSettings({
                                     jsonEditor: true,
                                     target: ConfigurationTarget.WORKSPACE,
-                                    revealSetting: { key: TerminalContribSettingId.AutoApprove },
+                                    revealSetting: {
+                                        key: TerminalContribSettingId.AutoApprove
+                                    }
                                 });
                                 throw ( new ErrorNoTelemetry(`Cannot add new rule, existing workspace setting is unexpected format`));
                             }
@@ -238,30 +297,33 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                             const inspect = this.configurationService.inspect(TerminalContribSettingId.AutoApprove);
                             const oldValue = inspect.userValue ?? {};
                             if (isObject(oldValue)) {
-                                const newValue = { ...oldValue };
+                                const newValue = {
+                                    ...oldValue
+                                };
                                 for (const rule of userRules) {
                                     newValue[rule.key] = rule.value;
                                 }
                                 await this.configurationService.updateValue(TerminalContribSettingId.AutoApprove, newValue, ConfigurationTarget.USER);
-                            }
-                            else {
+                            } else {
                                 this.preferencesService.openSettings({
                                     jsonEditor: true,
                                     target: ConfigurationTarget.USER,
-                                    revealSetting: { key: TerminalContribSettingId.AutoApprove },
+                                    revealSetting: {
+                                        key: TerminalContribSettingId.AutoApprove
+                                    }
                                 });
                                 throw ( new ErrorNoTelemetry(`Cannot add new rule, existing setting is unexpected format`));
                             }
                         }
                         function formatRuleLinks(rules, scope) {
                             return ( rules.map(e => {
-                                if (scope === 'session') {
+                                if (scope === "session") {
                                     return `\`${e.key}\``;
                                 }
-                                const target = scope === 'workspace' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+                                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(', ');
+                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(5970, "View rule in settings"))}")`;
+                            })).join(", ");
                         }
                         const mdTrustSettings = {
                             isTrusted: {
@@ -270,119 +332,117 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                         };
                         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')
+                            parts.push(sessionRules.length === 1 ? ( localize(
+                                5971,
+                                "Session auto approve rule {0} added",
+                                formatRuleLinks(sessionRules, "session")
+                            )) : ( localize(
+                                5972,
+                                "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')
+                            parts.push(workspaceRules.length === 1 ? ( localize(
+                                5973,
+                                "Workspace auto approve rule {0} added",
+                                formatRuleLinks(workspaceRules, "workspace")
+                            )) : ( localize(
+                                5974,
+                                "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')
+                            parts.push(userRules.length === 1 ? ( localize(
+                                5975,
+                                "User auto approve rule {0} added",
+                                formatRuleLinks(userRules, "user")
+                            )) : ( localize(
+                                5976,
+                                "User auto approve rules {0} added",
+                                formatRuleLinks(userRules, "user")
                             )));
                         }
                         if (parts.length > 0) {
-                            terminalData.autoApproveInfo = ( new MarkdownString(parts.join(', '), mdTrustSettings));
+                            terminalData.autoApproveInfo = ( new MarkdownString(parts.join(", "), mdTrustSettings));
                         }
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
-                    case 'configure': {
+                case "configure":
+                    {
                         this.preferencesService.openSettings({
                             target: ConfigurationTarget.USER,
-                            query: `@id:${TerminalContribSettingId.AutoApprove}`,
+                            query: `@id:${TerminalContribSettingId.AutoApprove}`
                         });
                         doComplete = false;
                         break;
                     }
-                    case 'sessionApproval': {
-                        const sessionId = this.context.element.sessionId;
-                        this.terminalChatService.setChatSessionAutoApproval(sessionId, true);
-                        const disableUri = createCommandUri(TerminalContribCommandId.DisableSessionAutoApproval, sessionId);
+                case "sessionApproval":
+                    {
+                        const sessionResource = this.context.element.sessionResource;
+                        this.terminalChatService.setChatSessionAutoApproval(sessionResource, true);
+                        const disableUri = createCommandUri(TerminalContribCommandId.DisableSessionAutoApproval, sessionResource);
                         const mdTrustSettings = {
                             isTrusted: {
                                 enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
                             }
                         };
-                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(5724, 'All commands will be auto approved for this session'))} ([${( localize(5725, 'Disable'))}](${( disableUri.toString())}))`, mdTrustSettings));
+                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(5977, "All commands will be auto approved for this session"))} ([${( localize(5978, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
                 }
             }
             if (doComplete) {
-                IChatToolInvocation.confirmWith(toolInvocation, { type: toolConfirmKind });
+                IChatToolInvocation.confirmWith(toolInvocation, {
+                    type: toolConfirmKind
+                });
                 this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
             }
         }));
-        this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
         this.domNode = confirmWidget.domNode;
     }
     _createButtons(moreActions) {
         const getLabelAndTooltip = (label, actionId, tooltipDetail = label) => {
-            const keybinding = this.keybindingService.lookupKeybinding(actionId)?.getLabel();
-            const tooltip = keybinding ? `${tooltipDetail} (${keybinding})` : (tooltipDetail);
-            return { label, tooltip };
+            const tooltip = this.keybindingService.appendKeybinding(tooltipDetail, actionId);
+            return {
+                label,
+                tooltip
+            };
         };
-        return [
-            {
-                ...getLabelAndTooltip(( localize(5726, "Allow")), AcceptToolConfirmationActionId),
-                data: true,
-                moreActions,
+        return [{
+            ...getLabelAndTooltip(( localize(5979, "Allow")), AcceptToolConfirmationActionId),
+            data: true,
+            moreActions
+        }, {
+            ...getLabelAndTooltip(( localize(5980, "Skip")), SkipToolConfirmationActionId, ( localize(5981, "Proceed without executing this command"))),
+            data: {
+                type: "skip"
             },
-            {
-                ...getLabelAndTooltip(( localize(5727, "Skip")), SkipToolConfirmationActionId, ( localize(5728, 'Proceed without executing this command'))),
-                data: { type: 'skip' },
-                isSecondary: true,
-            },
-        ];
+            isSecondary: true
+        }];
     }
     async _showAutoApproveWarning() {
         const promptResult = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(5729, 'Enable terminal auto approve?')),
+            message: ( localize(5982, "Enable terminal auto approve?")),
             buttons: [{
-                    label: ( localize(5730, 'Enable')),
-                    run: () => true
-                }],
+                label: ( localize(5983, "Enable")),
+                run: () => true
+            }],
             cancelButton: true,
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
-                        markdown: ( new MarkdownString(( localize(
-                            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(5732, 'Learn more about the potential risks and how to avoid them.'))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
-                    }],
+                    markdown: ( new MarkdownString(( localize(
+                        5984,
+                        "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(5985, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
+                }]
             }
         });
         return promptResult.result === true;
@@ -390,32 +450,19 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
     _getUniqueCodeBlockUri() {
         return ( URI.from({
             scheme: Schemas.vscodeChatCodeBlock,
-            path: generateUuid(),
+            path: generateUuid()
         }));
     }
     _appendMarkdownPart(container, message, codeBlockRenderOptions) {
         const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, {
-            kind: 'markdownContent',
-            content: typeof message === 'string' ? ( new MarkdownString()).appendMarkdown(message) : message
-        }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
+            kind: "markdownContent",
+            content: typeof message === "string" ? ( new MarkdownString()).appendMarkdown(message) : message
+        }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), this.codeBlockModelCollection, {
+            codeBlockRenderOptions
+        }));
         append(container, part.domNode);
-        this._register(part.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
     }
 };
-ChatTerminalToolConfirmationSubPart = ( __decorate([
-    ( __param(8, IInstantiationService)),
-    ( __param(9, IDialogService)),
-    ( __param(10, IKeybindingService)),
-    ( __param(11, IModelService)),
-    ( __param(12, ILanguageService)),
-    ( __param(13, IConfigurationService)),
-    ( __param(14, IContextKeyService)),
-    ( __param(15, IChatWidgetService)),
-    ( __param(16, IPreferencesService)),
-    ( __param(17, IStorageService)),
-    ( __param(18, ITerminalChatService)),
-    ( __param(19, ITextModelService)),
-    ( __param(20, IHoverService))
-], ChatTerminalToolConfirmationSubPart));
+ChatTerminalToolConfirmationSubPart = ( __decorate([( __param(8, IInstantiationService)), ( __param(9, IDialogService)), ( __param(10, IKeybindingService)), ( __param(11, IModelService)), ( __param(12, ILanguageService)), ( __param(13, IConfigurationService)), ( __param(14, IContextKeyService)), ( __param(15, IChatWidgetService)), ( __param(16, IPreferencesService)), ( __param(17, IStorageService)), ( __param(18, ITerminalChatService)), ( __param(19, ITextModelService)), ( __param(20, IHoverService))], ChatTerminalToolConfirmationSubPart));
 
 export { ChatTerminalToolConfirmationSubPart, TerminalToolConfirmationStorageKeys };

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

@@ -1,3 +1,4 @@
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 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/chatService";
 import { CodeBlockModelCollection } from "../../../../common/widget/codeBlockModelCollection.js";
@@ -25,6 +26,7 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _contextKeyService;
     private readonly _chatWidgetService;
     private readonly _keybindingService;
+    private readonly _configurationService;
     readonly domNode: HTMLElement;
     private readonly _actionBar;
     private readonly _titleElement;
@@ -37,6 +39,7 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _showOutputAction;
     private _showOutputActionAdded;
     private readonly _focusAction;
+    private readonly _continueInBackgroundAction;
     private readonly _terminalData;
     private _terminalCommandUri;
     private _storedCommandId;
@@ -44,11 +47,17 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _isSerializedInvocation;
     private _terminalInstance;
     private readonly _decoration;
+    private _userToggledOutput;
+    private _isInThinkingContainer;
+    private _thinkingCollapsibleWrapper;
     private markdownPart;
     get codeblocks(): IChatCodeBlockInfo[];
     get elementIndex(): number;
     get contentIndex(): number;
-    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, codeBlockModelCollection: CodeBlockModelCollection, _instantiationService: IInstantiationService, _terminalChatService: ITerminalChatService, _terminalService: ITerminalService, _contextKeyService: IContextKeyService, _chatWidgetService: IChatWidgetService, _keybindingService: IKeybindingService);
+    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, codeBlockModelCollection: CodeBlockModelCollection, _instantiationService: IInstantiationService, _terminalChatService: ITerminalChatService, _terminalService: ITerminalService, _contextKeyService: IContextKeyService, _chatWidgetService: IChatWidgetService, _keybindingService: IKeybindingService, _configurationService: IConfigurationService);
+    private _createCollapsibleWrapper;
+    expandCollapsibleWrapper(): void;
+    markCollapsibleWrapperComplete(): void;
     private _initializeTerminalActions;
     private _addActions;
     private _getResolvedCommand;
@@ -56,6 +65,7 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private _clearCommandAssociation;
     private _registerInstanceListener;
     private _removeFocusAction;
+    private _removeContinueInBackgroundAction;
     private _toggleOutput;
     private _ensureTerminalInstance;
     private _handleOutputFocus;
@@ -98,3 +108,9 @@ export declare class FocusChatInstanceAction extends Action implements IAction {
     private _resolveCommand;
     private _updateTooltip;
 }
+export declare class ContinueInBackgroundAction extends Action implements IAction {
+    private readonly _terminalToolSessionId;
+    private readonly _terminalChatService;
+    constructor(_terminalToolSessionId: string, _terminalChatService: ITerminalChatService);
+    run(): Promise<void>;
+}