Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikolaRHristov merged 1 commit into from
Jun 4, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions Source/Function/Install/Function/ResolveConfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,

Expand Down
Loading