@gitkraken/core-gitlens 0.5.114 → 0.5.116

package/src/plus/integrations/manager.ts

@@ -17,6 +17,7 @@ import type {
 } from './reads/counts.js';
 import type { SupportedFilters } from './reads/filters.js';
 import type { IssueBatchResult, IssueBatchTarget } from './reads/issueBatch.js';
+import type { TrackerIssueResult } from './reads/trackerIssue.js';
 import type {
 	ConnectionStateChangeEvent,
 	ProviderBroadenResult,
@@ -403,15 +404,36 @@ export interface IntegrationManager {
 	 */
 	searchPullRequestsPage(options: {
 		providerId: IntegrationIds;
-		/** Repository descriptors that bound the search; ids cannot name provider search qualifiers. */
+		/**
+		 * Repository descriptors that bound the search; ids cannot name provider search qualifiers.
+		 *
+		 * Both halves of a descriptor must reach the provider unchanged — see `org` — since a search names a
+		 * repository by its `namespace/name` path.
+		 */
 		repos?: ProviderRepositoriesInput;
-		/** Organization/account that bounds the search. */
+		/**
+		 * Organization/account that bounds the search.
+		 *
+		 * Held to a STRICTER rule than the free-form `criteria.text`, which is sanitized: a scope name carrying a
+		 * quote, or an inner space or control character, is REFUSED (warning + `fetchFailed`), and the refusal
+		 * names the value. Leading and trailing whitespace and control characters are stripped and accepted,
+		 * since removing them cannot change which scope the query names. Sanitizing a scope would answer the wrong question — the sanitized value may name a real but
+		 * DIFFERENT organization, whose result looks entirely normal. Pass the name exactly as the provider spells
+		 * it; `''` means "no org supplied" and falls through to the other scopes.
+		 */
 		org?: string;
 		criteria?: PullRequestSearchCriteria;
 		/** Cursor-only: without a cursor, reaching page N costs O(N) upstream requests. */
 		page?: number;
 		cursor?: string;
-		/** Page size per relationship × state facet; the deduped union can contain more rows. */
+		/**
+		 * Page size PER RELATIONSHIP × STATE facet, not per page. Each facet is its own aliased provider query —
+		 * one axis more than {@link searchIssuesPage}'s per-relationship fan-out — so a page of a 3-relationship,
+		 * 2-state search returns up to `6 × itemsPerPage` items before deduplication, and fewer than that where
+		 * the facets overlap. Deduplication does NOT bring the page back to this size: it removes only the rows the
+		 * facets share. `page.itemsPerPage` reports what actually came back, so size the UI off that rather than
+		 * off this. A provider may also cap it below what is asked for.
+		 */
 		itemsPerPage?: number;
 		forceSync?: boolean;
 		connectionId?: string;
@@ -419,7 +441,9 @@ export interface IntegrationManager {
 		domain?: string;
 		/**
 		 * Requests the lightweight row shape: identity, body, author, repository, branch refs and stack info,
-		 * without review, check or diff statistics. It also raises the default page size.
+		 * without review, check or diff statistics. It also replaces the flat per-facet default page size with a
+		 * fixed budget shared across the search's ACTIVE facets, so with up to three of them it raises the page
+		 * and from four on it LOWERS it — measured against GitHub, a 100-row budget versus a flat 30 each.
 		 *
 		 * A provider without a lightweight projection ignores it and returns its usual shape, so this is a hint
 		 * rather than a contract about which fields are present.
@@ -512,9 +536,23 @@ export interface IntegrationManager {
 	 */
 	searchIssuesPage(options: {
 		providerId: IntegrationIds;
-		/** Repositories to search. Combines with `org`; both constrain the same query. */
+		/**
+		 * Repositories to search. Combines with `org`; both constrain the same query.
+		 *
+		 * Both halves of a descriptor must reach the provider unchanged — see `org` — since a search names a
+		 * repository by its `namespace/name` path.
+		 */
 		repos?: ProviderRepositoriesInput;
-		/** Organization/account to search. Combines with `repos`. */
+		/**
+		 * Organization/account to search. Combines with `repos`.
+		 *
+		 * Held to a STRICTER rule than the free-form criteria, which are sanitized: a scope name carrying a quote,
+		 * or an inner space or control character, is REFUSED (warning + `fetchFailed`), and the refusal names the
+		 * value. Leading and trailing whitespace and control characters are stripped and accepted, since removing
+		 * them cannot change which scope the query names.
+		 * The sanitized value may name a real but DIFFERENT org, whose result looks entirely normal. `''` means
+		 * "no org supplied" and falls through to the other scopes.
+		 */
 		org?: string;
 		criteria?: IssueSearchCriteria;
 		/**
@@ -589,6 +627,27 @@ export interface IntegrationManager {
 		/** Self-managed host domain fallback; see {@link ProviderSweepTarget.domain}. */
 		domain?: string;
 	}): Promise<ProviderResult<IssueBatchResult>>;
+	/**
+	 * Resolves one issue-tracker issue by key within a resource — the tracker counterpart of
+	 * {@link getIssuesBatch}, which cannot serve one.
+	 *
+	 * `issue: undefined` is a proven absence and may be cached. A failed read returns no item and sets
+	 * `fetchFailed`. `resourceId` is required and trusted; Jira also requires the resource's site URL so the result
+	 * retains its browser link. The read performs no resource discovery.
+	 *
+	 * Jira and Linear only. Trello refuses: its single-issue read falls back to a capped board scan for a numeric
+	 * identifier, so it cannot prove absence.
+	 */
+	getTrackerIssue(options: {
+		providerId: IntegrationIds;
+		/** Provider resource ID for the Atlassian site or Linear workspace. */
+		resourceId: string;
+		/** Jira site URL from resource discovery. Required for Jira so the result retains a browser link. */
+		resourceUrl?: string;
+		/** The provider's own key, e.g. `ABC-123`. Not a number. */
+		key: string;
+		connectionId?: string;
+	}): Promise<ProviderResult<TrackerIssueResult>>;
 	/**
 	 * How many pull requests match each scope, fetching none of them — the PR twin of {@link countIssues}, behind a
 	 * "this will fetch ~N pull requests" preview and a live count next to an unapplied filter. Same cost model,

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

@@ -13,6 +13,7 @@ import type {
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata.js';
 import type { ResourceDescriptor } from '../../../git/models/resourceDescriptor.js';
 import type { PullRequestUrlIdentity } from '../../../git/utils/pullRequest.utils.js';
+import { ensureArray } from '../../../utils/array.js';
 import { isCancellationError } from '../../../utils/cancellation.js';
 import { gate } from '../../../utils/decorators/gate.js';
 import { trace } from '../../../utils/decorators/log.js';
@@ -22,7 +23,11 @@ import { getScopedLogger } from '../../../utils/logger.scoped.js';
 import type { PagedResult } from '../../../utils/paging.js';
 import type { ProviderAuthenticationSession } from '../authentication/models.js';
 import { toTokenWithInfo } from '../authentication/models.js';
-import { throwIfCallerContractError, toCollectionScopeFailure } from '../collectionMetadata.js';
+import {
+	throwIfCallerContractError,
+	toCollectionFailureError,
+	toCollectionScopeFailure,
+} from '../collectionMetadata.js';
 import type { IntegrationIds } from '../constants.js';
 import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId } from '../constants.js';
 import { toError } from '../errors.js';
@@ -50,7 +55,7 @@ import {
 	toProviderPullRequestStates,
 } from '../providers/models.js';
 import type { ProvidersApi } from '../providers/providersApi.js';
-import { mergeCollectionMetadata } from '../providers/utils/providerPaging.js';
+import { mergeCollectionMetadata, throwIfAllSettledFailed } from '../providers/utils/providerPaging.js';
 import type {
 	IntegrationResult,
 	IntegrationType,
@@ -113,10 +118,24 @@ function getSelfManagedApiBaseUrl(
 	}
 }
 
+/** Read options for {@link GitHostIntegration.searchMyPullRequests} and the provider hook behind it. */
 export type SearchMyPullRequestsOptions = {
+	/** Suppresses the user-facing notification when the read fails. */
+	silent?: boolean;
+	/**
+	 * PR states to include (open/closed/merged/all). Providers that cannot express it in a single query
+	 * filter the normalized results; omitted preserves the historical open-only behavior.
+	 */
+	state?: PullRequestStateFilter;
 	includeReviewRequested?: boolean;
 };
 
+/** Read options for {@link GitHostIntegration.searchPullRequests} and the provider hook behind it. */
+export type SearchPullRequestsOptions = {
+	/** PR states to include; omitted preserves the provider's default. */
+	include?: PullRequestState[];
+};
+
 type MyPullRequestsForReposOptions = {
 	filters?: PullRequestFilter[];
 	cursor?: string;
@@ -747,10 +766,17 @@ export abstract class GitHostIntegration<
 		const customUrl =
 			options?.customUrl ?? getSelfManagedApiBaseUrl(providerId, session.domain || this.domain, session.protocol);
 
-		const api = await this.getProvidersApi();
+		let api: ProvidersApi;
+		try {
+			api = await this.getProvidersApi();
+		} catch (ex) {
+			this.handleProviderException('getIssuesForRepos', ex, { scope: scope, connectionId: connectionId });
+			return { error: toError(ex), duration: performance.now() - start };
+		}
+		const repoIdsInput = api.isRepoIdsInput(reposOrRepoIds);
 		if (
 			providerId !== GitCloudHostIntegrationId.GitLab &&
-			(api.isRepoIdsInput(reposOrRepoIds) ||
+			(repoIdsInput ||
 				(isAzureDevOpsProvider(providerId) &&
 					!reposOrRepoIds.every(repo => repo.project != null && repo.namespace != null)))
 		) {
@@ -791,7 +817,10 @@ export abstract class GitHostIntegration<
 				try {
 					userAccount = await this.getFilterAccount(api, session, customUrl, organization);
 				} catch (ex) {
-					Logger.error(ex, 'getIssuesForRepos');
+					this.handleProviderException('getIssuesForRepos', ex, {
+						scope: scope,
+						connectionId: connectionId,
+					});
 					return { error: toError(ex), duration: performance.now() - start };
 				}
 
@@ -861,6 +890,7 @@ export abstract class GitHostIntegration<
 						return { projectInput: projectInput, results: results };
 					}),
 				);
+				throwIfAllSettledFailed(settled);
 
 				for (let i = 0; i < settled.length; i++) {
 					const outcome = settled[i];
@@ -904,6 +934,7 @@ export abstract class GitHostIntegration<
 					cursor.page = options.page;
 				}
 
+				this.resetRequestExceptionCount('getIssuesForRepos');
 				return {
 					value: {
 						values: data,
@@ -921,7 +952,10 @@ export abstract class GitHostIntegration<
 					duration: performance.now() - start,
 				};
 			} catch (ex) {
-				Logger.error(ex, 'getIssuesForRepos');
+				this.handleProviderException('getIssuesForRepos', ex, {
+					scope: scope,
+					connectionId: connectionId,
+				});
 				return { error: toError(ex), duration: performance.now() - start };
 			}
 		}
@@ -937,7 +971,10 @@ export abstract class GitHostIntegration<
 			try {
 				userAccount = await this.getFilterAccount(api, session, customUrl);
 			} catch (ex) {
-				Logger.error(ex, 'getIssuesForRepos');
+				this.handleProviderException('getIssuesForRepos', ex, {
+					scope: scope,
+					connectionId: connectionId,
+				});
 				return { error: toError(ex), duration: performance.now() - start };
 			}
 
@@ -964,7 +1001,7 @@ export abstract class GitHostIntegration<
 			};
 		}
 
-		if (api.getProviderIssuesPagingMode(providerId) === PagingMode.Repo && !api.isRepoIdsInput(reposOrRepoIds)) {
+		if (api.getProviderIssuesPagingMode(providerId) === PagingMode.Repo && !repoIdsInput) {
 			const cursorInfo = this.parseCursorInfo<PagedRepoInput>(options?.cursor);
 			const cursors: PagedRepoInput[] = cursorInfo.cursors ?? [];
 			let repoInputs: PagedRepoInput[] = reposOrRepoIds.map(repo => ({ repo: repo, cursor: undefined }));
@@ -1001,6 +1038,7 @@ export abstract class GitHostIntegration<
 						return { repoInput: repoInput, results: results };
 					}),
 				);
+				throwIfAllSettledFailed(settled);
 
 				for (let i = 0; i < settled.length; i++) {
 					const outcome = settled[i];
@@ -1038,6 +1076,7 @@ export abstract class GitHostIntegration<
 					cursor.page = options.page;
 				}
 
+				this.resetRequestExceptionCount('getIssuesForRepos');
 				return {
 					value: {
 						values: data,
@@ -1055,13 +1094,17 @@ export abstract class GitHostIntegration<
 					duration: performance.now() - start,
 				};
 			} catch (ex) {
-				Logger.error(ex, 'getIssuesForRepos');
+				this.handleProviderException('getIssuesForRepos', ex, {
+					scope: scope,
+					connectionId: connectionId,
+				});
 				return { error: toError(ex), duration: performance.now() - start };
 			}
 		}
 
 		try {
-			const result = await api.getIssuesForRepos(toTokenWithInfo(providerId, session), reposOrRepoIds, {
+			const tokenWithInfo = toTokenWithInfo(providerId, session);
+			const result = await api.getIssuesForRepos(tokenWithInfo, reposOrRepoIds, {
 				...getIssuesOptions,
 				cursor: options?.cursor,
 				baseUrl: customUrl,
@@ -1070,9 +1113,28 @@ export abstract class GitHostIntegration<
 				states: states,
 				sort: options?.sort,
 			});
+			const failures = result.metadata?.failures;
+			if (
+				repoIdsInput &&
+				reposOrRepoIds.length > 0 &&
+				result.values.length === 0 &&
+				failures?.length === reposOrRepoIds.length
+			) {
+				const ex = toCollectionFailureError(failures[0], tokenWithInfo);
+				this.handleProviderException('getIssuesForRepos', ex, {
+					scope: scope,
+					connectionId: connectionId,
+				});
+				return { error: ex, duration: performance.now() - start };
+			}
+
+			this.resetRequestExceptionCount('getIssuesForRepos');
 			return { value: result, duration: performance.now() - start };
 		} catch (ex) {
-			Logger.error(ex, 'getIssuesForRepos');
+			this.handleProviderException('getIssuesForRepos', ex, {
+				scope: scope,
+				connectionId: connectionId,
+			});
 			return { error: toError(ex), duration: performance.now() - start };
 		}
 	}
@@ -1134,7 +1196,16 @@ export abstract class GitHostIntegration<
 		const customUrl =
 			options?.customUrl ?? getSelfManagedApiBaseUrl(providerId, session.domain || this.domain, session.protocol);
 
-		const api = await this.getProvidersApi();
+		let api: ProvidersApi;
+		try {
+			api = await this.getProvidersApi();
+		} catch (ex) {
+			this.handleProviderException('getPullRequestsForRepos', ex, {
+				scope: scope,
+				connectionId: connectionId,
+			});
+			return { error: toError(ex), duration: performance.now() - start };
+		}
 		if (
 			providerId !== GitCloudHostIntegrationId.GitLab &&
 			(api.isRepoIdsInput(reposOrRepoIds) ||
@@ -1182,14 +1253,20 @@ export abstract class GitHostIntegration<
 				try {
 					userAccount = await this.getFilterAccount(api, session, customUrl, organization);
 				} catch (ex) {
-					Logger.error(ex, 'getPullRequestsForRepos');
+					this.handleProviderException('getPullRequestsForRepos', ex, {
+						scope: scope,
+						connectionId: connectionId,
+					});
 					return { error: toError(ex), duration: performance.now() - start };
 				}
 			} else {
 				try {
 					userAccount = await this.getFilterAccount(api, session, customUrl);
 				} catch (ex) {
-					Logger.error(ex, 'getPullRequestsForRepos');
+					this.handleProviderException('getPullRequestsForRepos', ex, {
+						scope: scope,
+						connectionId: connectionId,
+					});
 					return { error: toError(ex), duration: performance.now() - start };
 				}
 			}
@@ -1298,6 +1375,7 @@ export abstract class GitHostIntegration<
 						return { repoInput: repoInput, results: results };
 					}),
 				);
