@codingame/monaco-vscode-katex-common 26.2.2 → 28.0.0

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

@@ -1,24 +1,24 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { AnimationFrameScheduler, $, DisposableResizeObserver, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, AnimationFrameScheduler, DisposableResizeObserver, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { rcut } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import { ChatCollapsibleMarkdownContentPart } from './chatCollapsibleMarkdownContentPart.js';
-import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
-import { RunSubagentTool } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { renderFileWidgets } from './chatInlineAnchorWidget.js';
+import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
 import { createThinkingIcon, getToolInvocationIcon } from './chatThinkingContentPart.js';
 import { ChatToolInvocationPart } from './toolInvocationParts/chatToolInvocationPart.js';
-import { IChatMarkdownAnchorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownAnchorService.service';
-import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import * as chatSubagentContent from './media/chatSubagentContent.css';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -26,9 +26,12 @@ var ChatSubagentContentPart_1;
 registerCss(chatSubagentContent);
 const MAX_TITLE_LENGTH = 100;
 let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentContentPart extends ChatCollapsibleContentPart {
+    static isParentSubagentTool(toolInvocation) {
+        return toolInvocation.toolSpecificData?.kind === "subagent" && !toolInvocation.subAgentInvocationId;
+    }
     static extractSubagentInfo(toolInvocation) {
-        const defaultDescription = ( localize(5969, "Running subagent..."));
-        if (toolInvocation.toolId !== RunSubagentTool.Id) {
+        const defaultDescription = ( localize(6580, "Running subagent..."));
+        if (!ChatSubagentContentPart_1.isParentSubagentTool(toolInvocation)) {
             return {
                 description: defaultDescription,
                 agentName: undefined,
@@ -73,7 +76,8 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         announcedToolProgressKeys,
         instantiationService,
         chatMarkdownAnchorService,
-        hoverService
+        hoverService,
+        configurationService
     ) {
         const {
             description,
@@ -81,9 +85,9 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             prompt,
             modelName
         } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
-        const prefix = agentName || ( localize(5970, "Subagent"));
+        const prefix = agentName || ( localize(6581, "Subagent"));
         const initialTitle = `${prefix}: ${description}`;
-        super(initialTitle, context, undefined, hoverService);
+        super(initialTitle, context, undefined, hoverService, configurationService);
         this.subAgentInvocationId = subAgentInvocationId;
         this.context = context;
         this.chatContentMarkdownRenderer = chatContentMarkdownRenderer;
@@ -110,14 +114,24 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.isInitiallyComplete = this.element.isComplete;
         const node = this.domNode;
         node.classList.add("chat-thinking-box", "chat-thinking-fixed-mode", "chat-subagent-part");
+        if (!this.element.isComplete) {
+            node.classList.add("chat-thinking-active");
+        }
+        if (!this.element.isComplete && this._collapseButton) {
+            const labelElement = this._collapseButton.labelElement;
+            labelElement.textContent = "";
+            this.titleShimmerSpan = $("span.chat-thinking-title-shimmer");
+            this.titleShimmerSpan.textContent = initialTitle;
+            labelElement.appendChild(this.titleShimmerSpan);
+        }
         if (this._collapseButton && !this.element.isComplete) {
-            this._collapseButton.icon = ThemeIcon.modify(Codicon.loading, "spin");
+            this._collapseButton.icon = Codicon.circleFilled;
         }
         this._register(autorun(r => {
             this.expanded.read(r);
             if (this._collapseButton) {
                 if (!this.element.isComplete && this.isActive) {
-                    this._collapseButton.icon = ThemeIcon.modify(Codicon.loading, "spin");
+                    this._collapseButton.icon = Codicon.circleFilled;
                 } else {
                     this._collapseButton.icon = Codicon.check;
                 }
@@ -176,7 +190,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             return;
         }
         const lines = this.prompt.split("\n");
-        const rawFirstLine = lines[0] || ( localize(5971, "Prompt"));
+        const rawFirstLine = lines[0] || ( localize(6582, "Prompt"));
         const restOfLines = lines.slice(1).join("\n").trim();
         const titleContent = rcut(rawFirstLine, MAX_TITLE_LENGTH);
         const wasTruncated = rawFirstLine.length > MAX_TITLE_LENGTH;
@@ -210,6 +224,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
     }
     markAsInactive() {
         this.isActive = false;
+        this.domNode.classList.remove("chat-thinking-active");
         if (this._collapseButton) {
             this._collapseButton.icon = Codicon.check;
         }
@@ -223,19 +238,73 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     updateTitle() {
-        const prefix = this.agentName || ( localize(5970, "Subagent"));
-        let finalLabel = `${prefix}: ${this.description}`;
-        if (this.currentRunningToolMessage && this.isActive) {
-            finalLabel += ` \u2014 ${this.currentRunningToolMessage}`;
+        const prefix = this.agentName || ( localize(6581, "Subagent"));
+        const shimmerText = `${prefix}: ${this.description}`;
+        const toolCallText = this.currentRunningToolMessage && this.isActive ? ` \u2014 ${this.currentRunningToolMessage}` : ``;
+        if (!this._collapseButton) {
+            return;
+        }
+        const labelElement = this._collapseButton.labelElement;
+        if (!this.isActive) {
+            labelElement.textContent = "";
+            this.titleShimmerSpan = undefined;
+            if (this.titleDetailRendered) {
+                this.titleDetailRendered.dispose();
+                this.titleDetailRendered = undefined;
+            }
+            this.titleDetailContainer = undefined;
+            const prefixSpan = $("span");
+            prefixSpan.textContent = `${prefix}:`;
+            labelElement.appendChild(prefixSpan);
+            const descSpan = $("span.chat-thinking-title-detail-text");
+            descSpan.textContent = ` ${this.description}`;
+            labelElement.appendChild(descSpan);
+            this._collapseButton.element.ariaLabel = shimmerText;
+            this._collapseButton.element.ariaExpanded = String(this.isExpanded());
+            return;
+        }
+        if (!this.titleShimmerSpan || !this.titleShimmerSpan.parentElement) {
+            labelElement.textContent = "";
+            this.titleShimmerSpan = $("span.chat-thinking-title-shimmer");
+            labelElement.appendChild(this.titleShimmerSpan);
+        }
+        this.titleShimmerSpan.textContent = shimmerText;
+        if (this.titleDetailRendered) {
+            this.titleDetailRendered.dispose();
+            this.titleDetailRendered = undefined;
         }
-        this.setTitleWithWidgets(( new MarkdownString(finalLabel)), this.instantiationService, this.chatMarkdownAnchorService, this.chatContentMarkdownRenderer);
+        if (!toolCallText) {
+            if (this.titleDetailContainer) {
+                this.titleDetailContainer.remove();
+                this.titleDetailContainer = undefined;
+            }
+        } else {
+            const result = this.chatContentMarkdownRenderer.render(( new MarkdownString(toolCallText)));
+            result.element.classList.add("collapsible-title-content", "chat-thinking-title-detail");
+            renderFileWidgets(
+                result.element,
+                this.instantiationService,
+                this.chatMarkdownAnchorService,
+                this._store
+            );
+            this.titleDetailRendered = result;
+            if (this.titleDetailContainer) {
+                this.titleDetailContainer.replaceWith(result.element);
+            } else {
+                labelElement.appendChild(result.element);
+            }
+            this.titleDetailContainer = result.element;
+        }
+        const fullLabel = `${shimmerText}${toolCallText}`;
+        this._collapseButton.element.ariaLabel = fullLabel;
+        this._collapseButton.element.ariaExpanded = String(this.isExpanded());
     }
     updateHover() {
         if (!this.modelName || !this._collapseButton) {
             return;
         }
         this._hoverDisposable.value = this.hoverService.setupDelayedHover(this._collapseButton.element, {
-            content: ( localize(5972, "Model: {0}", this.modelName))
+            content: ( localize(6583, "Model: {0}", this.modelName))
         });
     }
     trackToolState(toolInvocation) {
@@ -267,7 +336,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }));
     }
     watchToolCompletion(toolInvocation) {
-        if (toolInvocation.toolId !== RunSubagentTool.Id) {
+        if (!ChatSubagentContentPart_1.isParentSubagentTool(toolInvocation)) {
             return;
         }
         if (toolInvocation.kind === "toolInvocation") {
@@ -387,6 +456,9 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     appendHookItem(factory, hookPart) {
+        const hookMessage = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(6584, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(6585, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(6586, "Warning for {0}", hookPart.toolDisplayName)) : ( localize(6587, "Hook warning")));
+        this.currentRunningToolMessage = hookMessage;
+        this.updateTitle();
         if (this.isExpanded() || this.hasExpandedOnce) {
             const result = factory();
             this.appendHookItemToDOM(result.domNode, hookPart);
@@ -550,8 +622,8 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         if (other.kind === "hook" && other.subAgentInvocationId) {
             return this.subAgentInvocationId === other.subAgentInvocationId;
         }
-        if ((other.kind === "toolInvocation" || other.kind === "toolInvocationSerialized") && (other.subAgentInvocationId || other.toolId === RunSubagentTool.Id)) {
-            const otherEffectiveId = other.toolId === RunSubagentTool.Id ? other.toolCallId : other.subAgentInvocationId;
+        if ((other.kind === "toolInvocation" || other.kind === "toolInvocationSerialized") && (other.subAgentInvocationId || ChatSubagentContentPart_1.isParentSubagentTool(other))) {
+            const otherEffectiveId = other.subAgentInvocationId ?? other.toolCallId;
             if (this.subAgentInvocationId && otherEffectiveId) {
                 return this.subAgentInvocationId === otherEffectiveId;
             }
@@ -560,6 +632,6 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         return false;
     }
 };
-ChatSubagentContentPart = ChatSubagentContentPart_1 = ( __decorate([( __param(9, IInstantiationService)), ( __param(10, IChatMarkdownAnchorService)), ( __param(11, IHoverService))], ChatSubagentContentPart));
+ChatSubagentContentPart = ChatSubagentContentPart_1 = ( __decorate([( __param(9, IInstantiationService)), ( __param(10, IChatMarkdownAnchorService)), ( __param(11, IHoverService)), ( __param(12, IConfigurationService))], ChatSubagentContentPart));
 
 export { ChatSubagentContentPart };

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

@@ -42,8 +42,8 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
             return;
         }
         this._currentMode = mode;
-        const modeName = mode.name.get() || mode.label.get() || ( localize(5973, "current mode"));
-        this.titleElement.textContent = ( localize(5974, "Proceed from {0}", modeName));
+        const modeName = mode.name.get() || mode.label.get() || ( localize(6588, "current mode"));
+        this.titleElement.textContent = ( localize(6589, "Proceed from {0}", modeName));
         const childrenToRemove = [];
         for (let i = 1; i < this.promptsContainer.children.length; i++) {
             childrenToRemove.push(this.promptsContainer.children[i]);
@@ -73,7 +73,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
         const button = $(".chat-welcome-view-suggested-prompt");
         button.setAttribute("tabindex", "0");
         button.setAttribute("role", "button");
-        button.setAttribute("aria-label", ( localize(5975, "{0}", handoff.label)));
+        button.setAttribute("aria-label", ( localize(6590, "{0}", handoff.label)));
         const titleElement = append(button, $(".chat-welcome-view-suggested-prompt-title"));
         titleElement.textContent = handoff.label;
         const showContinueOn = handoff.showContinueOn ?? true;
@@ -90,7 +90,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
             const dropdownContainer = append(button, $(".chat-suggest-next-dropdown"));
             dropdownContainer.setAttribute("tabindex", "0");
             dropdownContainer.setAttribute("role", "button");
-            dropdownContainer.setAttribute("aria-label", ( localize(5976, "More options for {0}", handoff.label)));
+            dropdownContainer.setAttribute("aria-label", ( localize(6591, "More options for {0}", handoff.label)));
             dropdownContainer.setAttribute("aria-haspopup", "true");
             const separator = append(dropdownContainer, $(".chat-suggest-next-separator"));
             separator.setAttribute("aria-hidden", "true");
@@ -105,7 +105,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
                     const name = getAgentSessionProviderName(provider);
                     return (new Action(
                         contrib.type,
-                        localize(5977, "Continue in {0}", name),
+                        localize(6592, "Continue in {0}", name),
                         ThemeIcon.isThemeIcon(icon) ? ThemeIcon.asClassName(icon) : undefined,
                         true,
                         () => {

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

@@ -3,7 +3,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IChatTask, IChatTaskSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatProgressRenderableResponseContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 import { CollapsibleListPool } from "./chatReferencesContentPart.js";
 export declare class ChatTaskContentPart extends Disposable implements IChatContentPart {
     private readonly task;

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

@@ -40,6 +40,7 @@ let ChatTaskContentPart = class ChatTaskContentPart extends Disposable {
                 showSpinner,
                 true,
                 undefined,
+                undefined,
                 undefined
             ));
             this.domNode = progressPart.domNode;

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

@@ -7,7 +7,7 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { IChatListItemRendererOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { DiffEditorPool } from "./chatContentCodePools.js";
-import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
 import { ICodeCompareModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service";
 export declare class ChatTextEditContentPart extends Disposable implements IChatContentPart {
     private readonly codeCompareModelService;

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

@@ -39,7 +39,7 @@ let ChatTextEditContentPart = class ChatTextEditContentPart extends Disposable {
                 this.domNode = $(
                     ".interactive-edits-summary",
                     undefined,
-                    !element.isComplete ? "" : element.isCanceled ? ( localize(5978, "Making changes was aborted.")) : ( localize(5979, "Made changes."))
+                    !element.isComplete ? "" : element.isCanceled ? ( localize(6593, "Making changes was aborted.")) : ( localize(6594, "Made changes."))
                 );
             } else {
                 this.domNode = $("div");

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

@@ -1,5 +1,5 @@
 import { IChatMarkdownContent, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
-import { IChatContentPartRenderContext, IChatContentPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
+import { IChatContentPartRenderContext, IChatContentPart } from "./chatContentParts.js";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
@@ -40,6 +40,8 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
     private appendedItemCount;
     private isActive;
     private toolInvocations;
+    private allThinkingParts;
+    private hookCount;
     private singleItemInfo;
     private lazyItems;
     private hasExpandedOnce;
@@ -49,9 +51,13 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
     private readonly toolWrappersByCallId;
     private readonly toolDisposables;
     private pendingRemovals;
+    private pendingRemovalFlushDisposable;
     private pendingScrollDisposable;
     private mutationObserverDisposable;
     private isUpdatingDimensions;
+    private titleShimmerSpan;
+    private titleDetailContainer;
+    private titleDetailRendered;
     private getRandomWorkingMessage;
     constructor(content: IChatThinkingPart, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, streamingCompleted: boolean, instantiationService: IInstantiationService, configurationService: IConfigurationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, languageModelsService: ILanguageModelsService, hoverService: IHoverService);
     protected shouldInitEarly(): boolean;
@@ -65,7 +71,9 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
      */
     private updateScrollDimensionsForCompletion;
     private renderMarkdown;
+    private setFinalizedTitle;
     private setDropdownClickable;
+    private shouldAllowExpansion;
     private updateDropdownClickability;
     private appendToWrapper;
     resetId(): void;
@@ -74,7 +82,7 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
     getIsActive(): boolean;
     markAsInactive(): void;
     finalizeTitleIfDefault(): void;
-    private setGeneratedTitleOnToolInvocations;
+    private setGeneratedTitleOnAllParts;
     private generateTitleViaLLM;
     private restoreSingleItemToOriginalPosition;
     private setFallbackTitle;
@@ -93,6 +101,7 @@ export declare class ChatThinkingContentPart extends ChatCollapsibleContentPart
      */
     removeLazyItem(toolInvocationId: string): boolean;
     private processPendingRemovals;
+    private schedulePendingRemovalsFlush;
     private removeStreamingToolEntry;
     private trackToolMetadata;
     private appendItemToDOM;