@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.0.1

package/index.js

@@ -2,70 +2,70 @@
 import '@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IChatCodeBlockContextProviderService, IChatAccessibilityService, IQuickChatService, IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatAccessibilityService } from './vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.js';
-import { QuickChatService } from './vscode/src/vs/workbench/contrib/chat/browser/chatQuick.js';
-import { ChatVariablesService } from './vscode/src/vs/workbench/contrib/chat/browser/chatVariables.js';
+import { ChatAccessibilityService } from './vscode/src/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityService.js';
+import { QuickChatService } from './vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js';
+import { ChatVariablesService } from './vscode/src/vs/workbench/contrib/chat/browser/attachments/chatVariables.js';
 import { ChatCodeBlockContextProviderService } from './vscode/src/vs/workbench/contrib/chat/browser/codeBlockContextProviderService.js';
-import { ChatAgentNameService, ChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { IChatAgentNameService, IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatService } from './vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js';
-import { ChatSlashCommandService } from './vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js';
-import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
-import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
-import { ChatWidgetHistoryService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService';
-import { IChatWidgetHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service';
+import { ChatAgentNameService, ChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
+import { IChatAgentNameService, IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ChatService } from './vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.js';
+import { ChatSlashCommandService } from './vscode/src/vs/workbench/contrib/chat/common/participants/chatSlashCommands.js';
+import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
+import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables.service';
+import { ChatWidgetHistoryService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService';
+import { IChatWidgetHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.service';
 import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { LanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { InlineChatSessionServiceImpl } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { LanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { LanguageModelToolsService } from './vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsService.js';
-import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
-import { CodeMapperService } from './vscode/src/vs/workbench/contrib/chat/common/chatCodeMapperService.js';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+import { LanguageModelToolsService } from './vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.js';
+import { ICodeMapperService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.service';
+import { CodeMapperService } from './vscode/src/vs/workbench/contrib/chat/common/editing/chatCodeMapperService.js';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
 import { LanguageModelIgnoredFilesService } from './vscode/src/vs/workbench/contrib/chat/common/ignoredFiles.js';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.service';
-import { ChatMarkdownAnchorService } from './vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownAnchorService.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
+import { ChatMarkdownAnchorService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.js';
 import { ChatEditingService } from './vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.js';
 import { ChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { PromptsService } from './vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service';
-import { ChatTransferService } from './vscode/src/vs/workbench/contrib/chat/common/chatTransferService.js';
-import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
-import { ChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
-import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service';
-import { ChatAttachmentResolveService } from './vscode/src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.js';
+import { IChatTransferService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatTransferService.service';
+import { ChatTransferService } from './vscode/src/vs/workbench/contrib/chat/common/model/chatTransferService.js';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
+import { ChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService';
+import { IChatAttachmentResolveService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service';
+import { ChatAttachmentResolveService } from './vscode/src/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.js';
 import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service';
 import { RemoteCodingAgentsService } from './vscode/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.js';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { ChatSessionsService } from './vscode/src/vs/workbench/contrib/chat/browser/chatSessions.contribution.js';
+import { ChatSessionsService } from './vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.js';
 import { ChatOutputRendererService } from './vscode/src/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.js';
 import { IChatOutputRendererService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service';
-import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service';
-import { ChatTodoListService } from './vscode/src/vs/workbench/contrib/chat/common/chatTodoListService.js';
-import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatLayoutService.service';
-import { ChatLayoutService } from './vscode/src/vs/workbench/contrib/chat/browser/chatLayoutService.js';
+import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service';
+import { ChatTodoListService } from './vscode/src/vs/workbench/contrib/chat/common/tools/chatTodoListService.js';
+import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service';
+import { ChatLayoutService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatLayoutService.js';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
 import { AiEditTelemetryServiceImpl } from './vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.js';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { ChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service';
-import { LanguageModelToolsConfirmationService } from './vscode/src/vs/workbench/contrib/chat/browser/languageModelToolsConfirmationService.js';
-import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service';
-import { ChatContextService } from './vscode/src/vs/workbench/contrib/chat/browser/chatContextService.js';
+import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
+import { LanguageModelToolsConfirmationService } from './vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.js';
+import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
+import { ChatContextService } from './vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.js';
 import { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalChatService } from './vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatService.js';
 import { ChatStatusItemService } from './vscode/src/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.js';
 import { IChatStatusItemService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatus/chatStatusItemService.service';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { AgentSessionsService } from './vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
-import { ChatWidgetService } from './vscode/src/vs/workbench/contrib/chat/browser/chatWidgetService.js';
+import { ChatWidgetService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.js';
 import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
 import './vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js';
 import './vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "24.3.0",
+  "version": "25.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - chat service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.3.0",
-    "@codingame/monaco-vscode-katex-common": "24.3.0",
-    "@codingame/monaco-vscode-xterm-addons-common": "24.3.0",
-    "@codingame/monaco-vscode-xterm-common": "24.3.0"
+    "@codingame/monaco-vscode-api": "25.0.1",
+    "@codingame/monaco-vscode-katex-common": "25.0.1",
+    "@codingame/monaco-vscode-xterm-addons-common": "25.0.1",
+    "@codingame/monaco-vscode-xterm-common": "25.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAccessibilityService.d.ts → accessibility/chatAccessibilityService.d.ts}

@@ -1,28 +1,30 @@
 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 { IAccessibilitySignalService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
-import { IChatElicitationRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatElicitationRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 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 { ChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
 export declare class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
     private readonly _accessibilitySignalService;
     private readonly _instantiationService;
     private readonly _configurationService;
     private readonly _hostService;
     private readonly _widgetService;
+    private readonly _chatService;
     readonly _serviceBrand: undefined;
     private _pendingSignalMap;
-    private _requestId;
     private readonly notifications;
-    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _hostService: IHostService, _widgetService: IChatWidgetService);
+    constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _hostService: IHostService, _widgetService: IChatWidgetService, _chatService: IChatService);
     dispose(): void;
-    acceptRequest(): number;
-    disposeRequest(requestId: number): void;
-    acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+    acceptRequest(uri: URI): void;
+    disposeRequest(requestId: URI): void;
+    acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: URI, isVoiceInput?: boolean): void;
     acceptElicitation(elicitation: IChatElicitationRequest): void;
     private _showOSNotification;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAccessibilityService.js → accessibility/chatAccessibilityService.js}

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { getWindow, triggerNotification } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
-import { status, alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { alert, status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { 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, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -15,23 +15,36 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { FocusMode } from '@codingame/monaco-vscode-api/vscode/vs/platform/native/common/native';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { AccessibilityVoiceSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
-    constructor(_accessibilitySignalService, _instantiationService, _configurationService, _hostService, _widgetService) {
+    constructor(_accessibilitySignalService, _instantiationService, _configurationService, _hostService, _widgetService, _chatService) {
         super();
         this._accessibilitySignalService = _accessibilitySignalService;
         this._instantiationService = _instantiationService;
         this._configurationService = _configurationService;
         this._hostService = _hostService;
         this._widgetService = _widgetService;
+        this._chatService = _chatService;
         this._pendingSignalMap = this._register(( new DisposableMap()));
-        this._requestId = 0;
         this.notifications = ( new Set());
+        this._register(this._widgetService.onDidBackgroundSession(e => {
+            const session = this._chatService.getSession(e);
+            if (!session) {
+                return;
+            }
+            const requestInProgress = session.requestInProgress.get();
+            if (!requestInProgress) {
+                return;
+            }
+            alert(( localize(4588, "Chat session will continue in the background.")));
+            this.disposeRequest(e);
+        }));
     }
     dispose() {
         for (const ds of Array.from(this.notifications)) {
@@ -40,11 +53,9 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         this.notifications.clear();
         super.dispose();
     }
-    acceptRequest() {
-        this._requestId++;
+    acceptRequest(uri) {
         this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
-        this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
-        return this._requestId;
+        this._pendingSignalMap.set(uri, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
     }
     disposeRequest(requestId) {
         this._pendingSignalMap.deleteAndDispose(requestId);
@@ -92,9 +103,9 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
             ds.dispose();
             this.notifications.delete(ds);
         }
-        const title = widget?.viewModel?.model.title ? ( localize(5006, "Chat: {0}", widget.viewModel.model.title)) : ( localize(5007, "Untitled Chat"));
+        const title = widget?.viewModel?.model.title ? ( localize(4589, "Chat: {0}", widget.viewModel.model.title)) : ( localize(4590, "Untitled Chat"));
         const notification = await triggerNotification(title, {
-            detail: ( localize(5008, "New chat response."))
+            detail: ( localize(4591, "New chat response."))
         });
         if (!notification) {
             return;
@@ -122,7 +133,8 @@ ChatAccessibilityService = ( __decorate([
     ( __param(1, IInstantiationService)),
     ( __param(2, IConfigurationService)),
     ( __param(3, IHostService)),
-    ( __param(4, IChatWidgetService))
+    ( __param(4, IChatWidgetService)),
+    ( __param(5, IChatService))
 ], ChatAccessibilityService));
 
 export { ChatAccessibilityService };

package/vscode/src/vs/workbench/contrib/chat/browser/{chatResponseAccessibleView.d.ts → accessibility/chatResponseAccessibleView.d.ts}

@@ -1,3 +1,4 @@
+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 { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
 import { IAccessibleViewImplementation } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
@@ -15,6 +16,9 @@ declare class ChatResponseAccessibleProvider extends Disposable implements IAcce
     private readonly _widget;
     private readonly _wasOpenedFromInput;
     private _focusedItem;
+    private readonly _focusedItemDisposables;
+    private readonly _onDidChangeContent;
+    readonly onDidChangeContent: Event<void>;
     constructor(_widget: IChatWidget, item: ChatTreeItem, _wasOpenedFromInput: boolean);
     readonly id = AccessibleViewProviderId.PanelChat;
     readonly verbositySettingKey = AccessibilityVerbositySettingId.Chat;
@@ -22,7 +26,9 @@ declare class ChatResponseAccessibleProvider extends Disposable implements IAcce
         type: AccessibleViewType;
     };
     provideContent(): string;
+    private _setFocusedItem;
     private _getContent;
+    private _normalizeWhitespace;
     onClose(): void;
     provideNextContent(): string | undefined;
     providePreviousContent(): string | undefined;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatResponseAccessibleView.js → accessibility/chatResponseAccessibleView.js}

@@ -1,16 +1,17 @@
 
 import { renderAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 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 { Disposable, DisposableStore } 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-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-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
-import { toolContentToA11yString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import { isToolResultInputOutputDetails, isToolResultOutputDetails, toolContentToA11yString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 class ChatResponseAccessibleView {
@@ -43,14 +44,24 @@ class ChatResponseAccessibleProvider extends Disposable {
         super();
         this._widget = _widget;
         this._wasOpenedFromInput = _wasOpenedFromInput;
+        this._focusedItemDisposables = this._register(( new DisposableStore()));
+        this._onDidChangeContent = this._register(( new Emitter()));
+        this.onDidChangeContent = this._onDidChangeContent.event;
         this.id = AccessibleViewProviderId.PanelChat;
         this.verbositySettingKey = AccessibilityVerbositySettingId.Chat;
         this.options = { type: AccessibleViewType.View };
-        this._focusedItem = item;
+        this._setFocusedItem(item);
     }
     provideContent() {
         return this._getContent(this._focusedItem);
     }
+    _setFocusedItem(item) {
+        this._focusedItem = item;
+        this._focusedItemDisposables.clear();
+        if (isResponseVM(item)) {
+            this._focusedItemDisposables.add(item.model.onDidChange(() => this._onDidChangeContent.fire()));
+        }
+    }
     _getContent(item) {
         let responseContent = isResponseVM(item) ? ( item.response.toString()) : '';
         if (!responseContent && 'errorDetails' in item && item.errorDetails) {
@@ -102,7 +113,12 @@ class ChatResponseAccessibleProvider extends Disposable {
                     responseContent += `\n${message}\n`;
                 }
                 else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                    responseContent += ( localize(5465, "Approve results of {0}? Result: ", toolInvocation.toolId)) + toolContentToA11yString(state.contentForModel) + '\n';
+                    const postApprovalDetails = isToolResultInputOutputDetails(state.resultDetails)
+                        ? state.resultDetails.input
+                        : isToolResultOutputDetails(state.resultDetails)
+                            ? undefined
+                            : toolContentToA11yString(state.contentForModel);
+                    responseContent += ( localize(4592, "Approve results of {0}? Result: ", toolInvocation.toolId)) + (postApprovalDetails ?? '') + '\n';
                 }
                 else {
                     const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
@@ -121,7 +137,19 @@ class ChatResponseAccessibleProvider extends Disposable {
                 }
             }
         }
-        return renderAsPlaintext(( new MarkdownString(responseContent)), { includeCodeBlocksFences: true });
+        const plainText = renderAsPlaintext(( new MarkdownString(responseContent)), { includeCodeBlocksFences: true });
+        return this._normalizeWhitespace(plainText);
+    }
+    _normalizeWhitespace(content) {
+        const lines = content.split(/\r?\n/);
+        const normalized = [];
+        for (const line of lines) {
+            if (line.trim().length === 0) {
+                continue;
+            }
+            normalized.push(line);
+        }
+        return normalized.join('\n');
     }
     onClose() {
         this._widget.reveal(this._focusedItem);
@@ -135,7 +163,7 @@ class ChatResponseAccessibleProvider extends Disposable {
     provideNextContent() {
         const next = this._widget.getSibling(this._focusedItem, 'next');
         if (next) {
-            this._focusedItem = next;
+            this._setFocusedItem(next);
             return this._getContent(next);
         }
         return;
@@ -143,7 +171,7 @@ class ChatResponseAccessibleProvider extends Disposable {
     providePreviousContent() {
         const previous = this._widget.getSibling(this._focusedItem, 'previous');
         if (previous) {
-            this._focusedItem = previous;
+            this._setFocusedItem(previous);
             return this._getContent(previous);
         }
         return;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatTerminalOutputAccessibleView.js → accessibility/chatTerminalOutputAccessibleView.js}

@@ -1,7 +1,7 @@
 
 import { AccessibleViewType, AccessibleContentProvider, 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 
 class ChatTerminalOutputAccessibleView {

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityActions.js

@@ -5,8 +5,8 @@ import { Action2, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility';
 
 const ACTION_ID_FOCUS_CHAT_CONFIRMATION = 'workbench.action.chat.focusConfirmation';
@@ -14,8 +14,8 @@ class AnnounceChatConfirmationAction extends Action2 {
     constructor() {
         super({
             id: ACTION_ID_FOCUS_CHAT_CONFIRMATION,
-            title: { value: ( localize(4544, 'Focus Chat Confirmation')), original: 'Focus Chat Confirmation' },
-            category: { value: ( localize(4545, 'Chat')), original: 'Chat' },
+            title: { value: ( localize(4593, 'Focus Chat Confirmation')), original: 'Focus Chat Confirmation' },
+            category: { value: ( localize(4594, 'Chat')), original: 'Chat' },
             precondition: ChatContextKeys.enabled,
             f1: true,
             keybinding: {
@@ -29,12 +29,12 @@ class AnnounceChatConfirmationAction extends Action2 {
         const chatWidgetService = accessor.get(IChatWidgetService);
         const pendingWidget = chatWidgetService.getAllWidgets().find(widget => widget.viewModel?.model.requestNeedsInput.get());
         if (!pendingWidget) {
-            alert(( localize(4546, 'No active chat session found.')));
+            alert(( localize(4595, 'No active chat session found.')));
             return;
         }
         const viewModel = pendingWidget.viewModel;
         if (!viewModel) {
-            alert(( localize(4547, 'Chat interface not ready.')));
+            alert(( localize(4596, 'Chat interface not ready.')));
             return;
         }
         let firstConfirmationElement;
@@ -49,7 +49,7 @@ class AnnounceChatConfirmationAction extends Action2 {
             firstConfirmationElement.focus();
         }
         else {
-            alert(( localize(4548, 'No chat confirmation required')));
+            alert(( localize(4597, 'No chat confirmation required')));
         }
     }
 }