@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -3,89 +3,113 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { DisposableStore, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { truncate } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { 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 '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { VIEWLET_ID, ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { VIEWLET_ID } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/chatSessions';
+import { NEW_CHAT_SESSION_ACTION_ID } from './chatSessions/common.js';
 
-const CODING_AGENT_DOCS = 'https://code.visualstudio.com/docs/copilot/copilot-coding-agent';
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatSessions',
     jsonSchema: {
-        description: ( localize(5169, 'Contributes chat session integrations to the chat widget.')),
+        description: ( localize(5221, 'Contributes chat session integrations to the chat widget.')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 type: {
-                    description: ( localize(5170, 'Unique identifier for the type of chat session.')),
+                    description: ( localize(5222, 'Unique identifier for the type of chat session.')),
                     type: 'string',
                 },
                 name: {
-                    description: ( localize(5171, 'Name shown in the chat widget. (eg: @agent)')),
+                    description: ( localize(5223, 'Name shown in the chat widget. (eg: @agent)')),
                     type: 'string',
                 },
                 displayName: {
-                    description: ( localize(5172, 'A longer name for this item which is used for display in menus.')),
+                    description: ( localize(5224, 'A longer name for this item which is used for display in menus.')),
                     type: 'string',
                 },
                 description: {
-                    description: ( localize(5173, 'Description of the chat session for use in menus and tooltips.')),
+                    description: ( localize(5225, 'Description of the chat session for use in menus and tooltips.')),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(5174, 'Condition which must be true to show this item.')),
+                    description: ( localize(5226, 'Condition which must be true to show this item.')),
                     type: 'string'
                 },
                 capabilities: {
-                    description: ( localize(5175, 'Optional capabilities for this chat session.')),
+                    description: ( localize(5227, 'Optional capabilities for this chat session.')),
                     type: 'object',
                     properties: {
                         supportsFileAttachments: {
                             description: ( localize(
-                                5176,
+                                5228,
                                 'Whether this chat session supports attaching files or file references.'
                             )),
                             type: 'boolean'
                         },
                         supportsToolAttachments: {
                             description: ( localize(
-                                5177,
+                                5229,
                                 'Whether this chat session supports attaching tools or tool references.'
                             )),
                             type: 'boolean'
                         }
                     }
+                },
+                commands: {
+                    markdownDescription: ( localize(
+                        5230,
+                        "Commands available for this chat session, which the user can invoke with a `/`."
+                    )),
+                    type: 'array',
+                    items: {
+                        additionalProperties: false,
+                        type: 'object',
+                        defaultSnippets: [{ body: { name: '', description: '' } }],
+                        required: ['name'],
+                        properties: {
+                            name: {
+                                description: ( localize(
+                                    5231,
+                                    "A short name by which this command is referred to in the UI, e.g. `fix` or `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."
+                                )),
+                                type: 'string'
+                            },
+                            description: {
+                                description: ( localize(5232, "A description of this command.")),
+                                type: 'string'
+                            },
+                            when: {
+                                description: ( localize(5233, "A condition which must be true to enable this command.")),
+                                type: 'string'
+                            },
+                        }
+                    }
                 }
             },
             required: ['type', 'name', 'displayName', 'description'],
         }
     },
-    activationEventsGenerator: (contribs, results) => {
+    activationEventsGenerator: function* (contribs) {
         for (const contrib of contribs) {
-            results.push(`onChatSession:${contrib.type}`);
+            yield `onChatSession:${contrib.type}`;
         }
     }
 });
