@codingame/monaco-vscode-katex-common 30.0.0 → 31.0.0

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

@@ -5,7 +5,6 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IMarkdownRenderer } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer";
 import { IChatHookPart, IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-import { CodeBlockModelCollection } from "../../../common/widget/codeBlockModelCollection.js";
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
 import { EditorPool } from "./chatContentCodePools.js";
@@ -23,10 +22,10 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private readonly listPool;
     private readonly editorPool;
     private readonly currentWidthDelegate;
-    private readonly codeBlockModelCollection;
     private readonly announcedToolProgressKeys;
     private readonly instantiationService;
     private readonly chatMarkdownAnchorService;
+    private readonly configurationService;
     private wrapper;
     private isActive;
     private hasToolItems;
@@ -44,10 +43,22 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private pendingResultText;
     private currentRunningToolMessage;
     private modelName;
+    private _isDefaultDescription;
     private readonly _hoverDisposable;
     private toolsWaitingForConfirmation;
     private userManuallyExpanded;
     private autoExpandedForConfirmation;
+    private _navigateToCarousel;
+    private _addToolToCarousel;
+    private _shouldUseCarouselForTool;
+    private _confirmationPlaceholder;
+    private _confirmationPlaceholderLabel;
+    private readonly _confirmationPlaceholderDisposable;
+    private _useCarouselForConfirmations;
+    private toolsWaitingForCarouselConfirmation;
+    private workingSpinnerElement;
+    private workingSpinnerLabel;
+    private availableMessages;
     private titleShimmerSpan;
     private titleDetailContainer;
     private readonly _titleDetailRendered;
@@ -60,7 +71,11 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
      * Extracts subagent info (description, agentName, prompt) from a tool invocation.
      */
     private static extractSubagentInfo;
-    constructor(subAgentInvocationId: string, toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, context: IChatContentPartRenderContext, chatContentMarkdownRenderer: IMarkdownRenderer, listPool: CollapsibleListPool, editorPool: EditorPool, currentWidthDelegate: () => number, codeBlockModelCollection: CodeBlockModelCollection, announcedToolProgressKeys: Set<string>, instantiationService: IInstantiationService, chatMarkdownAnchorService: IChatMarkdownAnchorService, hoverService: IHoverService, configurationService: IConfigurationService);
+    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;
+    private removeWorkingSpinner;
+    private showWorkingSpinner;
     protected initContent(): HTMLElement;
     /**
      * Renders the prompt as a collapsible section at the start of the content.
@@ -70,6 +85,10 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private renderPromptSection;
     private doRenderPromptSection;
     getIsActive(): 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;
     finalizeTitle(): void;
     private updateTitle;
@@ -82,6 +101,13 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
      * This method is public to support testing.
      */
     trackToolState(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): void;
+    private getConfirmationPlaceholderText;
+    private updateConfirmationPlaceholderLabel;
+    /** Shows a placeholder that jumps back to the carousel. */
+    private showConfirmationPlaceholder;
+    private hideConfirmationPlaceholder;
+    /** Keeps the carousel placeholder after visible tool output. */
+    private ensurePlaceholderAtBottom;
     /**
      * Watches the tool invocation for completion and renders the result.
      * Handles both live and serialized invocations.
@@ -103,11 +129,17 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     /**
      * Appends a markdown item (e.g., an edit pill) to the subagent content part.
      * This is used to route codeblockUri parts with subAgentInvocationId to this subagent's container.
+     *
+     * When the caller has already created the content part eagerly (for example, a
+     * pre-built `ChatMarkdownContentPart` wrapped in a factory), the caller MUST pass
+     * that part as `eagerDisposable` so it is registered on this subagent part
+     * immediately. Otherwise, if the subagent section is collapsed and the lazy item
+     * is never materialized, the eagerly-created part would leak.
      */
     appendMarkdownItem(factory: () => {
         domNode: HTMLElement;
         disposable?: IDisposable;
-    }, _codeblocksPartId: string | undefined, _markdown: IChatMarkdownContent, _originalParent?: HTMLElement): void;
+    }, _codeblocksPartId: string | undefined, _markdown: IChatMarkdownContent, _originalParent?: HTMLElement, eagerDisposable?: IDisposable): void;
     /**
      * Appends a hook item (blocked/warning) to the subagent content part.
      */

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

