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

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

@@ -14,14 +14,14 @@ import { EditorsOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { WebviewInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-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 { isStringImplicitContextValue } 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 { isStringImplicitContextValue } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { getPromptsTypeForLanguageId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 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';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ChatImplicitContextContribution = class ChatImplicitContextContribution extends Disposable {
@@ -155,24 +155,30 @@ let ChatImplicitContextContribution = class ChatImplicitContextContribution exte
             }
         }
         const notebookEditor = this.findActiveNotebookEditor();
-        if (notebookEditor) {
+        if (notebookEditor?.isReplHistory) {
+            newValue = undefined;
+        }
+        else if (notebookEditor) {
             const activeCell = notebookEditor.getActiveCell();
             if (activeCell) {
                 const codeEditor = this.codeEditorService.getActiveCodeEditor();
                 const selection = codeEditor?.getSelection();
                 const visibleRanges = codeEditor?.getVisibleRanges() || [];
                 newValue = activeCell.uri;
-                if (isEqual(codeEditor?.getModel()?.uri, activeCell.uri)) {
+                const cellModel = codeEditor?.getModel();
+                if (cellModel && isEqual(cellModel.uri, activeCell.uri)) {
                     if (selection && !selection.isEmpty()) {
                         newValue = { uri: activeCell.uri, range: selection };
                         isSelection = true;
                     }
                     else if (visibleRanges.length > 0) {
-                        let range = visibleRanges[0];
-                        visibleRanges.slice(1).forEach(r => {
-                            range = range.plusRange(r);
-                        });
-                        newValue = { uri: activeCell.uri, range };
+                        if (!isEntireCellVisible(cellModel, visibleRanges)) {
+                            let range = visibleRanges[0];
+                            visibleRanges.slice(1).forEach(r => {
+                                range = range.plusRange(r);
+                            });
+                            newValue = { uri: activeCell.uri, range };
+                        }
                     }
                 }
             }
@@ -222,6 +228,12 @@ ChatImplicitContextContribution = ( __decorate([
     ( __param(6, ILanguageModelIgnoredFilesService)),
     ( __param(7, IChatContextService))
 ], ChatImplicitContextContribution));
+function isEntireCellVisible(cellModel, visibleRanges) {
+    if (visibleRanges.length === 1 && visibleRanges[0].startLineNumber === 1 && visibleRanges[0].startColumn === 1 && visibleRanges[0].endLineNumber === cellModel.getLineCount() && visibleRanges[0].endColumn === cellModel.getLineMaxColumn(visibleRanges[0].endLineNumber)) {
+        return true;
+    }
+    return false;
+}
 class ChatImplicitContext extends Disposable {
     constructor() {
         super(...arguments);

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

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { ResourceSet } from "@codingame/monaco-vscode-api/vscode/vs/base/common/map";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatRelatedFilesContribution extends Disposable implements IWorkbenchContribution {
     private readonly chatEditingService;

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

@@ -7,7 +7,7 @@ import { ResourceMap, ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -60,7 +60,7 @@ let ChatRelatedFilesContribution = class ChatRelatedFilesContribution extends Di
                     if (( existingFiles.has(file.uri))) {
                         continue;
                     }
-                    newSuggestions.set(file.uri, ( localize(5695, "{0} (Suggested)", file.description)));
+                    newSuggestions.set(file.uri, ( localize(4964, "{0} (Suggested)", file.description)));
                     existingFiles.add(file.uri);
                 }
             }

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

@@ -9,10 +9,10 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { ResourceLabels } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels";
-import { IChatRequestImplicitVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatRequestImplicitVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import { ChatAttachmentModel } from "../chatAttachmentModel.js";
-import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service";
+import { ChatAttachmentModel } from "./chatAttachmentModel.js";
+import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
 export declare class ImplicitContextAttachmentWidget extends Disposable {
     private readonly widgetRef;
     private readonly attachment;
@@ -35,4 +35,5 @@ export declare class ImplicitContextAttachmentWidget extends Disposable {
     private renderString;
     private renderResource;
     private convertToRegularAttachment;
+    private pinSelection;
 }

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

@@ -11,6 +11,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { basename, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 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 { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -25,8 +26,8 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
-import { isStringImplicitContextValue } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service';
+import { isStringImplicitContextValue } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+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) {
@@ -53,21 +54,12 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         clearNode(this.domNode);
         this.renderDisposables.clear();
         this.domNode.classList.toggle('disabled', !this.attachment.enabled);
-        const label = this.resourceLabels.create(this.domNode, { supportIcons: true });
         const file = this.attachment.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(4875, "cell")) : ( localize(4876, "file"));
-        let title;
-        if (isStringImplicitContextValue(this.attachment.value)) {
-            title = this.renderString(label);
-        }
-        else {
-            title = this.renderResource(this.attachment.value, label);
-        }
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(4966, "cell")) : ( localize(4967, "file"));
         const isSuggestedEnabled = this.configService.getValue('chat.implicitContext.suggestedContext');
-        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.domNode, title));
         if (isSuggestedEnabled) {
             if (!this.attachment.isSelection) {
-                const buttonMsg = this.attachment.enabled ? ( localize(4877, "Disable current {0} context", attachmentTypeName)) : '';
+                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) => {
@@ -79,6 +71,16 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                     this.attachment.enabled = false;
                 }));
             }
+            else {
+                const pinButtonMsg = ( localize(4969, "Pin selection"));
+                const pinButton = this.renderDisposables.add(( new Button(this.domNode, { supportIcons: true, title: pinButtonMsg })));
+                pinButton.icon = Codicon.pinned;
+                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');
             }
@@ -99,7 +101,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             }));
         }
         else {
-            const buttonMsg = this.attachment.enabled ? ( localize(4877, "Disable current {0} context", attachmentTypeName)) : ( localize(4878, "Enable current {0} context", attachmentTypeName));
+            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) => {
@@ -107,6 +109,15 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 this.attachment.enabled = !this.attachment.enabled;
             }));
         }
