@gitkraken/core-gitlens 0.21.0 → 0.22.1

package/dist/plus/integrations/manager.d.ts

@@ -1,8 +1,9 @@
 import { Event } from "../../utils/event.js";
+import { RefSet } from "../../git/models/autolink.js";
 import { IssueSearchCriteria, IssueShape, IssueSorting, IssueStateFilter } from "../../git/models/issue.js";
 import { PullRequestFilter, PullRequestSearchCriteria, PullRequestShape, PullRequestStateFilter } from "../../git/models/pullRequest.js";
 import { ConfiguredIntegrationDescriptor } from "./authentication/models.js";
-import { IntegrationIds } from "./constants.js";
+import { IntegrationIds, IssuesCloudHostIntegrationId, IssuesSelfManagedHostIntegrationId } from "./constants.js";
 import { ConfiguredIntegrationsChangeEvent } from "./authentication/configuredIntegrationService.js";
 import { ConnectionStateChangeEvent, ProviderBroadenResult, ProviderOrganization, ProviderPagedResult, ProviderRepositoryShape, ProviderResult, ProviderSweepResult, ResolveRepositoryResult } from "./results.js";
 import { IssueFilter } from "./providerFilters.js";
@@ -214,6 +215,14 @@ export type ListProjectsOptions = {
   connectionId?: never;
   domain?: never;
 };
