@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -16,7 +16,6 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable, DisposableStore, dispose, toDisposable, thenIfNotDisposed } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { FileAccess, Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -42,7 +41,7 @@ import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IWorkbenchIssueService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/issue/common/issue.service';
 import { CodiconActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView';
-import { annotateSpecialMarkdownContent, hasEditCodeblockUriTag, extractSubAgentInvocationIdFromText } from '../../common/widget/annotations.js';
+import { annotateSpecialMarkdownContent, hasEditCodeblockUriTag, hasCodeblockUriTag, extractSubAgentInvocationIdFromText } from '../../common/widget/annotations.js';
 import { checkModeOption } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
@@ -54,7 +53,7 @@ import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { isResponseVM, isPendingDividerVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { getNWords } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatWordCounter';
 import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
-import { ChatAgentLocation, ChatConfiguration, CollapsedToolsDisplayMode, ThinkingDisplayMode, ChatModeKind, ChatPermissionLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, ChatAgentLocation, CollapsedToolsDisplayMode, ThinkingDisplayMode, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ClickAnimation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/animations/animations';
 import { MarkUnhelpfulActionId, MarkHelpfulActionId } from '../actions/chatTitleActions.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
@@ -96,9 +95,9 @@ import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { ChatHookContentPart } from './chatContentParts/chatHookContentPart.js';
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
-import { ChatQuestionCarouselAutoReply } from './chatQuestionCarouselAutoReply.js';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { isMcpToolInvocation } from './chatContentParts/toolInvocationParts/chatToolPartUtilities.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -173,7 +172,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         this.templateDataByRequestId = ( new Map());
         this.responseTemplateDataByRequestId = ( new Map());
         this.pendingQuestionCarousels = ( new ResourceMap());
-        this._autoRepliedQuestionCarousels = ( new Set());
         this._notifiedQuestionCarousels = ( new Set());
         this._onDidClickFollowup = this._register(( new Emitter()));
         this.onDidClickFollowup = this._onDidClickFollowup.event;
@@ -219,7 +217,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         this._toolInvocationCodeBlockCollection = this._register(
             this.instantiationService.createInstance(CodeBlockModelCollection, "tools")
         );
-        this._autoReply = this._register(this.instantiationService.createInstance(ChatQuestionCarouselAutoReply));
         this._register(this.chatService.onDidSubmitRequest(e => {
             const carousels = this.pendingQuestionCarousels.get(e.chatSessionResource);
             if (carousels) {
@@ -229,6 +226,16 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 carousels.clear();
             }
         }));
+        this._register(this.configService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ChatConfiguration.AutoReply) && this.configService.getValue(ChatConfiguration.AutoReply)) {
+                for (const [, carousels] of this.pendingQuestionCarousels) {
+                    for (const carousel of carousels) {
+                        carousel.skip();
+                    }
+                    carousels.clear();
+                }
+            }
+        }));
     }
     set pendingDragController(controller) {
         this._pendingDragController = controller;
@@ -294,7 +301,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     updateViewModel(viewModel) {
         this.viewModel = viewModel;
         this._announcedToolProgressKeys.clear();
-        this._autoRepliedQuestionCarousels.clear();
         this._notifiedQuestionCarousels.clear();
         this.codeBlocksByEditorUri.clear();
         this.codeBlocksByResponseId.clear();
@@ -458,7 +464,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const checkpointRestoreContainer = append(rowContainer, $(".checkpoint-restore-container"));
         append(checkpointRestoreContainer, $(".checkpoint-line-left"));
         const label = append(checkpointRestoreContainer, $("span.checkpoint-label-text"));
-        label.textContent = ( localize(6726, "Checkpoint Restored"));
+        label.textContent = ( localize(6933, "Checkpoint Restored"));
         const dot = append(checkpointRestoreContainer, $("span.checkpoint-dot-separator"));
         dot.textContent = "·";
         dot.setAttribute("aria-hidden", "true");
@@ -584,6 +590,8 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             dispose(coalesce(templateData.renderedParts));
             templateData.renderedParts = undefined;
             clearNode(templateData.value);
+        } else if (isPendingDividerVM(templateData.currentElement)) {
+            clearNode(templateData.value);
         }
         if (templateData.titleToolbar) {
             templateData.titleToolbar.context = undefined;
@@ -606,6 +614,16 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         templateData.currentElement = element;
         this.templateDataByRequestId.set(element.id, templateData);
+        templateData.rowContainer.classList.remove(
+            "pending-item",
+            "pending-divider",
+            "pending-request",
+            "chat-pending-dragging"
+        );
+        templateData.dragHandle?.remove();
+        templateData.dragHandle = undefined;
+        delete templateData.rowContainer.dataset.pendingRequestId;
+        delete templateData.rowContainer.dataset.pendingKind;
         if (isPendingDividerVM(element)) {
             this.renderPendingDivider(element, templateData);
             return;
@@ -642,11 +660,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         templateData.rowContainer.classList.toggle("editing-session", location === ChatAgentLocation.Chat);
         templateData.rowContainer.classList.toggle("interactive-request", isRequestVM(element));
         templateData.rowContainer.classList.toggle("interactive-response", isResponseVM(element));
-        templateData.rowContainer.classList.remove("pending-item", "pending-divider", "pending-request");
-        templateData.dragHandle?.remove();
-        templateData.dragHandle = undefined;
-        delete templateData.rowContainer.dataset.pendingRequestId;
-        delete templateData.rowContainer.dataset.pendingKind;
         const progressMessageAtBottomOfResponse = checkModeOption(
             this.delegate.currentChatMode(),
             this.rendererOptions.progressMessageAtBottomOfResponse
@@ -655,6 +668,16 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             "show-detail-progress",
             isResponseVM(element) && !element.isComplete && !element.progressMessages.length && !progressMessageAtBottomOfResponse
         );
+        const updateContainerCheckmarks = () => templateData.rowContainer.classList.toggle(
+            "show-checkmarks",
+            !!this.configService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
+        );
+        updateContainerCheckmarks();
+        templateData.elementDisposables.add(this.configService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
+                updateContainerCheckmarks();
+            }
+        }));
         if (!this.rendererOptions.noHeader) {
             this.renderAvatar(element, templateData);
         }
