Honors integration disconnect state & moves utils

 - Ensure "maybe connect" honors disconnected storage state
Moves integration change detection from compare results to autolinks
 - Avoids needless refresh since only autolinks need the integrations
 - Debounces integration changes

Author: eamodio

src/constants.storage.ts

@@ -8,7 +8,7 @@ import type { Environment } from './container';
 import type { FeaturePreviews } from './features';
 import type { GitRevisionRangeNotation } from './git/models/revision';
 import type { PaidSubscriptionPlanIds, Subscription } from './plus/gk/models/subscription';
-import type { Integration } from './plus/integrations/models/integration';
+import type { IntegrationConnectedKey } from './plus/integrations/models/integration';
 import type { DeepLinkServiceState } from './uris/deepLinks/deepLink';
 
 export type SecretKeys =
@@ -156,7 +156,7 @@ export type WorkspaceStorage = {
 	'views:searchAndCompare:pinned': StoredSearchAndCompareItems;
 	'views:scm:grouped:selected': GroupableTreeViewTypes;
 } & {
-	[key in `connected:${Integration['key']}`]: boolean;
+	[key in IntegrationConnectedKey]: boolean;
 };
 
 export interface Stored<T, SchemaVersion extends number = 1> {

src/constants.views.ts

@@ -109,6 +109,7 @@ export const treeViewFileNodeTypes: TreeViewFileNodeTypes[] = [
 	'uncommitted-file',
 ];
 export type TreeViewSubscribableNodeTypes =
+	| 'autolinks'
 	| 'commits-current-branch'
 	| 'compare-branch'
 	| 'compare-results'
@@ -126,7 +127,6 @@ export type TreeViewNodeTypes =
 	| TreeViewFileNodeTypes
 	| TreeViewSubscribableNodeTypes
 	| 'autolink'
-	| 'autolinks'
 	| 'branch-tag-folder'
 	| 'branches'
 	| 'compare-picker'

src/git/models/remote.ts

@@ -2,7 +2,10 @@
 import { GitCloudHostIntegrationId } from '../../constants.integrations';
 import type { Container } from '../../container';
 import type { GitHostIntegration } from '../../plus/integrations/models/gitHostIntegration';
-import { getIntegrationIdForRemote } from '../../plus/integrations/utils/-webview/integration.utils';
+import {
+	getIntegrationConnectedKey,
+	getIntegrationIdForRemote,
+} from '../../plus/integrations/utils/-webview/integration.utils';
 import { memoize } from '../../system/decorators/-webview/memoize';
 import { getLoggableName } from '../../system/logger';
 import { equalsIgnoreCase } from '../../system/string';
@@ -54,7 +57,9 @@ export class GitRemote<TProvider extends RemoteProvider | undefined = RemoteProv
 		// Special case for GitHub, since we support the legacy GitHub integration
 		if (integrationId === GitCloudHostIntegrationId.GitHub) {
 			const configured = this.container.integrations.getConfiguredLite(integrationId, { cloud: true });
-			if (configured.length) return true;
+			if (configured.length) {
+				return this.container.storage.getWorkspace(getIntegrationConnectedKey(integrationId)) !== false;
+			}
 
 			return undefined;
 		}
@@ -63,7 +68,14 @@ export class GitRemote<TProvider extends RemoteProvider | undefined = RemoteProv
 			integrationId,
 			this.provider.custom ? { domain: this.provider.domain } : undefined,
 		);
-		return Boolean(configured.length);
+
+		if (configured.length) {
+			return (
+				this.container.storage.getWorkspace(getIntegrationConnectedKey(integrationId, this.provider.domain)) !==
+				false
+			);
+		}
+		return false;
 	}
 
 	@memoize()

src/git/remotes/remoteProviders.ts

@@ -3,7 +3,7 @@ import type { CloudGitSelfManagedHostIntegrationIds } from '../../constants.inte
 import { GitSelfManagedHostIntegrationId } from '../../constants.integrations';
 import type { Container } from '../../container';
 import type { ConfiguredIntegrationDescriptor } from '../../plus/integrations/authentication/models';
