@codingame/monaco-vscode-katex-common 34.1.2 → 35.0.0

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

@@ -56,7 +56,7 @@ class TodoListRenderer {
         statusIcon.style.color = this.getStatusIconColor(todo.status);
         iconLabel.setLabel(todo.title);
         const statusText = this.getStatusText(todo.status);
-        const ariaLabel = ( localize(7484, "{0}, {1}", todo.title, statusText));
+        const ariaLabel = ( localize(8026, "{0}, {1}", todo.title, statusText));
         todoElement.setAttribute("aria-label", ariaLabel);
     }
     disposeTemplate(templateData) {
@@ -65,12 +65,12 @@ class TodoListRenderer {
     getStatusText(status) {
         switch (status) {
         case "completed":
-            return localize(7485, "completed");
+            return localize(8027, "completed");
         case "in-progress":
-            return localize(7486, "in progress");
+            return localize(8028, "in progress");
         case "not-started":
         default:
-            return localize(7487, "not started");
+            return localize(8029, "not started");
         }
     }
     getStatusIconClass(status) {
@@ -142,7 +142,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(7488, "Todos"));
+        this.titleElement.textContent = ( localize(8030, "Todos"));
         this.clearButtonContainer = $(".todo-clear-button-container");
         this.createClearButton();
         titleSection.appendChild(this.expandIcon);
@@ -164,7 +164,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
     createClearButton() {
         this.clearButton = ( new Button(this.clearButtonContainer, {
             supportIcons: true,
-            ariaLabel: ( localize(7489, "Clear all todos"))
+            ariaLabel: ( localize(8031, "Clear all todos"))
         }));
         this.clearButton.element.tabIndex = 0;
         this.clearButton.icon = Codicon.clearAll;
@@ -249,9 +249,9 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                     accessibilityProvider: {
                         getAriaLabel: todo => {
                             const statusText = this.getStatusText(todo.status);
-                            return localize(7484, "{0}, {1}", todo.title, statusText);
+                            return localize(8026, "{0}, {1}", todo.title, statusText);
                         },
-                        getWidgetAriaLabel: () => ( localize(7490, "Chat Todo List"))
+                        getWidgetAriaLabel: () => ( localize(8032, "Chat Todo List"))
                     }
                 }
             ));
