@codingame/monaco-vscode-katex-common 26.1.1 → 26.1.2

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

@@ -53,10 +53,10 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
         switch (chatEntitlementService.entitlement) {
         case ChatEntitlement.Pro:
         case ChatEntitlement.ProPlus:
-            primaryButtonLabel = ( localize(5883, "Manage Paid Premium Requests"));
+            primaryButtonLabel = ( localize(5958, "Manage Paid Premium Requests"));
             break;
         case ChatEntitlement.Free:
-            primaryButtonLabel = ( localize(5884, "Upgrade to GitHub Copilot Pro"));
+            primaryButtonLabel = ( localize(5959, "Upgrade to GitHub Copilot Pro"));
             break;
         }
         let hasAddedWaitWarning = false;
@@ -65,7 +65,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 return;
             }
             hasAddedWaitWarning = true;
-            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(5885, "Changes may take a few minutes to take effect."))));
+            append(messageContainer, $(".chat-quota-wait-warning", undefined, ( localize(5960, "Changes may take a few minutes to take effect."))));
         };
         let hasAddedRetryButton = false;
         const addRetryButtonIfNeeded = () => {
@@ -78,7 +78,7 @@ let ChatQuotaExceededPart = class ChatQuotaExceededPart extends Disposable {
                 buttonForeground: asCssVariable(textLinkForeground)
             })));
             retryButton.element.classList.add("chat-quota-error-secondary-button");
