Joh/sweet-crawdad (#234851)

* fix empty line hint

* no ellipsis on hints

* add `renderDetectedCommandsWithRequest` option and use it for inline chat

fyi @roblourens

Author: jrieken

Diff for: src/vs/workbench/contrib/chat/browser/chat.ts

@@ -111,6 +111,7 @@ export interface IChatListItemRendererOptions {
 	readonly noPadding?: boolean;
 	readonly editableCodeBlock?: boolean;
 	readonly renderCodeBlockPills?: boolean;
+	readonly renderDetectedCommandsWithRequest?: boolean;
 	readonly renderTextEditsAsSummary?: (uri: URI) => boolean;
 }
 

Diff for: src/vs/workbench/contrib/chat/browser/chatContentParts/chatAgentCommandContentPart.ts

@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IChatAgentCommand } from '../../common/chatAgents.js';
+import { chatSubcommandLeader } from '../../common/chatParserTypes.js';
+import { IChatRendererContent } from '../../common/chatViewModel.js';
+import { ChatTreeItem } from '../chat.js';
+import { IChatContentPart } from './chatContentParts.js';
+import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { addDisposableListener } from '../../../../../base/browser/dom.js';
+import { localize } from '../../../../../nls.js';
+
+
+export class ChatAgentCommandContentPart extends Disposable implements IChatContentPart {
+
+	readonly domNode: HTMLElement = document.createElement('span');
+
+	constructor(
+		cmd: IChatAgentCommand,
+		onClick: () => void,
+		@IHoverService private readonly _hoverService: IHoverService,
+	) {
+		super();
+		this._store.add(this._hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this.domNode, localize('rerun', "Detected command. Select to rerun without {0}{1}", chatSubcommandLeader, cmd.name)));
+		this.domNode.classList.add('chat-agent-command');
+		this.domNode.innerText = chatSubcommandLeader + cmd.name;
+		this.domNode.setAttribute('aria-label', cmd.name);
+		this.domNode.setAttribute('role', 'button');
+
+		this.domNode.appendChild(renderIcon(Codicon.close));
+
+		this._store.add(addDisposableListener(this.domNode, 'click', onClick));
+	}
+
+	hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
+		return false;
+	}
+}

Diff for: src/vs/workbench/contrib/chat/browser/chatListRenderer.ts

@@ -53,6 +53,7 @@ import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js'
 import { MarkUnhelpfulActionId } from './actions/chatTitleActions.js';
 import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidgetService } from './chat.js';
 import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
+import { ChatAgentCommandContentPart } from './chatContentParts/chatAgentCommandContentPart.js';
 import { ChatAttachmentsContentPart } from './chatContentParts/chatAttachmentsContentPart.js';
 import { ChatCodeCitationContentPart } from './chatContentParts/chatCodeCitationContentPart.js';
 import { ChatCommandButtonContentPart } from './chatContentParts/chatCommandContentPart.js';
@@ -123,8 +124,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	protected readonly _onDidClickFollowup = this._register(new Emitter<IChatFollowup>());
 	readonly onDidClickFollowup: Event<IChatFollowup> = this._onDidClickFollowup.event;
 
-	private readonly _onDidClickRerunWithAgentOrCommandDetection = new Emitter<IChatResponseViewModel>();
-	readonly onDidClickRerunWithAgentOrCommandDetection: Event<IChatResponseViewModel> = this._onDidClickRerunWithAgentOrCommandDetection.event;
+	private readonly _onDidClickRerunWithAgentOrCommandDetection = new Emitter<{ sessionId: string; requestId: string }>();
+	readonly onDidClickRerunWithAgentOrCommandDetection: Event<{ sessionId: string; requestId: string }> = this._onDidClickRerunWithAgentOrCommandDetection.event;
 
 	protected readonly _onDidChangeItemHeight = this._register(new Emitter<IItemHeightChangeParams>());
 	readonly onDidChangeItemHeight: Event<IItemHeightChangeParams> = this._onDidChangeItemHeight.event;
