More confirmation polish

Author: Tyriar

src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts

@@ -263,6 +263,7 @@ abstract class BaseSimpleChatConfirmationWidget extends Disposable {
 	}
 }
 
+/** @deprecated Use ChatConfirmationWidget instead */
 export class SimpleChatConfirmationWidget extends BaseSimpleChatConfirmationWidget {
 	private _renderedMessage: HTMLElement | undefined;
 

src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css

@@ -201,9 +201,24 @@
 			margin: 0 !important;
 		}
 	}
+
+	p,
+	.rendered-markdown {
+		display: inline;
+	}
+}
+
+.chat-confirmation-widget2 .disclaimer {
+	margin-bottom: 0 !important;
+	font-style: italic;
+	opacity: 0.7 !important;
+
+	.chat-markdown-part > p {
+		margin-bottom: 6px !important;
+	}
 }
 
-.chat-confirmation-widget2 .chat-confirmation-widget-message:not(:has(.interactive-result-code-block)) {
+.chat-confirmation-widget2 .chat-confirmation-widget-message:not(:has(.chat-confirmation-message-terminal)) {
 	background: var(--vscode-chat-requestBackground);
 	border: 1px solid var(--vscode-chat-requestBorder);
 	padding: 6px 9px 0 9px;
@@ -214,11 +229,11 @@
 	}
 }
 
-.chat-confirmation-widget2.hideButtons .chat-buttons-container {
-	display: none;
-}
-
-.interactive-session .interactive-response .chat-confirmation-widget2 .chat-confirmation-widget-message .interactive-result-code-block {
+.interactive-session .interactive-response .chat-confirmation-widget2 .chat-confirmation-message-terminal .interactive-result-code-block {
 	border-top-left-radius: 0px;
 	border-top-right-radius: 0px;
 }
+
+.chat-confirmation-widget2.hideButtons .chat-buttons-container {
+	display: none;
+}

src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatExtensionsInstallToolSubPart.ts

@@ -16,7 +16,7 @@ import { IChatToolInvocation } from '../../../common/chatService.js';
 import { CancelChatActionId } from '../../actions/chatExecuteActions.js';
 import { AcceptToolConfirmationActionId } from '../../actions/chatToolActions.js';
 import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
-import { SimpleChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
+import { IChatConfirmationButton, ChatConfirmationWidget } from '../chatConfirmationWidget.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { ChatExtensionsContentPart } from '../chatExtensionsContentPart.js';
 import { BaseChatToolInvocationSubPart } from './chatToolInvocationSubPart.js';
@@ -73,7 +73,7 @@ export class ExtensionsInstallConfirmationWidgetSubPart extends BaseChatToolInvo
 			];
 
 			const confirmWidget = this._register(instantiationService.createInstance(
-				SimpleChatConfirmationWidget,
+				ChatConfirmationWidget,
 				context.container,
 				{
 					title: toolInvocation.confirmationMessages?.title ?? localize('installExtensions', "Install Extensions"),

src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts

@@ -162,7 +162,7 @@ export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationS
 		this._register(model.onDidChangeContent(e => {
 			terminalData.commandLine.userEdited = model.getValue();
 		}));
-		const messageElement = $('');
+		const messageElement = $('.chat-confirmation-message-terminal');
 		dom.append(messageElement, editor.object.element);
 		this._register(hoverService.setupDelayedHover(messageElement, {
 			content: message,

src/vs/workbench/contrib/chat/browser/chatContentParts/toolInvocationParts/chatToolConfirmationSubPart.ts

@@ -30,7 +30,7 @@ import { AcceptToolConfirmationActionId } from '../../actions/chatToolActions.js
 import { IChatCodeBlockInfo, IChatWidgetService } from '../../chat.js';
 import { renderFileWidgets } from '../../chatInlineAnchorWidget.js';
 import { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
-import { SimpleChatConfirmationWidget, ChatCustomConfirmationWidget, IChatConfirmationButton, ChatConfirmationWidget } from '../chatConfirmationWidget.js';
+import { ChatCustomConfirmationWidget, IChatConfirmationButton, ChatConfirmationWidget } from '../chatConfirmationWidget.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { IChatMarkdownAnchorService } from '../chatMarkdownAnchorService.js';
 import { ChatMarkdownContentPart, EditorPool } from '../chatMarkdownContentPart.js';
@@ -105,7 +105,7 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 				tooltip: cancelTooltip
 			}];
 
-		let confirmWidget: SimpleChatConfirmationWidget | ChatCustomConfirmationWidget;
+		let confirmWidget: ChatCustomConfirmationWidget;
 		if (typeof message === 'string') {
 			const tool = languageModelToolsService.getTool(toolInvocation.toolId);
 			confirmWidget = this._register(this.instantiationService.createInstance(
@@ -333,7 +333,21 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 	}
 
 	private _makeMarkdownPart(container: HTMLElement, message: string | IMarkdownString, codeBlockRenderOptions: ICodeBlockRenderOptions) {
-		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, { kind: 'markdownContent', content: typeof message === 'string' ? new MarkdownString().appendText(message) : message }, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, undefined, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
+		const part = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart,
+			{
+				kind: 'markdownContent',
+				content: typeof message === 'string' ? new MarkdownString().appendText(message) : message
+			},
+			this.context,
+			this.editorPool,
+			false,
+			this.codeBlockStartIndex,
+			this.renderer,
+			undefined,
+			this.currentWidthDelegate(),
+			this.codeBlockModelCollection,
+			{ codeBlockRenderOptions }
+		));
 		renderFileWidgets(part.domNode, this.instantiationService, this.chatMarkdownAnchorService, this._store);
 		container.append(part.domNode);
 

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/task/runTaskTool.ts

@@ -17,6 +17,7 @@ import { getOutput } from '../../outputHelpers.js';
 import { getTaskDefinition, getTaskForTool } from '../../taskHelpers.js';
 import { MarkdownString } from '../../../../../../../base/common/htmlContent.js';
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
+import { Codicon } from '../../../../../../../base/common/codicons.js';
 
 type RunTaskToolClassification = {
 	taskId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the task.' };
@@ -149,6 +150,7 @@ export const RunTaskToolData: IToolData = {
 	displayName: localize('runInTerminalTool.displayName', 'Run Task'),
 	modelDescription: 'Runs a VS Code task.\n\n- If you see that an appropriate task exists for building or running code, prefer to use this tool to run the task instead of using the run_in_terminal tool.\n- Make sure that any appropriate build or watch task is running before trying to run tests or execute code.\n- If the user asks to run a task, use this tool to do so.',
 	userDescription: localize('runInTerminalTool.userDescription', 'Tool for running tasks in the workspace'),
+	icon: Codicon.tools,
 	source: ToolDataSource.Internal,
 	inputSchema: {
 		'type': 'object',