@gitkraken/core-gitlens 0.4.0 → 0.4.101

package/src/plus/integrations/providers/bitbucket.ts

@@ -1,23 +1,53 @@
+import type { CollectionMetadata, CollectionScopeFailure } from '@gitkraken/provider-apis';
 import type { Account, UnidentifiedAuthor } from '../../../git/models/author.js';
 import type { DefaultBranch } from '../../../git/models/defaultBranch.js';
 import type { Issue, IssueShape } from '../../../git/models/issue.js';
 import type { IssueOrPullRequest, IssueOrPullRequestType } from '../../../git/models/issueOrPullRequest.js';
-import type { PullRequest, PullRequestMergeMethod, PullRequestState } from '../../../git/models/pullRequest.js';
+import type {
+	PullRequest,
+	PullRequestMergeMethod,
+	PullRequestState,
+	PullRequestStateFilter,
+} from '../../../git/models/pullRequest.js';
 import type { GitRemote } from '../../../git/models/remote.js';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata.js';
+import { CancellationError } from '../../../utils/cancellation.js';
 import { md5 } from '../../../utils/crypto.js';
 import { uniqueBy } from '../../../utils/iterable.js';
-import { flatSettled, nonnullSettled } from '../../../utils/promise.js';
+import { batchResults, flatSettled, nonnullSettled } from '../../../utils/promise.js';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider.js';
 import type {
 	AuthenticationSessionLike as AuthenticationSession,
 	ProviderAuthenticationSession,
 } from '../authentication/models.js';
 import { toTokenWithInfo } from '../authentication/models.js';
+import { toCollectionScopeFailure } from '../collectionMetadata.js';
 import { GitCloudHostIntegrationId } from '../constants.js';
+import type { SearchMyPullRequestsOptions } from '../models/gitHostIntegration.js';
 import { GitHostIntegration } from '../models/gitHostIntegration.js';
 import type { BitbucketRepositoryDescriptor, BitbucketWorkspaceDescriptor } from './bitbucket/models.js';
-import { fromProviderPullRequest, providersMetadata } from './models.js';
+import type {
+	ProviderApiCollectionResult,
+	ProviderApiPagedResult,
+	ProviderHierarchyResult,
+	ProviderOrganization,
+	ProviderPullRequest,
+	ProviderRepository,
+} from './models.js';
+import {
+	fromProviderPullRequest,
+	getProviderPullRequestIdentity,
+	providersMetadata,
+	PullRequestFilter,
+	toProviderPullRequestStates,
+} from './models.js';
+import {
+	collectProviderPagedResult,
+	flatSettledOrThrow,
+	mergeCollectionMetadata,
+	parsePageCursor,
+	toPageCursor,
+} from './utils/providerPaging.js';
 
 const metadata = providersMetadata[GitCloudHostIntegrationId.Bitbucket];
 const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes });
@@ -51,6 +81,22 @@ export class BitbucketIntegration extends GitHostIntegration<
 		});
 	}
 
+	public override async getRepoInfo(repo: {
+		owner: string;
+		name: string;
+		project?: string;
+		connectionId?: string;
+	}): Promise<ProviderRepository | undefined> {
+		const api = await this.getProvidersApi();
+		// `connectionId` targets a specific account (multi-account); omitted reads the primary.
+		const session = await this.resolveReadSession(repo.connectionId, undefined);
+		if (session == null) return undefined;
+
+		return api.getRepo(toTokenWithInfo(this.id, session), repo.owner, repo.name, repo.project, {
+			baseUrl: this.apiBaseUrl,
+		});
+	}
+
 	protected override async getProviderAccountForCommit(
 		session: ProviderAuthenticationSession,
 		repo: BitbucketRepositoryDescriptor,
@@ -84,10 +130,18 @@ export class BitbucketIntegration extends GitHostIntegration<
 	}
 
 	protected override async getProviderDefaultBranch(
-		_session: AuthenticationSession,
-		_repo: BitbucketRepositoryDescriptor,
+		session: ProviderAuthenticationSession,
+		repo: BitbucketRepositoryDescriptor,
+		cancellation?: AbortSignal,
 	): Promise<DefaultBranch | undefined> {
-		return Promise.resolve(undefined);
+		return (await this.authenticationService.apis.bitbucket)?.getDefaultBranch(
+			this,
+			toTokenWithInfo(this.id, session),
+			repo.owner,
+			repo.name,
+			{ baseUrl: this.apiBaseUrl },
+			cancellation,
+		);
 	}
 
 	protected override async getProviderLinkedIssueOrPullRequest(
@@ -159,11 +213,18 @@ export class BitbucketIntegration extends GitHostIntegration<
 	}
 
 	protected override async getProviderRepositoryMetadata(
-		_session: AuthenticationSession,
-		_repo: BitbucketRepositoryDescriptor,
-		_cancellation?: AbortSignal,
+		session: ProviderAuthenticationSession,
+		repo: BitbucketRepositoryDescriptor,
+		cancellation?: AbortSignal,
 	): Promise<RepositoryMetadata | undefined> {
-		return Promise.resolve(undefined);
+		return (await this.authenticationService.apis.bitbucket)?.getRepositoryMetadata(
+			this,
+			toTokenWithInfo(this.id, session),
+			repo.owner,
+			repo.name,
+			{ baseUrl: this.apiBaseUrl },
+			cancellation,
+		);
 	}
 
 	private _accounts: Map<string, Account | undefined> | undefined;