@@ -531,6 +532,17 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				};
 				const newPart = this.renderChatContentPart(data, templateData, context);
 				if (newPart) {
+
+					if (this.rendererOptions.renderDetectedCommandsWithRequest
+						&& isRequestVM(element) && element.agentOrSlashCommandDetected && element.slashCommand
+						&& data.kind === 'markdownContent' // TODO this is fishy but I didn't find a better way to render on the same inline as the MD request part
+					) {
+						newPart.domNode.style.display = 'inline-flex';
+						const cmdPart = this.instantiationService.createInstance(ChatAgentCommandContentPart, element.slashCommand, () => this._onDidClickRerunWithAgentOrCommandDetection.fire({ sessionId: element.sessionId, requestId: element.id }));
+						templateData.value.appendChild(cmdPart.domNode);
+						parts.push(cmdPart);
+					}
+
 					templateData.value.appendChild(newPart.domNode);
 					parts.push(newPart);
 				}

Diff for: src/vs/workbench/contrib/chat/browser/media/chat.css

@@ -1123,12 +1123,29 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	color: var(--vscode-chat-slashCommandForeground);
 }
 
+
+.interactive-item-container .chat-agent-command,
 .interactive-item-container .chat-resource-widget,
 .interactive-item-container .chat-agent-widget .monaco-button {
 	border-radius: 4px;
 	padding: 1px 3px;
 }
 
