tools: implement 'skip' for tool calls in place of cancel (microsoft#263314)

Closes microsoft#259534

Author: connor4312

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

@@ -3,16 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Codicon } from '../../../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../../../base/common/htmlContent.js';
-import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { ConfigurationTarget } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IPreferencesService, type IOpenSettingsOptions } from '../../../../../services/preferences/common/preferences.js';
 import { TerminalContribSettingId } from '../../../../terminal/terminalContribExports.js';
 import { migrateLegacyTerminalToolSpecificData } from '../../../common/chat.js';
-import { IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../common/chatService.js';
+import { IChatMarkdownContent, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData, type ILegacyChatTerminalToolInvocationData } from '../../../common/chatService.js';
 import { CodeBlockModelCollection } from '../../../common/codeBlockModelCollection.js';
 import { IChatCodeBlockInfo } from '../../chat.js';
 import { ICodeBlockRenderOptions } from '../../codeBlockPart.js';
@@ -106,17 +104,7 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
 			},
 		}, currentWidthDelegate(), codeBlockModelCollection, { codeBlockRenderOptions }));
 		this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-		const isConfirmed = typeof toolInvocation.isConfirmed === 'boolean'
-			? toolInvocation.isConfirmed
-			: toolInvocation.isConfirmed?.type === ToolConfirmKind.UserAction || toolInvocation.isConfirmed?.type === ToolConfirmKind.ConfirmationNotNeeded;
-		const isSkipped = typeof toolInvocation.isConfirmed !== 'boolean' && toolInvocation.isConfirmed?.type === ToolConfirmKind.Skipped;
-		const icon = isSkipped ?
-			Codicon.circleSlash :
-			(!isConfirmed ?
-				Codicon.error :
-				toolInvocation.isComplete ?
-					Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin'));
-		const progressPart = instantiationService.createInstance(ChatCustomProgressPart, this.markdownPart.domNode, icon);
+		const progressPart = instantiationService.createInstance(ChatCustomProgressPart, this.markdownPart.domNode, this.getIcon());
 		this.domNode = progressPart.domNode;
 	}
 }

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

@@ -80,11 +80,10 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 
 		const enum ConfirmationOutcome {
 			Allow,
-			Disallow,
+			Skip,
 			AllowWorkspace,
 			AllowGlobally,
 			AllowSession,
-			CustomAction,
 		}
 
 		const buttons: IChatConfirmationButton<ConfirmationOutcome>[] = [
@@ -99,8 +98,8 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 				],
 			},
 			{
-				label: localize('cancel', "Cancel"),
-				data: ConfirmationOutcome.Disallow,
+				label: localize('skip', "Skip"),
+				data: ConfirmationOutcome.Skip,
 				isSecondary: true,
 				tooltip: cancelTooltip
 			}];
@@ -327,8 +326,8 @@ export class ToolConfirmationSubPart extends BaseChatToolInvocationSubPart {
 				case ConfirmationOutcome.Allow:
 					toolInvocation.confirmed.complete({ type: ToolConfirmKind.UserAction });
 					break;
-				case ConfirmationOutcome.Disallow:
-					toolInvocation.confirmed.complete({ type: ToolConfirmKind.Denied });
+				case ConfirmationOutcome.Skip:
+					toolInvocation.confirmed.complete({ type: ToolConfirmKind.Skipped });
 					break;
 			}
 

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

@@ -3,9 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized } from '../../../common/chatService.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService.js';
 import { IChatCodeBlockInfo } from '../../chat.js';
 
 export abstract class BaseChatToolInvocationSubPart extends Disposable {
@@ -23,12 +25,26 @@ export abstract class BaseChatToolInvocationSubPart extends Disposable {
 	public readonly codeblocksPartId = 'tool-' + (BaseChatToolInvocationSubPart.idPool++);
 
 	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		protected readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
 	) {
 		super();
 
 		if (toolInvocation.kind === 'toolInvocation' && !toolInvocation.isComplete) {
 			toolInvocation.isCompletePromise.then(() => this._onNeedsRerender.fire());
 		}
 	}
+
+	protected getIcon() {
+		const toolInvocation = this.toolInvocation;
+		const isConfirmed = typeof toolInvocation.isConfirmed === 'boolean'
+			? toolInvocation.isConfirmed
+			: toolInvocation.isConfirmed?.type === ToolConfirmKind.UserAction || toolInvocation.isConfirmed?.type === ToolConfirmKind.ConfirmationNotNeeded;
+		const isSkipped = typeof toolInvocation.isConfirmed !== 'boolean' && toolInvocation.isConfirmed?.type === ToolConfirmKind.Skipped;
+		return isSkipped ?
+			Codicon.circleSlash :
+			(!isConfirmed ?
+				Codicon.error :
+				toolInvocation.isComplete ?
+					Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin'));
+	}
 }

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

@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../../../base/browser/dom.js';
-import { Codicon } from '../../../../../../base/common/codicons.js';
 import { IMarkdownString, MarkdownString } from '../../../../../../base/common/htmlContent.js';
 import { autorun } from '../../../../../../base/common/observable.js';
 import { MarkdownRenderer } from '../../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized, IChatProgressMessage, ToolConfirmKind } from '../../../common/chatService.js';
+import { IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from '../../../common/chatService.js';
 import { IChatCodeBlockInfo } from '../../chat.js';
 import { IChatContentPartRenderContext } from '../chatContentParts.js';
 import { ChatProgressContentPart } from '../chatProgressContentPart.js';
@@ -21,7 +20,7 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
 	public override readonly codeblocks: IChatCodeBlockInfo[] = [];
 
 	constructor(
-		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
 		private readonly context: IChatContentPartRenderContext,
 		private readonly renderer: MarkdownRenderer,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -68,10 +67,6 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
 			content
 		};
 
-		const iconOverride = !this.toolIsConfirmed ?
-			Codicon.error :
-			this.toolInvocation.isComplete ?
-				Codicon.check : undefined;
-		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, iconOverride);
+		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon());
 	}
 }