Skip to content

Cloud Session - use working set to show changes in favour of the multi-diff chat response part #2619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lszomoru wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −36
Open

Cloud Session - use working set to show changes in favour of the multi-diff chat response part #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions src/extension/chatSessions/vscode-node/copilotCloudSessionContentBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { ChatRequestTurn, ChatRequestTurn2, ChatResponseMarkdownPart, ChatRespon
import { IGitService } from '../../../platform/git/common/gitService';
import { PullRequestSearchItem, SessionInfo } from '../../../platform/github/common/githubAPI';
import { getAuthorDisplayName, toOpenPullRequestWebviewUri } from '../vscode/copilotCodingAgentUtils';
import { IPullRequestFileChangesService } from './pullRequestFileChangesService';

export interface SessionResponseLogChunk {
choices: Array<{
Expand Down Expand Up @@ -99,8 +98,7 @@ export interface ParsedToolCallDetails {
export class ChatSessionContentBuilder {
constructor(
private type: string,
@IGitService private readonly _gitService: IGitService,
@IPullRequestFileChangesService private readonly _prFileChangesService: IPullRequestFileChangesService,
@IGitService private readonly _gitService: IGitService
) {
}

Expand Down Expand Up @@ -194,13 +192,6 @@ export class ChatSessionContentBuilder {
}
}

if (session.state === 'completed' || session.state === 'failed' /** session can fail with proposed changes */) {
const multiDiffPart = await this._prFileChangesService.getFileChangesMultiDiffPart(pullRequest);
if (multiDiffPart) {
responseParts.push(multiDiffPart);
}
}

if (responseParts.length > 0) {
const responseResult: ChatResult = {};
return new ChatResponseTurn2(responseParts, responseResult, this.type);
Expand Down
26 changes: 13 additions & 13 deletions src/extension/chatSessions/vscode-node/copilotCloudSessionsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,16 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
return undefined;
}

const multiDiffPart = await this._prFileChangesService.getFileChangesMultiDiffPart(pr);
const changes = multiDiffPart
? multiDiffPart.value.map(change =>
new vscode.ChatSessionChangedFile(change.modifiedUri!, change.added!, change.removed!, change.originalUri))
: {
files: pr.files.totalCount,
insertions: pr.additions,
deletions: pr.deletions
};

const session = {
resource: vscode.Uri.from({ scheme: CopilotCloudSessionsProvider.TYPE, path: '/' + pr.number }),
label: pr.title,
Expand All @@ -414,11 +424,7 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
endTime: validateISOTimestamp(sessionItem.completed_at),
}
} : {}),
changes: {
files: pr.files.totalCount,
insertions: pr.additions,
deletions: pr.deletions
},
changes,
fullDatabaseId: pr.fullDatabaseId.toString(),
pullRequestDetails: pr,
} satisfies vscode.ChatSessionItem & {
Expand Down Expand Up @@ -525,7 +531,7 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
return (this.sessionReferencesMap.get(resource) ?? []).concat(summaryRef ? [summaryRef] : []);
});

const sessionContentBuilder = new ChatSessionContentBuilder(CopilotCloudSessionsProvider.TYPE, this._gitService, this._prFileChangesService);
const sessionContentBuilder = new ChatSessionContentBuilder(CopilotCloudSessionsProvider.TYPE, this._gitService);
const history = await sessionContentBuilder.buildSessionHistory(getProblemStatement(sortedSessions), sortedSessions, pr, (sessionId: string) => this._octoKitService.getSessionLogs(sessionId), storedReferences);

const selectedAgent =
Expand Down Expand Up @@ -1250,12 +1256,6 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
return;
}
isCompleted = true;

this.logService.info(`Session completed, attempting to get file changes for PR #${pullRequest.number}`);
const multiDiffPart = await this._prFileChangesService.getFileChangesMultiDiffPart(pullRequest);
if (multiDiffPart) {
stream.push(multiDiffPart);
}
resolve();
};

Expand Down Expand Up @@ -1343,7 +1343,7 @@ export class CopilotCloudSessionsProvider extends Disposable implements vscode.C
}

// Parse the new log content
const contentBuilder = new ChatSessionContentBuilder(CopilotCloudSessionsProvider.TYPE, this._gitService, this._prFileChangesService);
const contentBuilder = new ChatSessionContentBuilder(CopilotCloudSessionsProvider.TYPE, this._gitService);

const logChunks = contentBuilder.parseSessionLogs(newLogContent);
let hasStreamedContent = false;
Expand Down
17 changes: 4 additions & 13 deletions src/extension/chatSessions/vscode-node/pullRequestFileChangesService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
*--------------------------------------------------------------------------------------------*/

import * as vscode from 'vscode';
import { IGitService } from '../../../platform/git/common/gitService';
import { PullRequestSearchItem } from '../../../platform/github/common/githubAPI';
import { IOctoKitService } from '../../../platform/github/common/githubService';
import { ILogService } from '../../../platform/log/common/logService';
import { createServiceIdentifier } from '../../../util/common/services';
import { getRepoId } from '../vscode/copilotCodingAgentUtils';
import { toPRContentUri } from './prContentProvider';

export const IPullRequestFileChangesService = createServiceIdentifier<IPullRequestFileChangesService>('IPullRequestFileChangesService');
Expand All @@ -23,24 +21,17 @@ export class PullRequestFileChangesService implements IPullRequestFileChangesSer
declare readonly _serviceBrand: undefined;

constructor(
@IGitService private readonly _gitService: IGitService,
@IOctoKitService private readonly _octoKitService: IOctoKitService,
@ILogService private readonly logService: ILogService,
) { }

async getFileChangesMultiDiffPart(pullRequest: PullRequestSearchItem): Promise<vscode.ChatResponseMultiDiffPart | undefined> {
try {
this.logService.trace(`Getting file changes for PR #${pullRequest.number}`);
const repoId = await getRepoId(this._gitService);
let repoName, repoOwner = undefined;
if (repoId) {
repoName = repoId.repo;
repoOwner = repoId.org;
} else {
repoOwner = pullRequest.repository.owner.login;
repoName = pullRequest.repository.name;
}
if (!repoName || !repoOwner) {
const repoOwner = pullRequest.repository.owner.login;
const repoName = pullRequest.repository.name;

if (!repoOwner || !repoName) {
this.logService.warn('No repo ID available for fetching PR file changes');
return undefined;
}
Expand Down