@codingame/monaco-vscode-chat-service-override 22.1.9 → 23.0.0

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

@@ -25,12 +25,12 @@ import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode
 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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+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';
 
 const chatViewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: CHAT_SIDEBAR_PANEL_ID,
-    title: ( localize2(5183, "Chat")),
+    title: ( localize2(5327, "Chat")),
     icon: Codicon.chatSparkle,
     ctorDescriptor: ( new SyncDescriptor(
         ViewPaneContainer,
@@ -40,34 +40,34 @@ const chatViewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).regi
     hideIfEmpty: true,
     order: 1,
 }, ViewContainerLocation.AuxiliaryBar, { isDefault: true, doNotRegisterOpenCommand: true });
-const chatViewDescriptor = [{
-        id: ChatViewId,
-        containerIcon: chatViewContainer.icon,
-        containerTitle: chatViewContainer.title.value,
-        singleViewPaneContainerTitle: chatViewContainer.title.value,
-        name: ( localize2(5183, "Chat")),
-        canToggleVisibility: false,
-        canMoveView: true,
-        openCommandActionDescriptor: {
-            id: CHAT_SIDEBAR_PANEL_ID,
-            title: chatViewContainer.title,
-            mnemonicTitle: ( localize(5184, "&&Chat")),
-            keybindings: {
-                primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
-                mac: {
-                    primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
-                }
-            },
-            order: 1
+const chatViewDescriptor = {
+    id: ChatViewId,
+    containerIcon: chatViewContainer.icon,
+    containerTitle: chatViewContainer.title.value,
+    singleViewPaneContainerTitle: chatViewContainer.title.value,
+    name: ( localize2(5327, "Chat")),
+    canToggleVisibility: false,
+    canMoveView: true,
+    openCommandActionDescriptor: {
+        id: CHAT_SIDEBAR_PANEL_ID,
+        title: chatViewContainer.title,
+        mnemonicTitle: ( localize(5328, "&&Chat")),
+        keybindings: {
+            primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
+            mac: {
+                primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
+            }
         },
-        ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Chat }])),
-        when: ( ContextKeyExpr.or(( ContextKeyExpr.or(ChatContextKeys.Setup.hidden, ChatContextKeys.Setup.disabled))?.negate(), ChatContextKeys.panelParticipantRegistered, ChatContextKeys.extensionInvalid))
-    }];
-( Registry.as(Extensions.ViewsRegistry)).registerViews(chatViewDescriptor, chatViewContainer);
+        order: 1
+    },
+    ctorDescriptor: ( new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Chat }])),
+    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(5185, 'Contributes a chat participant')),
+        description: ( localize(5329, 'Contributes a chat participant')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -76,12 +76,12 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
             required: ['name', 'id'],
             properties: {
                 id: {
-                    description: ( localize(5186, "A unique id for this chat participant.")),
+                    description: ( localize(5330, "A unique id for this chat participant.")),
                     type: 'string'
                 },
                 name: {
                     description: ( localize(
-                        5187,
+                        5331,
                         "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(
-                        5188,
+                        5332,
                         "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(5189, "A description of this chat participant, shown in the UI.")),
+                    description: ( localize(5333, "A description of this chat participant, shown in the UI.")),
                     type: 'string'
                 },
                 isSticky: {
                     description: ( localize(
-                        5190,
+                        5334,
                         "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(
-                        5191,
+                        5335,
                         "When the user clicks this participant in `/help`, this text will be submitted to the participant."
                     )),
                     type: 'string'
                 },
                 when: {
-                    description: ( localize(5192, "A condition which must be true to enable this participant.")),
+                    description: ( localize(5336, "A condition which must be true to enable this participant.")),
                     type: 'string'
                 },
                 disambiguation: {
                     description: ( localize(
-                        5193,
+                        5337,
                         "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(
-                                    5194,
+                                    5338,
                                     "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                 )),
                                 type: 'string'
                             },
                             description: {
                                 description: ( localize(
-                                    5195,
+                                    5339,
                                     "A detailed description of the kinds of questions that are suitable for this chat participant."
                                 )),
                                 type: 'string'
                             },
                             examples: {
                                 description: ( localize(
-                                    5196,
+                                    5340,
                                     "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(
-                        5197,
+                        5341,
                         "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(
-                                    5198,
+                                    5342,
                                     "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(5199, "A description of this command.")),
+                                description: ( localize(5343, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localize(5200, "A condition which must be true to enable this command.")),
+                                description: ( localize(5344, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                             sampleRequest: {
                                 description: ( localize(
-                                    5201,
+                                    5345,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: 'string'
                             },
                             isSticky: {
                                 description: ( localize(
-                                    5190,
+                                    5334,
                                     "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(
-                                    5202,
+                                    5346,
                                     "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(
-                                                5203,
+                                                5347,
                                                 "A detailed name for this category, e.g. `workspace_questions` or `web_questions`."
                                             )),
                                             type: 'string'
                                         },
                                         description: {
                                             description: ( localize(
-                                                5204,
+                                                5348,
                                                 "A detailed description of the kinds of questions that are suitable for this chat command."
                                             )),
                                             type: 'string'
                                         },
                                         examples: {
                                             description: ( localize(
-                                                5205,
+                                                5349,
                                                 "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(5206, "Show Extension"));
+        const showExtensionLabel = ( localize(5350, "Show Extension"));
         const mainMessage = ( localize(
-            5207,
+            5351,
             "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(5208, "Name")),
-            ( localize(5209, "Full Name")),
-            ( localize(5210, "Description")),
-            ( localize(5211, "Commands")),
+            ( localize(5352, "Name")),
+            ( localize(5353, "Full Name")),
+            ( localize(5354, "Description")),
+            ( localize(5355, "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(5212, "Chat Participants")),
+    label: ( localize(5356, "Chat Participants")),
     access: {
         canToggle: false
     },

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

@@ -3,7 +3,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IQuickChatOpenOptions } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/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;

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

@@ -6,15 +6,15 @@ import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 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 '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { Disposable, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { MarkdownRenderer } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
-import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
+import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
@@ -27,15 +27,16 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
 import { quickInputBackground, quickInputForeground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
-import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 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 { isCellTextEditOperation } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+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 { 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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+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 { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var QuickChat_1;
@@ -134,7 +135,7 @@ 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) {
+    constructor(instantiationService, contextKeyService, chatService, layoutService, viewsService, chatEntitlementService, markdownRendererService) {
         super();
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
@@ -142,6 +143,7 @@ let QuickChat = class QuickChat extends Disposable {
         this.layoutService = layoutService;
         this.viewsService = viewsService;
         this.chatEntitlementService = chatEntitlementService;
+        this.markdownRendererService = markdownRendererService;
         this.maintainScrollTimer = this._register(( new MutableDisposable()));
         this._deferUpdatingDynamicLayout = false;
     }
@@ -189,7 +191,14 @@ let QuickChat = class QuickChat extends Disposable {
             IContextKeyService,
             this._register(this.contextKeyService.createScoped(parent))
         ]))));
-        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Chat, { isQuickChat: true }, { autoScroll: true, renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide, telemetrySource: 'chatQuick' }, enableImplicitContext: true }, {
+        this.widget = this._register(scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Chat, { isQuickChat: true }, {
+            autoScroll: true,
+            renderInputOnTop: true,
+            renderStyle: 'compact',
+            menus: { inputSideToolbar: MenuId.ChatInputSide, telemetrySource: 'chatQuick' },
+            enableImplicitContext: true,
+            defaultMode: ChatMode.Ask
+        }, {
             listForeground: quickInputForeground,
             listBackground: quickInputBackground,
             overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
@@ -220,9 +229,8 @@ let QuickChat = class QuickChat extends Disposable {
             const showDisclaimer = !sentiment.installed && anonymous && !requestInProgress;
             disclaimerElement.classList.toggle('hidden', !showDisclaimer);
             if (showDisclaimer) {
-                const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
-                const renderedMarkdown = disposables.add(markdown.render(( new MarkdownString(( localize(
-                    5220,
+                const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
+                    5364,
                     "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 ?? '',
@@ -270,7 +278,7 @@ let QuickChat = class QuickChat extends Disposable {
         return this.widget.acceptInput();
     }
     async openChatView() {
-        const widget = await showChatView(this.viewsService);
+        const widget = await showChatView(this.viewsService, this.layoutService);
         if (!widget?.viewModel || !this.model) {
             return;
         }
@@ -289,17 +297,17 @@ let QuickChat = class QuickChat extends Disposable {
                     }
                     else if (item.kind === 'notebookEditGroup') {
                         for (const group of item.edits) {
-                            if (isCellTextEditOperation(group)) {
+                            if (isCellTextEditOperationArray(group)) {
                                 message.push({
                                     kind: 'textEdit',
-                                    edits: [group.edit],
-                                    uri: group.uri
+                                    edits: ( group.map(e => e.edit)),
+                                    uri: group[0].uri
                                 });
                             }
                             else {
                                 message.push({
                                     kind: 'notebookEdit',
-                                    edits: [group],
+                                    edits: group,
                                     uri: item.uri
                                 });
                             }
@@ -309,7 +317,7 @@ let QuickChat = class QuickChat extends Disposable {
                         message.push(item);
                     }
                 }
-                this.chatService.addCompleteRequest(widget.viewModel.sessionId, request.message, request.variableData, request.attempt, {
+                this.chatService.addCompleteRequest(widget.viewModel.sessionResource, request.message, request.variableData, request.attempt, {
                     message,
                     result: request.response.result,
                     followups: request.response.followups
@@ -341,9 +349,10 @@ QuickChat = QuickChat_1 = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, IContextKeyService)),
     ( __param(2, IChatService)),
-    ( __param(3, ILayoutService)),
+    ( __param(3, IWorkbenchLayoutService)),
     ( __param(4, IViewsService)),
-    ( __param(5, IChatEntitlementService))
+    ( __param(5, IChatEntitlementService)),
+    ( __param(6, IMarkdownRendererService))
 ], QuickChat));
 
 export { QuickChatService };

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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ChatTreeItem, IChatWidget } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/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

@@ -3,11 +3,14 @@ import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/b
 import { isMarkdownString, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+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-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chat';
+import { migrateLegacyTerminalToolSpecificData } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+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 { 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';
 
 class ChatResponseAccessibleView {
@@ -72,7 +75,8 @@ class ChatResponseAccessibleProvider extends Disposable {
             });
             const toolInvocations = item.response.value.filter(item => item.kind === 'toolInvocation');
             for (const toolInvocation of toolInvocations) {
-                if (toolInvocation.confirmationMessages) {
+                const state = toolInvocation.state.get();
+                if (toolInvocation.confirmationMessages?.title && state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
                     const title = typeof toolInvocation.confirmationMessages.title === 'string' ? toolInvocation.confirmationMessages.title : toolInvocation.confirmationMessages.title.value;
                     const message = typeof toolInvocation.confirmationMessages.message === 'string' ? toolInvocation.confirmationMessages.message : stripIcons(renderAsPlaintext(toolInvocation.confirmationMessages.message));
                     let input = '';
@@ -97,9 +101,15 @@ class ChatResponseAccessibleProvider extends Disposable {
                     }
                     responseContent += `\n${message}\n`;
                 }
-                else if (toolInvocation.isComplete && toolInvocation.resultDetails && 'input' in toolInvocation.resultDetails) {
-                    responseContent += '\n' + toolInvocation.resultDetails.isError ? 'Errored ' : 'Completed ';
-                    responseContent += `${`${typeof toolInvocation.invocationMessage === 'string' ? toolInvocation.invocationMessage : stripIcons(renderAsPlaintext(toolInvocation.invocationMessage))} with input: ${toolInvocation.resultDetails.input}`}\n`;
+                else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                    responseContent += ( localize(5365, "Approve results of {0}? Result: ", toolInvocation.toolId)) + toolContentToA11yString(state.contentForModel) + '\n';
+                }
+                else {
+                    const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
+                    if (resultDetails && 'input' in resultDetails) {
+                        responseContent += '\n' + (resultDetails.isError ? 'Errored ' : 'Completed ');
+                        responseContent += `${`${typeof toolInvocation.invocationMessage === 'string' ? toolInvocation.invocationMessage : stripIcons(renderAsPlaintext(toolInvocation.invocationMessage))} with input: ${resultDetails.input}`}\n`;
+                    }
                 }
             }
             const pastConfirmations = item.response.value.filter(item => item.kind === 'toolInvocationSerialized');

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

@@ -1,18 +1,21 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { GroupModelChangeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
-import { ChatEditorInput } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
-import { IChatSessionItem, IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatSessionItem, IChatSessionItemProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
+import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
+import { ChatEditorInput } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput";
 export declare class ChatSessionTracker extends Disposable {
     private readonly editorGroupsService;
     private readonly chatService;
+    private readonly chatSessionsService;
     private readonly _onDidChangeEditors;
+    private readonly groupDisposables;
     readonly onDidChangeEditors: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<{
         sessionType: string;
         kind: GroupModelChangeKind;
     }>;
-    constructor(editorGroupsService: IEditorGroupsService, chatService: IChatService);
+    constructor(editorGroupsService: IEditorGroupsService, chatService: IChatService, chatSessionsService: IChatSessionsService);
     private setupEditorTracking;
     private registerGroupListeners;
     getLocalEditorsForSessionType(sessionType: string): ChatEditorInput[];

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

@@ -1,21 +1,23 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { isChatSession, getChatSessionType } from './common.js';
-import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { localChatSessionType, ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { isChatSession } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/common';
 
 let ChatSessionTracker = class ChatSessionTracker extends Disposable {
-    constructor(editorGroupsService, chatService) {
+    constructor(editorGroupsService, chatService, chatSessionsService) {
         super();
         this.editorGroupsService = editorGroupsService;
         this.chatService = chatService;
+        this.chatSessionsService = chatSessionsService;
         this._onDidChangeEditors = this._register(( new Emitter()));
+        this.groupDisposables = this._register(( new DisposableMap()));
         this.onDidChangeEditors = this._onDidChangeEditors.event;
         this.setupEditorTracking();
     }
@@ -26,14 +28,18 @@ let ChatSessionTracker = class ChatSessionTracker extends Disposable {
         this._register(this.editorGroupsService.onDidAddGroup(group => {
             this.registerGroupListeners(group);
         }));
+        this._register(this.editorGroupsService.onDidRemoveGroup(group => {
+            this.groupDisposables.deleteAndDispose(group.id);
+        }));
     }
     registerGroupListeners(group) {
-        this._register(group.onDidModelChange(e => {
-            if (!isChatSession(e.editor)) {
+        this.groupDisposables.set(group.id, group.onDidModelChange(e => {
+            if (!isChatSession(this.chatSessionsService.getContentProviderSchemes(), e.editor)) {
                 return;
             }
             const editor = e.editor;
-            const sessionType = getChatSessionType(editor);
+            const sessionType = editor.getSessionType();
+            this.chatSessionsService.notifySessionItemsChanged(sessionType);
             this._onDidChangeEditors.fire({ sessionType, kind: e.kind });
         }));
     }
@@ -41,7 +47,7 @@ let ChatSessionTracker = class ChatSessionTracker extends Disposable {
         const localEditors = [];
         this.editorGroupsService.groups.forEach(group => {
             group.editors.forEach(editor => {
-                if (editor instanceof ChatEditorInput && getChatSessionType(editor) === sessionType) {
+                if (editor instanceof ChatEditorInput && editor.getSessionType() === sessionType) {
                     localEditors.push(editor);
                 }
             });
@@ -49,7 +55,7 @@ let ChatSessionTracker = class ChatSessionTracker extends Disposable {
         return localEditors;
     }
     async getHybridSessionsForProvider(provider) {
-        if (provider.chatSessionType === 'local') {
+        if (provider.chatSessionType === localChatSessionType) {
             return [];
         }
         const localEditors = this.getLocalEditorsForSessionType(provider.chatSessionType);
@@ -62,24 +68,25 @@ let ChatSessionTracker = class ChatSessionTracker extends Disposable {
             if (editor.options.ignoreInView) {
                 return;
             }
-            let status;
+            let status = ChatSessionStatus.Completed;
             let timestamp;
-            if (editor.sessionId) {
-                const model = this.chatService.getSession(editor.sessionId);
-                if (model) {
-                    status = this.modelToStatus(model);
+            if (editor.sessionResource) {
+                const model = this.chatService.getSession(editor.sessionResource);
+                const modelStatus = model ? this.modelToStatus(model) : undefined;
+                if (model && modelStatus) {
+                    status = modelStatus;
                     const requests = model.getRequests();
                     if (requests.length > 0) {
                         timestamp = requests[requests.length - 1].timestamp;
                     }
                 }
             }
-            const parsed = ChatSessionUri.parse(editor.resource);
+            const parsed = LocalChatSessionUri.parse(editor.resource);
             const hybridSession = {
                 id: parsed?.sessionId || editor.sessionId || `${provider.chatSessionType}-local-${index}`,
+                resource: editor.resource,
                 label: editor.getName(),
-                iconPath: Codicon.chatSparkle,
-                status,
+                status: status,
                 provider,
                 timing: {
                     startTime: timestamp ?? Date.now()
@@ -121,7 +128,8 @@ let ChatSessionTracker = class ChatSessionTracker extends Disposable {
 };
 ChatSessionTracker = ( __decorate([
     ( __param(0, IEditorGroupsService)),
-    ( __param(1, IChatService))
+    ( __param(1, IChatService)),
+    ( __param(2, IChatSessionsService))
 ], ChatSessionTracker));
 
 export { ChatSessionTracker };