Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-17 15:24:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove progress service dependency and optimize chat session forking (#306207)

Browse Source
This commit is contained in:
Don Jayamanne
2026-03-31 14:32:10 +11:00
committed by GitHub
parent 99a7b4b084
commit b27242af3a
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/vs/workbench/contrib/chat/browser/actions/chatForkActions.ts
View File

@@ -12,7 +12,6 @@ import { localize, localize2 } from '../../../../../nls.js';
import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
import { IProgressService } from '../../../../../platform/progress/common/progress.js';
import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
import { IChatService, ResponseModelState } from '../../common/chatService/chatService.js';
import type { ISerializableChatData } from '../../common/model/chatModel.js';
@@ -54,7 +53,6 @@ export function registerChatForkActions() {
const chatWidgetService = accessor.get(IChatWidgetService);
const chatService = accessor.get(IChatService);
const chatSessionsService = accessor.get(IChatSessionsService);
const progressService = accessor.get(IProgressService);
const forkedTitlePrefix = localize('chat.forked.titlePrefix', "Forked: ");
// When invoked via /fork slash command, args[0] is a URI (sessionResource).
@@ -65,8 +63,7 @@ export function registerChatForkActions() {
// Check if this is a contributed session that supports forking
const contentProviderSchemes = chatSessionsService.getContentProviderSchemes();
if (contentProviderSchemes.includes(sourceSessionResource.scheme)) {
await forkContributedChatSession(sourceSessionResource, undefined, false, chatSessionsService, chatWidgetService, progressService);
return;
return await this.forkContributedChatSession(sourceSessionResource, undefined, false, chatSessionsService, chatWidgetService);
}
const chatModel = chatService.getSession(sourceSessionResource);
@@ -165,8 +162,7 @@ export function registerChatForkActions() {
}
}
}
await forkContributedChatSession(sessionResource, request, true, chatSessionsService, chatWidgetService, progressService);
return;
return await this.forkContributedChatSession(sessionResource, request, true, chatSessionsService, chatWidgetService);
}
const chatModel = chatService.getSession(sessionResource);
@@ -231,10 +227,28 @@ export function registerChatForkActions() {
await chatWidgetService.openSession(newSessionResource, ChatViewPaneTarget);
modelRef.dispose();
}
private pendingFork = new Map<string, Promise<void>>();
private async forkContributedChatSession(sourceSessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, openForkedSessionImmediately: boolean, chatSessionsService: IChatSessionsService, chatWidgetService: IChatWidgetService) {
const pendingKey = `${sourceSessionResource.toString()}@${request?.id ?? 'full'}`;
const pending = this.pendingFork.get(pendingKey);
if (pending) {
return pending;
}
const forkPromise = forkContributedChatSession(sourceSessionResource, request, openForkedSessionImmediately, chatSessionsService, chatWidgetService);
this.pendingFork.set(pendingKey, forkPromise);
try {
await forkPromise;
} finally {
this.pendingFork.delete(pendingKey);
}
}
});
}
async function forkContributedChatSession(sourceSessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, openForkedSessionImmediately: boolean, chatSessionsService: IChatSessionsService, chatWidgetService: IChatWidgetService, progressService: IProgressService) {
async function forkContributedChatSession(sourceSessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, openForkedSessionImmediately: boolean, chatSessionsService: IChatSessionsService, chatWidgetService: IChatWidgetService) {
const cts = new CancellationTokenSource();
try {
const forkedItem = await chatSessionsService.forkChatSession(sourceSessionResource, request, cts.token);