@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -33,7 +33,6 @@ import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { isAgentSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
-import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 
 class EditingSessionAction extends Action2 {
     constructor(opts) {
@@ -86,7 +85,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(5787, "Open Changes in Diff Editor")),
+            title: ( localize2(5918, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -117,7 +116,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(5788, "Keep")),
+            title: ( localize2(5919, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -143,7 +142,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(5789, "Undo")),
+            title: ( localize2(5920, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -169,9 +168,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(5790, "Keep")),
+            title: ( localize(5921, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(5791, "Keep All Edits")),
+            tooltip: ( localize(5922, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -195,9 +194,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(5792, "Undo")),
+            title: ( localize(5923, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(5793, "Undo All Edits")),
+            tooltip: ( localize(5924, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -228,8 +227,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(5794, "Explain")),
-            tooltip: ( localize(5795, "Toggle Change Explanations")),
+            title: ( localize(5925, "Explain")),
+            tooltip: ( localize(5926, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -253,17 +252,17 @@ async function discardAllEditsWithConfirmation(accessor, currentEditingSession)
     const entries = currentEditingSession.entries.get().filter(e => e.state.get() === ModifiedFileEntryState.Modified);
     if (entries.length > 0) {
         const confirmation = await dialogService.confirm({
-            title: ( localize(5796, "Undo all edits?")),
+            title: ( localize(5927, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                5797,
+                5928,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                5798,
+                5929,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(5799, "Yes")),
+            primaryButton: ( localize(5930, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -278,7 +277,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(5800, "View All Edits"));
+        this.LABEL = ( localize(5931, "View All Edits"));
     }
     constructor() {
         super({
@@ -311,7 +310,7 @@ class ViewAllSessionChangesAction extends Action2 {
     constructor() {
         super({
             id: ViewAllSessionChangesAction.ID,
-            title: ( localize2(5801, "View All Changes")),
+            title: ( localize2(5932, "View All Changes")),
             icon: Codicon.diffMultiple,
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.hasAgentSessionChanges,
@@ -320,11 +319,6 @@ class ViewAllSessionChangesAction extends Action2 {
                 group: "navigation",
                 order: 10,
                 when: ChatContextKeys.hasAgentSessionChanges
-            }, {
-                id: MenuId.AgentSessionItemToolbar,
-                group: "navigation",
-                order: 0,
-                when: ( ContextKeyExpr.and(ChatContextKeys.hasAgentSessionChanges, ( IsSessionsWindowContext.negate())))
             }]
         });
     }
@@ -353,7 +347,7 @@ class ViewAllSessionChangesAction extends Action2 {
                 multiDiffSourceUri: sessionResource.with({
                     scheme: sessionResource.scheme + "-worktree-changes"
                 }),
-                title: ( localize(5802, "All Session Changes")),
+                title: ( localize(5933, "All Session Changes")),
                 resources
             });
             session?.setRead(true);
@@ -393,13 +387,13 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     if (editsToUndo === 1) {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                5803,
+                5934,
                 "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(
-                5804,
+                5935,
                 "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
@@ -407,24 +401,24 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     } else {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                5805,
+                5936,
                 "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                5806,
+                5937,
                 "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
         }
     }
     const confirmation = shouldPrompt ? await dialogService.confirm({
-        title: editsToUndo === 1 ? ( localize(5807, "Do you want to undo your last edit?")) : ( localize(5808, "Do you want to undo {0} edits?", editsToUndo)),
+        title: editsToUndo === 1 ? ( localize(5938, "Do you want to undo your last edit?")) : ( localize(5939, "Do you want to undo {0} edits?", editsToUndo)),
         message: message,
-        primaryButton: ( localize(5809, "Yes")),
+        primaryButton: ( localize(5940, "Yes")),
         checkbox: {
-            label: ( localize(5810, "Don't ask again")),
+            label: ( localize(5941, "Don't ask again")),
             checked: false
         },
         type: "info"
@@ -452,7 +446,7 @@ registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.undoEdits",
-            title: ( localize2(5811, "Undo Requests")),
+            title: ( localize2(5942, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -494,8 +488,8 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreCheckpoint",
-            title: ( localize2(5812, "Restore Checkpoint")),
-            tooltip: ( localize2(5813, "Restores workspace and chat to this point")),
+            title: ( localize2(5943, "Restore Checkpoint")),
+            tooltip: ( localize2(5944, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -536,7 +530,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(5814, "Restore to Last Checkpoint")),
+            title: ( localize2(5945, "Restore to Last Checkpoint")),
             f1: true,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -561,7 +555,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
         }
         const checkpointRequest = chatModel.checkpoint;
         if (!checkpointRequest) {
-            alert(( localize(5815, "There is no checkpoint to restore.")));
+            alert(( localize(5946, "There is no checkpoint to restore.")));
             return;
         }
         widget?.viewModel?.model.setCheckpoint(checkpointRequest.id);
@@ -574,7 +568,7 @@ registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editRequests",
-            title: ( localize2(5816, "Edit Request")),
+            title: ( localize2(5947, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -613,7 +607,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5817, "Open File")),
+            title: ( localize(5948, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -639,7 +633,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(5818, "Open File Snapshot")),
+            title: ( localize(5949, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -663,7 +657,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         if (snapshot) {
             const editor = await editorService.openEditor({
                 resource: snapshot,
-                label: ( localize(5819, "{0} (Snapshot)", basename(context.uri))),
+                label: ( localize(5950, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -680,7 +674,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(5820, "Add Files From References")),
+            title: ( localize2(5951, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -744,7 +738,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(5821, "View Previous Edits"));
+        this.Label = ( localize(5952, "View Previous Edits"));
     }
     constructor() {
         super({

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

@@ -10,6 +10,7 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { resolveCommandsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { EditorResourceAccessor, SideBySideEditor, TEXT_DIFF_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
@@ -64,7 +65,7 @@ class NavigateAction extends ChatEditingEditorAction {
     constructor(next) {
         super({
             id: next ? "chatEditor.action.navigateNext" : "chatEditor.action.navigatePrevious",
-            title: next ? ( localize2(5823, "Go to Next Chat Edit")) : ( localize2(5824, "Go to Previous Chat Edit")),
+            title: next ? ( localize2(5954, "Go to Next Chat Edit")) : ( localize2(5955, "Go to Previous Chat Edit")),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -128,9 +129,9 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
     constructor(id, _keep) {
         super({
             id,
-            title: _keep ? ( localize2(5825, "Keep Chat Edits")) : ( localize2(5826, "Undo Chat Edits")),
-            shortTitle: _keep ? ( localize2(5827, "Keep")) : ( localize2(5828, "Undo")),
-            tooltip: _keep ? ( localize2(5829, "Keep Chat Edits in this File")) : ( localize2(5830, "Undo Chat Edits in this File")),
+            title: _keep ? ( localize2(5956, "Keep Chat Edits")) : ( localize2(5957, "Undo Chat Edits")),
+            shortTitle: _keep ? ( localize2(5958, "Keep")) : ( localize2(5959, "Undo")),
+            tooltip: _keep ? ( localize2(5960, "Keep Chat Edits in this File")) : ( localize2(5961, "Undo Chat Edits in this File")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep ? Codicon.check : Codicon.discard,
             f1: true,
@@ -150,12 +151,15 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
     }
     async runChatEditingCommand(accessor, session, entry, _integration) {
         const instaService = accessor.get(IInstantiationService);
+        const configService = accessor.get(IConfigurationService);
         if (this._keep) {
             session.accept(entry.modifiedURI);
         } else {
             session.reject(entry.modifiedURI);
         }
-        await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
+        if (configService.getValue(ChatConfiguration.RevealNextChangeOnResolve)) {
+            await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
+        }
     }
 }
 class AcceptAction extends KeepOrUndoAction {
@@ -180,8 +184,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(5831, "Keep this Change")) : ( localize2(5832, "Undo this Change")),
-            shortTitle: _accept ? ( localize2(5833, "Keep")) : ( localize2(5834, "Undo")),
+            title: _accept ? ( localize2(5962, "Keep this Change")) : ( localize2(5963, "Undo this Change")),
+            shortTitle: _accept ? ( localize2(5964, "Keep")) : ( localize2(5965, "Undo")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -198,12 +202,13 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     }
     async runChatEditingCommand(accessor, session, entry, ctrl, ...args) {
         const instaService = accessor.get(IInstantiationService);
+        const configService = accessor.get(IConfigurationService);
         if (this._accept) {
             await ctrl.acceptNearestChange(args[0]);
         } else {
             await ctrl.rejectNearestChange(args[0]);
         }
-        if (entry.changesCount.get() === 0) {
+        if (configService.getValue(ChatConfiguration.RevealNextChangeOnResolve) && entry.changesCount.get() === 0) {
             await instaService.invokeFunction(openNextOrPreviousChange, session, entry, true);
         }
     }
@@ -228,7 +233,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.toggleDiff",
-            title: ( localize2(5835, "Toggle Diff Editor for Chat Edits")),
+            title: ( localize2(5966, "Toggle Diff Editor for Chat Edits")),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -265,7 +270,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.showAccessibleDiffView",
-            title: ( localize2(5836, "Show Accessible Diff View for Chat Edits")),
+            title: ( localize2(5967, "Show Accessible Diff View for Chat Edits")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -283,7 +288,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.reviewChanges",
-            title: ( localize2(5837, "Review")),
+            title: ( localize2(5968, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                 id: MenuId.ChatEditingEditorContent,
@@ -304,8 +309,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(5838, "Keep All Chat Edits")),
-            tooltip: ( localize2(5839, "Keep All Chat Edits in this Session")),
+            title: ( localize2(5969, "Keep All Chat Edits")),
+            tooltip: ( localize2(5970, "Keep All Chat Edits in this Session")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -324,7 +329,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? "chatEditing.multidiff.acceptAllFiles" : "chatEditing.multidiff.discardAllFiles",
-            title: accept ? ( localize(5840, "Keep All Edits")) : ( localize(5841, "Undo All Edits")),
+            title: accept ? ( localize(5971, "Keep All Edits")) : ( localize(5972, "Undo All Edits")),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -375,7 +380,7 @@ class ExplainMultiDiffAction extends Action2 {
     constructor() {
         super({
             id: "chatEditing.multidiff.explain",
-            title: ( localize(5842, "Explain")),
+            title: ( localize(5973, "Explain")),
             menu: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( explainMultiDiffSchemes.map(scheme => ( ContextKeyExpr.equals("resourceScheme", scheme)))))), ( ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`)))),
                 id: MenuId.MultiDiffEditorContent,
@@ -521,7 +526,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(5843, "Navigation Status")),
+            title: ( localize(5974, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

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

@@ -200,9 +200,9 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                     } = that._navigationBearings.read(r);
                                     if (changeCount > 0) {
                                         const n = activeIdx === -1 ? "1" : `${activeIdx + 1}`;
-                                        this.label.innerText = ( localize(5851, "{0} of {1}", n, changeCount));
+                                        this.label.innerText = ( localize(5982, "{0} of {1}", n, changeCount));
                                     } else {
-                                        this.label.innerText = ( localize(5852, "—"));
+                                        this.label.innerText = ( localize(5983, "—"));
                                     }
                                     this.updateTooltip();
                                 }));
@@ -217,18 +217,18 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 }
                                 let result;
                                 if (changeCount === 1 && entriesCount === 1) {
-                                    result = ( localize(5853, "1 change in 1 file"));
+                                    result = ( localize(5984, "1 change in 1 file"));
                                 } else if (changeCount === 1) {
-                                    result = ( localize(5854, "1 change in {0} files", entriesCount));
+                                    result = ( localize(5985, "1 change in {0} files", entriesCount));
                                 } else if (entriesCount === 1) {
-                                    result = ( localize(5855, "{0} changes in 1 file", changeCount));
+                                    result = ( localize(5986, "{0} changes in 1 file", changeCount));
                                 } else {
-                                    result = ( localize(5856, "{0} changes in {1} files", changeCount, entriesCount));
+                                    result = ( localize(5987, "{0} changes in {1} files", changeCount, entriesCount));
                                 }
                                 if (!that._isBusy.get()) {
                                     return result;
                                 }
-                                return localize(5857, "{0} - Working...", result);
+                                return localize(5988, "{0} - Working...", result);
                             }
                         })();
                     }

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

@@ -6,7 +6,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
-import { $, addDisposableListener, clearNode, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, addDisposableListener, clearNode, createTextNode, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { overviewRulerRangeHighlight } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editorColorRegistry';
@@ -95,7 +95,7 @@ class ChatEditingExplanationWidget extends Disposable {
             return {
                 startLineNumber: change.modified.startLineNumber,
                 endLineNumber: change.modified.endLineNumberExclusive - 1,
-                explanation: ( localize(5861, "Generating explanation...")),
+                explanation: ( localize(5992, "Generating explanation...")),
                 read: false,
                 loading: true,
                 originalText,
@@ -116,7 +116,7 @@ class ChatEditingExplanationWidget extends Disposable {
         this._headerNode.appendChild(this._toggleButton);
         this._dismissButton = $("div.chat-explanation-dismiss");
         this._dismissButton.appendChild(renderIcon(Codicon.close));
-        this._dismissButton.title = ( localize(5862, "Dismiss"));
+        this._dismissButton.title = ( localize(5993, "Dismiss"));
         this._headerNode.appendChild(this._dismissButton);
         this._domNode.appendChild(this._headerNode);
         this._bodyNode = $("div.chat-explanation-body");
@@ -178,35 +178,35 @@ class ChatEditingExplanationWidget extends Disposable {
             this._readIndicator.appendChild(renderIcon(Codicon.circle));
             this._readIndicator.classList.add("read");
             this._readIndicator.classList.remove("partial", "unread");
-            this._readIndicator.title = ( localize(5863, "Mark as unread"));
+            this._readIndicator.title = ( localize(5994, "Mark as unread"));
         } else if (someRead) {
             this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
             this._readIndicator.classList.remove("read", "unread");
             this._readIndicator.classList.add("partial");
-            this._readIndicator.title = ( localize(5864, "Mark all as read"));
+            this._readIndicator.title = ( localize(5995, "Mark all as read"));
         } else {
             this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
             this._readIndicator.classList.remove("read", "partial");
             this._readIndicator.classList.add("unread");
-            this._readIndicator.title = ( localize(5865, "Mark as read"));
+            this._readIndicator.title = ( localize(5996, "Mark as read"));
         }
     }
     _updateTitle() {
         const count = this._explanations.length;
         if (count === 1) {
-            this._titleNode.textContent = ( localize(5866, "1 change"));
+            this._titleNode.textContent = ( localize(5997, "1 change"));
         } else {
-            this._titleNode.textContent = ( localize(5867, "{0} changes", count));
+            this._titleNode.textContent = ( localize(5998, "{0} changes", count));
         }
     }
     _updateToggleButton() {
         clearNode(this._toggleButton);
         if (this._isExpanded) {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronUp));
-            this._toggleButton.title = ( localize(5868, "Collapse"));
+            this._toggleButton.title = ( localize(5999, "Collapse"));
         } else {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronDown));
-            this._toggleButton.title = ( localize(5869, "Expand"));
+            this._toggleButton.title = ( localize(6000, "Expand"));
         }
     }
     _buildExplanationItems() {
@@ -217,9 +217,9 @@ class ChatEditingExplanationWidget extends Disposable {
             const item = $("div.chat-explanation-item");
             const lineInfo = $("span.chat-explanation-line-info");
             if (exp.startLineNumber === exp.endLineNumber) {
-                lineInfo.textContent = ( localize(5870, "Line {0}", exp.startLineNumber));
+                lineInfo.textContent = ( localize(6001, "Line {0}", exp.startLineNumber));
             } else {
-                lineInfo.textContent = ( localize(5871, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
+                lineInfo.textContent = ( localize(6002, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
             }
             item.appendChild(lineInfo);
             const text = $("span.chat-explanation-text");
@@ -227,7 +227,7 @@ class ChatEditingExplanationWidget extends Disposable {
                 const loadingIcon = renderIcon(ThemeIcon.modify(Codicon.loading, "spin"));
                 loadingIcon.classList.add("chat-explanation-loading");
                 text.appendChild(loadingIcon);
-                const loadingText = document.createTextNode(" " + exp.explanation);
+                const loadingText = createTextNode(" " + exp.explanation);
                 text.appendChild(loadingText);
             } else {
                 text.textContent = exp.explanation;
@@ -238,7 +238,7 @@ class ChatEditingExplanationWidget extends Disposable {
             item.appendChild(itemReadIndicator);
             const replyButton = $("div.chat-explanation-reply-button");
             replyButton.appendChild(renderIcon(Codicon.arrowRight));
-            replyButton.title = ( localize(5872, "Follow up on this change"));
+            replyButton.title = ( localize(6003, "Follow up on this change"));
             item.appendChild(replyButton);
             this._eventStore.add(addDisposableListener(replyButton, "click", async e => {
                 e.stopPropagation();

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

@@ -10,6 +10,7 @@ import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IChatInputPickerOptions } from "../widget/input/chatInputPickerActionItem.js";
 export interface IChatSessionPickerDelegate {
     readonly onDidChangeOption: Event<IChatSessionProviderOptionItem>;
     getCurrentOption(): IChatSessionProviderOptionItem | undefined;
@@ -23,13 +24,14 @@ export interface IChatSessionPickerDelegate {
  */
 export declare class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewItem {
     protected readonly delegate: IChatSessionPickerDelegate;
+    protected readonly _pickerOptions: IChatInputPickerOptions | undefined;
     protected readonly commandService: ICommandService;
     protected currentOption: IChatSessionProviderOptionItem | undefined;
     protected container: HTMLElement | undefined;
     constructor(action: IAction, initialState: {
         group: IChatSessionProviderOptionGroup;
         item: IChatSessionProviderOptionItem | undefined;
-    }, delegate: IChatSessionPickerDelegate, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService);
+    }, delegate: IChatSessionPickerDelegate, _pickerOptions: IChatInputPickerOptions | undefined, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService);
     /**
      * Returns the actions to show in the dropdown. Can be overridden by subclasses.
      */
@@ -38,6 +40,11 @@ export declare class ChatSessionPickerActionItem extends ActionWidgetDropdownAct
      * Creates a disabled action for a locked option.
      */
     protected createLockedOptionAction(option: IChatSessionProviderOptionItem): IActionWidgetDropdownAction;
+    /**
+     * Returns the anchor element for the dropdown.
+     * Falls back to the overflow anchor if this element is not in the DOM.
+     */
+    private _getAnchorElement;
     protected renderLabel(element: HTMLElement): IDisposable | null;
     render(container: HTMLElement): void;
     /**

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

@@ -2,7 +2,7 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatSessionPickerActionItem from './media/chatSessionPickerActionItem.css';
-import { $, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { getActiveWindow, $, 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';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
@@ -18,6 +18,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         action,
         initialState,
         delegate,
+        _pickerOptions,
         actionWidgetService,
         contextKeyService,
         keybindingService,
@@ -43,7 +44,8 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
                 id: group.id,
                 name: `ChatSession:${group.name}`,
                 includeOptions: false
-            }
+            },
+            getAnchor: () => this._getAnchorElement()
         };
         super(
             actionWithLabel,
@@ -54,6 +56,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             telemetryService
         );
         this.delegate = delegate;
+        this._pickerOptions = _pickerOptions;
         this.commandService = commandService;
         this.currentOption = item;
         this._register(this.delegate.onDidChangeOption(newOption => {
@@ -130,6 +133,12 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             run: () => {}
         };
     }
+    _getAnchorElement() {
+        if (this.element && getActiveWindow().document.contains(this.element)) {
+            return this.element;
+        }
+        return this._pickerOptions?.getOverflowAnchor?.() ?? this.element;
+    }
     renderLabel(element) {
         const domChildren = [];
         element.classList.add("chat-session-option-picker");
@@ -142,7 +151,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             domChildren.push($(
                 "span.chat-session-option-label",
                 undefined,
-                this.currentOption?.name ?? group?.description ?? ( localize(6009, "Pick Option"))
+                this.currentOption?.name ?? group?.description ?? ( localize(6142, "Pick Option"))
             ));
         }
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
@@ -173,6 +182,6 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         }
     }
 };
-ChatSessionPickerActionItem = ( __decorate([( __param(3, IActionWidgetService)), ( __param(4, IContextKeyService)), ( __param(5, IKeybindingService)), ( __param(6, ICommandService)), ( __param(7, ITelemetryService))], ChatSessionPickerActionItem));
+ChatSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IContextKeyService)), ( __param(6, IKeybindingService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService))], ChatSessionPickerActionItem));
 
 export { ChatSessionPickerActionItem };