@gitkraken/core-gitlens 0.24.0 → 0.26.0

package/dist/plus/integrations/lite.js

@@ -1,6 +1,6 @@
 import "./constants.js";
-import { toTokenInfo } from "./authentication/models.js";
 import { providersMetadata } from "./providers/models.js";
+import { toTokenInfo } from "./authentication/models.js";
 import { GitHubApi } from "../git-github/api/github.js";
 import { AzureDevOpsApi } from "./providers/azure/azure.js";
 import { BitbucketApi } from "./providers/bitbucket/bitbucket.js";

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

@@ -24,9 +24,16 @@ export interface ProviderRepositoryInput {
 }
 export type ProviderRepositoriesInput = (string | number)[] | ProviderRepositoryInput[];
 /**
- * One provider slice in a pull-request sweep.
+ * One provider slice in a pull-request sweep: a provider, optionally pinned to one of its connections.
+ *
+ * A sweep may carry several targets of one provider, one per connection (two GitHub Enterprise installations,
+ * two Bitbucket Data Center servers, two github.com accounts). A target is identified by its provider,
+ * `connectionId` and the host its `domain` names; repeating one throws a `TypeError`. When a provider has more
+ * than one target, every one of them must name a `connectionId` or, on a self-managed provider, a `domain` (a cloud
+ * provider's read ignores `domain`): an unnamed target reads the provider's primary connection, which may be one
+ * of the named ones, so it would be read twice and its rows attributed ambiguously. A single unnamed target reads
+ * the primary connection.
  *
- * A sweep accepts at most one target per provider because its failure attribution is provider-scoped.
  * `domain` is a fallback for self-managed hosts whose authentication provider doesn't persist a configured
  * connection; a configured `connectionId` domain takes precedence when both are supplied. It must come from
  * the trusted authentication configuration, not repository or remote data.
@@ -36,7 +43,13 @@ export interface ProviderSweepTarget {
   connectionId?: string;
   domain?: string;
   /**
-   * Relationship filters for this provider slice. With sweep-level `repos`, members are provider query
+   * Repositories this target reads, so each connection can carry its own. It overrides the sweep-level `repos`
+   * for this target, like `filters`; an empty array reads the target account-wide, as an empty sweep-level
+   * one does.
+   */
+  repos?: ProviderRepositoriesInput;
+  /**
+   * Relationship filters for this provider slice. With `repos`, members are provider query
    * constraints; without `repos`, they form an exact OR union. The whole set is validated against the
    * selected path's capabilities.
    *
@@ -127,6 +140,7 @@ export interface ProviderBroadenOrg {
   domain?: string;
 }
 type PullRequestSweepCommonOptions = {
+  /** Repositories every target reads unless it carries its own `repos`. */
   repos?: ProviderRepositoriesInput;
   /** Named `states` to match {@link IntegrationManager.listPullRequestsPage}; a mismatch here read as silently ignored. */
   states?: PullRequestStateFilter[];
