@codingame/monaco-vscode-chat-service-override 10.1.3 → 11.0.0

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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 { DisposableMap, DisposableStore, toDisposable, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { AmbiguousCharacters, InvisibleCharacters } from 'vscode/vscode/vs/base/common/strings';
@@ -19,14 +20,14 @@ import { showExtensionsWithIdsCommandId } from 'vscode/vscode/vs/workbench/contr
 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 } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
+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-quickaccess-search-terminal-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(7355, 'Contributes a chat participant')),
+        description: ( localize(7610, 'Contributes a chat participant')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -35,12 +36,12 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ['name', 'id'],
             properties: {
                 id: {
-                    description: ( localize(7356, "A unique id for this chat participant.")),
+                    description: ( localize(7611, "A unique id for this chat participant.")),
                     type: 'string'
                 },
                 name: {
                     description: ( localize(
-                        7357,
+                        7612,
                         "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',
@@ -48,37 +49,37 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 fullName: {
                     markdownDescription: ( localize(
-                        7358,
+                        7613,
                         "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(7359, "A description of this chat participant, shown in the UI.")),
+                    description: ( localize(7614, "A description of this chat participant, shown in the UI.")),
                     type: 'string'
                 },
                 isSticky: {
                     description: ( localize(
-                        7360,
+                        7615,
                         "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(
-                        7361,
+                        7616,
                         "When the user clicks this participant in `/help`, this text will be submitted to the participant."
                     )),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(7362, "A condition which must be true to enable this participant.")),
+                    description: ( localize(7617, "A condition which must be true to enable this participant.")),
                     type: 'string'
                 },
                 disambiguation: {
                     description: ( localize(
-                        7363,
+                        7618,
                         "Metadata to help with automatically routing user questions to this chat participant."
                     )),
                     type: 'array',
@@ -90,21 +91,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             category: {
                                 markdownDescription: ( localize(
-                                    7364,
+                                    7619,
                                     "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                 )),
                                 type: 'string'
                             },
                             description: {
                                 description: ( localize(
-                                    7365,
+                                    7620,
                                     "A detailed description of the kinds of questions that are suitable for this chat participant."
                                 )),
                                 type: 'string'
                             },
                             examples: {
                                 description: ( localize(
-                                    7366,
+                                    7621,
                                     "A list of representative example questions that are suitable for this chat participant."
                                 )),
                                 type: 'array'
@@ -114,7 +115,7 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        7367,
+                        7622,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: 'array',
@@ -126,36 +127,36 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             name: {
                                 description: ( localize(
-                                    7368,
+                                    7623,
                                     "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(7369, "A description of this command.")),
+                                description: ( localize(7624, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localize(7370, "A condition which must be true to enable this command.")),
+                                description: ( localize(7625, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                             sampleRequest: {
                                 description: ( localize(
-                                    7371,
+                                    7626,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: 'string'
                             },
                             isSticky: {
                                 description: ( localize(
-                                    7360,
+                                    7615,
                                     "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(
-                                    7372,
+                                    7627,
                                     "Metadata to help with automatically routing user questions to this chat command."
                                 )),
                                 type: 'array',
@@ -167,21 +168,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                                     properties: {
                                         category: {
                                             markdownDescription: ( localize(
-                                                7373,
+                                                7628,
                                                 "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                             )),
                                             type: 'string'
                                         },
                                         description: {
                                             description: ( localize(
-                                                7374,
+                                                7629,
                                                 "A detailed description of the kinds of questions that are suitable for this chat command."
                                             )),
                                             type: 'string'
                                         },
                                         examples: {
                                             description: ( localize(
-                                                7375,
+                                                7630,
                                                 "A list of representative example questions that are suitable for this chat command."
                                             )),
                                             type: 'array'
@@ -192,14 +193,6 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         }
                     }
                 },
-                supportsToolReferences: {
-                    description: ( localize(
-                        7376,
-                        "Whether this participant supports {0}.",
-                        'ChatRequest#toolReferences'
-                    )),
-                    type: 'boolean'
-                }
             }
         }
     },
@@ -217,6 +210,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         this._participantRegistrationDisposables = ( (new DisposableMap()));
         this._viewContainer = this.registerViewContainer();
         this.registerDefaultParticipantView();
+        this.registerChatEditingView();
         this.handleAndRegisterChatExtensions();
     }
     handleAndRegisterChatExtensions() {
@@ -239,7 +233,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT use API proposal: defaultChatParticipant.`);
                         continue;
                     }
-                    if ((providerDescriptor.defaultImplicitVariables || providerDescriptor.locations || providerDescriptor.supportsModelPicker) && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
+                    if ((providerDescriptor.defaultImplicitVariables || providerDescriptor.locations) && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT use API proposal: chatParticipantAdditions.`);
                         continue;
                     }
@@ -248,47 +242,48 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         continue;
                     }
                     const participantsAndCommandsDisambiguation = [];
-                    if (isProposedApiEnabled(extension.description, 'contribChatParticipantDetection')) {
-                        if (providerDescriptor.disambiguation?.length) {
-                            participantsAndCommandsDisambiguation.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
-                                    })))));
-                                }
+                    if (providerDescriptor.disambiguation?.length) {
+                        participantsAndCommandsDisambiguation.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
+                                })))));
                             }
                         }
                     }
-                    const store = ( (new DisposableStore()));
-                    store.add(this._chatAgentService.registerAgent(providerDescriptor.id, {
-                        extensionId: extension.description.identifier,
-                        publisherDisplayName: extension.description.publisherDisplayName ?? extension.description.publisher,
-                        extensionPublisherId: extension.description.publisher,
-                        extensionDisplayName: extension.description.displayName ?? extension.description.name,
-                        id: providerDescriptor.id,
-                        description: providerDescriptor.description,
-                        supportsModelPicker: providerDescriptor.supportsModelPicker,
-                        when: providerDescriptor.when,
-                        metadata: {
-                            isSticky: providerDescriptor.isSticky,
-                            sampleRequest: providerDescriptor.sampleRequest,
-                        },
-                        name: providerDescriptor.name,
-                        fullName: providerDescriptor.fullName,
-                        isDefault: providerDescriptor.isDefault,
-                        locations: isNonEmptyArray(providerDescriptor.locations) ?
-                            ( (providerDescriptor.locations.map(ChatAgentLocation.fromRaw))) :
-                            [ChatAgentLocation.Panel],
-                        slashCommands: providerDescriptor.commands ?? [],
-                        disambiguation: coalesce(participantsAndCommandsDisambiguation.flat()),
-                        supportsToolReferences: providerDescriptor.supportsToolReferences,
-                    }));
-                    this._participantRegistrationDisposables.set(getParticipantKey(extension.description.identifier, providerDescriptor.id), store);
+                    try {
+                        const store = ( (new DisposableStore()));
+                        store.add(this._chatAgentService.registerAgent(providerDescriptor.id, {
+                            extensionId: extension.description.identifier,
+                            publisherDisplayName: extension.description.publisherDisplayName ?? extension.description.publisher,
+                            extensionPublisherId: extension.description.publisher,
+                            extensionDisplayName: extension.description.displayName ?? extension.description.name,
+                            id: providerDescriptor.id,
+                            description: providerDescriptor.description,
+                            when: providerDescriptor.when,
+                            metadata: {
+                                isSticky: providerDescriptor.isSticky,
+                                sampleRequest: providerDescriptor.sampleRequest,
+                            },
+                            name: providerDescriptor.name,
+                            fullName: providerDescriptor.fullName,
+                            isDefault: providerDescriptor.isDefault,
+                            locations: isNonEmptyArray(providerDescriptor.locations) ?
+                                ( (providerDescriptor.locations.map(ChatAgentLocation.fromRaw))) :
+                                [ChatAgentLocation.Panel],
+                            slashCommands: providerDescriptor.commands ?? [],
+                            disambiguation: coalesce(participantsAndCommandsDisambiguation.flat()),
+                        }));
+                        this._participantRegistrationDisposables.set(getParticipantKey(extension.description.identifier, providerDescriptor.id), store);
+                    }
+                    catch (e) {
+                        this.logService.error(`Failed to register participant ${providerDescriptor.id}: ${toErrorMessage(e, true)}`);
+                    }
                 }
             }
             for (const extension of delta.removed) {
@@ -299,7 +294,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         });
     }
     registerViewContainer() {
-        const title = ( localize2(7377, "Chat"));
+        const title = ( localize2(7631, "Chat"));
         const icon = Codicon.commentDiscussion;
         const viewContainerId = CHAT_SIDEBAR_PANEL_ID;
         const viewContainer = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
@@ -313,7 +308,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
             storageId: viewContainerId,
             hideIfEmpty: true,
             order: 100,
-        }, 0 );
+        }, 2 , { doNotRegisterOpenCommand: true });
         return viewContainer;
     }
     registerDefaultParticipantView() {
@@ -326,7 +321,17 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                 name: { value: name, original: name },
                 canToggleVisibility: false,
                 canMoveView: true,
-                ctorDescriptor: ( (new SyncDescriptor(ChatViewPane))),
+                openCommandActionDescriptor: {
+                    id: CHAT_SIDEBAR_PANEL_ID,
+                    keybindings: {
+                        primary: 2048  | 512  | 39 ,
+                        mac: {
+                            primary: 2048  | 256  | 39
+                        }
+                    },
+                    order: 100
+                },
+                ctorDescriptor: ( (new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }]))),
                 when: ( (ContextKeyExpr.or(CONTEXT_CHAT_PANEL_PARTICIPANT_REGISTERED, CONTEXT_CHAT_EXTENSION_INVALID)))
             }];
         ( (Registry.as(Extensions.ViewsRegistry))).registerViews(viewDescriptor, this._viewContainer);