@@ -1,11 +1,11 @@
 
 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, addDisposableListener } 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 { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 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';
@@ -17,7 +17,7 @@ import { ChatCollapsibleContentPart } from './chatCollapsibleContentPart.js';
 import { ChatCollapsibleMarkdownContentPart } from './chatCollapsibleMarkdownContentPart.js';
 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 { buildPhrasePool, createThinkingIcon, getToolInvocationIcon } from './chatThinkingContentPart.js';
 import { ChatToolInvocationPart } from './toolInvocationParts/chatToolInvocationPart.js';
 import * as chatSubagentContent from './media/chatSubagentContent.css';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -25,23 +25,27 @@ 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(6926, "Processing")), ( localize(6927, "Preparing")), ( localize(6928, "Loading")), ( localize(6929, "Analyzing")), ( localize(6930, "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(6822, "Running subagent"));
+        const defaultDescription = ( localize(6931, "Running subagent"));
         if (!ChatSubagentContentPart_1.isParentSubagentTool(toolInvocation)) {
             return {
                 description: defaultDescription,
+                isDefaultDescription: true,
                 agentName: undefined,
                 prompt: undefined,
                 modelName: undefined
             };
         }
         if (toolInvocation.toolSpecificData?.kind === "subagent") {
+            const hasDescription = !!toolInvocation.toolSpecificData.description;
             return {
                 description: toolInvocation.toolSpecificData.description ?? defaultDescription,
+                isDefaultDescription: !hasDescription,
                 agentName: toolInvocation.toolSpecificData.agentName,
                 prompt: toolInvocation.toolSpecificData.prompt,
                 modelName: toolInvocation.toolSpecificData.modelName
@@ -50,8 +54,10 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         if (toolInvocation.kind === "toolInvocation") {
             const state = toolInvocation.state.get();
             const params = state.type !== IChatToolInvocation.StateKind.Streaming ? state.parameters : undefined;
+            const hasDescription = !!params?.description;
             return {
                 description: params?.description ?? defaultDescription,
+                isDefaultDescription: !hasDescription,
                 agentName: params?.agentName,
                 prompt: params?.prompt,
                 modelName: undefined
@@ -59,6 +65,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
         return {
             description: defaultDescription,
+            isDefaultDescription: true,
             agentName: undefined,
             prompt: undefined,
             modelName: undefined
@@ -72,7 +79,6 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         listPool,
         editorPool,
         currentWidthDelegate,
-        codeBlockModelCollection,
         announcedToolProgressKeys,
         instantiationService,
         chatMarkdownAnchorService,
@@ -81,11 +87,13 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
     ) {
         const {
             description,
+            isDefaultDescription,
             agentName,
             prompt,
             modelName
         } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
-        const prefix = agentName || ( localize(6823, "Subagent"));
+        const rawPrefix = agentName || ( localize(6932, "Subagent"));
+        const prefix = rawPrefix.charAt(0).toUpperCase() + rawPrefix.slice(1);
         const initialTitle = `${prefix}: ${description}`;
         super(initialTitle, context, undefined, hoverService, configurationService);
         this.subAgentInvocationId = subAgentInvocationId;
@@ -94,10 +102,10 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.listPool = listPool;
         this.editorPool = editorPool;
         this.currentWidthDelegate = currentWidthDelegate;
-        this.codeBlockModelCollection = codeBlockModelCollection;
         this.announcedToolProgressKeys = announcedToolProgressKeys;
         this.instantiationService = instantiationService;
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
+        this.configurationService = configurationService;
         this.isActive = true;
         this.hasToolItems = false;
         this.lazyItems = [];
@@ -107,8 +115,12 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.toolsWaitingForConfirmation = 0;
         this.userManuallyExpanded = false;
         this.autoExpandedForConfirmation = false;
+        this._confirmationPlaceholderDisposable = this._register(( new MutableDisposable()));
+        this._useCarouselForConfirmations = false;
+        this.toolsWaitingForCarouselConfirmation = 0;
         this._titleDetailRendered = this._register(( new MutableDisposable()));
-        this.description = description;
+        this.description = rcut(description, MAX_TITLE_LENGTH);
+        this._isDefaultDescription = isDefaultDescription;
         this.agentName = agentName;
         this.prompt = prompt;
         this.modelName = modelName;
@@ -165,12 +177,48 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.renderPromptSection();
         this.watchToolCompletion(toolInvocation);
     }
+    getRandomWorkingMessage() {
+        if (!this.availableMessages || this.availableMessages.length === 0) {
+            this.availableMessages = buildPhrasePool(subagentWorkingMessages, this.configurationService);
+        }
+        const index = Math.floor(Math.random() * this.availableMessages.length);
+        return this.availableMessages.splice(index, 1)[0];
+    }
+    createWorkingSpinner() {
+        if (this.workingSpinnerElement || !this.wrapper) {
+            return;
+        }
+        this.workingSpinnerElement = $(".chat-thinking-item.chat-thinking-spinner-item");
+        const spinnerIcon = createThinkingIcon(Codicon.circleFilled);
+        this.workingSpinnerElement.appendChild(spinnerIcon);
+        this.workingSpinnerLabel = $("span.chat-thinking-spinner-label");
+        this.workingSpinnerLabel.textContent = this.getRandomWorkingMessage();
+        this.workingSpinnerElement.appendChild(this.workingSpinnerLabel);
+        this.wrapper.appendChild(this.workingSpinnerElement);
+    }
+    removeWorkingSpinner() {
+        if (this.workingSpinnerElement) {
+            this.workingSpinnerElement.remove();
+            this.workingSpinnerElement = undefined;
+            this.workingSpinnerLabel = undefined;
+        }
+    }
+    showWorkingSpinner() {
+        if (this.workingSpinnerElement) {
+            this.workingSpinnerElement.style.display = "";
+        } else {
+            this.createWorkingSpinner();
+        }
+    }
     initContent() {
         this.wrapper = $(".chat-used-context-list.chat-thinking-collapsible");
         if (!this.hasToolItems) {
             this.wrapper.style.display = "none";
         }
         this.materializePendingContent();
+        if (this.isActive && !this.isInitiallyComplete && !this.hasToolsWaitingForConfirmation) {
+            this.showWorkingSpinner();
+        }
         const resizeObserver = this._register(( new DisposableResizeObserver(() => this.layoutScheduler.schedule())));
         this._register(resizeObserver.observe(this.wrapper));
         return this.wrapper;
@@ -191,7 +239,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             return;
         }
         const lines = this.prompt.split("\n");
-        const rawFirstLine = lines[0] || ( localize(6824, "Prompt"));
+        const rawFirstLine = lines[0] || ( localize(6933, "Prompt"));
         const restOfLines = lines.slice(1).join("\n").trim();
         const titleContent = rcut(rawFirstLine, MAX_TITLE_LENGTH);
         const wasTruncated = rawFirstLine.length > MAX_TITLE_LENGTH;
@@ -223,12 +271,35 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
     getIsActive() {
         return this.isActive;
     }
+    get hasToolsWaitingForConfirmation() {
+        return this.toolsWaitingForConfirmation > 0;
+    }
+    enableCarouselMode(navigateToCarousel, addToolToCarousel, shouldUseCarouselForTool) {
+        this._useCarouselForConfirmations = true;
+        this._navigateToCarousel = navigateToCarousel;
+        this._addToolToCarousel = addToolToCarousel;
+        this._shouldUseCarouselForTool = shouldUseCarouselForTool;
+    }
+    getAgentLabel() {
+        if (this.agentName) {
+            return this.agentName;
+        }
+        if (!this._isDefaultDescription && this.description) {
+            return this.description;
+        }
+        return localize(6932, "Subagent");
+    }
     markAsInactive() {
         this.isActive = false;
         this.domNode.classList.remove("chat-thinking-active");
         if (this._collapseButton) {
             this._collapseButton.icon = Codicon.check;
         }
+        this.removeWorkingSpinner();
+        this.hideConfirmationPlaceholder();
+        if (this._isDefaultDescription) {
+            this.description = ( localize(6934, "Ran subagent"));
+        }
         this.finalizeTitle();
         this.setExpanded(false);
     }
@@ -239,7 +310,8 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     updateTitle() {
-        const prefix = this.agentName || ( localize(6823, "Subagent"));
+        const rawName = this.agentName || ( localize(6932, "Subagent"));
+        const prefix = rawName.charAt(0).toUpperCase() + rawName.slice(1);
         const shimmerText = `${prefix}: ${this.description}`;
         const toolCallText = this.currentRunningToolMessage && this.isActive ? ` \u2014 ${this.currentRunningToolMessage}` : ``;
         if (!this._collapseButton) {
@@ -299,7 +371,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             return;
         }
         this._hoverDisposable.value = this.hoverService.setupDelayedHover(this._collapseButton.element, {
-            content: ( localize(6825, "Model: {0}", this.modelName))
+            content: ( localize(6935, "Model: {0}", this.modelName))
         });
     }
     trackToolState(toolInvocation) {
@@ -310,26 +382,103 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         const messageText = typeof message === "string" ? message : message.value;
         this.currentRunningToolMessage = messageText;
         this.updateTitle();
+        const addToolToCarousel = this._addToolToCarousel;
+        const shouldUseCarouselForTool = this._shouldUseCarouselForTool;
         let wasWaitingForConfirmation = false;
+        let wasWaitingForCarouselConfirmation = false;
         this._register(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;
             if (isWaitingForConfirmation && !wasWaitingForConfirmation) {
                 this.toolsWaitingForConfirmation++;
                 if (!this.isExpanded()) {
                     this.autoExpandedForConfirmation = true;
                     this.setExpanded(true);
                 }
+                this.removeWorkingSpinner();
             } else if (!isWaitingForConfirmation && wasWaitingForConfirmation) {
                 this.toolsWaitingForConfirmation--;
                 if (this.toolsWaitingForConfirmation === 0 && this.autoExpandedForConfirmation && !this.userManuallyExpanded) {
                     this.autoExpandedForConfirmation = false;
                     this.setExpanded(false);
                 }
+                if (this.toolsWaitingForConfirmation === 0 && this.isActive) {
+                    this.showWorkingSpinner();
+                }
+            }
+            if (isWaitingForCarouselConfirmation && !wasWaitingForCarouselConfirmation) {
+                this.toolsWaitingForCarouselConfirmation++;
+                addToolToCarousel(toolInvocation);
+                this.showConfirmationPlaceholder();
+            } else if (!isWaitingForCarouselConfirmation && wasWaitingForCarouselConfirmation) {
+                this.toolsWaitingForCarouselConfirmation--;
+                if (this.toolsWaitingForCarouselConfirmation === 0) {
+                    this.hideConfirmationPlaceholder();
+                } else {
+                    this.updateConfirmationPlaceholderLabel();
+                }
             }
             wasWaitingForConfirmation = isWaitingForConfirmation;
+            wasWaitingForCarouselConfirmation = isWaitingForCarouselConfirmation;
         }));
     }
+    getConfirmationPlaceholderText() {
+        const count = this.toolsWaitingForCarouselConfirmation;
+        return count === 1 ? ( localize(6936, "1 pending confirmation")) : ( localize(6937, "{0} pending confirmations", count));
+    }
+    updateConfirmationPlaceholderLabel() {
+        if (this._confirmationPlaceholderLabel) {
+            this._confirmationPlaceholderLabel.textContent = this.getConfirmationPlaceholderText();
+        }
+    }
+    showConfirmationPlaceholder() {
+        if (this._confirmationPlaceholder) {
+            this.updateConfirmationPlaceholderLabel();
+            return;
+        }
+        const placeholder = $("button.chat-subagent-confirmation-placeholder");
+        const label = $("span.chat-subagent-placeholder-label");
+        label.textContent = this.getConfirmationPlaceholderText();
+        placeholder.appendChild(label);
+        this._confirmationPlaceholder = placeholder;
+        this._confirmationPlaceholderLabel = label;
+        const placeholderDisposables = ( new DisposableStore());
+        placeholderDisposables.add(addDisposableListener(placeholder, "click", e => {
+            e.preventDefault();
+            e.stopPropagation();
+            this._navigateToCarousel?.(this.subAgentInvocationId);
+        }));
+        this._confirmationPlaceholderDisposable.value = placeholderDisposables;
+        if (!this.hasToolItems) {
+            this.hasToolItems = true;
+            if (this.wrapper) {
+                this.wrapper.style.display = "";
+            }
+        }
+        if (!this.isExpanded()) {
+            this.autoExpandedForConfirmation = true;
+            this.setExpanded(true);
+        }
+        if (this.wrapper) {
+            this.wrapper.appendChild(placeholder);
+        }
+        this.layoutScheduler.schedule();
+    }
+    hideConfirmationPlaceholder() {
+        if (this._confirmationPlaceholder) {
+            this._confirmationPlaceholder.remove();
+            this._confirmationPlaceholder = undefined;
+            this._confirmationPlaceholderLabel = undefined;
+            this._confirmationPlaceholderDisposable.clear();
+            this.layoutScheduler.schedule();
+        }
+    }
+    ensurePlaceholderAtBottom() {
+        if (this._confirmationPlaceholder?.parentElement === this.wrapper) {
+            this.wrapper.appendChild(this._confirmationPlaceholder);
+        }
+    }
     watchToolCompletion(toolInvocation) {
         if (!ChatSubagentContentPart_1.isParentSubagentTool(toolInvocation)) {
             return;
@@ -344,20 +493,28 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                     if (textParts.length > 0) {
                         this.renderResultText(textParts.join("\n"));
                     }
-                    if (toolInvocation.toolSpecificData?.kind === "subagent" && toolInvocation.toolSpecificData.modelName) {
-                        this.modelName = toolInvocation.toolSpecificData.modelName;
-                        this.updateHover();
+                    if (toolInvocation.toolSpecificData?.kind === "subagent") {
+                        if (toolInvocation.toolSpecificData.description) {
+                            this.description = toolInvocation.toolSpecificData.description;
+                            this._isDefaultDescription = false;
+                        }
+                        if (toolInvocation.toolSpecificData.modelName) {
+                            this.modelName = toolInvocation.toolSpecificData.modelName;
+                            this.updateHover();
+                        }
                     }
                     this.markAsInactive();
                 } else if (wasStreaming && state.type !== IChatToolInvocation.StateKind.Streaming) {
                     wasStreaming = false;
                     const {
                         description,
+                        isDefaultDescription,
                         agentName,
                         prompt,
                         modelName
                     } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
                     this.description = description;
+                    this._isDefaultDescription = isDefaultDescription;
                     this.agentName = agentName;
                     this.prompt = prompt;
                     if (modelName) {
@@ -366,6 +523,24 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                     }
                     this.renderPromptSection();
                     this.updateTitle();
+                } else if (toolInvocation.toolSpecificData?.kind === "subagent") {
+                    const {
+                        description,
+                        isDefaultDescription,
+                        agentName
+                    } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
+                    const descriptionChanged = this._isDefaultDescription && !isDefaultDescription;
+                    const agentNameChanged = !!agentName && agentName !== this.agentName;
+                    if (descriptionChanged || agentNameChanged) {
+                        if (descriptionChanged) {
+                            this.description = description;
+                            this._isDefaultDescription = isDefaultDescription;
+                        }
+                        if (agentNameChanged) {
+                            this.agentName = agentName;
+                        }
+                        this.updateTitle();
+                    }
                 }
             }));
         } else if (toolInvocation.toolSpecificData?.kind === "subagent" && toolInvocation.toolSpecificData.result) {
@@ -435,23 +610,27 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             this.lazyItems.push(item);
         }
     }
-    appendMarkdownItem(factory, _codeblocksPartId, _markdown, _originalParent) {
+    appendMarkdownItem(factory, _codeblocksPartId, _markdown, _originalParent, eagerDisposable) {
+        if (eagerDisposable) {
+            this._register(eagerDisposable);
+        }
         if (this.isExpanded() || this.hasExpandedOnce) {
             const result = factory();
             this.appendMarkdownItemToDOM(result.domNode);
-            if (result.disposable) {
+            if (result.disposable && result.disposable !== eagerDisposable) {
                 this._register(result.disposable);
             }
         } else {
             const item = {
                 kind: "markdown",
-                lazy: ( new Lazy(factory))
+                lazy: ( new Lazy(factory)),
+                eagerlyRegistered: !!eagerDisposable
             };
             this.lazyItems.push(item);
         }
     }
     appendHookItem(factory, hookPart) {
-        const hookMessage = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(6826, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(6827, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(6828, "Warning for {0}", hookPart.toolDisplayName)) : ( localize(6829, "Hook warning")));
+        const hookMessage = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(6938, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(6939, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(6940, "Warning for {0}", hookPart.toolDisplayName)) : ( localize(6941, "Hook warning")));
         this.currentRunningToolMessage = hookMessage;
         this.updateTitle();
         if (this.isExpanded() || this.hasExpandedOnce) {
@@ -521,7 +700,6 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             this.listPool,
             this.editorPool,
             this.currentWidthDelegate,
-            this.codeBlockModelCollection,
             this.announcedToolProgressKeys,
             codeBlockStartIndex
         );
@@ -538,21 +716,35 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         const iconElement = createThinkingIcon(icon);
         itemWrapper.appendChild(content);
         if (toolInvocation.kind === "toolInvocation") {
+            const shouldUseCarouselForTool = this._shouldUseCarouselForTool;
             this._register(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;
                 if (hasConfirmation) {
                     iconElement.remove();
-                } else if (!iconElement.parentElement) {
-                    itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
+                    if (shouldHideInline) {
+                        itemWrapper.style.display = "none";
+                    } else {
+                        itemWrapper.style.display = "";
+                    }
+                } else {
+                    if (!iconElement.parentElement) {
+                        itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
+                    }
+                    if (this._useCarouselForConfirmations) {
+                        itemWrapper.style.display = "";
+                        this.ensurePlaceholderAtBottom();
+                    }
                 }
             }));
         } else {
             itemWrapper.insertBefore(iconElement, itemWrapper.firstChild);
         }
         if (this.wrapper) {
-            if (this.resultContainer) {
-                this.wrapper.insertBefore(itemWrapper, this.resultContainer);
+            const anchor = this._confirmationPlaceholder ?? this.workingSpinnerElement ?? this.resultContainer;
+            if (anchor) {
+                this.wrapper.insertBefore(itemWrapper, anchor);
             } else {
                 this.wrapper.appendChild(itemWrapper);
             }
@@ -570,7 +762,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         } else if (item.kind === "markdown") {
             const result = item.lazy.value;
             this.appendMarkdownItemToDOM(result.domNode);
-            if (result.disposable) {
+            if (result.disposable && !item.eagerlyRegistered) {
                 this._register(result.disposable);
             }
         } else if (item.kind === "hook") {
@@ -627,6 +819,6 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         return false;
     }
 };
-ChatSubagentContentPart = ChatSubagentContentPart_1 = ( __decorate([( __param(9, IInstantiationService)), ( __param(10, IChatMarkdownAnchorService)), ( __param(11, IHoverService)), ( __param(12, IConfigurationService))], ChatSubagentContentPart));
+ChatSubagentContentPart = ChatSubagentContentPart_1 = ( __decorate([( __param(8, IInstantiationService)), ( __param(9, IChatMarkdownAnchorService)), ( __param(10, IHoverService)), ( __param(11, IConfigurationService))], ChatSubagentContentPart));
 
 export { ChatSubagentContentPart };

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

@@ -53,8 +53,8 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
             return;
         }
         this._currentMode = mode;
-        const modeName = mode.name.get() || mode.label.get() || ( localize(6830, "current mode"));
-        this.titleElement.textContent = ( localize(6831, "Proceed from {0}", modeName));
+        const modeName = mode.name.get() || mode.label.get() || ( localize(6942, "current mode"));
+        this.titleElement.textContent = ( localize(6943, "Proceed from {0}", modeName));
         const childrenToRemove = [];
         for (let i = 1; i < this.promptsContainer.children.length; i++) {
             childrenToRemove.push(this.promptsContainer.children[i]);
@@ -91,7 +91,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(6832, "{0}", handoff.label)));
+        button.setAttribute("aria-label", ( localize(6944, "{0}", handoff.label)));
         const titleElement = append(button, $(".chat-welcome-view-suggested-prompt-title"));
         titleElement.textContent = handoff.label;
         const showContinueOn = handoff.showContinueOn ?? true;
@@ -112,7 +112,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(6833, "More options for {0}", handoff.label)));
+            dropdownContainer.setAttribute("aria-label", ( localize(6945, "More options for {0}", handoff.label)));
             dropdownContainer.setAttribute("aria-haspopup", "true");
             const separator = append(dropdownContainer, $(".chat-suggest-next-separator"));
             separator.setAttribute("aria-hidden", "true");
@@ -127,7 +127,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
                     const name = getAgentSessionProviderName(provider);
                     return (new Action(
                         contrib.type,
-                        localize(6834, "Continue in {0}", name),
+                        localize(6946, "Continue in {0}", name),
                         ThemeIcon.isThemeIcon(icon) ? ThemeIcon.asClassName(icon) : undefined,
                         true,
                         () => {
@@ -197,7 +197,7 @@ let ChatSuggestNextWidget = class ChatSuggestNextWidget extends Disposable {
             const currentHandoffs = this._currentMode?.handOffs?.get();
             return currentHandoffs?.find(h => h.label === handoffLabel) ?? handoff;
         };
-        const label = ( localize(6835, "Start with Autopilot"));
+        const label = ( localize(6947, "Start with Autopilot"));
         const button = $(".chat-welcome-view-suggested-prompt");
         button.setAttribute("tabindex", "0");
         button.setAttribute("role", "button");

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(6836, "Making changes was aborted.")) : ( localize(6837, "Made changes."))
+                    !element.isComplete ? "" : element.isCanceled ? ( localize(6948, "Making changes was aborted.")) : ( localize(6949, "Made changes."))
                 );
             } else {
                 this.domNode = $("div");