Submit active session feedback action and CI check improvements (microsoft#303336)

submit and ci check primary actions

Author: benibenj

src/vs/sessions/contrib/agentFeedback/browser/agentFeedback.contribution.ts

@@ -6,17 +6,78 @@
 import './agentFeedbackEditorInputContribution.js';
 import './agentFeedbackEditorWidgetContribution.js';
 import './agentFeedbackOverviewRulerContribution.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../../workbench/common/contributions.js';
+import { IsSessionsWindowContext } from '../../../../workbench/common/contextkeys.js';
 import { AgentFeedbackService, IAgentFeedbackService } from './agentFeedbackService.js';
 import { AgentFeedbackAttachmentContribution } from './agentFeedbackAttachment.js';
 import { AgentFeedbackAttachmentWidget } from './agentFeedbackAttachmentWidget.js';
 import { AgentFeedbackEditorOverlay } from './agentFeedbackEditorOverlay.js';
-import { registerAgentFeedbackEditorActions } from './agentFeedbackEditorActions.js';
+import { hasActiveSessionAgentFeedback, registerAgentFeedbackEditorActions, submitActiveSessionFeedbackActionId } from './agentFeedbackEditorActions.js';
 import { IChatAttachmentWidgetRegistry } from '../../../../workbench/contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.js';
 import { IAgentFeedbackVariableEntry } from '../../../../workbench/contrib/chat/common/attachments/chatVariableEntries.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
+/**
+ * Sets the `hasActiveSessionAgentFeedback` context key to true when the
+ * currently active session has pending agent feedback items.
+ */
+class ActiveSessionFeedbackContextContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.activeSessionFeedbackContext';
+
+	constructor(
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IAgentFeedbackService agentFeedbackService: IAgentFeedbackService,
+		@ISessionsManagementService sessionManagementService: ISessionsManagementService,
+	) {
+		super();
+
+		const contextKey = hasActiveSessionAgentFeedback.bindTo(contextKeyService);
+		const menuRegistration = this._register(new MutableDisposable());
+
+		const feedbackChanged = observableFromEvent(
+			this,
+			agentFeedbackService.onDidChangeFeedback,
+			e => e,
+		);
+
+		this._register(autorun(reader => {
+			feedbackChanged.read(reader);
+			const activeSession = sessionManagementService.activeSession.read(reader);
+			menuRegistration.clear();
+			if (!activeSession) {
+				contextKey.set(false);
+				return;
+			}
+			const feedback = agentFeedbackService.getFeedback(activeSession.resource);
+			const count = feedback.length;
+			contextKey.set(count > 0);
+
+			if (count > 0) {
+				menuRegistration.value = MenuRegistry.appendMenuItem(MenuId.ChatEditingSessionApplySubmenu, {
+					command: {
+						id: submitActiveSessionFeedbackActionId,
+						icon: Codicon.comment,
+						title: localize('agentFeedback.submitFeedbackCount', "Submit Feedback ({0})", count),
+					},
+					group: 'navigation',
+					order: 3,
+					when: ContextKeyExpr.and(IsSessionsWindowContext, hasActiveSessionAgentFeedback),
+				});
+			}
+		}));
+	}
+}
+
+registerWorkbenchContribution2(ActiveSessionFeedbackContextContribution.ID, ActiveSessionFeedbackContextContribution, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(AgentFeedbackEditorOverlay.ID, AgentFeedbackEditorOverlay, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(AgentFeedbackAttachmentContribution.ID, AgentFeedbackAttachmentContribution, WorkbenchPhase.AfterRestored);
 

src/vs/sessions/contrib/agentFeedback/browser/agentFeedbackEditorActions.ts

@@ -24,6 +24,7 @@ import { IChatEditingService } from '../../../../workbench/contrib/chat/common/e
 import { IAgentSessionsService } from '../../../../workbench/contrib/chat/browser/agentSessions/agentSessionsService.js';
 import { ICodeReviewService } from '../../codeReview/browser/codeReviewService.js';
 import { getSessionEditorComments } from './sessionEditorComments.js';
+import { ISessionsManagementService } from '../../sessions/browser/sessionsManagementService.js';
 
 export const submitFeedbackActionId = 'agentFeedbackEditor.action.submit';
 export const navigatePreviousFeedbackActionId = 'agentFeedbackEditor.action.navigatePrevious';
@@ -32,6 +33,8 @@ export const clearAllFeedbackActionId = 'agentFeedbackEditor.action.clearAll';
 export const navigationBearingFakeActionId = 'agentFeedbackEditor.navigation.bearings';
 export const hasSessionEditorComments = new RawContextKey<boolean>('agentFeedbackEditor.hasSessionComments', false);
 export const hasSessionAgentFeedback = new RawContextKey<boolean>('agentFeedbackEditor.hasAgentFeedback', false);
+export const hasActiveSessionAgentFeedback = new RawContextKey<boolean>('agentFeedbackEditor.hasActiveSessionAgentFeedback', false);
+export const submitActiveSessionFeedbackActionId = 'agentFeedbackEditor.action.submitActiveSession';
 
 abstract class AgentFeedbackEditorAction extends Action2 {
 
@@ -190,8 +193,66 @@ class ClearAllFeedbackAction extends AgentFeedbackEditorAction {
 	}
 }
 
+class SubmitActiveSessionFeedbackAction extends Action2 {
+
+	static readonly ID = submitActiveSessionFeedbackActionId;
+
+	constructor() {
+		super({
+			id: SubmitActiveSessionFeedbackAction.ID,
+			title: localize2('agentFeedback.submitFeedback', 'Submit Feedback'),
+			icon: Codicon.comment,
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, hasActiveSessionAgentFeedback),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor): Promise<void> {
+		const sessionManagementService = accessor.get(ISessionsManagementService);
+		const agentFeedbackService = accessor.get(IAgentFeedbackService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const editorService = accessor.get(IEditorService);
+		const logService = accessor.get(ILogService);
+
+		const activeSession = sessionManagementService.getActiveSession();
+		if (!activeSession) {
+			return;
+		}
+
+		const sessionResource = activeSession.resource;
+		const feedbackItems = agentFeedbackService.getFeedback(sessionResource);
+		if (feedbackItems.length === 0) {
+			return;
+		}
+
+		const widget = chatWidgetService.getWidgetBySessionResource(sessionResource);
+		if (!widget) {
+			logService.error('[AgentFeedback] Cannot submit feedback: no chat widget found for session', sessionResource.toString());
+			return;
+		}
+
+		// Close all editors belonging to the session resource
+		const editorsToClose: IEditorIdentifier[] = [];
+		for (const { editor, groupId } of editorService.getEditors(EditorsOrder.SEQUENTIAL)) {
+			const candidates = getActiveResourceCandidates(editor);
+			const belongsToSession = candidates.some(uri =>
+				isEqual(agentFeedbackService.getMostRecentSessionForResource(uri), sessionResource)
+			);
+			if (belongsToSession) {
+				editorsToClose.push({ editor, groupId });
+			}
+		}
+		if (editorsToClose.length) {
+			await editorService.closeEditors(editorsToClose);
+		}
+
+		await widget.acceptInput('act on feedback');
+	}
+}
+
 export function registerAgentFeedbackEditorActions(): void {
 	registerAction2(SubmitFeedbackAction);
+	registerAction2(SubmitActiveSessionFeedbackAction);
 	registerAction2(class extends NavigateFeedbackAction { constructor() { super(false); } });
 	registerAction2(class extends NavigateFeedbackAction { constructor() { super(true); } });
 	registerAction2(ClearAllFeedbackAction);

src/vs/sessions/contrib/changes/browser/changesView.contribution.ts

@@ -12,6 +12,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../work
 import { IViewContainersRegistry, ViewContainerLocation, IViewsRegistry, Extensions as ViewContainerExtensions, WindowVisibility } from '../../../../workbench/common/views.js';
 import { CHANGES_VIEW_CONTAINER_ID, CHANGES_VIEW_ID, ChangesViewPane, ChangesViewPaneContainer } from './changesView.js';
 import './changesViewActions.js';
+import './fixCIChecksAction.js';
 import { ChangesViewController } from './changesViewController.js';
 
 const changesViewIcon = registerIcon('changes-view-icon', Codicon.gitCompare, localize2('changesViewIcon', 'View icon for the Changes view.').value);

src/vs/sessions/contrib/changes/browser/ciStatusWidget.ts

@@ -23,16 +23,10 @@ import { DEFAULT_LABELS_CONTAINER, IResourceLabel, ResourceLabels } from '../../
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { GitHubCheckConclusion, GitHubCheckStatus, GitHubCIOverallStatus, IGitHubCICheck } from '../../github/common/types.js';
 import { GitHubPullRequestCIModel } from '../../github/browser/models/githubPullRequestCIModel.js';
+import { CICheckGroup, buildFixChecksPrompt, getCheckGroup, getCheckStateLabel, getFailedChecks } from './fixCIChecksAction.js';
 
 const $ = dom.$;
 
-const enum CICheckGroup {
-	Running,
-	Pending,
-	Failed,
-	Successful,
-}
-
 interface ICICheckListItem {
 	readonly check: IGitHubCICheck;
 	readonly group: CICheckGroup;
@@ -397,17 +391,6 @@ function compareChecks(a: IGitHubCICheck, b: IGitHubCICheck): number {
 	return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' });
 }
 
-function getCheckGroup(check: IGitHubCICheck): CICheckGroup {
-	switch (check.status) {
-		case GitHubCheckStatus.InProgress:
-			return CICheckGroup.Running;
-		case GitHubCheckStatus.Queued:
-			return CICheckGroup.Pending;
-		case GitHubCheckStatus.Completed:
-			return isFailedConclusion(check.conclusion) ? CICheckGroup.Failed : CICheckGroup.Successful;
-	}
-}
-
 function getCheckCounts(checks: readonly IGitHubCICheck[]): ICICheckCounts {
 	let running = 0;
 	let pending = 0;
@@ -434,10 +417,6 @@ function getCheckCounts(checks: readonly IGitHubCICheck[]): ICICheckCounts {
 	return { running, pending, failed, successful };
 }
 
-function getFailedChecks(checks: readonly IGitHubCICheck[]): readonly IGitHubCICheck[] {
-	return checks.filter(check => getCheckGroup(check) === CICheckGroup.Failed);
-}
-
 function getChecksSummary(checks: readonly IGitHubCICheck[]): string {
 	const counts = getCheckCounts(checks);
 	const parts: string[] = [];
@@ -469,33 +448,6 @@ function getChecksSummary(checks: readonly IGitHubCICheck[]): string {
 	return parts.join(', ');
 }
 
-function buildFixChecksPrompt(failedChecks: ReadonlyArray<{ check: IGitHubCICheck; annotations: string }>): string {
-	const sections = failedChecks.map(({ check, annotations }) => {
-		const parts = [
-			`Check: ${check.name}`,
-			`Status: ${getCheckStateLabel(check)}`,
-			`Conclusion: ${check.conclusion ?? 'unknown'}`,
-		];
-
-		if (check.detailsUrl) {
-			parts.push(`Details: ${check.detailsUrl}`);
-		}
-
-		parts.push('', 'Annotations and output:', annotations || 'No output available for this check run.');
-		return parts.join('\n');
-	});
-
-	return [
-		'Please fix the failed CI checks for this session immediately.',
-		'Use the failed check information below, including annotations and check output, to identify the root causes and make the necessary code changes.',
-		'Focus on resolving these CI failures. Avoid unrelated changes unless they are required to fix the checks.',
-		'',
-		'Failed CI checks:',
-		'',
-		sections.join('\n\n---\n\n'),
-	].join('\n');
-}
-
 function getHeaderIconAndClass(checks: readonly IGitHubCICheck[], overallStatus: GitHubCIOverallStatus): { icon: ThemeIcon; className: string } {
 	const counts = getCheckCounts(checks);
 	if (counts.running > 0) {
@@ -552,22 +504,3 @@ function getCheckStatusClass(check: IGitHubCICheck): string {
 			return 'ci-status-success';
 	}
 }
-
-function getCheckStateLabel(check: IGitHubCICheck): string {
-	switch (getCheckGroup(check)) {
-		case CICheckGroup.Running:
-			return localize('ci.runningState', "running");
-		case CICheckGroup.Pending:
-			return localize('ci.pendingState', "pending");
-		case CICheckGroup.Failed:
-			return localize('ci.failedState', "failed");
-		case CICheckGroup.Successful:
-			return localize('ci.successfulState', "successful");
-	}
-}
-
-function isFailedConclusion(conclusion: GitHubCheckConclusion | undefined): boolean {
-	return conclusion === GitHubCheckConclusion.Failure
-		|| conclusion === GitHubCheckConclusion.TimedOut
-		|| conclusion === GitHubCheckConclusion.ActionRequired;
-}