Merge pull request microsoft#260533 from microsoft/isidorn/wicked-carp

remove pause action from chat view

Author: isidorn

src/vs/workbench/api/browser/mainThreadChatAgents2.ts

@@ -177,9 +177,6 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 			setRequestTools: (requestId, tools) => {
 				this._proxy.$setRequestTools(requestId, tools);
 			},
-			setRequestPaused: (requestId, isPaused) => {
-				this._proxy.$setRequestPaused(handle, requestId, isPaused);
-			},
 			provideFollowups: async (request, result, history, token): Promise<IChatFollowup[]> => {
 				if (!this._agents.get(handle)?.hasFollowups) {
 					return [];

src/vs/workbench/api/common/extHost.protocol.ts

@@ -1365,7 +1365,6 @@ export type IChatAgentHistoryEntryDto = {
 
 export interface ExtHostChatAgentsShape2 {
 	$invokeAgent(handle: number, request: Dto<IChatAgentRequest>, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatAgentResult | undefined>;
-	$setRequestPaused(handle: number, requestId: string, isPaused: boolean): void;
 	$provideFollowups(request: Dto<IChatAgentRequest>, handle: number, result: IChatAgentResult, context: { history: IChatAgentHistoryEntryDto[] }, token: CancellationToken): Promise<IChatFollowup[]>;
 	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
 	$acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;

src/vs/workbench/api/common/extHostChatAgents2.ts

@@ -527,19 +527,6 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return model;
 	}
 
-	async $setRequestPaused(handle: number, requestId: string, isPaused: boolean) {
-		const agent = this._agents.get(handle);
-		if (!agent) {
-			return;
-		}
-
-		const inFlight = Iterable.find(this._inFlightRequests, r => r.requestId === requestId);
-		if (!inFlight) {
-			return;
-		}
-
-		agent.setChatRequestPauseState({ request: inFlight.extRequest, isPaused });
-	}
 
 	async $setRequestTools(requestId: string, tools: Pick<IChatAgentRequest, 'userSelectedTools'>) {
 		const request = [...this._inFlightRequests].find(r => r.requestId === requestId);

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

@@ -150,7 +150,7 @@ abstract class SubmitAction extends Action2 {
 	}
 }
 
-const whenNotInProgressOrPaused = ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate());
+const whenNotInProgress = ChatContextKeys.requestInProgress.negate();
 
 export class ChatSubmitAction extends SubmitAction {
 	static readonly ID = 'workbench.action.chat.submit';
@@ -185,7 +185,7 @@ export class ChatSubmitAction extends SubmitAction {
 					id: MenuId.ChatExecute,
 					order: 4,
 					when: ContextKeyExpr.and(
-						whenNotInProgressOrPaused,
+						whenNotInProgress,
 						menuCondition,
 					),
 					group: 'navigation',
@@ -277,45 +277,6 @@ class ToggleChatModeAction extends Action2 {
 	}
 }
 
-export const ToggleRequestPausedActionId = 'workbench.action.chat.toggleRequestPaused';
-export class ToggleRequestPausedAction extends Action2 {
-	static readonly ID = ToggleRequestPausedActionId;
-
-	constructor() {
-		super({
-			id: ToggleRequestPausedAction.ID,
-			title: localize2('interactive.toggleRequestPausd.label', "Toggle Request Paused"),
-			category: CHAT_CATEGORY,
-			icon: Codicon.debugPause,
-			toggled: {
-				condition: ChatContextKeys.isRequestPaused,
-				icon: Codicon.play,
-				tooltip: localize('requestIsPaused', "Resume Request"),
-			},
-			tooltip: localize('requestNotPaused', "Pause Request"),
-			menu: [
-				{
-					id: MenuId.ChatExecute,
-					order: 3.5,
-					when: ContextKeyExpr.and(
-						ChatContextKeys.canRequestBePaused,
-						ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
-						ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
-						ContextKeyExpr.or(ChatContextKeys.isRequestPaused.negate(), ChatContextKeys.inputHasText.negate()),
-					),
-					group: 'navigation',
-				}]
-		});
-	}
-
-	override run(accessor: ServicesAccessor, ...args: any[]): void {
-		const context: IChatExecuteActionContext | undefined = args[0];
-		const widgetService = accessor.get(IChatWidgetService);
-		const widget = context?.widget ?? widgetService.lastFocusedWidget;
-		widget?.togglePaused();
-	}
-}
-
 class SwitchToNextModelAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.switchToNextModel';
 
@@ -450,17 +411,14 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 				{
 					id: MenuId.ChatExecuteSecondary,
 					group: 'group_1',
-					when: ContextKeyExpr.and(whenNotInProgressOrPaused, menuCondition),
+					when: ContextKeyExpr.and(whenNotInProgress, menuCondition),
 					order: 1
 				},
 				{
 					id: MenuId.ChatExecute,
 					order: 4,
 					when: ContextKeyExpr.and(
-						ContextKeyExpr.or(
-							ContextKeyExpr.and(ChatContextKeys.isRequestPaused, ChatContextKeys.inputHasText),
-							ChatContextKeys.requestInProgress.negate(),
-						),
+						ChatContextKeys.requestInProgress.negate(),
 						menuCondition),
 					group: 'navigation',
 				}]
@@ -476,7 +434,7 @@ class SubmitWithoutDispatchingAction extends Action2 {
 			// if the input has prompt instructions attached, allow submitting requests even
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
-			whenNotInProgressOrPaused,
+			whenNotInProgress,
 			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask),
 		);
 
@@ -522,7 +480,7 @@ export class CreateRemoteAgentJobAction extends Action2 {
 	constructor() {
 		const precondition = ContextKeyExpr.and(
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
-			whenNotInProgressOrPaused,
+			whenNotInProgress,
 			ChatContextKeys.remoteJobCreating.negate(),
 		);
 
@@ -725,7 +683,7 @@ export class ChatSubmitWithCodebaseAction extends Action2 {
 			// if the input has prompt instructions attached, allow submitting requests even
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
-			whenNotInProgressOrPaused,
+			whenNotInProgress,
 		);
 
 		super({
@@ -782,7 +740,7 @@ class SendToNewChatAction extends Action2 {
 			// if the input has prompt instructions attached, allow submitting requests even
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.hasPromptFile),
-			whenNotInProgressOrPaused,
+			whenNotInProgress,
 		);
 
 		super({
@@ -843,7 +801,6 @@ export class CancelAction extends Action2 {
 			menu: [{
 				id: MenuId.ChatExecute,
 				when: ContextKeyExpr.and(
-					ChatContextKeys.isRequestPaused.negate(),
 					ChatContextKeys.requestInProgress,
 					ChatContextKeys.remoteJobCreating.negate()
 				),
@@ -926,7 +883,6 @@ export function registerChatExecuteActions() {
 	registerAction2(ChatSubmitWithCodebaseAction);
 	registerAction2(CreateRemoteAgentJobAction);
 	registerAction2(ToggleChatModeAction);
-	registerAction2(ToggleRequestPausedAction);
 	registerAction2(SwitchToNextModelAction);
 	registerAction2(OpenModelPickerAction);
 	registerAction2(OpenModePickerAction);

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

@@ -226,7 +226,6 @@ export interface IChatWidget {
 	 */
 	waitForReady(): Promise<void>;
 	getViewState(): IChatViewState;
-	togglePaused(): void;
 	lockToCodingAgent(name: string, displayName: string): void;
 
 	delegateScrollFromMouseWheelEvent(event: IMouseWheelEvent): void;

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

@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, addDisposableListener, append, EventType } from '../../../../../base/browser/dom.js';
+import { $, append } from '../../../../../base/browser/dom.js';
 import { alert } from '../../../../../base/browser/ui/aria/aria.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
-import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { localize } from '../../../../../nls.js';
 import { IChatProgressMessage, IChatTask, IChatTaskSerialized } from '../../common/chatService.js';
-import { IChatRendererContent, IChatWorkingProgress, isResponseVM } from '../../common/chatViewModel.js';
+import { IChatRendererContent, isResponseVM } from '../../common/chatViewModel.js';
 import { ChatTreeItem } from '../chat.js';
 import { renderFileWidgets } from '../chatInlineAnchorWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
@@ -80,35 +80,6 @@ function shouldShowSpinner(followingContent: IChatRendererContent[], element: Ch
 	return isResponseVM(element) && !element.isComplete && followingContent.length === 0;
 }
 
-export class ChatWorkingProgressContentPart extends ChatProgressContentPart implements IChatContentPart {
-	constructor(
-		private readonly workingProgress: IChatWorkingProgress,
-		renderer: MarkdownRenderer,
-		context: IChatContentPartRenderContext,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IChatMarkdownAnchorService chatMarkdownAnchorService: IChatMarkdownAnchorService,
-	) {
-		const progressMessage: IChatProgressMessage = {
-			kind: 'progressMessage',
-			content: workingProgress.isPaused ?
-				new MarkdownString().appendText(localize('pausedMessage', "Paused")) :
-				new MarkdownString().appendText(localize('workingMessage', "Working..."))
-		};
-		super(progressMessage, renderer, context, undefined, undefined, workingProgress.isPaused ? Codicon.debugPause : undefined, instantiationService, chatMarkdownAnchorService);
-
-		if (workingProgress.isPaused) {
-			this.domNode.style.cursor = 'pointer';
-			this.domNode.title = localize('resume', "Click to resume");
-			this._register(addDisposableListener(this.domNode, EventType.CLICK, () => {
-				workingProgress.setPaused(false);
-			}));
-		}
-	}
-
-	override hasSameContent(other: IChatRendererContent, followingContent: IChatRendererContent[], element: ChatTreeItem): boolean {
-		return other.kind === 'working' && this.workingProgress.isPaused === other.isPaused;
-	}
-}
 
 export class ChatCustomProgressPart {
 	public readonly domNode: HTMLElement;
@@ -126,3 +97,19 @@ export class ChatCustomProgressPart {
 		append(this.domNode, messageElement);
 	}
 }
+
+export class ChatWorkingProgressContentPart extends ChatProgressContentPart implements IChatContentPart {
+	constructor(
+		_workingProgress: { kind: 'working' },
+		renderer: MarkdownRenderer,
+		context: IChatContentPartRenderContext,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IChatMarkdownAnchorService chatMarkdownAnchorService: IChatMarkdownAnchorService,
+	) {
+		const progressMessage: IChatProgressMessage = {
+			kind: 'progressMessage',
+			content: new MarkdownString().appendText(localize('workingMessage', "Working..."))
+		};
+		super(progressMessage, renderer, context, undefined, undefined, undefined, instantiationService, chatMarkdownAnchorService);
+	}
+}

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts

@@ -76,10 +76,6 @@ class ChatEditorOverlayWidget extends Disposable {
 				return { message: localize('working', "Working...") };
 			}
 
-			if (response.isPaused.read(r)) {
-				return { message: localize('paused', "Paused"), paused: true };
-			}
-
 			const lastPart = observableFromEventOpts({ equalsFn: arrays.equals }, response.onDidChange, () => response.response.value)
 				.read(r)
 				.filter(part => part.kind === 'progressMessage' || part.kind === 'toolInvocation')
@@ -105,7 +101,7 @@ class ChatEditorOverlayWidget extends Disposable {
 
 		this._store.add(autorun(r => {
 			const value = requestMessage.read(r);
-			const busy = this._isBusy.read(r) && !value?.paused;
+			const busy = this._isBusy.read(r);
 
 			this._domNode.classList.toggle('busy', busy);