@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.js

@@ -1,10 +1,12 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { markAsSingleton } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
@@ -15,15 +17,16 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ToolsScope } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSelectedTools';
+import { ToolsScope } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatSelectedTools';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { AcceptToolConfirmationActionId, SkipToolConfirmationActionId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { showToolsPicker } from './chatToolPicker.js';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 class ToolConfirmationAction extends Action2 {
     run(accessor, ...args) {
@@ -47,7 +50,7 @@ class AcceptToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: AcceptToolConfirmationActionId,
-            title: ( localize2(4794, "Accept")),
+            title: ( localize2(4807, "Accept")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -65,7 +68,7 @@ class SkipToolConfirmation extends ToolConfirmationAction {
     constructor() {
         super({
             id: SkipToolConfirmationActionId,
-            title: ( localize2(4795, "Skip")),
+            title: ( localize2(4808, "Skip")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -84,7 +87,7 @@ class ConfigureToolsAction extends Action2 {
     constructor() {
         super({
             id: ConfigureToolsAction.ID,
-            title: ( localize(4796, "Configure Tools...")),
+            title: ( localize(4809, "Configure Tools...")),
             icon: Codicon.tools,
             f1: false,
             category: CHAT_CATEGORY,
@@ -119,36 +122,49 @@ class ConfigureToolsAction extends Action2 {
         const { entriesScope, entriesMap } = widget.input.selectedToolsModel;
         switch (entriesScope) {
             case ToolsScope.Session:
-                placeholder = ( localize(4797, "Select tools for this chat session"));
-                description = ( localize(4798, "The selected tools were configured only for this chat session."));
+                placeholder = ( localize(4810, "Select tools for this chat session"));
+                description = ( localize(4811, "The selected tools were configured only for this chat session."));
                 break;
             case ToolsScope.Agent:
-                placeholder = ( localize(4799, "Select tools for this custom agent"));
+                placeholder = ( localize(4812, "Select tools for this custom agent"));
                 description = ( localize(
-                    4800,
+                    4813,
                     "The selected tools are configured by the '{0}' custom agent. Changes to the tools will be applied to the custom agent file as well.",
                     widget.input.currentModeObs.get().label.get()
                 ));
                 break;
             case ToolsScope.Agent_ReadOnly:
-                placeholder = ( localize(4801, "Select tools for this custom agent"));
+                placeholder = ( localize(4814, "Select tools for this custom agent"));
                 description = ( localize(
-                    4802,
+                    4815,
                     "The selected tools are configured by the '{0}' custom agent. Changes to the tools will only be used for this session and will not change the '{0}' custom agent.",
                     widget.input.currentModeObs.get().label.get()
                 ));
                 break;
             case ToolsScope.Global:
-                placeholder = ( localize(4803, "Select tools that are available to chat."));
+                placeholder = ( localize(4816, "Select tools that are available to chat."));
                 description = ( localize(
-                    4804,
+                    4817,
                     "The selected tools will be applied globally for all chat sessions that use the default agent."
                 ));
                 break;
         }
-        const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, () => entriesMap.get());
-        if (result) {
-            widget.input.selectedToolsModel.set(result, false);
+        const cts = ( new CancellationTokenSource());
+        const initialMode = widget.input.currentModeObs.get();
+        const modeListener = autorun(reader => {
+            if (initialMode.id !== widget.input.currentModeObs.read(reader).id) {
+                cts.cancel();
+            }
+        });
+        try {
+            const result = await instaService.invokeFunction(showToolsPicker, placeholder, description, () => entriesMap.get(), cts.token);
+            if (result) {
+                widget.input.selectedToolsModel.set(result, false);
+            }
+        }
+        finally {
+            modeListener.dispose();
+            cts.dispose();
         }
         const tools = widget.input.selectedToolsModel.entriesMap.get();
         telemetryService.publicLog2('chat/selectedTools', {
@@ -191,7 +207,7 @@ let ConfigureToolsActionRendering = class ConfigureToolsActionRendering {
                 getTooltip() {
                     if (this.isAboveToolLimit()) {
                         const warningMessage = ( localize(
-                            4805,
+                            4818,
                             'More than {0} tools are enabled, you may experience degraded tool calling.',
                             this._contextKeyService.getContextKeyValue(ChatContextKeys.chatToolGroupingThreshold.key)
                         ));

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.d.ts

@@ -1,5 +1,6 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 /**
  * New QuickTree implementation of the tools picker.
  * Uses IQuickTree to provide a true hierarchical tree structure with:
@@ -12,7 +13,7 @@ import { IToolData, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workb
  * @param placeHolder - Placeholder text shown in the picker
  * @param description - Optional description text shown in the picker
  * @param toolsEntries - Optional initial selection state for tools and toolsets
- * @param onUpdate - Optional callback fired when the selection changes
+ * @param token - Optional cancellation token to close the picker when cancelled
  * @returns Promise resolving to the final selection map, or undefined if cancelled
  */
-export declare function showToolsPicker(accessor: ServicesAccessor, placeHolder: string, description?: string, getToolsEntries?: () => ReadonlyMap<ToolSet | IToolData, boolean>): Promise<ReadonlyMap<ToolSet | IToolData, boolean> | undefined>;
+export declare function showToolsPicker(accessor: ServicesAccessor, placeHolder: string, description?: string, getToolsEntries?: () => ReadonlyMap<ToolSet | IToolData, boolean>, token?: CancellationToken): Promise<ReadonlyMap<ToolSet | IToolData, boolean> | undefined>;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.js

@@ -20,9 +20,9 @@ import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { McpServerEditorTab, McpConnectionState, McpServerCacheState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService, IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ToolDataSource } 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ToolDataSource } 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 { ConfigureToolSets } from '../tools/toolSetsContribution.js';
 
 var BucketOrdinal;
@@ -77,7 +77,7 @@ function createToolSetTreeItem(toolset, checked, editorService) {
         const resource = toolset.source.file;
         buttons.push({
             iconClass: ThemeIcon.asClassName(Codicon.edit),
-            tooltip: ( localize(4806, "Edit Tool Set")),
+            tooltip: ( localize(4819, "Edit Tool Set")),
             action: () => editorService.openEditor({ resource })
         });
     }
@@ -94,7 +94,7 @@ function createToolSetTreeItem(toolset, checked, editorService) {
         ...iconProps
     };
 }
-async function showToolsPicker(accessor, placeHolder, description, getToolsEntries) {
+async function showToolsPicker(accessor, placeHolder, description, getToolsEntries, token) {
     const quickPickService = accessor.get(IQuickInputService);
     const mcpService = accessor.get(IMcpService);
     const mcpRegistry = accessor.get(IMcpRegistry);
@@ -158,14 +158,14 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                 if (collection?.source) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4807, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4820, "Configure {0}", collection.label)),
                         action: () => collection.source ? collection.source instanceof ExtensionIdentifier ? extensionsWorkbenchService.open(collection.source.value, { tab: ExtensionEditorTab.Features, feature: 'mcp' }) : mcpWorkbenchService.open(collection.source, { tab: McpServerEditorTab.Configuration }) : undefined
                     });
                 }
                 else if (collection?.presentation?.origin) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4807, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4820, "Configure {0}", collection.label)),
                         action: () => editorService.openEditor({
                             resource: collection.presentation.origin,
                         })
@@ -174,7 +174,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                 if (mcpServer.connectionState.get().state === McpConnectionState.Kind.Error) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.warning),
-                        tooltip: ( localize(4808, "Show Output")),
+                        tooltip: ( localize(4821, "Show Output")),
                         action: () => mcpServer.showOutput(),
                     });
                 }
@@ -186,7 +186,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     children.push({
                         itemType: 'callback',
                         iconClass: ThemeIcon.asClassName(Codicon.sync),
-                        label: ( localize(4809, "Update Tools")),
+                        label: ( localize(4822, "Update Tools")),
                         pickable: false,
                         run: () => {
                             treePicker.busy = true;
@@ -243,7 +243,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.BuiltIn,
                     id: key,
-                    label: ( localize(4810, "Built-In")),
+                    label: ( localize(4823, "Built-In")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -256,7 +256,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.User,
                     id: key,
-                    label: ( localize(4811, "User Defined Tool Sets")),
+                    label: ( localize(4824, "User Defined Tool Sets")),
                     checked: undefined,
                     children: [],
                     buttons: [],
@@ -339,7 +339,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
             }
         }
         if (treeItems.length === 0) {
-            treePicker.placeholder = ( localize(4812, "Add tools to chat"));
+            treePicker.placeholder = ( localize(4825, "Add tools to chat"));
         }
         else {
             treePicker.placeholder = placeHolder;
@@ -380,7 +380,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
             if (count > toolLimit) {
                 treePicker.severity = Severity.Warning;
                 treePicker.validationMessage = ( localize(
-                    4813,
+                    4826,
                     "{0} tools are enabled. You may experience degraded tool calling above {1} tools.",
                     count,
                     createMarkdownCommandLink({ title: String(toolLimit), id: '_chat.toolPicker.closeAndOpenVirtualThreshold' })
@@ -443,17 +443,17 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
     }));
     const addMcpServerButton = {
         iconClass: ThemeIcon.asClassName(Codicon.mcp),
-        tooltip: ( localize(4814, 'Add MCP Server...'))
+        tooltip: ( localize(4827, 'Add MCP Server...'))
     };
     const installExtension = {
         iconClass: ThemeIcon.asClassName(Codicon.extensions),
-        tooltip: ( localize(4815, 'Install Extension...'))
+        tooltip: ( localize(4828, 'Install Extension...'))
     };
     const configureToolSets = {
         iconClass: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(4816, 'Configure Tool Sets...'))
+        tooltip: ( localize(4829, 'Configure Tool Sets...'))
     };
-    treePicker.title = ( localize(4817, "Configure Tools"));
+    treePicker.title = ( localize(4830, "Configure Tools"));
     treePicker.buttons = [addMcpServerButton, installExtension, configureToolSets];
     store.add(treePicker.onDidTriggerButton(button => {
         if (button === addMcpServerButton) {
@@ -467,6 +467,11 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
         }
         treePicker.hide();
     }));
+    if (token) {
+        store.add(token.onCancellationRequested(() => {
+            treePicker.hide();
+        }));
+    }
     treePicker.show();
     await Promise.race([Event.toPromise(Event.any(treePicker.onDidHide, didAcceptFinalItem.event), store)]);
     store.dispose();

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.d.ts

@@ -1,6 +1,6 @@
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service";
+import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service";
 export declare class ChatTransferContribution extends Disposable implements IWorkbenchContribution {
     static readonly ID = "workbench.contrib.chatTransfer";
     constructor(chatTransferService: IChatTransferService);

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
+import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service';
 
 let ChatTransferContribution = class ChatTransferContribution extends Disposable {
     static { this.ID = 'workbench.contrib.chatTransfer'; }

package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.d.ts

@@ -12,9 +12,9 @@ import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench
 import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
 import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
-import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart";
 export declare class InsertCodeBlockOperation {
     private readonly editorService;
     private readonly textFileService;

package/vscode/src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.js

@@ -31,9 +31,9 @@ import { reviewEdits, reviewNotebookEdits } from '@codingame/monaco-vscode-katex
 import { insertCell } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
 import { CellKind, NOTEBOOK_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
-import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 
 let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageService, dialogService, aiEditTelemetryService) {
@@ -58,7 +58,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    4818,
+                    4831,
                     "To insert the code block, open a code editor or notebook editor and set the cursor at the location where to insert the code block."
                 )));
             }
@@ -91,7 +91,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4819, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4832, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -102,7 +102,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4820, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4833, "Cannot insert the code block to read-only code editor.")));
             return false;
         }
         const range = codeEditor.getSelection() ?? ( new Range(activeModel.getLineCount(), 1, activeModel.getLineCount(), 1));
@@ -156,7 +156,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     activeEditorControl = codeEditor;
                 }
                 else {
-                    this.notify(( localize(4821, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4834, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             }
@@ -182,7 +182,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                 result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionResource, context.code);
             }
             else {
-                this.notify(( localize(4822, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4835, "To apply this code block, open a code or notebook editor.")));
             }
         }
         if (isResponseVM(context.element)) {
@@ -205,15 +205,15 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             return resource;
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? { label: ( localize(
-            4823,
+            4836,
             "Active editor '{0}'",
             this.labelService.getUriLabel(activeEditorControl.getModel().uri, { relative: true })
         )), id: 'activeEditor' } : undefined;
-        const untitledEditorOption = { label: ( localize(4824, "New untitled editor")), id: 'newUntitledFile' };
+        const untitledEditorOption = { label: ( localize(4837, "New untitled editor")), id: 'newUntitledFile' };
         const options = [];
         if (resource) {
             options.push({ label: ( localize(
-                4825,
+                4838,
                 "New file '{0}'",
                 this.labelService.getUriLabel(resource, { relative: true })
             )), id: 'createFile' });
@@ -228,7 +228,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             options.push(untitledEditorOption);
         }
-        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4826, "Select where to apply the code block")) }) : options[0];
+        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4839, "Select where to apply the code block")) }) : options[0];
         if (selected) {
             switch (selected.id) {
                 case 'createFile':
@@ -237,7 +237,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                             await this.fileService.writeFile(resource, VSBuffer.fromString(''));
                         }
                         catch (error) {
-                            this.notify(( localize(4827, "Failed to create file: {0}", error.message)));
+                            this.notify(( localize(4840, "Failed to create file: {0}", error.message)));
                             return ( URI.from({ scheme: 'untitled', path: resource.path }));
                         }
                     }