@@ -195,69 +256,144 @@ export class BitbucketIntegration extends GitHostIntegration<
 		return this._accounts.get(accessToken);
 	}
 
-	private _workspaces: Map<string, BitbucketWorkspaceDescriptor[] | undefined> | undefined;
+	private _workspaces: Map<string, ProviderApiCollectionResult<BitbucketWorkspaceDescriptor> | undefined> | undefined;
 	private async getProviderResourcesForCurrentUser(
 		session: ProviderAuthenticationSession,
 		force: boolean = false,
-	): Promise<BitbucketWorkspaceDescriptor[] | undefined> {
-		this._workspaces ??= new Map<string, BitbucketWorkspaceDescriptor[] | undefined>();
+	): Promise<ProviderApiCollectionResult<BitbucketWorkspaceDescriptor> | undefined> {
+		this._workspaces ??= new Map<string, ProviderApiCollectionResult<BitbucketWorkspaceDescriptor> | undefined>();
 		const { accessToken } = session;
 		const cachedResources = this._workspaces.get(accessToken);
+		if (cachedResources != null && !force) return cachedResources;
 
-		if (cachedResources == null || force) {
-			const api = await this.getProvidersApi();
+		const api = await this.getProvidersApi();
+		const resources = await api.getBitbucketResourcesForCurrentUser(toTokenWithInfo(this.id, session));
+		if (resources == null) return undefined;
 
-			const resources = await api.getBitbucketResourcesForCurrentUser(toTokenWithInfo(this.id, session));
-			this._workspaces.set(
-				accessToken,
-				resources != null ? resources.map(r => ({ ...r, key: r.id, name: r.name ?? r.slug })) : undefined,
-			);
+		const values = resources.values.map(r => ({ ...r, key: r.id, name: r.name ?? r.slug }));
+		const metadata = mergeCollectionMetadata(
+			resources.metadata,
+			resources.paging?.truncated === true ? { completeness: 'partial' } : undefined,
+		);
+		const result: ProviderApiCollectionResult<BitbucketWorkspaceDescriptor> = {
+			values: values,
+			...(metadata != null ? { metadata: metadata } : {}),
+		};
+
+		// A partial workspace prefix is useful to the current read but must not become authoritative cache state:
+		// a transient page-2 failure must be retried on the next call rather than hiding every later workspace
+		// until disconnect.
+		if (metadata == null || metadata.completeness === 'complete') {
+			this._workspaces.set(accessToken, result);
 		}
+		return result;
+	}
+
+	protected override async getProviderOrganizationsForUser(
+		session: ProviderAuthenticationSession,
+	): Promise<ProviderHierarchyResult<ProviderOrganization> | undefined> {
+		const workspaces = await this.getProviderResourcesForCurrentUser(session);
+		if (workspaces == null) return undefined;
+
+		return {
+			values: workspaces.values.map(w => ({
+				id: w.id,
+				providerId: this.id,
+				name: w.slug,
+				url: `https://bitbucket.org/${w.slug}`,
+			})),
+			...(workspaces.metadata != null ? { metadata: workspaces.metadata } : {}),
+		};
+	}
 
-		return this._workspaces.get(accessToken);
+	protected override async getProviderRepositoriesForOrg(
+		session: ProviderAuthenticationSession,
+		org: string,
+		options?: { cursor?: string },
+	): Promise<ProviderHierarchyResult<ProviderRepository> | undefined> {
+		const api = await this.getProvidersApi();
+		return api.getReposForBitbucketWorkspace(toTokenWithInfo(this.id, session), org, {
+			cursor: options?.cursor,
+		});
 	}
 
 	protected override async searchProviderMyPullRequests(
 		session: ProviderAuthenticationSession,
 		repos?: BitbucketRepositoryDescriptor[],
+		_cancellation?: AbortSignal,
+		_silent?: boolean,
+		state?: PullRequestStateFilter,
+		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		if (repos != null) {
 			// TODO: implement repos version
 			return undefined;
 		}
 
+		const states = toProviderPullRequestStates(state);
+
 		const api = await this.getProvidersApi();
 		if (!api) {
 			return undefined;
 		}
 
-		const remotes = await this.ctx.repositories.getOpenRemotes();
-		const workspaceRepos = await nonnullSettled(
-			remotes.map(async (r: GitRemote) => {
-				const integration = await this.authenticationService.getByRemote(r);
-				const [namespace, name] = r.path.split('/');
-				return integration?.id === this.id ? { name: name, namespace: namespace } : undefined;
-			}),
-		);
-
 		const user = await this.getProviderCurrentAccount(session);
-		if (user?.username == null) return undefined;
+		// `user.id` feeds both the authored workspace reads and the reviewer BBQL clause; guard on it so we
+		// never issue requests/queries with an undefined uuid. `username` isn't used here, so don't gate on it.
+		if (user?.id == null) return undefined;
 
-		const workspaces = await this.getProviderResourcesForCurrentUser(session);
-		if (workspaces == null || workspaces.length === 0) return undefined;
+		const workspacesResult = await this.getProviderResourcesForCurrentUser(session);
+		if (workspacesResult == null) return undefined;
+
+		const workspaces = workspacesResult.values;
+		if (workspaces.length === 0) return [];
 
 		const authoredPrs = workspaces.map(async ws => {
 			const prs = await api.getBitbucketPullRequestsAuthoredByUserForWorkspace(
 				toTokenWithInfo(this.id, session),
 				user.id,
 				ws.slug,
+				{ states: states },
 			);
-			return prs?.map(pr => fromProviderPullRequest(pr, this));
+			return prs?.data.map(pr => fromProviderPullRequest(pr, this));
 		});
 
+		if (!options?.includeReviewRequested) {
+			return [
+				...uniqueBy(
+					await flatSettled(authoredPrs),
+					pr => pr.url,
+					(orig, _cur) => orig,
+				),
+			];
+		}
+
+		// Bitbucket's reviewing PRs require a repo-scoped BBQL query; keep that sweep opt-in so the default
+		// "my pull requests" feed stays aligned with backends that only expose authored PRs.
+		const stateClause =
+			state === 'closed'
+				? '(state="DECLINED" OR state="SUPERSEDED")'
+				: state === 'merged'
+					? 'state="MERGED"'
+					: state === 'all'
+						? undefined
+						: 'state="OPEN"';
+
+		const workspaceRepos = await this.getWorkspaceRepoInputs();
+		if (workspaceRepos.length === 0) {
+			return [
+				...uniqueBy(
+					await flatSettled(authoredPrs),
+					pr => pr.url,
+					(orig, _cur) => orig,
+				),
+			];
+		}
+
+		const reviewerClause = `reviewers.uuid="${user.id}"`;
 		const reviewingPrs = api
 			.getPullRequestsForRepos(toTokenWithInfo(this.id, session), workspaceRepos, {
-				query: `state="OPEN" AND reviewers.uuid="${user.id}"`,
+				query: stateClause ? `${stateClause} AND ${reviewerClause}` : reviewerClause,
 			})
 			.then(r => r.values?.map(pr => fromProviderPullRequest(pr, this)));
 
@@ -270,6 +406,280 @@ export class BitbucketIntegration extends GitHostIntegration<
 		];
 	}
 