@@ -673,7 +696,8 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             this.renderDetail(element, templateData);
         }
         templateData.checkpointToolbar.context = element;
-        const checkpointEnabled = this.configService.getValue(ChatConfiguration.CheckpointsEnabled) && (this.rendererOptions.restorable ?? true);
+        const supportsForkOrRestoration = this.rendererOptions.supportsFork || (this.rendererOptions.restorable ?? true);
+        const checkpointEnabled = this.configService.getValue(ChatConfiguration.CheckpointsEnabled) && supportsForkOrRestoration;
         const isPendingRequest = isRequestVM(element) && !!element.pendingKind;
         templateData.checkpointContainer.classList.toggle("hidden", isResponseVM(element) || isPendingRequest || !checkpointEnabled);
         templateData.footerToolbar.refresh();
@@ -790,11 +814,11 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const dividerContent = $$1(".pending-divider-content");
         const label = append(dividerContent, $$1("span.pending-divider-label"));
         if (element.dividerKind === ChatRequestQueueKind.Steering) {
-            label.textContent = ( localize(6727, "Steering"));
-            label.title = ( localize(6728, "Steering message will be sent after the next tool call happens"));
+            label.textContent = ( localize(6934, "Steering"));
+            label.title = ( localize(6935, "Steering message will be sent after the next tool call happens"));
         } else {
-            label.textContent = ( localize(6729, "Queued"));
-            label.title = ( localize(6730, "Queued messages will be sent after the current request completes"));
+            label.textContent = ( localize(6936, "Queued"));
+            label.title = ( localize(6937, "Queued messages will be sent after the current request completes"));
         }
         templateData.value.appendChild(dividerContent);
     }
