Further polishing cases

Author: Tyriar

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

@@ -182,10 +182,12 @@
 	padding: 5px 9px;
 	display: flex;
 	justify-content: space-between;
+	column-gap: 10px;
 
 	.chat-buttons {
 		display: flex;
 		column-gap: 10px;
+		align-items: center;
 	}
 
 	.monaco-button {
@@ -212,19 +214,6 @@
 	}
 }
 
-/* .chat-confirmation-widget2 .chat-buttons-container {
-	background: var(--vscode-chat-requestBackground);
-	border: 1px solid var(--vscode-chat-requestBorder);
-	border-top: none;
-	border-bottom-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-	padding: 8px 9px;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-top: 0;
-} */
-
 .chat-confirmation-widget2.hideButtons .chat-buttons-container {
 	display: none;
 }

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

@@ -87,18 +87,18 @@ export class ChatTerminalToolConfirmationSubPart extends BaseChatToolInvocationS
 		terminalData = migrateLegacyTerminalToolSpecificData(terminalData);
 
 		const { title, message, disclaimer, terminalCustomActions } = toolInvocation.confirmationMessages;
-		const continueLabel = localize('continue', "Continue");
-		const continueKeybinding = keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
-		const continueTooltip = continueKeybinding ? `${continueLabel} (${continueKeybinding})` : continueLabel;
+		const runLabel = localize('run', "Run");
+		const runKeybinding = keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
+		const runTooltip = runKeybinding ? `${runLabel} (${runKeybinding})` : runLabel;
 		const cancelLabel = localize('cancel', "Cancel");
 		const cancelKeybinding = keybindingService.lookupKeybinding(CancelChatActionId)?.getLabel();
 		const cancelTooltip = cancelKeybinding ? `${cancelLabel} (${cancelKeybinding})` : cancelLabel;
 
 		const buttons: IChatConfirmationButton[] = [
 			{
-				label: continueLabel,
+				label: runLabel,
 				data: true,
-				tooltip: continueTooltip,
+				tooltip: runTooltip,
 				moreActions: terminalCustomActions,
 			},
 			{

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 } from '../chatConfirmationWidget.js';
+import { SimpleChatConfirmationWidget, ChatCustomConfirmationWidget, IChatConfirmationButton, ChatConfirmationWidget } from '../chatConfirmationWidget.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { IChatMarkdownAnchorService } from '../chatMarkdownAnchorService.js';
 import { ChatMarkdownContentPart, EditorPool } from '../chatMarkdownContentPart.js';
@@ -107,10 +107,18 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 
 		let confirmWidget: SimpleChatConfirmationWidget | ChatCustomConfirmationWidget;
 		if (typeof message === 'string') {
+			const tool = languageModelToolsService.getTool(toolInvocation.toolId);
 			confirmWidget = this._register(this.instantiationService.createInstance(
-				SimpleChatConfirmationWidget,
+				ChatConfirmationWidget,
 				this.context.container,
-				{ title, subtitle: toolInvocation.originMessage, buttons, message, toolbarData: { arg: toolInvocation, partType: 'chatToolConfirmation' } }
+				{
+					title,
+					icon: tool?.icon && 'id' in tool.icon ? tool.icon : Codicon.tools,
+					subtitle: toolInvocation.originMessage,
+					buttons,
+					message,
+					toolbarData: { arg: toolInvocation, partType: 'chatToolConfirmation' }
+				}
 			));
 		} else {
 			const codeBlockRenderOptions: ICodeBlockRenderOptions = {

src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/bufferOutputPolling.ts

@@ -163,8 +163,8 @@ export function promptForMorePolling(command: string, token: CancellationToken,
 			let part: ChatElicitationRequestPart | undefined = undefined;
 			const promise = new Promise<boolean>(resolve => {
 				const thePart = part = new ChatElicitationRequestPart(
-					new MarkdownString(localize('poll.terminal.waiting', "Continue waiting for `{0}` to finish?", command)),
-					new MarkdownString(localize('poll.terminal.polling', "Copilot will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes.")),
+					new MarkdownString(localize('poll.terminal.waiting', "Continue waiting?")),
+					new MarkdownString(localize('poll.terminal.polling', "This will continue to poll for output to determine when the terminal becomes idle for up to 2 minutes.")),
 					'',
 					localize('poll.terminal.accept', 'Yes'),
 					localize('poll.terminal.reject', 'No'),