@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.0

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

@@ -0,0 +1,42 @@
+import * as dom from "vscode/vscode/vs/base/browser/dom";
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IScopedContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IEditorOptions } from "vscode/vscode/vs/platform/editor/common/editor";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IThemeService } from "vscode/vscode/vs/platform/theme/common/themeService.service";
+import { EditorPane } from "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { IEditorOpenContext } from "vscode/vscode/vs/workbench/common/editor";
+import { ChatEditorInput } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
+import { IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IEditorGroup } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService";
+export interface IChatEditorOptions extends IEditorOptions {
+    target?: {
+        sessionId: string;
+    } | {
+        data: IExportableChatData | ISerializableChatData;
+    };
+}
+export declare class ChatEditor extends EditorPane {
+    private readonly instantiationService;
+    private readonly storageService;
+    private readonly contextKeyService;
+    private widget;
+    private _scopedContextKeyService;
+    get scopedContextKeyService(): IScopedContextKeyService;
+    private _memento;
+    private _viewState;
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, instantiationService: IInstantiationService, storageService: IStorageService, contextKeyService: IContextKeyService);
+    private clear;
+    protected createEditor(parent: HTMLElement): void;
+    protected setEditorVisible(visible: boolean): void;
+    focus(): void;
+    clearInput(): void;
+    setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    private updateModel;
+    protected saveState(): void;
+    getViewState(): object | undefined;
+    layout(dimension: dom.Dimension, position?: dom.IDomPosition | undefined): void;
+}

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