+				throwIfAllSettledFailed(settled);
 
 				// `allSettled` preserves order, so `settled[i]` is `repoInputs[i]`.
 				settled.forEach((outcome, i) => {
@@ -1338,6 +1416,7 @@ export abstract class GitHostIntegration<
 					cursor.page = options.page;
 				}
 
+				this.resetRequestExceptionCount('getPullRequestsForRepos');
 				return {
 					value: {
 						values: data,
@@ -1355,7 +1434,10 @@ export abstract class GitHostIntegration<
 					duration: performance.now() - start,
 				};
 			} catch (ex) {
-				Logger.error(ex, 'getPullRequestsForRepos');
+				this.handleProviderException('getPullRequestsForRepos', ex, {
+					scope: scope,
+					connectionId: connectionId,
+				});
 				return { error: toError(ex), duration: performance.now() - start };
 			}
 		}
@@ -1372,80 +1454,40 @@ export abstract class GitHostIntegration<
 				includeRemoteInfo: isAzureDevOpsProvider(providerId) ? true : undefined,
 				fields: options?.summary ? summaryPullRequestFields : undefined,
 			});
+			this.resetRequestExceptionCount('getPullRequestsForRepos');
 			return { value: result, duration: performance.now() - start };
 		} catch (ex) {
-			Logger.error(ex, 'getPullRequestsForRepos');
+			this.handleProviderException('getPullRequestsForRepos', ex, {
+				scope: scope,
+				connectionId: connectionId,
+			});
 			return { error: toError(ex), duration: performance.now() - start };
 		}
 	}
 
