Fixes #4521 ensures repoPath is included in id

Author: eamodio

CHANGELOG.md

@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Fixes underlines showing on home branch actions ([#4703](https://github.com/gitkraken/vscode-gitlens/issues/4703))
 - Fixes _Inspect_ view not showing uncommitted files on the Inspect tab ([#4714](https://github.com/gitkraken/vscode-gitlens/issues/4714))
 - Fixes _Commit Graph_ losing row selection when graph updates ([#4544](https://github.com/gitkraken/vscode-gitlens/issues/4544))
+- Fixes "Element with id already registered" error on comparison w/ multiple repos ([#4521](https://github.com/gitkraken/vscode-gitlens/issues/4521))
 
 ## [17.6.2] - 2025-10-16
 

src/views/nodes/abstract/repositoryFolderNode.ts

@@ -29,7 +29,7 @@ export abstract class RepositoryFolderNode<
 	) {
 		super('repo-folder', uri, view, parent);
 
-		this.updateContext({ repository: this.repo });
+		this.updateContext({ repository: repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);
 	}
 

src/views/nodes/abstract/viewNode.ts

@@ -127,6 +127,7 @@ export interface AmbientContext {
 	readonly reflog?: GitReflogRecord;
 	readonly remote?: GitRemote;
 	readonly repository?: Repository;
+	readonly repoPath?: string;
 	readonly root?: boolean;
 	readonly searchId?: string;
 	readonly storedComparisonId?: string;
@@ -150,8 +151,8 @@ export function getViewNodeId(type: string, context: AmbientContext): string {
 	if (context.wsRepositoryDescriptor != null) {
 		uniqueness += `/wsrepo/${context.wsRepositoryDescriptor.id}`;
 	}
-	if (context.repository != null) {
-		uniqueness += `/repo/${context.repository.id}`;
+	if (context.repository != null || context.repoPath != null) {
+		uniqueness += `/repo/${context.repository?.id ?? context.repoPath}`;
 	}
 	if (context.worktree != null) {
 		uniqueness += `/worktree/${context.worktree.uri.path}`;

src/views/nodes/compareResultsNode.ts

@@ -42,6 +42,7 @@ export class CompareResultsNode extends SubscribeableViewNode<
 
 		this.updateContext({
 			comparisonId: `${_ref.ref}+${_compareWith.ref}`,
+			repoPath: repoPath,
 			storedComparisonId: this.getStorageId(),
 		});
 		this._uniqueId = getViewNodeId(this.type, this.context);

src/views/nodes/repositoryNode.ts

@@ -49,7 +49,7 @@ export class RepositoryNode extends SubscribeableViewNode<'repository', ViewsWit
 	) {
 		super('repository', uri, view, parent);
 
-		this.updateContext({ ...context, repository: this.repo });
+		this.updateContext({ ...context, repository: repo });
 		this._uniqueId = getViewNodeId(this.type, this.context);
 
 		this._status = this.repo.git.status.getStatus();

src/views/nodes/resultsCommitsNode.ts

@@ -56,7 +56,7 @@ export class ResultsCommitsNodeBase<Type extends TreeViewNodeTypes, View extends
 		super(type, GitUri.fromRepoPath(repoPath), view, parent);
 
 		if (_results.direction != null) {
-			this.updateContext({ branchStatusUpstreamType: _results.direction });
+			this.updateContext({ branchStatusUpstreamType: _results.direction, repoPath: repoPath });
 		}
 		this._uniqueId = getViewNodeId(this.type, this.context);
 		this.limit = this.view.getNodeLastKnownLimit(this);

src/views/searchAndCompareView.ts

@@ -81,6 +81,11 @@ export class SearchAndCompareViewNode extends ViewNode<'search-compare', SearchA
 		const children = [...this.children];
 		if (children.includes(results)) return;
 
+		const index = children.findIndex(c => c.id === results.id);
+		if (index !== -1) {
+			children.splice(index, 1);
+		}
+
 		children.push(results);
 		this.children = children;