@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.1

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

@@ -209,23 +209,23 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
     getDropTypeName(type) {
         switch (type) {
         case ChatDragAndDropType.FILE_INTERNAL:
-            return localize(7106, "File");
+            return localize(7399, "File");
         case ChatDragAndDropType.FILE_EXTERNAL:
-            return localize(7106, "File");
+            return localize(7399, "File");
         case ChatDragAndDropType.FOLDER:
-            return localize(7107, "Folder");
+            return localize(7400, "Folder");
         case ChatDragAndDropType.IMAGE:
-            return localize(7108, "Image");
+            return localize(7401, "Image");
         case ChatDragAndDropType.SYMBOL:
-            return localize(7109, "Symbol");
+            return localize(7402, "Symbol");
         case ChatDragAndDropType.MARKER:
-            return localize(7110, "Problem");
+            return localize(7403, "Problem");
         case ChatDragAndDropType.HTML:
-            return localize(7111, "URL");
+            return localize(7404, "URL");
         case ChatDragAndDropType.NOTEBOOK_CELL_OUTPUT:
-            return localize(7112, "Output");
+            return localize(7405, "Output");
         case ChatDragAndDropType.SCM_HISTORY_ITEM:
-            return localize(7113, "Change");
+            return localize(7406, "Change");
         }
     }
     async resolveAttachmentsFromDragEvent(e) {
@@ -297,7 +297,7 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
     async resolveHTMLAttachContext(e) {
         const existingAttachmentNames = ( new Set(( this.attachmentModel.attachments.map(attachment => attachment.name))));
         const createDisplayName = () => {
-            const baseName = ( localize(7114, "Image from URL"));
+            const baseName = ( localize(7407, "Image from URL"));
             let uniqueName = baseName;
             let baseNameInstance = 1;
             while (( existingAttachmentNames.has(uniqueName))) {
@@ -375,7 +375,7 @@ let ChatDragAndDrop = class ChatDragAndDrop extends Themable {
     }
     getOverlayText(type) {
         const typeName = this.getDropTypeName(type);
-        return localize(7115, "Attach {0} as Context", typeName);
+        return localize(7408, "Attach {0} as Context", typeName);
     }
     updateOverlayStyles(overlay) {
         overlay.style.backgroundColor = this.getColor(this.styles.overlayBackground) || "";

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

@@ -257,6 +257,7 @@ export declare class ChatListItemRenderer extends Disposable implements ITreeRen
     private _getCarouselStableKey;
     private _notifyOnQuestionCarousel;
     private renderPlanReview;
+    private getPlanReviewProgressMessage;
     private removeCarouselFromTracking;
     private renderChangesSummary;
     private renderAttachments;

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

@@ -45,7 +45,7 @@ import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatToolInvocation, isCh
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatPlanReviewData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatPlanReviewData';
 import { ChatQuestionCarouselData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData';
-import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { localChatSessionType, isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isResponseVM, isPendingDividerVM, isRequestVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { getNWords } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatWordCounter';
@@ -96,7 +96,7 @@ import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contr
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { AccessibilityWorkbenchSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { isMcpToolInvocation } from './chatContentParts/toolInvocationParts/chatToolPartUtilities.js';
-import { isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -464,7 +464,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const checkpointRestoreContainer = append(rowContainer, $(".checkpoint-restore-container"));
         append(checkpointRestoreContainer, $(".checkpoint-line-left"));
         const label = append(checkpointRestoreContainer, $("span.checkpoint-label-text"));
-        label.textContent = ( localize(7116, "Checkpoint Restored"));
+        label.textContent = ( localize(7409, "Checkpoint Restored"));
         const dot = append(checkpointRestoreContainer, $("span.checkpoint-dot-separator"));
         dot.textContent = "·";
         dot.setAttribute("aria-hidden", "true");
@@ -568,12 +568,14 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 this._onDidFocusOutside.fire();
             }
         }));
-        const resizeObserver = templateDisposables.add(new DisposableResizeObserver(entries => {
-            const entry = entries[0];
-            if (entry) {
-                this.fireItemHeightChange(template, entry.borderBoxSize.at(0)?.blockSize);
-            }
-        }));
+        const resizeObserver = templateDisposables.add(
+            new DisposableResizeObserver("ChatListItemRenderer.itemHeight", entries => {
+                const entry = entries[0];
+                if (entry) {
+                    this.fireItemHeightChange(template, entry.borderBoxSize.at(0)?.blockSize);
+                }
+            })
+        );
         templateDisposables.add(resizeObserver.observe(rowContainer));
         return template;
     }
@@ -837,15 +839,15 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const label = append(dividerContent, $$1("span.pending-divider-label"));
         if (element.dividerKind === ChatRequestQueueKind.Steering) {
             if (element.isSystemInitiated) {
-                label.textContent = ( localize(7117, "System Notification"));
-                label.title = ( localize(7118, "System notification will be sent after the next tool call happens"));
+                label.textContent = ( localize(7410, "System Notification"));
+                label.title = ( localize(7411, "System notification will be sent after the next tool call happens"));
             } else {
-                label.textContent = ( localize(7119, "Steering"));
-                label.title = ( localize(7120, "Steering message will be sent after the next tool call happens"));
+                label.textContent = ( localize(7412, "Steering"));
+                label.title = ( localize(7413, "Steering message will be sent after the next tool call happens"));
             }
         } else {
-            label.textContent = ( localize(7121, "Queued"));
-            label.title = ( localize(7122, "Queued messages will be sent after the current request completes"));
+            label.textContent = ( localize(7414, "Queued"));
+            label.title = ( localize(7415, "Queued messages will be sent after the current request completes"));
         }
         templateData.value.appendChild(dividerContent);
     }
@@ -853,10 +855,10 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         clearNode(templateData.detail);
         if (element.agentOrSlashCommandDetected) {
             const msg = element.slashCommand ? ( localize(
-                7123,
+                7416,
                 "used {0} [[(rerun without)]]",
                 `${chatSubcommandLeader}${element.slashCommand.name}`
-            )) : ( localize(7124, "[[(rerun without)]]"));
+            )) : ( localize(7417, "[[(rerun without)]]"));
             reset(templateData.detail, renderFormattedText(msg, {
                 actionHandler: {
                     disposables: templateData.elementDisposables,
@@ -869,7 +871,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             this.delegate.currentChatMode(),
             this.rendererOptions.progressMessageAtBottomOfResponse
         )) {
-            templateData.detail.textContent = ( localize(7125, "Working"));
+            templateData.detail.textContent = ( localize(7418, "Working"));
         }
     }
     renderConfirmationAction(element, templateData) {
@@ -878,7 +880,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             append(templateData.detail, $("span.codicon.codicon-check", {
                 "aria-hidden": "true"
             }));
-            append(templateData.detail, $("span.confirmation-text", undefined, ( localize(7126, "Selected \"{0}\"", element.confirmation))));
+            append(templateData.detail, $("span.confirmation-text", undefined, ( localize(7419, "Selected \"{0}\"", element.confirmation))));
             templateData.header?.classList.remove("header-disabled");
             templateData.header?.classList.add("partially-disabled");
         }
@@ -967,7 +969,10 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === "minimal") {
             return undefined;
         }
-        const showProgressDetails = this.configService.getValue(ChatConfiguration.ChatPersistentProgressEnabled) !== false;
+        if (( partsToRender.some(part => part.kind === "planReview" && !part.isUsed))) {
+            return undefined;
+        }
+        const showProgressDetails = this.configService.getValue(ChatConfiguration.ChatPersistentProgressEnabled) !== false && (this.configService.getValue(ChatConfiguration.ProgressBorder) !== true || this.accessibilityService.isMotionReduced());
         if (element.isComplete) {
             return undefined;
         }
@@ -1042,8 +1047,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             if (lastPart.isAttachedToThinking) {
                 return undefined;
             }
+            const isEffectivelyHiddenToolInvocation = IChatToolInvocation.isEffectivelyHidden(lastPart);
             const collapsedToolsMode = this.configService.getValue("chat.agent.thinking.collapsedTools");
-            if (collapsedToolsMode !== CollapsedToolsDisplayMode.Off && this.shouldPinPart(lastPart, isResponseVM(element) ? element : undefined)) {
+            if (!isEffectivelyHiddenToolInvocation && collapsedToolsMode !== CollapsedToolsDisplayMode.Off && this.shouldPinPart(lastPart, isResponseVM(element) ? element : undefined)) {
                 return undefined;
             }
         }
@@ -1074,7 +1080,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }).length;
     }
     getConfirmationPendingLabel(count) {
-        return count === 1 ? ( localize(7127, "1 confirmation pending")) : ( localize(7128, "{0} confirmations pending", count));
+        return count === 1 ? ( localize(7420, "1 confirmation pending")) : ( localize(7421, "{0} confirmations pending", count));
     }
     removeWorkingProgressContentPart(templateData) {
         const renderedParts = templateData.renderedParts;
@@ -1097,7 +1103,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (!isResponseVM(element)) {
             return;
         }
-        if (element.isComplete && this.configService.getValue(ChatConfiguration.ChatPersistentProgressEnabled) !== false) {
+        if (element.isComplete && this.configService.getValue(ChatConfiguration.ChatPersistentProgressEnabled) !== false && (this.configService.getValue(ChatConfiguration.ProgressBorder) !== true || this.accessibilityService.isMotionReduced())) {
             return;
         }
         const pendingConfirmationCount = this.getPendingToolConfirmationCount(element.response.value, false);
@@ -1657,7 +1663,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         const isTerminalTool = (part.kind === "toolInvocation" || part.kind === "toolInvocationSerialized") && part.toolSpecificData?.kind === "terminal";
         const isContributedTerminalToolInvocation =
-        element && (element.sessionResource.scheme !== Schemas.vscodeChatInput && element.sessionResource.scheme !== Schemas.vscodeLocalChatSession) && part.kind === "toolInvocationSerialized" && part.toolSpecificData?.kind === "terminal";
+        element && (element.sessionResource.scheme !== Schemas.vscodeChatInput && getChatSessionType(element.sessionResource) !== localChatSessionType) && part.kind === "toolInvocationSerialized" && part.toolSpecificData?.kind === "terminal";
         if (isTerminalTool && !isContributedTerminalToolInvocation) {
             if (part.kind === "toolInvocation" && IChatToolInvocation.getConfirmationMessages(part)) {
                 return false;
@@ -1890,6 +1896,14 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     content,
                     this.chatContentMarkdownRenderer
                 );
+            } else if (content.kind === "info") {
+                return this.instantiationService.createInstance(
+                    ChatErrorContentPart,
+                    ChatErrorLevel.Info,
+                    content.content,
+                    content,
+                    this.chatContentMarkdownRenderer
+                );
             } else if (content.kind === "hook") {
                 return this.renderHookPart(content, context, templateData);
             } else if (content.kind === "markdownContent") {
@@ -1916,7 +1930,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             } else if (content.kind === "questionCarousel") {
                 return this.renderQuestionCarousel(context, content, templateData);
             } else if (content.kind === "planReview") {
-                return this.renderPlanReview(context, content);
+                return this.renderPlanReview(context, content, templateData);
             } else if (content.kind === "changesSummary") {
                 return this.renderChangesSummary(content, context, templateData);
             } else if (content.kind === "mcpServersStarting") {
@@ -1940,7 +1954,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 "ChatListItemRenderer#renderChatContentPart: error rendering content",
                 toErrorMessage(err, true)
             );
-            const errorPart = this.instantiationService.createInstance(ChatErrorContentPart, ChatErrorLevel.Error, ( new MarkdownString(( localize(7129, "Failed to render content")) + `: ${toErrorMessage(err, false)}`)), content, this.chatContentMarkdownRenderer);
+            const errorPart = this.instantiationService.createInstance(ChatErrorContentPart, ChatErrorLevel.Error, ( new MarkdownString(( localize(7422, "Failed to render content")) + `: ${toErrorMessage(err, false)}`)), content, this.chatContentMarkdownRenderer);
             return {
                 dispose: () => errorPart.dispose(),
                 domNode: errorPart.domNode,
@@ -2066,7 +2080,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         });
     }
     renderToolInvocation(toolInvocation, context, templateData) {
-        if (IChatToolInvocation.isComplete(toolInvocation)) {
+        if (IChatToolInvocation.isComplete(toolInvocation) && IChatToolInvocation.isEffectivelyHidden(toolInvocation)) {
             const msg = toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage;
             const text = typeof msg === "string" ? msg : msg?.value;
             if (!text || text.trim().length === 0) {
@@ -2317,7 +2331,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         }
         const shouldPinToThinking = hookPart.hookType === HookType.PreToolUse || hookPart.hookType === HookType.PostToolUse;
         if (shouldPinToThinking) {
-            const hookTitle = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(7130, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(7131, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(7132, "Used {0}, but received a warning", hookPart.toolDisplayName)) : ( localize(7133, "Tool call received a warning")));
+            const hookTitle = hookPart.stopReason ? (hookPart.toolDisplayName ? ( localize(7423, "Blocked {0}", hookPart.toolDisplayName)) : ( localize(7424, "Blocked by hook"))) : (hookPart.toolDisplayName ? ( localize(7425, "Used {0}, but received a warning", hookPart.toolDisplayName)) : ( localize(7426, "Tool call received a warning")));
             let thinkingPart = this.getLastThinkingPart(templateData.renderedParts);
             if (!thinkingPart) {
                 const newThinking = this.renderThinkingPart({
@@ -2392,6 +2406,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const widget = isResponseVM(context.element) ? this.chatWidgetService.getWidgetBySessionResource(context.element.sessionResource) : undefined;
         const shouldAutoFocus = widget ? widget.getInput() === "" : true;
         const responseId = isResponseVM(context.element) ? context.element.requestId : undefined;
+        const carouselKey = carousel.resolveId ?? `${responseId ?? ""}_${context.contentIndex}`;
         const handleSubmit = async (answers, part) => {
             const answersRecord = answers ? Object.fromEntries(answers) : undefined;
             carousel.data = answersRecord ?? {};
@@ -2407,7 +2422,6 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 this.chatService.notifyQuestionCarouselAnswer(context.element.requestId, carousel.resolveId, answersRecord);
             }
             this.removeCarouselFromTracking(context, part);
-            const carouselKey = carousel.resolveId ?? `${responseId}_${context.contentIndex}`;
             widget?.input.clearQuestionCarousel(undefined, carouselKey);
         };
         const responseIsComplete = isResponseVM(context.element) && context.element.isComplete;
@@ -2426,8 +2440,12 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 this.chatService.notifyQuestionCarouselAnswer(context.element.requestId, carousel.resolveId, undefined);
                 this.pendingQuestionCarousels.get(context.element.sessionResource)?.clear();
             }
-            if (responseIsComplete && inputPartHasCarousel && responseId) {
-                widget?.input.clearQuestionCarousel(responseId);
+            if (inputPartHasCarousel) {
+                if (carousel.isUsed) {
+                    widget?.input.clearQuestionCarousel(undefined, carouselKey);
+                } else if (responseIsComplete && responseId) {
+                    widget?.input.clearQuestionCarousel(responseId);
+                }
             }
             const part = this.instantiationService.createInstance(ChatQuestionCarouselPart, carousel, context, {
                 shouldAutoFocus: false,
@@ -2490,10 +2508,10 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             return;
         }
         const questionCount = carousel.questions.length;
-        const question = carousel.questions.length > 0 && carousel.questions[0].message ? carousel.questions[0].message : ( localize(7134, "Chat input required."));
+        const question = carousel.questions.length > 0 && carousel.questions[0].message ? carousel.questions[0].message : ( localize(7427, "Chat input required."));
         const stringQuestion = typeof question === "string" ? question : question.value;
-        const alertMessage = questionCount === 1 ? ( localize(7135, "Chat input required (1 question): {0}", stringQuestion)) : ( localize(
-            7136,
+        const alertMessage = questionCount === 1 ? ( localize(7428, "Chat input required (1 question): {0}", stringQuestion)) : ( localize(
+            7429,
             "Chat input required ({0} questions): {1}",
             questionCount,
             stringQuestion
@@ -2502,16 +2520,17 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (stableKey) {
             this._notifiedQuestionCarousels.add(stableKey);
         }
-        const signalMessage = questionCount === 1 ? ( localize(7137, "Chat needs your input (1 question).")) : ( localize(7138, "Chat needs your input ({0} questions).", questionCount));
+        const signalMessage = questionCount === 1 ? ( localize(7430, "Chat needs your input (1 question).")) : ( localize(7431, "Chat needs your input ({0} questions).", questionCount));
         this.accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, {
             allowManyInParallel: true,
             customAlertMessage: signalMessage
         });
     }
-    renderPlanReview(context, review) {
+    renderPlanReview(context, review, templateData) {
         const widget = isResponseVM(context.element) ? this.chatWidgetService.getWidgetBySessionResource(context.element.sessionResource) : undefined;
         const responseId = isResponseVM(context.element) ? context.element.requestId : undefined;
         const reviewKey = review.resolveId ?? `${responseId ?? ""}_${context.contentIndex}`;
+        this.finalizeCurrentThinkingPart(context, templateData);
         const handleSubmit = result => {
             review.data = result;
             review.isUsed = true;
@@ -2521,17 +2540,62 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             widget?.input.clearPlanReview(undefined, reviewKey);
         };
         const responseIsComplete = isResponseVM(context.element) && context.element.isComplete;
-        if (review.isUsed || responseIsComplete) {
-            if (responseIsComplete && !review.isUsed) {
-                review.isUsed = true;
-                if (review instanceof ChatPlanReviewData) {
-                    review.completion.complete(undefined);
-                }
-                if (responseId) {
-                    widget?.input.clearPlanReview(responseId);
-                }
+        if (responseIsComplete && !review.isUsed) {
+            review.isUsed = true;
+            if (review instanceof ChatPlanReviewData) {
+                review.completion.complete(undefined);
+            }
+        }
+        if (responseIsComplete && responseId) {
+            widget?.input.clearPlanReview(responseId);
+        }
+        const renderProgress = () => {
+            const message = this.getPlanReviewProgressMessage(review);
+            if (!message) {
+                return this.renderNoContent(other => other.kind === "planReview");
+            }
+            const renderedAsUsed = !!review.isUsed;
+            const isPending = !renderedAsUsed;
+            const data = renderedAsUsed && !review.data?.rejected ? review.data : undefined;
+            let overall = data?.feedbackOverall?.trim();
+            const inlineMd = data?.feedbackInlineMarkdown?.trim();
+            if (!overall && !inlineMd && data?.feedback) {
+                overall = data.feedback.trim();
+            }
+            const content = ( new MarkdownString(undefined, {
+                supportThemeIcons: true
+            }));
+            if (overall) {
+                content.appendText(( localize(7432, "{0}: {1}", message, overall.replace(/\s+/g, " "))));
+            } else {
+                content.appendText(message);
+            }
+            if (inlineMd) {
+                content.appendMarkdown("\n\n");
+                content.appendMarkdown(inlineMd);
             }
-            return this.renderNoContent(other => other.kind === "planReview");
+            const progressPart = this.instantiationService.createInstance(ChatProgressContentPart, {
+                content
+            }, this.chatContentMarkdownRenderer, context,  isPending,  true,  isPending ? undefined : Codicon.check, undefined,  isPending);
+            return {
+                domNode: progressPart.domNode,
+                dispose: () => progressPart.dispose(),
+                hasSameContent: (other, _followingContent, _element) => {
+                    if (other.kind !== "planReview") {
+                        return false;
+                    }
+                    if (!!review.isUsed !== renderedAsUsed) {
+                        return false;
+                    }
+                    if (review.resolveId && other.resolveId) {
+                        return review.resolveId === other.resolveId;
+                    }
+                    return other === review;
+                }
+            };
+        };
+        if (review.isUsed) {
+            return renderProgress();
         }
         const isEditing = !!this.viewModel?.editing;
         const dockedPart = isEditing ? undefined : widget?.input.renderPlanReview(review, context, {
@@ -2543,18 +2607,27 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             });
             return fallbackPart;
         }
-        return this.renderNoContent((other, _followingContent, element) => {
-            if (review.isUsed || (isResponseVM(element) && element.isComplete)) {
-                return false;
-            }
-            if (other.kind === "planReview") {
-                if (review.resolveId && other.resolveId) {
-                    return review.resolveId === other.resolveId;
-                }
-                return other === review;
-            }
-            return false;
-        });
+        return renderProgress();
+    }
+    getPlanReviewProgressMessage(review) {
+        if (!review.isUsed) {
+            return localize(7433, "Plan review required");
+        }
+        const result = review.data;
+        if (!result) {
+            return undefined;
+        }
+        if (result.rejected) {
+            return localize(7434, "Rejected plan");
+        }
+        if (result.feedback) {
+            return localize(7435, "Provided feedback");
+        }
+        const action = review.actions.find(a => a.label === result.action);
+        if (action?.permissionLevel === "autopilot") {
+            return localize(7436, "Started implementation with Autopilot");
+        }
+        return localize(7437, "Approved plan");
     }
     removeCarouselFromTracking(context, part) {
         if (isResponseVM(context.element)) {
@@ -2641,7 +2714,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                     })
                 );
                 markdownPart.addDisposable(
-                    this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), markdownPart.domNode, ( localize(7139, "Click to Edit")), {
+                    this.hoverService.setupManagedHover(getDefaultHoverDelegate("element"), markdownPart.domNode, ( localize(7438, "Click to Edit")), {
                         trapFocus: true
                     })
                 );

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

@@ -4,6 +4,7 @@ import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
@@ -18,7 +19,6 @@ import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
 import { IChatLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service";
 import { IChatModel, IChatModelInputState, IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
-import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
 import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes";
 import { IChatLocationData, IChatSendRequestOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
@@ -39,6 +39,7 @@ import { ChatInputPart, IChatInputStyles } from "./input/chatInputPart.js";
 import { IChatTipService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatTipService.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IChatDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service";
+import { ICustomizationHarnessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationHarnessService.service";
 export interface IChatWidgetStyles extends IChatInputStyles {
     readonly inputEditorBackground: string;
     readonly resultEditorBackground: string;
@@ -77,8 +78,8 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private readonly chatSlashCommandService;
     private readonly telemetryService;
     private readonly promptsService;
+    private readonly customizationHarnessService;
     private readonly toolsService;
-    private readonly chatModeService;
     private readonly chatLayoutService;
     private readonly chatEntitlementService;
     private readonly chatSessionsService;
@@ -88,6 +89,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private readonly chatAttachmentResolveService;
     private readonly chatTipService;
     private readonly chatDebugService;
+    private readonly accessibilityService;
     static readonly CONTRIBS: {
         new (...args: [
             IChatWidget,
@@ -180,7 +182,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     readonly viewContext: IChatWidgetViewContext;
     get supportsChangingModes(): boolean;
     get locationData(): IChatLocationData | undefined;
-    constructor(location: ChatAgentLocation | IChatWidgetLocationOptions, viewContext: IChatWidgetViewContext | undefined, viewOptions: IChatWidgetViewOptions, styles: IChatWidgetStyles, codeEditorService: ICodeEditorService, configurationService: IConfigurationService, dialogService: IDialogService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatService: IChatService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, chatAccessibilityService: IChatAccessibilityService, logService: ILogService, themeService: IThemeService, chatSlashCommandService: IChatSlashCommandService, chatEditingService: IChatEditingService, telemetryService: ITelemetryService, promptsService: IPromptsService, toolsService: ILanguageModelToolsService, chatModeService: IChatModeService, chatLayoutService: IChatLayoutService, chatEntitlementService: IChatEntitlementService, chatSessionsService: IChatSessionsService, agentSessionsService: IAgentSessionsService, chatTodoListService: IChatTodoListService, lifecycleService: ILifecycleService, chatAttachmentResolveService: IChatAttachmentResolveService, chatTipService: IChatTipService, chatDebugService: IChatDebugService);
+    constructor(location: ChatAgentLocation | IChatWidgetLocationOptions, viewContext: IChatWidgetViewContext | undefined, viewOptions: IChatWidgetViewOptions, styles: IChatWidgetStyles, codeEditorService: ICodeEditorService, configurationService: IConfigurationService, dialogService: IDialogService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatService: IChatService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, chatAccessibilityService: IChatAccessibilityService, logService: ILogService, themeService: IThemeService, chatSlashCommandService: IChatSlashCommandService, chatEditingService: IChatEditingService, telemetryService: ITelemetryService, promptsService: IPromptsService, customizationHarnessService: ICustomizationHarnessService, toolsService: ILanguageModelToolsService, chatLayoutService: IChatLayoutService, chatEntitlementService: IChatEntitlementService, chatSessionsService: IChatSessionsService, agentSessionsService: IAgentSessionsService, chatTodoListService: IChatTodoListService, lifecycleService: ILifecycleService, chatAttachmentResolveService: IChatAttachmentResolveService, chatTipService: IChatTipService, chatDebugService: IChatDebugService, accessibilityService: IAccessibilityService);
     private _lastSelectedAgent;
     set lastSelectedAgent(agent: IChatAgentData | undefined);
     get lastSelectedAgent(): IChatAgentData | undefined;
@@ -196,6 +198,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
      */
     get inputPart(): ChatInputPart;
     private get inlineInputPart();
+    private updateWorkingProgressBorder;
     get inputEditor(): ICodeEditor;
     get contentHeight(): number;
     get scrollTop(): number;
@@ -209,6 +212,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     toggleQuestionCarouselFocus(): boolean;
     navigateToPreviousQuestion(): boolean;
     navigateToNextQuestion(): boolean;
+    focusQuestionCarouselTerminal(): boolean;
     toggleTipFocus(): boolean;
     hasInputFocus(): boolean;
     refreshParsedInput(): void;
@@ -274,6 +278,10 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     rerunLastRequest(): Promise<void>;
     private getConfiguredThinkingStyle;
     private logThinkingStyleUsage;
+    /**
+     * @returns `false` when the prompt metadata requested an agent switch that the
+     * user cancelled, signalling that input submission should be aborted.
+     */
     private _applyPromptFileIfSet;
     private _acceptInput;
     private _resolveDirectoryImageAttachments;
@@ -303,6 +311,11 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     getViewState(): IChatModelInputState | undefined;
     private updateChatInputContext;
     private _switchToAgentByName;
+    /**
+     * @returns `false` when the agent switch was cancelled (e.g. user dismissed the
+     * mode-switch confirmation dialog), signalling that the caller should abort the
+     * current input submission.
+     */
     private _applyPromptMetadata;
     delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent): void;
 }