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

package/index.js

@@ -19,7 +19,7 @@ import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/
 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 { InlineChatSessionServiceImpl } from './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js';
 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/tools/languageModelToolsService.service';
 import { LanguageModelToolsService } from './vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.js';
@@ -44,7 +44,7 @@ import { ChatAttachmentResolveService } from './vscode/src/vs/workbench/contrib/
 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/chatSessions.contribution.js';
+import { ChatSessionsService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution';
 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/tools/chatTodoListService.service';
@@ -68,6 +68,20 @@ import { AgentSessionsService } from './vscode/src/vs/workbench/contrib/chat/bro
 import { ChatWidgetService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.js';
 import { ICodeCompareModelService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service';
 import { CodeCompareModelService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart';
+import { IAgentSessionProjectionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.service';
+import { IAgentTitleBarStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.service';
+import { ILanguageModelsConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelsConfiguration.service';
+import { IChatTipService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatTipService.service';
+import { IChatEditingExplanationModelManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service';
+import { IChatToolOutputStateCache } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service';
+import { AgentSessionProjectionService } from './vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.js';
+import { AgentTitleBarStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService';
+import { LanguageModelsConfigurationService } from './vscode/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.js';
+import { ChatTipService } from './vscode/src/vs/workbench/contrib/chat/browser/chatTipService.js';
+import { ChatEditingExplanationModelManager } from './vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.js';
+import { ChatToolOutputStateCache } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.js';
+import { ITerminalSandboxService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.service';
+import { TerminalSandboxService } from './vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService.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';
@@ -111,7 +125,14 @@ function getServiceOverride() {
         [IChatContextService.toString()]: new SyncDescriptor(ChatContextService, [], true),
         [ITerminalChatService.toString()]: new SyncDescriptor(TerminalChatService, [], true),
         [IAgentSessionsService.toString()]: new SyncDescriptor(AgentSessionsService, [], true),
-        [ICodeCompareModelService.toString()]: new SyncDescriptor(CodeCompareModelService, [], true)
+        [ICodeCompareModelService.toString()]: new SyncDescriptor(CodeCompareModelService, [], true),
+        [IAgentSessionProjectionService.toString()]: new SyncDescriptor(AgentSessionProjectionService, [], true),
+        [IAgentTitleBarStatusService.toString()]: new SyncDescriptor(AgentTitleBarStatusService, [], true),
+        [ILanguageModelsConfigurationService.toString()]: new SyncDescriptor(LanguageModelsConfigurationService, [], true),
+        [IChatTipService.toString()]: new SyncDescriptor(ChatTipService, [], true),
+        [IChatEditingExplanationModelManager.toString()]: new SyncDescriptor(ChatEditingExplanationModelManager, [], true),
+        [IChatToolOutputStateCache.toString()]: new SyncDescriptor(ChatToolOutputStateCache, [], true),
+        [ITerminalSandboxService.toString()]: new SyncDescriptor(TerminalSandboxService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "25.1.2",
+  "version": "26.0.0",
   "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": "25.1.2",
-    "@codingame/monaco-vscode-katex-common": "25.1.2",
-    "@codingame/monaco-vscode-xterm-addons-common": "25.1.2",
-    "@codingame/monaco-vscode-xterm-common": "25.1.2"
+    "@codingame/monaco-vscode-api": "26.0.0",
+    "@codingame/monaco-vscode-katex-common": "26.0.0",
+    "@codingame/monaco-vscode-xterm-addons-common": "26.0.0",
+    "@codingame/monaco-vscode-xterm-common": "26.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/browserElements/common/browserElements.d.ts

@@ -4,7 +4,27 @@ export interface IElementData {
     readonly computedStyle: string;
     readonly bounds: IRectangle;
 }
-export declare enum BrowserType {
-    SimpleBrowser = "simpleBrowser",
-    LiveServer = "liveServer"
+/**
+ * Locator for identifying a browser target/webview.
+ * Uses either the parent webview or browser view id to uniquely identify the target.
+ */
+export interface IBrowserTargetLocator {
+    /**
+     * Identifier of the parent webview hosting the target.
+     *
+     * Exactly one of {@link webviewId} or {@link browserViewId} should be provided.
+     * Use this when the target is rendered inside a webview.
+     */
+    readonly webviewId?: string;
+    /**
+     * Identifier of the browser view hosting the target.
+     *
+     * Exactly one of {@link webviewId} or {@link browserViewId} should be provided.
+     * Use this when the target is rendered inside a browser view rather than a webview.
+     */
+    readonly browserViewId?: string;
 }
+/**
+ * Extract a display name from outer HTML (e.g., "div#myId.myClass1.myClass2")
+ */
+export declare function getDisplayNameFromOuterHTML(outerHTML: string): string;

package/vscode/src/vs/platform/browserElements/common/browserElements.js

@@ -1,9 +1,16 @@
 
 
-var BrowserType;
-(function (BrowserType) {
-    BrowserType["SimpleBrowser"] = "simpleBrowser";
-    BrowserType["LiveServer"] = "liveServer";
-})(BrowserType || (BrowserType = {}));
+function getDisplayNameFromOuterHTML(outerHTML) {
+    const firstElementMatch = outerHTML.match(/^<([^ >]+)([^>]*?)>/);
+    if (!firstElementMatch) {
+        throw ( new Error("No outer element found"));
+    }
+    const tagName = firstElementMatch[1];
+    const idMatch = firstElementMatch[2].match(/\s+id\s*=\s*["']([^"']+)["']/i);
+    const id = idMatch ? `#${idMatch[1]}` : "";
+    const classMatch = firstElementMatch[2].match(/\s+class\s*=\s*["']([^"']+)["']/i);
+    const className = classMatch ? `.${classMatch[1].replace(/\s+/g, ".")}` : "";
+    return `${tagName}${id}${className}`;
+}
 
-export { BrowserType };
+export { getDisplayNameFromOuterHTML };

package/vscode/src/vs/platform/domWidget/browser/domWidget.js

@@ -14,8 +14,8 @@ class DomWidget extends Disposable {
         }
     }
     static createInContents(store, ...params) {
-        const div = createElement('div');
-        div.style.display = 'contents';
+        const div = createElement("div");
+        div.style.display = "contents";
         this.createAppend(div, store, ...params);
         return div;
     }
@@ -33,8 +33,8 @@ class DomWidget extends Disposable {
         }
     }
     static instantiateInContents(instantiationService, store, ...params) {
-        const div = createElement('div');
-        div.style.display = 'contents';
+        const div = createElement("div");
+        div.style.display = "contents";
         this.instantiateAppend(instantiationService, div, store, ...params);
         return div;
     }

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

@@ -22,7 +22,7 @@ export declare class ChatAccessibilityService extends Disposable implements ICha
     private readonly notifications;
     constructor(_accessibilitySignalService: IAccessibilitySignalService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _hostService: IHostService, _widgetService: IChatWidgetService, _chatService: IChatService);
     dispose(): void;
-    acceptRequest(uri: URI): void;
+    acceptRequest(uri: URI, skipRequestSignal?: boolean): void;
     disposeRequest(requestId: URI): void;
     acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: URI, isVoiceInput?: boolean): void;
     acceptElicitation(elicitation: IChatElicitationRequest): void;

package/vscode/src/vs/workbench/contrib/chat/browser/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 { alert, status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
+import { status, alert } 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';
@@ -23,7 +23,14 @@ import { AccessibilityVoiceSettingId } from '@codingame/monaco-vscode-api/vscode
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 let ChatAccessibilityService = class ChatAccessibilityService extends Disposable {
-    constructor(_accessibilitySignalService, _instantiationService, _configurationService, _hostService, _widgetService, _chatService) {
+    constructor(
+        _accessibilitySignalService,
+        _instantiationService,
+        _configurationService,
+        _hostService,
+        _widgetService,
+        _chatService
+    ) {
         super();
         this._accessibilitySignalService = _accessibilitySignalService;
         this._instantiationService = _instantiationService;
@@ -42,7 +49,6 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
             if (!requestInProgress) {
                 return;
             }
-            alert(( localize(4588, "Chat session will continue in the background.")));
             this.disposeRequest(e);
         }));
     }
@@ -53,25 +59,35 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         this.notifications.clear();
         super.dispose();
     }
-    acceptRequest(uri) {
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
-        this._pendingSignalMap.set(uri, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_ALLOWANCE_MS, undefined));
+    acceptRequest(uri, skipRequestSignal) {
+        if (!skipRequestSignal) {
+            this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, {
+                allowManyInParallel: true
+            });
+        }
+        this._pendingSignalMap.set(uri, this._instantiationService.createInstance(
+            AccessibilityProgressSignalScheduler,
+            CHAT_RESPONSE_PENDING_ALLOWANCE_MS,
+            undefined
+        ));
     }
     disposeRequest(requestId) {
         this._pendingSignalMap.deleteAndDispose(requestId);
     }
     acceptResponse(widget, container, response, requestId, isVoiceInput) {
         this._pendingSignalMap.deleteAndDispose(requestId);
-        const isPanelChat = typeof response !== 'string';
-        const responseContent = typeof response === 'string' ? response : response?.response.toString();
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, { allowManyInParallel: true });
+        const isPanelChat = typeof response !== "string";
+        const responseContent = typeof response === "string" ? response : response?.response.toString();
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatResponseReceived, {
+            allowManyInParallel: true
+        });
         if (!response || !responseContent) {
             return;
         }
         const plainTextResponse = renderAsPlaintext(( new MarkdownString(responseContent)));
-        const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : '';
+        const errorDetails = isPanelChat && response.errorDetails ? ` ${response.errorDetails.message}` : "";
         this._showOSNotification(widget, container, plainTextResponse + errorDetails);
-        if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== 'on') {
+        if (!isVoiceInput || this._configurationService.getValue(AccessibilityVoiceSettingId.AutoSynthesize) !== "on") {
             status(plainTextResponse + errorDetails);
         }
     }
@@ -79,10 +95,12 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         if (elicitation.state.get() !== ElicitationState.Pending) {
             return;
         }
-        const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
-        const message = typeof elicitation.message === 'string' ? elicitation.message : elicitation.message.value;
-        alert(title + ' ' + message);
-        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { allowManyInParallel: true });
+        const title = typeof elicitation.title === "string" ? elicitation.title : elicitation.title.value;
+        const message = typeof elicitation.message === "string" ? elicitation.message : elicitation.message.value;
+        alert(title + " " + message);
+        this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, {
+            allowManyInParallel: true
+        });
     }
     async _showOSNotification(widget, container, responseContent) {
         if (!this._configurationService.getValue(ChatConfiguration.NotifyWindowOnResponseReceived)) {
@@ -98,14 +116,16 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         if (!responseContent || !responseContent.trim()) {
             return;
         }
-        await this._hostService.focus(targetWindow, { mode: FocusMode.Notify });
+        await this._hostService.focus(targetWindow, {
+            mode: FocusMode.Notify
+        });
         for (const ds of Array.from(this.notifications)) {
             ds.dispose();
             this.notifications.delete(ds);
         }
-        const title = widget?.viewModel?.model.title ? ( localize(4589, "Chat: {0}", widget.viewModel.model.title)) : ( localize(4590, "Untitled Chat"));
+        const title = widget?.viewModel?.model.title ? ( localize(4598, "Chat: {0}", widget.viewModel.model.title)) : ( localize(4599, "Untitled Chat"));
         const notification = await triggerNotification(title, {
-            detail: ( localize(4591, "New chat response."))
+            detail: ( localize(4600, "New chat response."))
         });
         if (!notification) {
             return;
@@ -114,7 +134,9 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         disposables.add(notification);
         this.notifications.add(disposables);
         disposables.add(Event.once(notification.onClick)(async () => {
-            await this._hostService.focus(targetWindow, { mode: FocusMode.Force });
+            await this._hostService.focus(targetWindow, {
+                mode: FocusMode.Force
+            });
             await this._widgetService.reveal(widget);
             widget.focusInput();
             disposables.dispose();
@@ -128,13 +150,6 @@ let ChatAccessibilityService = class ChatAccessibilityService extends Disposable
         }));
     }
 };
-ChatAccessibilityService = ( __decorate([
-    ( __param(0, IAccessibilitySignalService)),
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IHostService)),
-    ( __param(4, IChatWidgetService)),
-    ( __param(5, IChatService))
-], ChatAccessibilityService));
+ChatAccessibilityService = ( __decorate([( __param(0, IAccessibilitySignalService)), ( __param(1, IInstantiationService)), ( __param(2, IConfigurationService)), ( __param(3, IHostService)), ( __param(4, IChatWidgetService)), ( __param(5, IChatService))], ChatAccessibilityService));
 
 export { ChatAccessibilityService };

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

@@ -1,10 +1,14 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { 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";
 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 { IChatExtensionsContent, IChatPullRequestContent, IChatSubagentToolInvocationData, IChatTerminalToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, ILegacyChatTerminalToolInvocationData, IToolResultOutputDetailsSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IToolResultInputOutputDetails, IToolResultOutputDetails } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ChatTreeItem, IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 export declare class ChatResponseAccessibleView implements IAccessibleViewImplementation {
     readonly priority = 100;
     readonly name = "panelChat";
@@ -12,6 +16,15 @@ export declare class ChatResponseAccessibleView implements IAccessibleViewImplem
     readonly when: import("@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey").RawContextKey<boolean>;
     getProvider(accessor: ServicesAccessor): ChatResponseAccessibleProvider | undefined;
 }
+type ToolSpecificData = IChatTerminalToolInvocationData | ILegacyChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatPullRequestContent | IChatTodoListContent | IChatSubagentToolInvocationData;
+type ResultDetails = Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetails | IToolResultOutputDetailsSerialized;
+export declare function getToolSpecificDataDescription(toolSpecificData: ToolSpecificData | undefined): string;
+export declare function getResultDetailsDescription(resultDetails: ResultDetails | undefined): {
+    input?: string;
+    files?: string[];
+    isError?: boolean;
+};
+export declare function getToolInvocationA11yDescription(invocationMessage: string | undefined, pastTenseMessage: string | undefined, toolSpecificData: ToolSpecificData | undefined, resultDetails: ResultDetails | undefined, isComplete: boolean): string;
 declare class ChatResponseAccessibleProvider extends Disposable implements IAccessibleViewContentProvider {
     private readonly _widget;
     private readonly _wasOpenedFromInput;
@@ -27,6 +40,7 @@ declare class ChatResponseAccessibleProvider extends Disposable implements IAcce
     };
     provideContent(): string;
     private _setFocusedItem;
+    private _renderMessageAsPlaintext;
     private _getContent;
     private _normalizeWhitespace;
     onClose(): void;