Copilot CLI updates to worktree creation/storage (#1890)

* Copilot CLI updates to worktree creation/storage

* Fix tests

Author: DonJayamanne

src/extension/chatSessions/vscode-node/copilotCLIChatSessionsContribution.ts

@@ -40,12 +40,7 @@ export class CopilotCLIWorktreeManager {
 		@IVSCodeExtensionContext private readonly extensionContext: IVSCodeExtensionContext,
 		@IRunCommandExecutionService private readonly commandExecutionService: IRunCommandExecutionService) { }
 
-	async createWorktreeIfNeeded(sessionId: string, stream: vscode.ChatResponseStream): Promise<string | undefined> {
-		const isolationEnabled = this._sessionIsolation.get(sessionId) ?? false;
-		if (!isolationEnabled) {
-			return undefined;
-		}
-
+	async createWorktree(stream: vscode.ChatResponseStream): Promise<string | undefined> {
 		try {
 			const worktreePath = await this.commandExecutionService.executeCommand('git.createWorktreeWithDefaults') as string | undefined;
 			if (worktreePath) {
@@ -382,7 +377,7 @@ export class CopilotCLIChatSessionParticipant {
 		const id = SessionIdForCLI.parse(resource);
 
 		const workingDirectory = chatSessionContext.isUntitled ?
-			await this.worktreeManager.createWorktreeIfNeeded(id, stream) :
+			(this.worktreeManager.getIsolationPreference(id) ? await this.worktreeManager.createWorktree(stream) : undefined) :
 			this.worktreeManager.getWorktreePath(id);
 
 		const session = chatSessionContext.isUntitled ?
@@ -393,6 +388,10 @@ export class CopilotCLIChatSessionParticipant {
 			stream.warning(vscode.l10n.t('Chat session not found.'));
 			return undefined;
 		}
+
+		if (chatSessionContext.isUntitled && workingDirectory) {
+			await this.worktreeManager.storeWorktreePath(session.sessionId, workingDirectory);
+		}
 		disposables.add(session.attachStream(stream));
 		disposables.add(session.attachPermissionHandler(async (permissionRequest: PermissionRequest) => requestPermission(permissionRequest, this.toolsService, request.toolInvocationToken, token)));
 

src/extension/chatSessions/vscode-node/test/copilotCLIChatSessionParticipant.spec.ts

@@ -57,9 +57,10 @@ class FakeSummarizerProvider extends mock<ChatSummarizerProvider>() {
 }
 
 class FakeWorktreeManager extends mock<CopilotCLIWorktreeManager>() {
-	override createWorktreeIfNeeded = vi.fn(async () => undefined);
+	override createWorktree = vi.fn(async () => undefined);
 	override storeWorktreePath = vi.fn(async () => { });
 	override getWorktreePath = vi.fn((_id: string) => undefined);
+	override getIsolationPreference = vi.fn(() => true);
 }
 
 interface CreateSessionArgs { prompt: string | undefined; modelId: string | undefined; workingDirectory: string | undefined }