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

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

@@ -52,9 +52,6 @@
 	max-height: min(720px, 75vh);
 }
 
-.interactive-session .chat-plan-review-container.chat-plan-review-expanded .chat-confirmation-widget-message.chat-plan-review-body {
-	max-height: min(600px, 65vh);
-}
 /* ---------- Title bar ---------- */
 .interactive-session .chat-plan-review-container .chat-plan-review-title {
 	display: flex;
@@ -101,18 +98,13 @@
 	background: var(--vscode-toolbar-hoverBackground) !important;
 }
 
-/* Icon-only square buttons (restore, chevron). Exactly 22x22 with no padding,
- * matching `.monaco-button.chat-question-collapse-toggle`. */
+/* Icon-only square buttons (restore, chevron, edit). Exactly 22x22 with no
+ * padding, matching `.monaco-button.chat-question-collapse-toggle`. */
 .interactive-session .chat-plan-review-container .monaco-button.chat-plan-review-title-icon-button {
 	width: 22px;
 	padding: 0;
 }
 
-.interactive-session .chat-plan-review-container .monaco-button.chat-plan-review-edit {
-	font-size: var(--vscode-chat-font-size-body-s);
-	color: var(--vscode-foreground) !important;
-}
-
 /* Inline slot in the title bar. The action buttons (Approve + Reject) get
  * re-rendered here when the widget is collapsed so the user can act on the
  * plan without expanding it. */
@@ -129,15 +121,44 @@
 	display: flex;
 }
 
