@codingame/monaco-vscode-chat-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/chatUsageWidget.js

@@ -33,27 +33,27 @@ let ChatUsageWidget = class ChatUsageWidget extends Disposable {
         clearNode(this.usageSection);
         const { chat: chatQuota, completions: completionsQuota, premiumChat: premiumChatQuota, resetDate, resetDateHasTime } = this.chatEntitlementService.quotas;
         if (this.chatEntitlementService.anonymous && this.chatEntitlementService.sentiment.installed && !completionsQuota && !chatQuota && !premiumChatQuota) {
-            this.renderLimitedQuotaItem(this.usageSection, ( localize(5335, 'Inline Suggestions')));
-            this.renderLimitedQuotaItem(this.usageSection, ( localize(5336, 'Chat messages')));
+            this.renderLimitedQuotaItem(this.usageSection, ( localize(5415, 'Inline Suggestions')));
+            this.renderLimitedQuotaItem(this.usageSection, ( localize(5416, 'Chat messages')));
         }
         else if (completionsQuota || chatQuota || premiumChatQuota) {
             if (completionsQuota) {
-                this.renderQuotaItem(this.usageSection, ( localize(5337, 'Inline Suggestions')), completionsQuota);
+                this.renderQuotaItem(this.usageSection, ( localize(5417, 'Inline Suggestions')), completionsQuota);
             }
             if (chatQuota) {
-                this.renderQuotaItem(this.usageSection, ( localize(5338, 'Chat messages')), chatQuota);
+                this.renderQuotaItem(this.usageSection, ( localize(5418, 'Chat messages')), chatQuota);
             }
             if (premiumChatQuota) {
-                this.renderQuotaItem(this.usageSection, ( localize(5339, 'Premium requests')), premiumChatQuota);
+                this.renderQuotaItem(this.usageSection, ( localize(5419, 'Premium requests')), premiumChatQuota);
                 if (premiumChatQuota.overageEnabled) {
                     const overageMessage = append(this.usageSection, $('.overage-message'));
-                    overageMessage.textContent = ( localize(5340, 'Additional paid premium requests enabled.'));
+                    overageMessage.textContent = ( localize(5420, 'Additional paid premium requests enabled.'));
                 }
             }
             if (resetDate) {
                 const resetText = append(this.usageSection, $('.allowance-resets'));
                 resetText.textContent = ( localize(
-                    5341,
+                    5421,
                     'Allowance resets {0}.',
                     resetDateHasTime ? this.dateTimeFormatter.value.format(( new Date(resetDate))) : this.dateFormatter.value.format(( new Date(resetDate)))
                 ));
@@ -69,10 +69,10 @@ let ChatUsageWidget = class ChatUsageWidget extends Disposable {
         quotaItemLabel.textContent = label;
         const quotaItemValue = append(quotaItemHeader, $('.quota-item-value'));
         if (quota.unlimited) {
-            quotaItemValue.textContent = ( localize(5342, 'Included'));
+            quotaItemValue.textContent = ( localize(5422, 'Included'));
         }
         else {
-            quotaItemValue.textContent = ( localize(5342, 'Included'));
+            quotaItemValue.textContent = ( localize(5422, 'Included'));
         }
         const progressBarContainer = append(quotaItem, $('.quota-bar'));
         const progressBar = append(progressBarContainer, $('.quota-bit'));
@@ -97,7 +97,7 @@ let ChatUsageWidget = class ChatUsageWidget extends Disposable {
         const quotaItemLabel = append(quotaItemHeader, $('.quota-item-label'));
         quotaItemLabel.textContent = label;
         const quotaItemValue = append(quotaItemHeader, $('.quota-item-value'));
-        quotaItemValue.textContent = ( localize(5343, 'Limited'));
+        quotaItemValue.textContent = ( localize(5423, 'Limited'));
         const progressBarContainer = append(quotaItem, $('.quota-bar'));
         append(progressBarContainer, $('.quota-bit'));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatManagement/media/chatModelsWidget.css

@@ -153,6 +153,7 @@
 	display: flex;
 	align-items: center;
 	gap: 4px;
+	min-width: 48px;
 }
 
 .models-widget .models-table-container .monaco-table-td .model-token-limits .codicon {
@@ -161,7 +162,7 @@
 
 /** Capabilities column styling **/
 
-.models-widget .models-table-container .monaco-table-td .model-metadata {
+.models-widget .models-table-container .monaco-table-td .model-capabilities {
 	display: flex;
 	align-items: center;
 	gap: 6px;
@@ -179,7 +180,8 @@
 }
 
 .models-widget .models-table-container .monaco-table-td .model-capability.active {
-	border-color: var(--vscode-radio-activeBorder, transparent);
+	background-color: var(--vscode-toolbar-hoverBackground);
+	opacity: 0.8;
 }
 
 /** Vendor row styling **/
@@ -209,3 +211,11 @@
 .models-widget .models-table-container .monaco-table .monaco-list:not(.focused) .monaco-list-row[data-parity=odd].focused:not(.selected):not(:hover) .monaco-table-tr:not(.models-vendor-row) {
 	background-color: var(--vscode-editor-background);
 }
+
+/** Provider column styling **/
+
+.models-widget .models-table-container .monaco-table-td .model-provider {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}

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

@@ -3,7 +3,7 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
-import { IWebview } from "@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview";
+import { IWebview } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview";
 import { IWebviewService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IChatOutputRendererService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service";

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

@@ -9,7 +9,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { WebviewContentPurpose } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewContentPurpose } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -118,11 +118,11 @@ const chatOutputRendererContributionSchema = {
     properties: {
         viewType: {
             type: 'string',
-            description: ( localize(5344, 'Unique identifier for the renderer.')),
+            description: ( localize(5424, 'Unique identifier for the renderer.')),
         },
         mimeTypes: {
             type: 'array',
-            description: ( localize(5345, 'MIME types that this renderer can handle')),
+            description: ( localize(5425, 'MIME types that this renderer can handle')),
             items: {
                 type: 'string'
             }
@@ -137,7 +137,7 @@ const chatOutputRenderContributionPoint = ExtensionsRegistry.registerExtensionPo
         }
     },
     jsonSchema: {
-        description: ( localize(5346, 'Contributes a renderer for specific MIME types in chat outputs')),
+        description: ( localize(5426, 'Contributes a renderer for specific MIME types in chat outputs')),
         type: 'array',
         items: chatOutputRendererContributionSchema,
     }

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

@@ -15,28 +15,28 @@ import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { showExtensionsWithIdsCommandId } from '@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
+import { showExtensionsWithIdsCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsActions';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
+import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatViewContainerId, ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewPane } from './chatViewPane.js';
 
 const chatViewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
-    id: CHAT_SIDEBAR_PANEL_ID,
-    title: ( localize2(5347, "Chat")),
+    id: ChatViewContainerId,
+    title: ( localize2(5427, "Chat")),
     icon: Codicon.chatSparkle,
     ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
-        [CHAT_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]
+        [ChatViewContainerId, { mergeViewWithContainerWhenSingleView: true }]
     )),
-    storageId: CHAT_SIDEBAR_PANEL_ID,
+    storageId: ChatViewContainerId,
     hideIfEmpty: true,
     order: 1,
 }, ViewContainerLocation.AuxiliaryBar, { isDefault: true, doNotRegisterOpenCommand: true });
@@ -45,13 +45,13 @@ const chatViewDescriptor = {
     containerIcon: chatViewContainer.icon,
     containerTitle: chatViewContainer.title.value,
     singleViewPaneContainerTitle: chatViewContainer.title.value,
-    name: ( localize2(5347, "Chat")),
+    name: ( localize2(5427, "Chat")),
     canToggleVisibility: false,
     canMoveView: true,
     openCommandActionDescriptor: {
-        id: CHAT_SIDEBAR_PANEL_ID,
+        id: ChatViewContainerId,
         title: chatViewContainer.title,
-        mnemonicTitle: ( localize(5348, "&&Chat")),
+        mnemonicTitle: ( localize(5428, "&&Chat")),
         keybindings: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
             mac: {
@@ -60,14 +60,14 @@ const chatViewDescriptor = {
         },
         order: 1
     },
-    ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Chat }])),
+    ctorDescriptor: ( new SyncDescriptor(ChatViewPane)),
     when: ( ContextKeyExpr.or(( ContextKeyExpr.or(ChatContextKeys.Setup.hidden, ChatContextKeys.Setup.disabled))?.negate(), ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid))
 };
 ( Registry.as(Extensions.ViewsRegistry)).registerViews([chatViewDescriptor], chatViewContainer);
 const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatParticipants',
     jsonSchema: {
-        description: ( localize(5349, 'Contributes a chat participant')),
+        description: ( localize(5429, 'Contributes a chat participant')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -76,12 +76,12 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ['name', 'id'],
             properties: {
                 id: {
-                    description: ( localize(5350, "A unique id for this chat participant.")),
+                    description: ( localize(5430, "A unique id for this chat participant.")),
                     type: 'string'
                 },
                 name: {
                     description: ( localize(
-                        5351,
+                        5431,
                         "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',
@@ -89,37 +89,37 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 fullName: {
                     markdownDescription: ( localize(
-                        5352,
+                        5432,
                         "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(5353, "A description of this chat participant, shown in the UI.")),
+                    description: ( localize(5433, "A description of this chat participant, shown in the UI.")),
                     type: 'string'
                 },
                 isSticky: {
                     description: ( localize(
-                        5354,
+                        5434,
                         "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(
-                        5355,
+                        5435,
                         "When the user clicks this participant in `/help`, this text will be submitted to the participant."
                     )),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(5356, "A condition which must be true to enable this participant.")),
+                    description: ( localize(5436, "A condition which must be true to enable this participant.")),
                     type: 'string'
                 },
                 disambiguation: {
                     description: ( localize(
-                        5357,
+                        5437,
                         "Metadata to help with automatically routing user questions to this chat participant."
                     )),
                     type: 'array',
@@ -131,21 +131,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             category: {
                                 markdownDescription: ( localize(
-                                    5358,
+                                    5438,
                                     "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                 )),
                                 type: 'string'
                             },
                             description: {
                                 description: ( localize(
-                                    5359,
+                                    5439,
                                     "A detailed description of the kinds of questions that are suitable for this chat participant."
                                 )),
                                 type: 'string'
                             },
                             examples: {
                                 description: ( localize(
-                                    5360,
+                                    5440,
                                     "A list of representative example questions that are suitable for this chat participant."
                                 )),
                                 type: 'array'
@@ -155,7 +155,7 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                 },
                 commands: {
                     markdownDescription: ( localize(
-                        5361,
+                        5441,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: 'array',
@@ -167,36 +167,36 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                         properties: {
                             name: {
                                 description: ( localize(
-                                    5362,
+                                    5442,
                                     "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(5363, "A description of this command.")),
+                                description: ( localize(5443, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localize(5364, "A condition which must be true to enable this command.")),
+                                description: ( localize(5444, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                             sampleRequest: {
                                 description: ( localize(
-                                    5365,
+                                    5445,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: 'string'
                             },
                             isSticky: {
                                 description: ( localize(
-                                    5354,
+                                    5434,
                                     "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(
-                                    5366,
+                                    5446,
                                     "Metadata to help with automatically routing user questions to this chat command."
                                 )),
                                 type: 'array',
@@ -208,21 +208,21 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                                     properties: {
                                         category: {
                                             markdownDescription: ( localize(
-                                                5367,
+                                                5447,
                                                 "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                             )),
                                             type: 'string'
                                         },
                                         description: {
                                             description: ( localize(
-                                                5368,
+                                                5448,
                                                 "A detailed description of the kinds of questions that are suitable for this chat command."
                                             )),
                                             type: 'string'
                                         },
                                         examples: {
                                             description: ( localize(
-                                                5369,
+                                                5449,
                                                 "A list of representative example questions that are suitable for this chat command."
                                             )),
                                             type: 'array'
@@ -353,9 +353,9 @@ let ChatCompatibilityNotifier = class ChatCompatibilityNotifier extends Disposab
             return;
         }
         this.registeredWelcomeView = true;
-        const showExtensionLabel = ( localize(5370, "Show Extension"));
+        const showExtensionLabel = ( localize(5450, "Show Extension"));
         const mainMessage = ( localize(
-            5371,
+            5451,
             "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
         ));
@@ -387,10 +387,10 @@ class ChatParticipantDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5372, "Name")),
-            ( localize(5373, "Full Name")),
-            ( localize(5374, "Description")),
-            ( localize(5375, "Commands")),
+            ( localize(5452, "Name")),
+            ( localize(5453, "Full Name")),
+            ( localize(5454, "Description")),
+            ( localize(5455, "Commands")),
         ];
         const rows = ( nonDefaultContributions.map(d => {
             return [
@@ -411,7 +411,7 @@ class ChatParticipantDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$1.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'chatParticipants',
-    label: ( localize(5376, "Chat Participants")),
+    label: ( localize(5456, "Chat Participants")),
     access: {
         canToggle: false
     },

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

@@ -1,9 +1,10 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IQuickChatOpenOptions } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IQuickChatOpenOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IQuickChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class QuickChatService extends Disposable implements IQuickChatService {
     private readonly quickInputService;
@@ -18,6 +19,7 @@ export declare class QuickChatService extends Disposable implements IQuickChatSe
     constructor(quickInputService: IQuickInputService, chatService: IChatService, instantiationService: IInstantiationService);
     get enabled(): boolean;
     get focused(): boolean;
+    get sessionResource(): URI | undefined;
     toggle(options?: IQuickChatOpenOptions): void;
     open(options?: IQuickChatOpenOptions): void;
     focus(): void;

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

@@ -3,7 +3,6 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { isAncestorOfActiveElement, $, append, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Sash, Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -30,13 +29,12 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatMode } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModes';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var QuickChat_1;
@@ -59,6 +57,9 @@ let QuickChatService = class QuickChatService extends Disposable {
         }
         return isAncestorOfActiveElement(widget);
     }
+    get sessionResource() {
+        return this._input && this._currentChat?.sessionResource;
+    }
     toggle(options) {
         if (this.focused && !options?.query) {
             this.close();
@@ -135,23 +136,27 @@ let QuickChat = class QuickChat extends Disposable {
     static { QuickChat_1 = this; }
     static { this.DEFAULT_MIN_HEIGHT = 200; }
     static { this.DEFAULT_HEIGHT_OFFSET = 100; }
-    constructor(instantiationService, contextKeyService, chatService, layoutService, viewsService, chatEntitlementService, markdownRendererService) {
+    get sessionResource() {
+        return this.modelRef?.object.sessionResource;
+    }
+    constructor(instantiationService, contextKeyService, chatService, layoutService, chatWidgetService, chatEntitlementService, markdownRendererService) {
         super();
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
         this.chatService = chatService;
         this.layoutService = layoutService;
-        this.viewsService = viewsService;
+        this.chatWidgetService = chatWidgetService;
         this.chatEntitlementService = chatEntitlementService;
         this.markdownRendererService = markdownRendererService;
         this.maintainScrollTimer = this._register(( new MutableDisposable()));
         this._deferUpdatingDynamicLayout = false;
     }
     clear() {
-        this.model?.dispose();
-        this.model = undefined;
+        this.modelRef?.dispose();
+        this.modelRef = undefined;
         this.updateModel();
         this.widget.inputEditor.setValue('');
+        return Promise.resolve();
     }
     focus(selection) {
         if (this.widget) {
@@ -197,7 +202,8 @@ let QuickChat = class QuickChat extends Disposable {
             renderStyle: 'compact',
             menus: { inputSideToolbar: MenuId.ChatInputSide, telemetrySource: 'chatQuick' },
             enableImplicitContext: true,
-            defaultMode: ChatMode.Ask
+            defaultMode: ChatMode.Ask,
+            clear: () => this.clear(),
         }, {
             listForeground: quickInputForeground,
             listBackground: quickInputBackground,
@@ -230,7 +236,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle('hidden', !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    5384,
+                    5464,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? '',
                     product.defaultChatAgent?.provider?.default?.name ?? '',
@@ -253,10 +259,6 @@ let QuickChat = class QuickChat extends Disposable {
                 this._deferUpdatingDynamicLayout = true;
             }
         }));
-        this._register(this.widget.inputEditor.onDidChangeModelContent((e) => {
-            this._currentQuery = this.widget.inputEditor.getValue();
-        }));
-        this._register(this.widget.onDidClear(() => this.clear()));
         this._register(this.widget.onDidChangeHeight((e) => this.sash.layout()));
         const width = parent.offsetWidth;
         this._register(this.sash.onDidStart(() => {
@@ -278,11 +280,12 @@ let QuickChat = class QuickChat extends Disposable {
         return this.widget.acceptInput();
     }
     async openChatView() {
-        const widget = await showChatView(this.viewsService, this.layoutService);
-        if (!widget?.viewModel || !this.model) {
+        const widget = await this.chatWidgetService.revealWidget();
+        const model = this.modelRef?.object;
+        if (!widget?.viewModel || !model) {
             return;
         }
-        for (const request of this.model.getRequests()) {
+        for (const request of model.getRequests()) {
             if (request.response?.response.value || request.response?.result) {
                 const message = [];
                 for (const item of request.response.response.value) {
@@ -324,9 +327,9 @@ let QuickChat = class QuickChat extends Disposable {
                 });
             }
         }
-        const value = this.widget.inputEditor.getValue();
+        const value = this.widget.getViewState();
         if (value) {
-            widget.inputEditor.setValue(value);
+            widget.viewModel.model.inputModel.setState(value);
         }
         widget.focusInput();
     }
@@ -338,11 +341,18 @@ let QuickChat = class QuickChat extends Disposable {
         this.widget.inputEditor.setValue('');
     }
     updateModel() {
-        this.model ??= this.chatService.startSession(ChatAgentLocation.Chat, CancellationToken.None);
-        if (!this.model) {
+        this.modelRef ??= this.chatService.startSession(ChatAgentLocation.Chat, { disableBackgroundKeepAlive: true });
+        const model = this.modelRef?.object;
+        if (!model) {
             throw ( new Error('Could not start chat session'));
         }
-        this.widget.setModel(this.model, { inputValue: this._currentQuery });
+        this.modelRef.object.inputModel.setState({ inputText: '', selections: [] });
+        this.widget.setModel(model);
+    }
+    dispose() {
+        this.modelRef?.dispose();
+        this.modelRef = undefined;
+        super.dispose();
     }
 };
 QuickChat = QuickChat_1 = ( __decorate([
@@ -350,7 +360,7 @@ QuickChat = QuickChat_1 = ( __decorate([
     ( __param(1, IContextKeyService)),
     ( __param(2, IChatService)),
     ( __param(3, IWorkbenchLayoutService)),
-    ( __param(4, IViewsService)),
+    ( __param(4, IChatWidgetService)),
     ( __param(5, IChatEntitlementService)),
     ( __param(6, IMarkdownRendererService))
 ], QuickChat));

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

@@ -3,7 +3,7 @@ import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentPro
 import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { AccessibilityVerbositySettingId } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration";
-import { ChatTreeItem, IChatWidget } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ChatTreeItem, IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 export declare class ChatResponseAccessibleView implements IAccessibleViewImplementation {
     readonly priority = 100;
     readonly name = "panelChat";

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

@@ -6,10 +6,10 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { AccessibleViewType, AccessibleViewProviderId } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chat';
+import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { isResponseVM } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { toolContentToA11yString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
@@ -57,7 +57,7 @@ class ChatResponseAccessibleProvider extends Disposable {
             responseContent = item.errorDetails.message;
         }
         if (isResponseVM(item)) {
-            item.response.value.filter(item => item.kind === 'elicitation').forEach(elicitation => {
+            item.response.value.filter(item => item.kind === 'elicitation2' || item.kind === 'elicitationSerialized').forEach(elicitation => {
                 const title = elicitation.title;
                 if (typeof title === 'string') {
                     responseContent += `${title}\n`;
@@ -102,7 +102,7 @@ class ChatResponseAccessibleProvider extends Disposable {
                     responseContent += `\n${message}\n`;
                 }
                 else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                    responseContent += ( localize(5385, "Approve results of {0}? Result: ", toolInvocation.toolId)) + toolContentToA11yString(state.contentForModel) + '\n';
+                    responseContent += ( localize(5465, "Approve results of {0}? Result: ", toolInvocation.toolId)) + toolContentToA11yString(state.contentForModel) + '\n';
                 }
                 else {
                     const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);