terminal command attachment follow-ups (microsoft#273187)

Author: meganrogge

src/vs/workbench/contrib/chat/browser/actions/chatContext.ts

@@ -269,7 +269,7 @@ export class TerminalContext implements IChatContextValueItem {
 	constructor(private readonly _resource: URI, @ITerminalService private readonly _terminalService: ITerminalService) {
 
 	}
-	async isEnabled(widget: IChatWidget) {
+	isEnabled(widget: IChatWidget) {
 		const terminal = this._terminalService.getInstanceFromResource(this._resource);
 		return !!widget.attachmentCapabilities.supportsTerminalAttachments && terminal?.isDisposed === false;
 	}
@@ -279,7 +279,7 @@ export class TerminalContext implements IChatContextValueItem {
 			return;
 		}
 
-		const command = terminal.capabilities.get(TerminalCapability.CommandDetection)?.commands.find(cmd => cmd.id === this._resource.query);
+		const command = terminal.capabilities.get(TerminalCapability.CommandDetection)?.commands.find(cmd => cmd.id === this._resource.query.replace('command=', ''));
 		if (!command) {
 			return;
 		}

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

@@ -280,9 +280,6 @@ export class TerminalCommandAttachmentWidget extends AbstractChatAttachmentWidge
 		this._register(createTerminalCommandElements(this.element, attachment, ariaLabel, this.hoverService, clickHandler));
 
 		this._register(dom.addDisposableListener(this.element, dom.EventType.KEY_DOWN, async (e: KeyboardEvent) => {
-			if ((e.target as HTMLElement | null)?.closest('.monaco-button')) {
-				return;
-			}
 			const event = new StandardKeyboardEvent(e);
 			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				dom.EventHelper.stop(e, true);
@@ -307,15 +304,14 @@ function createTerminalCommandElements(
 	element.ariaLabel = ariaLabel;
 	element.style.cursor = 'pointer';
 
-	const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-terminal'));
+	const terminalIconSpan = dom.$('span');
+	terminalIconSpan.classList.add(...ThemeIcon.asClassNameArray(Codicon.terminal));
+	const pillIcon = dom.$('div.chat-attached-context-pill', {}, terminalIconSpan);
 	const textLabel = dom.$('span.chat-attached-context-custom-text', {}, attachment.command);
 	element.appendChild(pillIcon);
 	element.appendChild(textLabel);
 
 	disposable.add(dom.addDisposableListener(element, dom.EventType.CLICK, e => {
-		if ((e.target as HTMLElement | null)?.closest('.monaco-button')) {
-			return;
-		}
 		void clickHandler();
 	}));
 

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -775,7 +775,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 		if (instance) {
 			this.revealTerminal(instance);
 			const commands = instance.capabilities.get(TerminalCapability.CommandDetection)?.commands;
-			const relevantCommand = commands?.find(c => c.id === resource.query);
+			const relevantCommand = commands?.find(c => c.id === resource.query.replace('command=', ''));
 			if (relevantCommand) {
 				instance.xterm?.markTracker.revealCommand(relevantCommand);
 			}

src/vs/workbench/contrib/terminal/browser/terminalUri.ts

@@ -27,7 +27,7 @@ export function getTerminalUri(workspaceId: string, instanceId: number, title?:
 		scheme: Schemas.vscodeTerminal,
 		path: `/${workspaceId}/${instanceId}`,
 		fragment: title || undefined,
-		query: commandId
+		query: `command=${commandId}`
 	});
 }
 

src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.ts

@@ -405,8 +405,9 @@ export class DecorationAddon extends Disposable implements ITerminalAddon, IDeco
 			}),
 			dom.addDisposableListener(element, dom.EventType.CONTEXT_MENU, async (e) => {
 				e.stopImmediatePropagation();
+				const chatActions = await this._getCommandActions(command);
 				const actions = this._getContextMenuActions();
-				this._contextMenuService.showContextMenu({ getAnchor: () => element, getActions: () => actions });
+				this._contextMenuService.showContextMenu({ getAnchor: () => element, getActions: () => [...actions, ...chatActions] });
 			}),
 		];
 	}