@@ -802,10 +826,10 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         clearNode(templateData.detail);
         if (element.agentOrSlashCommandDetected) {
             const msg = element.slashCommand ? ( localize(
-                6731,
+                6938,
                 "used {0} [[(rerun without)]]",
                 `${chatSubcommandLeader}${element.slashCommand.name}`
-            )) : ( localize(6732, "[[(rerun without)]]"));
+            )) : ( localize(6939, "[[(rerun without)]]"));
             reset(templateData.detail, renderFormattedText(msg, {
                 actionHandler: {
                     disposables: templateData.elementDisposables,
@@ -818,7 +842,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             this.delegate.currentChatMode(),
             this.rendererOptions.progressMessageAtBottomOfResponse
         )) {
-            templateData.detail.textContent = ( localize(6733, "Working"));
+            templateData.detail.textContent = ( localize(6940, "Working"));
         }
     }
     renderConfirmationAction(element, templateData) {
@@ -827,19 +851,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             append(templateData.detail, $("span.codicon.codicon-check", {
                 "aria-hidden": "true"
             }));
-            append(templateData.detail, $("span.confirmation-text", undefined, ( localize(6734, "Selected \"{0}\"", element.confirmation))));
+            append(templateData.detail, $("span.confirmation-text", undefined, ( localize(6941, "Selected \"{0}\"", element.confirmation))));
             templateData.header?.classList.remove("header-disabled");
             templateData.header?.classList.add("partially-disabled");
-            const updateCheckmarks = () => templateData.detail.classList.toggle(
-                "show-checkmarks",
-                !!this.configService.getValue(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)
-            );
-            updateCheckmarks();
-            templateData.elementDisposables.add(this.configService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration(AccessibilityWorkbenchSettingId.ShowChatCheckmarks)) {
-                    updateCheckmarks();
-                }
-            }));
         }
     }
     renderAvatar(element, templateData) {
@@ -913,7 +927,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const diff = this.diff(templateData.renderedParts ?? [], content, element);
         this.renderChatContentDiff(diff, content, element, index, templateData);
     }
-    shouldShowWorkingProgress(element, partsToRender, templateData) {
+    shouldShowWorkingProgress(element, partsToRender, moreContentAvailable, templateData) {
         if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === "minimal" || element.isComplete || !checkModeOption(
             this.delegate.currentChatMode(),
             this.rendererOptions.progressMessageAtBottomOfResponse
@@ -925,22 +939,27 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         ))) {
             return false;
         }
+        if (( partsToRender.some(
+            part => part.kind === "toolInvocation" && !IChatToolInvocation.isComplete(part) && isMcpToolInvocation(part)
+        ))) {
+            return false;
+        }
         const lastPart = findLast(
             partsToRender,
             part => part.kind !== "markdownContent" || part.content.value.trim().length > 0
         );
-        if (( partsToRender.some(part => part.kind === "thinking"))) {
-            return false;
-        }
         const lastThinking = this.getLastThinkingPart(templateData.renderedParts);
         if (lastThinking) {
             return false;
         }