+        const label = this.resourceLabels.create(this.domNode, { supportIcons: true });
+        let title;
+        if (isStringImplicitContextValue(this.attachment.value)) {
+            title = this.renderString(label);
+        }
+        else {
+            title = this.renderResource(this.attachment.value, label);
+        }
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.domNode, title));
         const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(this.domNode));
         const resourceContextKey = this.renderDisposables.add(( new ResourceContextKey(
             scopedContextKeyService,
@@ -131,28 +142,28 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
     renderString(resourceLabel) {
         const label = this.attachment.name;
         const icon = this.attachment.icon;
-        const title = ( localize(4879, "Current file context"));
+        const title = ( localize(4971, "Current file context"));
         resourceLabel.setLabel(label, undefined, { iconPath: icon, title });
         return title;
     }
     renderResource(attachmentValue, 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(4875, "cell")) : ( localize(4876, "file"));
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(4966, "cell")) : ( localize(4967, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            4880,
+            4972,
             "Attached {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(4881, "Attached {0}, {1}", attachmentTypeName, friendlyName));
+        )) : ( localize(4973, "Attached {0}, {1}", attachmentTypeName, friendlyName));
         const uriLabel = this.labelService.getUriLabel(file, { relative: true });
-        const currentFile = ( localize(4882, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(4883, "Enable current {0} context", attachmentTypeName));
+        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;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {
@@ -186,7 +197,22 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         }
         else {
             const file = URI.isUri(this.attachment.value) ? this.attachment.value : this.attachment.value.uri;
-            this.attachmentModel.addFile(file);
+            if (file.scheme === Schemas.vscodeNotebookCell && isLocation(this.attachment.value)) {
+                this.attachmentModel.addFile(file, this.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);
         }
         this.widgetRef()?.focusInput();
     }

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

@@ -1,7 +1,7 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 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/chatEditingService";
+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";
 export declare abstract class EditingSessionAction extends Action2 {
     constructor(opts: Readonly<IAction2Options>);

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

@@ -21,12 +21,12 @@ import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
-import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatActions';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, decidedChatEditingResourceContextKey, applyingChatEditsFailedContextKey, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
-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 { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isChatViewTitleActionContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatActions';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, decidedChatEditingResourceContextKey, applyingChatEditsFailedContextKey, hasUndecidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+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 { isRequestVM, isResponseVM, isChatTreeItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -80,7 +80,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: 'chatEditing.openFileInDiff',
-            title: ( localize2(5186, 'Open Changes in Diff Editor')),
+            title: ( localize2(5097, 'Open Changes in Diff Editor')),
             icon: Codicon.diffSingle,
             menu: [{
                     id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -109,7 +109,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: 'chatEditing.acceptFile',
-            title: ( localize2(5187, 'Keep')),
+            title: ( localize2(5098, 'Keep')),
             icon: Codicon.check,
             menu: [{
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(chatEditingResourceContextKey.key, decidedChatEditingResourceContextKey.key))),
@@ -132,7 +132,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: 'chatEditing.discardFile',
-            title: ( localize2(5188, 'Undo')),
+            title: ( localize2(5099, 'Undo')),
             icon: Codicon.discard,
             menu: [{
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(chatEditingResourceContextKey.key, decidedChatEditingResourceContextKey.key))),
@@ -155,9 +155,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: 'chatEditing.acceptAllFiles',
-            title: ( localize(5189, 'Keep')),
+            title: ( localize(5100, 'Keep')),
             icon: Codicon.check,
-            tooltip: ( localize(5190, 'Keep All Edits')),
+            tooltip: ( localize(5101, 'Keep All Edits')),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -183,9 +183,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: 'chatEditing.discardAllFiles',
-            title: ( localize(5191, 'Undo')),
+            title: ( localize(5102, 'Undo')),
             icon: Codicon.discard,
-            tooltip: ( localize(5192, 'Undo All Edits')),
+            tooltip: ( localize(5103, 'Undo All Edits')),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [
                 {
@@ -213,22 +213,22 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
 registerAction2(ChatEditingDiscardAllAction);
 async function discardAllEditsWithConfirmation(accessor, currentEditingSession) {
     const dialogService = accessor.get(IDialogService);
-    const entries = currentEditingSession.entries.get();
+    const entries = currentEditingSession.entries.get().filter(e => e.state.get() === ModifiedFileEntryState.Modified);
     if (entries.length > 0) {
         const confirmation = await dialogService.confirm({
-            title: ( localize(5193, "Undo all edits?")),
+            title: ( localize(5104, "Undo all edits?")),
             message: entries.length === 1
                 ? ( localize(
-                5194,
+                5105,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             ))
                 : ( localize(
-                5195,
+                5106,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(5196, "Yes")),
+            primaryButton: ( localize(5107, "Yes")),
             type: 'info'
         });
         if (!confirmation.confirmed) {
@@ -240,7 +240,7 @@ async function discardAllEditsWithConfirmation(accessor, currentEditingSession)
 }
 class ChatEditingShowChangesAction extends EditingSessionAction {
     static { this.ID = 'chatEditing.viewChanges'; }
-    static { this.LABEL = ( localize(5197, 'View All Edits')); }
+    static { this.LABEL = ( localize(5108, 'View All Edits')); }
     constructor() {
         super({
             id: ChatEditingShowChangesAction.ID,
@@ -269,7 +269,7 @@ class ViewAllSessionChangesAction extends Action2 {
     constructor() {
         super({
             id: ViewAllSessionChangesAction.ID,
-            title: ( localize2(5198, 'View All Changes')),
+            title: ( localize2(5109, 'View All Changes')),
             icon: Codicon.diffMultiple,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.hasAgentSessionChanges,
@@ -300,7 +300,7 @@ class ViewAllSessionChangesAction extends Action2 {
         if (resources.length > 0) {
             await commandService.executeCommand('_workbench.openMultiDiffEditor', {
                 multiDiffSourceUri: sessionResource.with({ scheme: sessionResource.scheme + '-worktree-changes' }),
-                title: ( localize(5199, 'All Session Changes')),
+                title: ( localize(5110, 'All Session Changes')),
                 resources,
             });
         }
@@ -335,14 +335,14 @@ async function restoreSnapshotWithConfirmation(accessor, item) {
         if (editsToUndo === 1) {
             if (entriesModifiedInRequestsToRemove.length === 1) {
                 message = ( localize(
-                    5200,
+                    5111,
                     "This will remove your last request and undo the edits made to {0}. Do you want to proceed?",
                     basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
                 ));
             }
             else {
                 message = ( localize(
-                    5201,
+                    5112,
                     "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                     entriesModifiedInRequestsToRemove.length
                 ));
@@ -351,14 +351,14 @@ async function restoreSnapshotWithConfirmation(accessor, item) {
         else {
             if (entriesModifiedInRequestsToRemove.length === 1) {
                 message = ( localize(
-                    5202,
+                    5113,
                     "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                     basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
                 ));
             }
             else {
                 message = ( localize(
-                    5203,
+                    5114,
                     "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
                     entriesModifiedInRequestsToRemove.length
                 ));
@@ -367,11 +367,11 @@ async function restoreSnapshotWithConfirmation(accessor, item) {
         const confirmation = shouldPrompt
             ? await dialogService.confirm({
                 title: editsToUndo === 1
-                    ? ( localize(5204, "Do you want to undo your last edit?"))
-                    : ( localize(5205, "Do you want to undo {0} edits?", editsToUndo)),
+                    ? ( localize(5115, "Do you want to undo your last edit?"))
+                    : ( localize(5116, "Do you want to undo {0} edits?", editsToUndo)),
                 message: message,
-                primaryButton: ( localize(5206, "Yes")),
-                checkbox: { label: ( localize(5207, "Don't ask again")), checked: false },
+                primaryButton: ( localize(5117, "Yes")),
+                checkbox: { label: ( localize(5118, "Don't ask again")), checked: false },
                 type: 'info'
             })
             : { confirmed: true };
@@ -390,7 +390,7 @@ registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.undoEdits',
-            title: ( localize2(5208, "Undo Requests")),
+            title: ( localize2(5119, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -434,8 +434,8 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.restoreCheckpoint',
-            title: ( localize2(5209, "Restore Checkpoint")),
-            tooltip: ( localize2(5210, "Restores workspace and chat to this point")),
+            title: ( localize2(5120, "Restore Checkpoint")),
+            tooltip: ( localize2(5121, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -478,7 +478,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.restoreLastCheckpoint',
-            title: ( localize2(5211, "Restore to Last Checkpoint")),
+            title: ( localize2(5122, "Restore to Last Checkpoint")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -530,7 +530,7 @@ registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.editRequests',
-            title: ( localize2(5212, "Edit Request")),
+            title: ( localize2(5123, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -569,7 +569,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5213, "Open File")),
+            title: ( localize(5124, "Open File")),
             menu: [{
                     id: MenuId.ChatEditingCodeBlockContext,
                     group: 'navigation',
@@ -591,7 +591,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5214, "Open File Snapshot")),
+            title: ( localize(5125, "Open File Snapshot")),
             menu: [{
                     id: MenuId.ChatEditingCodeBlockContext,
                     group: 'navigation',
@@ -613,7 +613,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         }
         const snapshot = chatEditingService.getEditingSession(chatModel.sessionResource)?.getSnapshotUri(context.requestId, context.uri, context.stopId);
         if (snapshot) {
-            const editor = await editorService.openEditor({ resource: snapshot, label: ( localize(5215, '{0} (Snapshot)', basename(context.uri))), options: { activation: EditorActivation.ACTIVATE } });
+            const editor = await editorService.openEditor({ resource: snapshot, label: ( localize(5126, '{0} (Snapshot)', basename(context.uri))), options: { activation: EditorActivation.ACTIVATE } });
             if (isCodeEditor(editor)) {
                 editor.updateOptions({ readOnly: true });
             }
@@ -624,7 +624,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: 'workbench.action.edits.addFilesFromReferences',
-            title: ( localize2(5216, "Add Files From References")),
+            title: ( localize2(5127, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -683,7 +683,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
 });
 class ViewPreviousEditsAction extends EditingSessionAction {
     static { this.Id = 'chatEditing.viewPreviousEdits'; }
-    static { this.Label = ( localize(5217, 'View Previous Edits')); }
+    static { this.Label = ( localize(5128, 'View Previous Edits')); }
     constructor() {
         super({
             id: ViewPreviousEditsAction.Id,

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.js

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import * as chatSessionAction from './media/chatSessionAction.css';
+import * as chatSessionPickerActionItem from './media/chatSessionPickerActionItem.css';
 import { $, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { IActionWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -13,7 +13,7 @@ import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/acti
 import { renderIcon, renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
-registerCss(chatSessionAction);
+registerCss(chatSessionPickerActionItem);
 let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewItem {
     constructor(action, initialState, delegate, actionWidgetService, contextKeyService, commandService, chatEntitlementService, keybindingService, telemetryService) {
         const { group, item } = initialState;
@@ -78,7 +78,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         if (this.currentOption?.icon) {
             domChildren.push(renderIcon(this.currentOption.icon));
         }
-        domChildren.push($('span.chat-session-option-label', undefined, this.currentOption?.name ?? ( localize(5503, "Pick Option"))));
+        domChildren.push($('span.chat-session-option-label', undefined, this.currentOption?.name ?? ( localize(5292, "Pick Option"))));
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(element, ...domChildren);
         this.setAriaLabelAttributes(element);

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.js

@@ -152,18 +152,18 @@ let ChatViewWelcomePart = class ChatViewWelcomePart extends Disposable {
             if (content.suggestedPrompts && content.suggestedPrompts.length) {
                 const suggestedPromptsContainer = append(this.element, $('.chat-welcome-view-suggested-prompts'));
                 const titleElement = append(suggestedPromptsContainer, $('.chat-welcome-view-suggested-prompts-title'));
-                titleElement.textContent = ( localize(5853, 'Suggested Actions'));
+                titleElement.textContent = ( localize(5597, 'Suggested Actions'));
                 for (const prompt of content.suggestedPrompts) {
                     const promptElement = append(suggestedPromptsContainer, $('.chat-welcome-view-suggested-prompt'));
                     promptElement.setAttribute('role', 'button');
                     promptElement.setAttribute('tabindex', '0');
                     const promptAriaLabel = prompt.description
-                        ? ( localize(5854, 'Suggested prompt: {0}, {1}', prompt.label, prompt.description))
-                        : ( localize(5855, 'Suggested prompt: {0}', prompt.label));
+                        ? ( localize(5598, 'Suggested prompt: {0}, {1}', prompt.label, prompt.description))
+                        : ( localize(5599, 'Suggested prompt: {0}', prompt.label));
                     promptElement.setAttribute('aria-label', promptAriaLabel);
                     const titleElement = append(promptElement, $('.chat-welcome-view-suggested-prompt-title'));
                     titleElement.textContent = prompt.label;
-                    const tooltip = ( localize(5856, "Suggested prompt: {0}", prompt.prompt));
+                    const tooltip = ( localize(5600, "Suggested prompt: {0}", prompt.prompt));
                     promptElement.title = tooltip;
                     titleElement.title = tooltip;
                     if (prompt.description) {
@@ -228,7 +228,7 @@ let ChatViewWelcomePart = class ChatViewWelcomePart extends Disposable {
         const actions = [];
         if (prompt.uri) {
             const uri = prompt.uri;
-            actions.push(( new Action('chat.editPromptFile', ( localize(5857, "Edit Prompt File")), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
+            actions.push(( new Action('chat.editPromptFile', ( localize(5601, "Edit Prompt File")), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
                 try {
                     await this.openerService.open(uri);
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAgentHover.d.ts → widget/chatAgentHover.d.ts}

@@ -2,9 +2,9 @@ import { IManagedHoverOptions } from "@codingame/monaco-vscode-api/vscode/vs/bas
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatAgentNameService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
+import { IChatAgentNameService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 export declare class ChatAgentHover extends Disposable {
     private readonly chatAgentService;