Remove 'session' from transfer API (microsoft#209204)

Author: roblourens

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

@@ -6,6 +6,7 @@
 import { Emitter } from 'vs/base/common/event';
 import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
 import { URI, UriComponents } from 'vs/base/common/uri';
+import { ILogService } from 'vs/platform/log/common/log';
 import { ExtHostChatShape, ExtHostContext, MainContext, MainThreadChatShape } from 'vs/workbench/api/common/extHost.protocol';
 import { IChatWidgetService } from 'vs/workbench/contrib/chat/browser/chat';
 import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService';
@@ -24,25 +25,27 @@ export class MainThreadChat extends Disposable implements MainThreadChatShape {
 		extHostContext: IExtHostContext,
 		@IChatService private readonly _chatService: IChatService,
 		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
-		@IChatContributionService private readonly chatContribService: IChatContributionService,
+		@IChatContributionService private readonly _chatContribService: IChatContributionService,
+		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostChat);
 	}
 
-	$transferChatSession(sessionId: number, toWorkspace: UriComponents): void {
-		const sessionIdStr = this._chatService.getSessionId(sessionId);
-		if (!sessionIdStr) {
-			throw new Error(`Failed to transfer session. Unknown session provider ID: ${sessionId}`);
+	$transferActiveChatSession(toWorkspace: UriComponents): void {
+		const widget = this._chatWidgetService.lastFocusedWidget;
+		const sessionId = widget?.viewModel?.model.sessionId;
+		if (!sessionId) {
+			this._logService.error(`MainThreadChat#$transferActiveChatSession: No active chat session found`);
+			return;
 		}
 
-		const widget = this._chatWidgetService.getWidgetBySessionId(sessionIdStr);
 		const inputValue = widget?.inputEditor.getValue() ?? '';
-		this._chatService.transferChatSession({ sessionId: sessionIdStr, inputValue: inputValue }, URI.revive(toWorkspace));
+		this._chatService.transferChatSession({ sessionId, inputValue }, URI.revive(toWorkspace));
 	}
 
 	async $registerChatProvider(handle: number, id: string): Promise<void> {
-		const registration = this.chatContribService.registeredProviders.find(staticProvider => staticProvider.id === id);
+		const registration = this._chatContribService.registeredProviders.find(staticProvider => staticProvider.id === id);
 		if (!registration) {
 			throw new Error(`Provider ${id} must be declared in the package.json.`);
 		}

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

@@ -1405,9 +1405,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				checkProposedApiEnabled(extension, 'interactive');
 				return extHostChat.registerChatProvider(extension, id, provider);
 			},
-			transferChatSession(session: vscode.InteractiveSession, toWorkspace: vscode.Uri) {
+			transferActiveChat(toWorkspace: vscode.Uri) {
 				checkProposedApiEnabled(extension, 'interactive');
-				return extHostChat.transferChatSession(session, toWorkspace);
+				return extHostChat.transferActiveChat(toWorkspace);
 			}
 		};
 

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

@@ -1322,7 +1322,7 @@ export interface MainThreadChatShape extends IDisposable {
 	$registerChatProvider(handle: number, id: string): Promise<void>;
 	$acceptChatState(sessionId: number, state: any): Promise<void>;
 	$unregisterChatProvider(handle: number): Promise<void>;
-	$transferChatSession(sessionId: number, toWorkspace: UriComponents): void;
+	$transferActiveChatSession(toWorkspace: UriComponents): void;
 }
 
 export interface ExtHostChatShape {

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

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { Iterable } from 'vs/base/common/iterator';
 import { toDisposable } from 'vs/base/common/lifecycle';
 import { IRelaxedExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ExtHostChatShape, IChatDto, IMainContext, MainContext, MainThreadChatShape } from 'vs/workbench/api/common/extHost.protocol';
@@ -49,13 +48,8 @@ export class ExtHostChat implements ExtHostChatShape {
 		});
 	}
 
-	transferChatSession(session: vscode.InteractiveSession, newWorkspace: vscode.Uri): void {
-		const sessionId = Iterable.find(this._chatSessions.keys(), key => this._chatSessions.get(key) === session) ?? 0;
-		if (typeof sessionId !== 'number') {
-			return;
-		}
-
-		this._proxy.$transferChatSession(sessionId, newWorkspace);
+	transferActiveChat(newWorkspace: vscode.Uri): void {
+		this._proxy.$transferActiveChatSession(newWorkspace);
 	}
 
 	async $prepareChat(handle: number, token: CancellationToken): Promise<IChatDto | undefined> {

src/vscode-dts/vscode.proposed.interactive.d.ts

@@ -132,6 +132,6 @@ declare module 'vscode' {
 
 		export function registerInteractiveEditorSessionProvider(provider: InteractiveEditorSessionProvider, metadata?: InteractiveEditorSessionProviderMetadata): Disposable;
 
-		export function transferChatSession(session: InteractiveSession, toWorkspace: Uri): void;
+		export function transferActiveChat(toWorkspace: Uri): void;
 	}
 }