@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.1

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

@@ -1,15 +1,16 @@
 
 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 { isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 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/actions/chatContextKeys';
-import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isLegacyChatTerminalToolInvocationData, 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';
@@ -17,7 +18,7 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 class ChatResponseAccessibleView {
     constructor() {
         this.priority = 100;
-        this.name = 'panelChat';
+        this.name = "panelChat";
         this.type = AccessibleViewType.View;
         this.when = ChatContextKeys.inChatSession;
     }
@@ -39,6 +40,114 @@ class ChatResponseAccessibleView {
         return ( new ChatResponseAccessibleProvider(verifiedWidget, focusedItem, chatInputFocused));
     }
 }
+function isOutputDetailsSerialized(obj) {
+    return typeof obj === "object" && obj !== null && "output" in obj && typeof obj.output === "object" && obj.output?.type === "data" && typeof obj.output?.base64Data === "string";
+}
+function getToolSpecificDataDescription(toolSpecificData) {
+    if (!toolSpecificData) {
+        return "";
+    }
+    if (isLegacyChatTerminalToolInvocationData(toolSpecificData) || toolSpecificData.kind === "terminal") {
+        const terminalData = migrateLegacyTerminalToolSpecificData(toolSpecificData);
+        return terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+    }
+    switch (toolSpecificData.kind) {
+    case "subagent":
+        {
+            const parts = [];
+            if (toolSpecificData.agentName) {
+                parts.push(( localize(4601, "Agent: {0}", toolSpecificData.agentName)));
+            }
+            if (toolSpecificData.description) {
+                parts.push(toolSpecificData.description);
+            }
+            if (toolSpecificData.prompt) {
+                parts.push(( localize(4602, "Task: {0}", toolSpecificData.prompt)));
+            }
+            return parts.join(". ") || "";
+        }
+    case "extensions":
+        return toolSpecificData.extensions.length > 0 ? ( localize(4603, "Extensions: {0}", toolSpecificData.extensions.join(", "))) : "";
+    case "todoList":
+        {
+            const todos = toolSpecificData.todoList;
+            if (todos.length === 0) {
+                return "";
+            }
+            const todoDescriptions = ( todos.map(t => ( localize(4604, "{0} ({1})", t.title, t.status))));
+            return localize(4605, "{0} items: {1}", todos.length, todoDescriptions.join("; "));
+        }
+    case "pullRequest":
+        return localize(4606, "PR: {0} by {1}", toolSpecificData.title, toolSpecificData.author);
+    case "input":
+        return typeof toolSpecificData.rawInput === "string" ? toolSpecificData.rawInput : JSON.stringify(toolSpecificData.rawInput);
+    default:
+        return "";
+    }
+}
+function getResultDetailsDescription(resultDetails) {
+    if (!resultDetails) {
+        return {};
+    }
+    if (Array.isArray(resultDetails)) {
+        const files = ( resultDetails.map(ref => {
+            if (URI.isUri(ref)) {
+                return ref.fsPath || ref.path;
+            }
+            return ref.uri.fsPath || ref.uri.path;
+        }));
+        return {
+            files
+        };
+    }
+    if (isToolResultInputOutputDetails(resultDetails)) {
+        return {
+            input: resultDetails.input,
+            isError: resultDetails.isError
+        };
+    }
+    if (isOutputDetailsSerialized(resultDetails)) {
+        return {
+            input: ( localize(4607, "{0} data", resultDetails.output.mimeType))
+        };
+    }
+    if (isToolResultOutputDetails(resultDetails)) {
+        return {
+            input: ( localize(4607, "{0} data", resultDetails.output.mimeType))
+        };
+    }
+    return {};
+}
+function getToolInvocationA11yDescription(
+    invocationMessage,
+    pastTenseMessage,
+    toolSpecificData,
+    resultDetails,
+    isComplete
+) {
+    const parts = [];
+    const message = isComplete && pastTenseMessage ? pastTenseMessage : invocationMessage;
+    if (message) {
+        parts.push(message);
+    }
+    const toolDataDesc = getToolSpecificDataDescription(toolSpecificData);
+    if (toolDataDesc) {
+        parts.push(toolDataDesc);
+    }
+    if (isComplete && resultDetails) {
+        const details = getResultDetailsDescription(resultDetails);
+        if (details.isError) {
+            parts.unshift(( localize(4608, "Errored")));
+        }
+        if (details.input && !toolDataDesc) {
+            parts.push(( localize(4609, "Input: {0}", details.input)));
+        }
+        if (details.files && details.files.length > 0) {
+            parts.push(( localize(4610, "Files: {0}", details.files.join(", "))));
+        }
+    }
+    return parts.join(". ");
+}
 class ChatResponseAccessibleProvider extends Disposable {
     constructor(_widget, item, _wasOpenedFromInput) {
         super();
@@ -49,7 +158,9 @@ class ChatResponseAccessibleProvider extends Disposable {
         this.onDidChangeContent = this._onDidChangeContent.event;
         this.id = AccessibleViewProviderId.PanelChat;
         this.verbositySettingKey = AccessibilityVerbositySettingId.Chat;
-        this.options = { type: AccessibleViewType.View };
+        this.options = {
+            type: AccessibleViewType.View
+        };
         this._setFocusedItem(item);
     }
     provideContent() {
@@ -62,83 +173,117 @@ class ChatResponseAccessibleProvider extends Disposable {
             this._focusedItemDisposables.add(item.model.onDidChange(() => this._onDidChangeContent.fire()));
         }
     }
+    _renderMessageAsPlaintext(message) {
+        return typeof message === "string" ? message : stripIcons(renderAsPlaintext(message, {
+            useLinkFormatter: true
+        }));
+    }
     _getContent(item) {
-        let responseContent = isResponseVM(item) ? ( item.response.toString()) : '';
-        if (!responseContent && 'errorDetails' in item && item.errorDetails) {
-            responseContent = item.errorDetails.message;
+        const contentParts = [];
+        if (!isResponseVM(item)) {
+            return "";
         }
-        if (isResponseVM(item)) {
-            item.response.value.filter(item => item.kind === 'elicitation2' || item.kind === 'elicitationSerialized').forEach(elicitation => {
-                const title = elicitation.title;
-                if (typeof title === 'string') {
-                    responseContent += `${title}\n`;
-                }
-                else if (isMarkdownString(title)) {
-                    responseContent += renderAsPlaintext(title, { includeCodeBlocksFences: true }) + '\n';
-                }
-                const message = elicitation.message;
-                if (isMarkdownString(message)) {
-                    responseContent += renderAsPlaintext(message, { includeCodeBlocksFences: true });
+        if ("errorDetails" in item && item.errorDetails) {
+            contentParts.push(item.errorDetails.message);
+        }
+        for (const part of item.response.value) {
+            switch (part.kind) {
+            case "thinking":
+                {
+                    const thinkingValue = Array.isArray(part.value) ? part.value.join("") : (part.value || "");
+                    const trimmed = thinkingValue.trim();
+                    if (trimmed) {
+                        contentParts.push(( localize(4611, "Thinking: {0}", trimmed)));
+                    }
+                    break;
                 }
-                else {
-                    responseContent += message;
+            case "markdownContent":
+                {
+                    const text = renderAsPlaintext(part.content, {
+                        includeCodeBlocksFences: true,
+                        useLinkFormatter: true
+                    });
+                    if (text.trim()) {
+                        contentParts.push(text);
+                    }
+                    break;
                 }
-            });
-            const toolInvocations = item.response.value.filter(item => item.kind === 'toolInvocation');
-            for (const toolInvocation of toolInvocations) {
-                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 = '';
-                    if (toolInvocation.toolSpecificData) {
-                        if (toolInvocation.toolSpecificData?.kind === 'terminal') {
-                            const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
-                            input = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
-                        }
-                        else {
-                            input = toolInvocation.toolSpecificData?.kind === 'extensions'
-                                ? JSON.stringify(toolInvocation.toolSpecificData.extensions)
-                                : toolInvocation.toolSpecificData?.kind === 'todoList'
-                                    ? JSON.stringify(toolInvocation.toolSpecificData.todoList)
-                                    : toolInvocation.toolSpecificData?.kind === 'pullRequest'
-                                        ? JSON.stringify(toolInvocation.toolSpecificData)
-                                        : JSON.stringify(toolInvocation.toolSpecificData.rawInput);
-                        }
+            case "elicitation2":
+            case "elicitationSerialized":
+                {
+                    const title = part.title;
+                    let elicitationContent = "";
+                    if (typeof title === "string") {
+                        elicitationContent += `${title}\n`;
+                    } else if (isMarkdownString(title)) {
+                        elicitationContent += renderAsPlaintext(title, {
+                            includeCodeBlocksFences: true
+                        }) + "\n";
                     }
-                    responseContent += `${title}`;
-                    if (input) {
-                        responseContent += `: ${input}`;
+                    const message = part.message;
+                    if (isMarkdownString(message)) {
+                        elicitationContent += renderAsPlaintext(message, {
+                            includeCodeBlocksFences: true
+                        });
+                    } else {
+                        elicitationContent += message;
                     }
-                    responseContent += `\n${message}\n`;
-                }
-                else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                    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';
+                    if (elicitationContent.trim()) {
+                        contentParts.push(elicitationContent);
+                    }
+                    break;
                 }
-                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`;
+            case "toolInvocation":
+                {
+                    const state = part.state.get();
+                    if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation && state.confirmationMessages?.title) {
+                        const title = this._renderMessageAsPlaintext(state.confirmationMessages.title);
+                        const message = state.confirmationMessages.message ? this._renderMessageAsPlaintext(state.confirmationMessages.message) : "";
+                        const toolDataDesc = getToolSpecificDataDescription(part.toolSpecificData);
+                        let toolContent = title;
+                        if (toolDataDesc) {
+                            toolContent += `: ${toolDataDesc}`;
+                        }
+                        if (message) {
+                            toolContent += `\n${message}`;
+                        }
+                        contentParts.push(toolContent);
+                    } else if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
+                        const postApprovalDetails = isToolResultInputOutputDetails(state.resultDetails) ? state.resultDetails.input : isToolResultOutputDetails(state.resultDetails) ? undefined : toolContentToA11yString(state.contentForModel);
+                        contentParts.push(( localize(4612, "Approve results of {0}? Result: ", part.toolId)) + (postApprovalDetails ?? ""));
+                    } else {
+                        const resultDetails = IChatToolInvocation.resultDetails(part);
+                        const isComplete = IChatToolInvocation.isComplete(part);
+                        const description = getToolInvocationA11yDescription(
+                            this._renderMessageAsPlaintext(part.invocationMessage),
+                            part.pastTenseMessage ? this._renderMessageAsPlaintext(part.pastTenseMessage) : undefined,
+                            part.toolSpecificData,
+                            resultDetails,
+                            isComplete
+                        );
+                        if (description) {
+                            contentParts.push(description);
+                        }
                     }
+                    break;
                 }
-            }
-            const pastConfirmations = item.response.value.filter(item => item.kind === 'toolInvocationSerialized');
-            for (const pastConfirmation of pastConfirmations) {
-                if (pastConfirmation.isComplete && pastConfirmation.resultDetails && 'input' in pastConfirmation.resultDetails) {
-                    if (pastConfirmation.pastTenseMessage) {
-                        responseContent += `\n${`${typeof pastConfirmation.pastTenseMessage === 'string' ? pastConfirmation.pastTenseMessage : stripIcons(renderAsPlaintext(pastConfirmation.pastTenseMessage))} with input: ${pastConfirmation.resultDetails.input}`}\n`;
+            case "toolInvocationSerialized":
+                {
+                    const description = getToolInvocationA11yDescription(
+                        this._renderMessageAsPlaintext(part.invocationMessage),
+                        part.pastTenseMessage ? this._renderMessageAsPlaintext(part.pastTenseMessage) : undefined,
+                        part.toolSpecificData,
+                        part.resultDetails,
+                        part.isComplete
+                    );
+                    if (description) {
+                        contentParts.push(description);
                     }
+                    break;
                 }
             }
         }
-        const plainText = renderAsPlaintext(( new MarkdownString(responseContent)), { includeCodeBlocksFences: true });
-        return this._normalizeWhitespace(plainText);
+        return this._normalizeWhitespace(contentParts.join("\n"));
     }
     _normalizeWhitespace(content) {
         const lines = content.split(/\r?\n/);
@@ -149,19 +294,18 @@ class ChatResponseAccessibleProvider extends Disposable {
             }
             normalized.push(line);
         }
-        return normalized.join('\n');
+        return normalized.join("\n");
     }
     onClose() {
         this._widget.reveal(this._focusedItem);
         if (this._wasOpenedFromInput) {
             this._widget.focusInput();
-        }
-        else {
+        } else {
             this._widget.focus(this._focusedItem);
         }
     }
     provideNextContent() {
-        const next = this._widget.getSibling(this._focusedItem, 'next');
+        const next = this._widget.getSibling(this._focusedItem, "next");
         if (next) {
             this._setFocusedItem(next);
             return this._getContent(next);
@@ -169,7 +313,7 @@ class ChatResponseAccessibleProvider extends Disposable {
         return;
     }
     providePreviousContent() {
-        const previous = this._widget.getSibling(this._focusedItem, 'previous');
+        const previous = this._widget.getSibling(this._focusedItem, "previous");
         if (previous) {
             this._setFocusedItem(previous);
             return this._getContent(previous);
@@ -178,4 +322,4 @@ class ChatResponseAccessibleProvider extends Disposable {
     }
 }
 
-export { ChatResponseAccessibleView };
+export { ChatResponseAccessibleView, getResultDetailsDescription, getToolInvocationA11yDescription, getToolSpecificDataDescription };

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

@@ -7,7 +7,7 @@ import { ITerminalChatService } from '@codingame/monaco-vscode-api/vscode/vs/wor
 class ChatTerminalOutputAccessibleView {
     constructor() {
         this.priority = 115;
-        this.name = 'chatTerminalOutput';
+        this.name = "chatTerminalOutput";
         this.type = AccessibleViewType.View;
         this.when = ChatContextKeys.inChatTerminalToolOutput;
     }
@@ -21,13 +21,11 @@ class ChatTerminalOutputAccessibleView {
         if (!content) {
             return;
         }
-        return ( new AccessibleContentProvider(
-            AccessibleViewProviderId.ChatTerminalOutput,
-            { type: AccessibleViewType.View, id: AccessibleViewProviderId.ChatTerminalOutput, language: 'text' },
-            () => content,
-            () => part.focusOutput(),
-            AccessibilityVerbositySettingId.TerminalChatOutput
-        ));
+        return ( new AccessibleContentProvider(AccessibleViewProviderId.ChatTerminalOutput, {
+            type: AccessibleViewType.View,
+            id: AccessibleViewProviderId.ChatTerminalOutput,
+            language: "text"
+        }, () => content, () => part.focusOutput(), AccessibilityVerbositySettingId.TerminalChatOutput));
     }
 }
 

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

@@ -9,13 +9,19 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 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';
+const ACTION_ID_FOCUS_CHAT_CONFIRMATION = "workbench.action.chat.focusConfirmation";
 class AnnounceChatConfirmationAction extends Action2 {
     constructor() {
         super({
             id: ACTION_ID_FOCUS_CHAT_CONFIRMATION,
-            title: { value: ( localize(4593, 'Focus Chat Confirmation')), original: 'Focus Chat Confirmation' },
-            category: { value: ( localize(4594, 'Chat')), original: 'Chat' },
+            title: {
+                value: ( localize(4613, "Focus Chat Confirmation")),
+                original: "Focus Chat Confirmation"
+            },
+            category: {
+                value: ( localize(4614, "Chat")),
+                original: "Chat"
+            },
             precondition: ChatContextKeys.enabled,
             f1: true,
             keybinding: {
@@ -29,27 +35,26 @@ class AnnounceChatConfirmationAction extends Action2 {
         const chatWidgetService = accessor.get(IChatWidgetService);
         const pendingWidget = chatWidgetService.getAllWidgets().find(widget => widget.viewModel?.model.requestNeedsInput.get());
         if (!pendingWidget) {
-            alert(( localize(4595, 'No active chat session found.')));
+            alert(( localize(4615, "No active chat session found.")));
             return;
         }
         const viewModel = pendingWidget.viewModel;
         if (!viewModel) {
-            alert(( localize(4596, 'Chat interface not ready.')));
+            alert(( localize(4616, "Chat interface not ready.")));
             return;
         }
         let firstConfirmationElement;
         const lastResponse = viewModel.getItems()[viewModel.getItems().length - 1];
         if (isResponseVM(lastResponse)) {
-            const confirmationWidgets = pendingWidget.domNode.querySelectorAll('.chat-confirmation-widget-container');
+            const confirmationWidgets = pendingWidget.domNode.querySelectorAll(".chat-confirmation-widget-container");
             if (confirmationWidgets.length > 0) {
                 firstConfirmationElement = confirmationWidgets[0];
             }
         }
         if (firstConfirmationElement) {
             firstConfirmationElement.focus();
-        }
-        else {
-            alert(( localize(4597, 'No chat confirmation required')));
+        } else {
+            alert(( localize(4617, "No chat confirmation required")));
         }
     }
 }