@@ -307,9 +307,9 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
         const shouldDisable = isRequestInProgress && hasInProgressTask;
         this.clearButton.enabled = !shouldDisable;
         if (shouldDisable) {
-            this.clearButton.setTitle(( localize(7491, "Cannot clear todos while a task is in progress")));
+            this.clearButton.setTitle(( localize(8033, "Cannot clear todos while a task is in progress")));
         } else {
-            this.clearButton.setTitle(( localize(7489, "Clear all todos")));
+            this.clearButton.setTitle(( localize(8031, "Clear all todos")));
         }
     }
     updateTitleElement(titleElement, todoList) {
@@ -321,12 +321,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(7492, "Collapse Todos")) : ( localize(7493, "Expand Todos"));
+        const expandButtonLabel = this._isExpanded ? ( localize(8034, "Collapse Todos")) : ( localize(8035, "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(7494, "Todos ({0}/{1})", currentTaskNumber, totalCount)) : ( localize(7488, "Todos"));
+            titleText.textContent = totalCount > 0 ? ( localize(8036, "Todos ({0}/{1})", currentTaskNumber, totalCount)) : ( localize(8030, "Todos"));
             titleElement.appendChild(titleText);
         } else {
             const todoToShow = firstInProgressTodo || firstNotStartedTodo;
@@ -343,7 +343,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
                 icon.style.verticalAlign = "middle";
                 titleElement.appendChild(icon);
                 const todoText = $("span");
-                todoText.textContent = ( localize(7495, "{0} ({1}/{2})", todoToShow.title, currentTaskNumber, totalCount));
+                todoText.textContent = ( localize(8037, "{0} ({1}/{2})", todoToShow.title, currentTaskNumber, totalCount));
                 todoText.style.verticalAlign = "middle";
                 todoText.style.overflow = "hidden";
                 todoText.style.textOverflow = "ellipsis";
@@ -353,7 +353,7 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
             }
             else if (completedCount > 0 && completedCount === totalCount) {
                 const doneText = $("span");
-                doneText.textContent = ( localize(7494, "Todos ({0}/{1})", totalCount, totalCount));
+                doneText.textContent = ( localize(8036, "Todos ({0}/{1})", totalCount, totalCount));
                 doneText.style.verticalAlign = "middle";
                 titleElement.appendChild(doneText);
             }
@@ -362,12 +362,12 @@ let ChatTodoListWidget = class ChatTodoListWidget extends Disposable {
     getStatusText(status) {
         switch (status) {
         case "completed":
-            return localize(7485, "completed");
+            return localize(8027, "completed");
         case "in-progress":
-            return localize(7486, "in progress");
+            return localize(8028, "in progress");
         case "not-started":
         default:
-            return localize(7487, "not started");
+            return localize(8029, "not started");
         }
     }
 };

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

@@ -49,6 +49,7 @@ export declare class ChatCollapsibleInputOutputContentPart extends Disposable {
     private _outputSubPart;
     readonly domNode: HTMLElement;
     private _contentInitialized;
+    private _lastLayoutWidth;
     get codeblocks(): IChatCodeBlockInfo[];
     set title(s: string | IMarkdownString);
     get title(): string | IMarkdownString;
@@ -57,6 +58,7 @@ export declare class ChatCollapsibleInputOutputContentPart extends Disposable {
     constructor(title: IMarkdownString | string, subtitle: string | IMarkdownString | undefined, progressTooltip: IMarkdownString | string | undefined, context: IChatContentPartRenderContext, input: IChatCollapsibleInputData, output: IChatCollapsibleOutputData | undefined, isError: boolean, initiallyExpanded: boolean, shimmer: boolean, contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, hoverService: IHoverService, configurationService: IConfigurationService);
     private createMessageContents;
     private addCodeBlock;
+    private layoutToMessageWidth;
     hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean;
     layout(width: number): void;
 }

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { h, createElement, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { h, createElement, $, DisposableResizeObserver, getContentWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { ButtonWithIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -104,6 +104,12 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
                 const messageContainer = h(".chat-confirmation-widget-message");
                 messageContainer.root.appendChild(this.createMessageContents());
                 elements.root.appendChild(messageContainer.root);
+                const resizeObserver = this._register(new DisposableResizeObserver(
+                    "ChatCollapsibleInputOutputContentPart.message",
+                    () => this.layoutToMessageWidth(messageContainer.root)
+                ));
+                this._register(resizeObserver.observe(messageContainer.root));
+                this.layoutToMessageWidth(messageContainer.root);
             }
         }));
         const toggle = e => {
@@ -138,13 +144,13 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
             input,
             output
         } = this;
-        contents.inputTitle.textContent = ( localize(7496, "Input"));
+        contents.inputTitle.textContent = ( localize(8038, "Input"));
         this.addCodeBlock(input, contents.input);
         if (!output) {
             contents.output.remove();
             contents.outputTitle.remove();
         } else {
-            contents.outputTitle.textContent = ( localize(7497, "Output"));
+            contents.outputTitle.textContent = ( localize(8039, "Output"));
             const outputSubPart = this._register(
                 this._instantiationService.createInstance(ChatToolOutputContentSubPart, this.context, output.parts)
             );
@@ -169,6 +175,14 @@ let ChatCollapsibleInputOutputContentPart = class ChatCollapsibleInputOutputCont
         container.appendChild(editorReference.object.element);
         this._editorReferences.push(editorReference);
     }
+    layoutToMessageWidth(messageContainer) {
+        const width = getContentWidth(messageContainer);
+        if (width <= 0 || width === this._lastLayoutWidth) {
+            return;
+        }
+        this._lastLayoutWidth = width;
+        this.layout(width);
+    }
     hasSameContent(other, followingContent, element) {
         return false;
     }

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

@@ -83,7 +83,7 @@ let TreePool = class TreePool extends Disposable {
                 },
                 accessibilityProvider: {
                     getAriaLabel: element => element.label,
-                    getWidgetAriaLabel: () => ( localize(7498, "File Tree"))
+                    getWidgetAriaLabel: () => ( localize(8040, "File Tree"))
                 },
                 alwaysConsumeMouseWheel: false
             }

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

