Merge branch 'main' into copilot/fix-e7c8c5a5-dc38-4029-b1a7-504cde95862f

Author: alexr00

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.118.2
+
+### Fixes
+
+- Long coding agent problem statement results in unrecoverable error (Truncate coding agent problem_statement). https://github.com/microsoft/vscode-pull-request-github/issues/7861
+
 ## 0.118.1
 
 ### Fixes

package.json

@@ -14,7 +14,7 @@
 		"activeComment",
 		"chatParticipantAdditions",
 		"chatParticipantPrivate",
-		"chatSessionsProvider",
+		"chatSessionsProvider@2",
 		"codiconDecoration",
 		"codeActionRanges",
 		"commentingRangeHint",

src/@types/vscode.proposed.chatSessionsProvider.d.ts

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// version: 2
+
 declare module 'vscode' {
 	/**
 	 * Represents the status of a chat session.
@@ -34,6 +36,13 @@ declare module 'vscode' {
 		readonly onDidChangeChatSessionItems: Event<void>;
 
 		/**
+		 * Event that the provider can fire to signal that the current (original) chat session should be replaced with a new (modified) chat session.
+		 * The UI can use this information to gracefully migrate the user to the new session.
+		 */
+		readonly onDidCommitChatSessionItem: Event<{ original: ChatSessionItem /** untitled */; modified: ChatSessionItem /** newly created */ }>;
+
+		/**
+		 * DEPRECATED: Will be removed!
 		 * Creates a new chat session.
 		 *
 		 * @param options Options for the new session including an optional initial prompt and history
@@ -46,16 +55,6 @@ declare module 'vscode' {
 			 */
 			readonly request: ChatRequest;
 
-			/**
-			 * Initial prompt to initiate the session
-			 */
-			readonly prompt?: string;
-
-			/**
-			 * History to initialize the session with
-			 */
-			readonly history?: ReadonlyArray<ChatRequestTurn | ChatResponseTurn>;
-
 			/**
 			 * Additional metadata to use for session creation
 			 */
@@ -190,7 +189,16 @@ declare module 'vscode' {
 		 *
 		 * @returns A disposable that unregisters the provider when disposed.
 		 */
-		export function registerChatSessionContentProvider(chatSessionType: string, provider: ChatSessionContentProvider, capabilities?: ChatSessionCapabilities): Disposable;
+		export function registerChatSessionContentProvider(chatSessionType: string, provider: ChatSessionContentProvider, chatParticipant: ChatParticipant, capabilities?: ChatSessionCapabilities): Disposable;
+	}
+
+	export interface ChatContext {
+		readonly chatSessionContext?: ChatSessionContext;
+	}
+
+	export interface ChatSessionContext {
+		readonly chatSessionItem: ChatSessionItem; // Maps to URI of chat session editor (could be 'untitled-1', etc..)
+		readonly isUntitled: boolean;
 	}
 
 	export interface ChatSessionCapabilities {

src/common/uri.ts

@@ -9,6 +9,7 @@ import { Buffer } from 'buffer';
 import * as pathUtils from 'path';
 import fetch from 'cross-fetch';
 import * as vscode from 'vscode';
+import { RemoteInfo } from '../../common/types';
 import { Repository } from '../api/api';
 import { EXTENSION_ID } from '../constants';
 import { IAccount, isITeam, ITeam, reviewerId } from '../github/interface';
@@ -675,6 +676,24 @@ export function fromOpenPullRequestWebviewUri(uri: vscode.Uri): OpenPullRequestW
 	} catch (e) { }
 }
 
