@codingame/monaco-vscode-katex-common 34.1.3 → 35.0.1

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

@@ -28,6 +28,7 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private readonly configurationService;
     private wrapper;
     private isActive;
+    private isExternallyActive;
     private hasToolItems;
     private readonly isInitiallyComplete;
     private promptContainer;
@@ -43,8 +44,17 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private pendingResultText;
     private currentRunningToolMessage;
     private modelName;
+    private credits;
     private _isDefaultDescription;
     private readonly _hoverDisposable;
+    private readonly _subagentToolInvocation;
+    /**
+     * Toolbar hosting the `MenuId.ChatSubagentContent` menu in the subagent
+     * header. The Agents window contributes an "Open Subagent" action (rendered
+     * as a pill) into this menu; elsewhere the menu is empty and nothing shows.
+     */
+    private _openChatToolbar;
+    private _openChatToolbarContainer;
     private toolsWaitingForConfirmation;
     private userManuallyExpanded;
     private autoExpandedForConfirmation;
@@ -56,6 +66,8 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private readonly _confirmationPlaceholderDisposable;
     private _useCarouselForConfirmations;
     private toolsWaitingForCarouselConfirmation;
+    /** Per-tool-invocation autoruns observing tool state; each is disposed once its tool reaches a terminal state so listeners don't accumulate for the widget's lifetime. */
+    private readonly _toolStateTracking;
     private workingSpinnerElement;
     private workingSpinnerLabel;
     private availableMessages;
@@ -71,6 +83,17 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
      * Extracts subagent info (description, agentName, prompt) from a tool invocation.
      */
     private static extractSubagentInfo;
+    /** The subagent's own chat resource (URI string), when it runs as a distinct chat. */
+    private _getChatResource;
+    /**
+     * Creates (once) and toggles the subagent header toolbar that hosts the
+     * `MenuId.ChatSubagentContent` menu. The Agents window contributes an "Open
+     * Subagent" pill into that menu to reveal the subagent's own (read-only)
+     * chat; in the regular chat view the menu is empty and nothing renders. The
+     * subagent chat resource can arrive after the part is first constructed, so
+     * this is also called from the tool-completion autorun.
+     */
+    private _updateOpenChatLink;
     constructor(subAgentInvocationId: string, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, listPool: CollapsibleListPool, editorPool: EditorPool, currentWidthDelegate: () => number, announcedToolProgressKeys: Set<string>, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, hoverService: IHoverService, configurationService: IConfigurationService);
     private getRandomWorkingMessage;
     private createWorkingSpinner;
@@ -85,14 +108,30 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private renderPromptSection;
     private doRenderPromptSection;
     getIsActive(): boolean;
+    shouldRemainActive(): boolean;
     get hasToolsWaitingForConfirmation(): boolean;
     /** Routes this subagent's initial confirmations to the input carousel. */
     enableCarouselMode(navigateToCarousel: (subAgentInvocationId: string) => void, addToolToCarousel: (tool: IChatToolInvocation) => void, shouldUseCarouselForTool: (tool: IChatToolInvocation, state: IChatToolInvocation.State) => boolean): void;
     getAgentLabel(): string;
     markAsInactive(): void;
+    private markAsActive;
+    private refreshActiveStateFromToolData;
     finalizeTitle(): void;
     private updateTitle;
     private updateHover;
