@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/media/chatDebug.css

@@ -9,6 +9,29 @@
 	overflow: hidden;
 }
 
+/* ---- Disabled overlay (shown in place of a sub-view when logging is off) ---- */
+.chat-debug-disabled-overlay {
+	display: flex;
+	flex: 1;
+	min-height: 0;
+	align-items: center;
+	justify-content: center;
+	padding: 48px 24px;
+	overflow-y: auto;
+}
+.chat-debug-logging-disabled {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	text-align: center;
+	max-width: 480px;
+}
+.chat-debug-logging-disabled-message {
+	font-size: 13px;
+	color: var(--vscode-descriptionForeground);
+	margin: 0 0 16px;
+}
+
 /* ---- Home view ---- */
 .chat-debug-home {
 	display: flex;
@@ -98,7 +121,7 @@
 	background: var(--vscode-badge-background);
 	color: var(--vscode-badge-foreground);
 	font-size: 11px;
-	font-weight: 500;
+	font-weight: var(--vscode-fontWeight-semiBold);
 }
 .chat-debug-home-show-more {
 	margin-top: 8px;
@@ -400,7 +423,7 @@
 .chat-debug-log-row .chat-debug-log-name {
 	width: 200px;
 	flex-shrink: 0;
-	font-weight: 500;
+	font-weight: var(--vscode-fontWeight-semiBold);
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
@@ -550,6 +573,7 @@
 	flex-shrink: 0;
 	width: 16px;
 	text-align: center;
+	font-size: var(--vscode-codiconFontSize-compact);
 }
 .chat-debug-file-link {
 	color: var(--vscode-textLink-foreground);
@@ -1174,7 +1198,7 @@ button.chat-debug-cache-finding.is-clickable:focus-visible {
 	color: var(--vscode-descriptionForeground);
 }
 .chat-debug-cache-session-health-chip .codicon {
-	font-size: 12px;
+	font-size: var(--vscode-codiconFontSize-compact);
 }
 .chat-debug-cache-session-health-chip.cause-tools,
 .chat-debug-cache-session-health-chip.cause-system,
@@ -1785,3 +1809,253 @@ button.chat-debug-cache-finding.is-clickable:focus-visible {
 	background: var(--vscode-diffEditor-removedTextBackground, rgba(244, 135, 113, 0.4));
 	border-radius: 2px;
 }
+
+/* ---- AHP Log (protocol frames) view ---- */
+.chat-debug-wirelog {
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	flex: 1;
+	min-height: 0;
+}
+.chat-debug-wirelog-hint {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 6px 12px;
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
+	background: var(--vscode-editorWidget-background);
+	border-bottom: 1px solid var(--vscode-widget-border, transparent);
+}
+.chat-debug-wirelog-toolbar {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 6px 12px;
+	border-bottom: 1px solid var(--vscode-widget-border, transparent);
+	flex-shrink: 0;
+}
+.chat-debug-wirelog-select {
+	min-width: 220px;
+}
+.chat-debug-wirelog-select .monaco-select-box {
+	width: 100%;
+}
+.chat-debug-wirelog-filter {
+	flex: 1 1 auto;
+	min-width: 120px;
+	height: 24px;
+	padding: 2px 6px;
+	font-size: 12px;
+	color: var(--vscode-input-foreground);
+	background: var(--vscode-input-background);
+	border: 1px solid var(--vscode-input-border, transparent);
+	border-radius: 2px;
+}
+.chat-debug-wirelog-filter::placeholder {
+	color: var(--vscode-input-placeholderForeground);
+}
+.chat-debug-wirelog-filter:focus {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+.chat-debug-wirelog-action {
+	flex-shrink: 0;
+	width: auto;
+}
+.chat-debug-wirelog-summary {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	gap: 6px;
+	padding: 6px 12px;
+	flex-shrink: 0;
+	border-bottom: 1px solid var(--vscode-widget-border, transparent);
+}
+.chat-debug-wirelog-chip {
+	padding: 1px 8px;
+	font-size: 11px;
+	border-radius: 10px;
+	color: var(--vscode-badge-foreground);
+	background: var(--vscode-badge-background);
+}
+.chat-debug-wirelog-chip-error {
+	color: var(--vscode-inputValidation-errorForeground, var(--vscode-errorForeground));
+	background: var(--vscode-inputValidation-errorBackground, transparent);
+	border: 1px solid var(--vscode-inputValidation-errorBorder, var(--vscode-errorForeground));
+}
+.chat-debug-wirelog-chip-pending {
+	color: var(--vscode-inputValidation-warningForeground, var(--vscode-foreground));
+	background: var(--vscode-inputValidation-warningBackground, transparent);
+	border: 1px solid var(--vscode-inputValidation-warningBorder, var(--vscode-editorWarning-foreground));
+}
+.chat-debug-wirelog-body {
+	flex: 1 1 auto;
+	min-height: 0;
+	position: relative;
+	overflow: hidden;
+}
+.chat-debug-wirelog-loadmore {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 12px;
+	padding: 6px 0;
+	flex-shrink: 0;
+	border-top: 1px solid var(--vscode-widget-border, transparent);
+}
+.chat-debug-wirelog-loadmore-status {
+	font-size: 12px;
+	color: var(--vscode-descriptionForeground);
+}
+.chat-debug-wirelog-list {
+	padding: 4px 0;
+	user-select: text;
+	box-sizing: border-box;
+}
+.chat-debug-wirelog-list.chat-debug-wirelog-message {
+	padding: 12px;
+	color: var(--vscode-descriptionForeground);
+	white-space: pre-wrap;
+}
+.chat-debug-wirelog-noresults {
+	padding: 12px;
+	color: var(--vscode-descriptionForeground);
+}
+.chat-debug-wirelog-row {
+	border-bottom: 1px solid var(--vscode-widget-border, rgba(128, 128, 128, 0.15));
+}
+.chat-debug-wirelog-row-header {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	padding: 4px 12px;
+	cursor: pointer;
+	white-space: nowrap;
+}
+.chat-debug-wirelog-row-header:hover {
+	background: var(--vscode-list-hoverBackground);
+}
+.chat-debug-wirelog-row-header:focus-visible {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+.chat-debug-wirelog-row-error {
+	border-left: 2px solid var(--vscode-errorForeground);
+}
+.chat-debug-wirelog-row-error .chat-debug-wirelog-row-header {
+	background: var(--vscode-inputValidation-errorBackground, transparent);
+}
+.chat-debug-wirelog-row-error .chat-debug-wirelog-method {
+	color: var(--vscode-errorForeground);
+}
+.chat-debug-wirelog-chevron {
+	flex-shrink: 0;
+	color: var(--vscode-descriptionForeground);
+	font-size: 14px;
+}
+.chat-debug-wirelog-dir {
+	flex-shrink: 0;
+	color: var(--vscode-descriptionForeground);
+	font-size: 14px;
+}
+.chat-debug-wirelog-method {
+	font-family: var(--monaco-monospace-font);
+	font-size: 12px;
+	color: var(--vscode-foreground);
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.chat-debug-wirelog-type {
+	flex-shrink: 0;
+	padding: 0 6px;
+	font-family: var(--monaco-monospace-font);
+	font-size: 11px;
+	border-radius: 3px;
+	color: var(--vscode-textPreformat-foreground);
+	background: var(--vscode-textPreformat-background);
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.chat-debug-wirelog-badge {
+	flex-shrink: 0;
+	padding: 0 6px;
+	font-size: 10px;
+	text-transform: uppercase;
+	letter-spacing: 0.04em;
+	border-radius: 3px;
+	color: var(--vscode-descriptionForeground);
+	background: var(--vscode-badge-background);
+}
+.chat-debug-wirelog-status {
+	flex-shrink: 0;
+	font-size: 11px;
+	color: var(--vscode-descriptionForeground);
+}
+.chat-debug-wirelog-status-ok {
+	color: var(--vscode-descriptionForeground);
+}
+.chat-debug-wirelog-status-error {
+	color: var(--vscode-errorForeground);
+	font-weight: 600;
+}
+.chat-debug-wirelog-status-pending {
+	color: var(--vscode-editorWarning-foreground);
+}
+.chat-debug-wirelog-time {
+	flex-shrink: 0;
+	margin-left: auto;
+	font-family: var(--monaco-monospace-font);
+	font-size: 11px;
+	color: var(--vscode-descriptionForeground);
+}
+.chat-debug-wirelog-row-details {
+	display: none;
+	padding: 4px 12px 8px 34px;
+}
+.chat-debug-wirelog-row-expanded .chat-debug-wirelog-row-details {
+	display: block;
+}
+.chat-debug-wirelog-detail-section {
+	margin-bottom: 6px;
+}
+.chat-debug-wirelog-detail-title {
+	font-size: 11px;
+	text-transform: uppercase;
+	letter-spacing: 0.04em;
+	color: var(--vscode-descriptionForeground);
+	margin-bottom: 2px;
+}
+.chat-debug-wirelog-detail-json {
+	margin: 0;
+	padding: 6px 8px;
+	font-family: var(--monaco-monospace-font);
+	font-size: 12px;
+	line-height: 1.4;
+	white-space: pre-wrap;
+	word-break: break-word;
+	tab-size: 2;
+	color: var(--vscode-foreground);
+	background: var(--vscode-textCodeBlock-background, var(--vscode-editorWidget-background));
+	border-radius: 3px;
+}
+.chat-debug-wirelog-detail-json-error {
+	color: var(--vscode-errorForeground);
+}
+.chat-debug-wirelog-detail-note {
+	font-size: 11px;
+	font-style: italic;
+	color: var(--vscode-descriptionForeground);
+}
+.chat-debug-wirelog-footer {
+	flex-shrink: 0;
+	padding: 4px 12px;
+	font-size: 11px;
+	color: var(--vscode-descriptionForeground);
+	border-top: 1px solid var(--vscode-widget-border, transparent);
+}
+.chat-debug-wirelog-footer:empty {
+	display: none;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.js

@@ -620,7 +620,7 @@ let ChatEditingCodeEditorIntegration = class ChatEditingCodeEditorIntegration {
                 options: {
                     selection
                 },
-                label: ( localize(6968, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
+                label: ( localize(8074, "{0} (changes from chat)", basename(this._entry.modifiedURI)))
             });
             if (diffEditor && diffEditor.input) {
                 diffEditor.getControl()?.setSelection(selection);

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.d.ts

@@ -1,15 +1,15 @@
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
-import { IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatEditReviewSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
 declare abstract class ChatEditingEditorAction extends Action2 {
     constructor(desc: Readonly<IAction2Options>);
     run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
-    abstract runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, integration: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void> | void;
+    abstract runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditReviewSession, entry: IModifiedFileEntry, integration: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void> | void;
 }
 declare abstract class KeepOrUndoAction extends ChatEditingEditorAction {
     private _keep;
     constructor(id: string, _keep: boolean);
-    runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration): Promise<void>;
+    runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditReviewSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration): Promise<void>;
 }
 export declare class AcceptAction extends KeepOrUndoAction {
     static readonly ID = "chatEditor.action.accept";
@@ -22,7 +22,7 @@ export declare class RejectAction extends KeepOrUndoAction {
 declare abstract class AcceptRejectHunkAction extends ChatEditingEditorAction {
     private readonly _accept;
     constructor(_accept: boolean);
-    runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditingSession, entry: IModifiedFileEntry, ctrl: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void>;
+    runChatEditingCommand(accessor: ServicesAccessor, session: IChatEditReviewSession, entry: IModifiedFileEntry, ctrl: IModifiedFileEntryEditorIntegration, ...args: unknown[]): Promise<void>;
 }
 export declare class AcceptHunkAction extends AcceptRejectHunkAction {
     static readonly ID = "chatEditor.action.acceptHunk";
@@ -34,12 +34,12 @@ export declare class RejectHunkAction extends AcceptRejectHunkAction {
 }
 export declare class ReviewChangesAction extends ChatEditingEditorAction {
     constructor();
-    runChatEditingCommand(_accessor: ServicesAccessor, _session: IChatEditingSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: unknown[]): void;
+    runChatEditingCommand(_accessor: ServicesAccessor, _session: IChatEditReviewSession, entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: unknown[]): void;
 }
 export declare class AcceptAllEditsAction extends ChatEditingEditorAction {
     static readonly ID = "chatEditor.action.acceptAllEdits";
     constructor();
-    runChatEditingCommand(_accessor: ServicesAccessor, session: IChatEditingSession, _entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: unknown[]): Promise<void>;
+    runChatEditingCommand(_accessor: ServicesAccessor, session: IChatEditReviewSession, _entry: IModifiedFileEntry, _integration: IModifiedFileEntryEditorIntegration, ..._args: unknown[]): Promise<void>;
 }
 export declare function registerChatEditorActions(): void;
 export declare const navigationBearingFakeActionId = "chatEditor.navigation.bearings";

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.js

@@ -64,7 +64,7 @@ class NavigateAction extends ChatEditingEditorAction {
     constructor(next) {
         super({
             id: next ? "chatEditor.action.navigateNext" : "chatEditor.action.navigatePrevious",
-            title: next ? ( localize2(6969, "Go to Next Chat Edit")) : ( localize2(6970, "Go to Previous Chat Edit")),
+            title: next ? ( localize2(8075, "Go to Next Chat Edit")) : ( localize2(8076, "Go to Previous Chat Edit")),
             icon: next ? Codicon.arrowDown : Codicon.arrowUp,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasEditorModification)),
             keybinding: {
@@ -128,9 +128,9 @@ class KeepOrUndoAction extends ChatEditingEditorAction {
     constructor(id, _keep) {
         super({
             id,
-            title: _keep ? ( localize2(6971, "Keep Chat Edits")) : ( localize2(6972, "Undo Chat Edits")),
-            shortTitle: _keep ? ( localize2(6973, "Keep")) : ( localize2(6974, "Undo")),
-            tooltip: _keep ? ( localize2(6975, "Keep Chat Edits in this File")) : ( localize2(6976, "Undo Chat Edits in this File")),
+            title: _keep ? ( localize2(8077, "Keep Chat Edits")) : ( localize2(8078, "Undo Chat Edits")),
+            shortTitle: _keep ? ( localize2(8079, "Keep")) : ( localize2(8080, "Undo")),
+            tooltip: _keep ? ( localize2(8081, "Keep Chat Edits in this File")) : ( localize2(8082, "Undo Chat Edits in this File")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: _keep ? Codicon.check : Codicon.discard,
             f1: true,
@@ -183,8 +183,8 @@ class AcceptRejectHunkAction extends ChatEditingEditorAction {
     constructor(_accept) {
         super({
             id: _accept ? acceptHunkId : undoHunkId,
-            title: _accept ? ( localize2(6977, "Keep this Change")) : ( localize2(6978, "Undo this Change")),
-            shortTitle: _accept ? ( localize2(6979, "Keep")) : ( localize2(6980, "Undo")),
+            title: _accept ? ( localize2(8083, "Keep this Change")) : ( localize2(8084, "Undo this Change")),
+            shortTitle: _accept ? ( localize2(8085, "Keep")) : ( localize2(8086, "Undo")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             f1: true,
             keybinding: {
@@ -232,7 +232,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.toggleDiff",
-            title: ( localize2(6981, "Toggle Diff Editor for Chat Edits")),
+            title: ( localize2(8087, "Toggle Diff Editor for Chat Edits")),
             category: CHAT_CATEGORY,
             toggled: {
                 condition: ( ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ( ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID)))),
@@ -264,7 +264,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.showAccessibleDiffView",
-            title: ( localize2(6982, "Show Accessible Diff View for Chat Edits")),
+            title: ( localize2(8088, "Show Accessible Diff View for Chat Edits")),
             f1: true,
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             keybinding: {
@@ -282,7 +282,7 @@ class ReviewChangesAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: "chatEditor.action.reviewChanges",
-            title: ( localize2(6983, "Review")),
+            title: ( localize2(8089, "Review")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             menu: [{
                 id: MenuId.ChatEditingEditorContent,
@@ -303,8 +303,8 @@ class AcceptAllEditsAction extends ChatEditingEditorAction {
     constructor() {
         super({
             id: AcceptAllEditsAction.ID,
-            title: ( localize2(6984, "Keep All Chat Edits")),
-            tooltip: ( localize2(6985, "Keep All Chat Edits in this Session")),
+            title: ( localize2(8090, "Keep All Chat Edits")),
+            tooltip: ( localize2(8091, "Keep All Chat Edits in this Session")),
             precondition: ( ContextKeyExpr.and(ctxHasEditorModification, ( ctxIsCurrentlyBeingModified.negate()))),
             icon: Codicon.checkAll,
             f1: true,
@@ -323,7 +323,7 @@ class MultiDiffAcceptDiscardAction extends Action2 {
     constructor(accept) {
         super({
             id: accept ? "chatEditing.multidiff.acceptAllFiles" : "chatEditing.multidiff.discardAllFiles",
-            title: accept ? ( localize(6986, "Keep All Edits")) : ( localize(6987, "Undo All Edits")),
+            title: accept ? ( localize(8092, "Keep All Edits")) : ( localize(8093, "Undo All Edits")),
             icon: accept ? Codicon.check : Codicon.discard,
             menu: {
                 when: ( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)),
@@ -374,7 +374,7 @@ class ExplainMultiDiffAction extends Action2 {
     constructor() {
         super({
             id: "chatEditing.multidiff.explain",
-            title: ( localize(6988, "Explain")),
+            title: ( localize(8094, "Explain")),
             menu: {
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.or(...( explainMultiDiffSchemes.map(scheme => ( ContextKeyExpr.equals("resourceScheme", scheme)))))), ( ContextKeyExpr.has(`config.${ChatConfiguration.ExplainChangesEnabled}`)))),
                 id: MenuId.MultiDiffEditorContent,
@@ -520,7 +520,7 @@ function registerChatEditorActions() {
     MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
         command: {
             id: navigationBearingFakeActionId,
-            title: ( localize(6989, "Navigation Status")),
+            title: ( localize(8095, "Navigation Status")),
             precondition: ( ContextKeyExpr.false())
         },
         group: "navigate",

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.js

@@ -120,7 +120,7 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
         });
         const progressNode = createElement("div");
         progressNode.classList.add("chat-editor-overlay-progress");
-        append(progressNode, renderIcon(ThemeIcon.modify(Codicon.loading, "spin")));
+        append(progressNode, renderIcon(ThemeIcon.modify(Codicon.loadingCompact, "spin")));
         const textProgress = append(progressNode, $("span.progress-message"));
         this._domNode.appendChild(progressNode);
         this._store.add(autorun(r => {
@@ -202,9 +202,9 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                     } = that._navigationBearings.read(r);
                                     if (changeCount > 0) {
                                         const n = activeIdx === -1 ? "1" : `${activeIdx + 1}`;
-                                        this.label.innerText = ( localize(6997, "{0} of {1}", n, changeCount));
+                                        this.label.innerText = ( localize(8103, "{0} of {1}", n, changeCount));
                                     } else {
-                                        this.label.innerText = ( localize(6998, "—"));
+                                        this.label.innerText = ( localize(8104, "—"));
                                     }
                                     this.updateTooltip();
                                 }));
@@ -219,18 +219,18 @@ let ChatEditorOverlayWidget = class ChatEditorOverlayWidget extends Disposable {
                                 }
                                 let result;
                                 if (changeCount === 1 && entriesCount === 1) {
-                                    result = ( localize(6999, "1 change in 1 file"));
+                                    result = ( localize(8105, "1 change in 1 file"));
                                 } else if (changeCount === 1) {
-                                    result = ( localize(7000, "1 change in {0} files", entriesCount));
+                                    result = ( localize(8106, "1 change in {0} files", entriesCount));
                                 } else if (entriesCount === 1) {
-                                    result = ( localize(7001, "{0} changes in 1 file", changeCount));
+                                    result = ( localize(8107, "{0} changes in 1 file", changeCount));
                                 } else {
-                                    result = ( localize(7002, "{0} changes in {1} files", changeCount, entriesCount));
+                                    result = ( localize(8108, "{0} changes in {1} files", changeCount, entriesCount));
                                 }
                                 if (!that._isBusy.get()) {
                                     return result;
                                 }
-                                return localize(7003, "{0} - Working...", result);
+                                return localize(8109, "{0} - Working...", result);
                             }
                         })();
                     }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.js

@@ -129,7 +129,7 @@ let ChatEditingExplanationModelManager = class ChatEditingExplanationModelManage
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",
                         explanations: [],
-                        errorMessage: ( localize(7004, "No language model available"))
+                        errorMessage: ( localize(8110, "No language model available"))
                     });
                 }
                 return;
@@ -200,7 +200,7 @@ Example response format:
             for (const fileData of fileChanges) {
                 const explanations = [];
                 for (const data of fileData.changes) {
-                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(7005, "Code was modified."));
+                    const parsedExplanation = parsed[parsedIndex]?.explanation?.trim() || ( localize(8111, "Code was modified."));
                     explanations.push({
                         uri: fileData.uri,
                         startLineNumber: data.startLineNumber,
@@ -218,7 +218,7 @@ Example response format:
             }
         } catch (e) {
             if (!cancellationToken.isCancellationRequested) {
-                const errorMessage = e instanceof Error ? e.message : ( localize(7006, "Failed to generate explanations"));
+                const errorMessage = e instanceof Error ? e.message : ( localize(8112, "Failed to generate explanations"));
                 for (const fileData of fileChanges) {
                     this._updateUriStatePartial(fileData.uri, {
                         progress: "error",

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationWidget.js

@@ -95,7 +95,7 @@ class ChatEditingExplanationWidget extends Disposable {
             return {
                 startLineNumber: change.modified.startLineNumber,
                 endLineNumber: change.modified.endLineNumberExclusive - 1,
-                explanation: ( localize(7007, "Generating explanation...")),
+                explanation: ( localize(8113, "Generating explanation...")),
                 read: false,
                 loading: true,
                 originalText,
@@ -115,8 +115,8 @@ class ChatEditingExplanationWidget extends Disposable {
         this._updateToggleButton();
         this._headerNode.appendChild(this._toggleButton);
         this._dismissButton = $("div.chat-explanation-dismiss");
-        this._dismissButton.appendChild(renderIcon(Codicon.close));
-        this._dismissButton.title = ( localize(7008, "Dismiss"));
+        this._dismissButton.appendChild(renderIcon(Codicon.closeSmall));
+        this._dismissButton.title = ( localize(8114, "Dismiss"));
         this._headerNode.appendChild(this._dismissButton);
         this._domNode.appendChild(this._headerNode);
         this._bodyNode = $("div.chat-explanation-body");
@@ -178,35 +178,35 @@ class ChatEditingExplanationWidget extends Disposable {
             this._readIndicator.appendChild(renderIcon(Codicon.circle));
             this._readIndicator.classList.add("read");
             this._readIndicator.classList.remove("partial", "unread");
-            this._readIndicator.title = ( localize(7009, "Mark as unread"));
+            this._readIndicator.title = ( localize(8115, "Mark as unread"));
         } else if (someRead) {
-            this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
+            this._readIndicator.appendChild(renderIcon(Codicon.circleFilledCompact));
             this._readIndicator.classList.remove("read", "unread");
             this._readIndicator.classList.add("partial");
-            this._readIndicator.title = ( localize(7010, "Mark all as read"));
+            this._readIndicator.title = ( localize(8116, "Mark all as read"));
         } else {
-            this._readIndicator.appendChild(renderIcon(Codicon.circleFilled));
+            this._readIndicator.appendChild(renderIcon(Codicon.circleFilledCompact));
             this._readIndicator.classList.remove("read", "partial");
             this._readIndicator.classList.add("unread");
-            this._readIndicator.title = ( localize(7011, "Mark as read"));
+            this._readIndicator.title = ( localize(8117, "Mark as read"));
         }
     }
     _updateTitle() {
         const count = this._explanations.length;
         if (count === 1) {
-            this._titleNode.textContent = ( localize(7012, "1 change"));
+            this._titleNode.textContent = ( localize(8118, "1 change"));
         } else {
-            this._titleNode.textContent = ( localize(7013, "{0} changes", count));
+            this._titleNode.textContent = ( localize(8119, "{0} changes", count));
         }
     }
     _updateToggleButton() {
         clearNode(this._toggleButton);
         if (this._isExpanded) {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronUp));
-            this._toggleButton.title = ( localize(7014, "Collapse"));
+            this._toggleButton.title = ( localize(8120, "Collapse"));
         } else {
             this._toggleButton.appendChild(renderIcon(Codicon.chevronDown));
-            this._toggleButton.title = ( localize(7015, "Expand"));
+            this._toggleButton.title = ( localize(8121, "Expand"));
         }
     }
     _buildExplanationItems() {
@@ -217,9 +217,9 @@ class ChatEditingExplanationWidget extends Disposable {
             const item = $("div.chat-explanation-item");
             const lineInfo = $("span.chat-explanation-line-info");
             if (exp.startLineNumber === exp.endLineNumber) {
-                lineInfo.textContent = ( localize(7016, "Line {0}", exp.startLineNumber));
+                lineInfo.textContent = ( localize(8122, "Line {0}", exp.startLineNumber));
             } else {
-                lineInfo.textContent = ( localize(7017, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
+                lineInfo.textContent = ( localize(8123, "Lines {0}-{1}", exp.startLineNumber, exp.endLineNumber));
             }
             item.appendChild(lineInfo);
             const text = $("span.chat-explanation-text");
@@ -238,7 +238,7 @@ class ChatEditingExplanationWidget extends Disposable {
             item.appendChild(itemReadIndicator);
             const replyButton = $("div.chat-explanation-reply-button");
             replyButton.appendChild(renderIcon(Codicon.arrowRight));
-            replyButton.title = ( localize(7018, "Follow up on this change"));
+            replyButton.title = ( localize(8124, "Follow up on this change"));
             item.appendChild(replyButton);
             this._eventStore.add(addDisposableListener(replyButton, "click", async e => {
                 e.stopPropagation();
@@ -329,7 +329,7 @@ class ChatEditingExplanationWidget extends Disposable {
             element.classList.add("read");
             element.classList.remove("unread");
         } else {
-            element.appendChild(renderIcon(Codicon.circleFilled));
+            element.appendChild(renderIcon(Codicon.circleFilledCompact));
             element.classList.remove("read");
             element.classList.add("unread");
         }

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.d.ts

@@ -37,14 +37,14 @@ export declare class ChatEditingModifiedDocumentEntry extends AbstractChatEditin
     private readonly _docFileEditorModel;
     get changesCount(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     get diffInfo(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<{
-        originalModel: ITextModel;
-        modifiedModel: ITextModel;
-        keep: (changes: import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping) => Promise<boolean>;
-        undo: (changes: import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping) => Promise<boolean>;
         identical: boolean;
         quitEarly: boolean;
         changes: readonly import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping[];
         moves: readonly import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/linesDiffComputer").MovedText[];
+        originalModel: ITextModel;
+        modifiedModel: ITextModel;
+        keep: (changes: import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping) => Promise<boolean>;
+        undo: (changes: import("@codingame/monaco-vscode-api/vscode/vs/editor/common/diff/rangeMapping").DetailedLineRangeMapping) => Promise<boolean>;
     }>;
     get linesAdded(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;
     get linesRemoved(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").IObservable<number>;