+.interactive-item-container .chat-agent-command {
+	background-color: var(--vscode-chat-slashCommandBackground);
+	color: var(--vscode-chat-slashCommandForeground);
+	cursor: pointer;
+	display: inline-flex;
+	align-items: center;
+	margin-right: 0.5ch;
+	padding: 1px 1px 1px 3px;
+}
+
+.interactive-item-container .chat-agent-command > .codicon[class*='codicon-'] {
+	color: var(--vscode-chat-slashCommandForeground);
+	font-size: 14px;
+}
+
 .interactive-item-container .chat-agent-widget .monaco-text-button {
 	display: inline;
 	border: none;

Diff for: src/vs/workbench/contrib/chat/common/chatViewModel.ts

@@ -77,6 +77,8 @@ export interface IChatRequestViewModel {
 	readonly isHidden: boolean;
 	readonly isComplete: boolean;
 	readonly isCompleteAddedRequest: boolean;
+	readonly slashCommand: IChatAgentCommand | undefined;
+	readonly agentOrSlashCommandDetected: boolean;
 }
 
 export interface IChatResponseMarkdownRenderData {
@@ -387,6 +389,14 @@ export class ChatRequestViewModel implements IChatRequestViewModel {
 		return this._model.isHidden;
 	}
 
+	get slashCommand(): IChatAgentCommand | undefined {
+		return this._model.response?.slashCommand;
+	}
+
+	get agentOrSlashCommandDetected(): boolean {
+		return this._model.response?.agentOrSlashCommandDetected ?? false;
+	}
+
 	currentRenderedHeight: number | undefined;
 
 	constructor(

Diff for: src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts

@@ -235,15 +235,17 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			const isEol = model.getLineMaxColumn(position.lineNumber) === position.column;
 			const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
 
-			if (isWhitespace && !_configurationService.getValue(InlineChatConfigKeys.LineEmptyHint)) {
-				return undefined;
+			if (isWhitespace) {
+				return _configurationService.getValue(InlineChatConfigKeys.LineEmptyHint)
+					? { isEol, isWhitespace, kb, position, model }
+					: undefined;
 			}
 
-			if (!visible || !isEol || !_configurationService.getValue(InlineChatConfigKeys.LineSuffixHint)) {
-				return undefined;
+			if (visible && isEol && _configurationService.getValue(InlineChatConfigKeys.LineSuffixHint)) {
+				return { isEol, isWhitespace, kb, position, model };
 			}
 
-			return { isEol, isWhitespace, kb, position, model };
+			return undefined;
 		});
 
 		this._store.add(autorun(r => {
@@ -262,9 +264,9 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			const inlineClassName: string[] = ['inline-chat-hint'];
 			let content: string;
 			if (isWhitespace) {
-				content = '\u00a0' + localize('title2', "{0} to edit with {1}...", kb, agentName);
+				content = '\u00a0' + localize('title2', "{0} to edit with {1}", kb, agentName);
 			} else if (isEol) {
-				content = '\u00a0' + localize('title1', "{0} to continue with {1}...", kb, agentName);
+				content = '\u00a0' + localize('title1', "{0} to continue with {1}", kb, agentName);
 			} else {
 				content = '\u200a' + kb + '\u200a';
 				inlineClassName.push('embedded');

Diff for: src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { $, Dimension, getActiveElement, getTotalHeight, h, reset, trackFocus } from '../../../../base/browser/dom.js';
-import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
@@ -49,8 +48,7 @@ import { ChatWidget, IChatViewState, IChatWidgetLocationOptions } from '../../ch
 import { chatRequestBackground } from '../../chat/common/chatColors.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { IChatModel } from '../../chat/common/chatModel.js';
-import { chatSubcommandLeader } from '../../chat/common/chatParserTypes.js';
-import { ChatAgentVoteDirection, IChatSendRequestOptions, IChatService } from '../../chat/common/chatService.js';
+import { ChatAgentVoteDirection, IChatService } from '../../chat/common/chatService.js';
 import { isResponseVM } from '../../chat/common/chatViewModel.js';
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, inlineChatBackground, inlineChatForeground } from '../common/inlineChat.js';
 import { HunkInformation, Session } from './inlineChatSession.js';
@@ -90,7 +88,6 @@ export class InlineChatWidget {
 			h('div.status@status', [
 				h('div.label.info.hidden@infoLabel'),
 				h('div.actions.hidden@toolbar1'),
-				h('div.rerun@rerun'),
 				h('div.label.status.hidden@statusLabel'),
 				h('div.actions.secondary.hidden@toolbar2'),
 			]),
@@ -201,8 +198,6 @@ export class InlineChatWidget {
 				ctxResponseSupportIssues.reset();
 			}));
 
-			const detectedAgentCmdStore = viewModelStore.add(new DisposableStore());
-
 			viewModelStore.add(viewModel.onDidChange(() => {
 
 				this._requestInProgress.set(viewModel.requestInProgress, undefined);
@@ -216,37 +211,6 @@ export class InlineChatWidget {
 				ctxResponseErrorFiltered.set((!!(isResponseVM(last) && last.errorDetails?.responseIsFiltered)));
 				ctxResponseSupportIssues.set(isResponseVM(last) && (last.agent?.metadata.supportIssueReporting ?? false));
 
-				if (isResponseVM(last) && last.agentOrSlashCommandDetected && last.slashCommand) {
-					this._elements.rerun.innerText = last.slashCommand.name;
-					this._elements.rerun.title = last.slashCommand.description;
-
-					const msg = localize('usedAgentSlashCommand', "``{0}`` [[(rerun without)]]", `${chatSubcommandLeader}${last.slashCommand.name}`);
-
-					reset(this._elements.rerun, renderFormattedText(msg, {
-						className: 'agentOrSlashCommandDetected',
-						inline: true,
-						renderCodeSegments: true,
-						actionHandler: {
-							disposables: detectedAgentCmdStore,
-							callback: (content) => {
-								const request = this._chatService.getSession(last.sessionId)?.getRequests().find(candidate => candidate.id === last.requestId);
-								if (request) {
-									const options: IChatSendRequestOptions = {
-										noCommandDetection: true,
-										attempt: request.attempt + 1,
-										location: location.location,
-										userSelectedModelId: this.chatWidget.input.currentLanguageModel
-									};
-									this._chatService.resendRequest(request, options);
-								}
-							},
-						}
-					}));
-
-				} else {
-					reset(this._elements.rerun);
-				}
-
 				this._onDidChangeHeight.fire();
 			}));
 			this._onDidChangeHeight.fire();
@@ -515,7 +479,6 @@ export class InlineChatWidget {
 		this._chatWidget.saveState();
 
 		reset(this._elements.statusLabel);
-		reset(this._elements.rerun);
 		this._elements.statusLabel.classList.toggle('hidden', true);
 		this._elements.toolbar1.classList.add('hidden');
 		this._elements.toolbar2.classList.add('hidden');

Diff for: src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts

@@ -89,6 +89,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 						return isEqual(uri, editor.getModel()?.uri)
 							&& configurationService.getValue<EditMode>(InlineChatConfigKeys.Mode) === EditMode.Live;
 					},
+					renderDetectedCommandsWithRequest: true,
 				}
 			}
 		});