@codingame/monaco-vscode-katex-common 25.1.2 → 26.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.js

@@ -1,10 +1,9 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, clearNode, addDisposableListener, EventType, getWindow, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, addDisposableListener, EventType, getWindow, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
-import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -30,12 +29,31 @@ import { isStringImplicitContextValue } from '@codingame/monaco-vscode-api/vscod
 import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
 
 let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget extends Disposable {
-    constructor(widgetRef, attachment, resourceLabels, attachmentModel, contextKeyService, contextMenuService, labelService, menuService, fileService, languageService, modelService, hoverService, configService, chatContextService) {
+    constructor(
+        widgetRef,
+        isAttachmentAlreadyAttached,
+        attachment,
+        resourceLabels,
+        attachmentModel,
+        domNode,
+        contextKeyService,
+        contextMenuService,
+        labelService,
+        menuService,
+        fileService,
+        languageService,
+        modelService,
+        hoverService,
+        configService,
+        chatContextService
+    ) {
         super();
         this.widgetRef = widgetRef;
+        this.isAttachmentAlreadyAttached = isAttachmentAlreadyAttached;
         this.attachment = attachment;
         this.resourceLabels = resourceLabels;
         this.attachmentModel = attachmentModel;
+        this.domNode = domNode;
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
         this.labelService = labelService;
@@ -47,78 +65,114 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         this.configService = configService;
         this.chatContextService = chatContextService;
         this.renderDisposables = this._register(( new DisposableStore()));
-        this.domNode = $('.chat-attached-context-attachment.show-file-icons.implicit');
+        this.renderedCount = 0;
         this.render();
     }
     render() {
-        clearNode(this.domNode);
         this.renderDisposables.clear();
-        this.domNode.classList.toggle('disabled', !this.attachment.enabled);
-        const file = this.attachment.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(4966, "cell")) : ( localize(4967, "file"));
-        const isSuggestedEnabled = this.configService.getValue('chat.implicitContext.suggestedContext');
+        this.renderedCount = 0;
+        for (const context of this.attachment.values) {
+            const targetUri = context.uri;
+            const targetRange = isLocation(context.value) ? context.value.range : undefined;
+            const targetHandle = isStringImplicitContextValue(context.value) ? context.value.handle : undefined;
+            const currentlyAttached = this.isAttachmentAlreadyAttached(targetUri, targetRange, targetHandle);
+            if (!currentlyAttached) {
+                this.renderMainContext(context, context.isSelection);
+                this.renderedCount++;
+            }
+        }
+    }
+    get hasRenderedContexts() {
+        return this.renderedCount > 0;
+    }
+    renderMainContext(context, isSelection) {
+        const contextNode = $(".chat-attached-context-attachment.show-file-icons.implicit");
+        this.domNode.appendChild(contextNode);
+        contextNode.classList.toggle("disabled", !context.enabled);
+        const file = context.uri;
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5095, "cell")) : ( localize(5096, "file"));
+        const isSuggestedEnabled = this.configService.getValue("chat.implicitContext.suggestedContext");
         if (isSuggestedEnabled) {
-            if (!this.attachment.isSelection) {
-                const buttonMsg = this.attachment.enabled ? ( localize(4968, "Disable current {0} context", attachmentTypeName)) : '';
-                const toggleButton = this.renderDisposables.add(( new Button(this.domNode, { supportIcons: true, title: buttonMsg })));
-                toggleButton.icon = this.attachment.enabled ? Codicon.x : Codicon.plus;
-                this.renderDisposables.add(toggleButton.onDidClick(async (e) => {
+            if (!isSelection) {
+                const buttonMsg = context.enabled ? ( localize(5097, "Disable current {0} context", attachmentTypeName)) : "";
+                const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
+                    supportIcons: true,
+                    title: buttonMsg
+                })));
+                toggleButton.icon = context.enabled ? Codicon.x : Codicon.plus;
+                this.renderDisposables.add(toggleButton.onDidClick(async e => {
                     e.stopPropagation();
                     e.preventDefault();
-                    if (!this.attachment.enabled) {
-                        await this.convertToRegularAttachment();
+                    if (!context.enabled) {
+                        await this.convertToRegularAttachment(context);
                     }
-                    this.attachment.enabled = false;
+                    context.enabled = false;
                 }));
-            }
-            else {
-                const pinButtonMsg = ( localize(4969, "Pin selection"));
-                const pinButton = this.renderDisposables.add(( new Button(this.domNode, { supportIcons: true, title: pinButtonMsg })));
+            } else {
+                const pinButtonMsg = ( localize(5098, "Pin selection"));
+                const pinButton = this.renderDisposables.add(( new Button(contextNode, {
+                    supportIcons: true,
+                    title: pinButtonMsg
+                })));
                 pinButton.icon = Codicon.pinned;
-                this.renderDisposables.add(pinButton.onDidClick(async (e) => {
+                this.renderDisposables.add(pinButton.onDidClick(async e => {
                     e.stopPropagation();
                     e.preventDefault();
                     await this.pinSelection();
                 }));
             }
-            if (!this.attachment.enabled && this.attachment.isSelection) {
-                this.domNode.classList.remove('disabled');
+            if (!context.enabled && isSelection) {
+                contextNode.classList.remove("disabled");
             }
-            this.renderDisposables.add(addDisposableListener(this.domNode, EventType.CLICK, async (e) => {
-                if (!this.attachment.enabled && !this.attachment.isSelection) {
-                    await this.convertToRegularAttachment();
+            this.renderDisposables.add(addDisposableListener(contextNode, EventType.CLICK, async e => {
+                if (!context.enabled && !isSelection) {
+                    await this.convertToRegularAttachment(context);
                 }
             }));
-            this.renderDisposables.add(addDisposableListener(this.domNode, EventType.KEY_DOWN, async (e) => {
-                const event = ( new StandardKeyboardEvent(e));
-                if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-                    if (!this.attachment.enabled && !this.attachment.isSelection) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        await this.convertToRegularAttachment();
+            this.renderDisposables.add(
+                addDisposableListener(contextNode, EventType.KEY_DOWN, async e => {
+                    const event = ( new StandardKeyboardEvent(e));
+                    if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+                        if (!context.enabled && !isSelection) {
+                            e.preventDefault();
+                            e.stopPropagation();
+                            await this.convertToRegularAttachment(context);
+                        }
                     }
-                }
-            }));
-        }
-        else {
-            const buttonMsg = this.attachment.enabled ? ( localize(4968, "Disable current {0} context", attachmentTypeName)) : ( localize(4970, "Enable current {0} context", attachmentTypeName));
-            const toggleButton = this.renderDisposables.add(( new Button(this.domNode, { supportIcons: true, title: buttonMsg })));
-            toggleButton.icon = this.attachment.enabled ? Codicon.eye : Codicon.eyeClosed;
-            this.renderDisposables.add(toggleButton.onDidClick((e) => {
+                })
+            );
+        } else {
+            const buttonMsg = context.enabled ? ( localize(5097, "Disable current {0} context", attachmentTypeName)) : ( localize(5099, "Enable current {0} context", attachmentTypeName));
+            const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
+                supportIcons: true,
+                title: buttonMsg
+            })));
+            toggleButton.icon = context.enabled ? Codicon.eye : Codicon.eyeClosed;
+            this.renderDisposables.add(toggleButton.onDidClick(e => {
                 e.stopPropagation();
-                this.attachment.enabled = !this.attachment.enabled;
+                context.enabled = !context.enabled;
             }));
         }
-        const label = this.resourceLabels.create(this.domNode, { supportIcons: true });
+        const label = this.resourceLabels.create(contextNode, {
+            supportIcons: true
+        });
         let title;
-        if (isStringImplicitContextValue(this.attachment.value)) {
-            title = this.renderString(label);
+        let markdownTooltip;
+        if (isStringImplicitContextValue(context.value)) {
+            markdownTooltip = context.value.tooltip;
+            title = this.renderString(label, context.name, context.icon, markdownTooltip, ( localize(5100, "Current file context")));
+        } else {
+            title = this.renderResource(context.value, context.isSelection, context.enabled, label);
         }
-        else {
-            title = this.renderResource(this.attachment.value, label);
+        if (markdownTooltip || title) {
+            this.renderDisposables.add(this.hoverService.setupDelayedHover(contextNode, {
+                content: markdownTooltip ?? title,
+                appearance: {
+                    showPointer: true
+                }
+            }));
         }
-        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.domNode, title));
-        const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(this.domNode));
+        const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(contextNode));
         const resourceContextKey = this.renderDisposables.add(( new ResourceContextKey(
             scopedContextKeyService,
             this.fileService,
@@ -126,45 +180,52 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             this.modelService
         )));
         resourceContextKey.set(file);
-        this.renderDisposables.add(addDisposableListener(this.domNode, EventType.CONTEXT_MENU, async (domEvent) => {
-            const event = ( new StandardMouseEvent(getWindow(domEvent), domEvent));
-            EventHelper.stop(domEvent, true);
-            this.contextMenuService.showContextMenu({
-                contextKeyService: scopedContextKeyService,
-                getAnchor: () => event,
-                getActions: () => {
-                    const menu = this.menuService.getMenuActions(MenuId.ChatInputResourceAttachmentContext, scopedContextKeyService, { arg: file });
-                    return getFlatContextMenuActions(menu);
-                },
-            });
-        }));
+        this.renderDisposables.add(
+            addDisposableListener(contextNode, EventType.CONTEXT_MENU, async domEvent => {
+                const event = ( new StandardMouseEvent(getWindow(domEvent), domEvent));
+                EventHelper.stop(domEvent, true);
+                this.contextMenuService.showContextMenu({
+                    contextKeyService: scopedContextKeyService,
+                    getAnchor: () => event,
+                    getActions: () => {
+                        const menu = this.menuService.getMenuActions(MenuId.ChatInputResourceAttachmentContext, scopedContextKeyService, {
+                            arg: file
+                        });
+                        return getFlatContextMenuActions(menu);
+                    }
+                });
+            })
+        );
     }
-    renderString(resourceLabel) {
-        const label = this.attachment.name;
-        const icon = this.attachment.icon;
-        const title = ( localize(4971, "Current file context"));
-        resourceLabel.setLabel(label, undefined, { iconPath: icon, title });
+    renderString(resourceLabel, name, icon, markdownTooltip, defaultTitle) {
+        const title = markdownTooltip ? undefined : defaultTitle;
+        resourceLabel.setLabel(name, undefined, {
+            iconPath: icon,
+            title
+        });
         return title;
     }
-    renderResource(attachmentValue, label) {
+    renderResource(attachmentValue, isSelection, enabled, label) {
         const file = URI.isUri(attachmentValue) ? attachmentValue : attachmentValue.uri;
-        const range = URI.isUri(attachmentValue) || !this.attachment.isSelection ? undefined : attachmentValue.range;
-        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(4966, "cell")) : ( localize(4967, "file"));
+        const range = URI.isUri(attachmentValue) || !isSelection ? undefined : attachmentValue.range;
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5095, "cell")) : ( localize(5096, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            4972,
+            5101,
             "Attached {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(4973, "Attached {0}, {1}", attachmentTypeName, friendlyName));
-        const uriLabel = this.labelService.getUriLabel(file, { relative: true });
-        const currentFile = ( localize(4974, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(4975, "Enable current {0} context", attachmentTypeName));
-        const currentFileHint = this.attachment.enabled || this.attachment.isSelection ? currentFile : inactive;
+        )) : ( localize(5102, "Attached {0}, {1}", attachmentTypeName, friendlyName));
+        const uriLabel = this.labelService.getUriLabel(file, {
+            relative: true
+        });
+        const currentFile = ( localize(5103, "Current {0} context", attachmentTypeName));
+        const inactive = ( localize(5104, "Enable current {0} context", attachmentTypeName));
+        const currentFileHint = enabled || isSelection ? currentFile : inactive;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {
             fileKind: FileKind.FILE,
@@ -176,58 +237,50 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         this.domNode.tabIndex = 0;
         return title;
     }
-    async convertToRegularAttachment() {
-        if (!this.attachment.value) {
+    async convertToRegularAttachment(attachment) {
+        if (!attachment.value) {
             return;
         }
-        if (isStringImplicitContextValue(this.attachment.value)) {
-            if (this.attachment.value.value === undefined) {
-                await this.chatContextService.resolveChatContext(this.attachment.value);
+        if (isStringImplicitContextValue(attachment.value)) {
+            if (attachment.value.value === undefined) {
+                await this.chatContextService.resolveChatContext(attachment.value);
             }
             const context = {
-                kind: 'string',
-                value: this.attachment.value.value,
-                id: this.attachment.id,
-                name: this.attachment.name,
-                icon: this.attachment.value.icon,
-                modelDescription: this.attachment.value.modelDescription,
-                uri: this.attachment.value.uri
+                kind: "string",
+                value: attachment.value.value,
+                id: attachment.id,
+                name: attachment.name,
+                icon: attachment.value.icon,
+                modelDescription: attachment.modelDescription,
+                uri: attachment.value.uri,
+                tooltip: attachment.value.tooltip,
+                commandId: attachment.value.commandId,
+                handle: attachment.value.handle
             };
             this.attachmentModel.addContext(context);
-        }
-        else {
-            const file = URI.isUri(this.attachment.value) ? this.attachment.value : this.attachment.value.uri;
-            if (file.scheme === Schemas.vscodeNotebookCell && isLocation(this.attachment.value)) {
-                this.attachmentModel.addFile(file, this.attachment.value.range);
-            }
-            else {
+        } else {
+            const file = URI.isUri(attachment.value) ? attachment.value : attachment.value.uri;
+            if (file.scheme === Schemas.vscodeNotebookCell && isLocation(attachment.value)) {
+                this.attachmentModel.addFile(file, attachment.value.range);
+            } else {
                 this.attachmentModel.addFile(file);
             }
         }
         this.widgetRef()?.focusInput();
     }
     async pinSelection() {
-        if (!this.attachment.value || !this.attachment.isSelection) {
-            return;
-        }
-        if (!URI.isUri(this.attachment.value) && !isStringImplicitContextValue(this.attachment.value)) {
-            const location = this.attachment.value;
-            this.attachmentModel.addFile(location.uri, location.range);
+        for (const attachment of this.attachment.values) {
+            if (!attachment.value || !attachment.isSelection) {
+                continue;
+            }
+            if (!URI.isUri(attachment.value) && !isStringImplicitContextValue(attachment.value)) {
+                const location = attachment.value;
+                this.attachmentModel.addFile(location.uri, location.range);
+            }
         }
         this.widgetRef()?.focusInput();
     }
 };
-ImplicitContextAttachmentWidget = ( __decorate([
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IContextMenuService)),
-    ( __param(6, ILabelService)),
-    ( __param(7, IMenuService)),
-    ( __param(8, IFileService)),
-    ( __param(9, ILanguageService)),
-    ( __param(10, IModelService)),
-    ( __param(11, IHoverService)),
-    ( __param(12, IConfigurationService)),
-    ( __param(13, IChatContextService))
-], ImplicitContextAttachmentWidget));
+ImplicitContextAttachmentWidget = ( __decorate([( __param(6, IContextKeyService)), ( __param(7, IContextMenuService)), ( __param(8, ILabelService)), ( __param(9, IMenuService)), ( __param(10, IFileService)), ( __param(11, ILanguageService)), ( __param(12, IModelService)), ( __param(13, IHoverService)), ( __param(14, IConfigurationService)), ( __param(15, IChatContextService))], ImplicitContextAttachmentWidget));
 
 export { ImplicitContextAttachmentWidget };

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.d.ts

@@ -3,18 +3,20 @@ import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 export declare abstract class EditingSessionAction extends Action2 {
     constructor(opts: Readonly<IAction2Options>);
     run(accessor: ServicesAccessor, ...args: unknown[]): any;
     abstract runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): any;
 }
+export type EditingSessionActionContext = {
+    editingSession?: IChatEditingSession;
+    chatWidget: IChatWidget;
+};
 /**
  * Resolve view title toolbar context. If none, return context from the lastFocusedWidget.
  */
-export declare function getEditingSessionContext(accessor: ServicesAccessor, args: any[]): {
-    editingSession?: IChatEditingSession;
-    chatWidget: IChatWidget;
-} | undefined;
+export declare function getEditingSessionContext(accessor: ServicesAccessor, args: any[]): EditingSessionActionContext | undefined;
 export declare class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor();
     runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): Promise<void>;
@@ -23,6 +25,11 @@ export declare class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor();
     runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): Promise<void>;
 }
+export declare class ToggleExplanationWidgetAction extends EditingSessionAction {
+    static readonly ID = "chatEditing.toggleExplanationWidget";
+    constructor();
+    runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): Promise<void>;
+}
 export declare function discardAllEditsWithConfirmation(accessor: ServicesAccessor, currentEditingSession: IChatEditingSession): Promise<boolean>;
 export declare class ChatEditingShowChangesAction extends EditingSessionAction {
     static readonly ID = "chatEditing.viewChanges";
@@ -33,7 +40,7 @@ export declare class ChatEditingShowChangesAction extends EditingSessionAction {
 export declare class ViewAllSessionChangesAction extends Action2 {
     static readonly ID = "chatEditing.viewAllSessionChanges";
     constructor();
-    run(accessor: ServicesAccessor, sessionResource?: URI): Promise<void>;
+    run(accessor: ServicesAccessor, sessionOrSessionResource?: URI | IAgentSession): Promise<void>;
 }
 export interface ChatEditingActionContext {
     readonly sessionResource: URI;