@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -15,11 +15,11 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtensionEditorTab } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
-import { McpCommandIds } from '@codingame/monaco-vscode-37b3b402-09f5-5f69-89ef-ce30559f63cc-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
+import { McpCommandIds } from '@codingame/monaco-vscode-7b19b93e-7a49-5c48-81f5-091a64f468d2-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 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-37b3b402-09f5-5f69-89ef-ce30559f63cc-common/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-7b19b93e-7a49-5c48-81f5-091a64f468d2-common/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';
@@ -77,7 +77,7 @@ function createToolSetTreeItem(toolset, checked, editorService) {
         const resource = toolset.source.file;
         buttons.push({
             iconClass: ThemeIcon.asClassName(Codicon.edit),
-            tooltip: ( localize(4744, "Edit Tool Set")),
+            tooltip: ( localize(4775, "Edit Tool Set")),
             action: () => editorService.openEditor({ resource })
         });
     }
@@ -158,14 +158,14 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                 if (collection?.source) {
                     buttons.push({
                         iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
-                        tooltip: ( localize(4745, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4776, "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(4745, "Configure {0}", collection.label)),
+                        tooltip: ( localize(4776, "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(4746, "Show Output")),
+                        tooltip: ( localize(4777, "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(4747, "Update Tools")),
+                        label: ( localize(4778, "Update Tools")),
                         pickable: false,
                         run: () => {
                             treePicker.busy = true;
@@ -208,15 +208,16 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.Mcp,
                     id: key,
-                    label: ( localize(4748, "MCP Server: {0}", source.label)),
+                    label: source.label,
                     checked: undefined,
                     collapsed,
                     children,
                     buttons,
+                    sortOrder: 2,
                 };
-                const iconURI = mcpServer.serverMetadata.get()?.icons.getUrl(22);
-                if (iconURI) {
-                    bucket.iconPath = { dark: iconURI, light: iconURI };
+                const iconPath = mcpServer.serverMetadata.get()?.icons.getUrl(22);
+                if (iconPath) {
+                    bucket.iconPath = iconPath;
                 }
                 else {
                     bucket.iconClass = ThemeIcon.asClassName(Codicon.mcp);
@@ -228,12 +229,13 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.Extension,
                     id: key,
-                    label: ( localize(4749, 'Extension: {0}', source.label)),
+                    label: source.label,
                     checked: undefined,
                     children: [],
                     buttons: [],
                     collapsed: true,
-                    iconClass: ThemeIcon.asClassName(Codicon.extensions)
+                    iconClass: ThemeIcon.asClassName(Codicon.extensions),
+                    sortOrder: 3,
                 };
             }
             else if (source.type === 'internal') {
@@ -241,11 +243,12 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.BuiltIn,
                     id: key,
-                    label: ( localize(4750, "Built-In")),
+                    label: ( localize(4779, "Built-In")),
                     checked: undefined,
                     children: [],
                     buttons: [],
-                    collapsed: false
+                    collapsed: false,
+                    sortOrder: 1,
                 };
             }
             else {
@@ -253,11 +256,12 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                     itemType: 'bucket',
                     ordinal: BucketOrdinal.User,
                     id: key,
-                    label: ( localize(4751, "User Defined Tool Sets")),
+                    label: ( localize(4780, "User Defined Tool Sets")),
                     checked: undefined,
                     children: [],
                     buttons: [],
-                    collapsed: true
+                    collapsed: true,
+                    sortOrder: 4,
                 };
             }
         };
@@ -319,10 +323,23 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
                 getBucket({ type: 'mcp', definitionId: server.definition.id, label: server.definition.label, instructions: '', serverLabel: '', collectionId: server.collection.id });
             }
         }
-        const sortedBuckets = Array.from(( bucketMap.values())).sort((a, b) => a.ordinal - b.ordinal);
-        treeItems.push(...sortedBuckets);
+        const sortedBuckets = Array.from(( bucketMap.values())).sort((a, b) => {
+            if (a.sortOrder !== b.sortOrder) {
+                return a.sortOrder - b.sortOrder;
+            }
+            return a.label.localeCompare(b.label);
+        });
+        for (const bucket of sortedBuckets) {
+            treeItems.push(bucket);
+            bucket.children.sort((a, b) => a.label.localeCompare(b.label));
+            for (const child of bucket.children) {
+                if (isToolSetTreeItem(child) && child.children) {
+                    child.children.sort((a, b) => a.label.localeCompare(b.label));
+                }
+            }
+        }
         if (treeItems.length === 0) {
-            treePicker.placeholder = ( localize(4752, "Add tools to chat"));
+            treePicker.placeholder = ( localize(4781, "Add tools to chat"));
         }
         else {
             treePicker.placeholder = placeHolder;
@@ -336,6 +353,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
     treePicker.description = description;
     treePicker.matchOnDescription = true;
     treePicker.matchOnLabel = true;
+    treePicker.sortByLabel = false;
     computeItems();
     store.add(treePicker.onDidTriggerItemButton(e => {
         if (e.button && typeof e.button.action === 'function') {
@@ -362,7 +380,7 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
             if (count > toolLimit) {
                 treePicker.severity = Severity.Warning;
                 treePicker.validationMessage = ( localize(
-                    4753,
+                    4782,
                     "{0} tools are enabled. You may experience degraded tool calling above {1} tools.",
                     count,
                     markdownCommandLink({ title: String(toolLimit), id: '_chat.toolPicker.closeAndOpenVirtualThreshold' })
@@ -425,17 +443,17 @@ async function showToolsPicker(accessor, placeHolder, description, getToolsEntri
     }));
     const addMcpServerButton = {
         iconClass: ThemeIcon.asClassName(Codicon.mcp),
-        tooltip: ( localize(4754, 'Add MCP Server...'))
+        tooltip: ( localize(4783, 'Add MCP Server...'))
     };
     const installExtension = {
         iconClass: ThemeIcon.asClassName(Codicon.extensions),
-        tooltip: ( localize(4755, 'Install Extension...'))
+        tooltip: ( localize(4784, 'Install Extension...'))
     };
     const configureToolSets = {
         iconClass: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(4756, 'Configure Tool Sets...'))
+        tooltip: ( localize(4785, 'Configure Tool Sets...'))
     };
-    treePicker.title = ( localize(4757, "Configure Tools"));
+    treePicker.title = ( localize(4786, "Configure Tools"));
     treePicker.buttons = [addMcpServerButton, installExtension, configureToolSets];
     store.add(treePicker.onDidTriggerButton(button => {
         if (button === addMcpServerButton) {

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

@@ -14,7 +14,7 @@ import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/
 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-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { ICodeBlockActionContext } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
 export declare class InsertCodeBlockOperation {
     private readonly editorService;
     private readonly textFileService;

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

@@ -28,12 +28,13 @@ 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 { reviewEdits, reviewNotebookEdits } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { insertCell } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
+import { insertCell } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { isResponseVM, isRequestVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 
 let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     constructor(editorService, textFileService, bulkEditService, codeEditorService, chatService, languageService, dialogService, aiEditTelemetryService) {
@@ -58,7 +59,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
             }
             else {
                 this.notify(( localize(
-                    4758,
+                    4787,
                     "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 +92,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     }
     async handleNotebookEditor(notebookEditor, codeBlockContext) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4759, "Cannot insert the code block to read-only notebook editor.")));
+            this.notify(( localize(4788, "Cannot insert the code block to read-only notebook editor.")));
             return false;
         }
         const focusRange = notebookEditor.getFocus();
@@ -102,7 +103,7 @@ let InsertCodeBlockOperation = class InsertCodeBlockOperation {
     async handleTextEditor(codeEditor, codeBlockContext) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4760, "Cannot insert the code block to read-only code editor.")));
+            this.notify(( localize(4789, "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 +157,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                     activeEditorControl = codeEditor;
                 }
                 else {
-                    this.notify(( localize(4761, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
+                    this.notify(( localize(4790, "Failed to open {0} in a code editor.", (codemapperUri.toString()))));
                     return;
                 }
             }
@@ -174,15 +175,15 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         let result = undefined;
         if (activeEditorControl && !this.notebookService.hasSupportedNotebooks(codemapperUri)) {
-            result = await this.handleTextEditor(activeEditorControl, context.chatSessionId, context.code, codeBlockSuggestionId);
+            result = await this.handleTextEditor(activeEditorControl, context.chatSessionResource, context.code, codeBlockSuggestionId);
         }
         else {
             const activeNotebookEditor = getActiveNotebookEditor(this.editorService);
             if (activeNotebookEditor) {
-                result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionId, context.code);
+                result = await this.handleNotebookEditor(activeNotebookEditor, context.chatSessionResource, context.code);
             }
             else {
-                this.notify(( localize(4762, "To apply this code block, open a code or notebook editor.")));
+                this.notify(( localize(4791, "To apply this code block, open a code or notebook editor.")));
             }
         }
         if (isResponseVM(context.element)) {
@@ -205,15 +206,15 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             return resource;
         }
         const activeEditorOption = activeEditorControl?.getModel().uri ? { label: ( localize(
-            4763,
+            4792,
             "Active editor '{0}'",
             this.labelService.getUriLabel(activeEditorControl.getModel().uri, { relative: true })
         )), id: 'activeEditor' } : undefined;
-        const untitledEditorOption = { label: ( localize(4764, "New untitled editor")), id: 'newUntitledFile' };
+        const untitledEditorOption = { label: ( localize(4793, "New untitled editor")), id: 'newUntitledFile' };
         const options = [];
         if (resource) {
             options.push({ label: ( localize(
-                4765,
+                4794,
                 "New file '{0}'",
                 this.labelService.getUriLabel(resource, { relative: true })
             )), id: 'createFile' });
@@ -228,7 +229,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
             options.push(untitledEditorOption);
         }
-        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4766, "Select where to apply the code block")) }) : options[0];
+        const selected = options.length > 1 ? await this.quickInputService.pick(options, { placeHolder: ( localize(4795, "Select where to apply the code block")) }) : options[0];
         if (selected) {
             switch (selected.id) {
                 case 'createFile':
@@ -237,7 +238,7 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
                             await this.fileService.writeFile(resource, VSBuffer.fromString(''));
                         }
                         catch (error) {
-                            this.notify(( localize(4767, "Failed to create file: {0}", error.message)));
+                            this.notify(( localize(4796, "Failed to create file: {0}", error.message)));
                             return ( URI.from({ scheme: 'untitled', path: resource.path }));
                         }
                     }
@@ -250,31 +251,31 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
         }
         return undefined;
     }
-    async handleNotebookEditor(notebookEditor, chatSessionId, code) {
+    async handleNotebookEditor(notebookEditor, chatSessionResource, code) {
         if (notebookEditor.isReadOnly) {
-            this.notify(( localize(4768, "Cannot apply code block to read-only notebook editor.")));
+            this.notify(( localize(4797, "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(4769, "No code mapper available.")));
+            this.notify(( localize(4798, "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(4770, "Applying code block using {0}...", codeMapper)) });
-                const editsIterable = this.getNotebookEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
+                progress.report({ message: ( localize(4799, "Applying code block using {0}...", codeMapper)) });
+                const editsIterable = this.getNotebookEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
             editsProposed = await this.applyNotebookEditsWithInlinePreview(iterable, uri, cancellationTokenSource);
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4771, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4800, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -285,31 +286,31 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             codeMapper
         };
     }
-    async handleTextEditor(codeEditor, chatSessionId, code, applyCodeBlockSuggestionId) {
+    async handleTextEditor(codeEditor, chatSessionResource, code, applyCodeBlockSuggestionId) {
         const activeModel = codeEditor.getModel();
         if (isReadOnly(activeModel, this.textFileService)) {
-            this.notify(( localize(4772, "Cannot apply code block to read-only file.")));
+            this.notify(( localize(4801, "Cannot apply code block to read-only file.")));
             return undefined;
         }
-        const codeBlock = { code, resource: activeModel.uri, chatSessionId, markdownBeforeBlock: undefined };
+        const codeBlock = { code, resource: activeModel.uri, chatSessionResource, markdownBeforeBlock: undefined };
         const codeMapper = this.codeMapperService.providers[0]?.displayName;
         if (!codeMapper) {
-            this.notify(( localize(4769, "No code mapper available.")));
+            this.notify(( localize(4798, "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(4770, "Applying code block using {0}...", codeMapper)) });
-                const editsIterable = this.getTextEdits(codeBlock, chatSessionId, cancellationTokenSource.token);
+                progress.report({ message: ( localize(4799, "Applying code block using {0}...", codeMapper)) });
+                const editsIterable = this.getTextEdits(codeBlock, chatSessionResource, cancellationTokenSource.token);
                 return await this.waitForFirstElement(editsIterable);
             }, () => cancellationTokenSource.cancel());
             editsProposed = await this.applyWithInlinePreview(iterable, codeEditor, cancellationTokenSource, applyCodeBlockSuggestionId);
         }
         catch (e) {
             if (!isCancellationError(e)) {
-                this.notify(( localize(4771, "Failed to apply code block: {0}", e.message)));
+                this.notify(( localize(4800, "Failed to apply code block: {0}", e.message)));
             }
         }
         finally {
@@ -320,11 +321,11 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             codeMapper
         };
     }
-    getTextEdits(codeBlock, chatSessionId, token) {
+    getTextEdits(codeBlock, chatSessionResource, token) {
         return ( new AsyncIterableObject(async (executor) => {
             const request = {
                 codeBlocks: [codeBlock],
-                chatSessionId
+                chatSessionId: chatSessionResource && chatSessionResourceToId(chatSessionResource),
             };
             const response = {
                 textEdit: (target, edit) => {
@@ -339,11 +340,11 @@ let ApplyCodeBlockOperation = class ApplyCodeBlockOperation {
             }
         }));
     }
-    getNotebookEdits(codeBlock, chatSessionId, token) {
+    getNotebookEdits(codeBlock, chatSessionResource, token) {
         return ( new AsyncIterableObject(async (executor) => {
             const request = {
                 codeBlocks: [codeBlock],
-                chatSessionId,
+                chatSessionId: chatSessionResource && chatSessionResourceToId(chatSessionResource),
                 location: 'panel'
             };
             const response = {
@@ -417,7 +418,7 @@ function notifyUserAction(chatService, context, action) {
         chatService.notifyUserAction({
             agentId: context.element.agent?.id,
             command: context.element.slashCommand?.name,
-            sessionId: context.element.sessionId,
+            sessionResource: context.element.sessionResource,
             requestId: context.element.requestId,
             result: context.element.result,
             action

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionViewModel.d.ts

@@ -0,0 +1,53 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ILifecycleService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service";
+import { ChatSessionStatus, IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
+export interface IAgentSessionsViewModel {
+    readonly onWillResolve: Event<void>;
+    readonly onDidResolve: Event<void>;
+    readonly onDidChangeSessions: Event<void>;
+    readonly sessions: IAgentSessionViewModel[];
+    resolve(provider: string | string[] | undefined): Promise<void>;
+}
+export interface IAgentSessionViewModel {
+    readonly provider: IChatSessionItemProvider;
+    readonly providerLabel: string;
+    readonly resource: URI;
+    readonly status?: ChatSessionStatus;
+    readonly tooltip?: string | IMarkdownString;
+    readonly label: string;
+    readonly description: string | IMarkdownString;
+    readonly icon: ThemeIcon;
+    readonly timing: {
+        readonly startTime: number;
+        readonly endTime?: number;
+    };
+    readonly statistics?: {
+        readonly insertions: number;
+        readonly deletions: number;
+    };
+}
+export declare function isLocalAgentSessionItem(session: IAgentSessionViewModel): boolean;
+export declare function isAgentSession(obj: IAgentSessionsViewModel | IAgentSessionViewModel): obj is IAgentSessionViewModel;
+export declare function isAgentSessionsViewModel(obj: IAgentSessionsViewModel | IAgentSessionViewModel): obj is IAgentSessionsViewModel;
+export declare class AgentSessionsViewModel extends Disposable implements IAgentSessionsViewModel {
+    private readonly chatSessionsService;
+    private readonly lifecycleService;
+    readonly sessions: IAgentSessionViewModel[];
+    private readonly _onWillResolve;
+    readonly onWillResolve: Event<void>;
+    private readonly _onDidResolve;
+    readonly onDidResolve: Event<void>;
+    private readonly _onDidChangeSessions;
+    readonly onDidChangeSessions: Event<void>;
+    private readonly resolver;
+    private readonly providersToResolve;
+    constructor(chatSessionsService: IChatSessionsService, lifecycleService: ILifecycleService);
+    private registerListeners;
+    resolve(provider: string | string[] | undefined): Promise<void>;
+    private doResolve;
+}

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

@@ -0,0 +1,154 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
+import { localChatSessionType, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { AgentSessionProviders } from './agentSessions.js';
+
+function isLocalAgentSessionItem(session) {
+    return session.provider.chatSessionType === localChatSessionType;
+}
+function isAgentSession(obj) {
+    const session = obj;
+    return URI.isUri(session?.resource);
+}
+function isAgentSessionsViewModel(obj) {
+    const sessionsViewModel = obj;
+    return Array.isArray(sessionsViewModel?.sessions);
+}
+let AgentSessionsViewModel = class AgentSessionsViewModel extends Disposable {
+    constructor(chatSessionsService, lifecycleService) {
+        super();
+        this.chatSessionsService = chatSessionsService;
+        this.lifecycleService = lifecycleService;
+        this.sessions = [];
+        this._onWillResolve = this._register(( new Emitter()));
+        this.onWillResolve = this._onWillResolve.event;
+        this._onDidResolve = this._register(( new Emitter()));
+        this.onDidResolve = this._onDidResolve.event;
+        this._onDidChangeSessions = this._register(( new Emitter()));
+        this.onDidChangeSessions = this._onDidChangeSessions.event;
+        this.resolver = this._register(( new ThrottledDelayer(100)));
+        this.providersToResolve = ( new Set());
+        this.registerListeners();
+        this.resolve(undefined);
+    }
+    registerListeners() {
+        this._register(this.chatSessionsService.onDidChangeItemsProviders(({ chatSessionType: provider }) => this.resolve(provider)));
+        this._register(this.chatSessionsService.onDidChangeAvailability(() => this.resolve(undefined)));
+        this._register(this.chatSessionsService.onDidChangeSessionItems(provider => this.resolve(provider)));
+    }
+    async resolve(provider) {
+        if (Array.isArray(provider)) {
+            for (const p of provider) {
+                this.providersToResolve.add(p);
+            }
+        }
+        else {
+            this.providersToResolve.add(provider);
+        }
+        return this.resolver.trigger(async (token) => {
+            if (token.isCancellationRequested || this.lifecycleService.willShutdown) {
+                return;
+            }
+            try {
+                this._onWillResolve.fire();
+                return await this.doResolve(token);
+            }
+            finally {
+                this._onDidResolve.fire();
+            }
+        });
+    }
+    async doResolve(token) {
+        const providersToResolve = Array.from(this.providersToResolve);
+        this.providersToResolve.clear();
+        const mapSessionContributionToType = ( new Map());
+        for (const contribution of this.chatSessionsService.getAllChatSessionContributions()) {
+            mapSessionContributionToType.set(contribution.type, contribution);
+        }
+        const newSessions = [];
+        for (const provider of this.chatSessionsService.getAllChatSessionItemProviders()) {
+            if (!providersToResolve.includes(undefined) && !providersToResolve.includes(provider.chatSessionType)) {
+                newSessions.push(...this.sessions.filter(session => session.provider.chatSessionType === provider.chatSessionType));
+                continue;
+            }
+            const sessions = await provider.provideChatSessionItems(token);
+            if (token.isCancellationRequested) {
+                return;
+            }
+            for (const session of sessions) {
+                if (session.id === 'show-history' || session.id === 'workbench.panel.chat.view.copilot') {
+                    continue;
+                }
+                let description;
+                if (session.description) {
+                    description = session.description;
+                }
+                else {
+                    switch (session.status) {
+                        case ChatSessionStatus.InProgress:
+                            description = ( localize(4803, "Working..."));
+                            break;
+                        case ChatSessionStatus.Failed:
+                            description = ( localize(4804, "Failed"));
+                            break;
+                        default:
+                            description = ( localize(4805, "Finished"));
+                            break;
+                    }
+                }
+                let icon;
+                let providerLabel;
+                switch ((provider.chatSessionType)) {
+                    case localChatSessionType:
+                        providerLabel = ( localize(4806, "Local"));
+                        icon = Codicon.window;
+                        break;
+                    case AgentSessionProviders.Background:
+                        providerLabel = ( localize(4807, "Background"));
+                        icon = Codicon.layers;
+                        break;
+                    case AgentSessionProviders.Cloud:
+                        providerLabel = ( localize(4808, "Cloud"));
+                        icon = Codicon.cloud;
+                        break;
+                    default: {
+                        providerLabel = mapSessionContributionToType.get(provider.chatSessionType)?.name ?? provider.chatSessionType;
+                        icon = session.iconPath ?? Codicon.terminal;
+                    }
+                }
+                newSessions.push({
+                    provider,
+                    providerLabel,
+                    resource: session.resource,
+                    label: session.label,
+                    description,
+                    icon,
+                    tooltip: session.tooltip,
+                    status: session.status,
+                    timing: {
+                        startTime: session.timing.startTime,
+                        endTime: session.timing.endTime
+                    },
+                    statistics: session.statistics
+                });
+            }
+        }
+        this.sessions.length = 0;
+        this.sessions.push(...newSessions);
+        this._onDidChangeSessions.fire();
+    }
+};
+AgentSessionsViewModel = ( __decorate([
+    ( __param(0, IChatSessionsService)),
+    ( __param(1, ILifecycleService))
+], AgentSessionsViewModel));
+
+export { AgentSessionsViewModel, isAgentSession, isAgentSessionsViewModel, isLocalAgentSessionItem };

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

@@ -0,0 +1,7 @@
+export declare const AGENT_SESSIONS_VIEW_CONTAINER_ID = "workbench.viewContainer.agentSessions";
+export declare const AGENT_SESSIONS_VIEW_ID = "workbench.view.agentSessions";
+export declare enum AgentSessionProviders {
+    Local = "local",
+    Background = "copilotcli",
+    Cloud = "copilot-cloud-agent"
+}

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

@@ -0,0 +1,13 @@
+
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+
+const AGENT_SESSIONS_VIEW_CONTAINER_ID = 'workbench.viewContainer.agentSessions';
+const AGENT_SESSIONS_VIEW_ID = 'workbench.view.agentSessions';
+var AgentSessionProviders;
+(function (AgentSessionProviders) {
+    AgentSessionProviders["Local"] = "local";
+    AgentSessionProviders["Background"] = "copilotcli";
+    AgentSessionProviders["Cloud"] = "copilot-cloud-agent";
+})(AgentSessionProviders || (AgentSessionProviders = {}));
+
+export { AGENT_SESSIONS_VIEW_CONTAINER_ID, AGENT_SESSIONS_VIEW_ID, AgentSessionProviders };