@codingame/monaco-vscode-api 37.6.1 → 38.0.1

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

@@ -1,22 +1,22 @@
 
 import { registerCss } from '../../../../../../../../../css.js';
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
-import { $, addDisposableListener, EventType, EventHelper, scheduleAtNextAnimationFrame, getWindow, DisposableResizeObserver, clearNode, isHTMLElement, hide } from '../../../../../../base/browser/dom.js';
+import { $, addDisposableListener, EventType, EventHelper, scheduleAtNextAnimationFrame, getWindow, DisposableResizeObserver, clearNode, isHTMLElement, setVisibility, isAncestorOfActiveElement, getActiveElement, hide } from '../../../../../../base/browser/dom.js';
 import { alert } from '../../../../../../base/browser/ui/aria/aria.js';
-import { Button } from '../../../../../../base/browser/ui/button/button.js';
-import { HoverStyle } from '../../../../../../base/browser/ui/hover/hover.js';
 import { DomScrollableElement } from '../../../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { ScrollbarVisibility } from '../../../../../../base/common/scrollable.js';
 import { IChatToolInvocation } from '../../../common/chatService/chatService.js';
-import { ThinkingDisplayMode, ChatConfiguration } from '../../../common/constants.js';
+import { ChatEditStatsButton, aggregateChatEditDiffs } from './chatEditStatsButton.js';
+import { ThinkingDisplayMode, ChatConfiguration, ChatProgressVerbosity } from '../../../common/constants.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.service.js';
 import { AccessibilityWorkbenchSettingId } from '../../../../accessibility/browser/accessibilityConfiguration.js';