@@ -252,21 +252,21 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, chatSessionResource, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4828, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4841, "Cannot apply code block to read-only notebook editor.")));
             return undefined;
         }
         const uri = notebookEditor.textModel.uri;
         const codeBlock = { code, resource: uri, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4829, "No code mapper available.")));
+            this.notify(( localize(4842, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
         const cancellationTokenSource = ( new CancellationTokenSource());
         try {
             const iterable = await this.progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
-                progress.report({ message: ( localize(4830, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4843, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getNotebookEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
@@ -274,7 +274,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4831, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4844, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -288,20 +288,20 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
     async handleTextEditor(codeEditor, chatSessionResource, code, applyCodeBlockSuggestionId) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4832, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4845, "Cannot apply code block to read-only file.")));
             return undefined;
         }
         const codeBlock = { code, resource: activeModel.uri, chatSessionResource, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4829, "No code mapper available.")));
+            this.notify(( localize(4842, "No code mapper available.")));
             return undefined;
         }
         let editsProposed = false;
         const cancellationTokenSource = ( new CancellationTokenSource());
         try {
             const iterable = await this.progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
-                progress.report({ message: ( localize(4830, "Applying code block using {0}...", codeMapper)) });
+                progress.report({ message: ( localize(4843, "Applying code block using {0}...", codeMapper)) });
                 const editsIterable = this.getTextEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
@@ -309,7 +309,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4831, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4844, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.js

@@ -1,77 +1,45 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { AGENT_SESSIONS_VIEW_CONTAINER_ID, AGENT_SESSIONS_VIEW_ID, AgentSessionsViewerOrientation, AgentSessionsViewerPosition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { AgentSessionsViewerOrientation, AgentSessionsViewerPosition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import './agentSessionsService.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { AgentSessionsView } from './agentSessionsView.js';
-import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { LocalAgentsSessionsProvider } from './localAgentSessionsProvider.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { registerAction2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { ArchiveAgentSessionAction, UnarchiveAgentSessionAction, MarkAgentSessionUnreadAction, MarkAgentSessionReadAction, OpenAgentSessionInNewWindowAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, RefreshAgentSessionsViewAction, FindAgentSessionAction, RefreshAgentSessionsViewerAction, FindAgentSessionInViewerAction, ShowAgentSessionsSidebar, HideAgentSessionsSidebar } from './agentSessionsActions.js';
+import { FocusAgentSessionsAction, PickAgentSessionAction, ArchiveAllAgentSessionsAction, ArchiveAgentSessionSectionAction, ArchiveAgentSessionAction, UnarchiveAgentSessionAction, RenameAgentSessionAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, MarkAgentSessionUnreadAction, MarkAgentSessionReadAction, OpenAgentSessionInNewWindowAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, RefreshAgentSessionsViewerAction, FindAgentSessionInViewerAction, ShowAgentSessionsSidebar, HideAgentSessionsSidebar, ToggleAgentSessionsSidebar, ToggleChatViewSessionsAction, SetAgentSessionsOrientationStackedAction, SetAgentSessionsOrientationSideBySideAction } from './agentSessionsActions.js';
+import { AGENT_SESSIONS_QUICK_ACCESS_PREFIX, AgentSessionsQuickAccessProvider } from './agentSessionsQuickAccess.js';
 
-const chatAgentsIcon = registerIcon('chat-sessions-icon', Codicon.commentDiscussionSparkle, 'Icon for Agent Sessions View');
-const AGENT_SESSIONS_VIEW_TITLE = ( localize2(4833, "Agents"));
-const agentSessionsViewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
-    id: AGENT_SESSIONS_VIEW_CONTAINER_ID,
-    title: AGENT_SESSIONS_VIEW_TITLE,
-    icon: chatAgentsIcon,
-    ctorDescriptor: ( new SyncDescriptor(
-        ViewPaneContainer,
-        [AGENT_SESSIONS_VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]
-    )),
-    storageId: AGENT_SESSIONS_VIEW_CONTAINER_ID,
-    hideIfEmpty: true,
-    order: 6,
-}, ViewContainerLocation.AuxiliaryBar);
-const agentSessionsViewDescriptor = {
-    id: AGENT_SESSIONS_VIEW_ID,
-    containerIcon: chatAgentsIcon,
-    containerTitle: AGENT_SESSIONS_VIEW_TITLE.value,
-    singleViewPaneContainerTitle: AGENT_SESSIONS_VIEW_TITLE.value,
-    name: AGENT_SESSIONS_VIEW_TITLE,
-    canToggleVisibility: false,
-    canMoveView: true,
-    openCommandActionDescriptor: {
-        id: AGENT_SESSIONS_VIEW_ID,
-        title: AGENT_SESSIONS_VIEW_TITLE
-    },
-    ctorDescriptor: ( new SyncDescriptor(AgentSessionsView)),
-    when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabled.negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.AgentSessionsViewLocation}`, 'single-view'))))
-};
-( Registry.as(Extensions.ViewsRegistry)).registerViews([agentSessionsViewDescriptor], agentSessionsViewContainer);
+registerAction2(FocusAgentSessionsAction);
+registerAction2(PickAgentSessionAction);
+registerAction2(ArchiveAllAgentSessionsAction);
+registerAction2(ArchiveAgentSessionSectionAction);
 registerAction2(ArchiveAgentSessionAction);
 registerAction2(UnarchiveAgentSessionAction);
+registerAction2(RenameAgentSessionAction);
+registerAction2(DeleteAgentSessionAction);
+registerAction2(DeleteAllLocalSessionsAction);
 registerAction2(MarkAgentSessionUnreadAction);
 registerAction2(MarkAgentSessionReadAction);
 registerAction2(OpenAgentSessionInNewWindowAction);
 registerAction2(OpenAgentSessionInEditorGroupAction);
 registerAction2(OpenAgentSessionInNewEditorGroupAction);
-registerAction2(RefreshAgentSessionsViewAction);
-registerAction2(FindAgentSessionAction);
 registerAction2(RefreshAgentSessionsViewerAction);
 registerAction2(FindAgentSessionInViewerAction);
 registerAction2(ShowAgentSessionsSidebar);
 registerAction2(HideAgentSessionsSidebar);
-MenuRegistry.appendMenuItem(MenuId.AgentSessionsViewTitle, {
-    submenu: MenuId.AgentSessionsFilterSubMenu,
-    title: ( localize2(4834, "Filter Agent Sessions")),
-    group: 'navigation',
-    order: 100,
-    icon: Codicon.filter
-});
+registerAction2(ToggleAgentSessionsSidebar);
+registerAction2(ToggleChatViewSessionsAction);
+registerAction2(SetAgentSessionsOrientationStackedAction);
+registerAction2(SetAgentSessionsOrientationSideBySideAction);
 MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
     submenu: MenuId.AgentSessionsViewerFilterSubMenu,
-    title: ( localize2(4834, "Filter Agent Sessions")),
+    title: ( localize2(4846, "Filter Agent Sessions")),
     group: 'navigation',
     order: 3,
     icon: Codicon.filter,
@@ -125,7 +93,7 @@ MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     },
     group: 'navigation',
     order: 1,
-    when: ( ContextKeyExpr.and(( ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked)), ( ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Left))))
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ChatContextKeys.agentSessionsViewerVisible.negate()), ( ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked)))), ( ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Left))))
 });
 MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     command: {
@@ -135,6 +103,16 @@ MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     },
     group: 'navigation',
     order: 1,
-    when: ( ContextKeyExpr.and(( ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked)), ( ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Right))))
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ChatContextKeys.agentSessionsViewerVisible.negate()), ( ChatContextKeys.agentSessionsViewerOrientation.isEqualTo(AgentSessionsViewerOrientation.Stacked)))), ( ChatContextKeys.agentSessionsViewerPosition.isEqualTo(AgentSessionsViewerPosition.Right))))
+});
+( Registry.as(Extensions.Quickaccess)).registerQuickAccessProvider({
+    ctor: AgentSessionsQuickAccessProvider,
+    prefix: AGENT_SESSIONS_QUICK_ACCESS_PREFIX,
+    contextKey: 'inAgentSessionsPicker',
+    placeholder: ( localize(4847, "Search agent sessions by name")),
+    helpEntries: [{
+            description: ( localize(4848, "Show All Agent Sessions")),
+            commandId: 'workbench.action.chat.history',
+        }]
 });
 registerWorkbenchContribution2(LocalAgentsSessionsProvider.ID, LocalAgentsSessionsProvider, WorkbenchPhase.AfterRestored);