+export type GetAutolinkReferencesOptions = {
+  providerId: IssuesCloudHostIntegrationId.Jira | IssuesSelfManagedHostIntegrationId.JiraServer;
+  connectionId?: string;
+  /** Trusted self-managed domain fallback, as on the other provider reads. */
+  domain?: string;
+  /** Drops discovery and awaits a fresh build; retires builds started before the refresh. */
+  forceSync?: boolean;
+};
 /**
  * Public, provider-neutral integration facade. Provider clients and integration model instances remain private
  * implementation details so SDK changes don't expand this contract.
@@ -281,6 +290,14 @@ export interface IntegrationManager {
   deleteConnection(id: IntegrationIds, connectionId: string): Promise<void>;
   listOrgs(options?: ListOrgsOptions): Promise<ProviderResult<ProviderOrganization>>;
   listProjects(options?: ListProjectsOptions): Promise<ProviderResult<ProviderOrganization>>;
+  /**
+   * Jira project references for one connection. Cold discovery is awaited. Returns `undefined` for an
+   * unresolved target or failed/incomplete discovery; an empty set means complete discovery found no links.
+   * Each call reads the provider; callers own coalescing and caching.
+   * Match with `getAutolinks` or `getBranchAutolinks` from `git/utils/autolink.utils.js` in the host process;
+   * references can contain compiled regular expressions and are not a wire format.
+   */
+  getAutolinkReferences(options: GetAutolinkReferencesOptions): Promise<RefSet | undefined>;
   listRepos(options: {
     providerId: IntegrationIds;
     org?: string;

package/dist/plus/integrations/models/integration.d.ts

@@ -7,7 +7,7 @@ import { Issue as Issue$1, IssueShape, IssueSyncedWith } from "../../../git/mode
 import { PullRequest, PullRequestMergeableState, PullRequestReviewDecision, PullRequestReviewState, PullRequestStatusCheckRollupState } from "../../../git/models/pullRequest.js";
 import { ScopedLogger } from "../../../utils/logger.scoped.js";
 import { Account as Account$1 } from "../../../git/models/author.js";
-import { ConnectionResource, ProviderAuthenticationSession } from "../authentication/models.js";
+import { ConnectionResource, ProviderAuthenticationSession, SessionPublication } from "../authentication/models.js";
 import { GitCloudHostIntegrationId, IntegrationIds, IssuesCloudHostIntegrationId, IssuesHostIntegrationIds } from "../constants.js";
 import { Sources } from "../telemetry.js";
 import { ProviderWarningCause, ProviderWarningScope } from "../results.js";
@@ -300,8 +300,15 @@ export declare abstract class IntegrationBase<ID extends IntegrationIds = Integr
    * otherwise stay invisible, or keep being searched, for the rest of the session (#5907).
    */
   invalidateDiscoveryCaches(): void;
+  invalidateDiscoveryForConnection(_connectionId?: string): void;
+  getSessionDiscoveryGeneration(_sessionId?: string, _connectionId?: string, _cloud?: boolean): number;
+  get discoveryGeneration(): number;
+  protected isResolvedSessionCurrent(_session: ProviderAuthenticationSession | undefined, _generation: number): boolean;
+  onSessionPublishing(publication: SessionPublication): void;
+  protected invalidatePublishedSession(_publication: SessionPublication, _affectsPrimary: boolean): void;
   private static readonly requestExceptionLimit;
   private requestExceptionCount;
+  private resetRecoveryAccounting;
   resetRequestExceptionCount(syncReqUsecase: SyncReqUsecase | 'all'): void;
   /**
    * Resets request exceptions without resetting the amount of syncs

package/dist/plus/integrations/models/integration.js

@@ -1,4 +1,4 @@
-import { isCancellationError } from "../../../utils/cancellation.js";
+import { CancellationError, isCancellationError } from "../../../utils/cancellation.js";
 import { Logger as _logger } from "../../../utils/logger.js";
 import { getScopedLogger } from "../../../utils/logger.scoped.js";
 import { debug, trace } from "../../../utils/decorators/log.js";
@@ -12,6 +12,7 @@ import { isProviderUnreachableError, toError } from "../errors.js";
 import "../constants.js";
 import { isAzureProviderId } from "../providers/providerErrors.js";
 import { attributeScopedAuthFailures, hasOnlyScopedAuthFailures, markCredentialRefusals, toCollectionScopeFailure } from "../collectionMetadata.js";
+import { getSessionIdentity } from "../authentication/models.js";
 import { areDomainsOnSameHost } from "../utils/domain.utils.js";
 import { isSelfManagedHostIntegrationId } from "../utils/integration.utils.js";
 import { throwIfAllSettledFailed } from "../providers/utils/providerPaging.js";
@@ -118,6 +119,7 @@ var IntegrationBase = class IntegrationBase {
 		this.didChangeConnection = didChangeConnection;
 	}
 	dispose() {
+		this.invalidateDiscoveryCaches();
 		this._onDidChange.dispose();
 	}
 	get authProviderDescriptor() {
@@ -365,13 +367,41 @@ var IntegrationBase = class IntegrationBase {
 	* otherwise stay invisible, or keep being searched, for the rest of the session (#5907).
 	*/
 	invalidateDiscoveryCaches() {}
+	invalidateDiscoveryForConnection(_connectionId) {
+		this.invalidateDiscoveryCaches();
+	}
+	getSessionDiscoveryGeneration(_sessionId, _connectionId, _cloud) {
+		return this.discoveryGeneration;
+	}
+	get discoveryGeneration() {
+		return 0;
+	}
+	isResolvedSessionCurrent(_session, _generation) {
+		return true;
+	}
+	onSessionPublishing(publication) {
+		const { session, previousSessionId, replacePrimary } = publication;
+		const cloud = session != null ? session.cloud : publication.cloud;
+		const sameVariant = cloud == null || this._session?.cloud == null || cloud === this._session.cloud;
+		const affectsPrimary = replacePrimary === true && (session != null || cloud == null || this._session != null && sameVariant) || this._session === null && session != null || this._session != null && sameVariant && (session?.id === this._session.id || previousSessionId === this._session.id);
+		if (affectsPrimary && getSessionIdentity(this._session) !== getSessionIdentity(session)) this._session = void 0;
+		this.invalidatePublishedSession(publication, affectsPrimary);
+	}
+	invalidatePublishedSession(_publication, _affectsPrimary) {
+		this.invalidateDiscoveryCaches();
+	}
 	static requestExceptionLimit = 5;
 	requestExceptionCount = 0;
+	resetRecoveryAccounting() {
+		this.requestExceptionCount = 0;
+		this._syncRequestsPerFailedUsecase.clear();
+		this._rejectedTokens.clear();
+	}
 	resetRequestExceptionCount(syncReqUsecase) {
 		this.requestExceptionCount = 0;
 		if (syncReqUsecase === "all") {
-			this._syncRequestsPerFailedUsecase.clear();
-			this.onStoredTokensReplaced();
+			this.resetRecoveryAccounting();
+			this.invalidateDiscoveryCaches();
 		} else this._syncRequestsPerFailedUsecase.delete(syncReqUsecase);
 	}
 	/**
@@ -416,7 +446,7 @@ var IntegrationBase = class IntegrationBase {
 	syncCloudConnection(state, forceSync) {
 		return this.runSessionTransition(() => this.syncCloudConnectionLocked(state, forceSync));
 	}
-	async syncCloudConnectionLocked(state, forceSync) {
+	async syncCloudConnectionLocked(state, forceSync, reason = "explicit") {
 		const scope = getScopedLogger();
 		if (this._session?.cloud === false && state !== "connected") {
 			if (this.id !== "github" && !this.skippedNonCloudReported) {
@@ -435,7 +465,10 @@ var IntegrationBase = class IntegrationBase {
 				const oldSession = this._session;
 				let resyncing = false;
 				if (forceSync) {
-					this.onStoredTokensReplaced();
+					if (reason === "explicit") {
+						this._rejectedTokens.clear();
+						this.invalidateDiscoveryForConnection();
+					}
 					await this.ctx.storage.deleteWorkspace(this.connectedKey);
 					resyncing = true;
 				} else {
@@ -454,7 +487,7 @@ var IntegrationBase = class IntegrationBase {
 					if (!isCancellationError(ex)) scope?.error(ex);
 					failure = toError(ex);
 				}
-				if (oldSession && newSession && newSession.accessToken !== oldSession.accessToken) this.resetRequestExceptionCount("all");
+				if (oldSession && newSession && newSession === this._session && newSession.accessToken !== oldSession.accessToken) this.resetRecoveryAccounting();
 				if (resyncing && newSession == null && !refetchFailed) await (await this.authenticationService.get(this.authProvider.id)).deleteSession(this.authProviderDescriptor, { preserveConfigured: false });
 				break;
 			}
@@ -660,7 +693,7 @@ var IntegrationBase = class IntegrationBase {
 				let failure;
 				if (this._resyncs !== resyncs) failure = this._lastResyncFailure;
 				else if (this._session != null && this.connectionExpired === true) try {
-					failure = await this.syncCloudConnectionLocked("connected", true);
+					failure = await this.syncCloudConnectionLocked("connected", true, "expired");
 				} catch (ex) {
 					failure = toError(ex);
 				}
@@ -719,8 +752,14 @@ var IntegrationBase = class IntegrationBase {
 			this._session = null;
 		}
 		if (this.ctx.config.isIntegrationsEnabled?.() === false) return void 0;
-		if (createIfNeeded || sync) await this.ctx.storage.deleteWorkspace(this.connectedKey);
-		else if (this.ctx.storage.getWorkspace(this.connectedKey) === false) return;
+		const generation = this.discoveryGeneration;
+		if (createIfNeeded || sync) {
+			await this.ctx.storage.deleteWorkspace(this.connectedKey);
+			if (this.getSessionDiscoveryGeneration(this._session?.id, void 0, this._session?.cloud) > generation) {
+				if (sync) throw new CancellationError();
+				return;
+			}
+		} else if (this.ctx.storage.getWorkspace(this.connectedKey) === false) return;
 		let session;
 		try {
 			session = await (await this.authenticationService.get(this.authProvider.id)).getSession(this.authProviderDescriptor, sync ? {
@@ -734,7 +773,15 @@ var IntegrationBase = class IntegrationBase {
 			if (session?.expiresAt != null && session.expiresAt < /* @__PURE__ */ new Date()) session = null;
 			if (session != null && !this.isSessionForIntegrationHost(session)) session = void 0;
 		} catch (ex) {
+			if (isCancellationError(ex) || !this.isResolvedSessionCurrent(void 0, generation)) {
+				if (sync) throw new CancellationError();
+				return;
+			}
 			await this.ctx.storage.deleteWorkspace(this.connectedKey);
+			if (!this.isResolvedSessionCurrent(void 0, generation)) {
+				if (sync) throw new CancellationError();
+				return;
+			}
 			if (!sync && ex instanceof Error && ex.message.includes("User did not consent")) return;
 			if (sync) {
 				this.smoothifyRequestExceptionCount();
@@ -742,18 +789,40 @@ var IntegrationBase = class IntegrationBase {
 			}
 			session = null;
 		}
-		if (session === void 0 && !createIfNeeded && !sync) await this.ctx.storage.deleteWorkspace(this.connectedKey);
+		if (!this.isResolvedSessionCurrent(session ?? void 0, generation)) {
+			if (sync) throw new CancellationError();
+			return;
+		}
+		if (session === void 0 && !createIfNeeded && !sync) {
+			await this.ctx.storage.deleteWorkspace(this.connectedKey);
+			if (!this.isResolvedSessionCurrent(void 0, generation)) return void 0;
+		}
+		if (getSessionIdentity(this._session) !== getSessionIdentity(session)) this.onSessionPublishing({
+			session: session ?? void 0,
+			replacePrimary: true
+		});
+		else if (refetch && session != null) this.onSessionPublishing({
+			session,
+			replacePrimary: true
+		});
 		this._session = session ?? null;
 		this.smoothifyRequestExceptionCount();
 		if (session != null) {
+			const publishedGeneration = this.getSessionDiscoveryGeneration(session.id, void 0, session.cloud);
 			await this.ctx.storage.storeWorkspace(this.connectedKey, true);
+			if (this._session !== session || publishedGeneration !== this.getSessionDiscoveryGeneration(session.id, void 0, session.cloud)) {
+				if (sync) throw new CancellationError();
+				return;
+			}
 			queueMicrotask(() => {
+				if (this._session !== session || publishedGeneration !== this.getSessionDiscoveryGeneration(session.id, void 0, session.cloud)) return;
 				this._onDidChange.fire();
 				this.didChangeConnection?.fire({
 					integration: this,
 					key: this.key,
 					reason: "connected"
 				});
+				if (this._session !== session || publishedGeneration !== this.getSessionDiscoveryGeneration(session.id, void 0, session.cloud)) return;
 				(async () => {
 					try {
 						await this.providerOnConnect?.();