@gitkraken/core-gitlens 0.5.113 → 0.5.115

package/src/plus/integrations/models/issueReads.ts

@@ -66,6 +66,21 @@ export type IssuesForProjectOptions = {
 	sort?: IssueSorting;
 };
 
+export type ProjectIssuesDrain = {
+	values: IssueShape[];
+	metadata?: CollectionMetadata;
+} & (
+	| { truncated: false }
+	| {
+			truncated: true;
+			/**
+			 * `narrow-scope` means a smaller server-side scope avoids this truncation. `none` covers incomplete
+			 * results without that guarantee, including Linear's client-side assignee filtering.
+			 */
+			recovery: 'narrow-scope' | 'none';
+	  }
+);
+
 /**
  * Options for the REPO-scoped issue read (`GitHostIntegration.getMyIssuesForRepos*`), the git-host counterpart of
  * {@link IssuesForProjectOptions}.

package/src/plus/integrations/models/issuesIntegration.ts

@@ -1,17 +1,16 @@
-import type { CollectionMetadata } from '@gitkraken/provider-apis';
 import type { Account } from '../../../git/models/author.js';
-import type { IssueShape } from '../../../git/models/issue.js';
+import type { Issue, IssueShape } from '../../../git/models/issue.js';
 import type { ResourceDescriptor } from '../../../git/models/resourceDescriptor.js';
 import { gate } from '../../../utils/decorators/gate.js';
 import { trace } from '../../../utils/decorators/log.js';
 import { getScopedLogger } from '../../../utils/logger.scoped.js';
 import type { ProviderAuthenticationSession } from '../authentication/models.js';
 import type { IntegrationIds } from '../constants.js';
-import { toError } from '../errors.js';
+import { IntegrationReadUnavailableError, toError } from '../errors.js';
 import type { ProviderApiCollectionResult } from '../providers/models.js';
 import type { Integration, IntegrationResult, IntegrationType } from './integration.js';
 import { IntegrationBase } from './integration.js';
-import type { IssuesForProjectOptions } from './issueReads.js';
+import type { IssuesForProjectOptions, ProjectIssuesDrain } from './issueReads.js';
 
 export function isIssuesIntegration(integration: Integration): integration is IssuesIntegration {
 	return integration.type === 'issues';
@@ -23,6 +22,39 @@ export abstract class IssuesIntegration<
 > extends IntegrationBase<ID> {
 	readonly type: IntegrationType = 'issues';
 
+	get supportsIssueLookupByResourceId(): boolean {
+		return this.getProviderIssueByResourceId != null;
+	}
+
+	getIssueByResourceIdResult(
+		resourceId: string,
+		id: string,
+		options?: { connectionId?: string; expiryOverride?: boolean | number; resourceUrl?: string },
+	): Promise<IntegrationResult<Issue | undefined>> {
+		const getProviderIssue = this.getProviderIssueByResourceId;
+		if (getProviderIssue == null) {
+			return Promise.resolve({
+				error: new IntegrationReadUnavailableError(
+					this.name,
+					'does not support direct issue reads by resource id',
+				),
+			});
+		}
+
+		const { resourceUrl, ...readOptions } = options ?? {};
+		const resource = { key: resourceId, resourceId: resourceId, resourceUrl: resourceUrl };
+		return this.getIssueResultCore(resource, id, readOptions, session =>
+			getProviderIssue.call(this, session, resourceId, id, resourceUrl),
+		);
+	}
+
+	protected getProviderIssueByResourceId?(
+		_session: ProviderAuthenticationSession,
+		_resourceId: string,
+		_id: string,
+		_resourceUrl: string | undefined,
+	): Promise<Issue | undefined>;
+
 	@trace()
 	async getAccountForResource(resource: T, connectionId?: string): Promise<Account | undefined> {
 		return (await this.getAccountForResourceResult(resource, connectionId))?.value;
@@ -177,9 +209,7 @@ export abstract class IssuesIntegration<
 		project: T,
 		options?: IssuesForProjectOptions,
 		connectionId?: string,
-	): Promise<
-		IntegrationResult<{ values: IssueShape[]; truncated: boolean; metadata?: CollectionMetadata } | undefined>
-	> {
+	): Promise<IntegrationResult<ProjectIssuesDrain | undefined>> {
 		const scope = getScopedLogger();
 		const session = await this.resolveReadSession(connectionId, scope);
 		if (session == null) return undefined;
@@ -210,7 +240,7 @@ export abstract class IssuesIntegration<
 		session: ProviderAuthenticationSession,
 		project: T,
 		options?: IssuesForProjectOptions,
-	): Promise<{ values: IssueShape[]; truncated: boolean; metadata?: CollectionMetadata } | undefined> {
+	): Promise<ProjectIssuesDrain | undefined> {
 		const values = await this.getProviderIssuesForProject(session, project, options);
 		if (values == null) return undefined;
 		return { values: values, truncated: false };

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

@@ -14,6 +14,7 @@ import type { ResourceDescriptor } from '../../../git/models/resourceDescriptor.
 import { base64 } from '../../../utils/base64.js';
 import { CancellationError } from '../../../utils/cancellation.js';
 import type { Emitter } from '../../../utils/event.js';
+import { mapSettledBounded } from '../../../utils/promise.js';
 import type { IntegrationAuthenticationProviderDescriptor } from '../authentication/integrationAuthenticationProvider.js';
 import type { IntegrationAuthenticationService } from '../authentication/integrationAuthenticationService.js';
 import type {
@@ -23,10 +24,10 @@ import type {
 } from '../authentication/models.js';
 import { toTokenWithInfo } from '../authentication/models.js';
 import { toCollectionScopeFailure } from '../collectionMetadata.js';
-import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId } from '../constants.js';
+import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId, providerFanOutConcurrency } from '../constants.js';
 import type { IntegrationServiceContext } from '../context.js';
 import type { IntegrationConnectionChangeEvent } from '../integrationService.js';
-import type { SearchMyPullRequestsOptions } from '../models/gitHostIntegration.js';
+import type { SearchMyPullRequestsOptions, SearchPullRequestsOptions } from '../models/gitHostIntegration.js';
 import { GitHostIntegration } from '../models/gitHostIntegration.js';
 import type { AccountWideIssuesResult, IntegrationKey, SearchMyIssuesOptions } from '../models/integration.js';
 import type {
@@ -56,7 +57,11 @@ import {
 	toProviderPullRequestStates,
 } from './models.js';
 import type { ProvidersApi } from './providersApi.js';
-import { collectProviderPagedResult, flatSettledOrThrow, mergeCollectionMetadata } from './utils/providerPaging.js';
+import {
+	collectProviderPagedResult,
+	flatSettledResultsOrThrow,
+	mergeCollectionMetadata,
+} from './utils/providerPaging.js';
 
 function getAzureRepositoryIdentity(repo: Pick<AzureRepositoryDescriptor, 'owner' | 'name' | 'project'>): {
 	resourceName: string;
@@ -654,9 +659,7 @@ export abstract class AzureDevOpsIntegrationBase<
 		session: ProviderAuthenticationSession,
 		repos?: AzureRepositoryDescriptor[],
 		_cancellation?: AbortSignal,
-		_silent?: boolean,
-		state?: PullRequestStateFilter,
-		_options?: SearchMyPullRequestsOptions,
+		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		const api = await this.getProvidersApi();
 		if (repos != null) {
@@ -664,7 +667,7 @@ export abstract class AzureDevOpsIntegrationBase<
 			return undefined;
 		}
 
-		const states = toProviderPullRequestStates(state);
+		const states = toProviderPullRequestStates(options?.state);
 
 		const user = await this.getProviderCurrentAccount(session);
 		// Azure filters key on the identity GUID (account id), not the display name — see
@@ -683,21 +686,21 @@ export abstract class AzureDevOpsIntegrationBase<
 			.filter(r => r != null)
 			.flat();
 
-		const { tokenWithInfo, options } = this.getApiOptions(session);
+		const { tokenWithInfo, options: apiOptions } = this.getApiOptions(session);
 		const projectInputs = projects.values.map(p => ({ namespace: p.resourceName, project: p.name }));
 		// Legacy array-returning path (Launchpad/focus view): unwrap `.values` from the SDK collection result.
 		// The metadata (partial/failures) isn't surfaced here because this path's return type has no warning
 		// channel; the metadata-aware ProviderBackend surface is getProviderMyPullRequestsForUser above.
 		const assignedPrs = (
 			await api.getPullRequestsForAzureProjects(tokenWithInfo, projectInputs, {
-				...options,
+				...apiOptions,
 				assigneeLogins: [user.id],
 				states: states,
 			})
 		).values.map(pr => this.fromAzureProviderPullRequest(pr, repoDescriptors, projects.values));
 		const authoredPrs = (
 			await api.getPullRequestsForAzureProjects(tokenWithInfo, projectInputs, {
-				...options,
+				...apiOptions,
 				authorLogin: user.id,
 				states: states,
 			})
@@ -883,7 +886,7 @@ export abstract class AzureDevOpsIntegrationBase<
 		searchQuery: string,
 		repos?: AzureRepositoryDescriptor[],
 		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		if (cancellation?.aborted) throw new CancellationError();
 
@@ -939,8 +942,8 @@ export abstract class AzureDevOpsIntegrationBase<
 						project: { namespace: project.resourceName, project: project.name },
 					}));
 
-		const providerPullRequests = await flatSettledOrThrow(
-			searchScopes.map(async scope => {
+		const providerPullRequests = flatSettledResultsOrThrow(
+			await mapSettledBounded(searchScopes, providerFanOutConcurrency, async scope => {
 				const values: ProviderPullRequest[] = [];
 				let page: number | undefined;
 				for (let i = 0; i < 20; i++) {

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

@@ -25,7 +25,7 @@ import { toTokenWithInfo } from '../authentication/models.js';
 import { GitSelfManagedHostIntegrationId } from '../constants.js';
 import type { IntegrationServiceContext } from '../context.js';
 import type { IntegrationConnectionChangeEvent } from '../integrationService.js';
-import type { SearchMyPullRequestsOptions } from '../models/gitHostIntegration.js';
+import type { SearchMyPullRequestsOptions, SearchPullRequestsOptions } from '../models/gitHostIntegration.js';
 import { GitHostIntegration } from '../models/gitHostIntegration.js';
 import type { IntegrationKey } from '../models/integration.js';
 import type { BitbucketRepositoryDescriptor } from './bitbucket/models.js';
@@ -251,9 +251,7 @@ export class BitbucketServerIntegration extends GitHostIntegration<
 		session: ProviderAuthenticationSession,
 		repos?: BitbucketRepositoryDescriptor[],
 		_cancellation?: AbortSignal,
-		_silent?: boolean,
-		state?: PullRequestStateFilter,
-		_options?: SearchMyPullRequestsOptions,
+		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		if (repos != null) {
 			// TODO: implement repos version
@@ -268,7 +266,7 @@ export class BitbucketServerIntegration extends GitHostIntegration<
 		const prs = await api.getBitbucketServerPullRequestsForCurrentUser(
 			toTokenWithInfo(this.id, session),
 			this.apiBaseUrl,
-			{ states: toProviderPullRequestStates(state) },
+			{ states: toProviderPullRequestStates(options?.state) },
 		);
 		return prs?.data.map(pr => fromProviderPullRequest(pr, this));
 	}
@@ -331,7 +329,7 @@ export class BitbucketServerIntegration extends GitHostIntegration<
 		searchQuery: string,
 		repos?: BitbucketRepositoryDescriptor[],
 		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		if (cancellation?.aborted) throw new CancellationError();
 

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

@@ -23,7 +23,7 @@ import type {
 import { toTokenWithInfo } from '../authentication/models.js';
 import { toCollectionScopeFailure } from '../collectionMetadata.js';
 import { GitCloudHostIntegrationId } from '../constants.js';
-import type { SearchMyPullRequestsOptions } from '../models/gitHostIntegration.js';
+import type { SearchMyPullRequestsOptions, SearchPullRequestsOptions } from '../models/gitHostIntegration.js';
 import { GitHostIntegration } from '../models/gitHostIntegration.js';
 import type { BitbucketRepositoryDescriptor, BitbucketWorkspaceDescriptor } from './bitbucket/models.js';
 import type {
@@ -321,8 +321,6 @@ export class BitbucketIntegration extends GitHostIntegration<
 		session: ProviderAuthenticationSession,
 		repos?: BitbucketRepositoryDescriptor[],
 		_cancellation?: AbortSignal,
-		_silent?: boolean,
-		state?: PullRequestStateFilter,
 		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		if (repos != null) {
@@ -330,6 +328,7 @@ export class BitbucketIntegration extends GitHostIntegration<
 			return undefined;
 		}
 
+		const state = options?.state;
 		const states = toProviderPullRequestStates(state);
 
 		const api = await this.getProvidersApi();
@@ -624,7 +623,7 @@ export class BitbucketIntegration extends GitHostIntegration<
 		searchQuery: string,
 		repos?: BitbucketRepositoryDescriptor[],
 		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		if (cancellation?.aborted) throw new CancellationError();
 

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

@@ -26,7 +26,7 @@ import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId } from '../c
 import type { IntegrationServiceContext } from '../context.js';
 import { IntegrationReadUnavailableError } from '../errors.js';
 import type { IntegrationConnectionChangeEvent } from '../integrationService.js';
-import type { SearchMyPullRequestsOptions } from '../models/gitHostIntegration.js';
+import type { SearchMyPullRequestsOptions, SearchPullRequestsOptions } from '../models/gitHostIntegration.js';
 import { GitHostIntegration } from '../models/gitHostIntegration.js';
 import type {
 	ProviderIssueSearchPage,
@@ -397,9 +397,7 @@ abstract class GitHubIntegrationBase<ID extends GitHubIntegrationIds> extends Gi
 		session: ProviderAuthenticationSession,
 		repos?: GitHubRepositoryDescriptor[],
 		cancellation?: AbortSignal,
-		silent?: boolean,
-		state?: PullRequestStateFilter,
-		_options?: SearchMyPullRequestsOptions,
+		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		return (await this.authenticationService.apis.github)?.searchMyPullRequests(
 			this,
@@ -407,8 +405,8 @@ abstract class GitHubIntegrationBase<ID extends GitHubIntegrationIds> extends Gi
 			{
 				repos: repos?.map(r => `${r.owner}/${r.name}`),
 				baseUrl: this.apiBaseUrl,
-				silent: silent,
-				state: state,
+				silent: options?.silent,
+				state: options?.state,
 			},
 			cancellation,
 		);
@@ -689,6 +687,24 @@ abstract class GitHubIntegrationBase<ID extends GitHubIntegrationIds> extends Gi
 		);
 	}
 
+	/**
+	 * Resolves several issues by `(owner, repo, number)` in ONE request, by aliasing the point read rather than a
+	 * search — see {@link GitHubApi.getIssuesBatch} for why that distinction is the whole design.
+	 */
+	protected override async getProviderIssuesBatch(
+		session: ProviderAuthenticationSession,
+		coordinates: readonly { owner: string; repo: string; number: number }[],
+		cancellation?: AbortSignal,
+	): Promise<(IssueShape | undefined)[] | undefined> {
+		return (await this.authenticationService.apis.github)?.getIssuesBatch(
+			this,
+			toTokenWithInfo(this.id, session),
+			coordinates,
+			{ baseUrl: this.apiBaseUrl, includeBody: true },
+			cancellation,
+		);
+	}
+
 	/**
 	 * Counts several pull-request scopes in ONE request. Like {@link countProviderIssues}, GitHub's `search`
 	 * reports `issueCount` on a zero-node selection, so a count preview costs no pull-request transfer.
@@ -716,7 +732,7 @@ abstract class GitHubIntegrationBase<ID extends GitHubIntegrationIds> extends Gi
 		searchQuery: string,
 		repos?: GitHubRepositoryDescriptor[],
 		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		return (await this.authenticationService.apis.github)?.searchPullRequests(
 			this,

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

@@ -25,7 +25,7 @@ import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId } from '../c
 import type { IntegrationServiceContext } from '../context.js';
 import { IntegrationReadUnavailableError } from '../errors.js';
 import type { IntegrationConnectionChangeEvent } from '../integrationService.js';
-import type { SearchMyPullRequestsOptions } from '../models/gitHostIntegration.js';
+import type { SearchMyPullRequestsOptions, SearchPullRequestsOptions } from '../models/gitHostIntegration.js';
 import { GitHostIntegration } from '../models/gitHostIntegration.js';
 import type { AccountWideIssuesResult, SearchMyIssuesOptions } from '../models/integration.js';
 import type { GitLabIntegrationIds } from './gitlab/gitlab.utils.js';
@@ -406,9 +406,7 @@ abstract class GitLabIntegrationBase<ID extends GitLabIntegrationIds> extends Gi
 		session: ProviderAuthenticationSession,
 		repos?: GitLabRepositoryDescriptor[],
 		_cancellation?: AbortSignal,
-		_silent?: boolean,
-		state?: PullRequestStateFilter,
-		_options?: SearchMyPullRequestsOptions,
+		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		const api = await this.getProvidersApi();
 		// Resolve the username from THIS session's token (multi-account: `session` may be a non-primary
@@ -421,7 +419,7 @@ abstract class GitLabIntegrationBase<ID extends GitLabIntegrationIds> extends Gi
 		const apiResult = await api.getPullRequestsForUser(toTokenWithInfo(this.id, session), username, {
 			isPAT: this.isEnterprise,
 			baseUrl: this.isEnterprise ? `https://${this.domain}` : undefined,
-			states: toProviderPullRequestStates(state),
+			states: toProviderPullRequestStates(options?.state),
 		});
 
 		if (apiResult == null) {
@@ -709,7 +707,7 @@ abstract class GitLabIntegrationBase<ID extends GitLabIntegrationIds> extends Gi
 		searchQuery: string,
 		repos?: GitLabRepositoryDescriptor[],
 		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions,
 	): Promise<PullRequest[] | undefined> {
 		const api = await this.authenticationService.apis.gitlab;
 		if (!api) {

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

@@ -10,7 +10,7 @@ import type { ProviderAuthenticationSession } from '../authentication/models.js'
 import { toTokenWithInfo } from '../authentication/models.js';
 import { throwIfCallerContractError, toCollectionScopeFailure } from '../collectionMetadata.js';
 import { IssuesCloudHostIntegrationId } from '../constants.js';
-import type { IssuesForProjectOptions } from '../models/issueReads.js';
+import type { IssuesForProjectOptions, ProjectIssuesDrain } from '../models/issueReads.js';
 import { IssuesIntegration } from '../models/issuesIntegration.js';
 import type { ProviderApiCollectionResult, ProviderIssue } from './models.js';
 import { IssueFilter, providersMetadata, toAccount, toIssueShape } from './models.js';
@@ -20,6 +20,12 @@ const metadata = providersMetadata[IssuesCloudHostIntegrationId.Jira];
 const authProvider = Object.freeze({ id: metadata.id, scopes: metadata.scopes });
 const maxPagesPerRequest = 10;
 
+type JiraProjectIssuesDrain<T> = {
+	issues: T[];
+	status: 'complete' | 'backstop' | 'incomplete';
+	metadata?: CollectionMetadata;
+};
+
 export type JiraBaseDescriptor = IssueResourceDescriptor;
 
 export interface JiraOrganizationDescriptor extends JiraBaseDescriptor {
@@ -244,16 +250,11 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 		session: ProviderAuthenticationSession,
 		project: JiraProjectDescriptor,
 		options?: IssuesForProjectOptions,
-	): Promise<{ values: IssueShape[]; truncated: boolean; metadata?: CollectionMetadata } | undefined> {
+	): Promise<ProjectIssuesDrain | undefined> {
 		const tokenWithInfo = toTokenWithInfo(this.id, session);
 
 		const api = await this.getProvidersApi();
 
-		// Drain every page for a project read (bounded by a defensive backstop): the paged wrapper preserves the
-		// SDK's cursor, unlike the plain read which silently caps at the first page. `filter` undefined = the
-		// unscoped project read. Reports `truncated` when the drain stopped at the backstop with more pages
-		// still available, and records a structured failure if a page-level error discarded the rest of the drain,
-		// so the facade can warn + set fetchFailed while preserving the already-fetched prefix.
 		const projectScope = {
 			providerId: this.id,
 			resourceId: project.resourceId,
@@ -263,10 +264,10 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 			authorLogin?: string;
 			assigneeLogins?: string[];
 			mentionLogin?: string;
-		}): Promise<{ issues: ProviderIssue[]; truncated: boolean; metadata?: CollectionMetadata }> => {
+		}): Promise<JiraProjectIssuesDrain<ProviderIssue>> => {
 			const collected: ProviderIssue[] = [];
 			let cursor: string | undefined;
-			let truncated = false;
+			let status: JiraProjectIssuesDrain<ProviderIssue>['status'] = 'complete';
 			let metadata: CollectionMetadata | undefined;
 			for (let i = 0; i < maxPagesPerRequest; i++) {
 				let result: Awaited<ReturnType<typeof api.getIssuesForProjectPaged>> | undefined;
@@ -283,7 +284,7 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 					// than an empty partial success.
 					if (collected.length === 0) throw ex;
 
-					truncated = true;
+					status = 'incomplete';
 					metadata = mergeCollectionMetadata(metadata, {
 						completeness: 'partial',
 						failures: [toCollectionScopeFailure(projectScope, ex)],
@@ -293,7 +294,7 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 				if (result == null) {
 					if (cursor == null) break;
 
-					truncated = true;
+					status = 'incomplete';
 					metadata = mergeCollectionMetadata(metadata, {
 						completeness: 'partial',
 						failures: [
@@ -312,7 +313,7 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 				// The provider claims more pages but gave no advancing cursor: we can't continue, so the drain
 				// is incomplete — flag it rather than silently stopping (matches drainPullRequests/Repositories).
 				if (result.nextCursor == null || result.nextCursor === cursor) {
-					truncated = true;
+					status = 'incomplete';
 					metadata = mergeCollectionMetadata(metadata, {
 						completeness: 'partial',
 						failures: [
@@ -326,18 +327,21 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 				}
 
 				cursor = result.nextCursor;
-				// More pages remain but we're at the last allowed iteration: the drain is incomplete.
 				if (i === maxPagesPerRequest - 1) {
-					truncated = true;
+					status = 'backstop';
 				}
 			}
-			return { issues: collected, truncated: truncated, metadata: metadata };
+			return {
+				issues: collected,
+				status: status,
+				metadata: metadata,
+			};
 		};
 
 		const getSearchedUserIssuesForFilter = async (
 			user: string,
 			filter: IssueFilter,
-		): Promise<{ issues: IssueShape[]; truncated: boolean; metadata?: CollectionMetadata }> => {
+		): Promise<JiraProjectIssuesDrain<IssueShape>> => {
 			const result = await drainIssues({
 				authorLogin: filter === IssueFilter.Author ? user : undefined,
 				assigneeLogins: filter === IssueFilter.Assignee ? [user] : undefined,
@@ -348,7 +352,7 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 				issues: result.issues
 					.map(issue => toIssueShape(issue, this))
 					.filter((r): r is IssueShape => r !== undefined),
-				truncated: result.truncated,
+				status: result.status,
 				metadata: result.metadata,
 			};
 		};
@@ -415,7 +419,7 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 					continue;
 				}
 
-				if (outcome.value.truncated) {
+				if (outcome.value.status !== 'complete') {
 					truncated = true;
 				}
 				if (outcome.value.metadata != null) {
@@ -428,17 +432,23 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 				}
 			}
 
-			return { values: [...resultsById.values()], truncated: truncated, metadata: metadata };
+			return truncated
+				? { values: [...resultsById.values()], truncated: true, recovery: 'none', metadata: metadata }
+				: { values: [...resultsById.values()], truncated: false, metadata: metadata };
 		}
 
 		const unscoped = await drainIssues({});
-		return {
-			values: unscoped.issues
-				.map(issue => toIssueShape(issue, this))
-				.filter((result): result is IssueShape => result !== undefined),
-			truncated: unscoped.truncated,
-			metadata: unscoped.metadata,
-		};
+		const values = unscoped.issues
+			.map(issue => toIssueShape(issue, this))
+			.filter((result): result is IssueShape => result !== undefined);
+		return unscoped.status !== 'complete'
+			? {
+					values: values,
+					truncated: true,
+					recovery: unscoped.status === 'backstop' ? 'narrow-scope' : 'none',
+					metadata: unscoped.metadata,
+				}
+			: { values: values, truncated: false, metadata: unscoped.metadata };
 	}
 
 	protected override async searchProviderMyIssues(
@@ -516,6 +526,22 @@ export class JiraIntegration extends IssuesIntegration<IssuesCloudHostIntegratio
 		return issue != null ? { ...issue, type: 'issue' } : undefined;
 	}
 
+	protected override async getProviderIssueByResourceId(
+		session: ProviderAuthenticationSession,
+		resourceId: string,
+		id: string,
+		resourceUrl: string | undefined,
+	): Promise<Issue | undefined> {
+		if (resourceUrl == null) {
+			throw new Error('Jira direct issue reads require a resource URL');
+		}
+
+		const api = await this.getProvidersApi();
+		const apiResult = await api.getJiraIssueByKey(toTokenWithInfo(this.id, session), resourceId, resourceUrl, id);
+		const issue = apiResult != null ? toIssueShape(apiResult, this, { reliableStateCategory: true }) : undefined;
+		return issue != null ? { ...issue, type: 'issue' } : undefined;
+	}
+
 	protected override async providerOnConnect(): Promise<void> {
 		this._autolinks = undefined;
 		if (this._session == null) return;