@codingame/monaco-vscode-katex-common 30.0.1 → 31.0.0

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

@@ -8,15 +8,10 @@ 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 { MarkdownString, createCommandUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-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 { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 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 { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -37,6 +32,7 @@ import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '@c
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatCustomConfirmationWidget } from '../chatConfirmationWidget.js';
 import { ChatMarkdownContentPart } from '../chatMarkdownContentPart.js';
+import { CodeBlockPart } from '../codeBlockPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
 
 var TerminalToolConfirmationStorageKeys;
@@ -53,12 +49,10 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         renderer,
         editorPool,
         currentWidthDelegate,
-        codeBlockModelCollection,
         codeBlockStartIndex,
         instantiationService,
         dialogService,
         keybindingService,
-        modelService,
         languageService,
         configurationService,
         contextKeyService,
@@ -66,7 +60,6 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         preferencesService,
         storageService,
         terminalChatService,
-        textModelService,
         hoverService
     ) {
         super(toolInvocation);
@@ -74,12 +67,10 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         this.renderer = renderer;
         this.editorPool = editorPool;
         this.currentWidthDelegate = currentWidthDelegate;
-        this.codeBlockModelCollection = codeBlockModelCollection;
         this.codeBlockStartIndex = codeBlockStartIndex;
         this.instantiationService = instantiationService;
         this.dialogService = dialogService;
         this.keybindingService = keybindingService;
-        this.modelService = modelService;
         this.languageService = languageService;
         this.configurationService = configurationService;
         this.contextKeyService = contextKeyService;
@@ -113,7 +104,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             moreActions = [];
             if (!autoApproveWarningAccepted) {
                 moreActions.push({
-                    label: ( localize(6926, "Enable Auto Approve...")),
+                    label: ( localize(7039, "Enable Auto Approve...")),
                     data: {
                         type: "enable"
                     }
@@ -148,23 +139,17 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         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 key = CodeBlockPart.poolKey(this.context.element.id, this.codeBlockStartIndex);
+        const editor = this._register(this.editorPool.get(key));
         editor.object.render({
             codeBlockIndex: this.codeBlockStartIndex,
-            codeBlockPartIndex: 0,
             element: this.context.element,
             languageId,
+            text: initialContent,
             renderOptions: codeBlockRenderOptions,
-            textModel: Promise.resolve(model),
             chatSessionResource: this.context.element.sessionResource
         }, this.currentWidthDelegate());
+        const model = editor.object.editor.getModel();
         this.codeblocks.push({
             codeBlockIndex: this.codeBlockStartIndex,
             codemapperUri: undefined,
@@ -172,10 +157,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             focus: () => editor.object.focus(),
             ownerMarkdownPartId: this.codeblocksPartId,
             uri: model.uri,
-            uriPromise: Promise.resolve(model.uri),
             chatSessionResource: this.context.element.sessionResource
         });
-        this._register(model.onDidChangeContent(e => {
+        this._register(model.onDidChangeContent(() => {
             const currentValue = model.getValue();
             if (currentValue !== initialContent) {
                 terminalData.commandLine.userEdited = cdPrefix + currentValue;
@@ -205,7 +189,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
         );
         if (terminalData.requestUnsandboxedExecution) {
             const reasonText = (terminalData.requestUnsandboxedExecutionReason && terminalData.requestUnsandboxedExecutionReason.trim()) || ( localize(
-                6927,
+                7040,
                 "The model did not provide a reason for requesting unsandboxed execution."
             ));
             const unsandboxedReasonMarkdown = ( new MarkdownString(undefined, {
@@ -331,7 +315,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 }
                                 const target = scope === "workspace" ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
                                 const settingsUri = createCommandUri(TerminalContribCommandId.OpenTerminalSettingsLink, target);
-                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(6928, "View rule in settings"))}")`;
+                                return `[\`${e.key}\`](${( settingsUri.toString())} "${( localize(7041, "View rule in settings"))}")`;
                             })).join(", ");
                         }
                         const mdTrustSettings = {
@@ -342,33 +326,33 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                         const parts = [];
                         if (sessionRules.length > 0) {
                             parts.push(sessionRules.length === 1 ? ( localize(
-                                6929,
+                                7042,
                                 "Session auto approve rule {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )) : ( localize(
-                                6930,
+                                7043,
                                 "Session auto approve rules {0} added",
                                 formatRuleLinks(sessionRules, "session")
                             )));
                         }
                         if (workspaceRules.length > 0) {
                             parts.push(workspaceRules.length === 1 ? ( localize(
-                                6931,
+                                7044,
                                 "Workspace auto approve rule {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )) : ( localize(
-                                6932,
+                                7045,
                                 "Workspace auto approve rules {0} added",
                                 formatRuleLinks(workspaceRules, "workspace")
                             )));
                         }
                         if (userRules.length > 0) {
                             parts.push(userRules.length === 1 ? ( localize(
-                                6933,
+                                7046,
                                 "User auto approve rule {0} added",
                                 formatRuleLinks(userRules, "user")
                             )) : ( localize(
-                                6934,
+                                7047,
                                 "User auto approve rules {0} added",
                                 formatRuleLinks(userRules, "user")
                             )));
@@ -398,7 +382,7 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                                 enabledCommands: [TerminalContribCommandId.DisableSessionAutoApproval]
                             }
                         };
-                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(6935, "All commands will be auto approved for this session"))} ([${( localize(6936, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
+                        terminalData.autoApproveInfo = ( new MarkdownString(`${( localize(7048, "All commands will be auto approved for this session"))} ([${( localize(7049, "Disable"))}](${( disableUri.toString())}))`, mdTrustSettings));
                         toolConfirmKind = ToolConfirmKind.UserAction;
                         break;
                     }
@@ -422,11 +406,11 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
             };
         };
         return [{
-            ...getLabelAndTooltip(( localize(6937, "Allow")), AcceptToolConfirmationActionId),
+            ...getLabelAndTooltip(( localize(7050, "Allow")), AcceptToolConfirmationActionId),
             data: true,
             moreActions
         }, {
-            ...getLabelAndTooltip(( localize(6938, "Skip")), SkipToolConfirmationActionId, ( localize(6939, "Proceed without executing this command"))),
+            ...getLabelAndTooltip(( localize(7051, "Skip")), SkipToolConfirmationActionId, ( localize(7052, "Proceed without executing this command"))),
             data: {
                 type: "skip"
             },
@@ -436,9 +420,9 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
     async _showAutoApproveWarning() {
         const promptResult = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(6940, "Enable terminal auto approve?")),
+            message: ( localize(7053, "Enable terminal auto approve?")),
             buttons: [{
-                label: ( localize(6941, "Enable")),
+                label: ( localize(7054, "Enable")),
                 run: () => true
             }],
             cancelButton: true,
@@ -446,32 +430,26 @@ let ChatTerminalToolConfirmationSubPart = class ChatTerminalToolConfirmationSubP
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        6942,
+                        7055,
                         "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(6943, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
+                    markdown: ( new MarkdownString(`[${( localize(7056, "Learn more about the potential risks and how to avoid them."))}](https://code.visualstudio.com/docs/copilot/security#_security-considerations)`))
                 }]
             }
         });
         return promptResult.result === true;
     }
-    _getUniqueCodeBlockUri() {
-        return ( URI.from({
-            scheme: Schemas.vscodeChatCodeBlock,
-            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, {
+        }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), {
             codeBlockRenderOptions
         }));
         append(container, part.domNode);
     }
 };
-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(7, IInstantiationService)), ( __param(8, IDialogService)), ( __param(9, IKeybindingService)), ( __param(10, ILanguageService)), ( __param(11, IConfigurationService)), ( __param(12, IContextKeyService)), ( __param(13, IChatWidgetService)), ( __param(14, IPreferencesService)), ( __param(15, IStorageService)), ( __param(16, ITerminalChatService)), ( __param(17, IHoverService))], ChatTerminalToolConfirmationSubPart));
 
 export { ChatTerminalToolConfirmationSubPart, TerminalToolConfirmationStorageKeys };

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

