Merge pull request #456 from CodeEditorLand/fix/scm-duplicate-groups-resolve-configuration

fix(scm): avoid setting both folderUri and workspace in ResolveConfiguration

Author: NikolaRHristov

Source/Function/Install/Function/ResolveConfiguration.ts

@@ -161,6 +161,15 @@ export async function ResolveConfiguration(): Promise<ISandboxConfiguration> {
 		}
 	}
 
+	// True when running inside a Tauri webview (Mountain desktop shell).
+	// DesktopMain reads `workspace` (ISingleFolderWorkspaceIdentifier).
+	// The browser workbench reads `folderUri`.
+	// Setting both causes the workbench to register the same git repository
+	// twice via two independent workspace resolution paths, which makes the
+	// Git extension call registerSCMProvider twice and produces duplicate
+	// SCM group rows in the Source Control view.
+	const IsTauri = typeof ResolveInvoke() === "function";
+
 	try {
 		if (typeof Invoke === "function") {
 			Paths = await (
@@ -241,6 +250,8 @@ export async function ResolveConfiguration(): Promise<ISandboxConfiguration> {
 
 	DevLog("config", "workspace:", JSON.stringify(Workspace));
 
+	DevLog("config", "isTauri:", String(IsTauri));
+
 	// Mountain returns logsPath as a session-timestamped directory
 	// (e.g., .../logs/20260410T105248) with window1/ already created.
 	// Use it directly - no additional timestamp nesting needed.
@@ -560,11 +571,18 @@ export async function ResolveConfiguration(): Promise<ISandboxConfiguration> {
 
 		extensionsPath: `${Paths.userDataDir || "/tmp/.fiddee"}/extensions`,
 
-		// Workspace - set from ?folder= URL param
-		// folderUri is used by the browser workbench; workspace by the Electron workbench.
-		folderUri: FolderUri,
-
-		workspace: Workspace,
+		// Workspace resolution: folderUri and workspace must be mutually exclusive.
+		// Both being set causes the workbench to open the same git repository
+		// twice via two independent workspace paths, producing duplicate SCM
+		// provider registrations and duplicate group rows in the Source Control view.
+		//
+		// In Tauri/Mountain (desktop): DesktopMain.reviveIdentifier() reads
+		//   `workspace` (ISingleFolderWorkspaceIdentifier). Pass workspace only.
+		// In browser (no Tauri): the browser workbench reads `folderUri`.
+		//   Pass folderUri only.
+		folderUri: IsTauri ? undefined : FolderUri,
+
+		workspace: IsTauri ? Workspace : undefined,
 
 		backupPath: undefined,