@codingame/monaco-vscode-chat-service-override 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContributionServiceImpl.js → chatParticipantContributions.js}

@@ -1,9 +1,8 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { DisposableStore, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { DisposableStore, DisposableMap, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
-import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
@@ -11,83 +10,19 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
-import { getHistoryAction, getOpenChatEditorAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { getNewChatAction } from './actions/chatClearActions.js';
-import { getMoveToEditorAction, getMoveToNewWindowAction } from './actions/chatMoveActions.js';
-import { getQuickChatActionForProvider } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
+import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatViewPane, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { IChatContributionService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContributionService.service';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 
-const chatExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
-    extensionPoint: 'interactiveSession',
-    jsonSchema: {
-        description: ( localizeWithPath(
-            'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-            'vscode.extension.contributes.interactiveSession',
-            'Contributes an Interactive Session provider'
-        )),
-        type: 'array',
-        items: {
-            additionalProperties: false,
-            type: 'object',
-            defaultSnippets: [{ body: { id: '', program: '', runtime: '' } }],
-            required: ['id', 'label'],
-            properties: {
-                id: {
-                    description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'vscode.extension.contributes.interactiveSession.id',
-                        "Unique identifier for this Interactive Session provider."
-                    )),
-                    type: 'string'
-                },
-                label: {
-                    description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'vscode.extension.contributes.interactiveSession.label',
-                        "Display name for this Interactive Session provider."
-                    )),
-                    type: 'string'
-                },
-                icon: {
-                    description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'vscode.extension.contributes.interactiveSession.icon',
-                        "An icon for this Interactive Session provider."
-                    )),
-                    type: 'string'
-                },
-                when: {
-                    description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'vscode.extension.contributes.interactiveSession.when',
-                        "A condition which must be true to enable this Interactive Session provider."
-                    )),
-                    type: 'string'
-                },
-            }
-        }
-    },
-    activationEventsGenerator: (contributions, result) => {
-        for (const contrib of contributions) {
-            result.push(`onInteractiveSession:${contrib.id}`);
-        }
-    },
-});
+const _moduleId = "vs/workbench/contrib/chat/browser/chatParticipantContributions";
 const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatParticipants',
     jsonSchema: {
-        description: ( localizeWithPath(
-            'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-            'vscode.extension.contributes.chatParticipant',
-            'Contributes a chat participant'
-        )),
+        description: ( localizeWithPath(_moduleId, 0, 'Contributes a chat participant')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -96,41 +31,33 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ['name', 'id'],
             properties: {
                 id: {
-                    description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatParticipantId',
-                        "A unique id for this chat participant."
-                    )),
+                    description: ( localizeWithPath(_moduleId, 1, "A unique id for this chat participant.")),
                     type: 'string'
                 },
                 name: {
                     description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatParticipantName',
+                        _moduleId,
+                        2,
                         "User-facing display name for this chat participant. The user will use '@' with this name to invoke the participant."
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatParticipantDescription',
-                        "A description of this chat participant, shown in the UI."
-                    )),
+                    description: ( localizeWithPath(_moduleId, 3, "A description of this chat participant, shown in the UI.")),
                     type: 'string'
                 },
                 isDefault: {
                     markdownDescription: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatParticipantIsDefaultDescription',
+                        _moduleId,
+                        4,
                         "**Only** allowed for extensions that have the `defaultChatParticipant` proposal."
                     )),
                     type: 'boolean',
                 },
                 isSticky: {
                     description: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatCommandSticky',
+                        _moduleId,
+                        5,
                         "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."
                     )),
                     type: 'boolean'