@@ -1,26 +1,21 @@
 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";
 import { ChatTreeItem, 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 "../chatContentParts.js";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
 import { ChatCollapsibleContentPart } from "../chatCollapsibleContentPart.js";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-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";
+import { IChatTerminalToolProgressPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalGroupService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
-import { ITerminalCommand } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { EditorPool } from "../chatContentCodePools.js";
-import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 /**
  * A chat content part that displays terminal tool invocation progress.
@@ -47,10 +42,11 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _terminalService;
     private readonly _contextKeyService;
     private readonly _chatWidgetService;
-    private readonly _keybindingService;
     private readonly _configurationService;
+    private readonly _terminalEditorService;
+    private readonly _terminalGroupService;
+    private readonly _telemetryService;
     readonly domNode: HTMLElement;
-    private readonly _actionBar;
     private readonly _titleElement;
     private readonly _outputView;
     private readonly _terminalOutputContextKey;
@@ -58,13 +54,15 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     private readonly _elementIndex;
     private readonly _contentIndex;
     private readonly _sessionResource;
-    private readonly _showOutputAction;
-    private _showOutputActionAdded;
-    private readonly _focusAction;
-    private readonly _continueInBackgroundAction;
+    private _toolbarHasInstance;
+    private _toolbarCanContinueInBackground;
+    private _toolbarHasOutput;
+    private _toolbarIsHiddenTerminal;
+    private _toolbarOutputExpanded;
+    private _actionBar;
+    private readonly _actionBarActions;
     private readonly _terminalData;
     private _terminalCommandUri;
-    private _storedCommandId;
     private readonly _commandText;
     private readonly _isSerializedInvocation;
     private _terminalInstance;
@@ -77,7 +75,7 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     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, _configurationService: IConfigurationService);
+    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, terminalData: IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData, context: IChatContentPartRenderContext, renderer: IMarkdownRenderer, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockStartIndex: number, _instantiationService: IInstantiationService, _terminalChatService: ITerminalChatService, _terminalService: ITerminalService, _contextKeyService: IContextKeyService, _chatWidgetService: IChatWidgetService, _configurationService: IConfigurationService, _terminalEditorService: ITerminalEditorService, _terminalGroupService: ITerminalGroupService, _telemetryService: ITelemetryService);
     /**
      * Renders image attachment pills below the terminal output when the tool
      * result contains image data parts. For collapsible wrappers, the single
@@ -88,9 +86,16 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     expandCollapsibleWrapper(): void;
     markCollapsibleWrapperComplete(): void;
     private _initializeTerminalActions;
-    private _addActions;
+    /**
+     * Updates the scoped context keys that drive toolbar action visibility.
+     * The ActionBar is rebuilt with the correct set of visible actions.
+     */
+    private _updateToolbarContextKeys;
+    /**
+     * Rebuilds the ActionBar actions based on current toolbar state.
+     */
+    private _updateToolbarActions;
     private _getResolvedCommand;
-    private _ensureShowOutputAction;
     private _clearCommandAssociation;
     /**
      * Determines whether the terminal output should auto-expand.
@@ -108,8 +113,12 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
      * - Instance disposal handling to clean up actions and state
      */
     private _registerInstanceListener;
-    private _removeFocusAction;
-    private _removeContinueInBackgroundAction;
+    /**
+     * Sets up listeners using an {@link IAhpTerminalCommandSource} when no local
+     * `ICommandDetectionCapability` is available. Provides auto-expand, toolbar
+     * context key updates, and command completion handling.
+     */
+    private _attachAhpCommandSource;
     /**
      * Handles the completion of a terminal command by updating the UI state.
      * This includes marking the collapsible wrapper as complete, auto-collapsing
@@ -127,45 +136,12 @@ export declare class ChatTerminalToolProgressPart extends BaseChatToolInvocation
     focusOutput(): void;
     private _focusChatInput;
     focusTerminal(): Promise<void>;
+    continueInBackground(): void;
+    toggleOutputFromAction(): Promise<void>;
     toggleOutputFromKeyboard(): Promise<void>;
-    private _toggleOutputFromAction;
     private _collapseOutputAndFocusInput;
     private _resolveCommand;
 }
-export declare class ToggleChatTerminalOutputAction extends Action implements IAction {
-    private readonly _toggle;
-    private readonly _keybindingService;
-    private readonly _telemetryService;
-    private _expanded;
-    constructor(_toggle: () => Promise<void>, _keybindingService: IKeybindingService, _telemetryService: ITelemetryService);
-    run(): Promise<void>;
-    syncPresentation(expanded: boolean): void;
-    refreshKeybindingTooltip(): void;
-    private _updatePresentation;
-    private _updateTooltip;
-}
-export declare class FocusChatInstanceAction extends Action implements IAction {
-    private _instance;
-    private _command;
-    private readonly _commandUri;
-    private readonly _commandId;
-    private readonly _terminalService;
-    private readonly _terminalEditorService;
-    private readonly _terminalGroupService;
-    private readonly _keybindingService;
-    private readonly _telemetryService;
-    constructor(_instance: ITerminalInstance | undefined, _command: ITerminalCommand | undefined, _commandUri: URI | undefined, _commandId: string | undefined, isTerminalHidden: boolean, _terminalService: ITerminalService, _terminalEditorService: ITerminalEditorService, _terminalGroupService: ITerminalGroupService, _keybindingService: IKeybindingService, _telemetryService: ITelemetryService);
-    run(): Promise<void>;
-    refreshKeybindingTooltip(): void;
-    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>;
-}
 export declare class ChatTerminalThinkingCollapsibleWrapper extends ChatCollapsibleContentPart {
     private readonly _terminalContentElement;
     private readonly _commandText;