Address local agents fork review feedback

Author: Chulong Li (M365)

src/vs/sessions/contrib/providers/localChatSessions/browser/localChatSessions.contribution.ts

@@ -69,10 +69,14 @@ registerAction2(class extends ForkConversationAction {
 				return super._openForkedSession(instantiationService, parentSessionResource, forkedSessionResource);
 			}
 
-			const adoptedSession = await sessionsManagementService.adoptForkedChat(parentSessionResource, forkedSessionResource);
-			if (adoptedSession) {
-				await sessionsViewService.openSession(adoptedSession.resource);
-				return;
+			try {
+				const adoptedSession = await sessionsManagementService.adoptForkedChat(parentSessionResource, forkedSessionResource);
+				if (adoptedSession) {
+					await sessionsViewService.openSession(adoptedSession.resource);
+					return;
+				}
+			} catch (error) {
+				logService.error(`Failed to adopt forked chat ${forkedSessionResource.toString()}`, error);
 			}
 
 			// Wait for the forked session to appear, but bound the wait so a

src/vs/sessions/contrib/providers/localChatSessions/browser/localChatSessionsProvider.ts

@@ -375,6 +375,7 @@ class LocalSession extends Disposable {
 
 	setModeSnapshot(mode: { readonly id: string; readonly kind: ChatModeKind | undefined } | undefined): void {
 		this._mode = undefined;
+		// The sessions surface stores a concrete mode kind; local chats default to agent mode when input state has no kind.
 		this._modeObservable.set(mode ? { id: mode.id, kind: mode.kind ?? ChatModeKind.Agent } : undefined, undefined);
 	}
 
@@ -574,7 +575,7 @@ export class LocalChatSessionsProvider extends Disposable implements ISessionsPr
 				lastMessageDate: stored.lastMessageDate,
 				timing: { created: stored.createdAt, lastRequestStarted: undefined, lastRequestEnded: stored.lastMessageDate },
 				isActive: false,
-				lastResponseState: 0 /* ResponseModelState.Complete */,
+				lastResponseState: ResponseModelState.Complete,
 				workingDirectory,
 			};
 
@@ -902,29 +903,34 @@ export class LocalChatSessionsProvider extends Disposable implements ISessionsPr
 		try {
 			const model = modelRef.object;
 			const sourceWorkspace = primary.workspace.get();
-			const workspace = sourceWorkspace ?? (model.workingDirectory ? this.resolveWorkspace(model.workingDirectory) : undefined);
+			const modelWorkingDirectory = model.workingDirectory;
+			const workingDirectory = modelWorkingDirectory ?? sourceWorkspace?.folders[0]?.root;
+			const workspace = (modelWorkingDirectory ? this.resolveWorkspace(modelWorkingDirectory) : undefined)
+				?? sourceWorkspace
+				?? (workingDirectory ? this.resolveWorkspace(workingDirectory) : undefined);
 			if (!workspace) {
 				throw new Error(`Cannot resolve workspace for forked chat ${forkedChatUri.toString()}`);
 			}
 
-			if (!model.workingDirectory && workspace.folders.length > 0) {
-				model.setWorkingDirectory(workspace.folders[0]?.root);
+			if (!model.workingDirectory && workingDirectory) {
+				model.setWorkingDirectory(workingDirectory);
 			}
 
 			const timing = model.timing;
 			const lastUpdate = model.lastMessageDate || timing.lastRequestEnded || timing.lastRequestStarted || timing.created;
+			const requestInProgress = model.requestInProgress.get();
 			const detail: IChatDetail = {
 				sessionResource: forkedChatUri,
 				title: model.title,
 				lastMessageDate: lastUpdate,
 				timing,
-				isActive: model.requestInProgress.get(),
-				lastResponseState: ResponseModelState.Complete,
-				workingDirectory: workspace.folders[0]?.root,
+				isActive: requestInProgress,
+				lastResponseState: requestInProgress ? ResponseModelState.Pending : ResponseModelState.Complete,
+				workingDirectory,
 			};
 
 			const session = LocalSession.fromHistory(detail, this.id, workspace, this.instantiationService);
-			session.setStatus(model.requestInProgress.get() ? SessionStatus.InProgress : SessionStatus.Completed);
+			session.setStatus(requestInProgress ? SessionStatus.InProgress : SessionStatus.Completed);
 			const inputState = model.inputModel.state.get();
 			session.setModelId(inputState?.selectedModel?.identifier);
 			session.setModeSnapshot(inputState?.mode);

src/vs/sessions/contrib/providers/localChatSessions/test/browser/localChatSessionsProvider.test.ts

@@ -156,7 +156,7 @@ const STORAGE_KEY_SESSIONS = 'sessions.localChat.sessions';
 
 interface IReadStoredSession {
 	readonly uri: UriComponents;
-	readonly workingDirectory: UriComponents;
+	readonly workingDirectory?: UriComponents;
 	readonly parentUri?: UriComponents;
 }
 
@@ -520,11 +520,12 @@ suite('LocalChatSessionsProvider', () => {
 		const provider = store.add(instantiationService.createInstance(LocalChatSessionsProvider));
 
 		const source = await commitNewSession(provider);
+		const forkedWorkingDirectory = URI.file('/forked/folder');
 		const forkedResource = URI.parse('vscode-local-chat://chat/forked-primary');
 		chatService.registerModel(createMockModel(forkedResource, {
 			title: 'Forked: hello',
 			timing: { created: 2_000, lastRequestStarted: 2_100, lastRequestEnded: 2_200 },
-			workingDirectory: TEST_FOLDER,
+			workingDirectory: forkedWorkingDirectory,
 		}));
 
 		const adopted = await provider.adoptForkedChat(source.sessionId, source.resource, forkedResource);
@@ -542,7 +543,7 @@ suite('LocalChatSessionsProvider', () => {
 			sessions: [source.resource.toString(), forkedResource.toString()],
 			chats: [forkedResource.toString()],
 			storedParent: undefined,
-			storedWorkingDirectory: TEST_FOLDER.toString(),
+			storedWorkingDirectory: forkedWorkingDirectory.toString(),
 		});
 	});