-import { isCloudSelfHostedIntegrationId } from '../../plus/integrations/providers/models';
+import { isCloudGitSelfManagedHostIntegrationId } from '../../plus/integrations/utils/-webview/integration.utils';
 import { configuration } from '../../system/-webview/configuration';
 import { Logger } from '../../system/logger';
 import { AzureDevOpsRemote } from './azure-devops';
@@ -130,7 +130,7 @@ export function loadRemoteProviders(
 	if (configuredIntegrations?.length) {
 		for (const ci of configuredIntegrations) {
 			const integrationId = ci.integrationId;
-			if (isCloudSelfHostedIntegrationId(integrationId) && ci.domain) {
+			if (isCloudGitSelfManagedHostIntegrationId(integrationId) && ci.domain) {
 				const matcher = ci.domain.toLocaleLowerCase();
 				const provider = {
 					custom: false,

src/plus/integrations/authentication/configuredIntegrationService.ts

@@ -10,7 +10,8 @@ import type { Container } from '../../../container';
 import { debounce } from '../../../system/function/debounce';
 import { flatten } from '../../../system/iterable';
 import { getBuiltInIntegrationSession } from '../../gk/utils/-webview/integrationAuthentication.utils';
-import { isSelfHostedIntegrationId, providersMetadata } from '../providers/models';
+import { providersMetadata } from '../providers/models';
+import { isGitSelfManagedHostIntegrationId } from '../utils/-webview/integration.utils';
 import type { IntegrationAuthenticationSessionDescriptor } from './integrationAuthenticationProvider';
 import type { ConfiguredIntegrationDescriptor, ProviderAuthenticationSession } from './models';
 
@@ -289,12 +290,12 @@ export class ConfiguredIntegrationService implements Disposable {
 
 		await this.removeConfigured(id, {
 			cloud: cloud,
-			domain: isSelfHostedIntegrationId(id) ? sessionId : undefined,
+			domain: isGitSelfManagedHostIntegrationId(id) ? sessionId : undefined,
 		});
 	}
 
 	async deleteAllSecrets(id: IntegrationIds, cloud?: boolean): Promise<void> {
-		if (isSelfHostedIntegrationId(id)) {
+		if (isGitSelfManagedHostIntegrationId(id)) {
 			// Hack because session IDs are tied to domain. Update this when session ids are different
 			const configuredDomains = this.configured.get(id)?.map(c => c.domain);
 			if (configuredDomains != null) {
@@ -317,7 +318,7 @@ export class ConfiguredIntegrationService implements Disposable {
 
 		await this.addOrUpdateConfigured({
 			integrationId: id,
-			domain: isSelfHostedIntegrationId(id) ? session.domain : undefined,
+			domain: isGitSelfManagedHostIntegrationId(id) ? session.domain : undefined,
 			expiresAt: session.expiresAt,
 			scopes: session.scopes.join(','),
 			cloud: session.cloud ?? false,
@@ -336,7 +337,7 @@ export class ConfiguredIntegrationService implements Disposable {
 				storedSession = JSON.parse(sessionJSON);
 				if (storedSession != null) {
 					const configured = this.configured.get(id);
-					const domain = isSelfHostedIntegrationId(id) ? storedSession.id : undefined;
+					const domain = isGitSelfManagedHostIntegrationId(id) ? storedSession.id : undefined;
 					if (
 						configured == null ||
 						configured.length === 0 ||

src/plus/integrations/authentication/integrationAuthenticationProvider.ts

@@ -6,7 +6,10 @@ import type { Sources } from '../../../constants.telemetry';
 import type { Container } from '../../../container';
 import { debug } from '../../../system/decorators/log';
 import { getBuiltInIntegrationSession } from '../../gk/utils/-webview/integrationAuthentication.utils';
-import { isCloudSelfHostedIntegrationId, isSelfHostedIntegrationId } from '../providers/models';
+import {
+	isCloudGitSelfManagedHostIntegrationId,
+	isGitSelfManagedHostIntegrationId,
+} from '../utils/-webview/integration.utils';
 import type { ConfiguredIntegrationService } from './configuredIntegrationService';
 import type { IntegrationAuthenticationService } from './integrationAuthenticationService';
 import type { ProviderAuthenticationSession } from './models';
@@ -65,7 +68,7 @@ abstract class IntegrationAuthenticationProviderBase<ID extends IntegrationIds =
 	async deleteSession(descriptor: IntegrationAuthenticationSessionDescriptor): Promise<void> {
 		const configured = await this.configuredIntegrationService.getConfigured(this.authProviderId, {
 			cloud: this.cloud,
-			domain: isSelfHostedIntegrationId(this.authProviderId) ? descriptor?.domain : undefined,
+			domain: isGitSelfManagedHostIntegrationId(this.authProviderId) ? descriptor?.domain : undefined,
 		});
 
 		await this.configuredIntegrationService.deleteStoredSessions(
@@ -265,7 +268,7 @@ export abstract class CloudIntegrationAuthenticationProvider<
 		if (
 			session?.expiresIn === 0 &&
 			(this.authProviderId === GitCloudHostIntegrationId.GitHub ||
-				isCloudSelfHostedIntegrationId(this.authProviderId))
+				isCloudGitSelfManagedHostIntegrationId(this.authProviderId))
 		) {
 			// It never expires so don't refresh it frequently:
 			session.expiresIn = maxSmallIntegerV8; // maximum expiration length

src/plus/integrations/authentication/integrationAuthenticationService.ts

@@ -8,7 +8,7 @@ import {
 import type { Container } from '../../../container';
 import { gate } from '../../../system/decorators/-webview/gate';
 import { log } from '../../../system/decorators/log';
-import { supportedIntegrationIds } from '../providers/models';
+import { supportedIntegrationIds } from '../utils/-webview/integration.utils';
 import type { ConfiguredIntegrationService } from './configuredIntegrationService';
 import type { IntegrationAuthenticationProvider } from './integrationAuthenticationProvider';
 import { BuiltInAuthenticationProvider } from './integrationAuthenticationProvider';

src/plus/integrations/integrationService.ts

@@ -51,9 +51,13 @@ import type {
 	IntegrationResult,
 } from './models/integration';
 import type { IssuesIntegration } from './models/issuesIntegration';
-import { isCloudSelfHostedIntegrationId, isHostingIntegrationId, isSelfHostedIntegrationId } from './providers/models';
 import type { ProvidersApi } from './providers/providersApi';
-import { convertRemoteProviderIdToIntegrationId } from './utils/-webview/integration.utils';
+import {
+	convertRemoteProviderIdToIntegrationId,
+	isCloudGitSelfManagedHostIntegrationId,
+	isGitCloudHostIntegrationId,
+	isGitSelfManagedHostIntegrationId,
+} from './utils/-webview/integration.utils';
 
 export interface ConnectionStateChangeEvent {
 	key: string;
@@ -591,7 +595,7 @@ export class IntegrationService implements Disposable {
 			const isInvalidIntegration =
 				(options?.openRepositoriesOnly &&
 					integrationId !== GitCloudHostIntegrationId.AzureDevOps &&
-					(isHostingIntegrationId(integrationId) || isSelfHostedIntegrationId(integrationId)) &&
+					(isGitCloudHostIntegrationId(integrationId) || isGitSelfManagedHostIntegrationId(integrationId)) &&
 					!openRemotesByIntegrationId.has(integrationId)) ||
 				(integrationId === GitCloudHostIntegrationId.AzureDevOps && !hasOpenAzureRepository);
 			if (integration == null || isInvalidIntegration) {
@@ -970,11 +974,12 @@ export class IntegrationService implements Disposable {
 		id: GitCloudHostIntegrationId | IssuesCloudHostIntegrationId | GitSelfManagedHostIntegrationId,
 		domain?: string,
 	): IntegrationKey {
-		return isSelfHostedIntegrationId(id) ? (`${id}:${domain}` as const) : id;
+		return isGitSelfManagedHostIntegrationId(id) ? (`${id}:${domain}` as const) : id;
 	}
+
 	private async *getSupportedCloudIntegrations(domainsById: Map<IntegrationIds, string>): AsyncIterable<Integration> {
 		for (const id of getSupportedCloudIntegrationIds()) {
-			if (isCloudSelfHostedIntegrationId(id) && !domainsById.has(id)) {
+			if (isCloudGitSelfManagedHostIntegrationId(id) && !domainsById.has(id)) {
 				// Try getting whatever we have now because we will need to disconnect
 				const integration = await this.get(id, undefined);
 				if (integration != null) {

src/plus/integrations/models/integration.ts

@@ -2,11 +2,7 @@
 import type { CancellationToken, Disposable, Event, MessageItem } from 'vscode';
 import { EventEmitter, window } from 'vscode';
 import type { AutolinkReference, DynamicAutolinkReference } from '../../../autolinks/models/autolinks';
-import type {
-	GitSelfManagedHostIntegrationId,
-	IntegrationIds,
-	IssuesCloudHostIntegrationId,
-} from '../../../constants.integrations';
+import type { IntegrationIds, IssuesCloudHostIntegrationId } from '../../../constants.integrations';
 import { GitCloudHostIntegrationId } from '../../../constants.integrations';
 import type { Sources } from '../../../constants.telemetry';
 import type { Container } from '../../../container';
@@ -41,15 +37,13 @@ export type IntegrationById<T extends IntegrationIds> = T extends IssuesCloudHos
 	: GitHostIntegration;
 export type IntegrationType = 'git' | 'issues';
 
-export type IntegrationKey =
-	| `${GitCloudHostIntegrationId}`
-	| `${IssuesCloudHostIntegrationId}`
-	| `${GitSelfManagedHostIntegrationId}:${string}`;
-export type IntegrationKeyById<T extends IntegrationIds> = T extends IssuesCloudHostIntegrationId
-	? `${IssuesCloudHostIntegrationId}`
-	: T extends GitCloudHostIntegrationId
-	  ? `${GitCloudHostIntegrationId}`
-	  : `${GitSelfManagedHostIntegrationId}:${string}`;
+export type IntegrationKey<T extends IntegrationIds = IntegrationIds> = T extends
+	| GitCloudHostIntegrationId
+	| IssuesCloudHostIntegrationId
+	? `${T}`
+	: `${T}:${string}`;
+
+export type IntegrationConnectedKey<T extends IntegrationIds = IntegrationIds> = `connected:${IntegrationKey<T>}`;
 
 export type IntegrationResult<T> =
 	| { value: T; duration?: number; error?: never }
@@ -81,7 +75,7 @@ export abstract class IntegrationBase<
 
 	abstract get authProvider(): IntegrationAuthenticationProviderDescriptor;
 	abstract get id(): ID;
-	protected abstract get key(): IntegrationKeyById<ID>;
+	protected abstract get key(): IntegrationKey<ID>;
 	abstract get name(): string;
 	abstract get domain(): string;
 
@@ -104,7 +98,7 @@ export abstract class IntegrationBase<
 		return [];
 	}
 
-	private get connectedKey(): `connected:${Integration['key']}` {
+	private get connectedKey(): IntegrationConnectedKey<ID> {
 		return `connected:${this.key}`;
 	}
 

src/plus/integrations/providers/bitbucket-server.ts

@@ -13,6 +13,7 @@ import type { IntegrationAuthenticationService } from '../authentication/integra
 import type { ProviderAuthenticationSession } from '../authentication/models';
 import type { IntegrationConnectionChangeEvent } from '../integrationService';
 import { GitHostIntegration } from '../models/gitHostIntegration';
+import type { IntegrationKey } from '../models/integration';
 import type { BitbucketRepositoryDescriptor } from './bitbucket/models';
 import type { ProviderRepository } from './models';
 import { fromProviderPullRequest, providersMetadata } from './models';
@@ -28,7 +29,7 @@ export class BitbucketServerIntegration extends GitHostIntegration<
 	readonly authProvider: IntegrationAuthenticationProviderDescriptor = authProvider;
 	readonly id = GitSelfManagedHostIntegrationId.BitbucketServer;
 	protected readonly key =
-		`${this.id}:${this.domain}` satisfies `${GitSelfManagedHostIntegrationId.BitbucketServer}:${string}`;
+		`${this.id}:${this.domain}` satisfies IntegrationKey<GitSelfManagedHostIntegrationId.BitbucketServer>;
 	readonly name: string = 'Bitbucket Data Center';
 
 	constructor(