@@ -144,8 +71,8 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 commands: {
                     markdownDescription: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatCommandsDescription',
+                        _moduleId,
+                        6,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: 'array',
@@ -157,48 +84,40 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             name: {
                                 description: ( localizeWithPath(
-                                    'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                                    'chatCommand',
+                                    _moduleId,
+                                    7,
                                     "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: ( localizeWithPath(
-                                    'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                                    'chatCommandDescription',
-                                    "A description of this command."
-                                )),
+                                description: ( localizeWithPath(_moduleId, 8, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localizeWithPath(
-                                    'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                                    'chatCommandWhen',
-                                    "A condition which must be true to enable this command."
-                                )),
+                                description: ( localizeWithPath(_moduleId, 9, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                             sampleRequest: {
                                 description: ( localizeWithPath(
-                                    'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                                    'chatCommandSampleRequest',
+                                    _moduleId,
+                                    10,
                                     "When the user clicks this command in `/help`, this text will be submitted to this participant."
                                 )),
                                 type: 'string'
                             },
                             isSticky: {
                                 description: ( localizeWithPath(
-                                    'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                                    'chatCommandSticky',
+                                    _moduleId,
+                                    5,
                                     "Whether invoking the command puts the chat into a persistent mode, where the command is automatically added to the chat input for the next message."
                                 )),
                                 type: 'boolean'
                             },
                             defaultImplicitVariables: {
                                 markdownDescription: ( localizeWithPath(
-                                    'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                                    'defaultImplicitVariables',
+                                    _moduleId,
+                                    11,
                                     "**Only** allowed for extensions that have the `chatParticipantAdditions` proposal. The names of the variables that are invoked by default"
                                 )),
                                 type: 'array',
@@ -210,11 +129,7 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                     }
                 },
                 locations: {
-                    markdownDescription: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-                        'chatLocationsDescription',
-                        "Locations in which this chat participant is available."
-                    )),
+                    markdownDescription: ( localizeWithPath(_moduleId, 12, "Locations in which this chat participant is available.")),
                     type: 'array',
                     default: ['panel'],
                     items: {
@@ -233,15 +148,13 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
 });
 let ChatExtensionPointHandler = class ChatExtensionPointHandler {
     static { this.ID = 'workbench.contrib.chatExtensionPointHandler'; }
-    constructor(_chatContributionService, _chatAgentService, productService, contextService, logService) {
-        this._chatContributionService = _chatContributionService;
+    constructor(_chatAgentService, productService, contextService, logService) {
         this._chatAgentService = _chatAgentService;
         this.productService = productService;
         this.contextService = contextService;
         this.logService = logService;
-        this.disposables = ( new DisposableStore());
-        this._registrationDisposables = ( new Map());
-        this._participantRegistrationDisposables = ( new DisposableMap());
+        this.disposables = ( (new DisposableStore()));
+        this._participantRegistrationDisposables = ( (new DisposableMap()));
         this._viewContainer = this.registerViewContainer();
         this.registerListeners();
         this.handleAndRegisterChatExtensions();
@@ -252,26 +165,22 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                 return;
             }
             const showWelcomeViewConfigKey = 'workbench.chat.experimental.showWelcomeView';
-            const keys = ( new Set([showWelcomeViewConfigKey]));
+            const keys = ( (new Set([showWelcomeViewConfigKey])));
             if (e.affectsSome(keys)) {
-                const contextKeyExpr = ( ContextKeyExpr.equals(showWelcomeViewConfigKey, true));
-                const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
+                const contextKeyExpr = ( (ContextKeyExpr.equals(showWelcomeViewConfigKey, true)));
+                const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
                 if (this.contextService.contextMatchesRules(contextKeyExpr)) {
-                    const viewId = this._chatContributionService.getViewIdForProvider(this.productService.chatWelcomeView.welcomeViewId);
                     this._welcomeViewDescriptor = {
-                        id: viewId,
+                        id: CHAT_VIEW_ID,
                         name: { original: this.productService.chatWelcomeView.welcomeViewTitle, value: this.productService.chatWelcomeView.welcomeViewTitle },
                         containerIcon: this._viewContainer.icon,
-                        ctorDescriptor: ( new SyncDescriptor(
-                            ChatViewPane,
-                            [{ providerId: this.productService.chatWelcomeView.welcomeViewId }]
-                        )),
+                        ctorDescriptor: ( (new SyncDescriptor(ChatViewPane))),
                         canToggleVisibility: false,
                         canMoveView: true,
                         order: 100
                     };
                     viewsRegistry.registerViews([this._welcomeViewDescriptor], this._viewContainer);
-                    viewsRegistry.registerViewWelcomeContent(viewId, {
+                    viewsRegistry.registerViewWelcomeContent(CHAT_VIEW_ID, {
                         content: this.productService.chatWelcomeView.welcomeViewContent,
                     });
                 }
@@ -282,26 +191,6 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         }, null, this.disposables);
     }
     handleAndRegisterChatExtensions() {
-        chatExtensionPoint.setHandler((extensions, delta) => {
-            for (const extension of delta.added) {
-                const extensionDisposable = ( new DisposableStore());
-                for (const providerDescriptor of extension.value) {
-                    this.registerChatProvider(providerDescriptor);
-                    this._chatContributionService.registerChatProvider(providerDescriptor);
-                }
-                this._registrationDisposables.set(extension.description.identifier.value, extensionDisposable);
-            }
-            for (const extension of delta.removed) {
-                const registration = this._registrationDisposables.get(extension.description.identifier.value);
-                if (registration) {
-                    registration.dispose();
-                    this._registrationDisposables.delete(extension.description.identifier.value);
-                }
-                for (const providerDescriptor of extension.value) {
-                    this._chatContributionService.deregisterChatProvider(providerDescriptor.id);
-                }
-            }
-        });
         chatParticipantExtensionPoint.setHandler((extensions, delta) => {
             for (const extension of delta.added) {
                 for (const providerDescriptor of extension.value) {
@@ -317,8 +206,15 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant without both id and name.`);
                         continue;
                     }
-                    this._participantRegistrationDisposables.set(getParticipantKey(extension.description.identifier, providerDescriptor.name), this._chatAgentService.registerAgent(providerDescriptor.id, {
+                    const store = ( (new DisposableStore()));
+                    if (providerDescriptor.isDefault && (!providerDescriptor.locations || providerDescriptor.locations?.includes(ChatAgentLocation.Panel))) {
+                        store.add(this.registerDefaultParticipantView(providerDescriptor));
+                    }
+                    store.add(this._chatAgentService.registerAgent(providerDescriptor.id, {
                         extensionId: extension.description.identifier,
+                        extensionPublisherDisplayName: extension.description.publisherDisplayName ?? extension.description.publisher,
+                        extensionPublisherId: extension.description.publisher,
+                        extensionDisplayName: extension.description.displayName ?? extension.description.name,
                         id: providerDescriptor.id,
                         description: providerDescriptor.description,
                         metadata: {
@@ -328,10 +224,11 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         isDefault: providerDescriptor.isDefault,
                         defaultImplicitVariables: providerDescriptor.defaultImplicitVariables,
                         locations: isNonEmptyArray(providerDescriptor.locations) ?
-                            ( providerDescriptor.locations.map(ChatAgentLocation.fromRaw)) :
+                            ( (providerDescriptor.locations.map(ChatAgentLocation.fromRaw))) :
                             [ChatAgentLocation.Panel],
                         slashCommands: providerDescriptor.commands ?? []
                     }));
+                    this._participantRegistrationDisposables.set(getParticipantKey(extension.description.identifier, providerDescriptor.id), store);
                 }
             }
             for (const extension of delta.removed) {
@@ -342,84 +239,48 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         });
     }
     registerViewContainer() {
-        const title = ( localize2WithPath(
-            'vs/workbench/contrib/chat/browser/chatContributionServiceImpl',
-            'chat.viewContainer.label',
-            "Chat"
-        ));
+        const title = ( localize2WithPath(_moduleId, 13, "Chat"));
         const icon = Codicon.commentDiscussion;
         const viewContainerId = CHAT_SIDEBAR_PANEL_ID;
-        const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
+        const viewContainer = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
             id: viewContainerId,
             title,
             icon,
-            ctorDescriptor: ( new SyncDescriptor(
+            ctorDescriptor: ( (new SyncDescriptor(
                 ViewPaneContainer,
                 [viewContainerId, { mergeViewWithContainerWhenSingleView: true }]
-            )),
+            ))),
             storageId: viewContainerId,
             hideIfEmpty: true,
             order: 100,
         }, 0 );
         return viewContainer;
     }
-    registerChatProvider(providerDescriptor) {
-        const viewId = this._chatContributionService.getViewIdForProvider(providerDescriptor.id);
+    registerDefaultParticipantView(defaultParticipantDescriptor) {
         const viewDescriptor = [{
-                id: viewId,
+                id: CHAT_VIEW_ID,
                 containerIcon: this._viewContainer.icon,
                 containerTitle: this._viewContainer.title.value,
                 singleViewPaneContainerTitle: this._viewContainer.title.value,
-                name: { value: providerDescriptor.label, original: providerDescriptor.label },
+                name: { value: defaultParticipantDescriptor.name, original: defaultParticipantDescriptor.name },
                 canToggleVisibility: false,
                 canMoveView: true,
-                ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ providerId: providerDescriptor.id }])),
-                when: ContextKeyExpr.deserialize(providerDescriptor.when)
+                ctorDescriptor: ( (new SyncDescriptor(ChatViewPane))),
             }];
-        ( Registry.as(Extensions.ViewsRegistry)).registerViews(viewDescriptor, this._viewContainer);
-        const disposables = ( new DisposableStore());
-        disposables.add(registerAction2(getHistoryAction(viewId, providerDescriptor.id)));
-        disposables.add(registerAction2(getNewChatAction(viewId, providerDescriptor.id)));
-        disposables.add(registerAction2(getMoveToEditorAction(viewId, providerDescriptor.id)));
-        disposables.add(registerAction2(getMoveToNewWindowAction(viewId, providerDescriptor.id)));
-        disposables.add(registerAction2(getOpenChatEditorAction(providerDescriptor.id, providerDescriptor.label, providerDescriptor.when)));
-        disposables.add(registerAction2(getQuickChatActionForProvider(providerDescriptor.id, providerDescriptor.label)));
-        return {
-            dispose: () => {
-                ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(viewDescriptor, this._viewContainer);
-                ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(this._viewContainer);
-                disposables.dispose();
-            }
-        };
+        ( (Registry.as(Extensions.ViewsRegistry))).registerViews(viewDescriptor, this._viewContainer);
+        return toDisposable(() => {
+            ( (Registry.as(Extensions.ViewsRegistry))).deregisterViews(viewDescriptor, this._viewContainer);
+        });
     }
 };
-ChatExtensionPointHandler = ( __decorate([
-    ( __param(0, IChatContributionService)),
-    ( __param(1, IChatAgentService)),
-    ( __param(2, IProductService)),
-    ( __param(3, IContextKeyService)),
-    ( __param(4, ILogService))
-], ChatExtensionPointHandler));
-registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, 1 );
+ChatExtensionPointHandler = ( (__decorate([
+    ( (__param(0, IChatAgentService))),
+    ( (__param(1, IProductService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, ILogService)))
+], ChatExtensionPointHandler)));
 function getParticipantKey(extensionId, participantName) {
     return `${extensionId.value}_${participantName}`;
 }
-class ChatContributionService {
-    constructor() {
-        this._registeredProviders = ( new Map());
-    }
-    getViewIdForProvider(providerId) {
-        return ChatViewPane.ID + '.' + providerId;
-    }
-    registerChatProvider(provider) {
-        this._registeredProviders.set(provider.id, provider);
-    }
-    deregisterChatProvider(providerId) {
-        this._registeredProviders.delete(providerId);
-    }
-    get registeredProviders() {
-        return Array.from(( this._registeredProviders.values()));
-    }
-}
 
-export { ChatContributionService, ChatExtensionPointHandler };
+export { ChatExtensionPointHandler };

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

@@ -22,10 +22,11 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import { quickInputForeground, quickInputBackground } from 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 var QuickChat_1;
 let QuickChatService = class QuickChatService extends Disposable {
@@ -38,7 +39,7 @@ let QuickChatService = class QuickChatService extends Disposable {
         this.onDidClose = this._onDidClose.event;
     }
     get enabled() {
-        return this.chatService.getProviderInfos().length > 0;
+        return !!this.chatService.isEnabled(ChatAgentLocation.Panel);
     }
     get focused() {
         const widget = this._input?.widget;
@@ -47,12 +48,12 @@ let QuickChatService = class QuickChatService extends Disposable {
         }
         return isAncestorOfActiveElement(widget);
     }
-    toggle(providerId, options) {
+    toggle(options) {
         if (this.focused && !options?.query) {
             this.close();
         }
         else {
-            this.open(providerId, options);
+            this.open(options);
             if (options?.isPartialQuery) {
                 const disposable = this._store.add(Event.once(this.onDidClose)(() => {
                     this._currentChat?.clearValue();
@@ -61,7 +62,7 @@ let QuickChatService = class QuickChatService extends Disposable {
             }
         }
     }
-    open(providerId, options) {
+    open(options) {
         if (this._input) {
             if (this._currentChat && options?.query) {
                 this._currentChat.focus();
@@ -73,12 +74,6 @@ let QuickChatService = class QuickChatService extends Disposable {
             }
             return this.focus();
         }
-        const providerInfo = providerId
-            ? this.chatService.getProviderInfos().find(info => info.id === providerId)
-            : this.chatService.getProviderInfos()[0];
-        if (!providerInfo) {
-            return;
-        }
         const disposableStore = ( new DisposableStore());
         this._input = this.quickInputService.createQuickWidget();
         this._input.contextKey = 'chatInputVisible';
@@ -88,9 +83,7 @@ let QuickChatService = class QuickChatService extends Disposable {
         this._input.widget = this._container;
         this._input.show();
         if (!this._currentChat) {
-            this._currentChat = this.instantiationService.createInstance(QuickChat, {
-                providerId: providerInfo.id,
-            });
+            this._currentChat = this.instantiationService.createInstance(QuickChat);
             this._currentChat.render(this._container);
         }
         else {
@@ -131,14 +124,13 @@ let QuickChat = class QuickChat extends Disposable {
     static { QuickChat_1 = this; }
     static { this.DEFAULT_MIN_HEIGHT = 200; }
     static { this.DEFAULT_HEIGHT_OFFSET = 100; }
-    constructor(_options, instantiationService, contextKeyService, chatService, _chatWidgetService, layoutService) {
+    constructor(instantiationService, contextKeyService, chatService, layoutService, viewsService) {
         super();
-        this._options = _options;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
         this.chatService = chatService;
-        this._chatWidgetService = _chatWidgetService;
         this.layoutService = layoutService;
+        this.viewsService = viewsService;
         this.maintainScrollTimer = this._register(( new MutableDisposable()));
         this._deferUpdatingDynamicLayout = false;
     }
@@ -180,7 +172,7 @@ let QuickChat = class QuickChat extends Disposable {
     }
     render(parent) {
         if (this.widget) {
-            throw new Error('Cannot render quick chat twice');
+            throw ( new Error('Cannot render quick chat twice'));
         }
         const scopedInstantiationService = this.instantiationService.createChild(( new ServiceCollection([
             IContextKeyService,
@@ -240,14 +232,29 @@ let QuickChat = class QuickChat extends Disposable {
         return this.widget.acceptInput();
     }
     async openChatView() {
-        const widget = await this._chatWidgetService.revealViewForProvider(this._options.providerId);
+        const widget = await showChatView(this.viewsService);
         if (!widget?.viewModel || !this.model) {
             return;
         }
         for (const request of this.model.getRequests()) {
             if (request.response?.response.value || request.response?.result) {
-                this.chatService.addCompleteRequest(widget.viewModel.sessionId, request.message, request.variableData, {
-                    message: request.response.response.value,
+                const message = [];
+                for (const item of request.response.response.value) {
+                    if (item.kind === 'textEditGroup') {
+                        for (const group of item.edits) {
+                            message.push({
+                                kind: 'textEdit',
+                                edits: group,
+                                uri: item.uri
+                            });
+                        }
+                    }
+                    else {
+                        message.push(item);
+                    }
+                }
+                this.chatService.addCompleteRequest(widget.viewModel.sessionId, request.message, request.variableData, request.attempt, {
+                    message,
                     result: request.response.result,
                     followups: request.response.followups
                 });
@@ -267,19 +274,19 @@ let QuickChat = class QuickChat extends Disposable {
         this.widget.inputEditor.setValue('');
     }
     updateModel() {
-        this.model ??= this.chatService.startSession(this._options.providerId, CancellationToken.None);
+        this.model ??= this.chatService.startSession(ChatAgentLocation.Panel, CancellationToken.None);
         if (!this.model) {
-            throw new Error('Could not start chat session');
+            throw ( new Error('Could not start chat session'));
         }
         this.widget.setModel(this.model, { inputValue: this._currentQuery });
     }
 };
 QuickChat = QuickChat_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IChatService)),
-    ( __param(4, IChatWidgetService)),
-    ( __param(5, ILayoutService))
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IChatService)),
+    ( __param(3, ILayoutService)),
+    ( __param(4, IViewsService))
 ], QuickChat));
 
 export { QuickChatService };

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

@@ -75,7 +75,7 @@ let ChatVariablesService = class ChatVariablesService {
     registerVariable(data, resolver) {
         const key = data.name.toLowerCase();
         if (( this._resolver.has(key))) {
-            throw new Error(`A chat variable with the name '${data.name}' already exists.`);
+            throw ( new Error(`A chat variable with the name '${data.name}' already exists.`));
         }
         this._resolver.set(key, { data, resolver });
         return toDisposable(() => {