+	protected override async getProviderMyPullRequestsForUser(
+		session: ProviderAuthenticationSession,
+		options?: {
+			state?: PullRequestStateFilter[];
+			cursor?: string;
+			includeReviewRequested?: boolean;
+			filters?: PullRequestFilter[];
+		},
+	): Promise<ProviderApiPagedResult<ProviderPullRequest> | undefined> {
+		const api = await this.getProvidersApi();
+		const user = await this.getProviderCurrentAccount(session);
+		if (user?.id == null) return undefined;
+
+		const workspacesResult = await this.getProviderResourcesForCurrentUser(session);
+		if (workspacesResult == null) return undefined;
+
+		const workspaces = workspacesResult.values;
+		if (workspaces.length === 0) {
+			const incomplete =
+				workspacesResult.metadata != null && workspacesResult.metadata.completeness !== 'complete';
+			return {
+				values: [],
+				paging: { cursor: '{}', more: false, truncated: incomplete || undefined },
+				...(workspacesResult.metadata != null ? { metadata: workspacesResult.metadata } : {}),
+			};
+		}
+
+		// Account-wide "my PRs" for Bitbucket = the user's authored PRs across every workspace they belong to,
+		// plus the PRs they've been requested to review. Bitbucket's cross-workspace read is per-workspace and
+		// numbered-page, so drain each workspace fully (bounded by a defensive backstop) and concatenate.
+		// There's no single cross-workspace cursor, so the aggregate is one page; `truncated` is set when a
+		// workspace hit the backstop with more pages left, or when a workspace's read was dropped by a failure.
+		const states = toProviderPullRequestStates(options?.state);
+		const requested = options?.filters?.length ? new Set(options.filters) : undefined;
+		const wantAuthored = requested == null || requested.has(PullRequestFilter.Author);
+		const wantReviewRequested =
+			requested?.has(PullRequestFilter.ReviewRequested) ?? options?.includeReviewRequested === true;
+		const maxPagesPerWorkspace = 20;
+		let truncated = workspacesResult.metadata != null && workspacesResult.metadata.completeness !== 'complete';
+		// Structured per-scope failures from BOTH the authored and reviewer slices. A rejected scope is recorded
+		// here (never re-thrown) so successful sibling workspaces/repos survive and the ProviderBackend facade
+		// maps each failure to an actionable warning + `fetchFailed` (auth/rate-limit failures still drive
+		// recovery through their warning kind, matching the SDK's own collect-across-scopes model).
+		const failures: CollectionScopeFailure[] = [];
+		let aggregateMetadata = workspacesResult.metadata;
+		const absorbCollectionResult = (result: ProviderHierarchyResult<unknown>): void => {
+			aggregateMetadata = mergeCollectionMetadata(aggregateMetadata, result.metadata);
+			if (result.truncated || (result.metadata != null && result.metadata.completeness !== 'complete')) {
+				truncated = true;
+			}
+		};
+		const settled = wantAuthored
+			? await Promise.allSettled(
+					workspaces.map(async ws => {
+						return collectProviderPagedResult(
+							async cursor => {
+								const result = await api.getBitbucketPullRequestsAuthoredByUserForWorkspace(
+									toTokenWithInfo(this.id, session),
+									user.id,
+									ws.slug,
+									{ states: states, page: parsePageCursor(cursor) },
+								);
+								if (result == null) return undefined;
+
+								return {
+									values: result.data,
+									paging: {
+										more: result.hasMore,
+										cursor:
+											result.hasMore && result.nextPage != null
+												? toPageCursor(result.nextPage)
+												: '{}',
+									},
+								};
+							},
+							maxPagesPerWorkspace,
+							{ providerId: this.id, resourceId: ws.slug },
+						);
+					}),
+				)
+			: [];
+
+		const prsByIdentity = new Map<string, ProviderPullRequest>();
+		let unkeyedPullRequest = 0;
+		const addPullRequest = (pr: ProviderPullRequest): void => {
+			const key = getProviderPullRequestIdentity(pr) ?? `unkeyed:${unkeyedPullRequest++}`;
+			if (!prsByIdentity.has(key)) {
+				prsByIdentity.set(key, pr);
+			}
+		};
+		// `allSettled` preserves order, so `settled[i]` is `workspaces[i]`. A rejected workspace becomes a
+		// structured failure (attributed to its slug) instead of a generic truncation or a re-throw, preserving
+		// every sibling workspace's authored PRs.
+		settled.forEach((outcome, i) => {
+			if (outcome.status !== 'fulfilled') {
+				failures.push(this.toWorkspaceFailure(workspaces[i].slug, outcome.reason));
+				return;
+			}
+
+			absorbCollectionResult(outcome.value);
+			for (const pr of outcome.value.values) {
+				addPullRequest(pr);
+			}
+		});
+
+		// Bitbucket's account-wide (per-workspace) endpoint returns authored PRs only, and the SDK exposes no
+		// workspace-level reviewer query — only a repo-scoped one. Adding the reviewer slice therefore requires
+		// draining every workspace's full repo list and then a per-repo `getPullRequestsForRepo` with `reviewerId`
+		// (O(workspaces × repos) requests), so keep it opt-in: gate it on `includeReviewRequested` so the default
+		// sweep matches the gkcli baseline (authored PRs only, no reviewer fan-out) and a caller pays that cost
+		// only when it deliberately asks for review-requested PRs.
+		if (wantReviewRequested) {
+			// Enumerate the account's repos by draining each resolved workspace's repository list, then drain the
+			// real per-repo paged `getPullRequestsForRepo` for each repo with `reviewerId`, so review-requested PRs
+			// aren't bounded to the currently-open remotes and a reviewer PR past the first page isn't dropped.
+			// Structured per-scope failures are collected as CollectionScopeFailure so the ProviderBackend facade
+			// maps them to actionable warnings (Step 3).
+			const maxReposPagesPerWorkspace = 20;
+			const maxPrPagesPerRepo = 20;
+			// Bound concurrency: workspaces are few, so process them concurrently, but drain each workspace's repos
+			// in a bounded batch rather than an unbounded Promise.all over every repo in every workspace.
+			const repoBatchSize = 5;
+
+			await Promise.all(
+				workspaces.map(async ws => {
+					let repos: ProviderRepository[];
+					try {
+						const discovered = await collectProviderPagedResult(
+							cursor =>
+								api.getReposForBitbucketWorkspace(toTokenWithInfo(this.id, session), ws.slug, {
+									cursor: cursor,
+								}),
+							maxReposPagesPerWorkspace,
+							{ providerId: this.id, resourceId: ws.slug },
+						);
+						repos = discovered.values;
+						absorbCollectionResult(discovered);
+					} catch (ex) {
+						// Record the workspace as a structured failure and keep going: the failure metadata drives
+						// the warning + `fetchFailed` + incompleteness for every kind (auth/rate-limit stay
+						// actionable via their warning kind), so sibling workspaces' repos are still drained.
+						failures.push(this.toWorkspaceFailure(ws.slug, ex));
+						return;
+					}
+
+					const drained = await batchResults(repos, repoBatchSize, async repo => {
+						const reviewing = await collectProviderPagedResult(
+							cursor =>
+								api.getPullRequestsForRepo(
+									toTokenWithInfo(this.id, session),
+									{ namespace: repo.namespace, name: repo.name },
+									{ reviewerId: user.id, states: states, cursor: cursor },
+								),
+							maxPrPagesPerRepo,
+							{
+								providerId: this.id,
+								resourceId: ws.slug,
+								repositoryId: `${repo.namespace}/${repo.name}`,
+							},
+						);
+						return { repo: repo, reviewing: reviewing };
+					});
+
+					for (let i = 0; i < drained.length; i++) {
+						const outcome = drained[i];
+						if (outcome.status !== 'fulfilled') {
+							const repo = repos[i];
+							failures.push(
+								this.toRepositoryFailure(
+									`${repo?.namespace ?? ws.slug}/${repo?.name ?? 'unknown'}`,
+									outcome.reason,
+								),
+							);
+							continue;
+						}
+
+						const { reviewing } = outcome.value;
+						absorbCollectionResult(reviewing);
+						for (const pr of reviewing.values) {
+							addPullRequest(pr);
+						}
+					}
+				}),
+			);
+		}
+
+		// Every slice that ran (authored workspaces always, reviewer workspaces/repos when opted in) records its
+		// per-scope rejections as structured failures instead of re-throwing: re-throwing would discard every
+		// successful sibling's PRs. Auth/rate-limit failures stay actionable through the metadata (the facade maps
+		// kind `authentication` → an `auth` warning, `rate-limit` → a `rate-limit` warning) while the survivors are
+		// returned with `fetchFailed`.
+		const metadata: CollectionMetadata | undefined = mergeCollectionMetadata(
+			failures.length > 0 ? { completeness: 'partial', failures: failures } : undefined,
+			aggregateMetadata,
+		);
+
+		return {
+			values: [...prsByIdentity.values()],
+			paging: { cursor: '{}', more: false, truncated: truncated || undefined },
+			metadata: metadata,
+		};
+	}
+
+	/** Classifies a caught workspace-scope error into a structured {@link CollectionScopeFailure}. */
+	private toWorkspaceFailure(workspaceSlug: string, ex: unknown): CollectionScopeFailure {
+		return toCollectionScopeFailure({ providerId: this.id, resourceId: workspaceSlug }, ex);
+	}
+
+	/** Classifies a caught repository-scope error into a structured {@link CollectionScopeFailure}. */
+	private toRepositoryFailure(repositoryId: string, ex: unknown): CollectionScopeFailure {
+		return toCollectionScopeFailure({ providerId: this.id, repositoryId: repositoryId }, ex);
+	}
+
+	protected override async searchProviderPullRequests(
+		session: ProviderAuthenticationSession,
+		searchQuery: string,
+		repos?: BitbucketRepositoryDescriptor[],
+		cancellation?: AbortSignal,
+		options?: { include?: PullRequestState[] },
+	): Promise<PullRequest[] | undefined> {
+		if (cancellation?.aborted) throw new CancellationError();
+
+		const api = await this.getProvidersApi();
+		if (!api) return undefined;
+
+		const workspaceRepos =
+			repos != null
+				? repos.map(r => ({ name: r.name, namespace: r.owner }))
+				: await this.getWorkspaceRepoInputs();
+		if (cancellation?.aborted) throw new CancellationError();
+		// An explicitly-empty `repos` means "search these zero repos" -> no results; reserve `undefined`
+		// ("scope couldn't be determined") for when no repos were requested and none were discovered.
+		if (workspaceRepos.length === 0) return repos != null ? [] : undefined;
+
+		const token = toTokenWithInfo(this.id, session);
+		const states = toProviderPullRequestStates(options?.include);
+		const providerPullRequests = await flatSettledOrThrow(
+			workspaceRepos.map(async repo => {
+				const result = await collectProviderPagedResult(cursor => {
+					if (cancellation?.aborted) throw new CancellationError();
+
+					return api.getPullRequestsForRepo(token, repo, {
+						cursor: cursor,
+						query: searchQuery,
+						states: states,
+					});
+				});
+				return result.values;
+			}),
+		);
+		if (cancellation?.aborted) throw new CancellationError();
+
+		return providerPullRequests.map(pr => fromProviderPullRequest(pr, this));
+	}
+
+	private async getWorkspaceRepoInputs(): Promise<{ name: string; namespace: string }[]> {
+		const remotes = await this.ctx.repositories.getOpenRemotes();
+		const inputs = await nonnullSettled(
+			remotes.map(async (r: GitRemote) => {
+				const integration = await this.authenticationService.getByRemote(r);
+				if (integration !== this) return undefined;
+
+				// Use the remote provider's parsing rather than splitting `r.path`, so adornments like a
+				// trailing `.git` or extra path segments don't leak into the namespace/name.
+				const namespace = r.provider?.owner;
+				const name = r.provider?.repoName;
+				return namespace != null && name != null ? { name: name, namespace: namespace } : undefined;
+			}),
+		);
+		// Dedupe: a repo with multiple remotes (e.g. `origin` + `upstream`) can map to the same input,
+		// which would otherwise fetch and return the same PRs more than once.
+		return [...new Map(inputs.map(i => [`${i.namespace}/${i.name}`, i])).values()];
+	}
+
 	protected override async searchProviderMyIssues(
 		session: ProviderAuthenticationSession,
 		repos?: BitbucketRepositoryDescriptor[],
@@ -297,6 +707,16 @@ export class BitbucketIntegration extends GitHostIntegration<
 		return issueResult;
 	}
 