@@ -334,6 +339,40 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
             ( (Registry.as(Extensions.ViewsRegistry))).deregisterViews(viewDescriptor, this._viewContainer);
         });
     }
+    registerChatEditingView() {
+        const title = ( localize2(7632, "Copilot Edits"));
+        const icon = Codicon.editSession;
+        const viewContainerId = CHAT_EDITING_SIDEBAR_PANEL_ID;
+        const viewContainer = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
+            id: viewContainerId,
+            title,
+            icon,
+            ctorDescriptor: ( (new SyncDescriptor(
+                ViewPaneContainer,
+                [viewContainerId, { mergeViewWithContainerWhenSingleView: true }]
+            ))),
+            storageId: viewContainerId,
+            hideIfEmpty: true,
+            order: 100,
+        }, 2 );
+        const id = 'workbench.panel.chat.view.edits';
+        const viewDescriptor = [{
+                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
+            }];
+        ( (Registry.as(Extensions.ViewsRegistry))).registerViews(viewDescriptor, viewContainer);
+        return toDisposable(() => {
+            ( (Registry.as(Extensions.ViewContainersRegistry))).deregisterViewContainer(viewContainer);
+            ( (Registry.as(Extensions.ViewsRegistry))).deregisterViews(viewDescriptor, viewContainer);
+        });
+    }
 };
 ChatExtensionPointHandler = ( (__decorate([
     ( (__param(0, IChatAgentService))),
@@ -366,9 +405,9 @@ let ChatCompatibilityNotifier = class ChatCompatibilityNotifier extends Disposab
             return;
         }
         this.registeredWelcomeView = true;
-        const showExtensionLabel = ( localize(7378, "Show Extension"));
+        const showExtensionLabel = ( localize(7633, "Show Extension"));
         const mainMessage = ( localize(
-            7379,
+            7634,
             "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',
             this.productService.nameLong

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

@@ -2,25 +2,116 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { HierarchicalKind } from 'vscode/vscode/vs/base/common/hierarchicalKind';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { ChatInputPart } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { localize } from 'vscode/vscode/vs/nls';
+import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 class PasteImageProvider {
-    constructor() {
-        this.kind = ( new HierarchicalKind('image'));
+    constructor(chatWidgetService, extensionService) {
+        this.chatWidgetService = chatWidgetService;
+        this.extensionService = extensionService;
+        this.kind = ( (new HierarchicalKind('image')));
         this.pasteMimeTypes = ['image/*'];
     }
     async provideDocumentPasteEdits(_model, _ranges, dataTransfer, context, token) {
+        if (!( (this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))))) {
+            return;
+        }
+        const supportedMimeTypes = [
+            'image/png',
+            'image/jpeg',
+            'image/jpg',
+            'image/bmp',
+            'image/gif',
+            'image/tiff'
+        ];
+        let mimeType;
+        let imageItem;
+        for (const type of supportedMimeTypes) {
+            imageItem = dataTransfer.get(type);
+            if (imageItem) {
+                mimeType = type;
+                break;
+            }
+        }
+        if (!imageItem || !mimeType) {
+            return;
+        }
+        const currClipboard = await imageItem.asFile()?.data();
+        if (token.isCancellationRequested || !currClipboard) {
+            return;
+        }
+        const widget = this.chatWidgetService.getWidgetByInputUri(_model.uri);
+        if (!widget) {
+            return;
+        }
+        const attachedVariables = widget.attachmentModel.attachments;
+        const displayName = ( localize(7635, 'Pasted Image'));
+        let tempDisplayName = displayName;
+        for (let appendValue = 2; ( (attachedVariables.some(attachment => attachment.name === tempDisplayName))); appendValue++) {
+            tempDisplayName = `${displayName} ${appendValue}`;
+        }
+        const imageContext = await getImageAttachContext(currClipboard, mimeType, token, tempDisplayName);
+        if (token.isCancellationRequested || !imageContext) {
+            return;
+        }
+        const currentContextIds = widget.attachmentModel.getAttachmentIDs();
+        if (( (currentContextIds.has(imageContext.id)))) {
+            return;
+        }
+        widget.attachmentModel.addContext(imageContext);
         return;
     }
 }
+async function getImageAttachContext(data, mimeType, token, displayName) {
+    const imageHash = await imageToHash(data);
+    if (token.isCancellationRequested) {
+        return undefined;
+    }
+    return {
+        value: data,
+        id: imageHash,
+        name: displayName,
+        isImage: true,
+        icon: Codicon.fileMedia,
+        isDynamic: true,
+        isFile: false,
+        mimeType
+    };
+}
+async function imageToHash(data) {
+    const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+    const hashArray = Array.from(( (new Uint8Array(hashBuffer))));
+    return ( (hashArray.map(b => ( (b.toString(16))).padStart(2, '0')))).join('');
+}
+function isImage(array) {
+    if (array.length < 4) {
+        return false;
+    }
+    const identifier = {
+        png: [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A],
+        jpeg: [0xFF, 0xD8, 0xFF],
+        bmp: [0x42, 0x4D],
+        gif: [0x47, 0x49, 0x46, 0x38],
+        tiff: [0x49, 0x49, 0x2A, 0x00]
+    };
+    return (
+         (( (Object.values(identifier))).some((signature) => signature.every((byte, index) => array[index] === byte)))
+    );
+}
 let ChatPasteProvidersFeature = class ChatPasteProvidersFeature extends Disposable {
-    constructor(languageFeaturesService) {
+    constructor(languageFeaturesService, chatWidgetService, extensionService) {
         super();
-        this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, ( new PasteImageProvider())));
+        this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, ( (new PasteImageProvider(chatWidgetService, extensionService)))));
     }
 };
-ChatPasteProvidersFeature = ( __decorate([
-    ( __param(0, ILanguageFeaturesService))
-], ChatPasteProvidersFeature));
+ChatPasteProvidersFeature = ( (__decorate([
+    ( (__param(0, ILanguageFeaturesService))),
+    ( (__param(1, IChatWidgetService))),
+    ( (__param(2, IExtensionService)))
+], ChatPasteProvidersFeature)));
 
-export { ChatPasteProvidersFeature, PasteImageProvider };
+export { ChatPasteProvidersFeature, PasteImageProvider, imageToHash, isImage };

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

@@ -22,8 +22,8 @@ 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 { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatWidget } from '@codingame/monaco-vscode-chat-extensions-notebook-common/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';
@@ -179,7 +179,7 @@ let QuickChat = class QuickChat extends Disposable {
             IContextKeyService,
             this._register(this.contextKeyService.createScoped(parent))
         ]))));