-	async searchMyPullRequests(
-		repo?: T,
-		cancellation?: AbortSignal,
-		silent?: boolean,
-		connectionId?: string,
-		state?: PullRequestStateFilter,
-		options?: SearchMyPullRequestsOptions,
-	): Promise<IntegrationResult<PullRequest[] | undefined>>;
-	async searchMyPullRequests(
-		repos?: T[],
-		cancellation?: AbortSignal,
-		silent?: boolean,
-		connectionId?: string,
-		state?: PullRequestStateFilter,
-		options?: SearchMyPullRequestsOptions,
-	): Promise<IntegrationResult<PullRequest[] | undefined>>;
+	/** Account-wide (or repo-scoped) search for the current user's pull requests. */
 	@trace()
 	async searchMyPullRequests(
 		repos?: T | T[],
 		cancellation?: AbortSignal,
-		silent?: boolean,
-		connectionId?: string,
-		state?: PullRequestStateFilter,
-		options?: SearchMyPullRequestsOptions,
+		options?: SearchMyPullRequestsOptions & { connectionId?: string },
 	): Promise<IntegrationResult<PullRequest[] | undefined>> {
 		const scope = getScopedLogger();
+		const { connectionId, ...searchOptions } = options ?? {};
 		// `connectionId` targets a specific account (multi-account); omitted reads the primary.
 		const session = await this.resolveReadSession(connectionId, scope);
 		if (session == null) return undefined;
 
 		const start = performance.now();
 		try {
-			// Prefer the optional metadata-aware path for account-wide reads so partial failures (e.g. one Azure
-			// org rejecting) are surfaced as a soft `{ value, error }` instead of being lost. Repo-scoped reads and
-			// providers without that override keep using the legacy array path.
-			let result: IntegrationResult<PullRequest[] | undefined>;
-			if (this.searchProviderMyPullRequestsResult != null && repos == null) {
-				result = await this.searchProviderMyPullRequestsResult(
-					session,
-					repos != null ? (Array.isArray(repos) ? repos : [repos]) : undefined,
-					cancellation,
-					silent,
-					state,
-					options,
-				);
-			} else {
-				result = {
-					value: await this.searchProviderMyPullRequests(
-						session,
-						repos != null ? (Array.isArray(repos) ? repos : [repos]) : undefined,
-						cancellation,
-						silent,
-						state,
-						options,
-					),
-				};
-			}
+			const prs = await this.searchProviderMyPullRequests(
+				session,
+				ensureArray(repos),
+				cancellation,
+				searchOptions,
+			);
 			this.resetRequestExceptionCount('searchMyPullRequests');
-			// `IntegrationResult` is a strict union of value-only or error-only (and may be `undefined`). Return the
-			// matching branch explicitly; a missing result is treated as a successful empty read.
-			if (result == null) {
-				return { value: undefined, duration: performance.now() - start };
-			}
-			if (result.error != null) {
-				return { error: result.error, duration: performance.now() - start };
-			}
-			return { value: result.value, duration: performance.now() - start };
+			return { value: prs, duration: performance.now() - start };
 		} catch (ex) {
 			this.handleProviderException('searchMyPullRequests', ex, {
 				scope: scope,
@@ -1542,34 +1584,13 @@ export abstract class GitHostIntegration<
 		}
 	}
 
-	// `state` selects which PR states to include (open/closed/merged/all). Providers that cannot express it
-	// in a single query filter the normalized results; omitted preserves the historical open-only behavior.
 	protected abstract searchProviderMyPullRequests(
 		session: ProviderAuthenticationSession,
 		repos?: T[],
 		cancellation?: AbortSignal,
-		silent?: boolean,
-		state?: PullRequestStateFilter,
 		options?: SearchMyPullRequestsOptions,
 	): Promise<PullRequest[] | undefined>;
 
-	/**
-	 * Optional metadata-aware counterpart of {@link searchProviderMyPullRequests}. Providers whose account-wide
-	 * "my PRs" read already produces {@link ProviderApiPagedResult} with completeness/failures can override
-	 * this to return a soft `{ value, error }` result so `searchMyPullRequests` surfaces partial data and a
-	 * warning instead of silently discarding the failure signal. The wrapper prefers this when present; the
-	 * abstract {@link searchProviderMyPullRequests} remains the required fallback for repo-scoped and
-	 * metadata-oblivious paths.
-	 */
-	protected searchProviderMyPullRequestsResult?(
-		session: ProviderAuthenticationSession,
-		repos?: T[],
-		cancellation?: AbortSignal,
-		silent?: boolean,
-		state?: PullRequestStateFilter,
-		options?: SearchMyPullRequestsOptions,
-	): Promise<IntegrationResult<PullRequest[] | undefined>>;
-
 	/**
 	 * Result-returning wrapper for the filtered pull-request search. Errors become the soft
 	 * `{ error }` branch so the public facade can preserve an empty account and a failed request as distinct
@@ -1618,49 +1639,16 @@ export abstract class GitHostIntegration<
 		cancellation?: AbortSignal,
 	): Promise<ProviderPullRequestSearchPage | undefined>;
 
-	async searchPullRequests(
-		searchQuery: string,
-		repo?: T,
-		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
-	): Promise<PullRequest[] | undefined>;
-	async searchPullRequests(
-		searchQuery: string,
-		repos?: T[],
-		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
-	): Promise<PullRequest[] | undefined>;
-	async searchPullRequests(
-		searchQuery: string,
-		repo?: T,
-		cancellation?: AbortSignal,
-		connectionId?: string,
-		options?: { include?: PullRequestState[] },
-	): Promise<PullRequest[] | undefined>;
-	async searchPullRequests(
-		searchQuery: string,
-		repos?: T[],
-		cancellation?: AbortSignal,
-		connectionId?: string,
-		options?: { include?: PullRequestState[] },
-	): Promise<PullRequest[] | undefined>;
+	/** Free-text search across pull requests, optionally narrowed to `repos`. */
 	@trace()
 	async searchPullRequests(
 		searchQuery: string,
 		repos?: T | T[],
 		cancellation?: AbortSignal,
-		connectionIdOrOptions?: string | { include?: PullRequestState[] },
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions & { connectionId?: string },
 	): Promise<PullRequest[] | undefined> {
-		// `connectionId` (string) can be omitted when passing `options`; split the overlapping 4th arg.
-		// When the 4th arg isn't the options object (a string `connectionId` or `undefined`), fall back to
-		// the 5th-arg `options` so an explicit `undefined` connectionId still honors state filtering.
-		const connectionId = typeof connectionIdOrOptions === 'string' ? connectionIdOrOptions : undefined;
-		const searchOptions =
-			connectionIdOrOptions != null && typeof connectionIdOrOptions !== 'string'
-				? connectionIdOrOptions
-				: options;
 		const scope = getScopedLogger();
+		const { connectionId, ...searchOptions } = options ?? {};
 		// `connectionId` targets a specific account (multi-account); omitted reads the primary.
 		const session = await this.resolveReadSession(connectionId, scope);
 		if (session == null) return undefined;
@@ -1669,7 +1657,7 @@ export abstract class GitHostIntegration<
 			const prs = await this.searchProviderPullRequests?.(
 				session,
 				searchQuery,
-				repos != null ? (Array.isArray(repos) ? repos : [repos]) : undefined,
+				ensureArray(repos),
 				cancellation,
 				searchOptions,
 			);
@@ -1686,7 +1674,7 @@ export abstract class GitHostIntegration<
 		searchQuery: string,
 		repos?: T[],
 		cancellation?: AbortSignal,
-		options?: { include?: PullRequestState[] },
+		options?: SearchPullRequestsOptions,
 	): Promise<PullRequest[] | undefined>;
 
 	/**