-            retryButton.label = ( localize(5886, "Click to Retry"));
+            retryButton.label = ( localize(5961, "Click to Retry"));
             this._register(retryButton.onDidClick(() => {
                 const widget = chatWidgetService.getWidgetBySessionResource(element.sessionResource);
                 if (!widget) {

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

@@ -55,7 +55,7 @@ let ChatCollapsibleListContentPart = class ChatCollapsibleListContentPart extend
         contextMenuService,
         hoverService
     ) {
-        super(labelOverride ?? (data.length > 1 ? ( localize(5887, "Used {0} references", data.length)) : ( localize(5888, "Used {0} reference", 1))), context, hoverMessage, hoverService);
+        super(labelOverride ?? (data.length > 1 ? ( localize(5962, "Used {0} references", data.length)) : ( localize(5963, "Used {0} reference", 1))), context, hoverMessage, hoverService);
         this.data = data;
         this.contentReferencesListPool = contentReferencesListPool;
         this.openerService = openerService;
@@ -209,7 +209,7 @@ let CollapsibleListPool = class CollapsibleListPool extends Disposable {
                         return basename(reference.uri.path);
                     }
                 },
-                getWidgetAriaLabel: () => ( localize(5889, "Collapsible Chat References List"))
+                getWidgetAriaLabel: () => ( localize(5964, "Collapsible Chat References List"))
             },
             dnd: {
                 getDragURI: element => getResourceForElement(element)?.toString() ?? null,
@@ -395,7 +395,7 @@ let CollapsibleListRenderer = class CollapsibleListRenderer {
                     name: settingId
                 }, {
                     icon: Codicon.settingsGear,
-                    title: ( localize(5890, "Open setting '{0}'", settingId)),
+                    title: ( localize(5965, "Open setting '{0}'", settingId)),
                     strikethrough: data.excluded,
                     extraClasses
                 });
@@ -440,7 +440,7 @@ let CollapsibleListRenderer = class CollapsibleListRenderer {
                     templateData.addedSpan.textContent = `+${diffMeta.added}`;
                     templateData.removedSpan.textContent = `-${diffMeta.removed}`;
                     templateData.fileDiffsContainer.setAttribute("aria-label", ( localize(
-                        5891,
+                        5966,
                         "{0} lines added, {1} lines removed",
                         diffMeta.added,
                         diffMeta.removed
@@ -521,7 +521,7 @@ registerAction2(class AddToChatAction extends Action2 {
         super({
             id: AddToChatAction.id,
             title: {
-                ...( localize2(5892, "Add File to Chat"))
+                ...( localize2(5967, "Add File to Chat"))
             },
             f1: false,
             menu: [{
@@ -551,7 +551,7 @@ registerAction2(class OpenChatReferenceLinkAction extends Action2 {
         super({
             id: OpenChatReferenceLinkAction.id,
             title: {
-                ...( localize2(5893, "Copy Link"))
+                ...( localize2(5968, "Copy Link"))
             },
             f1: false,
             menu: [{

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

@@ -6,7 +6,7 @@ import { IChatRendererContent } from "@codingame/monaco-vscode-api/vscode/vs/wor
 import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatContentPart, IChatContentPartRenderContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentParts";
 import { ChatCollapsibleContentPart } from "./chatCollapsibleContentPart.js";
-import { IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatHookPart, IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { CollapsibleListPool } from "./chatReferencesContentPart.js";
 import { EditorPool } from "./chatContentCodePools.js";
 import { CodeBlockModelCollection } from "../../../common/widget/codeBlockModelCollection.js";
@@ -42,6 +42,8 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     private pendingPromptRender;
     private pendingResultText;
     private currentRunningToolMessage;
+    private modelName;
+    private readonly _hoverDisposable;
     private toolsWaitingForConfirmation;
     private userManuallyExpanded;
     private autoExpandedForConfirmation;
@@ -62,6 +64,7 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
     markAsInactive(): void;
     finalizeTitle(): void;
     private updateTitle;
+    private updateHover;
     /**
      * Tracks a tool invocation's state for:
      * 1. Updating the title with the current tool message (persists even after completion)
@@ -96,6 +99,17 @@ export declare class ChatSubagentContentPart extends ChatCollapsibleContentPart
         domNode: HTMLElement;
         disposable?: IDisposable;
     }, _codeblocksPartId: string | undefined, _markdown: IChatMarkdownContent, _originalParent?: HTMLElement): void;
+    /**
+     * Appends a hook item (blocked/warning) to the subagent content part.
+     */
+    appendHookItem(factory: () => {
+        domNode: HTMLElement;
+        disposable?: IDisposable;
+    }, hookPart: IChatHookPart): void;
+    /**
+     * Appends a hook item's DOM node to the wrapper.
+     */
+    private appendHookItemToDOM;
     /**
      * Appends a markdown item's DOM node to the wrapper.
      */

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

@@ -3,6 +3,7 @@ import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { AnimationFrameScheduler, $, DisposableResizeObserver, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { rcut } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -26,19 +27,21 @@ registerCss(chatSubagentContent);
 const MAX_TITLE_LENGTH = 100;
 let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentContentPart extends ChatCollapsibleContentPart {
     static extractSubagentInfo(toolInvocation) {
-        const defaultDescription = ( localize(5894, "Running subagent..."));
+        const defaultDescription = ( localize(5969, "Running subagent..."));
         if (toolInvocation.toolId !== RunSubagentTool.Id) {
             return {
                 description: defaultDescription,
                 agentName: undefined,
-                prompt: undefined
+                prompt: undefined,
+                modelName: undefined
             };
         }
         if (toolInvocation.toolSpecificData?.kind === "subagent") {
             return {
                 description: toolInvocation.toolSpecificData.description ?? defaultDescription,
                 agentName: toolInvocation.toolSpecificData.agentName,
-                prompt: toolInvocation.toolSpecificData.prompt
+                prompt: toolInvocation.toolSpecificData.prompt,
+                modelName: toolInvocation.toolSpecificData.modelName
             };
         }
         if (toolInvocation.kind === "toolInvocation") {
@@ -47,13 +50,15 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             return {
                 description: params?.description ?? defaultDescription,
                 agentName: params?.agentName,
-                prompt: params?.prompt
+                prompt: params?.prompt,
+                modelName: undefined
             };
         }
         return {
             description: defaultDescription,
             agentName: undefined,
-            prompt: undefined
+            prompt: undefined,
+            modelName: undefined
         };
     }
     constructor(
@@ -73,9 +78,10 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         const {
             description,
             agentName,
-            prompt
+            prompt,
+            modelName
         } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
-        const prefix = agentName || ( localize(5895, "Subagent"));
+        const prefix = agentName || ( localize(5970, "Subagent"));
         const initialTitle = `${prefix}: ${description}`;
         super(initialTitle, context, undefined, hoverService);
         this.subAgentInvocationId = subAgentInvocationId;
@@ -93,12 +99,14 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         this.lazyItems = [];
         this.hasExpandedOnce = false;
         this.pendingPromptRender = false;
+        this._hoverDisposable = this._register(( new MutableDisposable()));
         this.toolsWaitingForConfirmation = 0;
         this.userManuallyExpanded = false;
         this.autoExpandedForConfirmation = false;
         this.description = description;
         this.agentName = agentName;
         this.prompt = prompt;
+        this.modelName = modelName;
         this.isInitiallyComplete = this.element.isComplete;
         const node = this.domNode;
         node.classList.add("chat-thinking-box", "chat-thinking-fixed-mode", "chat-subagent-part");
@@ -138,6 +146,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             }
         }));
         this.layoutScheduler = this._register(( new AnimationFrameScheduler(this.domNode, () => this.performLayout())));
+        this.updateHover();
         this.renderPromptSection();
         this.watchToolCompletion(toolInvocation);
     }
@@ -167,7 +176,7 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             return;
         }
         const lines = this.prompt.split("\n");
-        const rawFirstLine = lines[0] || ( localize(5896, "Prompt"));
+        const rawFirstLine = lines[0] || ( localize(5971, "Prompt"));
         const restOfLines = lines.slice(1).join("\n").trim();
         const titleContent = rcut(rawFirstLine, MAX_TITLE_LENGTH);
         const wasTruncated = rawFirstLine.length > MAX_TITLE_LENGTH;
@@ -214,13 +223,21 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         }
     }
     updateTitle() {
-        const prefix = this.agentName || ( localize(5895, "Subagent"));
+        const prefix = this.agentName || ( localize(5970, "Subagent"));
         let finalLabel = `${prefix}: ${this.description}`;
         if (this.currentRunningToolMessage && this.isActive) {
             finalLabel += ` \u2014 ${this.currentRunningToolMessage}`;
         }
         this.setTitleWithWidgets(( new MarkdownString(finalLabel)), this.instantiationService, this.chatMarkdownAnchorService, this.chatContentMarkdownRenderer);
     }
+    updateHover() {
+        if (!this.modelName || !this._collapseButton) {
+            return;
+        }
+        this._hoverDisposable.value = this.hoverService.setupDelayedHover(this._collapseButton.element, {
+            content: ( localize(5972, "Model: {0}", this.modelName))
+        });
+    }
     trackToolState(toolInvocation) {
         if (toolInvocation.kind !== "toolInvocation") {
             return;
@@ -263,17 +280,26 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
                     if (textParts.length > 0) {
                         this.renderResultText(textParts.join("\n"));
                     }
+                    if (toolInvocation.toolSpecificData?.kind === "subagent" && toolInvocation.toolSpecificData.modelName) {
+                        this.modelName = toolInvocation.toolSpecificData.modelName;
+                        this.updateHover();
+                    }
                     this.markAsInactive();
                 } else if (wasStreaming && state.type !== IChatToolInvocation.StateKind.Streaming) {
                     wasStreaming = false;
                     const {
                         description,
                         agentName,
-                        prompt
+                        prompt,
+                        modelName
                     } = ChatSubagentContentPart_1.extractSubagentInfo(toolInvocation);
                     this.description = description;
                     this.agentName = agentName;
                     this.prompt = prompt;
+                    if (modelName) {
+                        this.modelName = modelName;
+                        this.updateHover();
+                    }
                     this.renderPromptSection();
                     this.updateTitle();
                 }
@@ -360,6 +386,44 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             this.lazyItems.push(item);
         }
     }
+    appendHookItem(factory, hookPart) {
+        if (this.isExpanded() || this.hasExpandedOnce) {
+            const result = factory();
+            this.appendHookItemToDOM(result.domNode, hookPart);
+            if (result.disposable) {
+                this._register(result.disposable);
+            }
+        } else {
+            const item = {
+                kind: "hook",
+                lazy: ( new Lazy(factory)),
+                hookPart
+            };
+            this.lazyItems.push(item);
+        }
+    }
+    appendHookItemToDOM(domNode, hookPart) {
+        const itemWrapper = $(".chat-thinking-tool-wrapper");
+        const icon = hookPart.stopReason ? Codicon.error : Codicon.warning;
+        const iconElement = createThinkingIcon(icon);
+        itemWrapper.appendChild(iconElement);
+        itemWrapper.appendChild(domNode);
+        if (!this.hasToolItems) {
+            this.hasToolItems = true;
+            if (this.wrapper) {
+                this.wrapper.style.display = "";
+            }
+        }
+        if (this.wrapper) {
+            if (this.resultContainer) {
+                this.wrapper.insertBefore(itemWrapper, this.resultContainer);
+            } else {
+                this.wrapper.appendChild(itemWrapper);
+            }
+        }
+        this.lastItemWrapper = itemWrapper;
+        this.layoutScheduler.schedule();
+    }
     appendMarkdownItemToDOM(domNode) {
         if (!domNode.hasChildNodes() || domNode.textContent?.trim() === "") {
             return;
@@ -442,6 +506,12 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
             if (result.disposable) {
                 this._register(result.disposable);
             }
+        } else if (item.kind === "hook") {
+            const result = item.lazy.value;
+            this.appendHookItemToDOM(result.domNode, item.hookPart);
+            if (result.disposable) {
+                this._register(result.disposable);
+            }
         }
     }
     materializePendingContent() {
@@ -477,6 +547,9 @@ let ChatSubagentContentPart = ChatSubagentContentPart_1 = class ChatSubagentCont
         if (other.kind === "markdownContent") {
             return true;
         }
+        if (other.kind === "hook" && other.subAgentInvocationId) {
+            return this.subAgentInvocationId === other.subAgentInvocationId;
+        }
         if ((other.kind === "toolInvocation" || other.kind === "toolInvocationSerialized") && (other.subAgentInvocationId || other.toolId === RunSubagentTool.Id)) {
             const otherEffectiveId = other.toolId === RunSubagentTool.Id ? other.toolCallId : other.subAgentInvocationId;
             if (this.subAgentInvocationId && otherEffectiveId) {

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

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

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

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

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

@@ -66,9 +66,9 @@ var WorkingMessageCategory;
     WorkingMessageCategory["Terminal"] = "terminal";
     WorkingMessageCategory["Tool"] = "tool";
 })(WorkingMessageCategory || (WorkingMessageCategory = {}));
-const thinkingMessages = [( localize(5904, "Thinking...")), ( localize(5905, "Reasoning...")), ( localize(5906, "Considering...")), ( localize(5907, "Analyzing...")), ( localize(5908, "Evaluating..."))];
-const terminalMessages = [( localize(5909, "Executing...")), ( localize(5910, "Running...")), ( localize(5911, "Processing..."))];
-const toolMessages = [( localize(5912, "Processing...")), ( localize(5913, "Preparing...")), ( localize(5914, "Loading...")), ( localize(5915, "Analyzing...")), ( localize(5916, "Evaluating..."))];
+const thinkingMessages = [( localize(5980, "Thinking...")), ( localize(5981, "Reasoning...")), ( localize(5982, "Considering...")), ( localize(5983, "Analyzing...")), ( localize(5984, "Evaluating..."))];
+const terminalMessages = [( localize(5985, "Executing...")), ( localize(5986, "Running...")), ( localize(5987, "Processing..."))];
+const toolMessages = [( localize(5988, "Processing...")), ( localize(5989, "Preparing...")), ( localize(5990, "Loading...")), ( localize(5991, "Analyzing...")), ( localize(5992, "Evaluating..."))];
 let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsibleContentPart {
     getRandomWorkingMessage(category = WorkingMessageCategory.Tool) {
         let pool = this.availableMessagesByCategory.get(category);
@@ -111,7 +111,7 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
         this.chatMarkdownAnchorService = chatMarkdownAnchorService;
         this.languageModelsService = languageModelsService;
         this._onDidChangeHeight = this._register(( new Emitter()));
-        this.defaultTitle = ( localize(5917, "Working..."));
+        this.defaultTitle = ( localize(5993, "Working..."));
         this.fixedScrollingMode = false;
         this.autoScrollEnabled = true;
         this.extractedTitles = [];
@@ -138,7 +138,7 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
         if (initialText.trim()) {
             this.appendedItemCount++;
         }
-        alert(( localize(5918, "Thinking")));
+        alert(( localize(5994, "Thinking")));
         if (configuredMode === ThinkingDisplayMode.Collapsed) {
             this.setExpanded(false);
         } else if (configuredMode === ThinkingDisplayMode.CollapsedPreview) {
@@ -581,6 +581,12 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
             - For reasoning/thinking: "Considered", "Planned", "Analyzed", "Reviewed", "Evaluated"
             - Choose the synonym that best fits the context
 
+            PRIORITY RULE - BLOCKED/DENIED CONTENT:
+            - If any item mentions being "blocked" (e.g. "Tried to use X, but was blocked"), it MUST be reflected in the title
+            - Blocked content takes priority over all other tool calls
+            - Use natural phrasing like "Tried to <action>, but was blocked" or "Attempted <tool> but was denied"
+            - If there are both blocked items AND normal tool calls, mention both: e.g. "Tried to run terminal but was blocked, edited file.ts"
+
             RULES FOR TOOL CALLS:
             1. If the SAME file was both edited AND read: Use a combined phrase like "Reviewed and updated <filename>"
             2. If exactly ONE file was edited: Start with an edit synonym + "<filename>" (include actual filename)
@@ -620,6 +626,12 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
             - "Edited Button.tsx, Edited Button.css, Edited index.ts" → "Modified 3 files"
             - "Searched codebase for error handling" → "Looked up error handling"
 
+            EXAMPLES WITH BLOCKED CONTENT:
+            - "Tried to use Run in Terminal, but was blocked" → "Tried to run command, but was blocked"
+            - "Tried to use Run in Terminal, but was blocked, Edited config.ts" → "Tried to run command but was blocked, edited config.ts"
+            - "Tried to use Edit File, but was blocked, Tried to use Run in Terminal, but was blocked" → "Tried to use 2 tools, but was blocked"
+            - "Used Read File, but received a warning, Edited utils.ts" → "Read file with a warning, edited utils.ts"
+
             EXAMPLES WITH REASONING HEADERS (no tools):
             - "Analyzing component architecture" → "Considered component architecture"
             - "Planning refactor strategy" → "Planned refactor strategy"
@@ -704,11 +716,11 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
     }
     setFallbackTitle() {
         const finalLabel = this.appendedItemCount > 0 ? ( localize(
-            5919,
+            5995,
             "Finished with {0} step{1}",
             this.appendedItemCount,
             this.appendedItemCount === 1 ? "" : "s"
-        )) : ( localize(5920, "Finished Working"));
+        )) : ( localize(5996, "Finished Working"));
         this.currentTitle = finalLabel;
         if (this.wrapper) {
             this.wrapper.classList.remove("chat-thinking-streaming");
@@ -895,12 +907,12 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
             const codeblockInfo = extractCodeblockUrisFromText(toolInvocationOrMarkdown.content.value);
             if (codeblockInfo?.uri) {
                 const filename = basename(codeblockInfo.uri);
-                toolCallLabel = ( localize(5921, "Edited {0}", filename));
+                toolCallLabel = ( localize(5997, "Edited {0}", filename));
             } else {
-                toolCallLabel = ( localize(5922, "Edited file"));
+                toolCallLabel = ( localize(5998, "Edited file"));
             }
         } else {
-            toolCallLabel = `Invoked \`${toolInvocationId}\``;
+            toolCallLabel = toolInvocationId;
         }
         if (!this.extractedTitles.includes(toolCallLabel)) {
             this.extractedTitles.push(toolCallLabel);
@@ -933,6 +945,10 @@ let ChatThinkingContentPart = class ChatThinkingContentPart extends ChatCollapsi
             const terminalData = toolInvocationOrMarkdown.toolSpecificData;
             const exitCode = terminalData?.terminalCommandState?.exitCode;
             icon = exitCode !== undefined && exitCode !== 0 ? Codicon.error : Codicon.terminal;
+        } 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) : Codicon.tools;
         }

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

@@ -55,7 +55,7 @@ class TodoListRenderer {
         statusIcon.style.color = this.getStatusIconColor(todo.status);
         iconLabel.setLabel(todo.title);
         const statusText = this.getStatusText(todo.status);
-        const ariaLabel = ( localize(5923, "{0}, {1}", todo.title, statusText));
+        const ariaLabel = ( localize(5999, "{0}, {1}", todo.title, statusText));
         todoElement.setAttribute("aria-label", ariaLabel);
     }
     disposeTemplate(templateData) {
@@ -64,12 +64,12 @@ class TodoListRenderer {
     getStatusText(status) {
         switch (status) {
         case "completed":
-            return localize(5924, "completed");
+            return localize(6000, "completed");
         case "in-progress":
-            return localize(5925, "in progress");
+            return localize(6001, "in progress");
         case "not-started":
         default:
-            return localize(5926, "not started");
+            return localize(6002, "not started");
         }
     }
     getStatusIconClass(status) {
@@ -131,7 +131,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         this.expandIcon.setAttribute("aria-hidden", "true");
         this.titleElement = $(".todo-list-title");
         this.titleElement.id = "todo-list-title";
-        this.titleElement.textContent = ( localize(5927, "Todos"));
+        this.titleElement.textContent = ( localize(6003, "Todos"));
         this.clearButtonContainer = $(".todo-clear-button-container");
         this.createClearButton();
         titleSection.appendChild(this.expandIcon);
@@ -215,9 +215,9 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                     accessibilityProvider: {
                         getAriaLabel: todo => {
                             const statusText = this.getStatusText(todo.status);
-                            return localize(5923, "{0}, {1}", todo.title, statusText);
+                            return localize(5999, "{0}, {1}", todo.title, statusText);
                         },
-                        getWidgetAriaLabel: () => ( localize(5928, "Chat Todo List"))
+                        getWidgetAriaLabel: () => ( localize(6004, "Chat Todo List"))
                     }
                 }
             ));
@@ -268,9 +268,9 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const shouldDisable = isRequestInProgress && hasInProgressTask;
         this.clearButton.enabled = !shouldDisable;
         if (shouldDisable) {
-            this.clearButton.setTitle(( localize(5929, "Cannot clear todos while a task is in progress")));
+            this.clearButton.setTitle(( localize(6005, "Cannot clear todos while a task is in progress")));
         } else {
-            this.clearButton.setTitle(( localize(5930, "Clear all todos")));
+            this.clearButton.setTitle(( localize(6006, "Clear all todos")));
         }
     }
     updateTitleElement(titleElement, todoList) {
@@ -282,12 +282,12 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const notStartedTodos = todoList.filter(todo => todo.status === "not-started");
         const firstNotStartedTodo = notStartedTodos.length > 0 ? notStartedTodos[0] : undefined;
         const currentTaskNumber = inProgressTodos.length > 0 ? completedCount + 1 : Math.max(1, completedCount);
-        const expandButtonLabel = this._isExpanded ? ( localize(5931, "Collapse Todos")) : ( localize(5932, "Expand Todos"));
+        const expandButtonLabel = this._isExpanded ? ( localize(6007, "Collapse Todos")) : ( localize(6008, "Expand Todos"));
         this.expandoButton.element.setAttribute("aria-label", expandButtonLabel);
         this.expandoButton.element.setAttribute("aria-expanded", this._isExpanded ? "true" : "false");
         if (this._isExpanded) {
             const titleText = $("span");
-            titleText.textContent = totalCount > 0 ? ( localize(5933, "Todos ({0}/{1})", currentTaskNumber, totalCount)) : ( localize(5927, "Todos"));
+            titleText.textContent = totalCount > 0 ? ( localize(6009, "Todos ({0}/{1})", currentTaskNumber, totalCount)) : ( localize(6003, "Todos"));
             titleElement.appendChild(titleText);
         } else {
             const todoToShow = firstInProgressTodo || firstNotStartedTodo;
@@ -304,7 +304,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                 icon.style.verticalAlign = "middle";
                 titleElement.appendChild(icon);
                 const todoText = $("span");
-                todoText.textContent = ( localize(5934, "{0} ({1}/{2})", todoToShow.title, currentTaskNumber, totalCount));
+                todoText.textContent = ( localize(6010, "{0} ({1}/{2})", todoToShow.title, currentTaskNumber, totalCount));
                 todoText.style.verticalAlign = "middle";
                 todoText.style.overflow = "hidden";
                 todoText.style.textOverflow = "ellipsis";
@@ -314,7 +314,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
             }
             else if (completedCount > 0 && completedCount === totalCount) {
                 const doneText = $("span");
-                doneText.textContent = ( localize(5933, "Todos ({0}/{1})", totalCount, totalCount));
+                doneText.textContent = ( localize(6009, "Todos ({0}/{1})", totalCount, totalCount));
                 doneText.style.verticalAlign = "middle";
                 titleElement.appendChild(doneText);
             }
@@ -323,12 +323,12 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
     getStatusText(status) {
         switch (status) {
         case "completed":
-            return localize(5924, "completed");
+            return localize(6000, "completed");
         case "in-progress":
-            return localize(5925, "in progress");
+            return localize(6001, "in progress");
         case "not-started":
         default:
-            return localize(5926, "not started");
+            return localize(6002, "not started");
         }
     }
 };

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

@@ -129,13 +129,13 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
             input,
             output
         } = this;
-        contents.inputTitle.textContent = ( localize(5935, "Input"));
+        contents.inputTitle.textContent = ( localize(6011, "Input"));
         this.addCodeBlock(input, contents.input);
         if (!output) {
             contents.output.remove();
             contents.outputTitle.remove();
         } else {
-            contents.outputTitle.textContent = ( localize(5936, "Output"));
+            contents.outputTitle.textContent = ( localize(6012, "Output"));
             const outputSubPart = this._register(
                 this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts)
             );