+    /**
+     * Re-reads the subagent's credit (AIC) usage from `toolSpecificData` and
+     * refreshes the hover tooltip when it has changed. Credits can arrive
+     * incrementally while the subagent runs and continue updating until its
+     * child turns report their final usage.
+     */
+    private refreshCreditsFromToolData;
+    /**
+     * Re-reads the subagent's model name from `toolSpecificData` and refreshes
+     * the hover when it changes. The model can arrive incrementally (e.g. agent
+     * host subagents report it via their child turns' usage events).
+     */
+    private refreshModelFromToolData;
     /**
      * Tracks a tool invocation's state for:
      * 1. Updating the title with the current tool message (persists even after completion)

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

@@ -1,7 +1,8 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, AnimationFrameScheduler, DisposableResizeObserver, append, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, addDisposableListener, EventType, AnimationFrameScheduler, DisposableResizeObserver, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Gesture, EventType as EventType$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/touch';
 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';
@@ -9,10 +10,12 @@ import { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api
 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 { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 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 { IChatToolInvocation, formatCopilotCredits } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import { ChatCollapsibleMarkdownContentPart } from './chatCollapsibleMarkdownContentPart.js';
 import { renderFileWidgets } from './chatInlineAnchorWidget.js';
@@ -25,20 +28,21 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 var ChatSubagentContentPart_1;
 registerCss(chatSubagentContent);
 const MAX_TITLE_LENGTH = 100;
-const subagentWorkingMessages = [( localize(7407, "Processing")), ( localize(7408, "Preparing")), ( localize(7409, "Loading")), ( localize(7410, "Analyzing")), ( localize(7411, "Evaluating"))];
+const subagentWorkingMessages = [( localize(7951, "Processing")), ( localize(7952, "Preparing")), ( localize(7953, "Loading")), ( localize(7954, "Analyzing")), ( localize(7955, "Evaluating"))];
 let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentContentPart extends ChatCollapsibleContentPart {
     static isParentSubagentTool(toolInvocation) {
         return toolInvocation.toolSpecificData?.kind === "subagent" && !toolInvocation.subAgentInvocationId;
     }
     static extractSubagentInfo(toolInvocation) {
-        const defaultDescription = ( localize(7412, "Running subagent"));
+        const defaultDescription = ( localize(7956, "Running subagent"));
         if (!ChatSubagentContentPart_1.isParentSubagentTool(toolInvocation)) {
             return {
                 description: defaultDescription,
                 isDefaultDescription: true,
                 agentName: undefined,
                 prompt: undefined,
-                modelName: undefined
+                modelName: undefined,
+                credits: undefined
             };
         }
         if (toolInvocation.toolSpecificData?.kind === "subagent") {
@@ -48,7 +52,8 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                 isDefaultDescription: !hasDescription,
                 agentName: toolInvocation.toolSpecificData.agentName,
                 prompt: toolInvocation.toolSpecificData.prompt,
-                modelName: toolInvocation.toolSpecificData.modelName
+                modelName: toolInvocation.toolSpecificData.modelName,
+                credits: toolInvocation.toolSpecificData.credits
             };
         }
         if (toolInvocation.kind === "toolInvocation") {
@@ -60,7 +65,8 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                 isDefaultDescription: !hasDescription,
                 agentName: params?.agentName,
                 prompt: params?.prompt,
-                modelName: undefined
+                modelName: undefined,
+                credits: undefined
             };
         }
         return {
@@ -68,9 +74,57 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             isDefaultDescription: true,
             agentName: undefined,
             prompt: undefined,
-            modelName: undefined
+            modelName: undefined,
+            credits: undefined
         };
     }
+    _getChatResource() {
+        const data = this._subagentToolInvocation.toolSpecificData;
+        return data?.kind === "subagent" ? data.chatResource : undefined;
+    }
+    _updateOpenChatLink() {
+        const resource = this._getChatResource();
+        if (!this._collapseButton) {
+            return;
+        }
+        this.domNode.classList.toggle("chat-subagent-has-chat", !!resource);
+        if (!resource) {
+            this._openChatToolbarContainer?.classList.add("hidden");
+            return;
+        }
+        if (!this._openChatToolbar) {
+            const container = $(".chat-subagent-open-chat-toolbar");
+            this._collapseButton.element.insertBefore(container, this._collapseButton.labelElement);
+            this._openChatToolbarContainer = container;
+            this._openChatToolbar = this._register(
+                this.instantiationService.createInstance(MenuWorkbenchToolBar, container, MenuId.ChatSubagentContent, {
+                    hiddenItemStrategy: HiddenItemStrategy.Ignore,
+                    menuOptions: {
+                        shouldForwardArgs: true
+                    },
+                    toolbarOptions: {
+                        primaryGroup: () => true
+                    }
+                })
+            );
+            const pill = this._openChatToolbar.getElement();
+            this._register(Gesture.addTarget(pill));
+            this._register(
+                addDisposableListener(pill, EventType.MOUSE_DOWN, e => e.stopPropagation())
+            );
+            this._register(
+                addDisposableListener(pill, EventType.CLICK, e => e.stopPropagation())
+            );
+            this._register(
+                addDisposableListener(pill, EventType$1.Tap, e => e.stopPropagation())
+            );
+        }
+        this._openChatToolbar.context = {
+            chatResource: resource,
+            agentName: this.agentName
+        };
+        this._openChatToolbarContainer.classList.remove("hidden");
+    }
     constructor(
         subAgentInvocationId,
         toolInvocation,
@@ -90,9 +144,10 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             isDefaultDescription,
             agentName,
             prompt,
-            modelName
+            modelName,
+            credits
         } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
-        const rawPrefix = agentName || ( localize(7413, "Subagent"));
+        const rawPrefix = agentName || ( localize(7957, "Subagent"));
         const prefix = rawPrefix.charAt(0).toUpperCase() + rawPrefix.slice(1);
         const initialTitle = `${prefix}: ${description}`;
         super(initialTitle, context, undefined, hoverService, configurationService);
@@ -106,7 +161,6 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.instantiationService = instantiationService;
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this.configurationService = configurationService;
-        this.isActive = true;
         this.hasToolItems = false;
         this.lazyItems = [];
         this.hasExpandedOnce = false;
@@ -118,32 +172,38 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this._confirmationPlaceholderDisposable = this._register(( new MutableDisposable()));
         this._useCarouselForConfirmations = false;
         this.toolsWaitingForCarouselConfirmation = 0;
+        this._toolStateTracking = this._register(( new DisposableStore()));
         this._titleDetailRendered = this._register(( new MutableDisposable()));
         this.description = rcut(description, MAX_TITLE_LENGTH);
         this._isDefaultDescription = isDefaultDescription;
         this.agentName = agentName;
         this.prompt = prompt;
         this.modelName = modelName;
-        this.isInitiallyComplete = this.element.isComplete;
+        this.credits = credits;
+        this.isInitiallyComplete = IChatToolInvocation.isComplete(toolInvocation);
+        this.isExternallyActive = toolInvocation.toolSpecificData?.kind === "subagent" && toolInvocation.toolSpecificData.isActive === true;
+        this.isActive = toolInvocation.toolSpecificData?.kind === "subagent" ? toolInvocation.toolSpecificData.isActive ?? !this.isInitiallyComplete : !this.isInitiallyComplete;
+        this._subagentToolInvocation = toolInvocation;
         const node = this.domNode;
         node.classList.add("chat-thinking-box", "chat-thinking-fixed-mode", "chat-subagent-part");
-        if (!this.element.isComplete) {
+        this._updateOpenChatLink();
+        if (this.isActive) {
             node.classList.add("chat-thinking-active");
         }
-        if (!this.element.isComplete && this._collapseButton) {
+        if (this.isActive && 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) {
+        if (this._collapseButton && this.isActive) {
             this._collapseButton.icon = Codicon.circleFilled;
         }
         this._register(autorun(r => {
             this.expanded.read(r);
             if (this._collapseButton) {
-                if (!this.element.isComplete && this.isActive) {
+                if (this.isActive) {
                     this._collapseButton.icon = Codicon.circleFilled;
                 } else {
                     this._collapseButton.icon = Codicon.check;
@@ -239,7 +299,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             return;
         }
         const lines = this.prompt.split("\n");
-        const rawFirstLine = lines[0] || ( localize(7414, "Prompt"));
+        const rawFirstLine = lines[0] || ( localize(7958, "Prompt"));
         const restOfLines = lines.slice(1).join("\n").trim();
         const titleContent = rcut(rawFirstLine, MAX_TITLE_LENGTH);
         const wasTruncated = rawFirstLine.length > MAX_TITLE_LENGTH;
@@ -271,6 +331,9 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
     getIsActive() {
         return this.isActive;
     }
+    shouldRemainActive() {
+        return this.isExternallyActive;
+    }
     get hasToolsWaitingForConfirmation() {
         return this.toolsWaitingForConfirmation > 0;
     }
@@ -287,7 +350,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         if (!this._isDefaultDescription && this.description) {
             return this.description;
         }
-        return localize(7413, "Subagent");
+        return localize(7957, "Subagent");
     }
     markAsInactive() {
         this.isActive = false;
@@ -298,11 +361,36 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.removeWorkingSpinner();
         this.hideConfirmationPlaceholder();
         if (this._isDefaultDescription) {
-            this.description = ( localize(7415, "Ran subagent"));
+            this.description = ( localize(7959, "Ran subagent"));
         }
         this.finalizeTitle();
         this.setExpanded(false);
     }
+    markAsActive() {
+        if (this.isActive) {
+            return;
+        }
+        this.isActive = true;
+        this.domNode.classList.add("chat-thinking-active");
+        if (this._collapseButton) {
+            this._collapseButton.icon = Codicon.circleFilled;
+        }
+        if (this.wrapper && !this.hasToolsWaitingForConfirmation) {
+            this.showWorkingSpinner();
+        }
+        this.updateTitle();
+    }
+    refreshActiveStateFromToolData(toolInvocation) {
+        if (toolInvocation.toolSpecificData?.kind !== "subagent" || toolInvocation.toolSpecificData.isActive === undefined) {
+            return;
+        }
+        this.isExternallyActive = toolInvocation.toolSpecificData.isActive;
+        if (toolInvocation.toolSpecificData.isActive) {
+            this.markAsActive();
+        } else {
+            this.markAsInactive();
+        }
+    }
     finalizeTitle() {
         this.updateTitle();
         if (this._collapseButton) {
@@ -310,7 +398,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     updateTitle() {
-        const rawName = this.agentName || ( localize(7413, "Subagent"));
+        const rawName = this.agentName || ( localize(7957, "Subagent"));
         const prefix = rawName.charAt(0).toUpperCase() + rawName.slice(1);
         const shimmerText = `${prefix}: ${this.description}`;
         const toolCallText = this.currentRunningToolMessage && this.isActive ? ` \u2014 ${this.currentRunningToolMessage}` : ``;
@@ -369,13 +457,45 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this._collapseButton.element.ariaExpanded = String(this.isExpanded());
     }
     updateHover() {
-        if (!this.modelName || !this._collapseButton) {
+        if (!this._collapseButton) {
+            return;
+        }
+        const parts = [];
+        if (this.modelName) {
+            parts.push(( localize(7960, "Model: {0}", this.modelName)));
+        }
+        if (typeof this.credits === "number" && this.credits > 0) {
+            const formatted = formatCopilotCredits(this.credits);
+            parts.push(formatted === "1" ? ( localize(7961, "{0} credit", formatted)) : ( localize(7962, "{0} credits", formatted)));
+        }
+        if (parts.length === 0) {
+            this._hoverDisposable.clear();
             return;
         }
         this._hoverDisposable.value = this.hoverService.setupDelayedHover(this._collapseButton.element, {
-            content: ( localize(7416, "Model: {0}", this.modelName))
+            content: parts.join(" • ")
         });
     }
+    refreshCreditsFromToolData(toolInvocation) {
+        if (toolInvocation.toolSpecificData?.kind !== "subagent") {
+            return;
+        }
+        const credits = toolInvocation.toolSpecificData.credits;
+        if (typeof credits === "number" && credits !== this.credits) {
+            this.credits = credits;
+            this.updateHover();
+        }
+    }
+    refreshModelFromToolData(toolInvocation) {
+        if (toolInvocation.toolSpecificData?.kind !== "subagent") {
+            return;
+        }
+        const modelName = toolInvocation.toolSpecificData.modelName;
+        if (modelName && modelName !== this.modelName) {
+            this.modelName = modelName;
+            this.updateHover();
+        }
+    }
     trackToolState(toolInvocation) {
         if (toolInvocation.kind !== "toolInvocation") {
             return;
@@ -388,7 +508,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         const shouldUseCarouselForTool = this._shouldUseCarouselForTool;
         let wasWaitingForConfirmation = false;
         let wasWaitingForCarouselConfirmation = false;
-        this._register(autorun(r => {
+        const toolStateAutorun = autorun(r => {
             const state = toolInvocation.state.read(r);
             const isWaitingForConfirmation = state.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state.type === IChatToolInvocation.StateKind.WaitingForPostApproval;
             const isWaitingForCarouselConfirmation = !!addToolToCarousel && shouldUseCarouselForTool?.(toolInvocation, state) === true;
@@ -423,11 +543,15 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             }
             wasWaitingForConfirmation = isWaitingForConfirmation;
             wasWaitingForCarouselConfirmation = isWaitingForCarouselConfirmation;
-        }));
+            if (state.type === IChatToolInvocation.StateKind.Completed || state.type === IChatToolInvocation.StateKind.Cancelled) {
+                queueMicrotask(() => this._toolStateTracking.delete(toolStateAutorun));
+            }
+        });
+        this._toolStateTracking.add(toolStateAutorun);
     }
     getConfirmationPlaceholderText() {
         const count = this.toolsWaitingForCarouselConfirmation;
-        return count === 1 ? ( localize(7417, "1 pending confirmation")) : ( localize(7418, "{0} pending confirmations", count));
+        return count === 1 ? ( localize(7963, "1 pending confirmation")) : ( localize(7964, "{0} pending confirmations", count));
     }
     updateConfirmationPlaceholderLabel() {
         if (this._confirmationPlaceholderLabel) {
@@ -489,6 +613,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             let wasStreaming = toolInvocation.state.get().type === IChatToolInvocation.StateKind.Streaming;
             this._register(autorun(r => {
                 const state = toolInvocation.state.read(r);
+                this.refreshActiveStateFromToolData(toolInvocation);
                 if (state.type === IChatToolInvocation.StateKind.Completed) {
                     wasStreaming = false;
                     const textParts = ( (state.contentForModel || []).filter(part => part.kind === "text").map(part => part.value));
@@ -505,7 +630,11 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                             this.updateHover();
                         }
                     }
-                    this.markAsInactive();
+                    this.refreshCreditsFromToolData(toolInvocation);
+                    this._updateOpenChatLink();
+                    if (!this.isExternallyActive) {
+                        this.markAsInactive();
+                    }
                 } else if (wasStreaming && state.type !== IChatToolInvocation.StateKind.Streaming) {
                     wasStreaming = false;
                     const {
@@ -523,6 +652,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                         this.modelName = modelName;
                         this.updateHover();
                     }
+                    this.refreshCreditsFromToolData(toolInvocation);
                     this.renderPromptSection();
                     this.updateTitle();
                 } else if (toolInvocation.toolSpecificData?.kind === "subagent") {
@@ -543,6 +673,9 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                         }
                         this.updateTitle();
                     }
+                    this.refreshCreditsFromToolData(toolInvocation);
+                    this.refreshModelFromToolData(toolInvocation);
+                    this._updateOpenChatLink();
                 }
             }));
         } else if (toolInvocation.toolSpecificData?.kind === "subagent" && toolInvocation.toolSpecificData.result) {
@@ -632,7 +765,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     appendHookItem(factory, hookPart) {
-        const hookMessage = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(7419, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(7420, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(7421, "Warning for {0}", hookPart.toolDisplayName)) : ( localize(7422, "Hook warning")));
+        const hookMessage = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(7965, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(7966, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(7967, "Warning for {0}", hookPart.toolDisplayName)) : ( localize(7968, "Hook warning")));
         this.currentRunningToolMessage = hookMessage;
         this.updateTitle();
         if (this.isExpanded() || this.hasExpandedOnce) {
@@ -719,7 +852,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         itemWrapper.appendChild(content);
         if (toolInvocation.kind === "toolInvocation") {
             const shouldUseCarouselForTool = this._shouldUseCarouselForTool;
-            this._register(autorun(r => {
+            const iconAutorun = autorun(r => {
                 const state = toolInvocation.state.read(r);
                 const hasConfirmation = state.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state.type === IChatToolInvocation.StateKind.WaitingForPostApproval;
                 const shouldHideInline = shouldUseCarouselForTool?.(toolInvocation, state) === true;
@@ -739,7 +872,11 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                         this.ensurePlaceholderAtBottom();
                     }
                 }
-            }));
+                if (state.type === IChatToolInvocation.StateKind.Completed || state.type === IChatToolInvocation.StateKind.Cancelled) {
+                    queueMicrotask(() => this._toolStateTracking.delete(iconAutorun));
+                }
+            });
+            this._toolStateTracking.add(iconAutorun);
         } else {
             itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
         }
@@ -805,20 +942,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     hasSameContent(other, _followingContent, _element) {
-        if (other.kind === "markdownContent") {
-            return true;
-        }
-        if (other.kind === "hook" && other.subAgentInvocationId) {
-            return this.subAgentInvocationId === 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;
-            }
-            return !this.subAgentInvocationId && !otherEffectiveId;
-        }
-        return false;
+        return (other.kind === "toolInvocation" || other.kind === "toolInvocationSerialized") && ChatSubagentContentPart_1.isParentSubagentTool(other) && this.subAgentInvocationId === other.toolCallId;
     }
 };
 ChatSubagentContentPart = ChatSubagentContentPart_1 = ( __decorate([( __param(8, IInstantiationService)), ( __param(9, IChatMarkdownAnchorService)), ( __param(10, IHoverService)), ( __param(11, IConfigurationService))], ChatSubagentContentPart));

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

@@ -1,14 +1,11 @@
 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 { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
-import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IHandOff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser";
-import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export interface INextPromptSelection {
     readonly handoff: IHandOff;
     readonly agentId?: string;
@@ -19,9 +16,6 @@ export declare class ChatSuggestNextWidget extends Disposable {
     private readonly contextMenuService;
     private readonly chatSessionsService;
     private readonly contextKeyService;
-    private readonly commandService;
-    private readonly workspaceContextService;
-    private readonly chatWidgetService;
     readonly domNode: HTMLElement;
     private readonly _onDidChangeHeight;
     readonly onDidChangeHeight: Event<void>;
@@ -31,19 +25,11 @@ export declare class ChatSuggestNextWidget extends Disposable {
     private titleElement;
     private _currentMode;
     private buttonDisposables;
-    constructor(configurationService: IConfigurationService, contextMenuService: IContextMenuService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService, commandService: ICommandService, workspaceContextService: IWorkspaceContextService, chatWidgetService: IChatWidgetService);
+    constructor(configurationService: IConfigurationService, contextMenuService: IContextMenuService, chatSessionsService: IChatSessionsService, contextKeyService: IContextKeyService);
     get height(): number;
     getCurrentMode(): IChatMode | undefined;
     private createSuggestNextWidget;
     render(mode: IChatMode): void;
-    private createAgentsWindowHandoffButton;
-    /**
-     * Pull a compact transcript of the current chat — last user request and
-     * the assistant reply — so the Agents-window CLI session has the context
-     * that produced this handoff, not just the static handoff prompt.
-     */
-    private captureChatTranscript;
-    private composeAgentsWindowQuery;
     private createPromptButton;
     private createAutopilotButton;
     hide(): void;