@@ -1,7 +1,9 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -16,13 +18,13 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
-import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { clearChatEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
-import { ChatEditorInput } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { ChatWidget } from '@codingame/monaco-vscode-chat-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { EditorPane } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
+import { clearChatEditor } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
+import { ChatEditorInput } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
 
 let ChatEditor = class ChatEditor extends EditorPane {
@@ -43,7 +45,10 @@ let ChatEditor = class ChatEditor extends EditorPane {
     createEditor(parent) {
         this._scopedContextKeyService = this._register(this.contextKeyService.createScoped(parent));
         const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
-        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, undefined, { supportsFileReferences: true }, {
+        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, undefined, {
+            supportsFileReferences: true,
+            enableImplicitContext: true
+        }, {
             listForeground: editorForeground,
             listBackground: editorBackground,
             overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
@@ -79,7 +84,7 @@ let ChatEditor = class ChatEditor extends EditorPane {
     }
     updateModel(model, viewState) {
         this._memento = ( new Memento('interactive-session-editor-' + CHAT_PROVIDER_ID, this.storageService));
-        this._viewState = viewState ?? this._memento.getMemento(1 , 1 );
+        this._viewState = viewState ?? this._memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         this.widget.setModel(model, { ...this._viewState });
     }
     saveState() {
@@ -87,7 +92,6 @@ let ChatEditor = class ChatEditor extends EditorPane {
         if (this._memento && this._viewState) {
             const widgetViewState = this.widget.getViewState();
             this._viewState.inputValue = widgetViewState.inputValue;
-            this._viewState.selectedLanguageModelId = widgetViewState.selectedLanguageModelId;
             this._memento.saveMemento();
         }
     }

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

@@ -0,0 +1,26 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { IExtensionsWorkbenchService } from "vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service";
+import { IChatAgentService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+export declare class ChatExtensionPointHandler implements IWorkbenchContribution {
+    private readonly _chatAgentService;
+    private readonly logService;
+    static readonly ID = "workbench.contrib.chatExtensionPointHandler";
+    private _viewContainer;
+    private _participantRegistrationDisposables;
+    constructor(_chatAgentService: IChatAgentService, logService: ILogService);
+    private handleAndRegisterChatExtensions;
+    private registerViewContainer;
+    private registerDefaultParticipantView;
+    private registerChatEditingView;
+}
+export declare class ChatCompatibilityNotifier extends Disposable implements IWorkbenchContribution {
+    private readonly productService;
+    static readonly ID = "workbench.contrib.chatCompatNotifier";
+    private registeredWelcomeView;
+    constructor(extensionsWorkbenchService: IExtensionsWorkbenchService, contextKeyService: IContextKeyService, productService: IProductService);
+    private registerWelcomeView;
+}

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

@@ -1,33 +1,36 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { isNonEmptyArray, coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
 import { Event } from 'vscode/vscode/vs/base/common/event';
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableMap, DisposableStore, toDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { AmbiguousCharacters, InvisibleCharacters } from 'vscode/vscode/vs/base/common/strings';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 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 { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { Extensions, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { showExtensionsWithIdsCommandId } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
+import { showExtensionsWithIdsCommandId } from '@codingame/monaco-vscode-47923ab1-c4c8-58b5-89ac-fa1b998eb5dd-common/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CHAT_VIEW_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatViewId } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane, CHAT_EDITING_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 
 const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatParticipants',
     jsonSchema: {
-        description: ( localize(7646, 'Contributes a chat participant')),
+        description: ( localize(4472, 'Contributes a chat participant')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -36,12 +39,12 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ['name', 'id'],
             properties: {
                 id: {
-                    description: ( localize(7647, "A unique id for this chat participant.")),
+                    description: ( localize(4473, "A unique id for this chat participant.")),
                     type: 'string'
                 },
                 name: {
                     description: ( localize(
-                        7648,
+                        4474,
                         "User-facing name for this chat participant. The user will use '@' with this name to invoke the participant. Name must not contain whitespace."
                     )),
                     type: 'string',
@@ -49,37 +52,37 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 fullName: {
                     markdownDescription: ( localize(
-                        7649,
+                        4475,
                         "The full name of this chat participant, which is shown as the label for responses coming from this participant. If not provided, {0} is used.",
                         '`name`'
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localize(7650, "A description of this chat participant, shown in the UI.")),
+                    description: ( localize(4476, "A description of this chat participant, shown in the UI.")),
                     type: 'string'
                 },
                 isSticky: {
                     description: ( localize(
-                        7651,
+                        4477,
                         "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'
                 },
                 sampleRequest: {
                     description: ( localize(
-                        7652,
+                        4478,
                         "When the user clicks this participant in `/help`, this text will be submitted to the participant."
                     )),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(7653, "A condition which must be true to enable this participant.")),
+                    description: ( localize(4479, "A condition which must be true to enable this participant.")),
                     type: 'string'
                 },
                 disambiguation: {
                     description: ( localize(
-                        7654,
+                        4480,
                         "Metadata to help with automatically routing user questions to this chat participant."
                     )),
                     type: 'array',
@@ -91,21 +94,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             category: {
                                 markdownDescription: ( localize(
-                                    7655,
+                                    4481,
                                     "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                 )),
                                 type: 'string'
                             },
                             description: {
                                 description: ( localize(
-                                    7656,
+                                    4482,
                                     "A detailed description of the kinds of questions that are suitable for this chat participant."
                                 )),
                                 type: 'string'
                             },
                             examples: {
                                 description: ( localize(
-                                    7657,
+                                    4483,
                                     "A list of representative example questions that are suitable for this chat participant."
                                 )),
                                 type: 'array'
@@ -115,7 +118,7 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        7658,
+                        4484,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: 'array',
@@ -127,36 +130,36 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             name: {
                                 description: ( localize(
-                                    7659,
+                                    4485,
                                     "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(7660, "A description of this command.")),
+                                description: ( localize(4486, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localize(7661, "A condition which must be true to enable this command.")),
+                                description: ( localize(4487, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                             sampleRequest: {
                                 description: ( localize(
-                                    7662,
+                                    4488,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: 'string'
                             },
                             isSticky: {
                                 description: ( localize(
-                                    7651,
+                                    4477,
                                     "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'
                             },
                             disambiguation: {
                                 description: ( localize(
-                                    7663,
+                                    4489,
                                     "Metadata to help with automatically routing user questions to this chat command."
                                 )),
                                 type: 'array',
@@ -168,21 +171,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                                     properties: {
                                         category: {
                                             markdownDescription: ( localize(
-                                                7664,
+                                                4490,
                                                 "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                             )),
                                             type: 'string'
                                         },
                                         description: {
                                             description: ( localize(
-                                                7665,
+                                                4491,
                                                 "A detailed description of the kinds of questions that are suitable for this chat command."
                                             )),
                                             type: 'string'
                                         },
                                         examples: {
                                             description: ( localize(
-                                                7666,
+                                                4492,
                                                 "A list of representative example questions that are suitable for this chat command."
                                             )),
                                             type: 'array'
@@ -207,7 +210,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
     constructor(_chatAgentService, logService) {
         this._chatAgentService = _chatAgentService;
         this.logService = logService;
-        this._participantRegistrationDisposables = ( (new DisposableMap()));
+        this._participantRegistrationDisposables = ( new DisposableMap());
         this._viewContainer = this.registerViewContainer();
         this.registerDefaultParticipantView();
         this.registerChatEditingView();
@@ -221,7 +224,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with invalid name: ${providerDescriptor.name}. Name must match /^[\\w-]+$/.`);
                         continue;
                     }
-                    if (providerDescriptor.fullName && AmbiguousCharacters.getInstance(( (new Set()))).containsAmbiguousCharacter(providerDescriptor.fullName)) {
+                    if (providerDescriptor.fullName && AmbiguousCharacters.getInstance(( new Set())).containsAmbiguousCharacter(providerDescriptor.fullName)) {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with fullName that contains ambiguous characters: ${providerDescriptor.fullName}.`);
                         continue;
                     }
@@ -241,23 +244,14 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant without both id and name.`);
                         continue;
                     }
-                    const participantsAndCommandsDisambiguation = [];
+                    const participantsDisambiguation = [];
                     if (providerDescriptor.disambiguation?.length) {
-                        participantsAndCommandsDisambiguation.push(...( (providerDescriptor.disambiguation.map((d) => ({
+                        participantsDisambiguation.push(...( providerDescriptor.disambiguation.map((d) => ({
                             ...d, category: d.category ?? d.categoryName
-                        })))));
-                    }
-                    if (providerDescriptor.commands) {
-                        for (const command of providerDescriptor.commands) {
-                            if (command.disambiguation?.length) {
-                                participantsAndCommandsDisambiguation.push(...( (command.disambiguation.map((d) => ({
-                                    ...d, category: d.category ?? d.categoryName
-                                })))));
-                            }
-                        }
+                        }))));
                     }
                     try {
-                        const store = ( (new DisposableStore()));
+                        const store = ( new DisposableStore());
                         store.add(this._chatAgentService.registerAgent(providerDescriptor.id, {
                             extensionId: extension.description.identifier,
                             publisherDisplayName: extension.description.publisherDisplayName ?? extension.description.publisher,
@@ -274,10 +268,10 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                             fullName: providerDescriptor.fullName,
                             isDefault: providerDescriptor.isDefault,
                             locations: isNonEmptyArray(providerDescriptor.locations) ?
-                                ( (providerDescriptor.locations.map(ChatAgentLocation.fromRaw))) :
+                                ( providerDescriptor.locations.map(ChatAgentLocation.fromRaw)) :
                                 [ChatAgentLocation.Panel],
                             slashCommands: providerDescriptor.commands ?? [],
-                            disambiguation: coalesce(participantsAndCommandsDisambiguation.flat()),
+                            disambiguation: coalesce(participantsDisambiguation.flat()),
                         }));
                         this._participantRegistrationDisposables.set(getParticipantKey(extension.description.identifier, providerDescriptor.id), store);
                     }
@@ -294,90 +288,106 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         });
     }
     registerViewContainer() {
-        const title = ( localize2(7667, "Chat"));
+        const title = ( localize2(4493, "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,
-        }, 2 , { doNotRegisterOpenCommand: true });
+        }, ViewContainerLocation.AuxiliaryBar, { doNotRegisterOpenCommand: true });
         return viewContainer;
     }
     registerDefaultParticipantView() {
-        const name = 'GitHub Copilot';
         const viewDescriptor = [{
-                id: CHAT_VIEW_ID,
+                id: ChatViewId,
                 containerIcon: this._viewContainer.icon,
                 containerTitle: this._viewContainer.title.value,
                 singleViewPaneContainerTitle: this._viewContainer.title.value,
-                name: { value: name, original: name },
+                name: ( localize2(4493, "Chat")),
                 canToggleVisibility: false,
                 canMoveView: true,
                 openCommandActionDescriptor: {
                     id: CHAT_SIDEBAR_PANEL_ID,
+                    title: this._viewContainer.title,
+                    mnemonicTitle: ( localize(4494, "&&Chat")),
                     keybindings: {
-                        primary: 2048  | 512  | 39 ,
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
                         mac: {
-                            primary: 2048  | 256  | 39
+                            primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
                         }
                     },
-                    order: 100
+                    order: 1
                 },
-                ctorDescriptor: ( (new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }]))),
-                when: ( (ContextKeyExpr.or(CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID)))
+                ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }])),
+                when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.has('config.chat.experimental.offerSetup')), ChatContextKeys.Setup.triggered)), ChatContextKeys.Setup.installed, ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid))
             }];
-        ( (Registry.as(Extensions.ViewsRegistry))).registerViews(viewDescriptor, this._viewContainer);
+        ( Registry.as(Extensions.ViewsRegistry)).registerViews(viewDescriptor, this._viewContainer);
         return toDisposable(() => {
-            ( (Registry.as(Extensions.ViewsRegistry))).deregisterViews(viewDescriptor, this._viewContainer);
+            ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(viewDescriptor, this._viewContainer);
         });
     }
     registerChatEditingView() {
-        const title = ( localize2(7668, "Copilot Edits"));
+        const title = ( localize2(4495, "Copilot Edits"));
         const icon = Codicon.editSession;
         const viewContainerId = CHAT_EDITING_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,
-        }, 2 );
+            order: 101,
+        }, ViewContainerLocation.AuxiliaryBar, { doNotRegisterOpenCommand: true });
         const id = 'workbench.panel.chat.view.edits';
         const viewDescriptor = [{
-                id: id,
+                id,
                 containerIcon: viewContainer.icon,
                 containerTitle: title.value,
                 singleViewPaneContainerTitle: title.value,
                 name: { value: title.value, original: title.value },
                 canToggleVisibility: false,
                 canMoveView: true,
-                ctorDescriptor: ( (new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.EditingSession }]))),
-                when: CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED
+                openCommandActionDescriptor: {
+                    id: viewContainerId,
+                    title,
+                    mnemonicTitle: ( localize(4496, "Copilot Ed&&its")),
+                    keybindings: {
+                        primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
+                        linux: {
+                            primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyI
+                        }
+                    },
+                    order: 2
+                },
+                ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.EditingSession }])),
+                when: ( ContextKeyExpr.or(
+                    ChatContextKeys.Setup.installed,
+                    ChatContextKeys.editingParticipantRegistered
+                ))
             }];
-        ( (Registry.as(Extensions.ViewsRegistry))).registerViews(viewDescriptor, viewContainer);
+        ( Registry.as(Extensions.ViewsRegistry)).registerViews(viewDescriptor, viewContainer);
         return toDisposable(() => {
-            ( (Registry.as(Extensions.ViewContainersRegistry))).deregisterViewContainer(viewContainer);
-            ( (Registry.as(Extensions.ViewsRegistry))).deregisterViews(viewDescriptor, viewContainer);
+            ( Registry.as(Extensions.ViewContainersRegistry)).deregisterViewContainer(viewContainer);
+            ( Registry.as(Extensions.ViewsRegistry)).deregisterViews(viewDescriptor, viewContainer);
         });
     }
 };
-ChatExtensionPointHandler = ( (__decorate([
-    ( (__param(0, IChatAgentService))),
-    ( (__param(1, ILogService)))
-], ChatExtensionPointHandler)));
+ChatExtensionPointHandler = ( __decorate([
+    ( __param(0, IChatAgentService)),
+    ( __param(1, ILogService))
+], ChatExtensionPointHandler));
 function getParticipantKey(extensionId, participantName) {
     return `${extensionId.value}_${participantName}`;
 }
@@ -387,10 +397,10 @@ let ChatCompatibilityNotifier = class ChatCompatibilityNotifier extends Disposab
         super();
         this.productService = productService;
         this.registeredWelcomeView = false;
-        const isInvalid = CONTEXT_CHAT_EXTENSION_INVALID.bindTo(contextKeyService);
+        const isInvalid = ChatContextKeys.extensionInvalid.bindTo(contextKeyService);
         this._register(Event.runAndSubscribe(extensionsWorkbenchService.onDidChangeExtensionsNotification, () => {
             const notification = extensionsWorkbenchService.getExtensionsNotification();
-            const chatExtension = notification?.extensions.find(ext => ext.identifier.id === 'github.copilot-chat');
+            const chatExtension = notification?.extensions.find(ext => ExtensionIdentifier.equals(ext.identifier.id, this.productService.defaultChatAgent?.chatExtensionId));
             if (chatExtension) {
                 isInvalid.set(true);
                 this.registerWelcomeView(chatExtension);
@@ -405,26 +415,25 @@ let ChatCompatibilityNotifier = class ChatCompatibilityNotifier extends Disposab
             return;
         }
         this.registeredWelcomeView = true;
-        const showExtensionLabel = ( localize(7669, "Show Extension"));
+        const showExtensionLabel = ( localize(4497, "Show Extension"));
         const mainMessage = ( localize(
-            7670,
-            "Chat failed to load because the installed version of the {0} extension is not compatible with this version of {1}. Please ensure that the GitHub Copilot Chat extension is up to date.",
-            'GitHub Copilot Chat',
+            4498,
+            "Chat failed to load because the installed version of the Copilot Chat extension is not compatible with this version of {0}. Please ensure that the Copilot Chat extension is up to date.",
             this.productService.nameLong
         ));
-        const commandButton = `[${showExtensionLabel}](command:${showExtensionsWithIdsCommandId}?${encodeURIComponent(JSON.stringify([['GitHub.copilot-chat']]))})`;
-        const versionMessage = `GitHub Copilot Chat version: ${chatExtension.version}`;
-        const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
-        this._register(viewsRegistry.registerViewWelcomeContent(CHAT_VIEW_ID, {
+        const commandButton = `[${showExtensionLabel}](command:${showExtensionsWithIdsCommandId}?${encodeURIComponent(JSON.stringify([[this.productService.defaultChatAgent?.chatExtensionId]]))})`;
+        const versionMessage = `Copilot Chat version: ${chatExtension.version}`;
+        const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
+        this._register(viewsRegistry.registerViewWelcomeContent(ChatViewId, {
             content: [mainMessage, commandButton, versionMessage].join('\n\n'),
-            when: CONTEXT_CHAT_EXTENSION_INVALID,
+            when: ChatContextKeys.extensionInvalid,
         }));
     }
 };
-ChatCompatibilityNotifier = ( (__decorate([
-    ( (__param(0, IExtensionsWorkbenchService))),
-    ( (__param(1, IContextKeyService))),
-    ( (__param(2, IProductService)))
-], ChatCompatibilityNotifier)));
+ChatCompatibilityNotifier = ( __decorate([
+    ( __param(0, IExtensionsWorkbenchService)),
+    ( __param(1, IContextKeyService)),
+    ( __param(2, IProductService))
+], ChatCompatibilityNotifier));
 
 export { ChatCompatibilityNotifier, ChatExtensionPointHandler };

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

@@ -0,0 +1,42 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IReadonlyVSDataTransfer } from "vscode/vscode/vs/base/common/dataTransfer";
+import { HierarchicalKind } from "vscode/vscode/vs/base/common/hierarchicalKind";
+import { IRange } from "vscode/vscode/vs/editor/common/core/range";
+import { DocumentPasteContext, DocumentPasteEditProvider, DocumentPasteEditsSession } from "vscode/vscode/vs/editor/common/languages";
+import { ITextModel } from "vscode/vscode/vs/editor/common/model";
+import { ILanguageFeaturesService } from "vscode/vscode/vs/editor/common/services/languageFeatures";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IChatWidgetService } from "vscode/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+export declare class PasteImageProvider implements DocumentPasteEditProvider {
+    private readonly chatWidgetService;
+    private readonly extensionService;
+    readonly kind: HierarchicalKind;
+    readonly providedPasteEditKinds: HierarchicalKind[];
+    readonly copyMimeTypes: never[];
+    readonly pasteMimeTypes: string[];
+    constructor(chatWidgetService: IChatWidgetService, extensionService: IExtensionService);
+    provideDocumentPasteEdits(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined>;
+}
+export declare function imageToHash(data: Uint8Array): Promise<string>;
+export declare function isImage(array: Uint8Array): boolean;
+export declare class CopyTextProvider implements DocumentPasteEditProvider {
+    readonly providedPasteEditKinds: never[];
+    readonly copyMimeTypes: string[];
+    readonly pasteMimeTypes: never[];
+    prepareDocumentPaste(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<undefined | IReadonlyVSDataTransfer>;
+}
+export declare class PasteTextProvider implements DocumentPasteEditProvider {
+    private readonly chatWidgetService;
+    private readonly modelService;
+    readonly kind: HierarchicalKind;
+    readonly providedPasteEditKinds: HierarchicalKind[];
+    readonly copyMimeTypes: never[];
+    readonly pasteMimeTypes: string[];
+    constructor(chatWidgetService: IChatWidgetService, modelService: IModelService);
+    provideDocumentPasteEdits(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined>;
+}
+export declare class ChatPasteProvidersFeature extends Disposable {
+    constructor(languageFeaturesService: ILanguageFeaturesService, chatWidgetService: IChatWidgetService, extensionService: IExtensionService, modelService: IModelService);
+}