-.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button {
+/* Action button row sizing — shared between the inline (collapsed) action
+ * slot in the title bar and the footer. Keep these two rule sets together so
+ * any tweaks stay in sync. */
+.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button,
+.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button {
 	width: auto;
 	min-width: auto;
 	padding: 0 10px;
 	height: 22px;
 }
 
-.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button-dropdown {
+.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button-dropdown,
+.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button-dropdown {
 	width: auto;
+	height: 22px;
+	align-items: center;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button-dropdown > .monaco-button,
+.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button-dropdown > .monaco-button {
+	height: 22px;
+	box-sizing: border-box;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button-dropdown > .monaco-button.monaco-dropdown-button,
+.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button-dropdown > .monaco-button.monaco-dropdown-button {
+	padding: 0 4px;
+}
+
+/* The default-colors separator has `padding: 4px 0` plus 1px top/bottom
+ * borders; with content-box sizing it would visually overflow the 22px
+ * dropdown wrapper and make the chevron half look taller than the primary
+ * button. Force border-box and a fixed height so it matches. */
+.interactive-session .chat-plan-review-container .chat-plan-review-inline-actions .monaco-button-dropdown > .monaco-button-dropdown-separator,
+.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button-dropdown > .monaco-button-dropdown-separator {
+	box-sizing: border-box;
+	height: 22px;
+	padding: 3px 0;
 }
 
 /* ---------- Scrollable markdown body ----------
@@ -146,17 +167,19 @@
  * to clip and display its scrollbar against. DomScrollableElement sets the
  * inner element's `overflow: hidden` inline, so we don't set overflow here. */
 .interactive-session .chat-plan-review-container .chat-confirmation-widget-message-scrollable.chat-plan-review-body-scrollable {
-	flex: 1;
+	flex: 1 1 auto;
 	min-height: 0;
 }
 
+/* The inner element must fill the wrapper exactly — `DomScrollableElement`
+ * measures `clientHeight` against it, so a taller layout height would break
+ * scrollbar geometry once the feedback section claims part of the widget. */
 .interactive-session .chat-plan-review-container .chat-confirmation-widget-message.chat-plan-review-body {
-	flex: 1;
-	min-height: 0;
-	max-height: min(300px, 40vh);
 	padding: 6px 12px;
 	background: transparent;
 	border-bottom: none;
+	height: 100%;
+	box-sizing: border-box;
 }
 
 .interactive-session .chat-plan-review-container .chat-confirmation-widget-message.chat-plan-review-body .rendered-markdown p:first-child {
@@ -165,6 +188,20 @@
 
 .interactive-session .chat-plan-review-container .chat-confirmation-widget-message.chat-plan-review-body .rendered-markdown > :last-child {
 	margin-bottom: 0;
+	margin-top: 0;
+	padding-inline-start: 20px;
+}
+
+.interactive-session .chat-plan-review-container .chat-confirmation-widget-message.chat-plan-review-body.chat-plan-review-body-editor {
+	min-height: min(280px, 35vh);
+}
+
+.interactive-session .chat-plan-review-container.chat-plan-review-expanded .chat-confirmation-widget-message.chat-plan-review-body.chat-plan-review-body-editor {
+	min-height: min(520px, 60vh);
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-body-editor > .monaco-editor {
+	height: 100%;
 }
 
 /* ---------- Feedback section (fixed; outside scroll) ---------- */
@@ -177,7 +214,17 @@
 	flex-shrink: 0;
 }
 
+.interactive-session .chat-plan-review-container .chat-plan-review-feedback-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 6px;
+	min-width: 0;
+}
+
 .interactive-session .chat-plan-review-container .chat-plan-review-feedback-label {
+	flex: 1;
+	min-width: 0;
 	font-size: var(--vscode-chat-font-size-body-s);
 	color: var(--vscode-descriptionForeground);
 }
@@ -209,29 +256,124 @@
 	color: var(--vscode-input-placeholderForeground);
 }
 
-/* ---------- Footer buttons ---------- */
-.interactive-session .chat-plan-review-container > .chat-confirmation-widget2.chat-plan-review > .chat-confirmation-widget-buttons.chat-plan-review-footer {
-	justify-content: flex-start;
-	border-top: 1px solid var(--vscode-chat-requestBorder);
-	padding: 6px 8px;
+/* ---------- Inline comments list (anchored feedback captured from editor) ---------- */
+.interactive-session .chat-plan-review-container .chat-plan-review-comments-list-scrollable {
+	margin-bottom: 2px;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comments-list {
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+	max-height: 100px;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-row {
+	display: flex;
+	align-items: stretch;
+	min-width: 0;
+	border: 1px solid transparent;
+	border-radius: 4px;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-row:hover {
+	background: var(--vscode-list-hoverBackground);
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-row:focus-within {
+	outline: 1px solid var(--vscode-focusBorder);
+	outline-offset: -1px;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-reveal {
+	flex: 1;
+	min-width: 0;
+	display: flex;
+	align-items: baseline;
+	gap: 8px;
+	padding: 3px 6px;
+	background: transparent;
+	border: none;
+	color: var(--vscode-foreground);
+	font: inherit;
+	font-size: var(--vscode-chat-font-size-body-s);
+	text-align: left;
+	cursor: pointer;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-reveal:focus {
+	outline: none;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-remove {
 	flex-shrink: 0;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	width: 22px;
+	padding: 0;
+	background: transparent;
+	border: none;
+	color: var(--vscode-icon-foreground);
+	cursor: pointer;
+	opacity: 0;
+	transition: opacity 0.1s ease-in-out;
 }
 
-.interactive-session .chat-plan-review-container > .chat-confirmation-widget2.chat-plan-review > .chat-confirmation-widget-buttons.chat-plan-review-footer .chat-buttons {
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-row:hover .chat-plan-review-comment-remove,
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-row:focus-within .chat-plan-review-comment-remove,
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-remove:focus {
+	opacity: 1;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-remove:hover {
+	background: var(--vscode-toolbar-hoverBackground);
+	border-radius: 4px;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-line {
+	flex-shrink: 0;
+	color: var(--vscode-descriptionForeground);
+	font-variant-numeric: tabular-nums;
+}
+
+.interactive-session .chat-plan-review-container .chat-plan-review-comment-text {
+	flex: 1;
+	min-width: 0;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* ---------- Feedback header actions (Back, Clear All) ---------- */
+.interactive-session .chat-plan-review-container .chat-plan-review-feedback-header-actions {
 	display: flex;
-	column-gap: 6px;
 	align-items: center;
+	gap: 4px;
+	flex-shrink: 0;
 }
 
-.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button {
+.interactive-session .chat-plan-review-container .monaco-button.chat-plan-review-feedback-close,
+.interactive-session .chat-plan-review-container .monaco-button.chat-plan-review-feedback-clear-all,
+.interactive-session .chat-plan-review-container .monaco-button.chat-plan-review-review-button:not(.chat-plan-review-title-icon-button) {
 	width: auto;
 	min-width: auto;
-	padding: 0 10px;
+	padding: 0 8px;
 	height: 22px;
 }
 
-.interactive-session .chat-plan-review-container .chat-plan-review-footer .monaco-button-dropdown {
-	width: auto;
+/* ---------- Footer buttons ---------- */
+.interactive-session .chat-plan-review-container > .chat-confirmation-widget2.chat-plan-review > .chat-confirmation-widget-buttons.chat-plan-review-footer {
+	justify-content: flex-start;
+	border-top: 1px solid var(--vscode-chat-requestBorder);
+	padding: 6px 8px;
+	flex-shrink: 0;
+}
+
+.interactive-session .chat-plan-review-container > .chat-confirmation-widget2.chat-plan-review > .chat-confirmation-widget-buttons.chat-plan-review-footer .chat-buttons {
+	display: flex;
+	column-gap: 6px;
+	align-items: center;
 }
 
 /* ---------- Hidden helper ---------- */

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

@@ -62,12 +62,11 @@
 		display: flex;
 		flex-direction: column;
 		flex-shrink: 0;
-		overflow: hidden;
 
 		.chat-question-title-row {
 			display: flex;
 			justify-content: space-between;
-			align-items: center;
+			align-items: flex-start;
 			gap: 8px;
 			min-width: 0;
 			padding: 8px 8px 8px 16px;
@@ -77,8 +76,9 @@
 		.chat-question-title {
 			flex: 1;
 			min-width: 0;
-			word-wrap: break-word;
-			overflow-wrap: break-word;
+			word-break: break-word;
+			overflow-wrap: anywhere;
+			white-space: normal;
 			font-weight: 500;
 			font-size: var(--vscode-chat-font-size-body-s);
 			margin: 0;
@@ -462,6 +462,13 @@
 	}
 }
 
+/* user-select: text for elicitation dialog text areas */
+.interactive-session .chat-question-carousel-container .chat-question-detailed-message,
+.interactive-session .chat-question-carousel-container .chat-question-description {
+	user-select: text;
+	-webkit-user-select: text;
+}
+
 /* carousel-level message (e.g. from MCP elicitation) */
 .interactive-session .chat-question-carousel-container .chat-question-carousel-message {
 	padding: 8px 16px 0;
@@ -470,6 +477,8 @@
 	max-height: min(220px, 25vh);
 	overflow-y: auto;
 	overscroll-behavior: contain;
+	user-select: text;
+	-webkit-user-select: text;
 
 	.rendered-markdown p {
 		margin: 0;

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

@@ -376,7 +376,7 @@
 	}
 
 	&.chat-thinking-persistent-streaming {
-		margin-bottom: 0;
+		margin-bottom: 3px;
 	}
 
 	> .monaco-scrollable-element > .shadow {

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

@@ -151,6 +151,29 @@
 		opacity: 0.4;
 	}
 
+	.monaco-button.chat-tool-carousel-header-button {
+		min-width: 22px;
+		width: 22px;
+		height: 22px;
+		padding: 0;
+		border: none !important;
+		box-shadow: none !important;
+		background: transparent !important;
+		color: var(--vscode-icon-foreground) !important;
+		cursor: pointer;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.monaco-button.chat-tool-carousel-header-button:hover:not(.disabled) {
+		background: var(--vscode-toolbar-hoverBackground) !important;
+	}
+
+	&.chat-tool-carousel-content-expanded {
+		max-height: min(650px, 70vh);
+	}
+
 	.monaco-list:focus {
 		outline: none !important;
 	}
@@ -211,6 +234,12 @@
 			max-height: min(200px, 30vh);
 		}
 
+		.chat-tool-carousel-content-expanded & {
+			.chat-confirmation-widget-message {
+				max-height: min(500px, 55vh);
+			}
+		}
+
 		.chat-confirmation-message-terminal-editor .interactive-result-code-block {
 			background-color: var(--vscode-sideBar-background);
 		}

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

@@ -37,6 +37,7 @@ export declare abstract class AbstractToolConfirmationSubPart extends BaseChatTo
     constructor(toolInvocation: IChatToolInvocation, context: IChatContentPartRenderContext, instantiationService: IInstantiationService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatWidgetService: IChatWidgetService, languageModelToolsService: ILanguageModelToolsService);
     protected render(config: IToolConfirmationConfig): void;
     protected confirmWith(toolInvocation: IChatToolInvocation, reason: ConfirmedReason): void;
+    private buildCustomOptionButtons;
     protected additionalPrimaryActions(): AbstractToolPrimaryAction[];
     /**
      * When true, "Allow Once" stays the primary button even when a

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

@@ -1,11 +1,13 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { ConfirmationOptionKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatToolInvocation, ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
@@ -42,19 +44,10 @@ let AbstractToolConfirmationSubPart = class AbstractToolConfirmationSubPart exte
             toolInvocation
         } = this;
         const state = toolInvocation.state.get();
-        const customButtons = state.type === IChatToolInvocation.StateKind.WaitingForConfirmation ? state.confirmationMessages?.customButtons : undefined;
+        const customOptions = state.type === IChatToolInvocation.StateKind.WaitingForConfirmation ? state.confirmationMessages?.customOptions : undefined;
         let buttons;
-        if (customButtons && customButtons.length > 0) {
-            buttons = ( customButtons.map((label, index) => ({
-                label,
-                data: () => {
-                    this.confirmWith(toolInvocation, {
-                        type: ToolConfirmKind.UserAction,
-                        selectedButton: label
-                    });
-                },
-                isSecondary: index > 0
-            })));
+        if (customOptions && customOptions.length > 0) {
+            buttons = this.buildCustomOptionButtons(toolInvocation, customOptions);
         } else {
             const allowTooltip = keybindingService.appendKeybinding(config.allowLabel, config.allowActionId);
             const skipTooltip = keybindingService.appendKeybinding(config.skipLabel, config.skipActionId);
@@ -77,7 +70,7 @@ let AbstractToolConfirmationSubPart = class AbstractToolConfirmationSubPart exte
                 data: primaryAction.data,
                 moreActions: moreActions.length > 0 ? moreActions : undefined
             }, {
-                label: ( localize(7022, "Skip")),
+                label: ( localize(7304, "Skip")),
                 tooltip: skipTooltip,
                 data: () => {
                     this.confirmWith(toolInvocation, {
@@ -105,9 +98,16 @@ let AbstractToolConfirmationSubPart = class AbstractToolConfirmationSubPart exte
         );
         const hasToolConfirmation = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
         hasToolConfirmation.set(true);
-        this._register(confirmWidget.onDidClick(button => {
+        this._register(confirmWidget.onDidClick((
+            {
+                button,
+                isTouchClick
+            }
+        ) => {
             button.data();
-            this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+            if (!isTouchClick) {
+                this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+            }
         }));
         this._register(toDisposable(() => hasToolConfirmation.reset()));
         this.domNode = confirmWidget.domNode;
@@ -115,6 +115,51 @@ let AbstractToolConfirmationSubPart = class AbstractToolConfirmationSubPart exte
     confirmWith(toolInvocation, reason) {
         IChatToolInvocation.confirmWith(toolInvocation, reason);
     }
+    buildCustomOptionButtons(toolInvocation, options) {
+        const approve = [];
+        const deny = [];
+        for (const option of options) {
+            (option.kind === ConfirmationOptionKind.Deny ? deny : approve).push(option);
+        }
+        const makeAction = option => ({
+            label: option.label,
+            data: () => {
+                this.confirmWith(toolInvocation, {
+                    type: ToolConfirmKind.UserAction,
+                    selectedButton: option.id,
+                    selectedButtonKind: option.kind
+                });
+            }
+        });
+        const makeGroupButton = (group, isSecondary) => {
+            const [primary, ...rest] = group;
+            const button = {
+                ...makeAction(primary),
+                isSecondary
+            };
+            if (rest.length > 0) {
+                const moreActions = [];
+                let prevGroup = primary.group;
+                for (const option of rest) {
+                    if (option.group !== prevGroup) {
+                        moreActions.push(( new Separator()));
+                    }
+                    moreActions.push(makeAction(option));
+                    prevGroup = option.group;
+                }
+                button.moreActions = moreActions;
+            }
+            return button;
+        };
+        const buttons = [];
+        if (approve.length > 0) {
+            buttons.push(makeGroupButton(approve, false));
+        }
+        if (deny.length > 0) {
+            buttons.push(makeGroupButton(deny, approve.length > 0));
+        }
+        return buttons;
+    }
     additionalPrimaryActions() {
         return [];
     }

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

@@ -46,9 +46,9 @@ let ExtensionsInstallConfirmationWidgetSubPart = class ExtensionsInstallConfirma
         append(this.domNode, chatExtensionsContentPart.domNode);
         const state = toolInvocation.state.get();
         if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
-            const allowLabel = ( localize(7023, "Allow"));
+            const allowLabel = ( localize(7305, "Allow"));
             const allowTooltip = keybindingService.appendKeybinding(allowLabel, AcceptToolConfirmationActionId);
-            const cancelLabel = ( localize(7024, "Cancel"));
+            const cancelLabel = ( localize(7306, "Cancel"));
             const cancelTooltip = keybindingService.appendKeybinding(cancelLabel, CancelChatActionId);
             const enableAllowButtonEvent = this._register(( new Emitter()));
             const buttons = [{
@@ -68,18 +68,25 @@ let ExtensionsInstallConfirmationWidgetSubPart = class ExtensionsInstallConfirma
                 tooltip: cancelTooltip
             }];
             const confirmWidget = this._register(instantiationService.createInstance(ChatConfirmationWidget, context, {
-                title: state.confirmationMessages?.title ?? ( localize(7025, "Install Extensions")),
+                title: state.confirmationMessages?.title ?? ( localize(7307, "Install Extensions")),
                 message: state.confirmationMessages?.message ?? ( localize(
-                    7026,
+                    7308,
                     "Click the Install button on the extension and then press Allow when finished."
                 )),
                 buttons
             }));
             this._confirmWidget = confirmWidget;
             append(this.domNode, confirmWidget.domNode);
-            this._register(confirmWidget.onDidClick(button => {
+            this._register(confirmWidget.onDidClick((
+                {
+                    button,
+                    isTouchClick
+                }
+            ) => {
                 IChatToolInvocation.confirmWith(toolInvocation, button.data);
-                chatWidgetService.getWidgetBySessionResource(context.element.sessionResource)?.focusInput();
+                if (!isTouchClick) {
+                    chatWidgetService.getWidgetBySessionResource(context.element.sessionResource)?.focusInput();
+                }
             }));
             const hasToolConfirmationKey = ChatContextKeys.Editing.hasToolConfirmation.bindTo(contextKeyService);
             hasToolConfirmationKey.set(true);

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

@@ -84,7 +84,7 @@ let ChatMcpAppModel = class ChatMcpAppModel extends Disposable {
         this._height = ChatMcpAppModel_1.heightCache.get(this.toolInvocation) ?? 300;
         this._webview = this._register(this._webviewService.createWebviewElement({
             origin: this._webviewOrigin,
-            title: ( localize(7027, "MCP App")),
+            title: ( localize(7309, "MCP App")),
             options: {
                 purpose: WebviewContentPurpose.ChatOutputItem,
                 enableFindWidget: false,

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

@@ -100,7 +100,7 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
             {
                 container.style.display = "none";
                 const progressMessage = $("span");
-                progressMessage.textContent = ( localize(7028, "Loading MCP App..."));
+                progressMessage.textContent = ( localize(7310, "Loading MCP App..."));
                 const progressPart = this._instantiationService.createInstance(
                     ChatProgressSubPart,
                     progressMessage,
@@ -130,12 +130,12 @@ let ChatMcpAppSubPart = class ChatMcpAppSubPart extends BaseChatToolInvocationSu
     _showError(container, error) {
         const errorNode = $(".mcp-app-error");
         const errorMessage = ( new MarkdownString());
-        errorMessage.appendText(( localize(7029, "Error loading MCP App: {0}", error.message || String(error))));
+        errorMessage.appendText(( localize(7311, "Error loading MCP App: {0}", error.message || String(error))));
         const errorWidget = this._register(( new ChatErrorWidget(ChatErrorLevel.Error, errorMessage, this._markdownRendererService)));
         errorNode.appendChild(errorWidget.domNode);
         const buttonContainer = append(errorNode, $(".chat-buttons-container"));
         const retryButton = this._register(( new Button(buttonContainer, defaultButtonStyles)));
-        retryButton.label = ( localize(7030, "Retry"));
+        retryButton.label = ( localize(7312, "Retry"));
         this._register(retryButton.onDidClick(() => {
             this._model.retry();
         }));

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

@@ -38,8 +38,8 @@ let ChatMissingSandboxDepsConfirmationSubPart = class ChatMissingSandboxDepsConf
         this.render({
             allowActionId: AcceptToolConfirmationActionId,
             skipActionId: SkipToolConfirmationActionId,
-            allowLabel: ( localize(7031, "Install")),
-            skipLabel: ( localize(7032, "Cancel")),
+            allowLabel: ( localize(7313, "Install")),
+            skipLabel: ( localize(7314, "Cancel")),
             partType: "chatMissingSandboxDepsConfirmation"
         });
     }

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

@@ -73,9 +73,16 @@ let ChatModifiedFilesConfirmationSubPart = class ChatModifiedFilesConfirmationSu
         );
         const hasToolConfirmation = ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService);
         hasToolConfirmation.set(true);
-        this._register(confirmWidget.onDidClick(button => {
+        this._register(confirmWidget.onDidClick((
+            {
+                button,
+                isTouchClick
+            }
+        ) => {
             button.data();
-            this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+            if (!isTouchClick) {
+                this.chatWidgetService.getWidgetBySessionResource(this.context.element.sessionResource)?.focusInput();
+            }
         }));
         this._register(toDisposable(() => hasToolConfirmation.reset()));
         this.domNode = confirmWidget.domNode;
@@ -130,7 +137,7 @@ let ChatModifiedFilesConfirmationSubPart = class ChatModifiedFilesConfirmationSu
         const addedSpan = append(countsContainer, $(".working-set-lines-added"));
         const removedSpan = append(countsContainer, $(".working-set-lines-removed"));
         titleButton.element.appendChild(countsContainer);
-        const filesLabel = data.modifiedFiles.length === 1 ? ( localize(7033, "1 file changed")) : ( localize(7034, "{0} files changed", data.modifiedFiles.length));
+        const filesLabel = data.modifiedFiles.length === 1 ? ( localize(7315, "1 file changed")) : ( localize(7316, "{0} files changed", data.modifiedFiles.length));
         titleButton.label = filesLabel;
         let added = 0;
         let removed = 0;
@@ -146,13 +153,13 @@ let ChatModifiedFilesConfirmationSubPart = class ChatModifiedFilesConfirmationSu
             addedSpan.textContent = `+${added}`;
             removedSpan.textContent = `-${removed}`;
             titleButton.element.setAttribute("aria-label", ( localize(
-                7035,
+                7317,
                 "{0}, {1} lines added, {2} lines removed",
                 filesLabel,
                 added,
                 removed
             )));
-            countsContainer.setAttribute("aria-label", ( localize(7036, "{0} lines added, {1} lines removed", added, removed)));
+            countsContainer.setAttribute("aria-label", ( localize(7318, "{0} lines added, {1} lines removed", added, removed)));
         } else {
             countsContainer.remove();
             titleButton.element.setAttribute("aria-label", filesLabel);
@@ -162,8 +169,8 @@ let ChatModifiedFilesConfirmationSubPart = class ChatModifiedFilesConfirmationSu
             secondary: true,
             small: true,
             supportIcons: true,
-            ariaLabel: ( localize(7037, "View All Changes")),
-            title: ( localize(7037, "View All Changes"))
+            ariaLabel: ( localize(7319, "View All Changes")),
+            title: ( localize(7319, "View All Changes"))
         })));
         viewAllChangesButton.element.classList.add("default-colors");
         viewAllChangesButton.icon = Codicon.diffMultiple;
@@ -253,7 +260,7 @@ let ChatModifiedFilesConfirmationSubPart = class ChatModifiedFilesConfirmationSu
     }
     async openAllChanges(data) {
         await this.commandService.executeCommand("_workbench.openMultiDiffEditor", {
-            title: ( localize(7038, "All Changes")),
+            title: ( localize(7320, "All Changes")),
             resources: ( data.modifiedFiles.map(file => ({
                 originalUri: file.originalContentUri ? URI.revive(file.originalContentUri) : file.originalUri ? URI.revive(file.originalUri) : undefined,
                 modifiedUri: file.modifiedContentUri ? URI.revive(file.modifiedContentUri) : URI.revive(file.uri)