-        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { isQuickChat: true }, { renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } }, {
+        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Panel, { isQuickChat: true }, { autoScroll: true, renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide }, enableImplicitContext: true }, {
             listForeground: quickInputForeground,
             listBackground: quickInputBackground,
             overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,

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

@@ -2,7 +2,7 @@ import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdow
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 class ChatResponseAccessibleView {

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

@@ -3,16 +3,14 @@ import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { onUnexpectedExternalError } from 'vscode/vscode/vs/base/common/errors';
 import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { basename } from 'vscode/vscode/vs/base/common/path';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { showChatView } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatContextAttachments } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
-import { ChatDynamicVariableModel } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 let ChatVariablesService = class ChatVariablesService {
     constructor(chatWidgetService, viewsService) {
@@ -44,7 +42,7 @@ let ChatVariablesService = class ChatVariablesService {
                 }
             }
             else if (part instanceof ChatRequestDynamicVariablePart) {
-                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon };
+                resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon, isFile: part.isFile };
             }
             else if (part instanceof ChatRequestToolPart) {
                 resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(part.icon) ? part.icon : undefined, fullName: part.displayName };
@@ -70,7 +68,7 @@ let ChatVariablesService = class ChatVariablesService {
                 }).catch(onUnexpectedExternalError));
             }
             else if (attachment.isDynamic || attachment.isTool) {
-                resolvedAttachedContext[i] = { ...attachment };
+                resolvedAttachedContext[i] = attachment;
             }
         });
         await Promise.allSettled(jobs);
@@ -133,14 +131,14 @@ let ChatVariablesService = class ChatVariablesService {
         if (key === 'file' && typeof value !== 'string') {
             const uri = URI.isUri(value) ? value : value.uri;
             const range = 'range' in value ? value.range : undefined;
-            widget.getContrib(ChatContextAttachments.ID)?.setContext(false, { value, id: ( uri.toString()) + (range?.toString() ?? ''), name: basename(uri.path), isFile: true, isDynamic: true });
+            widget.attachmentModel.addFile(uri, range);
             return;
         }
         const resolved = this._resolver.get(key);
         if (!resolved) {
             return;
         }
-        widget.getContrib(ChatContextAttachments.ID)?.setContext(false, { ...resolved.data, value });
+        widget.attachmentModel.addContext({ ...resolved.data, value });
     }
 };
 ChatVariablesService = ( __decorate([