@codingame/monaco-vscode-katex-common 24.2.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAttachmentModel.d.ts → attachments/chatAttachmentModel.d.ts}

@@ -1,10 +1,10 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatRequestFileEntry, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatRequestFileEntry, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ISharedWebContentExtractorService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service";
-import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service";
+import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service";
 export interface IChatAttachmentChangeEvent {
     readonly deleted: readonly string[];
     readonly added: readonly IChatRequestVariableEntry[];
@@ -15,6 +15,7 @@ export declare class ChatAttachmentModel extends Disposable {
     private readonly webContentExtractorService;
     private readonly chatAttachmentResolveService;
     private readonly _attachments;
+    private readonly _fileWatchers;
     private _onDidChange;
     readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IChatAttachmentChangeEvent>;
     constructor(fileService: IFileService, webContentExtractorService: ISharedWebContentExtractorService, chatAttachmentResolveService: IChatAttachmentResolveService);
@@ -29,6 +30,7 @@ export declare class ChatAttachmentModel extends Disposable {
     clearAndSetContext(...attachments: IChatRequestVariableEntry[]): void;
     delete(...variableEntryIds: string[]): void;
     updateContext(toDelete: Iterable<string>, upsert: Iterable<IChatRequestVariableEntry>): void;
+    private _watchAttachment;
     asFileVariableEntry(uri: URI, range?: IRange): IChatRequestFileEntry;
     asImageVariableEntry(uri: URI): Promise<IChatRequestVariableEntry | undefined>;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAttachmentModel.js → attachments/chatAttachmentModel.js}

@@ -3,12 +3,13 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { isPromptFileVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { Disposable, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { isPromptFileVariableEntry, IChatRequestVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { FileChangeType } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ISharedWebContentExtractorService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
-import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service';
+import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
@@ -20,6 +21,7 @@ let ChatAttachmentModel = class ChatAttachmentModel extends Disposable {
         this.webContentExtractorService = webContentExtractorService;
         this.chatAttachmentResolveService = chatAttachmentResolveService;
         this._attachments = ( new Map());
+        this._fileWatchers = this._register(( new DisposableMap()));
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
     }
@@ -60,6 +62,7 @@ let ChatAttachmentModel = class ChatAttachmentModel extends Disposable {
         if (clearStickyAttachments) {
             const deleted = Array.from(( this._attachments.keys()));
             this._attachments.clear();
+            this._fileWatchers.clearAndDisposeAll();
             this._onDidChange.fire({ deleted, added: [], updated: [] });
         }
         else {
@@ -69,6 +72,7 @@ let ChatAttachmentModel = class ChatAttachmentModel extends Disposable {
                 const entry = this._attachments.get(id);
                 if (entry && !isPromptFileVariableEntry(entry)) {
                     this._attachments.delete(id);
+                    this._fileWatchers.deleteAndDispose(id);
                     deleted.push(id);
                 }
             }
@@ -94,6 +98,7 @@ let ChatAttachmentModel = class ChatAttachmentModel extends Disposable {
             if (item) {
                 this._attachments.delete(id);
                 deleted.push(id);
+                this._fileWatchers.deleteAndDispose(id);
             }
         }
         for (const item of upsert) {
@@ -101,16 +106,32 @@ let ChatAttachmentModel = class ChatAttachmentModel extends Disposable {
             if (!oldItem) {
                 this._attachments.set(item.id, item);
                 added.push(item);
+                this._watchAttachment(item);
             }
             else if (!equals(oldItem, item)) {
+                this._fileWatchers.deleteAndDispose(item.id);
                 this._attachments.set(item.id, item);
                 updated.push(item);
+                this._watchAttachment(item);
             }
         }
         if (deleted.length > 0 || added.length > 0 || updated.length > 0) {
             this._onDidChange.fire({ deleted, added, updated });
         }
     }
+    _watchAttachment(attachment) {
+        const uri = IChatRequestVariableEntry.toUri(attachment);
+        if (!uri || uri.scheme !== Schemas.file) {
+            return;
+        }
+        const watcher = this.fileService.createWatcher(uri, { recursive: false, excludes: [] });
+        const onDidChangeListener = watcher.onDidChange(e => {
+            if (e.contains(uri, FileChangeType.DELETED)) {
+                this.updateContext([attachment.id], Iterable.empty());
+            }
+        });
+        this._fileWatchers.set(attachment.id, combinedDisposable(onDidChangeListener, watcher));
+    }
     asFileVariableEntry(uri, range) {
         return {
             kind: 'file',

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAttachmentWidgets.d.ts → attachments/chatAttachmentWidgets.d.ts}

@@ -7,7 +7,7 @@ import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IScopedContextKeyService, RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { IOpenEditorOptions } from "../../../../platform/editor/browser/editor.js";
+import { IOpenEditorOptions } from "../../../../../platform/editor/browser/editor.js";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
@@ -19,11 +19,11 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IPreferencesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
-import { IChatContentReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry, IElementVariableEntry, INotebookOutputVariableEntry, IPromptFileVariableEntry, IPromptTextVariableEntry, ISCMHistoryItemVariableEntry, ChatRequestToolReferenceEntry, ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemChangeRangeVariableEntry, ITerminalVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatContentReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry, IElementVariableEntry, INotebookOutputVariableEntry, IPromptFileVariableEntry, IPromptTextVariableEntry, ISCMHistoryItemVariableEntry, ChatRequestToolReferenceEntry, ISCMHistoryItemChangeVariableEntry, ISCMHistoryItemChangeRangeVariableEntry, ITerminalVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { ILanguageModelChatMetadataAndIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 declare abstract class AbstractChatAttachmentWidget extends Disposable {
     protected readonly attachment: IChatRequestVariableEntry;
     private readonly options;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAttachmentWidgets.js → attachments/chatAttachmentWidgets.js}

@@ -31,7 +31,7 @@ import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/c
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { fillInSymbolsDragData } from '@codingame/monaco-vscode-api/vscode/vs/platform/dnd/browser/dnd';
-import { registerOpenEditorListeners } from '../../../../platform/editor/browser/editor.js';
+import { registerOpenEditorListeners } from '../../../../../platform/editor/browser/editor.js';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
@@ -52,10 +52,10 @@ import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { toHistoryItemHoverContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/scmHistory';
 import { getHistoryItemEditorTitle } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/util';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { OmittedState, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { OmittedState, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 
 const commonHoverOptions = {
@@ -86,6 +86,7 @@ let AbstractChatAttachmentWidget = class AbstractChatAttachmentWidget extends Di
         this._onDidDelete = this._register(new Emitter());
         this._onDidOpen = this._register(new Emitter());
         this.element = append(container, $('.chat-attached-context-attachment.show-file-icons'));
+        this.attachClearButton();
         this.label = contextResourceLabels.create(this.element, { supportIcons: true, hoverTargetOverride: this.element });
         this._register(this.label);
         this.element.tabIndex = 0;
@@ -108,7 +109,7 @@ let AbstractChatAttachmentWidget = class AbstractChatAttachmentWidget extends Di
         const clearButton = ( new Button(this.element, {
             supportIcons: true,
             hoverDelegate: createInstantHoverDelegate(),
-            title: ( localize(5013, "Remove from context"))
+            title: ( localize(4936, "Remove from context"))
         }));
         clearButton.element.tabIndex = -1;
         clearButton.icon = Codicon.close;
@@ -175,14 +176,14 @@ let FileAttachmentWidget = class FileAttachmentWidget extends AbstractChatAttach
         const fileDirname = dirname(resource.path);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         let ariaLabel = range ? ( localize(
-            5014,
+            4937,
             "Attached file, {0}, line {1} to line {2}",
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(5015, "Attached file, {0}", friendlyName));
+        )) : ( localize(4938, "Attached file, {0}", friendlyName));
         if (attachment.omittedState === OmittedState.Full) {
-            ariaLabel = ( localize(5016, "Omitted this file: {0}", attachment.name));
+            ariaLabel = ( localize(4939, "Omitted this file: {0}", attachment.name));
             this.renderOmittedWarning(friendlyName, ariaLabel);
         }
         else {
@@ -202,7 +203,6 @@ let FileAttachmentWidget = class FileAttachmentWidget extends AbstractChatAttach
             this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
         });
         this.addResourceOpenHandlers(resource, range);
-        this.attachClearButton();
     }
     renderOmittedWarning(friendlyName, ariaLabel) {
         const pillIcon = $('div.chat-attached-context-pill', {}, $('span.codicon.codicon-warning'));
@@ -213,7 +213,7 @@ let FileAttachmentWidget = class FileAttachmentWidget extends AbstractChatAttach
         hoverElement.setAttribute('aria-label', ariaLabel);
         this.element.classList.add('warning');
         hoverElement.textContent = ( localize(
-            5017,
+            4940,
             "{0} does not support this file type.",
             this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name : this.currentLanguageModel ?? 'This model'
         ));
@@ -236,7 +236,7 @@ let TerminalCommandAttachmentWidget = class TerminalCommandAttachmentWidget exte
         super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService, terminalService);
         this.hoverService = hoverService;
         this.terminalService = terminalService;
-        const ariaLabel = ( localize(5018, "Terminal command, {0}", attachment.command));
+        const ariaLabel = ( localize(4941, "Terminal command, {0}", attachment.command));
         const clickHandler = () => this.openResource(attachment.resource, { editorOptions: { preserveFocus: true } }, false, undefined);
         this._register(createTerminalCommandElements(this.element, attachment, ariaLabel, this.hoverService, clickHandler));
         this._register(addDisposableListener(this.element, EventType.KEY_DOWN, async (e) => {
@@ -246,7 +246,6 @@ let TerminalCommandAttachmentWidget = class TerminalCommandAttachmentWidget exte
                 await clickHandler();
             }
         }));
-        this.attachClearButton();
     }
 };
 TerminalCommandAttachmentWidget = ( __decorate([
@@ -275,52 +274,54 @@ function createTerminalCommandElements(element, attachment, ariaLabel, hoverServ
         e.stopPropagation();
         clickHandler();
     }));
-    const hoverElement = $('div.chat-attached-context-hover');
-    hoverElement.setAttribute('aria-label', ariaLabel);
-    const commandTitle = $('div', {}, typeof attachment.exitCode === 'number'
-        ? ( localize(
-        5019,
-        "Command: {0}, exit code: {1}",
-        attachment.command,
-        attachment.exitCode
-    ))
-        : ( localize(5020, "Command")));
-    commandTitle.classList.add('attachment-additional-info');
-    const commandBlock = $('pre.chat-terminal-command-block');
-    hoverElement.append(commandTitle, commandBlock);
-    if (attachment.output && attachment.output.trim().length > 0) {
-        const outputTitle = $('div', {}, ( localize(5021, "Output:")));
-        outputTitle.classList.add('attachment-additional-info');
-        const outputBlock = $('pre.chat-terminal-command-output');
-        const fullOutputLines = attachment.output.split('\n');
-        const hoverOutputLines = [];
-        for (const line of fullOutputLines) {
-            if (hoverOutputLines.length >= TerminalConstants.MaxAttachmentOutputLineCount) {
-                hoverOutputLines.push('...');
-                break;
-            }
-            const trimmed = line.trim();
-            if (trimmed.length === 0) {
-                continue;
-            }
-            if (trimmed.length > TerminalConstants.MaxAttachmentOutputLineLength) {
-                hoverOutputLines.push(`${trimmed.slice(0, TerminalConstants.MaxAttachmentOutputLineLength)}...`);
-            }
-            else {
-                hoverOutputLines.push(trimmed);
+    disposable.add(hoverService.setupDelayedHover(element, () => getHoverContent(ariaLabel, attachment), commonHoverLifecycleOptions));
+    return disposable;
+}
+function getHoverContent(ariaLabel, attachment) {
+    {
+        const hoverElement = $('div.chat-attached-context-hover');
+        hoverElement.setAttribute('aria-label', ariaLabel);
+        const commandTitle = $('div', {}, typeof attachment.exitCode === 'number'
+            ? ( localize(
+            4942,
+            "Command: {0}, exit code: {1}",
+            attachment.command,
+            attachment.exitCode
+        ))
+            : ( localize(4943, "Command")));
+        commandTitle.classList.add('attachment-additional-info');
+        const commandBlock = $('pre.chat-terminal-command-block');
+        hoverElement.append(commandTitle, commandBlock);
+        if (attachment.output && attachment.output.trim().length > 0) {
+            const outputTitle = $('div', {}, ( localize(4944, "Output:")));
+            outputTitle.classList.add('attachment-additional-info');
+            const outputBlock = $('pre.chat-terminal-command-output');
+            const fullOutputLines = attachment.output.split('\n');
+            const hoverOutputLines = [];
+            for (const line of fullOutputLines) {
+                if (hoverOutputLines.length >= TerminalConstants.MaxAttachmentOutputLineCount) {
+                    hoverOutputLines.push('...');
+                    break;
+                }
+                const trimmed = line.trim();
+                if (trimmed.length === 0) {
+                    continue;
+                }
+                if (trimmed.length > TerminalConstants.MaxAttachmentOutputLineLength) {
+                    hoverOutputLines.push(`${trimmed.slice(0, TerminalConstants.MaxAttachmentOutputLineLength)}...`);
+                }
+                else {
+                    hoverOutputLines.push(trimmed);
+                }
             }
+            outputBlock.textContent = hoverOutputLines.join('\n');
+            hoverElement.append(outputTitle, outputBlock);
         }
-        outputBlock.textContent = hoverOutputLines.join('\n');
-        hoverElement.append(outputTitle, outputBlock);
+        return {
+            ...commonHoverOptions,
+            content: hoverElement,
+        };
     }
-    const hint = $('div', {}, ( localize(5022, "Click to focus this command in the terminal.")));
-    hint.classList.add('attachment-additional-info');
-    hoverElement.appendChild(hint);
-    disposable.add(hoverService.setupDelayedHover(element, {
-        ...commonHoverOptions,
-        content: hoverElement,
-    }, commonHoverLifecycleOptions));
-    return disposable;
 }
 let ImageAttachmentWidget = class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
     constructor(resource, attachment, currentLanguageModel, options, container, contextResourceLabels, commandService, openerService, hoverService, languageModelsService, instantiationService, labelService) {
@@ -330,13 +331,13 @@ let ImageAttachmentWidget = class ImageAttachmentWidget extends AbstractChatAtta
         this.labelService = labelService;
         let ariaLabel;
         if (attachment.omittedState === OmittedState.Full) {
-            ariaLabel = ( localize(5023, "Omitted this image: {0}", attachment.name));
+            ariaLabel = ( localize(4945, "Omitted this image: {0}", attachment.name));
         }
         else if (attachment.omittedState === OmittedState.Partial) {
-            ariaLabel = ( localize(5024, "Partially omitted this image: {0}", attachment.name));
+            ariaLabel = ( localize(4946, "Partially omitted this image: {0}", attachment.name));
         }
         else {
-            ariaLabel = ( localize(5025, "Attached image, {0}", attachment.name));
+            ariaLabel = ( localize(4947, "Attached image, {0}", attachment.name));
         }
         const ref = attachment.references?.[0]?.reference;
         resource = ref && URI.isUri(ref) ? ref : undefined;
@@ -354,7 +355,6 @@ let ImageAttachmentWidget = class ImageAttachmentWidget extends AbstractChatAtta
                 this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
             });
         }
-        this.attachClearButton();
     }
 };
 ImageAttachmentWidget = ( __decorate([
@@ -386,7 +386,7 @@ function createImageElements(resource, name, fullName, element, buffer, hoverSer
     if ((!supportsVision && currentLanguageModel) || omittedState === OmittedState.Full) {
         element.classList.add('warning');
         hoverElement.textContent = ( localize(
-            5026,
+            4948,
             "{0} does not support images.",
             currentLanguageModelName ?? 'This model'
         ));
@@ -412,7 +412,7 @@ function createImageElements(resource, name, fullName, element, buffer, hoverSer
         const imageContainer = $('div.chat-attached-context-image-container', {}, hoverImage);
         hoverElement.appendChild(imageContainer);
         if (resource) {
-            const urlContainer = $('a.chat-attached-context-url', {}, omittedState === OmittedState.Partial ? ( localize(5027, "This GIF was partially omitted - current frame will be sent.")) : fullName);
+            const urlContainer = $('a.chat-attached-context-url', {}, omittedState === OmittedState.Partial ? ( localize(4949, "This GIF was partially omitted - current frame will be sent.")) : fullName);
             const separator = $('div.chat-attached-context-url-separator');
             disposable.add(addDisposableListener(urlContainer, 'click', () => clickHandler()));
             hoverElement.append(separator, urlContainer);
@@ -434,7 +434,7 @@ let PasteAttachmentWidget = class PasteAttachmentWidget extends AbstractChatAtta
         super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
         this.hoverService = hoverService;
         this.instantiationService = instantiationService;
-        const ariaLabel = ( localize(5028, "Attached context, {0}", attachment.name));
+        const ariaLabel = ( localize(4950, "Attached context, {0}", attachment.name));
         this.element.ariaLabel = ariaLabel;
         const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
         let resource;
@@ -463,7 +463,6 @@ let PasteAttachmentWidget = class PasteAttachmentWidget extends AbstractChatAtta
             this._register(this.instantiationService.invokeFunction(hookUpResourceAttachmentDragAndContextMenu, this.element, copiedFromResource));
             this.addResourceOpenHandlers(copiedFromResource, range);
         }
-        this.attachClearButton();
     }
 };
 PasteAttachmentWidget = ( __decorate([
@@ -480,7 +479,7 @@ let DefaultChatAttachmentWidget = class DefaultChatAttachmentWidget extends Abst
         const attachmentLabel = attachment.fullName ?? attachment.name;
         const withIcon = attachment.icon?.id ? `$(${attachment.icon.id})\u00A0${attachmentLabel}` : attachmentLabel;
         this.label.setLabel(withIcon, correspondingContentReference?.options?.status?.description);
-        this.element.ariaLabel = ( localize(5028, "Attached context, {0}", attachment.name));
+        this.element.ariaLabel = ( localize(4950, "Attached context, {0}", attachment.name));
         if (attachment.kind === 'diagnostic') {
             if (attachment.filterUri) {
                 resource = attachment.filterUri ? URI.revive(attachment.filterUri) : undefined;
@@ -500,7 +499,6 @@ let DefaultChatAttachmentWidget = class DefaultChatAttachmentWidget extends Abst
         if (resource) {
             this.addResourceOpenHandlers(resource, range);
         }
-        this.attachClearButton();
     }
 };
 DefaultChatAttachmentWidget = ( __decorate([
@@ -520,7 +518,6 @@ let PromptFileAttachmentWidget = class PromptFileAttachmentWidget extends Abstra
             this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, attachment.value));
         });
         this.addResourceOpenHandlers(attachment.value, undefined);
-        this.attachClearButton();
     }
     updateLabel(attachment) {
         const resource = attachment.value;
@@ -529,11 +526,11 @@ let PromptFileAttachmentWidget = class PromptFileAttachmentWidget extends Abstra
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const isPrompt = attachment.id.startsWith(PromptFileVariableKind.PromptFile);
         const ariaLabel = isPrompt
-            ? ( localize(5029, "Prompt file, {0}", friendlyName))
-            : ( localize(5030, "Instructions attachment, {0}", friendlyName));
+            ? ( localize(4951, "Prompt file, {0}", friendlyName))
+            : ( localize(4952, "Instructions attachment, {0}", friendlyName));
         const typeLabel = isPrompt
-            ? ( localize(5031, "Prompt"))
-            : ( localize(5032, "Instructions"));
+            ? ( localize(4953, "Prompt"))
+            : ( localize(4954, "Instructions"));
         const title = this.labelService.getUriLabel(resource) + (attachment.originLabel ? `\n${attachment.originLabel}` : '');
         this.element.classList.remove('warning', 'error');
         const fileWithoutExtension = getCleanPromptName(resource);
@@ -573,7 +570,7 @@ let PromptTextAttachmentWidget = class PromptTextAttachmentWidget extends Abstra
                 }
             }));
         }
-        this.label.setLabel(( localize(5033, 'Additional Instructions')), undefined, undefined);
+        this.label.setLabel(( localize(4955, 'Additional Instructions')), undefined, undefined);
         this._register(hoverService.setupDelayedHover(this.element, {
             ...commonHoverOptions,
             content: attachment.value,
@@ -600,11 +597,11 @@ let ToolSetOrToolItemAttachmentWidget = class ToolSetOrToolItemAttachmentWidget
         }
         this.label.setLabel(`$(${icon.id})\u00A0${name}`, undefined);
         this.element.style.cursor = 'pointer';
-        this.element.ariaLabel = ( localize(5028, "Attached context, {0}", name));
+        this.element.ariaLabel = ( localize(4950, "Attached context, {0}", name));
         let hoverContent;
         if (toolOrToolSet instanceof ToolSet) {
             hoverContent = ( localize(
-                5034,
+                4956,
                 "{0} - {1}",
                 toolOrToolSet.description ?? toolOrToolSet.referenceName,
                 toolOrToolSet.source.label
@@ -612,7 +609,7 @@ let ToolSetOrToolItemAttachmentWidget = class ToolSetOrToolItemAttachmentWidget
         }
         else if (toolOrToolSet) {
             hoverContent = ( localize(
-                5035,
+                4957,
                 "{0} - {1}",
                 toolOrToolSet.userDescription ?? toolOrToolSet.modelDescription,
                 toolOrToolSet.source.label
@@ -624,7 +621,6 @@ let ToolSetOrToolItemAttachmentWidget = class ToolSetOrToolItemAttachmentWidget
                 content: hoverContent,
             }, commonHoverLifecycleOptions));
         }
-        this.attachClearButton();
     }
 };
 ToolSetOrToolItemAttachmentWidget = ( __decorate([
@@ -659,10 +655,9 @@ let NotebookCellOutputChatAttachmentWidget = class NotebookCellOutputChatAttachm
             this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
         });
         this.addResourceOpenHandlers(resource, undefined);
-        this.attachClearButton();
     }
     getAriaLabel(attachment) {
-        return localize(5036, "Attached Notebook output, {0}", attachment.name);
+        return localize(4958, "Attached Notebook output, {0}", attachment.name);
     }
     renderErrorOutput(resource, attachment) {
         const attachmentLabel = attachment.name;
@@ -687,10 +682,10 @@ let NotebookCellOutputChatAttachmentWidget = class NotebookCellOutputChatAttachm
     renderImageOutput(resource, attachment) {
         let ariaLabel;
         if (attachment.omittedState === OmittedState.Full) {
-            ariaLabel = ( localize(5037, "Omitted this Notebook ouput: {0}", attachment.name));
+            ariaLabel = ( localize(4959, "Omitted this Notebook ouput: {0}", attachment.name));
         }
         else if (attachment.omittedState === OmittedState.Partial) {
-            ariaLabel = ( localize(5038, "Partially omitted this Notebook output: {0}", attachment.name));
+            ariaLabel = ( localize(4960, "Partially omitted this Notebook output: {0}", attachment.name));
         }
         else {
             ariaLabel = this.getAriaLabel(attachment);
@@ -728,13 +723,13 @@ NotebookCellOutputChatAttachmentWidget = ( __decorate([
 let ElementChatAttachmentWidget = class ElementChatAttachmentWidget extends AbstractChatAttachmentWidget {
     constructor(attachment, currentLanguageModel, options, container, contextResourceLabels, commandService, openerService, editorService) {
         super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
-        const ariaLabel = ( localize(5039, "Attached element, {0}", attachment.name));
+        const ariaLabel = ( localize(4961, "Attached element, {0}", attachment.name));
         this.element.ariaLabel = ariaLabel;
         this.element.style.position = 'relative';
         this.element.style.cursor = 'pointer';
         const attachmentLabel = attachment.name;
         const withIcon = attachment.icon?.id ? `$(${attachment.icon.id})\u00A0${attachmentLabel}` : attachmentLabel;
-        this.label.setLabel(withIcon, undefined, { title: ( localize(5040, "Click to view the contents of: {0}", attachmentLabel)) });
+        this.label.setLabel(withIcon, undefined, { title: ( localize(4962, "Click to view the contents of: {0}", attachmentLabel)) });
         this._register(addDisposableListener(this.element, EventType.CLICK, async () => {
             const content = attachment.value?.toString() || '';
             await editorService.openEditor({
@@ -745,7 +740,6 @@ let ElementChatAttachmentWidget = class ElementChatAttachmentWidget extends Abst
                 }
             });
         }));
-        this.attachClearButton();
     }
 };
 ElementChatAttachmentWidget = ( __decorate([
@@ -758,7 +752,7 @@ let SCMHistoryItemAttachmentWidget = class SCMHistoryItemAttachmentWidget extend
         super(attachment, options, container, contextResourceLabels, currentLanguageModel, commandService, openerService);
         this.label.setLabel(attachment.name, undefined);
         this.element.style.cursor = 'pointer';
-        this.element.ariaLabel = ( localize(5028, "Attached context, {0}", attachment.name));
+        this.element.ariaLabel = ( localize(4950, "Attached context, {0}", attachment.name));
         const { content, disposables } = toHistoryItemHoverContent(markdownRendererService, attachment.historyItem, false);
         this._store.add(hoverService.setupDelayedHover(this.element, {
             ...commonHoverOptions,
@@ -776,7 +770,6 @@ let SCMHistoryItemAttachmentWidget = class SCMHistoryItemAttachmentWidget extend
                 this._openAttachment(attachment);
             }
         }));
-        this.attachClearButton();
     }
     async _openAttachment(attachment) {
         await this.commandService.executeCommand('_workbench.openMultiDiffEditor', {
@@ -797,14 +790,13 @@ let SCMHistoryItemChangeAttachmentWidget = class SCMHistoryItemChangeAttachmentW
         this.editorService = editorService;
         const nameSuffix = `\u00A0$(${Codicon.gitCommit.id})${attachment.historyItem.displayId ?? attachment.historyItem.id}`;
         this.label.setFile(attachment.value, { fileKind: FileKind.FILE, hidePath: true, nameSuffix });
-        this.element.ariaLabel = ( localize(5028, "Attached context, {0}", attachment.name));
+        this.element.ariaLabel = ( localize(4950, "Attached context, {0}", attachment.name));
         const { content, disposables } = toHistoryItemHoverContent(markdownRendererService, attachment.historyItem, false);
         this._store.add(hoverService.setupDelayedHover(this.element, {
             ...commonHoverOptions, content,
         }, commonHoverLifecycleOptions));
         this._store.add(disposables);
         this.addResourceOpenHandlers(attachment.value, undefined);
-        this.attachClearButton();
     }
     async openResource(resource, options, isDirectory, range) {
         const attachment = this.attachment;
@@ -832,9 +824,8 @@ let SCMHistoryItemChangeRangeAttachmentWidget = class SCMHistoryItemChangeRangeA
         const historyItemEndId = attachment.historyItemChangeEnd.historyItem.displayId ?? attachment.historyItemChangeEnd.historyItem.id;
         const nameSuffix = `\u00A0$(${Codicon.gitCommit.id})${historyItemStartId}..${historyItemEndId}`;
         this.label.setFile(attachment.value, { fileKind: FileKind.FILE, hidePath: true, nameSuffix });
-        this.element.ariaLabel = ( localize(5028, "Attached context, {0}", attachment.name));
+        this.element.ariaLabel = ( localize(4950, "Attached context, {0}", attachment.name));
         this.addResourceOpenHandlers(attachment.value, undefined);
-        this.attachClearButton();
     }
     async openResource(resource, options, isDirectory, range) {
         const attachment = this.attachment;
@@ -943,7 +934,7 @@ const chatAttachmentResourceContextKey = ( new RawContextKey(
     'chatAttachmentResource',
     undefined,
     { type: 'URI', description: ( localize(
-        5041,
+        4963,
         "The full value of the chat attachment resource, including scheme and path"
     )) }
 ));

package/vscode/src/vs/workbench/contrib/chat/browser/{contrib → attachments}/chatImplicitContext.d.ts

@@ -7,12 +7,12 @@ import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/l
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IChatRequestImplicitVariableEntry, IChatRequestVariableEntry, StringChatContextValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatRequestImplicitVariableEntry, IChatRequestVariableEntry, StringChatContextValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { ILanguageModelIgnoredFilesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service";
+import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
 export declare class ChatImplicitContextContribution extends Disposable implements IWorkbenchContribution {
     private readonly codeEditorService;
     private readonly editorService;