@@ -106,10 +130,9 @@ class ContributedChatSessionData {
 }
 let ChatSessionsService = class ChatSessionsService extends Disposable {
     get onDidChangeInProgress() { return this._onDidChangeInProgress.event; }
-    constructor(_logService, _instantiationService, _chatAgentService, _extensionService, _contextKeyService) {
+    constructor(_logService, _chatAgentService, _extensionService, _contextKeyService) {
         super();
         this._logService = _logService;
-        this._instantiationService = _instantiationService;
         this._chatAgentService = _chatAgentService;
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
@@ -145,6 +168,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                         when: contribution.when,
                         capabilities: contribution.capabilities,
                         extensionDescription: ext.description,
+                        commands: contribution.commands
                     };
                     this._register(this.registerContribution(c));
                 }
@@ -221,9 +245,13 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
     _registerMenuItems(contribution) {
         return MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
             command: {
-                id: `workbench.action.chat.openNewSessionEditor.${contribution.type}`,
-                title: ( localize(5178, "New {0} Chat Editor", contribution.displayName)),
+                id: `${NEW_CHAT_SESSION_ACTION_ID}.${contribution.type}`,
+                title: ( localize(5234, "New {0} Chat Editor", contribution.displayName)),
                 icon: Codicon.plus,
+                source: {
+                    id: contribution.extensionDescription.identifier.value,
+                    title: contribution.extensionDescription.displayName || contribution.extensionDescription.name,
+                }
             },
             group: 'navigation',
             order: 1,
@@ -235,7 +263,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             constructor() {
                 super({
                     id: `workbench.action.chat.openNewSessionEditor.${contribution.type}`,
-                    title: ( localize2(5178, "New {0} Chat Editor", contribution.displayName)),
+                    title: ( localize2(5234, "New {0} Chat Editor", contribution.displayName)),
                     category: CHAT_CATEGORY,
                     icon: Codicon.plus,
                     f1: true,
@@ -251,8 +279,9 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
                         override: ChatEditorInput.EditorID,
                         pinned: true,
                     };
+                    const untitledId = `untitled-${generateUuid()}`;
                     await editorService.openEditor({
-                        resource: ChatEditorInput.getNewEditorUri().with({ query: `chatSessionType=${type}` }),
+                        resource: ChatSessionUri.forSession(type, untitledId),
                         options,
                     });
                 }
@@ -294,7 +323,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
     _enableContribution(contribution) {
         const disposableStore = ( new DisposableStore());
         this._disposableStores.set(contribution.type, disposableStore);
-        disposableStore.add(this._registerDynamicAgent(contribution));
+        disposableStore.add(this._registerAgent(contribution));
         disposableStore.add(this._registerCommands(contribution));
         disposableStore.add(this._registerMenuItems(contribution));
     }
@@ -315,7 +344,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             }
         }
     }