@@ -158,6 +172,20 @@ type PullRequestSweepCommonOptions = {
    */
   includeReviews?: boolean;
   forceSync?: boolean;
+  /**
+   * Repo-scoped targets only: most per-repository requests one provider read keeps in flight. Defaults to 6.
+   * Only hosts that read repository by repository fan out — GitLab, GitLab self-managed, Bitbucket Cloud,
+   * Bitbucket Data Center and Azure DevOps; GitHub/GHE send one query whatever the repo count. A sweep runs up
+   * to 6 targets at once, each with this bound.
+   */
+  scopeConcurrency?: number;
+  /**
+   * Azure DevOps, repo-scoped targets only: `false` skips the lookup that fills each row's clone URLs, saving one
+   * request per repository (and fork source) per page. Rows then carry no `refs.base.url`/`refs.head.url`
+   * (empty) and no `cloneHttps`/`cloneSsh`, so leave it on for rows that will be checked out or matched to local
+   * remotes. Defaults to `true`; other providers ignore it.
+   */
+  includeRemoteInfo?: boolean;
   /**
    * Page budget per provider. A stop at this budget with a resumable cursor is reported as
    * `pagination-incomplete` with `recovery: 'page-budget'`. A part no budget reaches is reported beside it
@@ -379,6 +407,20 @@ export interface IntegrationManager {
      * ignores the option, so it is a hint rather than a guarantee about which fields are present.
      */
     summary?: boolean;
+    /**
+     * Repo-scoped only: most per-repository requests one provider read keeps in flight. Defaults to 6. Only hosts
+     * that read repository by repository fan out — GitLab, GitLab self-managed, Bitbucket Cloud,
+     * Bitbucket Data Center and Azure DevOps; GitHub/GHE send one query whatever the repo count. The
+     * account-wide read ignores it.
+     */
+    scopeConcurrency?: number;
+    /**
+     * Azure DevOps, repo-scoped only (the account-wide read ignores it): `false` skips the lookup that fills each
+     * row's clone URLs, saving one request per repository (and fork source) per page. Rows then carry no
+     * `refs.base.url`/`refs.head.url` (empty) and no `cloneHttps`/`cloneSsh`, so leave it on for rows that will be
+     * checked out or matched to local remotes. Defaults to `true`; other providers ignore it.
+     */
+    includeRemoteInfo?: boolean;
   }): Promise<ProviderPagedResult<PullRequestShape>>;
   /**
    * Pull requests matching structured criteria over a repository/organization or current-user relationship
@@ -525,6 +567,12 @@ export interface IntegrationManager {
      */
     itemsPerPage?: number;
     forceSync?: boolean;
+    /**
+     * Most per-repository requests (per-project for Azure DevOps) one provider read keeps in flight. Defaults
+     * to 6. Only GitLab, GitLab self-managed and Azure DevOps fan out; GitHub/GHE send one query whatever the
+     * repo count. Account-wide reads ignore it.
+     */
+    scopeConcurrency?: number;
     connectionId?: string;
     /** Self-managed host domain fallback; see {@link ProviderSweepTarget.domain}. */
     domain?: string;

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

