@codingame/monaco-vscode-katex-common 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolInvocationSubPart.js

@@ -6,7 +6,9 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
 class BaseChatToolInvocationSubPart extends Disposable {
-    static { this.idPool = 0; }
+    static {
+        this.idPool = 0;
+    }
     get codeblocksPartId() {
         return this._codeBlocksPartId;
     }
@@ -15,9 +17,7 @@ class BaseChatToolInvocationSubPart extends Disposable {
         this.toolInvocation = toolInvocation;
         this._onNeedsRerender = this._register(( new Emitter()));
         this.onNeedsRerender = this._onNeedsRerender.event;
-        this._onDidChangeHeight = this._register(( new Emitter()));
-        this.onDidChangeHeight = this._onDidChangeHeight.event;
-        this._codeBlocksPartId = 'tool-' + (BaseChatToolInvocationSubPart.idPool++);
+        this._codeBlocksPartId = "tool-" + (BaseChatToolInvocationSubPart.idPool++);
     }
     getIcon() {
         const toolInvocation = this.toolInvocation;
@@ -26,10 +26,7 @@ class BaseChatToolInvocationSubPart extends Disposable {
         if (isSkipped) {
             return Codicon.circleSlash;
         }
-        return confirmState?.type === ToolConfirmKind.Denied ?
-            Codicon.error :
-            IChatToolInvocation.isComplete(toolInvocation) ?
-                Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin');
+        return confirmState?.type === ToolConfirmKind.Denied ? Codicon.error : IChatToolInvocation.isComplete(toolInvocation) ? Codicon.check : ThemeIcon.modify(Codicon.loading, "spin");
     }
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputPart.d.ts

@@ -1,3 +1,4 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatCodeBlockInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
@@ -5,17 +6,18 @@ import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatOutputRendererService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service";
 import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { BaseChatToolInvocationSubPart } from "./chatToolInvocationSubPart.js";
+import { IChatToolOutputStateCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service";
 export declare class ChatToolOutputSubPart extends BaseChatToolInvocationSubPart {
     private readonly context;
+    private readonly onDidRemount;
     private readonly chatOutputItemRendererService;
     private readonly chatWidgetService;
     private readonly instantiationService;
-    /** Remembers cached state on re-render */
-    private static readonly _cachedStates;
+    private readonly stateCache;
     readonly domNode: HTMLElement;
     readonly codeblocks: IChatCodeBlockInfo[];
     private readonly _disposeCts;
-    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, chatOutputItemRendererService: IChatOutputRendererService, chatWidgetService: IChatWidgetService, instantiationService: IInstantiationService);
+    constructor(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, onDidRemount: Event<void>, chatOutputItemRendererService: IChatOutputRendererService, chatWidgetService: IChatWidgetService, instantiationService: IInstantiationService, stateCache: IChatToolOutputStateCache);
     dispose(): void;
     private createOutputPart;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputPart.js

@@ -5,6 +5,7 @@ import { renderMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/base/brow
 import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -14,37 +15,44 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatOutputRendererService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatOutputItemRenderer.service';
 import { ChatProgressSubPart } from '../chatProgressContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
+import { IChatToolOutputStateCache } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service';
 
-var ChatToolOutputSubPart_1;
 let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvocationSubPart {
-    static { ChatToolOutputSubPart_1 = this; }
-    static { this._cachedStates = ( new WeakMap()); }
-    constructor(toolInvocation, context, chatOutputItemRendererService, chatWidgetService, instantiationService) {
+    constructor(
+        toolInvocation,
+        context,
+        onDidRemount,
+        chatOutputItemRendererService,
+        chatWidgetService,
+        instantiationService,
+        stateCache
+    ) {
         super(toolInvocation);
         this.context = context;
+        this.onDidRemount = onDidRemount;
         this.chatOutputItemRendererService = chatOutputItemRendererService;
         this.chatWidgetService = chatWidgetService;
         this.instantiationService = instantiationService;
+        this.stateCache = stateCache;
         this.codeblocks = [];
         this._disposeCts = this._register(( new CancellationTokenSource()));
-        const details = toolInvocation.kind === 'toolInvocation'
-            ? IChatToolInvocation.resultDetails(toolInvocation)
-            : {
-                output: {
-                    type: 'data',
-                    mimeType: toolInvocation.resultDetails.output.mimeType,
-                    value: decodeBase64(toolInvocation.resultDetails.output.base64Data),
-                },
-            };
-        this.domNode = $('div.tool-output-part');
-        const titleEl = $('.output-title');
-        this.domNode.appendChild(titleEl);
-        if (typeof toolInvocation.invocationMessage === 'string') {
-            titleEl.textContent = toolInvocation.invocationMessage;
-        }
-        else {
-            const md = this._register(renderMarkdown(toolInvocation.invocationMessage));
-            titleEl.appendChild(md.element);
+        const details = toolInvocation.kind === "toolInvocation" ? IChatToolInvocation.resultDetails(toolInvocation) : {
+            output: {
+                type: "data",
+                mimeType: toolInvocation.resultDetails.output.mimeType,
+                value: decodeBase64(toolInvocation.resultDetails.output.base64Data)
+            }
+        };
+        this.domNode = $("div.tool-output-part");
+        if (toolInvocation.invocationMessage) {
+            const titleEl = $(".output-title");
+            this.domNode.appendChild(titleEl);
+            if (typeof toolInvocation.invocationMessage === "string") {
+                titleEl.textContent = toolInvocation.invocationMessage;
+            } else {
+                const md = this._register(renderMarkdown(toolInvocation.invocationMessage));
+                titleEl.appendChild(md.element);
+            }
         }
         this.domNode.appendChild(this.createOutputPart(toolInvocation, details));
     }
@@ -53,67 +61,73 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         super.dispose();
     }
     createOutputPart(toolInvocation, details) {
-        const vm = this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.viewModel;
-        const parent = $('div.webview-output');
-        parent.style.maxHeight = '80vh';
-        let partState = { height: 0, webviewOrigin: generateUuid() };
-        if (vm) {
-            let allStates = ChatToolOutputSubPart_1._cachedStates.get(vm);
-            if (!allStates) {
-                allStates = ( new Map());
-                ChatToolOutputSubPart_1._cachedStates.set(vm, allStates);
-            }
-            const cachedState = allStates.get(toolInvocation.toolCallId);
-            if (cachedState) {
-                partState = cachedState;
-            }
-            else {
-                allStates.set(toolInvocation.toolCallId, partState);
-            }
-        }
+        const parent = $("div.webview-output");
+        parent.style.maxHeight = "80vh";
+        const partState = this.stateCache.get(toolInvocation.toolCallId) ?? {
+            height: 0,
+            webviewOrigin: generateUuid()
+        };
+        this.stateCache.set(toolInvocation.toolCallId, partState);
         if (partState.height) {
             parent.style.height = `${partState.height}px`;
         }
-        const progressMessage = $('span');
-        progressMessage.textContent = ( localize(5753, 'Rendering tool output...'));
-        const progressPart = this._register(this.instantiationService.createInstance(ChatProgressSubPart, progressMessage, ThemeIcon.modify(Codicon.loading, 'spin'), undefined));
+        if (partState.webviewOrigin) {
+            partState.webviewOrigin = partState.webviewOrigin;
+        }
+        const progressMessage = $("span");
+        progressMessage.textContent = ( localize(6009, "Rendering tool output..."));
+        const progressPart = this._register(this.instantiationService.createInstance(
+            ChatProgressSubPart,
+            progressMessage,
+            ThemeIcon.modify(Codicon.loading, "spin"),
+            undefined
+        ));
         parent.appendChild(progressPart.domNode);
-        this.chatOutputItemRendererService.renderOutputPart(details.output.mimeType, details.output.value.buffer, parent, { origin: partState.webviewOrigin }, this._disposeCts.token).then((renderedItem) => {
+        this.chatOutputItemRendererService.renderOutputPart(details.output.mimeType, details.output.value.buffer, parent, {
+            origin: partState.webviewOrigin,
+            webviewState: partState.webviewState
+        }, this._disposeCts.token).then(renderedItem => {
             if (this._disposeCts.token.isCancellationRequested) {
                 return;
             }
             this._register(renderedItem);
             progressPart.domNode.remove();
-            this._onDidChangeHeight.fire();
+            this._register(renderedItem.webview.onDidUpdateState(e => {
+                partState.webviewState = e;
+            }));
             this._register(renderedItem.onDidChangeHeight(newHeight => {
-                this._onDidChangeHeight.fire();
                 partState.height = newHeight;
             }));
             this._register(renderedItem.webview.onDidWheel(e => {
                 this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.delegateScrollFromMouseWheelEvent({
                     ...e,
-                    preventDefault: () => { },
-                    stopPropagation: () => { }
+                    preventDefault: () => {},
+                    stopPropagation: () => {}
                 });
             }));
-            const widget = this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource);
-            if (widget) {
-                this._register(widget?.onDidShow(() => {
+            this._register(this.context.onDidChangeVisibility(visible => {
+                if (visible) {
                     renderedItem.reinitialize();
-                }));
+                }
+            }));
+            this._register(this.onDidRemount(() => {
+                renderedItem.reinitialize();
+            }));
+        }, error => {
+            if (isCancellationError(error)) {
+                return;
             }
-        }, (error) => {
-            console.error('Error rendering tool output:', error);
-            const errorNode = $('.output-error');
-            const errorHeaderNode = $('.output-error-header');
+            console.error("Error rendering tool output:", error);
+            const errorNode = $(".output-error");
+            const errorHeaderNode = $(".output-error-header");
             append(errorNode, errorHeaderNode);
-            const iconElement = $('div');
+            const iconElement = $("div");
             iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.error));
             errorHeaderNode.append(iconElement);
-            const errorTitleNode = $('.output-error-title');
-            errorTitleNode.textContent = ( localize(5754, "Error rendering the tool output"));
+            const errorTitleNode = $(".output-error-title");
+            errorTitleNode.textContent = ( localize(6010, "Error rendering the tool output"));
             errorHeaderNode.append(errorTitleNode);
-            const errorMessageNode = $('.output-error-details');
+            const errorMessageNode = $(".output-error-details");
             errorMessageNode.textContent = error?.message || String(error);
             errorNode.append(errorMessageNode);
             progressPart.domNode.replaceWith(errorNode);
@@ -121,10 +135,6 @@ let ChatToolOutputSubPart = class ChatToolOutputSubPart extends BaseChatToolInvo
         return parent;
     }
 };
-ChatToolOutputSubPart = ChatToolOutputSubPart_1 = ( __decorate([
-    ( __param(2, IChatOutputRendererService)),
-    ( __param(3, IChatWidgetService)),
-    ( __param(4, IInstantiationService))
-], ChatToolOutputSubPart));
+ChatToolOutputSubPart = ( __decorate([( __param(3, IChatOutputRendererService)), ( __param(4, IChatWidgetService)), ( __param(5, IInstantiationService)), ( __param(6, IChatToolOutputStateCache))], ChatToolOutputSubPart));
 
 export { ChatToolOutputSubPart };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPartUtilities.js

@@ -5,7 +5,7 @@ import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-a
 
 function getToolApprovalMessage(toolInvocation) {
     const reason = IChatToolInvocation.executionConfirmedOrDenied(toolInvocation);
-    if (!reason || typeof reason === 'boolean') {
+    if (!reason || typeof reason === "boolean") {
         return undefined;
     }
     return getApprovalMessageFromReason(reason);
@@ -13,34 +13,36 @@ function getToolApprovalMessage(toolInvocation) {
 function getApprovalMessageFromReason(reason) {
     let md;
     switch (reason.type) {
-        case ToolConfirmKind.Setting:
-            md = ( localize(
-                5755,
-                'Auto approved by {0}',
-                createMarkdownCommandLink({ title: '`' + reason.id + '`', id: 'workbench.action.openSettings', arguments: [reason.id] }, false)
-            ));
-            break;
-        case ToolConfirmKind.LmServicePerTool:
-            md = reason.scope === 'session'
-                ? ( localize(5756, 'Auto approved for this session'))
-                : reason.scope === 'workspace'
-                    ? ( localize(5757, 'Auto approved for this workspace'))
-                    : ( localize(5758, 'Auto approved for this profile'));
-            md += ' (' + createMarkdownCommandLink({ title: ( localize(5759, 'Edit')), id: 'workbench.action.chat.editToolApproval', arguments: [reason.scope] }) + ')';
-            break;
-        case ToolConfirmKind.ConfirmationNotNeeded:
-            if (reason.reason) {
-                return typeof reason.reason === 'string'
-                    ? ( new MarkdownString(reason.reason, { isTrusted: true }))
-                    : reason.reason;
-            }
-            return undefined;
-        case ToolConfirmKind.UserAction:
-        case ToolConfirmKind.Denied:
-        default:
-            return undefined;
+    case ToolConfirmKind.Setting:
+        md = ( localize(6011, "Auto approved by {0}", createMarkdownCommandLink({
+            title: "`" + reason.id + "`",
+            id: "workbench.action.openSettings",
+            arguments: [reason.id]
+        }, false)));
+        break;
+    case ToolConfirmKind.LmServicePerTool:
+        md = reason.scope === "session" ? ( localize(6012, "Auto approved for this session")) : reason.scope === "workspace" ? ( localize(6013, "Auto approved for this workspace")) : ( localize(6014, "Auto approved for this profile"));
+        md += " (" + createMarkdownCommandLink({
+            title: ( localize(6015, "Edit")),
+            id: "workbench.action.chat.editToolApproval",
+            arguments: [reason.scope]
+        }) + ")";
+        break;
+    case ToolConfirmKind.ConfirmationNotNeeded:
+        if (reason.reason) {
+            return typeof reason.reason === "string" ? ( new MarkdownString(reason.reason, {
+                isTrusted: true
+            })) : reason.reason;
+        }
+        return undefined;
+    case ToolConfirmKind.UserAction:
+    case ToolConfirmKind.Denied:
+    default:
+        return undefined;
     }
-    return ( new MarkdownString(md, { isTrusted: true }));
+    return ( new MarkdownString(md, {
+        isTrusted: true
+    }));
 }
 
 export { getApprovalMessageFromReason, getToolApprovalMessage };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolPostExecuteConfirmationPart.d.ts

@@ -1,6 +1,4 @@
 import { Separator } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 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 { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
@@ -12,12 +10,10 @@ import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { AbstractToolConfirmationSubPart } from "./abstractToolConfirmationSubPart.js";
 export declare class ChatToolPostExecuteConfirmationPart extends AbstractToolConfirmationSubPart {
-    private readonly modelService;
-    private readonly languageService;
     private readonly confirmationService;
     private _codeblocks;
     get codeblocks(): IChatCodeBlockInfo[];
-    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, keybindingService: IKeybindingService, modelService: IModelService, languageService: ILanguageService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService, confirmationService: ILanguageModelToolsConfirmationService);
+    constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService, confirmationService: ILanguageModelToolsConfirmationService);
     protected createContentElement(): HTMLElement;
     protected getTitle(): string;
     protected additionalPrimaryActions(): (Separator | import("../chatConfirmationWidget.js").IChatConfirmationButton<() => void>)[];