-    _registerDynamicAgent(contribution) {
+    _registerAgent(contribution) {
         const { type: id, name, displayName, description, extensionDescription } = contribution;
         const { identifier: extensionId, name: extensionName, displayName: extensionDisplayName, publisher: extensionPublisherId } = extensionDescription;
         const agentData = {
@@ -326,8 +355,8 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             isDefault: false,
             isCore: false,
             isDynamic: true,
-            slashCommands: [],
-            locations: [ChatAgentLocation.Panel],
+            slashCommands: contribution.commands ?? [],
+            locations: [ChatAgentLocation.Chat],
             modes: [ChatModeKind.Agent, ChatModeKind.Ask],
             disambiguation: [],
             metadata: {
@@ -340,9 +369,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
             extensionDisplayName: extensionDisplayName || extensionName,
             extensionPublisherId,
         };
-        const agentImpl = this._instantiationService.createInstance(CodingAgentChatImplementation, contribution);
-        const disposable = this._chatAgentService.registerDynamicAgent(agentData, agentImpl);
-        return disposable;
+        return this._chatAgentService.registerAgent(id, agentData);
     }
     getAllChatSessionContributions() {
         return Array.from(( this._contributions.values())).filter(contribution => this._isContributionAvailable(contribution));
@@ -379,7 +406,7 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
     }
     async provideChatSessionItems(chatSessionType, token) {
         if (!(await this.canResolveItemProvider(chatSessionType))) {
-            throw Error(`Can not find provider for ${chatSessionType}`);
+            return [];
         }
         const provider = this._itemsProviders.get(chatSessionType);
         if (provider?.provideChatSessionItems) {
@@ -479,115 +506,9 @@ let ChatSessionsService = class ChatSessionsService extends Disposable {
 };
 ChatSessionsService = ( __decorate([
     ( __param(0, ILogService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IChatAgentService)),
-    ( __param(3, IExtensionService)),
-    ( __param(4, IContextKeyService))
+    ( __param(1, IChatAgentService)),
+    ( __param(2, IExtensionService)),
+    ( __param(3, IContextKeyService))
 ], ChatSessionsService));
-let CodingAgentChatImplementation = class CodingAgentChatImplementation extends Disposable {
-    constructor(chatSession, chatService, chatWidgetService, editorGroupService, chatSessionService, editorService, logService) {
-        super();
-        this.chatSession = chatSession;
-        this.chatService = chatService;
-        this.chatWidgetService = chatWidgetService;
-        this.editorGroupService = editorGroupService;
-        this.chatSessionService = chatSessionService;
-        this.editorService = editorService;
-        this.logService = logService;
-    }
-    async invoke(request, progress, history, token) {
-        const widget = this.chatWidgetService.getWidgetBySessionId(request.sessionId);
-        if (!widget) {
-            return {};
-        }
-        let chatSession;
-        for (const group of this.editorGroupService.groups) {
-            if (chatSession) {
-                break;
-            }
-            for (const editor of group.editors) {
-                if (editor instanceof ChatEditorInput) {
-                    try {
-                        const chatModel = await this.chatService.loadSessionForResource(editor.resource, request.location, CancellationToken.None);
-                        if (chatModel?.sessionId === request.sessionId) {
-                            const identifier = ChatSessionUri.parse(editor.resource);
-                            if (identifier) {
-                                chatSession = await this.chatSessionService.provideChatSessionContent(this.chatSession.type, identifier.sessionId, token);
-                            }
-                            break;
-                        }
-                    }
-                    catch (error) {
-                    }
-                }
-            }
-        }
-        if (chatSession?.requestHandler) {
-            await chatSession.requestHandler(request, progress, history, token);
-        }
-        else {
-            try {
-                const chatSessionItem = await this.chatSessionService.provideNewChatSessionItem(this.chatSession.type, {
-                    request,
-                    prompt: request.message,
-                    history,
-                }, token);
-                const options = {
-                    pinned: true,
-                    preferredTitle: truncate(chatSessionItem.label, 30),
-                };
-                await this.chatSessionService.provideChatSessionContent(this.chatSession.type, chatSessionItem.id, token);
-                const activeGroup = this.editorGroupService.activeGroup;
-                const currentEditor = activeGroup?.activeEditor;
-                if (currentEditor instanceof ChatEditorInput) {
-                    await this.editorService.replaceEditors([{
-                            editor: currentEditor,
-                            replacement: {
-                                resource: ChatSessionUri.forSession(this.chatSession.type, chatSessionItem.id),
-                                options,
-                            }
-                        }], activeGroup);
-                }
-                else {
-                    await this.editorService.openEditor({
-                        resource: ChatSessionUri.forSession(this.chatSession.type, chatSessionItem.id),
-                        options,
-                    });
-                    progress([{
-                            kind: 'markdownContent',
-                            content: ( new MarkdownString(( localize(
-                                5179,
-                                'Continue **{0}** in a new chat editor',
-                                truncate(chatSessionItem.label, 30)
-                            )))),
-                        }]);
-                }
-            }
-            catch (error) {
-                this.logService.error(`Failed to create new chat session for type '${this.chatSession.type}'`, error);
-                const content = this.chatSession.type === 'copilot-swe-agent'
-                    ? ( new MarkdownString(( localize(
-                    5180,
-                    "Failed to create chat session. Use `#copilotCodingAgent` to begin a new [coding agent session]({0}).",
-                    CODING_AGENT_DOCS
-                ))))
-                    : ( new MarkdownString(( localize(5181, "Failed to create chat session. Please try again later."))));
-                progress([{
-                        kind: 'markdownContent',
-                        content,
-                    }]);
-            }
-        }
-        return {};
-    }
-};
-CodingAgentChatImplementation = ( __decorate([
-    ( __param(1, IChatService)),
-    ( __param(2, IChatWidgetService)),
-    ( __param(3, IEditorGroupsService)),
-    ( __param(4, IChatSessionsService)),
-    ( __param(5, IEditorService)),
-    ( __param(6, ILogService))
-], CodingAgentChatImplementation));
 
 export { ChatSessionsService };

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

@@ -9,9 +9,11 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IWorkbenchExtensionEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service";
+import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
-import { ChatEntitlementService } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 export declare class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
     private readonly productService;
     private readonly instantiationService;
@@ -19,11 +21,17 @@ export declare class ChatSetupContribution extends Disposable implements IWorkbe
     private readonly telemetryService;
     private readonly logService;
     private readonly contextKeyService;
+    private readonly extensionEnablementService;
+    private readonly extensionsWorkbenchService;
+    private readonly extensionService;
+    private readonly environmentService;
+    private readonly configurationService;
     static readonly ID = "workbench.contrib.chatSetup";
-    constructor(productService: IProductService, instantiationService: IInstantiationService, commandService: ICommandService, telemetryService: ITelemetryService, chatEntitlementService: ChatEntitlementService, logService: ILogService, contextKeyService: IContextKeyService);
+    constructor(productService: IProductService, instantiationService: IInstantiationService, commandService: ICommandService, telemetryService: ITelemetryService, chatEntitlementService: ChatEntitlementService, logService: ILogService, contextKeyService: IContextKeyService, extensionEnablementService: IWorkbenchExtensionEnablementService, extensionsWorkbenchService: IExtensionsWorkbenchService, extensionService: IExtensionService, environmentService: IEnvironmentService, configurationService: IConfigurationService);
     private registerSetupAgents;
     private registerActions;
     private registerUrlLinkHandler;
+    private checkExtensionInstallation;
 }
 export declare class ChatTeardownContribution extends Disposable implements IWorkbenchContribution {
     private readonly configurationService;