Pass in tool invocation

Author: Tyriar

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

@@ -143,6 +143,7 @@ export class ChatMcpServersInteractionContentPart extends Disposable implements
 				true, // forceShowMessage
 				undefined, // icon
 				undefined, // confirmedReason
+				undefined, // toolInvocation
 			));
 			this.domNode.appendChild(this.workingProgressPart.domNode);
 		}

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

@@ -13,7 +13,7 @@ import { IMarkdownRenderer } from '../../../../../platform/markdown/browser/mark
 import { IRenderedMarkdown } from '../../../../../base/browser/markdownRenderer.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { localize } from '../../../../../nls.js';
-import { IChatProgressMessage, IChatTask, IChatTaskSerialized, ToolConfirmKind, type ConfirmedReason } from '../../common/chatService.js';
+import { IChatProgressMessage, IChatTask, IChatTaskSerialized, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind, type ConfirmedReason } from '../../common/chatService.js';
 import { IChatRendererContent, isResponseVM } from '../../common/chatViewModel.js';
 import { ChatTreeItem } from '../chat.js';
 import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
@@ -38,6 +38,7 @@ export class ChatProgressContentPart extends Disposable implements IChatContentP
 		forceShowMessage: boolean | undefined,
 		icon: ThemeIcon | undefined,
 		confirmedReason: boolean | ConfirmedReason | undefined,
+		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized | undefined,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IChatMarkdownAnchorService private readonly chatMarkdownAnchorService: IChatMarkdownAnchorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
@@ -117,8 +118,9 @@ export class ChatProgressContentPart extends Disposable implements IChatContentP
 					: reason.scope === 'workspace'
 						? localize('chat.autoapprove.lmServicePerTool.workspace', 'Auto approved for this workspace')
 						: localize('chat.autoapprove.lmServicePerTool.profile', 'Auto approved for this profile');
-				// TODO: Pass in toolId
-				// md += ' (' + markdownCommandLink({ title: localize('edit', 'Edit'), id: 'workbench.action.chat.editToolApproval', arguments: [this.toolInvocation.toolId] }) + ')';
+				if (this.toolInvocation?.toolId) {
+					md += ' (' + markdownCommandLink({ title: localize('edit', 'Edit'), id: 'workbench.action.chat.editToolApproval', arguments: [this.toolInvocation.toolId] }) + ')';
+				}
 				break;
 			case ToolConfirmKind.UserAction:
 			case ToolConfirmKind.Denied:
@@ -183,7 +185,7 @@ export class ChatWorkingProgressContentPart extends ChatProgressContentPart impl
 			kind: 'progressMessage',
 			content: new MarkdownString().appendText(localize('workingMessage', "Working..."))
 		};
-		super(progressMessage, chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, instantiationService, chatMarkdownAnchorService, configurationService);
+		super(progressMessage, chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, undefined, instantiationService, chatMarkdownAnchorService, configurationService);
 	}
 
 	override hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {

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

@@ -42,7 +42,7 @@ export class ChatTaskContentPart extends Disposable implements IChatContentPart
 			this.isSettled = isSettled;
 			const showSpinner = !isSettled && !context.element.isComplete;
 			// TODO: Pass in confirmed reason
-			const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, task, chatContentMarkdownRenderer, context, showSpinner, true, undefined, undefined));
+			const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, task, chatContentMarkdownRenderer, context, showSpinner, true, undefined, undefined, undefined));
 			this.domNode = progressPart.domNode;
 			this.onDidChangeHeight = Event.None;
 		}

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

@@ -82,7 +82,7 @@ export class ChatToolProgressSubPart extends BaseChatToolInvocationSubPart {
 			this.provideScreenReaderStatus(content);
 		}
 
-		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon(), this.toolInvocation.isConfirmed);
+		return this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, this.getIcon(), this.toolInvocation.isConfirmed, this.toolInvocation);
 	}
 
 	private getAnnouncementKey(kind: 'progress' | 'complete'): string {

src/vs/workbench/contrib/chat/browser/chatListRenderer.ts

@@ -1232,7 +1232,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			} else if (content.kind === 'multiDiffData') {
 				return this.renderMultiDiffData(content, templateData, context);
 			} else if (content.kind === 'progressMessage') {
-				return this.instantiationService.createInstance(ChatProgressContentPart, content, this.chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined);
+				return this.instantiationService.createInstance(ChatProgressContentPart, content, this.chatContentMarkdownRenderer, context, undefined, undefined, undefined, undefined, undefined);
 			} else if (content.kind === 'working') {
 				return this.instantiationService.createInstance(ChatWorkingProgressContentPart, content, this.chatContentMarkdownRenderer, context);
 			} else if (content.kind === 'progressTask' || content.kind === 'progressTaskSerialized') {