Fix file URIs using wrong workspace folder in multi-root workspaces (#8261)

* Initial plan

* Initial plan for fixing wrong file URIs with multiple roots

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Fix wrong file URIs with multiple roots by using correct workspace folder

Pass repository rootUri to TemporaryState.write so it can find the correct
workspace folder name instead of always using the first one.

Fixes issue where vscode-userdata URIs contained the wrong workspace folder
path in multi-root workspace scenarios.

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Add comment documenting readState limitation for multi-root workspaces

Added a comment to readState noting that it currently only supports the
first workspace folder, and that it should accept a repositoryUri parameter
if multi-root support is needed in the future.

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Add multi-root workspace support to readState method

Updated readState to accept optional repositoryUri parameter and find the
matching workspace folder, mirroring the logic in writeState. This ensures
consistency when reading files written with the correct workspace folder
path in multi-root workspaces.

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

* Fix some stuff

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/temporaryState.ts

@@ -5,6 +5,7 @@
 import * as vscode from 'vscode';
 import { disposeAll } from './lifecycle';
 import Logger from './logger';
+import { isDescendant } from './utils';
 
 let tempState: TemporaryState | undefined;
 
@@ -39,10 +40,21 @@ export class TemporaryState extends vscode.Disposable {
 		}
 	}
 
-	private async writeState(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean): Promise<vscode.Uri> {
+	private async writeState(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean, repositoryUri: vscode.Uri): Promise<vscode.Uri> {
 		let filePath: vscode.Uri = this.path;
-		const workspace = (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0)
-			? vscode.workspace.workspaceFolders[0].name : undefined;
+		let workspace: string | undefined;
+
+		if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+			const matchingFolder = vscode.workspace.workspaceFolders.find(folder =>
+				isDescendant(folder.uri.fsPath, repositoryUri.fsPath) || isDescendant(repositoryUri.fsPath, folder.uri.fsPath)
+			);
+			workspace = matchingFolder?.name;
+		}
+
+		// Fall back to the first workspace folder if no match found
+		if (!workspace && vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+			workspace = vscode.workspace.workspaceFolders[0].name;
+		}
 
 		if (workspace) {
 			filePath = vscode.Uri.joinPath(filePath, workspace);
@@ -68,10 +80,21 @@ export class TemporaryState extends vscode.Disposable {
 		return file;
 	}
 
-	private async readState(subpath: string, filename: string): Promise<Uint8Array> {
+	private async readState(subpath: string, filename: string, repositoryUri: vscode.Uri): Promise<Uint8Array> {
 		let filePath: vscode.Uri = this.path;
-		const workspace = (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0)
-			? vscode.workspace.workspaceFolders[0].name : undefined;
+		let workspace: string | undefined;
+
+		if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+			const matchingFolder = vscode.workspace.workspaceFolders.find(folder =>
+				isDescendant(folder.uri.fsPath, repositoryUri.fsPath) || isDescendant(repositoryUri.fsPath, folder.uri.fsPath)
+			);
+			workspace = matchingFolder?.name;
+		}
+
+		// Fall back to the first workspace folder if no match found
+		if (!workspace && vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
+			workspace = vscode.workspace.workspaceFolders[0].name;
+		}
 
 		if (workspace) {
 			filePath = vscode.Uri.joinPath(filePath, workspace);
@@ -99,19 +122,19 @@ export class TemporaryState extends vscode.Disposable {
 		}
 	}
 
-	static async write(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean = false): Promise<vscode.Uri | undefined> {
+	static async write(subpath: string, filename: string, contents: Uint8Array, persistInSession: boolean = false, repositoryUri: vscode.Uri): Promise<vscode.Uri | undefined> {
 		if (!tempState) {
 			return;
 		}
 
-		return tempState.writeState(subpath, filename, contents, persistInSession);
+		return tempState.writeState(subpath, filename, contents, persistInSession, repositoryUri);
 	}
 
-	static async read(subpath: string, filename: string): Promise<Uint8Array | undefined> {
+	static async read(subpath: string, filename: string, repositoryUri: vscode.Uri): Promise<Uint8Array | undefined> {
 		if (!tempState) {
 			return;
 		}
 
-		return tempState.readState(subpath, filename);
+		return tempState.readState(subpath, filename, repositoryUri);
 	}
 }

src/common/uri.ts

@@ -195,7 +195,7 @@ export async function asTempStorageURI(uri: vscode.Uri, repository: Repository):
 
 		if (ImageMimetypes.indexOf(mimetype) > -1) {
 			const contents = await repository.buffer(ref, absolutePath);
-			return TemporaryState.write(pathUtils.dirname(path), pathUtils.basename(path), contents);
+			return TemporaryState.write(pathUtils.dirname(path), pathUtils.basename(path), contents, false, repository.rootUri);
 		}
 	} catch (err) {
 		return;