Reworks "workspace" context

- Improves startup performance
- Improves scoped (repo) accuracy checking

Author: eamodio

package.json

@@ -125,7 +125,13 @@ function getAvatarUriCore(
 	const avatar = createOrUpdateAvatar(key, email, size, hash, options?.defaultStyle);
 	if (avatar.uri != null) return avatar.uri;
 
-	if (!options?.cached && repoPathOrCommit != null && getContext('gitlens:hasConnectedRemotes')) {
+	if (
+		!options?.cached &&
+		repoPathOrCommit != null &&
+		getContext('gitlens:repos:withHostingIntegrationsConnected')?.includes(
+			typeof repoPathOrCommit === 'string' ? repoPathOrCommit : repoPathOrCommit.repoPath,
+		)
+	) {
 		let query = avatarQueue.get(key);
 		if (query == null && hasAvatarExpired(avatar)) {
 			query = getAvatarUriFromRemoteProvider(avatar, key, email, repoPathOrCommit, { size: size }).then(

src/avatars.ts

@@ -681,9 +681,6 @@ export type ContextKeys = {
 	'gitlens:gk:organization:ai:enabled': boolean;
 	'gitlens:gk:organization:drafts:byob': boolean;
 	'gitlens:gk:organization:drafts:enabled': boolean;
-	'gitlens:hasConnectedRemotes': boolean;
-	'gitlens:hasRemotes': boolean;
-	'gitlens:hasRichRemotes': boolean;
 	'gitlens:hasVirtualFolders': boolean;
 	'gitlens:plus': SubscriptionPlanId;
 	'gitlens:plus:disallowedRepos': string[];
@@ -692,6 +689,9 @@ export type ContextKeys = {
 	'gitlens:plus:state': SubscriptionState;
 	'gitlens:prerelease': boolean;
 	'gitlens:readonly': boolean;
+	'gitlens:repos:withRemotes': string[];
+	'gitlens:repos:withHostingIntegrations': string[];
+	'gitlens:repos:withHostingIntegrationsConnected': string[];
 	'gitlens:untrusted': boolean;
 	'gitlens:views:canCompare': boolean;
 	'gitlens:views:canCompare:file': boolean;
@@ -1178,9 +1178,12 @@ export type TelemetryGlobalContext = {
 	'providers.count': number;
 	'providers.ids': string;
 	'repositories.count': number;
-	'repositories.hasConnectedRemotes': boolean;
 	'repositories.hasRemotes': boolean;
 	'repositories.hasRichRemotes': boolean;
+	'repositories.hasConnectedRemotes': boolean;
+	'repositories.withRemotes': number;
+	'repositories.withHostingIntegrations': number;
+	'repositories.withHostingIntegrationsConnected': number;
 	'repositories.remoteProviders': string;
 	'repositories.schemes': string;
 	'repositories.visibility': 'private' | 'public' | 'local' | 'mixed';

src/constants.ts

@@ -1076,52 +1076,60 @@ export class GitProviderService implements Disposable {
 		async function updateRemoteContext(this: GitProviderService) {
 			const integrations = configuration.get('integrations.enabled');
 
-			const telemetryEnabled = this.container.telemetry.enabled;
 			const remoteProviders = new Set<string>();
+			const reposWithRemotes = new Set<string>();
+			const reposWithHostingIntegrations = new Set<string>();
+			const reposWithHostingIntegrationsConnected = new Set<string>();
 
-			let hasRemotes = false;
-			let hasRemotesWithIntegrations = false;
-			let hasConnectedRemotes = false;
+			async function scanRemotes(repo: Repository) {
+				let hasSupportedIntegration = false;
+				let hasConnectedIntegration = false;
 
-			if (hasRepositories) {
-				for (const repo of this._repositories.values()) {
-					if (telemetryEnabled) {
-						const remotes = await repo.getRemotes();
-						for (const remote of remotes) {
-							remoteProviders.add(remote.provider?.id ?? 'unknown');
-						}
-					}
-
-					if (!hasConnectedRemotes && integrations) {
-						hasConnectedRemotes = await repo.hasRemoteWithIntegration({ includeDisconnected: false });
-
-						if (hasConnectedRemotes) {
-							hasRemotesWithIntegrations = true;
-							hasRemotes = true;
+				const remotes = await repo.getRemotes();
+				for (const remote of remotes) {
+					remoteProviders.add(remote.provider?.id ?? 'unknown');
+					reposWithRemotes.add(repo.uri.toString());
+					reposWithRemotes.add(repo.path);
+
+					// Skip if integrations are disabled or if we've already found a connected integration
+					if (!integrations || (hasSupportedIntegration && hasConnectedIntegration)) continue;
+
+					if (remote.hasIntegration()) {
+						hasSupportedIntegration = true;
+						reposWithHostingIntegrations.add(repo.uri.toString());
+						reposWithHostingIntegrations.add(repo.path);
+
+						let connected = remote.maybeIntegrationConnected;
+						// If we don't know if we are connected, only check if the remote is the default or there is only one
+						// TODO@eamodio is the above still a valid requirement?
+						if (connected == null && (remote.default || remotes.length === 1)) {
+							const integration = await remote.getIntegration();
+							connected = await integration?.isConnected();
 						}
-					}
-
-					if (!hasRemotesWithIntegrations && integrations) {
-						hasRemotesWithIntegrations = await repo.hasRemoteWithIntegration({ includeDisconnected: true });
 
-						if (hasRemotesWithIntegrations) {
-							hasRemotes = true;
+						if (connected) {
+							hasConnectedIntegration = true;
+							reposWithHostingIntegrationsConnected.add(repo.uri.toString());
+							reposWithHostingIntegrationsConnected.add(repo.path);
 						}
 					}
-
-					if (!hasRemotes) {
-						hasRemotes = await repo.hasRemotes();
-					}
-
-					if (hasRemotes && ((hasRemotesWithIntegrations && hasConnectedRemotes) || !integrations)) break;
 				}
 			}
 
-			if (telemetryEnabled) {
+			if (hasRepositories) {
+				void (await Promise.allSettled(map(this._repositories.values(), scanRemotes)));
+			}
+
+			if (this.container.telemetry.enabled) {
 				this.container.telemetry.setGlobalAttributes({
-					'repositories.hasRemotes': hasRemotes,
-					'repositories.hasRichRemotes': hasRemotesWithIntegrations,
-					'repositories.hasConnectedRemotes': hasConnectedRemotes,
+					'repositories.hasRemotes': reposWithRemotes.size !== 0,
+					'repositories.hasRichRemotes': reposWithHostingIntegrations.size !== 0,
+					'repositories.hasConnectedRemotes': reposWithHostingIntegrationsConnected.size !== 0,
+
+					'repositories.withRemotes': reposWithRemotes.size / 2,
+					'repositories.withHostingIntegrations': reposWithHostingIntegrations.size / 2,
+					'repositories.withHostingIntegrationsConnected': reposWithHostingIntegrationsConnected.size / 2,
+
 					'repositories.remoteProviders': join(remoteProviders, ','),
 				});
 				if (this._sendProviderContextTelemetryDebounced == null) {
@@ -1134,9 +1142,15 @@ export class GitProviderService implements Disposable {
 			}
 
 			await Promise.allSettled([
-				setContext('gitlens:hasRemotes', hasRemotes),
-				setContext('gitlens:hasRichRemotes', hasRemotesWithIntegrations),
-				setContext('gitlens:hasConnectedRemotes', hasConnectedRemotes),
+				setContext('gitlens:repos:withRemotes', reposWithRemotes.size ? [...reposWithRemotes] : undefined),
+				setContext(
+					'gitlens:repos:withHostingIntegrations',
+					reposWithHostingIntegrations.size ? [...reposWithHostingIntegrations] : undefined,
+				),
+				setContext(
+					'gitlens:repos:withHostingIntegrationsConnected',
+					reposWithHostingIntegrationsConnected.size ? [...reposWithHostingIntegrationsConnected] : undefined,
+				),
 			]);
 		}
 

src/git/gitProviderService.ts

@@ -945,7 +945,13 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 	}
 
 	private async onGetMissingRefMetadata(e: GetMissingRefsMetadataParams) {
-		if (this._graph == null || this._refsMetadata === null || !getContext('gitlens:hasConnectedRemotes')) return;
+		if (
+			this._graph == null ||
+			this._refsMetadata === null ||
+			!getContext('gitlens:repos:withHostingIntegrationsConnected')?.includes(this._graph.repoPath)
+		) {
+			return;
+		}
 
 		const repoPath = this._graph.repoPath;
 
@@ -1549,7 +1555,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			repo.watchFileSystem(1000),
 			repo.onDidChangeFileSystem(this.onRepositoryFileSystemChanged, this),
 			onDidChangeContext(key => {
-				if (key !== 'gitlens:hasConnectedRemotes') return;
+				if (key !== 'gitlens:repos:withHostingIntegrationsConnected') return;
 
 				this.resetRefsMetadata();
 				this.updateRefsMetadata();
@@ -2142,7 +2148,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 	}
 
 	private resetRefsMetadata(): null | undefined {
-		this._refsMetadata = getContext('gitlens:hasConnectedRemotes') ? undefined : null;
+		this._refsMetadata = getContext('gitlens:repos:withHostingIntegrationsConnected') ? undefined : null;
 		return this._refsMetadata;
 	}
 

src/plus/webviews/graph/graphWebview.ts

@@ -174,7 +174,7 @@ export class BranchNode
 				this.view.config.pullRequests.enabled &&
 				this.view.config.pullRequests.showForBranches &&
 				(branch.upstream != null || branch.remote) &&
-				getContext('gitlens:hasConnectedRemotes')
+				getContext('gitlens:repos:withHostingIntegrationsConnected')?.includes(branch.repoPath)
 			) {
 				pullRequest = this.getState('pullRequest');
 				if (pullRequest === undefined && this.getState('pendingPullRequest') === undefined) {

src/views/nodes/branchNode.ts

@@ -92,9 +92,9 @@ export class CommitNode extends ViewRefNode<'commit', ViewsWithCommits | FileHis
 			if (
 				this.view.type !== 'tags' &&
 				!this.unpublished &&
-				getContext('gitlens:hasConnectedRemotes') &&
 				this.view.config.pullRequests?.enabled &&
-				this.view.config.pullRequests?.showForCommits
+				this.view.config.pullRequests?.showForCommits &&
+				getContext('gitlens:repos:withHostingIntegrationsConnected')?.includes(commit.repoPath)
 			) {
 				pullRequest = this.getState('pullRequest');
 				if (pullRequest === undefined && this.getState('pendingPullRequest') === undefined) {

src/views/nodes/commitNode.ts

@@ -75,7 +75,7 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit
 				this.view.config.pullRequests.enabled &&
 				this.view.config.pullRequests.showForBranches &&
 				(branch.upstream != null || branch.remote) &&
-				getContext('gitlens:hasConnectedRemotes')
+				getContext('gitlens:repos:withHostingIntegrationsConnected')?.includes(branch.repoPath)
 			) {
 				pullRequest = this.getState('pullRequest');
 				if (pullRequest === undefined && this.getState('pendingPullRequest') === undefined) {

src/views/nodes/worktreeNode.ts

@@ -1456,7 +1456,11 @@ export class CommitDetailsWebviewProvider
 		this.updatePendingContext(
 			{
 				commit: commit,
-				richStateLoaded: Boolean(commit?.isUncommitted) || !getContext('gitlens:hasConnectedRemotes'),
+				richStateLoaded:
+					Boolean(commit?.isUncommitted) ||
+					(commit != null
+						? !getContext('gitlens:repos:withHostingIntegrationsConnected')?.includes(commit.repoPath)
+						: !getContext('gitlens:repos:withHostingIntegrationsConnected')),
 				formattedMessage: undefined,
 				autolinkedIssues: undefined,
 				pullRequest: undefined,