-import { markdownStringEqual, MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { extractCodeblockUrisFromText } from '../../../common/widget/annotations.js';
-import { getComparisonKey, basename } from '../../../../../../base/common/resources.js';
-import { URI } from '../../../../../../base/common/uri.js';
+import { MarkdownString, markdownStringEqual } from '../../../../../../base/common/htmlContent.js';
+import { renderAsPlaintext } from '../../../../../../base/browser/markdownRenderer.js';
+import { marked } from 'marked';
+import { extractCodeblockUrisFromText, extractEditCodeblockUrisFromText } from '../../../common/widget/annotations.js';
+import { basename } from '../../../../../../base/common/resources.js';
 import { ChatThinkingStyleContentPart, createThinkingIcon } from './chatThinkingStyleContentPart.js';
 import { renderFileWidgets } from './chatInlineAnchorWidget.js';
 import { localize } from '../../../../../../nls.js';
@@ -36,11 +36,14 @@ import { ITelemetryService } from '../../../../../../platform/telemetry/common/t
 import { getCompactCodicon } from '../../chatIcons.js';
 import { StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../../../platform/storage/common/storage.service.js';
-import { IEditorService } from '../../../../../services/editor/common/editorService.service.js';
 import { extractImagesFromToolInvocationOutputDetails } from '../../../common/chatImageExtraction.js';
 import { ChatThinkingExternalResourceWidget } from './chatThinkingExternalResourcesWidget.js';
 import { LocalChatSessionUri, chatSessionResourceToId } from '../../../common/model/chatUri.js';
+import { getToolInvocationIcon, hasToolInvocationError } from './toolInvocationParts/chatToolPartUtilities.js';
+import { IUriIdentityService } from '../../../../../../platform/uriIdentity/common/uriIdentity.service.js';
+import { getToolGroupSummary } from './chatToolGroupSummary.js';
 import { mainWindow } from '../../../../../../base/browser/window.js';
+import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 var ChatThinkingContentPart_1;
@@ -56,10 +59,6 @@ function extractTextFromPart(content) {
     const raw = Array.isArray(content.value) ? content.value.join("") : (content.value || "");
     return raw.trim();
 }
-function isEditToolId(toolId) {
-    const lowerToolId = toolId.toLowerCase();
-    return lowerToolId.includes("edit") || lowerToolId.includes("create") || lowerToolId.includes("replace") || lowerToolId.includes("patch");
-}
 function isGenericEditToolId(toolId) {
     const lowerToolId = toolId.toLowerCase();
     if (lowerToolId.includes("create") || lowerToolId.includes("notebook")) {
@@ -67,44 +66,6 @@ function isGenericEditToolId(toolId) {
     }
     return lowerToolId.includes("replace") || lowerToolId.includes("patch") || lowerToolId.includes("insertedit") || lowerToolId.includes("insert_edit") || lowerToolId.includes("editfile");
 }
-function isProblemsToolId(toolId) {
-    switch (toolId?.toLowerCase()) {
-    case "problems":
-    case "get_errors":
-    case "copilot_geterrors":
-        return true;
-    default:
-        return false;
-    }
-}
-function isNoProblemsFoundResult(toolId, resultText) {
-    return isProblemsToolId(toolId) && resultText?.toLowerCase().includes("no problems found") === true;
-}
-function getToolInvocationIcon(toolId, registeredIcon, resultText) {
-    if (isNoProblemsFoundResult(toolId, resultText)) {
-        return Codicon.search;
-    }
-    if (registeredIcon) {
-        return registeredIcon;
-    }
-    const lowerToolId = toolId.toLowerCase();
-    if (lowerToolId.includes("comment")) {
-        return Codicon.comment;
-    }
-    if (lowerToolId.includes("search") || lowerToolId.includes("grep") || lowerToolId.includes("find") || lowerToolId.includes("list") || lowerToolId.includes("semantic") || lowerToolId.includes("changes") || lowerToolId.includes("codebase") || lowerToolId.includes("checked")) {
-        return Codicon.search;
-    }
-    if (lowerToolId.includes("read") || lowerToolId.includes("get_file") || lowerToolId.includes("problems")) {
-        return Codicon.book;
-    }
-    if (isEditToolId(toolId)) {
-        return Codicon.pencil;
-    }
-    if (lowerToolId.includes("terminal")) {
-        return Codicon.terminal;
-    }
-    return Codicon.tools;
-}
 function setThinkingIcon(iconElement, icon) {
     iconElement.className = "chat-thinking-icon";
     iconElement.classList.add(...ThemeIcon.asClassNameArray(getCompactCodicon(icon)));
@@ -113,8 +74,50 @@ function extractTitleFromThinkingContent(content) {
     const headerMatch = content.match(/^\*\*([^*]+)\*\*/);
     return headerMatch ? headerMatch[1] : undefined;
 }
-function isThinkingHeaderLine(line) {
-    return /^\s*\*\*.+\*\*\s*$/.test(line);
+function extractThinkingHeader(line) {
+    const trimmed = line.trim();
+    const title = stripStandaloneBold(trimmed);
+    return title !== trimmed ? renderAsPlaintext(( new MarkdownString(title))).trim() || undefined : undefined;
+}
+function getThinkingHeaders(content) {
+    const headers = [];
+    if (!/^\s*\*\*.+\*\*\s*$/m.test(content)) {
+        return headers;
+    }
+    const source = content.replace(/\r\n?/g, "\n");
+    const lineCount = source.split("\n").length;
+    let depth = 0;
+    const lexer = new (class extends marked.Lexer {
+        blockTokens(src, tokens, lastParagraphClipped) {
+            depth++;
+            try {
+                return super.blockTokens(src, tokens, lastParagraphClipped);
+            } finally {
+                depth--;
+            }
+        }
+    })({
+        tokenizer: new (class extends marked.Tokenizer {
+            paragraph(src) {
+                const token = super.paragraph(src);
+                if (token && depth === 1 && token.raw.includes("**")) {
+                    const lineIndex = lineCount - src.split("\n").length;
+                    for (const [index, line] of token.raw.split("\n").entries()) {
+                        const title = extractThinkingHeader(line);
+                        if (title !== undefined) {
+                            headers.push({
+                                lineIndex: lineIndex + index,
+                                title
+                            });
+                        }
+                    }
+                }
+                return token;
+            }
+        })()
+    });
+    lexer.lex(source);
+    return headers;
 }
 function stripStandaloneBold(text) {
     const trimmed = text.trim();
@@ -123,10 +126,14 @@ function stripStandaloneBold(text) {
     }
     return text;
 }
-function splitReasoningSummaryRows(text, dropLeadingHeader = true) {
+function splitReasoningSummaryRows(text, dropLeadingHeader = true, headers = getThinkingHeaders(text)) {
+    if (headers.length < 2) {
+        return undefined;
+    }
+    const headerLines = ( new Set(headers.map(header => header.lineIndex)));
     const sections = [];
-    for (const line of text.split("\n")) {
-        if (isThinkingHeaderLine(line)) {
+    for (const [index, line] of text.split("\n").entries()) {
+        if (( headerLines.has(index))) {
             sections.push({
                 isHeader: true,
                 lines: [line]
@@ -140,9 +147,6 @@ function splitReasoningSummaryRows(text, dropLeadingHeader = true) {
             sections[sections.length - 1].lines.push(line);
         }
     }
-    if (sections.filter(section => section.isHeader).length < 2) {
-        return undefined;
-    }
     const dropFirst = dropLeadingHeader && sections[0].isHeader;
     const rows = [];
     sections.forEach((section, index) => {
@@ -173,13 +177,13 @@ var WorkingMessageCategory;
     WorkingMessageCategory["Terminal"] = "terminal";
     WorkingMessageCategory["Tool"] = "tool";
 })(WorkingMessageCategory || (WorkingMessageCategory = {}));
-const defaultThinkingMessages = [( localize(11715, "Thinking")), ( localize(11716, "Reasoning")), ( localize(11717, "Considering")), ( localize(11718, "Analyzing")), ( localize(11719, "Evaluating")), ( localize(11720, "Working"))];
-const terminalMessages = [( localize(11721, "Executing")), ( localize(11722, "Running")), ( localize(11723, "Processing"))];
-const toolMessages = [( localize(11724, "Processing")), ( localize(11725, "Preparing")), ( localize(11726, "Loading")), ( localize(11727, "Analyzing")), ( localize(11728, "Evaluating"))];
+const defaultThinkingMessages = [( localize(13953, "Thinking")), ( localize(13954, "Reasoning")), ( localize(13955, "Considering")), ( localize(13956, "Analyzing")), ( localize(13957, "Evaluating")), ( localize(13958, "Working"))];
+const terminalMessages = [( localize(13959, "Executing")), ( localize(13960, "Running")), ( localize(13961, "Processing"))];
+const toolMessages = [( localize(13962, "Processing")), ( localize(13963, "Preparing")), ( localize(13964, "Loading")), ( localize(13965, "Analyzing")), ( localize(13966, "Evaluating"))];
 const funWorkingMessages = [(
-localize(11729, "Bribing the hamster")), ( localize(11730, "Reticulating splines")), ( localize(11731, "Untangling the spaghetti")), ( localize(11732, "Communing with the codebase")), (
-localize(11733, "Mining diamonds")), (
-localize(11734, "Summoning Clippy"))];
+localize(13967, "Bribing the hamster")), ( localize(13968, "Reticulating splines")), ( localize(13969, "Untangling the spaghetti")), ( localize(13970, "Communing with the codebase")), ( localize(13971, "Letting it cook")), ( localize(13972, "Thanking all the fish")), ( localize(13973, "Stabilizing the wormhole")), ( localize(13974, "Baking the ideas")), ( localize(13975, "Consulting the oracle")), ( localize(13976, "Stirring the solution")), (
+localize(13977, "Mining diamonds")), ( localize(13978, "Digging straight down")), ( localize(13979, "Mining at night")), (
+localize(13980, "Summoning Clippy"))];
 const FUN_WORKING_MESSAGE_RATE = 50;
 function getCustomThinkingPhrases(configurationService) {
     const config = configurationService.getValue(ChatConfiguration.ThinkingPhrases);
@@ -215,7 +219,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         return codeElement;
     }
     get aggregatedDiff() {
-        return this._aggregatedDiff;
+        return this._diffData.get();
     }
     getRandomWorkingMessage(category = WorkingMessageCategory.Tool) {
         const fun = maybePickFunWorkingMessage(this.configurationService);
@@ -256,19 +260,21 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         telemetryService,
         storageService,
         contextKeyService,
-        editorService
+        uriIdentityService
     ) {
         const initialText = extractTextFromPart(content);
         const containsReasoning = initialText.trim().length > 0;
-        const extractedTitle = extractTitleFromThinkingContent(initialText) ?? ( localize(11735, "Thinking"));
+        const extractedTitle = extractTitleFromThinkingContent(initialText) ?? ( localize(13981, "Thinking"));
+        const initialTitle = context.suppressProgressShimmer && !context.isToolChain ? ( localize(13981, "Thinking")) : extractedTitle;
         super(
-            extractedTitle,
+            initialTitle,
             context,
             undefined,
             hoverService,
             configurationService,
             telemetryService
         );
+        this.context = context;
         this.chatContentMarkdownRenderer = chatContentMarkdownRenderer;
         this.streamingCompleted = streamingCompleted;
         this.instantiationService = instantiationService;
@@ -276,12 +282,14 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this.languageModelsService = languageModelsService;
         this.storageService = storageService;
-        this.editorService = editorService;
+        this.uriIdentityService = uriIdentityService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this._asyncRenderCallback = () => this._onDidChangeHeight.fire();
-        this.defaultTitle = ( localize(11736, "Thinking"));
-        this.workingTitle = ( localize(11737, "Working"));
+        this.defaultTitle = ( localize(13982, "Thinking"));
+        this.workingTitle = ( localize(13983, "Working"));
         this._markdownResult = this._register(( new MutableDisposable()));
+        this.pendingHeaderRemoval = this._register(( new MutableDisposable()));
+        this.renderedThinkingHeaders = ( new Map());
         this.summaryRowItems = [];
         this.summaryRowResults = [];
         this.summaryRowTexts = [];
@@ -301,9 +309,11 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this.toolWrappersByCallId = ( new Map());
         this.toolIconsByCallId = ( new Map());
         this.toolLabelsByCallId = ( new Map());
+        this.hiddenToolCallIds = ( new Set());
         this.toolDisposables = this._register(( new DisposableMap()));
         this.ownedToolParts = ( new Map());
         this.pendingRemovals = [];
+        this.pendingFocusCollapse = this._register(( new MutableDisposable()));
         this.isUpdatingDimensions = false;
         this.lastKnownContentHeight = 0;
         this.lastKnownScrollTop = 0;
@@ -311,21 +321,27 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this._titleDetailRendered = this._register(( new MutableDisposable()));
         this._pendingAppendRefresh = this._register(( new MutableDisposable()));
         this.diffDataByPartId = ( new Map());
-        this._aggregatedDiff = {
+        this.editResourcesByPartId = ( new Map());
+        this._diffData = observableValue(this, {
             added: 0,
-            removed: 0
-        };
+            removed: 0,
+            resources: []
+        });
+        this.diffData = this._diffData;
         this.diffButtonStore = this._register(( new DisposableStore()));
         this.containsGroupedItems = false;
+        this.isToolChain = !!context.suppressProgressShimmer && !!context.isToolChain;
+        this.isVerboseToolChain = this.isToolChain && configurationService.getValue(ChatConfiguration.PersistentProgressVerbosity) === ChatProgressVerbosity.Verbose;
+        this.isPersistentReasoning = !!context.suppressProgressShimmer && !this.isToolChain;
         this.containsReasoning = containsReasoning;
         this.reasoningDurationMs = content.reasoningDurationMs;
         this.id = content.id;
         this.content = content;
         this.allThinkingParts.push(content);
-        const configuredMode = getEffectiveThinkingDisplayMode(this.configurationService, contextKeyService, context.readOnly);
+        const configuredMode = context.suppressProgressShimmer ? ThinkingDisplayMode.CollapsedPreview : getEffectiveThinkingDisplayMode(this.configurationService, contextKeyService, context.readOnly);
         this.thinkingDisplayMode = configuredMode;
         this.fixedScrollingMode = configuredMode === ThinkingDisplayMode.FixedScrolling;
-        this.currentTitle = extractedTitle;
+        this.currentTitle = initialTitle;
         if (extractedTitle !== this.defaultTitle) {
             this.lastExtractedTitle = extractedTitle;
             this.extractedTitles.push(extractedTitle);
@@ -335,10 +351,12 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         if (initialText.trim()) {
             this.appendedItemCount++;
         }
-        if (this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
-            alert(( localize(11738, "Thinking")));
+        if (!this.isToolChain && this.configurationService.getValue(AccessibilityWorkbenchSettingId.VerboseChatProgressUpdates)) {
+            alert(( localize(13984, "Thinking")));
         }
-        if (configuredMode === ThinkingDisplayMode.Collapsed) {
+        if (this.isVerboseToolChain) {
+            this.setExpanded(true);
+        } else if (configuredMode === ThinkingDisplayMode.Collapsed) {
             this.setExpanded(false);
         } else if (configuredMode === ThinkingDisplayMode.CollapsedPreview) {
             this.setExpanded(!this.streamingCompleted && !this.element.isComplete);
@@ -346,6 +364,21 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             this.setExpanded(false);
         }
         const node = this.domNode;
+        if (this.isToolChain) {
+            node.classList.add("chat-tool-chain");
+            node.setAttribute("role", "group");
+            node.setAttribute("aria-label", ( localize(13985, "Tool calls")));
+            if (this.isVerboseToolChain) {
+                this._collapseButton?.element.parentElement?.remove();
+            } else {
+                node.classList.add("chat-tool-chain-collapsible");
+                node.classList.toggle("chat-tool-chain-preview", this.isExpanded());
+                this._collapseButton?.iconElement.setAttribute("aria-hidden", "true");
+            }
+        } else if (context.suppressProgressShimmer) {
+            node.classList.add("chat-persistent-reasoning");
+            this._collapseButton?.iconElement.setAttribute("aria-hidden", "true");
+        }
         if (this._hoverChevron) {
             this._register(addDisposableListener(this._hoverChevron, EventType.CLICK, event => {
                 EventHelper.stop(event, true);
@@ -355,9 +388,10 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this._externalResourceWidget = this._register(
             this.instantiationService.createInstance(ChatThinkingExternalResourceWidget)
         );
-        this._register(
-            this._externalResourceWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire())
-        );
+        this._register(this._externalResourceWidget.onDidChangeHeight(() => {
+            this.updateToolChainVisibility();
+            this._onDidChangeHeight.fire();
+        }));
         node.appendChild(this._externalResourceWidget.domNode);
         if (!this.streamingCompleted && !this.element.isComplete) {
             if (!this.fixedScrollingMode) {
@@ -365,7 +399,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             }
         }
         if (!this.fixedScrollingMode && !this.streamingCompleted && !this.element.isComplete && this._collapseButton) {
-            this.setShimmerTitle(extractedTitle);
+            this.setShimmerTitle(initialTitle);
         }
         if (this.fixedScrollingMode) {
             node.classList.add("chat-thinking-fixed-mode");
@@ -394,7 +428,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
                     this.materializeLazyItem(item);
                 }
             }
-            if (isExpanded && !this.shouldAllowExpansion() && (this.streamingCompleted || this.element.isComplete)) {
+            if (!this.isToolChain && isExpanded && !this.shouldAllowExpansion() && (this.streamingCompleted || this.element.isComplete)) {
                 this.setExpanded(false);
                 return;
             }
@@ -435,13 +469,13 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         }
     }
     shouldInitEarly() {
-        return this.fixedScrollingMode && !this.streamingCompleted;
+        return this.isVerboseToolChain || this.fixedScrollingMode && !this.streamingCompleted;
     }
     shouldAnimateContent() {
-        return !this.fixedScrollingMode;
+        return !this.isVerboseToolChain && !this.fixedScrollingMode;
     }
     shouldPrepareContentAnimation() {
-        return !this.fixedScrollingMode;
+        return !this.isVerboseToolChain && !this.fixedScrollingMode;
     }
     contentDidInitialize() {
         if (this.fixedScrollingMode && this.streamingCompleted && this.scrollableElement) {
@@ -454,6 +488,9 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         return "thinking";
     }
     expansionDidChange(expanded) {
+        if (this.isToolChain && !this.isVerboseToolChain && expanded && this.streamingCompleted) {
+            this.domNode.classList.remove("chat-tool-chain-preview");
+        }
         if (this.fixedScrollingMode && this.streamingCompleted) {
             if (expanded) {
                 this.syncDimensionsAndScheduleScroll();
@@ -463,6 +500,9 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         }
     }
     getThinkingIcon(_active, expanded) {
+        if (this.context.suppressProgressShimmer) {
+            return this.isToolChain ? Codicon.tools : Codicon.thinking;
+        }
         if (this.streamingCompleted || this.element.isComplete) {
             return Codicon.checkCompact;
         }
@@ -479,7 +519,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             this.wrapper.appendChild(this.textContainer);
             this.renderMarkdown(this.currentThinkingValue);
         }
-        if (!this.streamingCompleted && !this.element.isComplete) {
+        if (!this.streamingCompleted && !this.element.isComplete && !this.context.suppressProgressShimmer) {
             const spinner = this.createThinkingSpinnerRow(this.getRandomWorkingMessage(WorkingMessageCategory.Thinking));
             this.workingSpinnerElement = spinner.row;
             this.workingSpinnerLabel = spinner.label;
@@ -692,7 +732,11 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         if (this.summaryRowItems.length && this.summaryRowItems[0] !== this.textContainer) {
             this.retireSummaryRows();
         }
-        const cleanedContent = content.trim();
+        const previousHeader = this.renderedThinkingHeaders.get(this.textContainer);
+        if (this.isPersistentReasoning && this.textContainer) {
+            this.renderedThinkingHeaders.delete(this.textContainer);
+        }
+        const cleanedContent = this.getThinkingBody(content);
         if (!cleanedContent) {
             this._markdownResult.clear();
             this.clearSummaryRows();
@@ -701,28 +745,86 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             }
             return;
         }
-        const dropLeadingHeader = this.droppedSummaryHeader !== undefined && extractTitleFromThinkingContent(cleanedContent) === this.droppedSummaryHeader;
-        const summaryRows = splitReasoningSummaryRows(cleanedContent, dropLeadingHeader);
+        const dropLeadingHeader = !this.isPersistentReasoning && this.droppedSummaryHeader !== undefined && extractTitleFromThinkingContent(cleanedContent) === this.droppedSummaryHeader;
+        const headers = getThinkingHeaders(cleanedContent);
+        const summaryRows = splitReasoningSummaryRows(cleanedContent, dropLeadingHeader, headers);
         if (summaryRows && this.textContainer?.parentNode) {
             this.renderSummaryRows(summaryRows);
             return;
         }
         this.clearSummaryRows();
+        if (this.isPersistentReasoning && this.textContainer && !summaryRows && headers.length) {
+            const {
+                lineIndex,
+                title
+            } = headers[0];
+            const target = reuseExisting && previousHeader?.title === title ? this._markdownResult.value?.element : undefined;
+            this._markdownResult.value = this.renderThinkingMarkdownWithHeader(cleanedContent.split("\n"), lineIndex, title, target);
+            return;
+        }
         const contentToRender = stripStandaloneBold(cleanedContent);
         const target = reuseExisting ? this._markdownResult.value?.element : undefined;
-        const rendered = this.chatContentMarkdownRenderer.render(( new MarkdownString(contentToRender)), {
+        this._markdownResult.value = this.renderThinkingMarkdown(this.textContainer, contentToRender, target);
+    }
+    getThinkingBody(content) {
+        if (this.isPersistentReasoning && this.droppedSummaryHeader) {
+            const droppedLines = ( new Set(
+                getThinkingHeaders(content).filter(header => header.title === this.droppedSummaryHeader).map(header => header.lineIndex)
+            ));
+            return content.split("\n").filter((_, index) => !( droppedLines.has(index))).join("\n").trim();
+        }
+        return content.trim();
+    }
+    renderThinkingMarkdownWithHeader(lines, headerIndex, title, target) {
+        const store = ( new DisposableStore());
+        const element = target ?? $("div");
+        const previousSections = Array.from(element.children).filter(isHTMLElement);
+        let sectionIndex = 0;
+        const sections = [
+            lines.slice(0, headerIndex).join("\n").trim(),
+            lines[headerIndex],
+            lines.slice(headerIndex + 1).join("\n").trim()
+        ];
+        for (const [index, section] of sections.entries()) {
+            if (!section) {
+                continue;
+            }
+            const content = index === 1 && !sections[0] && !sections[2] ? stripStandaloneBold(section) : section;
+            const rendered = store.add(
+                this.renderThinkingMarkdown(undefined, content, previousSections[sectionIndex++])
+            );
+            if (rendered.element.parentElement !== element) {
+                element.appendChild(rendered.element);
+            }
+            if (index === 1) {
+                this.renderedThinkingHeaders.set(this.textContainer, {
+                    title,
+                    element: rendered.element
+                });
+            }
+        }
+        if (!target) {
+            clearNode(this.textContainer);
+            this.textContainer.appendChild(createThinkingIcon(Codicon.circleFilled));
+            this.textContainer.appendChild(element);
+        }
+        return {
+            element,
+            dispose: () => store.dispose()
+        };
+    }
+    renderThinkingMarkdown(container, content, target) {
+        const rendered = this.chatContentMarkdownRenderer.render(( new MarkdownString(content)), {
             fillInIncompleteTokens: true,
             asyncRenderCallback: this._asyncRenderCallback,
             codeBlockRendererSync: ChatThinkingContentPart_1._codeBlockRendererSync
         }, target);
-        this._markdownResult.value = rendered;
-        if (!target) {
-            if (this.textContainer) {
-                clearNode(this.textContainer);
-                this.textContainer.appendChild(createThinkingIcon(Codicon.circleFilled));
-                this.textContainer.appendChild(rendered.element);
-            }
+        if (!target && container) {
+            clearNode(container);
+            container.appendChild(createThinkingIcon(Codicon.circleFilled));
+            container.appendChild(rendered.element);
         }
+        return rendered;
     }
     renderSummaryRow(container, index, markdown) {
         const previous = this.summaryRowResults[index];
@@ -794,7 +896,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this.summaryRowTexts = [];
     }
     trackDroppedSummaryHeader(value) {
-        if (this.droppedSummaryHeader) {
+        if (this.isPersistentReasoning || this.droppedSummaryHeader) {
             return;
         }
         const trimmed = value.trim();
@@ -831,13 +933,13 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             const {
                 added,
                 removed
-            } = this._aggregatedDiff;
+            } = this.aggregatedDiff;
             if (added > 0 || removed > 0) {
                 this.renderDiffButton(added, removed);
-                const insertionsFragment = added === 1 ? ( localize(11739, "1 insertion")) : ( localize(11740, "{0} insertions", added));
-                const deletionsFragment = removed === 1 ? ( localize(11741, "1 deletion")) : ( localize(11742, "{0} deletions", removed));
+                const insertionsFragment = added === 1 ? ( localize(13986, "1 insertion")) : ( localize(13987, "{0} insertions", added));
+                const deletionsFragment = removed === 1 ? ( localize(13988, "1 deletion")) : ( localize(13989, "{0} deletions", removed));
                 this.setAriaLabel(( localize(
-                    11743,
+                    13990,
                     "{0}, {1}, {2}",
                     displayTitle,
                     insertionsFragment,
@@ -853,7 +955,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         }
     }
     renderDiffButton(added, removed) {
-        const resources = this.getAggregatedDiffResources();
+        const resources = this._diffData.get().resources;
         if (resources.length === 0) {
             this.clearDiffButton();
             return;
@@ -864,39 +966,27 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             if (!container) {
                 return;
             }
-            collapseButton.element.classList.add("chat-thinking-title-with-diff");
-            const button = this.diffButtonStore.add(( new Button(container, {})));
-            button.element.classList.add("chat-thinking-title-diff");
-            this.diffButtonStore.add(button.onDidClick(event => {
-                EventHelper.stop(event, true);
-                this.openDiffs();
-            }));
-            this.diffButtonStore.add(this.hoverService.setupDelayedHover(button.element, {
-                content: ( localize(11744, "View File Changes")),
-                style: HoverStyle.Pointer
-            }));
+            container.classList.add("chat-thinking-title-with-diff");
+            const button = this.diffButtonStore.add(
+                this.instantiationService.createInstance(ChatEditStatsButton, container, ( localize(13991, "Section File Changes")), "chat-thinking-title-diff")
+            );
             this.diffButton = button;
             if (this._hoverChevron) {
                 container.appendChild(this._hoverChevron);
             }
         }
-        this.diffButton.element.replaceChildren(
-            $("span.label-added", {}, `+${added}`),
-            $("span.label-removed", {}, `-${removed}`)
-        );
-        this.diffButton.setAriaLabel(( localize(
-            11745,
-            "View file changes, {0} lines added, {1} lines deleted",
+        this.diffButton.setDiff({
             added,
-            removed
-        )));
+            removed,
+            resources
+        });
     }
     clearDiffButton() {
         this.diffButtonStore.clear();
         this.diffButton = undefined;
         const collapseButton = this._collapseButton;
-        collapseButton?.element.classList.remove("chat-thinking-title-with-diff");
         const container = collapseButton?.element.parentElement;
+        container?.classList.remove("chat-thinking-title-with-diff");
         if (collapseButton && container && this._hoverChevron) {
             if (this.titleDetailContainer?.parentElement === container) {
                 container.appendChild(this._hoverChevron);
@@ -905,53 +995,13 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             }
         }
     }
-    getAggregatedDiffResources() {
-        const result = ( new Map());
-        for (const data of ( this.diffDataByPartId.values())) {
-            for (const resource of data.resources) {
-                const key = getComparisonKey(resource.resource);
-                const existing = result.get(key);
-                if (existing) {
-                    existing.resource = resource.resource;
-                    existing.modifiedURI = resource.modifiedURI;
-                } else {
-                    result.set(key, {
-                        ...resource
-                    });
-                }
-            }
-        }
-        return [...( result.values())].filter(
-            resource => resource.originalURI !== undefined || resource.modifiedURI !== undefined
-        );
-    }
-    openDiffs() {
-        const resources = this.getAggregatedDiffResources();
-        if (resources.length === 0) {
-            return;
-        }
-        const source = ( URI.parse(`multi-diff-editor:${( Date.now().toString())}-${( Math.random().toString(36)).slice(2)}`));
-        this.editorService.openEditor({
-            multiDiffSource: source,
-            label: ( localize(11746, "Section File Changes")),
-            resources: resources.map(resource => ({
-                original: {
-                    resource: resource.originalURI
-                },
-                modified: {
-                    resource: resource.modifiedURI
-                },
-                goToFileResource: resource.resource
-            }))
-        });
-    }
     getFinalizedDisplayTitle(title) {
         if (this.thinkingDisplayMode !== ThinkingDisplayMode.Collapsed || !this.containsReasoning || this.containsGroupedItems || !this.reasoningDurationMs) {
             return title;
         }
         const seconds = Math.ceil(this.reasoningDurationMs / 1000);
-        const duration = ( localize(11747, "{0}s", seconds));
-        return localize(11748, "{0} - {1}", title, duration);
+        const duration = ( localize(13992, "{0}s", seconds));
+        return localize(13993, "{0} - {1}", title, duration);
     }
     hasReasoningContent() {
         return this.containsReasoning;
@@ -970,15 +1020,25 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             this._collapseButton.element.style.pointerEvents = clickable ? "auto" : "none";
         }
         if (!clickable && this.streamingCompleted) {
-            this.setFinalizedTitle(this.lastExtractedTitle ?? this.currentTitle);
+            this.setFinalizedTitle(
+                this.isPersistentReasoning ? this.currentTitle : this.lastExtractedTitle ?? this.currentTitle
+            );
         }
     }
     shouldAllowExpansion() {
-        if (this.toolInvocationCount > 0 || this.lazyItems.length > 0) {
+        if (this.isPersistentReasoning) {
+            return ( this.allThinkingParts.some(part => this.getThinkingBody(extractTextFromPart(part)).length > 0));
+        }
+        const hasVisibleLazyItems = ( this.lazyItems.some(
+            item => item.kind === "thinking" || !item.lazy.hasValue || item.lazy.value.isVisible?.get() !== false
+        ));
+        if (this.toolInvocationCount > this.hiddenToolCallIds.size || hasVisibleLazyItems) {
             return true;
         }
         if (this.wrapper) {
-            const meaningfulChildren = Array.from(this.wrapper.children).filter(child => child !== this.workingSpinnerElement).length;
+            const meaningfulChildren = Array.from(this.wrapper.children).filter(
+                child => child !== this.workingSpinnerElement && isHTMLElement(child) && !child.hidden && child.style.display !== "none"
+            ).length;
             if (meaningfulChildren > 1) {
                 return true;
             }
@@ -992,6 +1052,17 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         return !(!strippedContent || strippedContent === titleToCompare);
     }
     updateDropdownClickability(knownContentHeight) {
+        if (this.fallbackTitle !== undefined && this.currentTitle === this.fallbackTitle) {
+            const title = this.getFallbackTitle();
+            if (title !== this.currentTitle) {
+                this.currentTitle = this.fallbackTitle = title;
+                this.setFinalizedTitle(title);
+            }
+        }
+        this.updateToolChainVisibility();
+        if (this.isVerboseToolChain) {
+            return;
+        }
         let allowExpansion = this.shouldAllowExpansion();
         if (allowExpansion && this.fixedScrollingMode && !this.streamingCompleted && !this.element.isComplete && this.wrapper) {
             const contentHeight = knownContentHeight ?? this.lastKnownContentHeight;
@@ -1004,6 +1075,17 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         }
         this.setDropdownClickable(allowExpansion);
     }
+    updateToolChainVisibility() {
+        if (!this.isToolChain || !this.wrapper) {
+            return;
+        }
+        const hasPendingContent = ( this.lazyItems.some(item => item.kind === "thinking" || !item.lazy.hasValue));
+        const hasVisibleContent = ( Array.from(this.wrapper.children).some(
+            child => isHTMLElement(child) && !child.hidden && child.style.display !== "none"
+        ));
+        const hasResources = this._externalResourceWidget?.domNode.hasChildNodes() ?? false;
+        setVisibility(hasPendingContent || hasVisibleContent || hasResources, this.domNode);
+    }
     appendToWrapper(element) {
         if (!this.wrapper) {
             return;
@@ -1013,6 +1095,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         } else {
             this.wrapper.appendChild(element);
         }
+        this.updateToolChainVisibility();
     }
     updateWorkingSpinnerVisibility(reader) {
         if (!this.wrapper || !this.workingSpinnerElement) {
@@ -1026,10 +1109,11 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             return !IChatToolInvocation.isComplete(toolInvocation, reader);
         }));
         const isAttached = this.workingSpinnerElement.parentNode === this.wrapper;
-        if (hasRunningTerminalTool && isAttached) {
+        const hideSpinner = this.context.suppressProgressShimmer || hasRunningTerminalTool;
+        if (hideSpinner && isAttached) {
             this.workingSpinnerElement.remove();
             this._onDidChangeHeight.fire();
-        } else if (!hasRunningTerminalTool && !isAttached && !this.streamingCompleted && !this.element.isComplete) {
+        } else if (!hideSpinner && !isAttached && !this.streamingCompleted && !this.element.isComplete) {
             this.wrapper.appendChild(this.workingSpinnerElement);
             this._onDidChangeHeight.fire();
         }
@@ -1038,12 +1122,65 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this.id = undefined;
     }
     collapseContent() {
-        this.setExpanded(false);
+        if (!this.isVerboseToolChain) {
+            this.setExpanded(false);
+        }
+    }
+    collapseContentWhenUnfocused() {
+        if (this.isVerboseToolChain || this._store.isDisposed) {
+            return;
+        }
+        if (!isAncestorOfActiveElement(this.domNode)) {
+            this.setExpanded(false);
+            return;
+        }
+        this.pendingFocusCollapse.value = addDisposableListener(this.domNode, EventType.FOCUS_OUT, event => {
+            if (event.relatedTarget instanceof Node && this.domNode.contains(event.relatedTarget)) {
+                return;
+            }
+            this.pendingFocusCollapse.clear();
+            this.setExpanded(false);
+        });
+    }
+    getPendingCollapseAnimation() {
+        const container = this.contentAnimationContainer ?? this.scrollableElement?.getDomNode();
+        if (!this.wrapper || this.isExpanded() || this._store.isDisposed || !container?.isConnected) {
+            return undefined;
+        }
+        const animations = container.getAnimations().filter(
+            animation => animation.playState !== "finished" && animation.playState !== "idle"
+        );
+        return animations.length ? this.waitForCollapseAnimation(container, animations) : undefined;
+    }
+    async waitForCollapseAnimation(container, animations) {
+        while (animations.length && !this._store.isDisposed && !this.isExpanded()) {
+            await Promise.all(animations.map(async animation => {
+                try {
+                    await animation.finished;
+                } catch (error) {
+                    if (!(error instanceof getWindow(container).DOMException) || error.name !== "AbortError") {
+                        throw error;
+                    }
+                }
+            }));
+            animations = container.getAnimations().filter(
+                animation => animation.playState !== "finished" && animation.playState !== "idle"
+            );
+        }
+    }
+    expandContent() {
+        this.setExpanded(true);
     }
     updateThinking(content) {
         if (this._store.isDisposed) {
             return;
         }
+        if (this.isPersistentReasoning && !this.allThinkingParts.includes(content)) {
+            const index = this.allThinkingParts.indexOf(this.content);
+            if (index !== -1) {
+                this.allThinkingParts[index] = content;
+            }
+        }
         this.content = content;
         this.reasoningDurationMs = content.reasoningDurationMs;
         for (const lazyItem of this.lazyItems) {
@@ -1055,11 +1192,11 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         const raw = extractTextFromPart(content);
         this.recordReasoningContent(raw);
         const next = raw;
-        if (next === this.currentThinkingValue) {
+        if (next === this.currentThinkingValue && (!this.isPersistentReasoning || this.textContainer?.hasChildNodes())) {
             return;
         }
         const previousValue = this.currentThinkingValue;
-        const reuseExisting = !!(this._markdownResult.value && next.startsWith(previousValue) && next.length > previousValue.length);
+        const reuseExisting = !!(this._markdownResult.value && this._markdownResult.value.element.parentElement === this.textContainer && next.startsWith(previousValue) && next.length > previousValue.length);
         this.currentThinkingValue = next;
         this.trackDroppedSummaryHeader(next);
         this.renderMarkdown(next, reuseExisting);
@@ -1118,7 +1255,36 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
         this.domNode.classList.remove("chat-thinking-active");
         this.domNode.classList.remove("chat-thinking-fade-top", "chat-thinking-fade-bottom");
         this.streamingCompleted = true;
-        this.setContentAnimationEnabled(!this.fixedScrollingMode);
+        this.setContentAnimationEnabled(!this.isVerboseToolChain && !this.fixedScrollingMode);
+        if (this.isPersistentReasoning) {
+            this.extractedTitles = this.allThinkingParts.flatMap(
+                part => getThinkingHeaders(extractTextFromPart(part)).map(header => header.title)
+            );
+            if (this.extractedTitles.length === 1 && !this.droppedSummaryHeader) {
+                this.droppedSummaryHeader = this.extractedTitles[0];
+                this.lastExtractedTitle = this.droppedSummaryHeader;
+                for (const {
+                    title,
+                    element
+                } of ( this.renderedThinkingHeaders.values())) {
+                    if (title !== this.droppedSummaryHeader) {
+                        continue;
+                    }
+                    if (isAncestorOfActiveElement(element)) {
+                        this.pendingHeaderRemoval.value = addDisposableListener(element, EventType.FOCUS_OUT, event => {
+                            if (event.relatedTarget instanceof Node && element.contains(event.relatedTarget)) {
+                                return;
+                            }
+                            this.pendingHeaderRemoval.clear();
+                            element.remove();
+                        });
+                    } else {
+                        element.remove();
+                    }
+                }
+                this.renderedThinkingHeaders.clear();
+            }
+        }
         this.flushPendingExternalResources();
         if (this.workingSpinnerElement) {
             this.workingSpinnerElement.remove();
@@ -1126,10 +1292,20 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             this.workingSpinnerLabel = undefined;
         }
         if (this._collapseButton) {
-            this._collapseButton.icon = Codicon.checkCompact;
+            this._collapseButton.icon = this.getThinkingIcon(false, this.isExpanded());
         }
         this.updateScrollDimensionsForCompletion();
         this.updateDropdownClickability();
+        if (this.isVerboseToolChain) {
+            return;
+        }
+        if (this.isToolChain && this.restoreSingleItemToOriginalPosition()) {
+            return;
+        }
+        if (this.isToolChain) {
+            this.setFallbackTitle();
+            return;
+        }
         if (this.droppedSummaryHeader) {
             this.currentTitle = this.droppedSummaryHeader;
             this.content.generatedTitle = this.droppedSummaryHeader;
@@ -1137,14 +1313,15 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             this.setFinalizedTitle(this.droppedSummaryHeader);
             return;
         }
-        if (this.content.generatedTitle) {
+        const canReuseTitle = title => !!title && (!this.isPersistentReasoning || this.extractedTitles.length < 2 || !this.extractedTitles.includes(renderAsPlaintext(( new MarkdownString(title))).trim()));
+        if (canReuseTitle(this.content.generatedTitle)) {
             this.currentTitle = this.content.generatedTitle;
             this.setGeneratedTitleOnAllParts(this.content.generatedTitle);
             this.setFinalizedTitle(this.content.generatedTitle);
             return;
         }
-        const existingTitle = this.toolInvocations.find(t => t.generatedTitle)?.generatedTitle ?? this.allThinkingParts.find(t => t.generatedTitle)?.generatedTitle;
-        if (existingTitle) {
+        const existingTitle = this.toolInvocations.find(t => canReuseTitle(t.generatedTitle))?.generatedTitle ?? this.allThinkingParts.find(t => canReuseTitle(t.generatedTitle))?.generatedTitle;
+        if (canReuseTitle(existingTitle)) {
             this.currentTitle = existingTitle;
             this.content.generatedTitle = existingTitle;
             this.setGeneratedTitleOnAllParts(existingTitle);
@@ -1156,7 +1333,7 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
             const cacheId = this.getTitleCacheId();
             if (cacheId) {
                 const cachedTitle = this.getCachedTitle(cacheId);
-                if (cachedTitle) {
+                if (canReuseTitle(cachedTitle)) {
                     this.currentTitle = cachedTitle;
                     this.content.generatedTitle = cachedTitle;
                     this.setGeneratedTitleOnAllParts(cachedTitle);
@@ -1165,31 +1342,8 @@ let ChatThinkingContentPart = ChatThinkingContentPart_1 = class ChatThinkingCont
                 }
             }
         }
-        if (this.toolInvocationCount === 1 && this.hookCount === 0 && this.currentThinkingValue.trim() === "") {
-            if (!this.singleItemInfo) {
-                const lazyItem = this.lazyItems.find(item => item.kind === "tool" && item.originalParent);
-                if (lazyItem && lazyItem.kind === "tool") {
-                    const toolInvocation = lazyItem.toolInvocationOrMarkdown && (lazyItem.toolInvocationOrMarkdown.kind === "toolInvocation" || lazyItem.toolInvocationOrMarkdown.kind === "toolInvocationSerialized") ? lazyItem.toolInvocationOrMarkdown : undefined;
-                    const result = lazyItem.lazy.value;
-                    this.appendItemToDOM(
-                        result.domNode,
-                        lazyItem.toolInvocationId,
-                        lazyItem.toolInvocationOrMarkdown,
-                        lazyItem.originalParent
-                    );
-                    if (result.disposable) {
-                        const toolCallId = toolInvocation?.toolCallId;
-                        if (toolCallId) {
-                            this.ownedToolParts.set(toolCallId, result.disposable);
-                        } else {
-                            this._register(result.disposable);
-                        }
-                    }
-                }
-            }
-            if (this.singleItemInfo && this.restoreSingleItemToOriginalPosition()) {
-                return;
-            }
+        if (!this.isToolChain && this.restoreSingleItemToOriginalPosition()) {
+            return;
         }
         if (this.extractedTitles.length === 1 && this.toolInvocationCount === 0) {
             const title = this.extractedTitles[0];
@@ -1432,6 +1586,31 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this.setFallbackTitle();
     }
     restoreSingleItemToOriginalPosition() {
+        if (this.toolInvocationCount !== 1 || this.hookCount !== 0 || this.currentThinkingValue.trim() !== "") {
+            return false;
+        }
+        if (!this.singleItemInfo) {
+            const lazyItem = this.lazyItems.find(item => item.kind === "tool" && item.originalParent);
+            if (lazyItem && lazyItem.kind === "tool") {
+                const toolInvocation = lazyItem.toolInvocationOrMarkdown && (lazyItem.toolInvocationOrMarkdown.kind === "toolInvocation" || lazyItem.toolInvocationOrMarkdown.kind === "toolInvocationSerialized") ? lazyItem.toolInvocationOrMarkdown : undefined;
+                const result = lazyItem.lazy.value;
+                this.appendItemToDOM(
+                    result.domNode,
+                    lazyItem.toolInvocationId,
+                    lazyItem.toolInvocationOrMarkdown,
+                    lazyItem.originalParent,
+                    result.isVisible
+                );
+                if (result.disposable) {
+                    const toolCallId = toolInvocation?.toolCallId;
+                    if (toolCallId) {
+                        this.ownedToolParts.set(toolCallId, result.disposable);
+                    } else {
+                        this._register(result.disposable);
+                    }
+                }
+            }
+        }
         if (!this.singleItemInfo) {
             return false;
         }
@@ -1448,10 +1627,12 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
             this.singleItemInfo = undefined;
             return false;
         }
+        const activeElement = getActiveElement();
+        const focusedContent = isHTMLElement(activeElement) && element.contains(activeElement) ? activeElement : undefined;
         const precedingToolInvocationPart = isHTMLElement(originalNextSibling) && originalNextSibling.parentElement === originalParent ? originalNextSibling.previousElementSibling : originalParent.lastElementChild;
         if (restoreToOriginalParent) {
-            if (originalNextSibling && originalNextSibling.parentNode === originalParent) {
-                originalParent.insertBefore(element, originalNextSibling);
+            if (originalNextSibling?.parentNode && (this.isToolChain || originalNextSibling.parentNode === originalParent)) {
+                originalNextSibling.parentNode.insertBefore(element, originalNextSibling);
             } else {
                 originalParent.appendChild(element);
             }
@@ -1470,26 +1651,37 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         }
         hide(this.domNode);
         this.singleItemInfo = undefined;
+        if (focusedContent?.isConnected) {
+            focusedContent.focus({
+                preventScroll: true
+            });
+        }
         return true;
     }
     updateAggregatedDiff() {
-        let totalAdded = 0;
-        let totalRemoved = 0;
-        for (const data of ( this.diffDataByPartId.values())) {
-            totalAdded += data.added;
-            totalRemoved += data.removed;
-        }
-        this._aggregatedDiff = {
-            added: totalAdded,
-            removed: totalRemoved
-        };
+        this._diffData.set(aggregateChatEditDiffs(( this.diffDataByPartId.values())), undefined);
         if (this.streamingCompleted || this.element.isComplete) {
             this.setFinalizedTitle(this.currentTitle);
         }
     }
+    getFallbackTitle() {
+        if (this.isPersistentReasoning) {
+            return localize(13994, "Finished thinking");
+        }
+        const visibleItemCount = this.appendedItemCount - this.hiddenToolCallIds.size;
+        if (this.isToolChain) {
+            const tools = this.toolInvocations.filter(tool => !( this.hiddenToolCallIds.has(tool.toolCallId)) && !IChatToolInvocation.isEffectivelyHidden(tool));
+            const summary = getToolGroupSummary(tools, [...( this.editResourcesByPartId.values())], visibleItemCount, this.uriIdentityService.extUri);
+            if (summary) {
+                return summary;
+            }
+        }
+        return visibleItemCount > 0 ? visibleItemCount === 1 ? ( localize(13995, "Finished with 1 step")) : ( localize(13996, "Finished with {0} steps", visibleItemCount)) : ( localize(13997, "Finished Working"));
+    }
     setFallbackTitle() {
-        const finalLabel = this.appendedItemCount > 0 ? this.appendedItemCount === 1 ? ( localize(11749, "Finished with 1 step")) : ( localize(11750, "Finished with {0} steps", this.appendedItemCount)) : ( localize(11751, "Finished Working"));
+        const finalLabel = this.getFallbackTitle();
         this.currentTitle = finalLabel;
+        this.fallbackTitle = finalLabel;
         if (this.wrapper) {
             this.wrapper.classList.remove("chat-thinking-streaming");
         }
@@ -1497,7 +1689,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this.streamingCompleted = true;
         this.flushPendingExternalResources();
         if (this._collapseButton) {
-            this._collapseButton.icon = Codicon.checkCompact;
+            this._collapseButton.icon = this.getThinkingIcon(false, this.isExpanded());
             this.setFinalizedTitle(finalLabel);
         }
         this.updateDropdownClickability();
@@ -1507,7 +1699,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         toolInvocationId,
         toolInvocationOrMarkdown,
         originalParent,
-        onDidChangeDiff,
+        diffSource,
         eagerDisposable
     ) {
         this.processPendingRemovals();
@@ -1515,19 +1707,27 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this.trackToolMetadata(toolInvocationId, toolInvocationOrMarkdown);
         this.updateWorkingSpinnerVisibility();
         this.appendedItemCount++;
-        if (onDidChangeDiff && toolInvocationId) {
-            this.diffDataByPartId.set(toolInvocationId, {
+        if (diffSource && toolInvocationId) {
+            this.diffDataByPartId.set(toolInvocationId, diffSource.diffData ?? {
                 added: 0,
                 removed: 0,
                 resources: []
             });
-            this._register(onDidChangeDiff(data => {
+            this._register(diffSource.onDidChangeDiff(data => {
                 this.diffDataByPartId.set(toolInvocationId, data);
                 this.updateAggregatedDiff();
             }));
+            if (diffSource.diffData) {
+                this.updateAggregatedDiff();
+            }
         }
+        const toolCallId = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized") ? toolInvocationOrMarkdown.toolCallId : undefined;
         if (eagerDisposable) {
-            this._register(eagerDisposable);
+            if (toolCallId) {
+                this.ownedToolParts.set(toolCallId, eagerDisposable);
+            } else {
+                this._register(eagerDisposable);
+            }
         }
         if (this.workingSpinnerLabel) {
             const isTerminalTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized") && toolInvocationOrMarkdown.toolSpecificData?.kind === "terminal";
@@ -1536,9 +1736,14 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         }
         if (this.isExpanded() || this.hasExpandedOnce || (this.fixedScrollingMode && !this.streamingCompleted)) {
             const result = factory();
-            this.appendItemToDOM(result.domNode, toolInvocationId, toolInvocationOrMarkdown, originalParent);
+            this.appendItemToDOM(
+                result.domNode,
+                toolInvocationId,
+                toolInvocationOrMarkdown,
+                originalParent,
+                result.isVisible
+            );
             if (result.disposable) {
-                const toolCallId = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized") ? toolInvocationOrMarkdown.toolCallId : undefined;
                 if (toolCallId) {
                     this.ownedToolParts.set(toolCallId, result.disposable);
                 } else {
@@ -1561,6 +1766,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
     removeMaterializedItem(toolCallId) {
         this.toolDisposables.deleteAndDispose(toolCallId);
         this.ownedToolParts.delete(toolCallId);
+        this.hiddenToolCallIds.delete(toolCallId);
         const wrapper = this.toolWrappersByCallId.get(toolCallId);
         if (wrapper) {
             this.toolWrappersByCallId.delete(toolCallId);
@@ -1588,8 +1794,14 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this.updateDropdownClickability();
         this._onDidChangeHeight.fire();
     }
+    detachToolPart(toolCallId) {
+        const part = this.ownedToolParts.get(toolCallId);
+        this.ownedToolParts.delete(toolCallId);
+        return part;
+    }
     removeEditPillByPartId(partId) {
         let removed = false;
+        this.editResourcesByPartId.delete(partId);
         const lazyIndex = this.lazyItems.findIndex(item => item.kind === "tool" && item.toolInvocationId === partId);
         if (lazyIndex !== -1) {
             this.lazyItems.splice(lazyIndex, 1);
@@ -1611,6 +1823,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
             return false;
         }
         const removedItem = this.lazyItems[index];
+        this.editResourcesByPartId.delete(toolInvocationId);
         this.lazyItems.splice(index, 1);
         this.appendedItemCount--;
         if (removedItem.kind === "tool" && removedItem.isHook) {
@@ -1621,6 +1834,8 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         if (removedItem.kind === "tool" && removedItem.toolInvocationOrMarkdown && (removedItem.toolInvocationOrMarkdown.kind === "toolInvocation" || removedItem.toolInvocationOrMarkdown.kind === "toolInvocationSerialized")) {
             removedItem.toolInvocationOrMarkdown.isAttachedToThinking = false;
             const toolCallId = removedItem.toolInvocationOrMarkdown.toolCallId;
+            this.toolDisposables.deleteAndDispose(toolCallId);
+            this.hiddenToolCallIds.delete(toolCallId);
             this._pendingExternalResources.delete(toolCallId);
             this._externalResourceWidget.removeToolInvocation(toolCallId);
             const label = this.toolLabelsByCallId.get(toolCallId);
@@ -1670,6 +1885,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this.toolDisposables.deleteAndDispose(toolCallId);
         this.ownedToolParts.get(toolCallId)?.dispose();
         this.ownedToolParts.delete(toolCallId);
+        this.hiddenToolCallIds.delete(toolCallId);
         const wrapper = this.toolWrappersByCallId.get(toolCallId);
         if (wrapper) {
             wrapper.remove();
@@ -1725,7 +1941,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
             const invocationMessage = toolInvocationOrMarkdown.invocationMessage;
             const isStreamingEditTool = toolInvocationOrMarkdown.kind === "toolInvocation" && IChatToolInvocation.isStreaming(toolInvocationOrMarkdown) && isGenericEditToolId(toolInvocationOrMarkdown.toolId);
             if (isStreamingEditTool) {
-                toolCallTitle = ( localize(11752, "Editing files"));
+                toolCallTitle = ( localize(13998, "Editing files"));
             } else {
                 toolCallTitle = invocationMessage;
             }
@@ -1770,7 +1986,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
                         toolCallTitle = updatedTitle;
                         this.toolLabelsByCallId.set(toolCallId, updatedMessage);
                         this.lastExtractedTitle = updatedMessage;
-                        if (!this.fixedScrollingMode && !this._isExpanded.read(undefined)) {
+                        if (!this.fixedScrollingMode && !this._isExpanded.read(undefined) && (!this.isToolChain || !this.streamingCompleted)) {
                             this.setTitle(updatedTitle);
                         }
                     }
@@ -1783,13 +1999,12 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
                     this.updateWorkingSpinnerVisibility(reader);
                     if (isStreaming && currentState.type !== IChatToolInvocation.StateKind.Streaming) {
                         isStreaming = false;
-                        const termData = toolInvocationOrMarkdown.toolSpecificData;
-                        if (termData?.kind === "terminal") {
-                            const iconEl = this.toolIconsByCallId.get(toolCallId);
-                            if (iconEl) {
-                                const newIcon = termData.commandLine?.isSandboxWrapped ? Codicon.terminalSecure : Codicon.terminal;
-                                setThinkingIcon(iconEl, newIcon);
-                            }
+                        const iconElement = this.toolIconsByCallId.get(toolCallId);
+                        if (iconElement) {
+                            setThinkingIcon(
+                                iconElement,
+                                getToolInvocationIcon(toolInvocationOrMarkdown.toolId, toolInvocationOrMarkdown)
+                            );
                         }
                         if (toolInvocationOrMarkdown.presentation === "hidden") {
                             this.pendingRemovals.push({
@@ -1814,11 +2029,16 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
                             const completedMessage = toolInvocationOrMarkdown.pastTenseMessage ?? toolInvocationOrMarkdown.invocationMessage;
                             const completedText = typeof completedMessage === "string" ? completedMessage : completedMessage.value;
                             const iconElement = this.toolIconsByCallId.get(toolCallId);
-                            if (iconElement && isNoProblemsFoundResult(toolInvocationOrMarkdown.toolId, completedText)) {
-                                setThinkingIcon(iconElement, Codicon.search);
+                            if (iconElement) {
+                                setThinkingIcon(
+                                    iconElement,
+                                    hasToolInvocationError(toolInvocationOrMarkdown) ? Codicon.error : getToolInvocationIcon(toolInvocationOrMarkdown.toolId, toolInvocationOrMarkdown, completedText)
+                                );
                             }
                         }
                         isComplete = true;
+                        this.updateDropdownClickability();
+                        this._onDidChangeHeight.fire();
                         return;
                     }
                     if (currentState.type === IChatToolInvocation.StateKind.Streaming) {
@@ -1850,27 +2070,32 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
             }
         } else if (toolInvocationOrMarkdown?.kind === "markdownContent") {
             const codeblockInfo = extractCodeblockUrisFromText(toolInvocationOrMarkdown.content.value);
+            const resources = extractEditCodeblockUrisFromText(toolInvocationOrMarkdown.content.value);
+            if (resources.length > 0) {
+                this.editResourcesByPartId.set(toolInvocationId, resources);
+            }
             if (codeblockInfo?.uri) {
                 const filename = basename(codeblockInfo.uri);
-                toolCallLabel = ( localize(11753, "Edited {0}", filename));
+                toolCallLabel = ( localize(13999, "Edited {0}", filename));
             } else {
-                toolCallLabel = ( localize(11754, "Edited file"));
+                toolCallLabel = ( localize(14000, "Edited file"));
             }
             toolCallTitle = toolCallLabel;
         } else if (toolInvocationOrMarkdown?.kind === "externalEdit") {
+            this.editResourcesByPartId.set(toolInvocationId, [toolInvocationOrMarkdown.uri]);
             const filename = basename(toolInvocationOrMarkdown.uri);
             switch (toolInvocationOrMarkdown.editKind) {
             case "create":
-                toolCallLabel = ( localize(11755, "Created {0}", filename));
+                toolCallLabel = ( localize(14001, "Created {0}", filename));
                 break;
             case "delete":
-                toolCallLabel = ( localize(11756, "Deleted {0}", filename));
+                toolCallLabel = ( localize(14002, "Deleted {0}", filename));
                 break;
             case "rename":
-                toolCallLabel = ( localize(11757, "Renamed {0}", filename));
+                toolCallLabel = ( localize(14003, "Renamed {0}", filename));
                 break;
             case "edit":
-                toolCallLabel = ( localize(11753, "Edited {0}", filename));
+                toolCallLabel = ( localize(13999, "Edited {0}", filename));
                 break;
             }
             toolCallTitle = toolCallLabel;
@@ -1900,7 +2125,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         }
         const parts = extractedImages.map(image => ({
             kind: "data",
-            value: image.data.buffer,
+            value: image.data?.buffer,
             mimeType: image.mimeType,
             uri: image.uri
         }));
@@ -1916,42 +2141,40 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
             this.updateExternalResourceParts(toolInvocation);
         }
     }
-    appendItemToDOM(content, toolInvocationId, toolInvocationOrMarkdown, originalParent) {
-        if (!content.hasChildNodes() || content.textContent?.trim() === "") {
+    appendItemToDOM(
+        content,
+        toolInvocationId,
+        toolInvocationOrMarkdown,
+        originalParent,
+        isVisible
+    ) {
+        if (!isVisible && (!content.hasChildNodes() || content.textContent?.trim() === "")) {
             return;
         }
         const itemWrapper = $(".chat-thinking-tool-wrapper");
         const isMarkdownEdit = toolInvocationOrMarkdown?.kind === "markdownContent";
         const isExternalEdit = toolInvocationOrMarkdown?.kind === "externalEdit";
-        const isTerminalTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized") && toolInvocationOrMarkdown.toolSpecificData?.kind === "terminal";
-        const isSearchTool = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized") && toolInvocationOrMarkdown.toolSpecificData?.kind === "search";
-        const toolInvocationIcon = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized") ? toolInvocationOrMarkdown.icon : undefined;
+        const isToolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized");
         let icon;
-        if (isNoProblemsFoundResult(toolInvocationId, content.textContent ?? undefined)) {
-            icon = Codicon.search;
+        if (isToolInvocation) {
+            icon = hasToolInvocationError(toolInvocationOrMarkdown) ? Codicon.error : getToolInvocationIcon(
+                toolInvocationOrMarkdown.toolId,
+                toolInvocationOrMarkdown,
+                content.textContent ?? undefined
+            );
         } else if (isMarkdownEdit || isExternalEdit) {
-            icon = Codicon.pencil;
-        } else if (isSearchTool) {
-            icon = Codicon.search;
-        } else if (isTerminalTool) {
-            const terminalData = toolInvocationOrMarkdown.toolSpecificData;
-            const exitCode = terminalData?.terminalCommandState?.exitCode;
-            const isSandboxWrapped = terminalData?.commandLine?.isSandboxWrapped;
-            if (exitCode !== undefined && exitCode !== 0) {
-                icon = Codicon.error;
-            } else if (isSandboxWrapped) {
-                icon = Codicon.terminalSecure;
-            } else {
-                icon = toolInvocationIcon ?? Codicon.terminal;
-            }
+            icon = getToolInvocationIcon("edit");
         } else if (content.classList.contains("chat-hook-outcome-blocked")) {
             icon = Codicon.error;
         } else if (content.classList.contains("chat-hook-outcome-warning")) {
             icon = Codicon.warning;
         } else {
-            icon = toolInvocationId ? getToolInvocationIcon(toolInvocationId, toolInvocationIcon, content.textContent ?? undefined) : Codicon.tools;
+            icon = toolInvocationId ? getToolInvocationIcon(toolInvocationId, undefined, content.textContent ?? undefined) : Codicon.tools;
         }
         const iconElement = createThinkingIcon(icon);
+        if (this.isToolChain) {
+            iconElement.setAttribute("aria-hidden", "true");
+        }
         itemWrapper.appendChild(iconElement);
         itemWrapper.appendChild(content);
         if (this.toolInvocationCount === 1 && this.hookCount === 0 && originalParent) {
@@ -1967,10 +2190,27 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         } else {
             this.singleItemInfo = undefined;
         }
-        const isToolInvocation = toolInvocationOrMarkdown && (toolInvocationOrMarkdown.kind === "toolInvocation" || toolInvocationOrMarkdown.kind === "toolInvocationSerialized");
         if (isToolInvocation && toolInvocationOrMarkdown.toolCallId) {
             this.toolWrappersByCallId.set(toolInvocationOrMarkdown.toolCallId, itemWrapper);
             this.toolIconsByCallId.set(toolInvocationOrMarkdown.toolCallId, iconElement);
+            if (isVisible) {
+                let toolStore = this.toolDisposables.get(toolInvocationOrMarkdown.toolCallId);
+                if (!toolStore) {
+                    toolStore = ( new DisposableStore());
+                    this.toolDisposables.set(toolInvocationOrMarkdown.toolCallId, toolStore);
+                }
+                toolStore.add(autorun(reader => {
+                    const visible = isVisible.read(reader);
+                    setVisibility(visible, itemWrapper);
+                    if (visible) {
+                        this.hiddenToolCallIds.delete(toolInvocationOrMarkdown.toolCallId);
+                    } else {
+                        this.hiddenToolCallIds.add(toolInvocationOrMarkdown.toolCallId);
+                    }
+                    this.updateDropdownClickability();
+                    this._onDidChangeHeight.fire();
+                }));
+            }
         }
         this.appendToWrapper(itemWrapper);
         if (this.fixedScrollingMode && this.scrollableElement) {
@@ -2024,7 +2264,8 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
                     result.domNode,
                     item.toolInvocationId,
                     item.toolInvocationOrMarkdown,
-                    item.originalParent
+                    item.originalParent,
+                    result.isVisible
                 );
             }
             return;
@@ -2034,7 +2275,8 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
             result.domNode,
             item.toolInvocationId,
             item.toolInvocationOrMarkdown,
-            item.originalParent
+            item.originalParent,
+            result.isVisible
         );
         if (result.disposable) {
             const toolCallId = item.toolInvocationOrMarkdown && (item.toolInvocationOrMarkdown.kind === "toolInvocation" || item.toolInvocationOrMarkdown.kind === "toolInvocationSerialized") ? item.toolInvocationOrMarkdown.toolCallId : undefined;
@@ -2049,6 +2291,13 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         if (this._store.isDisposed) {
             return;
         }
+        if (this.isPersistentReasoning && !this.textContainer && this.currentThinkingValue) {
+            this.lazyItems.push({
+                kind: "thinking",
+                textContainer: $(".chat-thinking-item.markdown-content"),
+                content: this.content
+            });
+        }
         this.appendedItemCount++;
         this.allThinkingParts.push(content);
         const contentText = extractTextFromPart(content);
@@ -2080,6 +2329,16 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this.updateDropdownClickability();
     }
     setTitle(title, omitPrefix) {
+        if (this.isVerboseToolChain) {
+            return;
+        }
+        if (this.isPersistentReasoning) {
+            if (!this.streamingCompleted && !this.element.isComplete) {
+                this.setShimmerTitle(this.defaultTitle);
+                this.setAriaLabel(this.defaultTitle);
+            }
+            return;
+        }
         const titleValue = getThinkingTitleValue(title);
         if (!titleValue || this.element.isComplete) {
             return;
@@ -2100,12 +2359,12 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         }
         this.lastExtractedTitle = titleValue;
         this.lastRenderedTitle = title;
-        this.currentTitle = ( localize(11758, "{0}: {1}", this.defaultTitle, titleValue));
+        this.currentTitle = ( localize(14004, "{0}: {1}", this.defaultTitle, titleValue));
         if (!this._collapseButton) {
             return;
         }
         const labelElement = this._collapseButton.labelElement;
-        this.setShimmerTitle(( localize(11759, "{0}: ", this.defaultTitle)));
+        this.setShimmerTitle(( localize(14005, "{0}: ", this.defaultTitle)));
         this._titleDetailRendered.clear();
         this._titleFileWidgetStore.clear();
         const markdownTitle = typeof title === "string" ? ( new MarkdownString(title)) : title;
@@ -2144,7 +2403,7 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         previousTitleDetail?.remove();
         this.titleDetailContainer = result.element;
         const renderedTitle = result.element.textContent?.trim() || titleValue;
-        const thinkingLabel = ( localize(11758, "{0}: {1}", this.defaultTitle, renderedTitle));
+        const thinkingLabel = ( localize(14004, "{0}: {1}", this.defaultTitle, renderedTitle));
         this._collapseButton.element.ariaLabel = thinkingLabel;
         this._collapseButton.element.ariaExpanded = String(this.isExpanded());
     }
@@ -2155,12 +2414,15 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         this._titleFileWidgetStore.clear();
     }
     hasSameContent(other, _followingContent, _element) {
-        if (_element.isComplete) {
-            return true;
+        if (this.context.suppressProgressShimmer && (other.kind === "working" || this.isToolChain !== (other.kind !== "thinking"))) {
+            return false;
         }
         if ((other.kind === "toolInvocation" || other.kind === "toolInvocationSerialized") && other.toolSpecificData?.kind === "subagent" && !other.subAgentInvocationId) {
             return false;
         }
+        if (_element.isComplete) {
+            return true;
+        }
         if (other.kind === "toolInvocation" || other.kind === "toolInvocationSerialized" || other.kind === "markdownContent" || other.kind === "hook") {
             return true;
         }
@@ -2182,6 +2444,6 @@ ${this.hookCount > 0 ? `EXAMPLES WITH BLOCKED CONTENT (from hooks):
         super.dispose();
     }
 };
-ChatThinkingContentPart = ChatThinkingContentPart_1 = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IConfigurationService)), ( __param(6, IChatMarkdownAnchorService)), ( __param(7, ILanguageModelsService)), ( __param(8, IHoverService)), ( __param(9, ITelemetryService)), ( __param(10, IStorageService)), ( __param(11, IContextKeyService)), ( __param(12, IEditorService))], ChatThinkingContentPart));
+ChatThinkingContentPart = ChatThinkingContentPart_1 = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IConfigurationService)), ( __param(6, IChatMarkdownAnchorService)), ( __param(7, ILanguageModelsService)), ( __param(8, IHoverService)), ( __param(9, ITelemetryService)), ( __param(10, IStorageService)), ( __param(11, IContextKeyService)), ( __param(12, IUriIdentityService))], ChatThinkingContentPart));
 
-export { ChatThinkingContentPart, buildPhrasePool, createThinkingIcon, defaultThinkingMessages, getEffectiveThinkingDisplayMode, getToolInvocationIcon, maybePickFunWorkingMessage, splitReasoningSummaryRows };
+export { ChatThinkingContentPart, buildPhrasePool, createThinkingIcon, defaultThinkingMessages, getEffectiveThinkingDisplayMode, maybePickFunWorkingMessage, splitReasoningSummaryRows };