@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.d.ts

@@ -27,6 +27,8 @@ export declare class ChatAttachmentResolveService implements IChatAttachmentReso
     resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[];
     resolveSymbolsAttachContext(symbols: DocumentSymbolTransferData[]): ISymbolVariableEntry[];
     resolveNotebookOutputAttachContext(data: NotebookCellOutputTransferData): IChatRequestVariableEntry[];
+    resolveDirectoryImages(directoryUri: URI): Promise<IChatRequestVariableEntry[]>;
+    private _collectDirectoryImages;
     resolveSourceControlHistoryItemAttachContext(data: SCMHistoryItemTransferData[]): ISCMHistoryItemVariableEntry[];
 }
 export type ImageTransferData = {

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

@@ -131,7 +131,7 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
             }
             const readFile = await this.fileService.readFile(resource);
             if (stat.size > 30 * 1024 * 1024) {
-                this.dialogService.error(( localize(5080, "Image is too large")), ( localize(5081, "The image {0} is too large to be attached.", fileName)));
+                this.dialogService.error(( localize(5388, "Image is too large")), ( localize(5389, "The image {0} is too large to be attached.", fileName)));
                 throw ( new Error("Image is too large"));
             }
             dataBuffer = readFile.value;
@@ -215,6 +215,35 @@ let ChatAttachmentResolveService = class ChatAttachmentResolveService {
         }
         return [];
     }