+export function toQueryUri(params: { remote: RemoteInfo | undefined, isCopilot?: boolean }) {
+	const uri = vscode.Uri.from({ scheme: Schemes.PRQuery, path: params.isCopilot ? 'copilot' : undefined, query: params.remote ? JSON.stringify({ remote: params.remote }) : undefined });
+	return uri;
+}
+
+export function fromQueryUri(uri: vscode.Uri): { remote: RemoteInfo | undefined, isCopilot?: boolean } | undefined {
+	if (uri.scheme !== Schemes.PRQuery) {
+		return;
+	}
+	try {
+		const query = uri.query ? JSON.parse(uri.query) : undefined;
+		return {
+			remote: query.remote,
+			isCopilot: uri.path === 'copilot'
+		};
+	} catch (e) { }
+}
+
 export enum Schemes {
 	File = 'file',
 	Review = 'review', // File content for a checked out PR
@@ -694,8 +713,6 @@ export enum Schemes {
 	GitHubCommit = 'githubcommit' // file content from GitHub for a commit
 }
 
-export const COPILOT_QUERY = vscode.Uri.from({ scheme: Schemes.PRQuery, path: 'copilot' });
-
 export function resolvePath(from: vscode.Uri, to: string) {
 	if (from.scheme === Schemes.File) {
 		return pathUtils.resolve(from.fsPath, to);

src/extension.ts

@@ -420,6 +420,11 @@ async function deferredActivate(context: vscode.ExtensionContext, showPRControll
 	const copilotRemoteAgentManager = new CopilotRemoteAgentManager(credentialStore, reposManager, telemetry, context, apiImpl);
 	context.subscriptions.push(copilotRemoteAgentManager);
 	if (vscode.chat?.registerChatSessionItemProvider) {
+		const chatParticipant = vscode.chat.createChatParticipant(COPILOT_SWE_AGENT, async (request, context, stream, token) =>
+			await copilotRemoteAgentManager.chatParticipantImpl(request, context, stream, token)
+		);
+		context.subscriptions.push(chatParticipant);
+
 		const provider = new class implements vscode.ChatSessionContentProvider, vscode.ChatSessionItemProvider {
 			label = vscode.l10n.t('GitHub Copilot Coding Agent');
 			provideChatSessionItems = async (token) => {
@@ -429,9 +434,7 @@ async function deferredActivate(context: vscode.ExtensionContext, showPRControll
 				return await copilotRemoteAgentManager.provideChatSessionContent(id, token);
 			};
 			onDidChangeChatSessionItems = copilotRemoteAgentManager.onDidChangeChatSessions;
-			provideNewChatSessionItem = async (options: { readonly request: vscode.ChatRequest; prompt?: string; history: ReadonlyArray<vscode.ChatRequestTurn | vscode.ChatResponseTurn>; metadata?: any; }, token: vscode.CancellationToken): Promise<vscode.ChatSessionItem> => {
-				return await copilotRemoteAgentManager.provideNewChatSessionItem(options, token);
-			};
+			onDidCommitChatSessionItem = copilotRemoteAgentManager.onDidCommitChatSession;
 		}();
 
 		context.subscriptions.push(vscode.chat?.registerChatSessionItemProvider(
@@ -442,7 +445,8 @@ async function deferredActivate(context: vscode.ExtensionContext, showPRControll
 		context.subscriptions.push(vscode.chat?.registerChatSessionContentProvider(
 			COPILOT_SWE_AGENT,
 			provider,
-			{ supportsInterruptions: true, }
+			chatParticipant,
+			{ supportsInterruptions: true }
 		));
 	}
 

src/github/copilotApi.ts

@@ -19,7 +19,8 @@ import { hasEnterpriseUri } from './utils';
 
 const LEARN_MORE_URL = 'https://aka.ms/coding-agent-docs';
 const PREMIUM_REQUESTS_URL = 'https://docs.github.com/en/copilot/concepts/copilot-billing/understanding-and-managing-requests-in-copilot#what-are-premium-requests';
-
+// https://github.com/github/sweagentd/blob/59e7d9210ca3ebba029918387e525eea73cb1f4a/internal/problemstatement/problemstatement.go#L36-L53
+export const MAX_PROBLEM_STATEMENT_LENGTH = 30_000 - 50; // 50 character buffer
 export interface RemoteAgentJobPayload {
 	problem_statement: string;
 	event_type: string;
@@ -45,14 +46,6 @@ export interface ChatSessionWithPR extends vscode.ChatSessionItem {
 	pullRequest: PullRequestModel;
 }
 
-export interface ChatSessionFromSummarizedChat extends vscode.ChatSessionItem {
-	prompt: string;
-	summary?: string;
-	// Cache
-	pullRequest?: PullRequestModel;
-	sessionInfo?: SessionInfo;
-}
-
 export class CopilotApi {
 	protected static readonly ID = 'copilotApi';
 
@@ -79,10 +72,15 @@ export class CopilotApi {
 		owner: string,
 		name: string,
 		payload: RemoteAgentJobPayload,
+		isTruncated: boolean,
 	): Promise<RemoteAgentJobResponse> {
 		const repoSlug = `${owner}/${name}`;
 		const apiUrl = `/agents/swe/v0/jobs/${repoSlug}`;
 		let status: number | undefined;
+
+		const problemStatementLength = payload.problem_statement.length.toString();
+		const payloadJson = JSON.stringify(payload);
+		const payloadLength = payloadJson.length.toString();
 		Logger.trace(`postRemoteAgentJob: Posting job to ${apiUrl} with payload: ${JSON.stringify(payload)}`, CopilotApi.ID);
 		try {
 			const response = await this.makeApiCall(apiUrl, {
@@ -93,7 +91,7 @@ export class CopilotApi {
 					'Content-Type': 'application/json',
 					'Accept': 'application/json'
 				},
-				body: JSON.stringify(payload)
+				body: payloadJson
 			});
 
 			status = response.status;
@@ -106,21 +104,33 @@ export class CopilotApi {
 			/*
 				__GDPR__
 				"remoteAgent.postRemoteAgentJob" : {
-					"status" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					"status" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"payloadLength": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"problemStatementLength": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"isTruncated": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
 			this.telemetry.sendTelemetryEvent('remoteAgent.postRemoteAgentJob', {
 				status: status.toString(),
+				payloadLength,
+				problemStatementLength,
+				isTruncated: isTruncated.toString(),
 			});
 			return data;
 		} catch (error) {
 			/* __GDPR__
 				"remoteAgent.postRemoteAgentJob" : {
-					"status" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					"status" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"payloadLength": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"problemStatementLength": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"isTruncated": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
 			this.telemetry.sendTelemetryErrorEvent('remoteAgent.postRemoteAgentJob', {
 				status: status?.toString() || '999',
+				payloadLength,
+				problemStatementLength,
+				isTruncated: isTruncated.toString(),
 			});
 			throw error;
 		}

src/github/copilotPrWatcher.ts

@@ -10,7 +10,6 @@ import { COPILOT_LOGINS, copilotEventToStatus, CopilotPRStatus } from '../common
 import { Disposable } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { PR_SETTINGS_NAMESPACE, QUERIES } from '../common/settingKeys';
-import { FolderRepositoryManager } from './folderRepositoryManager';
 import { PRType } from './interface';
 import { PullRequestModel } from './pullRequestModel';
 import { PullRequestOverviewPanel } from './pullRequestOverview';
@@ -42,7 +41,10 @@ export class CopilotStateModel extends Disposable {
 		this._onRefresh.fire();
 	}
 
-	makeKey(owner: string, repo: string, prNumber: number): string {
+	makeKey(owner: string, repo: string, prNumber?: number): string {
+		if (prNumber === undefined) {
+			return `${owner}/${repo}`;
+		}
 		return `${owner}/${repo}#${prNumber}`;
 	}
 
@@ -109,6 +111,17 @@ export class CopilotStateModel extends Disposable {
 		return this._showNotification;
 	}
 
+	getNotificationsCount(owner: string, repo: string): number {
+		let total = 0;
+		const partialKey = `${this.makeKey(owner, repo)}#`;
+		for (const state of this._showNotification.values()) {
+			if (state.startsWith(partialKey)) {
+				total++;
+			}
+		}
+		return total;
+	}
+
 	setInitialized() {
 		this._isInitialized = true;
 	}
@@ -117,11 +130,14 @@ export class CopilotStateModel extends Disposable {
 		return this._isInitialized;
 	}
 
-	getCounts(): { total: number; inProgress: number; error: number } {
+	getCounts(owner: string, repo: string): { total: number; inProgress: number; error: number } {
 		let inProgressCount = 0;
 		let errorCount = 0;
 
 		for (const state of this._states.values()) {
+			if (state.item.remote.owner !== owner || state.item.remote.repositoryName !== repo) {
+				continue;
+			}
 			if (state.status === CopilotPRStatus.Started) {
 				inProgressCount++;
 			} else if (state.status === CopilotPRStatus.Failed) {
@@ -221,14 +237,6 @@ export class CopilotPRWatcher extends Disposable {
 		}
 	}
 
-	private _currentUser: string | undefined;
-	private async _getCurrentUser(folderManager: FolderRepositoryManager): Promise<string> {
-		if (!this._currentUser) {
-			this._currentUser = (await folderManager.getCurrentUser()).login;
-		}
-		return this._currentUser;
-	}
-
 	private async _updateSingleState(pr: PullRequestModel): Promise<void> {
 		const changes: { pullRequestModel: PullRequestModel, status: CopilotPRStatus }[] = [];