+	/**
+	 * Bitbucket is not an issue provider on the ProviderBackend surface: Bitbucket Cloud deprecated its issue
+	 * tracker in favor of dedicated issue integrations (e.g. Jira). The legacy per-repo `getUsersIssuesForRepo`
+	 * client is retained only for autolink/hover enrichment, not for the ProviderBackend issue reads, so the
+	 * facade reports issues as unsupported rather than serving a deprecated, partial source.
+	 */
+	override get supportsIssues(): boolean {
+		return false;
+	}
+
 	private readonly storagePrefix = 'bitbucket';
 	protected override async providerOnConnect(): Promise<void> {
 		if (this._session == null) return;
@@ -308,7 +728,21 @@ export class BitbucketIntegration extends GitHostIntegration<
 
 		let account: Account | undefined = storedAccount?.data ? { ...storedAccount.data, provider: this } : undefined;
 
-		let workspaces = storedWorkspaces?.data?.map((o: BitbucketWorkspaceDescriptor) => ({ ...o }));
+		const storedWorkspacesData = storedWorkspaces?.data as
+			| ProviderApiCollectionResult<BitbucketWorkspaceDescriptor>
+			| BitbucketWorkspaceDescriptor[]
+			| undefined;
+		let workspaces: ProviderApiCollectionResult<BitbucketWorkspaceDescriptor> | undefined;
+		if (
+			!Array.isArray(storedWorkspacesData) &&
+			Array.isArray(storedWorkspacesData?.values) &&
+			(storedWorkspacesData.metadata == null || storedWorkspacesData.metadata.completeness === 'complete')
+		) {
+			workspaces = {
+				values: storedWorkspacesData.values.map((o: BitbucketWorkspaceDescriptor) => ({ ...o })),
+				...(storedWorkspacesData.metadata != null ? { metadata: storedWorkspacesData.metadata } : {}),
+			};
+		}
 
 		if (storedAccount == null) {
 			account = await this.getProviderCurrentAccount(this._session);
@@ -331,16 +765,26 @@ export class BitbucketIntegration extends GitHostIntegration<
 		this._accounts ??= new Map<string, Account | undefined>();
 		this._accounts.set(this._session.accessToken, account);
 
-		if (storedWorkspaces == null) {
-			workspaces = await this.getProviderResourcesForCurrentUser(this._session, true);
-			await this.ctx.storage.store(`${this.storagePrefix}:${accountStorageKey}:workspaces`, {
-				v: 1,
-				timestamp: Date.now(),
-				data: workspaces,
-			});
+		if (workspaces == null) {
+			const discovered = await this.getProviderResourcesForCurrentUser(this._session, true);
+			if (discovered?.metadata == null || discovered.metadata.completeness === 'complete') {
+				workspaces = discovered;
+				if (workspaces != null) {
+					await this.ctx.storage.store(`${this.storagePrefix}:${accountStorageKey}:workspaces`, {
+						v: 2,
+						timestamp: Date.now(),
+						data: workspaces,
+					});
+				}
+			}
+		}
+		if (workspaces != null) {
+			this._workspaces ??= new Map<
+				string,
+				ProviderApiCollectionResult<BitbucketWorkspaceDescriptor> | undefined
+			>();
+			this._workspaces.set(this._session.accessToken, workspaces);
 		}
-		this._workspaces ??= new Map<string, BitbucketWorkspaceDescriptor[] | undefined>();
-		this._workspaces.set(this._session.accessToken, workspaces);
 	}
 
 	protected override providerOnDisconnect(): void {

package/src/plus/integrations/providers/github/github.ts

@@ -1,7 +1,7 @@
-import { AuthenticationErrorReason } from '../../../../git/errors.js';
-import type { Provider } from '../../../../git/models/remoteProvider.js';
 import type { GitHubApiConfig } from '../../../git-github/api/config.js';
 import { GitHubApi } from '../../../git-github/api/github.js';
+import { AuthenticationErrorReason } from '../../../../git/errors.js';
+import type { Provider } from '../../../../git/models/remoteProvider.js';
 import type { IntegrationServiceContext } from '../../context.js';
 
 export { GitHubApi } from '../../../git-github/api/github.js';

package/src/plus/integrations/providers/github/github.utils.ts

@@ -1,5 +1,5 @@
-import type { PullRequestUrlIdentity } from '../../../../git/utils/pullRequest.utils.js';
 import { getGitHubPullRequestIdentityFromMaybeUrl as _getGitHubPullRequestIdentityFromMaybeUrl } from '../../../git-github/api/github.utils.js';
+import type { PullRequestUrlIdentity } from '../../../../git/utils/pullRequest.utils.js';
 import type { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId } from '../../constants.js';
 
 export type GitHubIntegrationIds =