@@ -0,0 +1,29 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IChatRendererContent, IChatTurnPillsPart } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
+import { ChatTreeItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatResponseFileChangesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatResponseFileChangesService.service";
+import { IChatContentPart, IChatContentPartRenderContext } from "./chatContentParts.js";
+/**
+ * Renders the turn's status pills (changes + preview) inside a completed chat
+ * response, mirroring the floating pills shown above the input while the turn
+ * streams. Fed by the per-request diffs from {@link IChatResponseFileChangesService}
+ * (agent host sessions), so it reflects the same authoritative per-turn changes as
+ * the "Changed N files" summary. The part self-hides when the turn produced no
+ * changes.
+ */
+export declare class ChatTurnPillsContentPart extends Disposable implements IChatContentPart {
+    private readonly _content;
+    private readonly _editorService;
+    private readonly _instantiationService;
+    readonly domNode: HTMLElement;
+    private readonly _diffs;
+    constructor(_content: IChatTurnPillsPart, _context: IChatContentPartRenderContext, chatResponseFileChangesService: IChatResponseFileChangesService, commandService: ICommandService, openerService: IOpenerService, logService: ILogService, _editorService: IEditorService, configurationService: IConfigurationService, _instantiationService: IInstantiationService);
+    private _openChanges;
+    hasSameContent(other: IChatRendererContent, _followingContent: IChatRendererContent[], _element: ChatTreeItem): boolean;
+}

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

@@ -0,0 +1,110 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { MultiDiffEditorItem } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
+import { IChatResponseFileChangesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatResponseFileChangesService.service';
+import { diffStatsEqual, EMPTY_DIFF_STATS, previewFilesEqual, previewKind, observeTurnStatusPillsConfig, openChatPreviewFile, ChatTurnPillsWidget } from '../chatTurnPills.js';
+import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
+import { derivedOpts, derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+
+let ChatTurnPillsContentPart = class ChatTurnPillsContentPart extends Disposable {
+    constructor(
+        _content,
+        _context,
+        chatResponseFileChangesService,
+        commandService,
+        openerService,
+        logService,
+        _editorService,
+        configurationService,
+        _instantiationService
+    ) {
+        super();
+        this._content = _content;
+        this._editorService = _editorService;
+        this._instantiationService = _instantiationService;
+        this.domNode = $(".chat-turn-pills-part");
+        this._diffs = chatResponseFileChangesService.getChangesForRequest(_content.sessionResource, _content.requestId) ?? constObservable([]);
+        const stats = derivedOpts({
+            owner: this,
+            equalsFn: diffStatsEqual
+        }, reader => {
+            const diffs = this._diffs.read(reader);
+            if (diffs.length === 0) {
+                return EMPTY_DIFF_STATS;
+            }
+            let insertions = 0, deletions = 0;
+            for (const diff of diffs) {
+                insertions += diff.added;
+                deletions += diff.removed;
+            }
+            return {
+                files: diffs.length,
+                insertions,
+                deletions
+            };
+        });
+        const previewFiles = derivedOpts({
+            owner: this,
+            equalsFn: previewFilesEqual
+        }, reader => {
+            const created = [];
+            const edited = [];
+            for (const diff of this._diffs.read(reader)) {
+                const kind = previewKind(diff.modifiedURI);
+                if (!kind) {
+                    continue;
+                }
+                const isCreated = isEqual(diff.originalURI, diff.modifiedURI);
+                (isCreated ? created : edited).push({
+                    uri: diff.modifiedURI,
+                    kind,
+                    created: isCreated
+                });
+            }
+            return [...created, ...edited];
+        });
+        const pillsConfig = observeTurnStatusPillsConfig(configurationService);
+        const model = {
+            stats,
+            previewFiles,
+            changesEnabled: derived(reader => pillsConfig.read(reader).changes),
+            previewEnabled: derived(reader => pillsConfig.read(reader).preview),
+            openChanges: () => this._openChanges(),
+            openPreviewFile: file => openChatPreviewFile(file, commandService, openerService, logService)
+        };
+        const widget = this._register(this._instantiationService.createInstance(ChatTurnPillsWidget, model));
+        this.domNode.appendChild(widget.element);
+        this._register(autorun(reader => {
+            this.domNode.style.display = widget.isVisible.read(reader) ? "" : "none";
+        }));
+    }
+    _openChanges() {
+        const diffs = this._diffs.get();
+        if (diffs.length === 0) {
+            return;
+        }
+        const source = ( URI.parse(`multi-diff-editor:${( Date.now().toString())}-${( Math.random().toString(36)).slice(2)}`));
+        const input = this._instantiationService.createInstance(MultiDiffEditorInput, source, ( localize(8041, "Turn File Changes")), ( diffs.map(diff => ( new MultiDiffEditorItem(diff.originalURI, diff.modifiedURI, undefined)))), false);
+        this._editorService.openEditor(input);
+    }
+    hasSameContent(other, _followingContent, _element) {
+        return other.kind === "turnPills" && other.requestId === this._content.requestId && isEqual(other.sessionResource, this._content.sessionResource);
+    }
+};
+ChatTurnPillsContentPart = ( __decorate([( __param(2, IChatResponseFileChangesService)), ( __param(3, ICommandService)), ( __param(4, IOpenerService)), ( __param(5, ILogService)), ( __param(6, IEditorService)), ( __param(7, IConfigurationService)), ( __param(8, IInstantiationService))], ChatTurnPillsContentPart));
+
+export { ChatTurnPillsContentPart };

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

@@ -45,15 +45,15 @@ let ChatWorkspaceEditContentPart = class ChatWorkspaceEditContentPart extends Di
         for (const edit of workspaceEdit.edits) {
             if (edit.oldResource && !edit.newResource) {
                 renderEntry(( localize(
-                    7499,
+                    8042,
                     "Deleted `{0}`",
                     this.labelService.getUriBasenameLabel(edit.oldResource)
                 )), Codicon.trash);
             } else if (!edit.oldResource && edit.newResource) {
-                renderEntry(( localize(7500, "Created []({0})", (edit.newResource.toString()))), Codicon.newFile);
+                renderEntry(( localize(8043, "Created []({0})", (edit.newResource.toString()))), Codicon.newFile);
             } else if (edit.oldResource && edit.newResource) {
                 renderEntry(( localize(
-                    7501,
+                    8044,
                     "Renamed {0} to []({1})",
                     this.labelService.getUriBasenameLabel(edit.oldResource),
                     (edit.newResource.toString())

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

@@ -135,7 +135,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
                 multipleDefinitions: "goto",
                 multipleImplementations: "goto"
             },
-            ariaLabel: ( localize(7502, "Code block")),
+            ariaLabel: ( localize(8045, "Code block")),
             overflowWidgetsDomNode,
             tabFocusMode: true,
             ...this.getEditorOptionsFromConfig()
@@ -387,11 +387,11 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         });
         if (!this.editor.getOption(EditorOption.ariaLabel)) {
             this.editor.updateOptions({
-                ariaLabel: ( localize(7503, "Code block {0}", data.codeBlockIndex + 1))
+                ariaLabel: ( localize(8046, "Code block {0}", data.codeBlockIndex + 1))
             });
         }
         this.layout(width);
-        const toolbarAriaLabel = ( localize(7504, "Code block {0}", data.codeBlockIndex + 1));
+        const toolbarAriaLabel = ( localize(8047, "Code block {0}", data.codeBlockIndex + 1));
         if (this.toolbar) {
             this.toolbar.setAriaLabel(toolbarAriaLabel);
         } else {
@@ -454,7 +454,7 @@ let CodeBlockPart = class CodeBlockPart extends Disposable {
         if (!this.currentCodeBlockData || !this.currentCodeBlockData.vulns) {
             return "";
         }
-        const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ? ( localize(7505, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(7506, "{0} vulnerability", 1));
+        const referencesLabel = this.currentCodeBlockData.vulns.length > 1 ? ( localize(8048, "{0} vulnerabilities", this.currentCodeBlockData.vulns.length)) : ( localize(8049, "{0} vulnerability", 1));
         const icon = element => element.vulnerabilitiesListExpanded ? Codicon.chevronDown : Codicon.chevronRight;
         return `${referencesLabel} $(${icon(this.currentCodeBlockData.element).id})`;
     }
@@ -589,7 +589,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
                 multipleDefinitions: "goto",
                 multipleImplementations: "goto"
             },
-            ariaLabel: ( localize(7502, "Code block")),
+            ariaLabel: ( localize(8045, "Code block")),
             overflowWidgetsDomNode,
             ...this.getEditorOptionsFromConfig()
         });
@@ -668,8 +668,8 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             stickyScroll: {
                 enabled: false
             },
-            originalAriaLabel: ( localize(7507, "Original")),
-            modifiedAriaLabel: ( localize(7508, "Modified")),
+            originalAriaLabel: ( localize(8050, "Original")),
+            modifiedAriaLabel: ( localize(8051, "Modified")),
             diffAlgorithm: "advanced",
             readOnly: false,
             isInEmbeddedEditor: true,
@@ -710,7 +710,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         const toolbarElt = this.toolbar.getElement();
         toolbarElt.style.display = "block";
         if (this.accessibilityService.isScreenReaderOptimized()) {
-            toolbarElt.ariaLabel = ( localize(7509, "Code block toolbar"));
+            toolbarElt.ariaLabel = ( localize(8052, "Code block toolbar"));
         }
     }
     getEditorOptionsFromConfig() {
@@ -751,7 +751,7 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
         await this.updateEditor(data, token);
         this.layout(width);
         this.diffEditor.updateOptions({
-            ariaLabel: ( localize(7510, "Code Edits")),
+            ariaLabel: ( localize(8053, "Code Edits")),
             readOnly: !!data.isReadOnly
         });
         this.resourceLabel.element.setFile(data.edit.uri, {
@@ -786,12 +786,12 @@ let CodeCompareBlockPart = class CodeCompareBlockPart extends Disposable {
             });
             let template;
             if (data.edit.state.applied === 1) {
-                template = ( localize(7511, "Applied 1 change in [[``{0}``]]", uriLabel));
+                template = ( localize(8054, "Applied 1 change in [[``{0}``]]", uriLabel));
             } else if (data.edit.state.applied < 0) {
-                template = ( localize(7512, "Edits in [[``{0}``]] have been rejected", uriLabel));
+                template = ( localize(8055, "Edits in [[``{0}``]] have been rejected", uriLabel));
             } else {
                 template = ( localize(
-                    7513,
+                    8056,
                     "Applied {0} changes in [[``{1}``]]",
                     data.edit.state.applied,
                     uriLabel
@@ -921,8 +921,8 @@ let DefaultChatTextEditor = class DefaultChatTextEditor {
     async _checkSha1(model, item) {
         if (item.state?.sha1 && this._sha1.computeSHA1(model) && this._sha1.computeSHA1(model) !== item.state.sha1) {
             const result = await this.dialogService.confirm({
-                message: ( localize(7514, "The original file has been modified.")),
-                detail: ( localize(7515, "Do you want to apply the changes anyway?"))
+                message: ( localize(8057, "The original file has been modified.")),
+                detail: ( localize(8058, "Do you want to apply the changes anyway?"))
             });
             if (!result.confirmed) {
                 return false;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatAgentFeedbackReviewConfirmation.css

@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-agent-feedback-review-list {
+	display: flex;
+	flex-direction: column;
+	gap: var(--vscode-spacing-size40);
+}
+
+.chat-agent-feedback-review-empty {
+	color: var(--vscode-descriptionForeground);
+	padding: var(--vscode-spacing-size40) 0;
+}
+
+.chat-agent-feedback-review-row {
+	display: flex;
+	align-items: flex-start;
+	gap: var(--vscode-spacing-size80);
+	padding: var(--vscode-spacing-size60);
+	border: var(--vscode-strokeThickness) solid var(--vscode-widget-border);
+	border-radius: var(--vscode-cornerRadius-small);
+}
+
+.chat-agent-feedback-review-row .monaco-checkbox {
+	margin-top: var(--vscode-spacing-size20);
+	flex: 0 0 auto;
+}
+
+.chat-agent-feedback-review-main {
+	display: flex;
+	flex-direction: column;
+	gap: var(--vscode-spacing-size20);
+	min-width: 0;
+	flex: 1 1 auto;
+}
+
+.chat-agent-feedback-review-header {
+	display: flex;
+	align-items: center;
+	gap: var(--vscode-spacing-size60);
+	min-width: 0;
+}
+
+.chat-agent-feedback-review-kind {
+	flex: 0 0 auto;
+	padding: 0 var(--vscode-spacing-size40);
+	border-radius: var(--vscode-cornerRadius-xSmall);
+	background: color-mix(in srgb, var(--vscode-charts-purple) 22%, var(--vscode-editorWidget-background));
+	color: var(--vscode-charts-purple);
+	font-size: var(--vscode-bodyFontSize-xSmall);
+	text-transform: uppercase;
+}
+
+.chat-agent-feedback-review-file {
+	flex: 1 1 auto;
+	min-width: 0;
+	overflow: hidden;
+	font-size: var(--vscode-bodyFontSize-small);
+}
+
+.chat-agent-feedback-review-text-container {
+	position: relative;
+}
+
+.chat-agent-feedback-review-text {
+	white-space: pre-wrap;
+	word-break: break-word;
+}
+
+.chat-agent-feedback-review-text-container.collapsed .chat-agent-feedback-review-text {
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	line-clamp: 2;
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+}
+
+/* Fade affordance shown only when the comment is collapsed and overflowing, making it clear there is more text below the two visible lines. */
+.chat-agent-feedback-review-text-container.collapsed.overflowing::after {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	height: 1.4em;
+	pointer-events: none;
+	background: linear-gradient(to bottom, transparent, var(--vscode-chat-requestBackground));
+}
+
+.chat-agent-feedback-review-expand-toggle {
+	display: none;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	align-items: center;
+	justify-content: center;
+	width: 18px;
+	height: 18px;
+	padding: 0;
+	border: none;
+	border-radius: var(--vscode-cornerRadius-xSmall);
+	background: transparent;
+	color: var(--vscode-icon-foreground);
+	cursor: pointer;
+	z-index: 1;
+}
+
+.chat-agent-feedback-review-text-container.overflowing .chat-agent-feedback-review-expand-toggle {
+	display: flex;
+}
+
+.chat-agent-feedback-review-expand-toggle:hover {
+	background: var(--vscode-toolbar-hoverBackground);
+}
+
+.chat-agent-feedback-review-expand-toggle:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.chat-agent-feedback-review-actions {
+	flex: 0 0 auto;
+}
+
+.chat-agent-feedback-review-actions .monaco-action-bar .action-label {
+	color: var(--vscode-icon-foreground);
+}
+
+.chat-confirmation-widget2 .chat-confirmation-widget-message:has(.chat-agent-feedback-review-list) {
+	padding: var(--vscode-spacing-size60) var(--vscode-spacing-size120) var(--vscode-spacing-size60) var(--vscode-spacing-size60);
+}

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatAutoModeResolution.css

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-auto-mode-resolution-content {
+	border: none;
+	border-radius: 0;
+	padding-top: 0;
+}
+
+.chat-auto-mode-resolution-body {
+	border-left: var(--vscode-strokeThickness) solid var(--vscode-chat-requestBorder);
+	margin-left: 4px;
+	padding-left: 12px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+}
+
+.chat-auto-mode-resolution-body p {
+	margin: 0;
+}
+
+.chat-auto-mode-resolution-explanation {
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-auto-mode-resolution-detail {
+	margin-top: 4px;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatCodeBlockPill.css

@@ -7,6 +7,10 @@
 	margin-bottom: 16px;
 }
 
+.interactive-item-container.editing-session.interactive-response > .value > .chat-codeblock-pill-container {
+	margin-bottom: 14px;
+}
+
 .chat-codeblock-pill-container {
 	display: flex;
 	align-items: center;