feat - add retry and report issue commands in SetupAgent on timeout (microsoft#288645)

Author: bpasero

src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.ts

@@ -167,7 +167,8 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
 	private static readonly SETUP_NEEDED_MESSAGE = new MarkdownString(localize('settingUpCopilotNeeded', "You need to set up GitHub Copilot and be signed in to use Chat."));
 	private static readonly TRUST_NEEDED_MESSAGE = new MarkdownString(localize('trustNeeded', "You need to trust this workspace to use Chat."));
 
-	private static CHAT_REPORT_ISSUE_WITH_OUTPUT_ID = 'workbench.action.chat.reportIssueWithOutput';
+	private static readonly CHAT_RETRY_COMMAND_ID = 'workbench.action.chat.retrySetup';
+	private static readonly CHAT_REPORT_ISSUE_WITH_OUTPUT_COMMAND_ID = 'workbench.action.chat.reportIssueWithOutput';
 
 	private readonly _onUnresolvableError = this._register(new Emitter<void>());
 	readonly onUnresolvableError = this._onUnresolvableError.event;
@@ -192,7 +193,9 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
 	}
 
 	private registerCommands(): void {
-		this._register(CommandsRegistry.registerCommand(SetupAgent.CHAT_REPORT_ISSUE_WITH_OUTPUT_ID, async accessor => {
+
+		// Report issue with output command
+		this._register(CommandsRegistry.registerCommand(SetupAgent.CHAT_REPORT_ISSUE_WITH_OUTPUT_COMMAND_ID, async accessor => {
 			const outputService = accessor.get(IOutputService);
 			const textModelService = accessor.get(ITextModelService);
 			const issueService = accessor.get(IWorkbenchIssueService);
@@ -234,6 +237,22 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
 				data: outputData || localize('chatOutputChannelUnavailable', "GitHub Copilot Chat output channel not available. Please ensure the GitHub Copilot Chat extension is active and try again. If the issue persists, you can manually include relevant information from the Output panel (View > Output > GitHub Copilot Chat).")
 			});
 		}));
+
+		// Retry chat command
+		this._register(CommandsRegistry.registerCommand(SetupAgent.CHAT_RETRY_COMMAND_ID, async (accessor, sessionResource: URI) => {
+			const chatService = accessor.get(IChatService);
+			const chatWidgetService = accessor.get(IChatWidgetService);
+
+			const widget = chatWidgetService.getWidgetBySessionResource(sessionResource);
+			const lastRequest = widget?.viewModel?.model.getRequests().at(-1);
+			if (lastRequest) {
+				await chatService.resendRequest(lastRequest, {
+					...widget?.getModeRequestOptions(),
+					modeInfo: widget?.input.currentModeInfo,
+					userSelectedModelId: widget?.input.currentLanguageModel
+				});
+			}
+		}));
 	}
 
 	async invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void): Promise<IChatAgentResult> {
@@ -397,9 +416,14 @@ export class SetupAgent extends Disposable implements IChatAgentImplementation {
 					progress({
 						kind: 'command',
 						command: {
-							id: SetupAgent.CHAT_REPORT_ISSUE_WITH_OUTPUT_ID,
+							id: SetupAgent.CHAT_RETRY_COMMAND_ID,
+							title: localize('retryChat', "Retry"),
+							arguments: [requestModel.session.sessionResource]
+						},
+						additionalCommands: [{
+							id: SetupAgent.CHAT_REPORT_ISSUE_WITH_OUTPUT_COMMAND_ID,
 							title: localize('reportChatIssue', "Report Issue"),
-						}
+						}]
 					});
 
 					// This means Chat is unhealthy and we cannot retry the

src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatCommandContentPart.ts

@@ -13,6 +13,7 @@ import { IChatContentPart, IChatContentPartRenderContext } from './chatContentPa
 import { IChatProgressRenderableResponseContent } from '../../../common/model/chatModel.js';
 import { IChatCommandButton } from '../../../common/chatService/chatService.js';
 import { isResponseVM } from '../../../common/model/chatViewModel.js';
+import { Command } from '../../../../../../editor/common/languages.js';
 
 const $ = dom.$;
 
@@ -28,15 +29,28 @@ export class ChatCommandButtonContentPart extends Disposable implements IChatCon
 
 		this.domNode = $('.chat-command-button');
 		const enabled = !isResponseVM(context.element) || !context.element.isStale;
+
+		// Render the primary button
+		this.renderButton(this.domNode, commandButton.command, enabled);
+
+		// Render additional buttons if any
+		if (commandButton.additionalCommands) {
+			for (const command of commandButton.additionalCommands) {
+				this.renderButton(this.domNode, command, enabled, true);
+			}
+		}
+	}
+
+	private renderButton(container: HTMLElement, command: Command, enabled: boolean, secondary?: boolean): void {
 		const tooltip = enabled ?
-			commandButton.command.tooltip :
+			command.tooltip :
 			localize('commandButtonDisabled', "Button not available in restored chat");
-		const button = this._register(new Button(this.domNode, { ...defaultButtonStyles, supportIcons: true, title: tooltip }));
-		button.label = commandButton.command.title;
+		const button = this._register(new Button(container, { ...defaultButtonStyles, supportIcons: true, title: tooltip, secondary }));
+		button.label = command.title;
 		button.enabled = enabled;
 
 		// TODO still need telemetry for command buttons
-		this._register(button.onDidClick(() => this.commandService.executeCommand(commandButton.command.id, ...(commandButton.command.arguments ?? []))));
+		this._register(button.onDidClick(() => this.commandService.executeCommand(command.id, ...(command.arguments ?? []))));
 	}
 
 	hasSameContent(other: IChatProgressRenderableResponseContent): boolean {

src/vs/workbench/contrib/chat/browser/widget/media/chat.css

@@ -2239,6 +2239,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 .interactive-item-container .chat-command-button {
 	display: flex;
+	flex-wrap: wrap;
+	gap: 8px;
 	margin-bottom: 16px;
 }
 

src/vs/workbench/contrib/chat/common/chatService/chatService.ts

@@ -282,6 +282,7 @@ export interface IChatAgentMarkdownContentWithVulnerability {
 export interface IChatCommandButton {
 	command: Command;
 	kind: 'command';
+	additionalCommands?: Command[]; // rendered as secondary buttons
 }
 
 export interface IChatMoveMessage {