@@ -43,6 +43,20 @@ type MyPullRequestsForReposOptions = {
   state?: PullRequestStateFilter | PullRequestStateFilter[];
   /** Requests the lightweight row shape without per-row build status or commit count. */
   summary?: boolean;
+  /**
+   * Most per-repository requests one provider read keeps in flight. Defaults to 6. Only hosts that read repository
+   * by repository fan out — GitLab, GitLab self-managed, Bitbucket Cloud, Bitbucket Data Center and Azure DevOps;
+   * GitHub/GHE send one query whatever the repo count. A value that isn't a finite number >= 1 falls back to the
+   * default.
+   */
+  scopeConcurrency?: number;
+  /**
+   * Azure DevOps only, repo-scoped: `false` skips the lookup that fills each row's clone URLs, saving one
+   * request per repository (and fork source) per page. Rows then carry no `refs.base.url`/`refs.head.url`
+   * (empty) and no `cloneHttps`/`cloneSsh`, so leave it on for rows that will be checked out or matched to local
+   * remotes. Defaults to `true`; other providers ignore it.
+   */
+  includeRemoteInfo?: boolean;
 };
 /** A repository as the batch and branch reads name it. */
 export type RepositoryCoordinate = {

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

@@ -3,6 +3,7 @@ import { ensureArray } from "../../../utils/array.js";
 import { isCancellationError } from "../../../utils/cancellation.js";
 import { Logger as _logger } from "../../../utils/logger.js";
 import { getScopedLogger } from "../../../utils/logger.scoped.js";
+import { mapSettledBounded } from "../../../utils/promise.js";
 import { trace } from "../../../utils/decorators/log.js";
 import __decorate from "../../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { RequestNotFoundError } from "../../../git/errors.js";
@@ -12,12 +13,12 @@ import { toError } from "../errors.js";
 import "../constants.js";
 import { isAzureProviderId } from "../providers/providerErrors.js";
 import { throwIfCallerContractError, toCollectionFailureError, toCollectionScopeFailure, toUnsettledScopeFailure, unsettledMissMessage } from "../collectionMetadata.js";
-import { toTokenWithInfo } from "../authentication/models.js";
 import "../providerFilters.js";
-import { areDomainsOnSameHost } from "../utils/domain.utils.js";
-import { getSelfManagedBaseUrl, isGitSelfManagedHostIntegrationId } from "../utils/integration.utils.js";
 import { mergeCollectionMetadata, throwIfAllSettledFailed } from "../providers/utils/providerPaging.js";
+import { areDomainsOnSameHost } from "../utils/domain.utils.js";
 import { isRepoIdsInput, toIssueShape, toProviderIssueStates, toProviderPullRequestStates } from "../providers/models.js";
+import { getSelfManagedBaseUrl, isGitSelfManagedHostIntegrationId } from "../utils/integration.utils.js";
+import { toTokenWithInfo } from "../authentication/models.js";
 import { IntegrationBase, isReadSessionFailure } from "./integration.js";
 //#region ../plus/integrations/src/models/gitHostIntegration.ts
 /**
@@ -30,6 +31,10 @@ import { IntegrationBase, isReadSessionFailure } from "./integration.js";
 function sendsBasicCredential(providerId, session) {
 	return isAzureProviderId(providerId) ? session.type !== "oauth" : void 0;
 }
+/** A finite number >= 1 truncated to an integer; anything else (which would starve the pool) is the default. */
+function resolveScopeConcurrency(value) {
+	return value != null && Number.isFinite(value) && value >= 1 ? Math.trunc(value) : 6;
+}
 /**
 * Rejects each slot that read nothing (`isMiss`) for a coordinate whose repository couldn't be settled (see
 * {@link GitHostIntegration.resolveRepositoryCoordinates}): it may have addressed another repository, so its miss is
@@ -337,7 +342,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				scope,
 				connectionId
 			});
-			else this.resetRequestExceptionCount("getOrganizationsForUser");
+			else this.resetRequestExceptionCount("getOrganizationsForUser", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -369,7 +374,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		try {
 			const result = await this.getProviderProjectsForOrg(session, org);
 			await this.confirmScopedAuthFailures(session, result?.metadata);
-			this.resetRequestExceptionCount("getProjectsForOrg");
+			this.resetRequestExceptionCount("getProjectsForOrg", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -404,7 +409,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		try {
 			const result = await this.getProviderRepositoriesForOrg?.(session, org, options);
 			await this.confirmScopedAuthFailures(session, result?.metadata);
-			this.resetRequestExceptionCount("getRepositoriesForOrg");
+			this.resetRequestExceptionCount("getRepositoriesForOrg", options?.connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -436,7 +441,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		try {
 			const result = await this.getProviderRepositoriesForUser(session, options);
 			await this.confirmScopedAuthFailures(session, result?.metadata);
-			this.resetRequestExceptionCount("getRepositoriesForUser");
+			this.resetRequestExceptionCount("getRepositoriesForUser", options?.connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -628,6 +633,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				};
 			}
 			const unsettledProjects = toUnsettledScopeKeys(reposOrRepoIds, unsettled, (r) => `${r.namespace}\0${r.project}`);
+			const scopeConcurrency = resolveScopeConcurrency(options?.scopeConcurrency);
 			const cursors = this.parseCursorInfo(options?.cursor).cursors ?? [];
 			let projectInputs = Array.from(projects.values(), (project) => ({
 				namespace: organization,
@@ -641,7 +647,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				let truncated = false;
 				let metadata;
 				const data = [];
-				const settled = await Promise.allSettled(projectInputs.map(async (projectInput) => {
+				const settled = await mapSettledBounded(projectInputs, scopeConcurrency, async (projectInput) => {
 					return {
 						projectInput,
 						results: await api.getIssuesForAzureProject(toTokenWithInfo(providerId, session), projectInput.namespace, projectInput.project, {
@@ -655,7 +661,7 @@ var GitHostIntegration = class extends IntegrationBase {
 							sort: options?.sort
 						})
 					};
-				}));
+				});
 				throwIfAllSettledFailed(settled);
 				for (let i = 0; i < settled.length; i++) {
 					const outcome = settled[i];
@@ -700,7 +706,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				}
 				if (options?.page != null) cursor.page = options.page;
 				await this.confirmScopedAuthFailures(session, metadata);
-				this.resetRequestExceptionCount("getIssuesForRepos");
+				this.resetRequestExceptionCount("getIssuesForRepos", connectionId);
 				return {
 					value: {
 						values: data,
@@ -751,6 +757,7 @@ var GitHostIntegration = class extends IntegrationBase {
 			};
 		}
 		if (api.getProviderIssuesPagingMode(providerId) === "repo" && !repoIdsInput) {
+			const scopeConcurrency = resolveScopeConcurrency(options?.scopeConcurrency);
 			const cursors = this.parseCursorInfo(options?.cursor).cursors ?? [];
 			let repoInputs = reposOrRepoIds.map((repo) => ({
 				repo,
@@ -763,7 +770,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				let truncated = false;
 				let metadata;
 				const data = [];
-				const settled = await Promise.allSettled(repoInputs.map(async (repoInput) => {
+				const settled = await mapSettledBounded(repoInputs, scopeConcurrency, async (repoInput) => {
 					return {
 						repoInput,
 						results: await api.getIssuesForRepo(toTokenWithInfo(providerId, session), repoInput.repo, {
@@ -776,7 +783,7 @@ var GitHostIntegration = class extends IntegrationBase {
 							sort: options?.sort
 						})
 					};
-				}));
+				});
 				throwIfAllSettledFailed(settled);
 				for (let i = 0; i < settled.length; i++) {
 					const outcome = settled[i];
@@ -806,7 +813,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				}
 				if (options?.page != null) cursor.page = options.page;
 				await this.confirmScopedAuthFailures(session, metadata);
-				this.resetRequestExceptionCount("getIssuesForRepos");
+				this.resetRequestExceptionCount("getIssuesForRepos", connectionId);
 				return {
 					value: {
 						values: data,
@@ -856,7 +863,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				};
 			}
 			await this.confirmScopedAuthFailures(session, result.metadata);
-			this.resetRequestExceptionCount("getIssuesForRepos");
+			this.resetRequestExceptionCount("getIssuesForRepos", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -1018,6 +1025,8 @@ var GitHostIntegration = class extends IntegrationBase {
 		if (api.getProviderPullRequestsPagingMode(providerId) === "repo" && !api.isRepoIdsInput(reposOrRepoIds)) {
 			const toRepoInputKey = (r) => `${r.namespace}\0${r.project ?? ""}\0${r.name}`;
 			const unsettledRepos = toUnsettledScopeKeys(reposOrRepoIds, unsettled, toRepoInputKey);
+			let scopeConcurrency = resolveScopeConcurrency(options?.scopeConcurrency);
+			if (providerId === "bitbucket-server") scopeConcurrency = Math.max(1, Math.floor(scopeConcurrency / Math.max(1, states?.length ?? 1)));
 			const cursors = this.parseCursorInfo(options?.cursor).cursors ?? [];
 			let repoInputs = reposOrRepoIds.map((repo) => ({
 				repo,
@@ -1031,7 +1040,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				let metadata;
 				const failures = [];
 				const data = [];
-				const settled = await Promise.allSettled(repoInputs.map(async (repoInput) => {
+				const settled = await mapSettledBounded(repoInputs, scopeConcurrency, async (repoInput) => {
 					return {
 						repoInput,
 						results: await api.getPullRequestsForRepo(toTokenWithInfo(providerId, session), repoInput.repo, {
@@ -1042,10 +1051,10 @@ var GitHostIntegration = class extends IntegrationBase {
 							page: repoInput.cursor == null ? options?.page : void 0,
 							pageSize: options?.pageSize,
 							states,
-							includeRemoteInfo: isAzureProviderId(providerId) ? true : void 0
+							includeRemoteInfo: isAzureProviderId(providerId) && options?.includeRemoteInfo !== false ? true : void 0
 						})
 					};
-				}));
+				});
 				throwIfAllSettledFailed(settled);
 				settled.forEach((outcome, i) => {
 					if (outcome.status !== "fulfilled") {
@@ -1078,7 +1087,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				});
 				if (options?.page != null) cursor.page = options.page;
 				await this.confirmScopedAuthFailures(session, metadata);
-				this.resetRequestExceptionCount("getPullRequestsForRepos");
+				this.resetRequestExceptionCount("getPullRequestsForRepos", connectionId);
 				return {
 					value: {
 						values: data,
@@ -1112,11 +1121,11 @@ var GitHostIntegration = class extends IntegrationBase {
 				page: options?.page,
 				pageSize: options?.pageSize,
 				states,
-				includeRemoteInfo: isAzureProviderId(providerId) ? true : void 0,
+				includeRemoteInfo: isAzureProviderId(providerId) && options?.includeRemoteInfo !== false ? true : void 0,
 				fields: options?.summary ? summaryPullRequestFields : void 0
 			});
 			await this.confirmScopedAuthFailures(session, result.metadata);
-			this.resetRequestExceptionCount("getPullRequestsForRepos");
+			this.resetRequestExceptionCount("getPullRequestsForRepos", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -1141,7 +1150,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const start = performance.now();
 		try {
 			const prs = await this.searchProviderMyPullRequests(session, ensureArray(repos), cancellation, searchOptions);
-			this.resetRequestExceptionCount("searchMyPullRequests");
+			this.resetRequestExceptionCount("searchMyPullRequests", connectionId);
 			return {
 				value: prs,
 				duration: performance.now() - start
@@ -1175,7 +1184,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		try {
 			const result = await this.getProviderMyPullRequestsForUser(session, options);
 			await this.confirmScopedAuthFailures(session, result?.metadata);
-			this.resetRequestExceptionCount("getMyPullRequestsForUser");
+			this.resetRequestExceptionCount("getMyPullRequestsForUser", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -1243,7 +1252,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		try {
 			const result = await this.searchProviderPullRequestsPage?.(session, options, cancellation);
 			await this.confirmScopedAuthFailures(session, result?.metadata);
-			this.resetRequestExceptionCount("searchPullRequestsPage");
+			this.resetRequestExceptionCount("searchPullRequestsPage", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -1267,7 +1276,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		if (session == null || isReadSessionFailure(session)) return void 0;
 		try {
 			const prs = await this.searchProviderPullRequests?.(session, searchQuery, ensureArray(repos), cancellation, searchOptions);
-			this.resetRequestExceptionCount("searchPullRequests");
+			this.resetRequestExceptionCount("searchPullRequests", connectionId);
 			return prs;
 		} catch (ex) {
 			this.handleProviderException("searchPullRequests", ex, {
@@ -1294,7 +1303,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const start = performance.now();
 		try {
 			const result = await this.searchProviderIssuesPage?.(session, options, cancellation);
-			this.resetRequestExceptionCount("searchIssuesPage");
+			this.resetRequestExceptionCount("searchIssuesPage", connectionId);
 			return {
 				value: result,
 				duration: performance.now() - start
@@ -1325,7 +1334,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const start = performance.now();
 		try {
 			const counts = await this.countProviderIssues?.(session, scopes, cancellation);
-			this.resetRequestExceptionCount("countIssues");
+			this.resetRequestExceptionCount("countIssues", connectionId);
 			return {
 				value: counts,
 				duration: performance.now() - start
@@ -1375,15 +1384,15 @@ var GitHostIntegration = class extends IntegrationBase {
 			const targets = await this.resolveRepositoryCoordinates(session, coordinates, cancellation);
 			slots = await this.getProviderIssuesBatch?.(session, targets.coordinates, cancellation);
 			if (slots == null) {
-				this.resetRequestExceptionCount("getIssuesBatch");
+				this.resetRequestExceptionCount("getIssuesBatch", connectionId);
 				return {
 					value: void 0,
 					duration: performance.now() - start
 				};
 			}
 			const settled = await this.settleResolvedSlots(session, targets, slots, (issue) => issue == null);
-			this.resetRequestExceptionCount("getIssuesBatch");
-			this.reportDeferredRequestFailures(settled, false);
+			this.resetRequestExceptionCount("getIssuesBatch", connectionId);
+			this.reportDeferredRequestFailures(settled, false, connectionId);
 			return {
 				value: settled,
 				duration: performance.now() - start
@@ -1393,7 +1402,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				scope,
 				connectionId
 			});
-			this.reportDeferredRequestFailures(slots, !struck);
+			this.reportDeferredRequestFailures(slots, !struck, connectionId);
 			return {
 				error: toError(ex),
 				duration: performance.now() - start
@@ -1427,15 +1436,15 @@ var GitHostIntegration = class extends IntegrationBase {
 			const targets = await this.resolveRepositoryCoordinates(session, coordinates, cancellation);
 			slots = await this.getProviderPullRequestsBatch?.(session, targets.coordinates, options, cancellation);
 			if (slots == null) {
-				this.resetRequestExceptionCount("getPullRequestsBatch");
+				this.resetRequestExceptionCount("getPullRequestsBatch", connectionId);
 				return {
 					value: void 0,
 					duration: performance.now() - start
 				};
 			}
 			const settled = await this.settleResolvedSlots(session, targets, slots, (pr) => pr == null);
-			this.resetRequestExceptionCount("getPullRequestsBatch");
-			this.reportDeferredRequestFailures(settled, false);
+			this.resetRequestExceptionCount("getPullRequestsBatch", connectionId);
+			this.reportDeferredRequestFailures(settled, false, connectionId);
 			return {
 				value: settled,
 				duration: performance.now() - start
@@ -1445,7 +1454,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				scope,
 				connectionId
 			});
-			this.reportDeferredRequestFailures(slots, !struck);
+			this.reportDeferredRequestFailures(slots, !struck, connectionId);
 			return {
 				error: toError(ex),
 				duration: performance.now() - start
@@ -1479,7 +1488,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				duration: performance.now() - start
 			};
 			const settled = await this.settleResolvedSlots(session, targets, read, (fields) => fields == null, { keepOtherFailures: true });
-			if (settled.some((slot) => slot.status === "fulfilled")) this.resetRequestExceptionCount("getIssuesEtagFields");
+			if (settled.some((slot) => slot.status === "fulfilled")) this.resetRequestExceptionCount("getIssuesEtagFields", connectionId);
 			return {
 				value: settled,
 				duration: performance.now() - start
@@ -1516,7 +1525,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				duration: performance.now() - start
 			};
 			const settled = await this.settleResolvedSlots(session, targets, read, (fields) => fields == null, { keepOtherFailures: true });
-			if (settled.some((slot) => slot.status === "fulfilled")) this.resetRequestExceptionCount("getPullRequestsEtagFields");
+			if (settled.some((slot) => slot.status === "fulfilled")) this.resetRequestExceptionCount("getPullRequestsEtagFields", connectionId);
 			return {
 				value: settled,
 				duration: performance.now() - start
@@ -1557,15 +1566,15 @@ var GitHostIntegration = class extends IntegrationBase {
 			const resolved = await this.resolveRepositoryCoordinates(session, targets, cancellation);
 			slots = await this.getProviderPullRequestsForBranches?.(session, resolved.coordinates, options, cancellation);
 			if (slots == null) {
-				this.resetRequestExceptionCount("getPullRequestsForBranches");
+				this.resetRequestExceptionCount("getPullRequestsForBranches", connectionId);
 				return {
 					value: void 0,
 					duration: performance.now() - start
 				};
 			}
 			const settled = await this.settleResolvedSlots(session, resolved, slots, (found) => found.pullRequests.length === 0 && !found.truncated);
-			this.resetRequestExceptionCount("getPullRequestsForBranches");
-			this.reportDeferredRequestFailures(settled, false);
+			this.resetRequestExceptionCount("getPullRequestsForBranches", connectionId);
+			this.reportDeferredRequestFailures(settled, false, connectionId);
 			return {
 				value: settled,
 				duration: performance.now() - start
@@ -1575,7 +1584,7 @@ var GitHostIntegration = class extends IntegrationBase {
 				scope,
 				connectionId
 			});
-			this.reportDeferredRequestFailures(slots, !struck);
+			this.reportDeferredRequestFailures(slots, !struck, connectionId);
 			return {
 				error: toError(ex),
 				duration: performance.now() - start
@@ -1595,7 +1604,7 @@ var GitHostIntegration = class extends IntegrationBase {
 		const start = performance.now();
 		try {
 			const counts = await this.countProviderPullRequests?.(session, scopes, cancellation);
-			this.resetRequestExceptionCount("countPullRequests");
+			this.resetRequestExceptionCount("countPullRequests", connectionId);
 			return {
 				value: counts,
 				duration: performance.now() - start