+    async resolveDirectoryImages(directoryUri) {
+        const imageEntries = [];
+        await this._collectDirectoryImages(directoryUri, imageEntries);
+        return imageEntries;
+    }
+    async _collectDirectoryImages(directoryUri, results) {
+        let stat;
+        try {
+            stat = await this.fileService.resolve(directoryUri);
+        } catch {
+            return;
+        }
+        if (!stat.children) {
+            return;
+        }
+        const childPromises = [];
+        for (const child of stat.children) {
+            if (child.isDirectory && !child.isSymbolicLink) {
+                childPromises.push(this._collectDirectoryImages(child.resource, results));
+            } else if (child.isFile && !child.isSymbolicLink && SUPPORTED_IMAGE_EXTENSIONS_REGEX.test(child.resource.path)) {
+                childPromises.push(this.resolveImageEditorAttachContext(child.resource).then(entry => {
+                    if (entry) {
+                        results.push(entry);
+                    }
+                }).catch(() => {}));
+            }
+        }
+        await Promise.all(childPromises);
+    }
     resolveSourceControlHistoryItemAttachContext(data) {
         return ( data.map(d => ({
             id: d.historyItem.id,

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.d.ts

@@ -0,0 +1,32 @@
+import * as event from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
+import { IChatAttachmentWidgetRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.service";
+/**
+ * Interface for a contributed attachment widget instance.
+ */
+export interface IChatAttachmentWidgetInstance extends IDisposable {
+    readonly element: HTMLElement;
+    readonly onDidDelete: event.Event<Event>;
+    readonly onDidOpen: event.Event<void>;
+    /** Optional label element, used for applying warning styles on omitted attachments. */
+    readonly label?: {
+        readonly element: HTMLElement;
+    };
+}
+/**
+ * Factory function type for creating attachment widgets.
+ */
+export type ChatAttachmentWidgetFactory = (attachment: IChatRequestVariableEntry, options: {
+    shouldFocusClearButton: boolean;
+    supportsDeletion: boolean;
+}, container: HTMLElement) => IChatAttachmentWidgetInstance;
+export declare class ChatAttachmentWidgetRegistry implements IChatAttachmentWidgetRegistry {
+    readonly _serviceBrand: undefined;
+    private readonly _factories;
+    registerFactory(kind: string, factory: ChatAttachmentWidgetFactory): IDisposable;
+    createWidget(attachment: IChatRequestVariableEntry, options: {
+        shouldFocusClearButton: boolean;
+        supportsDeletion: boolean;
+    }, container: HTMLElement): IChatAttachmentWidgetInstance | undefined;
+}

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

@@ -0,0 +1,26 @@
+
+
+class ChatAttachmentWidgetRegistry {
+    constructor() {
+        this._factories = ( new Map());
+    }
+    registerFactory(kind, factory) {
+        this._factories.set(kind, factory);
+        return {
+            dispose: () => {
+                if (this._factories.get(kind) === factory) {
+                    this._factories.delete(kind);
+                }
+            }
+        };
+    }
+    createWidget(attachment, options, container) {
+        const factory = this._factories.get(attachment.kind);
+        if (!factory) {
+            return undefined;
+        }
+        return factory(attachment, options, container);
+    }
+}
+
+export { ChatAttachmentWidgetRegistry };

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

@@ -31,6 +31,8 @@ import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { getDisplayNameFromOuterHTML } from '../../../../../platform/browserElements/common/browserElements.js';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { observableContextKey, observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
@@ -84,29 +86,29 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const mainContent = createElement("div");
         mainContent.className = "element-selection-main-content";
         const message = createElement("span");
-        const startSelectionMessage = ( localize(5121, "Add element to chat"));
+        const startSelectionMessage = ( localize(5437, "Add element to chat"));
         message.textContent = startSelectionMessage;
         mainContent.appendChild(message);
         let cts;
         const actions = [];
         actions.push(toAction({
             id: "singleSelection",
-            label: ( localize(5122, "Select an Element")),
+            label: ( localize(5438, "Select an Element")),
             enabled: true,
             run: async () => {
                 await startElementSelection();
             }
         }), toAction({
             id: "continuousSelection",
-            label: ( localize(5123, "Continuous Selection")),
+            label: ( localize(5439, "Continuous Selection")),
             enabled: true,
             run: async () => {
                 this._editor.focus();
                 cts = ( new CancellationTokenSource());
-                message.textContent = ( localize(5124, "Selecting element..."));
+                message.textContent = ( localize(5440, "Selecting element..."));
                 this.hideElement(startButton.element);
                 this.showElement(cancelButton.element);
-                cancelButton.label = ( localize(5125, "Done"));
+                cancelButton.label = ( localize(5441, "Done"));
                 while (!cts.token.isCancellationRequested) {
                     try {
                         await this.addElementToChat(cts);
@@ -116,7 +118,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
                         break;
                     }
                 }
-                message.textContent = ( localize(5126, "Element added to chat"));
+                message.textContent = ( localize(5442, "Element added to chat"));
                 finishedSelecting();
             }
         }));
@@ -125,33 +127,33 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             addPrimaryActionToDropdown: false,
             contextMenuProvider: this.contextMenuService,
             supportShortLabel: true,
-            title: ( localize(5127, "Click to select an element.")),
+            title: ( localize(5443, "Click to select an element.")),
             supportIcons: true,
             ...defaultButtonStyles
         })));
-        startButton.primaryButton.label = ( localize(5128, "Start"));
+        startButton.primaryButton.label = ( localize(5444, "Start"));
         startButton.element.classList.add("element-selection-start");
         const cancelButton = this._showStore.add(( new Button(mainContent, {
             ...defaultButtonStyles,
             supportIcons: true,
-            title: ( localize(5129, "Click to cancel selection."))
+            title: ( localize(5445, "Click to cancel selection."))
         })));
         cancelButton.element.className = "element-selection-cancel hidden";
-        const cancelButtonLabel = ( localize(5130, "Cancel"));
+        const cancelButtonLabel = ( localize(5446, "Cancel"));
         cancelButton.label = cancelButtonLabel;
         const configure = this._showStore.add(( new Button(mainContent, {
             supportIcons: true,
-            title: ( localize(5131, "Configure Attachments Sent"))
+            title: ( localize(5447, "Configure Attachments Sent"))
         })));
         configure.icon = Codicon.gear;
         const collapseOverlay = this._showStore.add(( new Button(mainContent, {
             supportIcons: true,
-            title: ( localize(5132, "Collapse Overlay"))
+            title: ( localize(5448, "Collapse Overlay"))
         })));
         collapseOverlay.icon = Codicon.chevronRight;
         const nextSelection = this._showStore.add(( new Button(mainContent, {
             supportIcons: true,
-            title: ( localize(5133, "Select Again"))
+            title: ( localize(5449, "Select Again"))
         })));
         nextSelection.icon = Codicon.close;
         nextSelection.element.classList.add("hidden");
@@ -159,7 +161,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         expandContainer.className = "element-expand-container hidden";
         const expandOverlay = this._showStore.add(( new Button(expandContainer, {
             supportIcons: true,
-            title: ( localize(5134, "Expand Overlay"))
+            title: ( localize(5450, "Expand Overlay"))
         })));
         expandOverlay.icon = Codicon.layout;
         this._domNode.appendChild(mainContent);
@@ -182,11 +184,11 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         const startElementSelection = async () => {
             cts = ( new CancellationTokenSource());
             this._editor.focus();
-            message.textContent = ( localize(5124, "Selecting element..."));
+            message.textContent = ( localize(5440, "Selecting element..."));
             this.hideElement(startButton.element);
             this.showElement(cancelButton.element);
             await this.addElementToChat(cts);
-            message.textContent = ( localize(5126, "Element added to chat"));
+            message.textContent = ( localize(5442, "Element added to chat"));
             finishedSelecting();
         };
         this._showStore.add(
@@ -196,7 +198,7 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
         );
         this._showStore.add(addDisposableListener(cancelButton.element, "click", () => {
             cts.cancel();
-            message.textContent = ( localize(5135, "Selection canceled"));
+            message.textContent = ( localize(5451, "Selection canceled"));
             finishedSelecting();
         }));
         this._showStore.add(addDisposableListener(collapseOverlay.element, "click", () => {
@@ -265,7 +267,12 @@ let SimpleBrowserOverlayWidget = class SimpleBrowserOverlayWidget {
             fullName: displayName,
             value: value,
             kind: "element",
-            icon: ThemeIcon.fromId(Codicon.layout.id)
+            icon: ThemeIcon.fromId(Codicon.layout.id),
+            ancestors: elementData.ancestors,
+            attributes: elementData.attributes,
+            computedStyles: attachCss ? elementData.computedStyles : undefined,
+            dimensions: elementData.dimensions,
+            innerText: elementData.innerText
         });
         if (this.configurationService.getValue("chat.sendElementsToChat.attachImages")) {
             this._domNode.style.display = "none";
@@ -309,15 +316,14 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         group,
         instaService,
         configurationService,
-        _browserElementsService
+        _browserElementsService,
+        contextKeyService
     ) {
         this.configurationService = configurationService;
         this._browserElementsService = _browserElementsService;
+        this.contextKeyService = contextKeyService;
         this._store = ( new DisposableStore());
         this._domNode = createElement("div");
-        if (!this.configurationService.getValue("chat.sendElementsToChat.enabled")) {
-            return;
-        }
         this._domNode.classList.add("chat-simple-browser-overlay");
         this._domNode.style.position = "absolute";
         this._domNode.style.bottom = `5px`;
@@ -332,7 +338,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         let cts = ( new CancellationTokenSource());
         const show = async (locator, browserType) => {
             widget.setActiveLocator(locator, browserType);
-            connectingWebviewElement.textContent = ( localize(5136, "Connecting to webview..."));
+            connectingWebviewElement.textContent = ( localize(5452, "Connecting to webview..."));
             if (!container.contains(connectingWebviewElement)) {
                 container.appendChild(connectingWebviewElement);
             }
@@ -341,7 +347,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
             try {
                 await this._browserElementsService.startDebugSession(cts.token, locator);
             } catch (error) {
-                connectingWebviewElement.textContent = ( localize(5137, "Please reopen the preview."));
+                connectingWebviewElement.textContent = ( localize(5453, "Please reopen the preview."));
                 return;
             }
             if (cts.token.isCancellationRequested) {
@@ -376,9 +382,13 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
             }
             return undefined;
         });
+        const chatEnabledObs = observableContextKey(ChatContextKeys.enabled.key, this.contextKeyService);
+        const sendElementsEnabledObs = observableConfigValue("chat.sendElementsToChat.enabled", true, this.configurationService);
         this._store.add(autorun(r => {
             const activeEditor = activeIdObs.read(r);
-            if (!activeEditor) {
+            const isChatEnabled = chatEnabledObs.read(r);
+            const isSendElementsEnabled = sendElementsEnabledObs.read(r);
+            if (!isChatEnabled || !isSendElementsEnabled || !activeEditor) {
                 hide();
                 return;
             }
@@ -391,7 +401,7 @@ let SimpleBrowserOverlayController = class SimpleBrowserOverlayController {
         this._store.dispose();
     }
 };
-SimpleBrowserOverlayController = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IConfigurationService)), ( __param(4, IBrowserElementsService))], SimpleBrowserOverlayController));
+SimpleBrowserOverlayController = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IConfigurationService)), ( __param(4, IBrowserElementsService)), ( __param(5, IContextKeyService))], SimpleBrowserOverlayController));
 let SimpleBrowserOverlay = class SimpleBrowserOverlay {
     static {
         this.ID = "chat.simpleBrowser.overlay";