-        const collapsedToolsMode = this.configService.getValue("chat.agent.thinking.collapsedTools");
-        if (collapsedToolsMode !== CollapsedToolsDisplayMode.Off && ( partsToRender.some(
-            part => (part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") && this.shouldPinPart(part, element)
-        ))) {
-            return false;
+        if (lastPart && (lastPart.kind === "toolInvocation" || lastPart.kind === "toolInvocationSerialized")) {
+            if (lastPart.isAttachedToThinking) {
+                return false;
+            }
+            const collapsedToolsMode = this.configService.getValue("chat.agent.thinking.collapsedTools");
+            if (collapsedToolsMode !== CollapsedToolsDisplayMode.Off && this.shouldPinPart(lastPart, isResponseVM(element) ? element : undefined)) {
+                return false;
+            }
         }
         const hasRenderedThinkingPart = ( (templateData.renderedParts ?? []).some(part => part instanceof ChatThinkingContentPart));
         const hasEditPillMarkdown = ( partsToRender.some(part => part.kind === "markdownContent" && this.hasEditCodeblockUri(part)));
@@ -950,7 +969,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (this.getSubagentPart(templateData.renderedParts)) {
             return false;
         }
-        if (!lastPart || lastPart.kind === "references" || ((lastPart.kind === "toolInvocation" || lastPart.kind === "toolInvocationSerialized") && (IChatToolInvocation.isComplete(lastPart) || lastPart.presentation === "hidden")) || ((lastPart.kind === "textEditGroup" || lastPart.kind === "notebookEditGroup") && lastPart.done && !( partsToRender.some(
+        if (!lastPart || lastPart.kind === "references" || (lastPart.kind === "markdownContent" && !moreContentAvailable) || ((lastPart.kind === "toolInvocation" || lastPart.kind === "toolInvocationSerialized") && (IChatToolInvocation.isComplete(lastPart) || lastPart.presentation === "hidden")) || ((lastPart.kind === "textEditGroup" || lastPart.kind === "notebookEditGroup") && lastPart.done && !( partsToRender.some(
             part => part.kind === "toolInvocation" && !IChatToolInvocation.isComplete(part)
         ))) || (lastPart.kind === "progressTask" && lastPart.deferred.isSettled) || lastPart.kind === "mcpServersStarting" || lastPart.kind === "disabledClaudeHooks" || lastPart.kind === "hook") {
             return true;
@@ -1029,6 +1048,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         clearNode(templateData.value);
         const parts = [];
         let inlineSlashCommandRendered = false;
+        let codeBlockStartIndex = 0;
         content.forEach((data, contentIndex) => {
             const context = {
                 element,
@@ -1042,12 +1062,8 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 currentWidth: this._currentLayoutWidth,
                 onDidChangeVisibility: this._onDidChangeVisibility.event,
                 inlineTextModels: this._inlineTextModels,
-                get codeBlockStartIndex() {
-                    return parts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
-                },
-                get treeStartIndex() {
-                    return parts.filter(part => part instanceof ChatTreeContentPart).length;
-                }
+                codeBlockStartIndex,
+                treeStartIndex: 0
             };
             const newPart = this.renderChatContentPart(data, templateData, context);
             if (newPart) {
@@ -1072,6 +1088,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     templateData.value.appendChild(newPart.domNode);
                 }
                 parts.push(newPart);
+                codeBlockStartIndex += newPart.codeblocks?.length ?? 0;
             }
         });
         if (templateData.renderedParts) {
@@ -1134,10 +1151,19 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     renderChatContentDiff(partsToRender, contentForThisTurn, element, elementIndex, templateData) {
         const renderedParts = templateData.renderedParts ?? [];
         templateData.renderedParts = renderedParts;
-        const lastMarkdownIndex = partsToRender.findLastIndex(part => part?.kind === "markdownContent");
+        let codeBlockStartIndex = 0;
+        let treeStartIndex = 0;
         partsToRender.forEach((partToRender, contentIndex) => {
+            if (contentIndex > 0) {
+                const prevPart = renderedParts[contentIndex - 1];
+                if (prevPart) {
+                    codeBlockStartIndex += prevPart.codeblocks?.length ?? 0;
+                    if (prevPart instanceof ChatTreeContentPart) {
+                        treeStartIndex++;
+                    }
+                }
+            }
             const alreadyRenderedPart = templateData.renderedParts?.[contentIndex];
-            const isFinalAnswerPart = partToRender?.kind === "markdownContent" && contentIndex === lastMarkdownIndex && element.isComplete;
             if (!partToRender) {
                 if (!templateData.renderedPartsMounted) {
                     alreadyRenderedPart?.onDidRemount?.();
@@ -1151,7 +1177,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     }
                     renderedParts[contentIndex] = alreadyRenderedPart;
                     return;
-                } else if (alreadyRenderedPart instanceof ChatThinkingContentPart && this.shouldPinPart(partToRender, element) && !isFinalAnswerPart) {
+                } else if (alreadyRenderedPart instanceof ChatThinkingContentPart && this.shouldPinPart(partToRender, element)) {
                     renderedParts[contentIndex] = alreadyRenderedPart;
                     return;
                 }
@@ -1163,7 +1189,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     }
                 }
             }
-            const preceedingContentParts = renderedParts.slice(0, contentIndex);
             const context = {
                 element,
                 elementIndex: elementIndex,
@@ -1176,15 +1201,11 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 currentWidth: this._currentLayoutWidth,
                 onDidChangeVisibility: this._onDidChangeVisibility.event,
                 inlineTextModels: this._inlineTextModels,
-                get codeBlockStartIndex() {
-                    return preceedingContentParts.reduce((acc, part) => acc + (part.codeblocks?.length ?? 0), 0);
-                },
-                get treeStartIndex() {
-                    return preceedingContentParts.filter(part => part instanceof ChatTreeContentPart).length;
-                }
+                codeBlockStartIndex,
+                treeStartIndex
             };
             const lastThinking = this.getLastThinkingPart(renderedParts);
-            if (lastThinking && (partToRender.kind === "toolInvocation" || partToRender.kind === "toolInvocationSerialized" || partToRender.kind === "markdownContent" || partToRender.kind === "textEditGroup" || partToRender.kind === "hook") && this.shouldPinPart(partToRender, element) && !isFinalAnswerPart) {
+            if (lastThinking && (partToRender.kind === "toolInvocation" || partToRender.kind === "toolInvocationSerialized" || partToRender.kind === "markdownContent" || partToRender.kind === "textEditGroup" || partToRender.kind === "hook") && this.shouldPinPart(partToRender, element)) {
                 const newPart = this.renderChatContentPart(partToRender, templateData, context);
                 if (newPart) {
                     renderedParts[contentIndex] = newPart;
@@ -1288,7 +1309,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 renderedParts: partsToRender
             };
         }
-        if (this.shouldShowWorkingProgress(element, partsToRender, templateData)) {
+        if (this.shouldShowWorkingProgress(element, partsToRender, moreContentAvailable, templateData)) {
             partsToRender.push({
                 kind: "working"
             });
@@ -1330,16 +1351,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     }
     diff(renderedParts, contentToRender, element) {
         const diff = [];
-        const elementIsComplete = isResponseVM(element) && element.isComplete;
-        const lastMarkdownContentIndex = contentToRender.findLastIndex(part => part.kind === "markdownContent");
         for (let i = 0; i < contentToRender.length; i++) {
             const content = contentToRender[i];
             const renderedPart = renderedParts[i];
-            const isFinalAnswerPart = content.kind === "markdownContent" && i === lastMarkdownContentIndex && elementIsComplete;
-            if (isFinalAnswerPart && this.isRenderedPartInsideThinking(renderedPart)) {
-                diff.push(content);
-                continue;
-            }
             if (!renderedPart || !renderedPart.hasSameContent(content, contentToRender.slice(i + 1), element)) {
                 diff.push(content);
             } else {
@@ -1348,12 +1362,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         return diff;
     }
-    isRenderedPartInsideThinking(renderedPart) {
-        if (!renderedPart?.domNode) {
-            return false;
-        }
-        return !!findParentWithClass(renderedPart.domNode, "chat-thinking-box");
-    }
     hasEditCodeblockUri(part) {
         if (part.kind !== "markdownContent") {
             return false;
@@ -1386,7 +1394,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (this.hasEditCodeblockUri(part) || part.kind === "textEditGroup") {
             return true;
         }
-        const isMcpTool = (part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") && part.source?.type === "mcp";
+        const isMcpTool = (part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") && isMcpToolInvocation(part);
         if (isMcpTool) {
             return false;
         }
@@ -1628,7 +1636,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 "ChatListItemRenderer#renderChatContentPart: error rendering content",
                 toErrorMessage(err, true)
             );
-            const errorPart = this.instantiationService.createInstance(ChatErrorContentPart, ChatErrorLevel.Error, ( new MarkdownString(( localize(6735, "Failed to render content")) + `: ${toErrorMessage(err, false)}`)), content, this.chatContentMarkdownRenderer);
+            const errorPart = this.instantiationService.createInstance(ChatErrorContentPart, ChatErrorLevel.Error, ( new MarkdownString(( localize(6942, "Failed to render content")) + `: ${toErrorMessage(err, false)}`)), content, this.chatContentMarkdownRenderer);
             return {
                 dispose: () => errorPart.dispose(),
                 domNode: errorPart.domNode,
@@ -1777,6 +1785,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             this.handleRenderedCodeblocks(context.element, lazilyCreatedPart, codeBlockStartIndex);
             return {
                 domNode: lazilyCreatedPart.domNode,
+                disposable: lazilyCreatedPart,
                 part: lazilyCreatedPart
             };
         };
@@ -1788,6 +1797,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     kind: "thinking"
                 }, context, templateData);
                 if (thinkingPart instanceof ChatThinkingContentPart) {
+                    toolInvocation.isAttachedToThinking = true;
                     thinkingPart.appendItem(createToolPart, toolInvocation.toolId, toolInvocation, templateData.value);
                     this.setupConfirmationTransitionWatcher(
                         toolInvocation,
@@ -1802,6 +1812,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             }
             if (this.shouldPinPart(toolInvocation, context.element)) {
                 if (lastThinking && toolInvocation.presentation !== "hidden") {
+                    toolInvocation.isAttachedToThinking = true;
                     lastThinking.appendItem(createToolPart, toolInvocation.toolId, toolInvocation, templateData.value);
                     this.setupConfirmationTransitionWatcher(
                         toolInvocation,
@@ -1841,12 +1852,14 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         const removeConfirmationWidget = () => {
             const createdPart = getCreatedPart();
+            toolInvocation.isAttachedToThinking = false;
             if (createdPart?.domNode) {
                 const wrapper = createdPart.domNode.parentElement;
                 if (wrapper?.classList.contains("chat-thinking-tool-wrapper")) {
                     wrapper.remove();
                 }
                 templateData.value.appendChild(createdPart.domNode);
+                thinkingPart.removeMaterializedItem(toolInvocation.toolCallId);
             } else {
                 thinkingPart.removeLazyItem(toolInvocation.toolId);
                 const {
@@ -1855,6 +1868,10 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 templateData.value.appendChild(domNode);
             }
             this.finalizeCurrentThinkingPart(context, templateData);
+            if (thinkingPart.isEffectivelyEmpty()) {
+                thinkingPart.domNode?.remove();
+                thinkingPart.dispose();
+            }
         };
         const currentState = toolInvocation.state.get();
         if (currentState.type === IChatToolInvocation.StateKind.WaitingForConfirmation || currentState.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
@@ -1904,7 +1921,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         const shouldPinToThinking = hookPart.hookType === HookType.PreToolUse || hookPart.hookType === HookType.PostToolUse;
         if (shouldPinToThinking) {
-            const hookTitle = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(6736, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(6737, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(6738, "Used {0}, but received a warning", hookPart.toolDisplayName)) : ( localize(6739, "Tool call received a warning")));
+            const hookTitle = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(6943, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(6944, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(6945, "Used {0}, but received a warning", hookPart.toolDisplayName)) : ( localize(6946, "Tool call received a warning")));
             let thinkingPart = this.getLastThinkingPart(templateData.renderedParts);
             if (!thinkingPart) {
                 const newThinking = this.renderThinkingPart({
@@ -1962,9 +1979,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         this._notifyOnQuestionCarousel(context, carousel);
         const widget = isResponseVM(context.element) ? this.chatWidgetService.getWidgetBySessionResource(context.element.sessionResource) : undefined;
         const shouldAutoFocus = widget ? widget.getInput() === "" : true;
-        const modelName = widget?.input.currentLanguageModel;
         const responseId = isResponseVM(context.element) ? context.element.requestId : undefined;
-        const requestMessageText = isResponseVM(context.element) ? this.getRequestMessageText(context.element) : undefined;
         const handleSubmit = async (answers, part) => {
             const answersRecord = answers ? Object.fromEntries(answers) : undefined;
             carousel.data = answersRecord ?? {};
@@ -2018,24 +2033,8 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 shouldAutoFocus,
                 onSubmit: async answers => handleSubmit(answers, fallbackPart)
             });
-            this.maybeAutoReplyToQuestionCarousel(
-                context,
-                carousel,
-                fallbackPart,
-                answers => handleSubmit(answers, fallbackPart),
-                modelName,
-                requestMessageText
-            );
             return fallbackPart;
         }
-        this.maybeAutoReplyToQuestionCarousel(
-            context,
-            carousel,
-            part,
-            answers => handleSubmit(answers, part),
-            modelName,
-            requestMessageText
-        );
         if (isResponseVM(context.element) && carousel.allowSkip && !carousel.isUsed) {
             let carousels = this.pendingQuestionCarousels.get(context.element.sessionResource);
             if (!carousels) {
@@ -2079,10 +2078,10 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             return;
         }
         const questionCount = carousel.questions.length;
-        const question = carousel.questions.length > 0 && carousel.questions[0].message ? carousel.questions[0].message : ( localize(6740, "Chat input required."));
+        const question = carousel.questions.length > 0 && carousel.questions[0].message ? carousel.questions[0].message : ( localize(6947, "Chat input required."));
         const stringQuestion = typeof question === "string" ? question : question.value;
-        const alertMessage = questionCount === 1 ? ( localize(6741, "Chat input required (1 question): {0}", stringQuestion)) : ( localize(
-            6742,
+        const alertMessage = questionCount === 1 ? ( localize(6948, "Chat input required (1 question): {0}", stringQuestion)) : ( localize(
+            6949,
             "Chat input required ({0} questions): {1}",
             questionCount,
             stringQuestion
@@ -2091,59 +2090,12 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (stableKey) {
             this._notifiedQuestionCarousels.add(stableKey);
         }
-        const signalMessage = questionCount === 1 ? ( localize(6743, "Chat needs your input (1 question).")) : ( localize(6744, "Chat needs your input ({0} questions).", questionCount));
+        const signalMessage = questionCount === 1 ? ( localize(6950, "Chat needs your input (1 question).")) : ( localize(6951, "Chat needs your input ({0} questions).", questionCount));
         this.accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, {
             allowManyInParallel: true,
             customAlertMessage: signalMessage
         });
     }
-    maybeAutoReplyToQuestionCarousel(context, carousel, part, submit, modelName, requestMessageText) {
-        if (carousel.isUsed) {
-            return;
-        }
-        const stableKey = this._getCarouselStableKey(context, carousel);
-        if (stableKey) {
-            if (( this._autoRepliedQuestionCarousels.has(stableKey))) {
-                return;
-            }
-            this._autoRepliedQuestionCarousels.add(stableKey);
-        }
-        void this._autoReply.shouldAutoReply().then(shouldAutoReply => {
-            const isAutopilot = this._isAutopilotForContext(context);
-            if (!shouldAutoReply && !isAutopilot) {
-                if (stableKey) {
-                    this._autoRepliedQuestionCarousels.delete(stableKey);
-                }
-                return;
-            }
-            const cts = ( new CancellationTokenSource());
-            part.addDisposable(toDisposable(() => {
-                cts.cancel();
-                cts.dispose();
-            }));
-            this._autoReply.autoReply(carousel, submit, modelName, requestMessageText, cts.token).catch(err => {
-                this.logService.debug("#ChatQuestionCarousel: Auto reply failed", toErrorMessage(err));
-            });
-        });
-    }
-    getRequestMessageText(response) {
-        const requestId = response.requestId;
-        const items = response.session.getItems();
-        const request = items.find(item => isRequestVM(item) && item.id === requestId);
-        return request?.messageText;
-    }
-    _isAutopilotForContext(context) {
-        if (isResponseVM(context.element) && context.element.model.request?.modeInfo?.permissionLevel === ChatPermissionLevel.Autopilot) {
-            return true;
-        }
-        if (isResponseVM(context.element)) {
-            const widget = this.chatWidgetService.getWidgetBySessionResource(context.element.sessionResource) ?? this.chatWidgetService.lastFocusedWidget;
-            if (widget?.input.currentModeInfo.permissionLevel === ChatPermissionLevel.Autopilot) {
-                return true;
-            }
-        }
-        return false;
-    }
     removeCarouselFromTracking(context, part) {
         if (isResponseVM(context.element)) {
             const carousels = this.pendingQuestionCarousels.get(context.element.sessionResource);
@@ -2176,12 +2128,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     }
     renderMarkdown(markdown, templateData, context) {
         const element = context.element;
-        const isFinalRenderPass = isResponseVM(element) && element.isComplete && !element.renderData;
-        const lastPinnedPartIndex = isFinalRenderPass ? context.content.findLastIndex(
-            c => c.kind === "thinking" || c.kind === "toolInvocation" || c.kind === "toolInvocationSerialized"
-        ) : -1;
-        const isFinalAnswerPart = isFinalRenderPass && context.contentIndex > lastPinnedPartIndex;
-        if (!this.hasEditCodeblockUri(markdown) || isFinalAnswerPart) {
+        const isBlankMarkdown = !markdown.content.value.trim();
+        const hasPendingEditCodeblock = isResponseVM(element) && !element.isComplete && hasCodeblockUriTag(markdown.content.value) && !codeblockHasClosingBackticks(markdown.content.value);
+        if (!this.hasEditCodeblockUri(markdown) && !isBlankMarkdown && !hasPendingEditCodeblock) {
             this.finalizeCurrentThinkingPart(context, templateData);
         }
         const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete || !!element.renderData);
@@ -2232,7 +2181,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     })
                 );
                 markdownPart.addDisposable(
-                    this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), markdownPart.domNode, ( localize(6745, "Click to Edit")), {
+                    this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), markdownPart.domNode, ( localize(6952, "Click to Edit")), {
                         trapFocus: true
                     })
                 );
@@ -2250,7 +2199,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         this.handleRenderedCodeblocks(element, markdownPart, codeBlockStartIndex);
         const collapsedToolsMode = this.configService.getValue("chat.agent.thinking.collapsedTools");
-        if (isResponseVM(context.element) && collapsedToolsMode !== CollapsedToolsDisplayMode.Off && !isFinalAnswerPart) {
+        if (isResponseVM(context.element) && collapsedToolsMode !== CollapsedToolsDisplayMode.Off) {
             const isComplete = this.isCodeblockComplete(markdown, context.element);
             const subAgentInvocationId = extractSubAgentInvocationIdFromText(markdown.content.value);
             if (subAgentInvocationId) {
@@ -2283,7 +2232,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                         disposable: markdownPart
                     }), markdownPart.codeblocksPartId, markdown, templateData.value);
                 }
-            } else if (!this.shouldPinPart(markdown, context.element)) {
+            } else if (!this.shouldPinPart(markdown, context.element) && !isBlankMarkdown && !hasPendingEditCodeblock) {
                 this.finalizeCurrentThinkingPart(context, templateData);
             }
         }
@@ -2394,15 +2343,15 @@ class ChatListDelegate extends CachedListVirtualDelegate {
     }
 }
 const voteDownDetailLabels = {
-    [ChatAgentVoteDownReason.IncorrectCode]: ( localize(6746, "Suggested incorrect code")),
-    [ChatAgentVoteDownReason.DidNotFollowInstructions]: ( localize(6747, "Didn't follow instructions")),
-    [ChatAgentVoteDownReason.MissingContext]: ( localize(6748, "Missing context")),
-    [ChatAgentVoteDownReason.OffensiveOrUnsafe]: ( localize(6749, "Offensive or unsafe")),
-    [ChatAgentVoteDownReason.PoorlyWrittenOrFormatted]: ( localize(6750, "Poorly written or formatted")),
-    [ChatAgentVoteDownReason.RefusedAValidRequest]: ( localize(6751, "Refused a valid request")),
-    [ChatAgentVoteDownReason.IncompleteCode]: ( localize(6752, "Incomplete code")),
-    [ChatAgentVoteDownReason.WillReportIssue]: ( localize(6753, "Report an issue")),
-    [ChatAgentVoteDownReason.Other]: ( localize(6754, "Other"))
+    [ChatAgentVoteDownReason.IncorrectCode]: ( localize(6953, "Suggested incorrect code")),
+    [ChatAgentVoteDownReason.DidNotFollowInstructions]: ( localize(6954, "Didn't follow instructions")),
+    [ChatAgentVoteDownReason.MissingContext]: ( localize(6955, "Missing context")),
+    [ChatAgentVoteDownReason.OffensiveOrUnsafe]: ( localize(6956, "Offensive or unsafe")),
+    [ChatAgentVoteDownReason.PoorlyWrittenOrFormatted]: ( localize(6957, "Poorly written or formatted")),
+    [ChatAgentVoteDownReason.RefusedAValidRequest]: ( localize(6958, "Refused a valid request")),
+    [ChatAgentVoteDownReason.IncompleteCode]: ( localize(6959, "Incomplete code")),
+    [ChatAgentVoteDownReason.WillReportIssue]: ( localize(6960, "Report an issue")),
+    [ChatAgentVoteDownReason.Other]: ( localize(6961, "Other"))
 };
 let ChatVoteDownButton = class ChatVoteDownButton extends DropdownMenuActionViewItem {
     constructor(