@gitkraken/core-gitlens 0.16.1 → 0.16.2

package/dist/plus/integrations/providers/issueSorts.d.ts

@@ -1,5 +1,4 @@
 import { IssueSorting } from "../../../git/models/issue.js";
-import "../providerFilters.js";
 //#region ../plus/integrations/src/providers/issueSorts.d.ts
 /** GitHub and GHE: one `search` channel serves all three issue reads, so all three order the same way. */
 export declare const githubIssueSorts: IssueSorting[];

package/dist/plus/integrations/providers/providerApiClient.d.ts

@@ -0,0 +1,9 @@
+import { ProviderRequestFunction, ProviderRequestResponse } from "./models.js";
+import ProviderApis from "@gitkraken/provider-apis";
+//#region ../plus/integrations/src/providers/providerApiClient.d.ts
+type ProviderApisFactory = typeof ProviderApis;
+export declare const createProviderApis: ProviderApisFactory;
+export declare function createProviderApiRequest(fetch: (input: string | URL, init?: RequestInit) => Promise<Response>, userAgent?: string): ProviderRequestFunction;
+export declare function parseFetchResponseForApi<T>(response: Response, sentCredential?: () => boolean): Promise<ProviderRequestResponse<T>>;
+//#endregion
+//# sourceMappingURL=providerApiClient.d.ts.map

package/dist/plus/integrations/providers/providerApiClient.js

@@ -0,0 +1,66 @@
+import { getAuthenticatedUser } from "../errors.js";
+import { AnonymousResponseError, UnexpectedHtmlResponseError, getProviderResponseBodyMessage, markRequestError } from "./providerErrors.js";
+import ProviderApis from "@gitkraken/provider-apis";
+//#region ../plus/integrations/src/providers/providerApiClient.ts
+const createProviderApis = ProviderApis.default ?? ProviderApis;
+function createProviderApiRequest(fetch, userAgent) {
+	return async ({ url, ...options }) => {
+		try {
+			return await parseFetchResponseForApi(await fetch(url, {
+				...options,
+				headers: {
+					...userAgent != null ? { "User-Agent": userAgent } : {},
+					...options.headers
+				}
+			}), () => hasAuthorization(options.headers));
+		} catch (ex) {
+			throw markRequestError(ex);
+		}
+	};
+}
+async function parseFetchResponseForApi(response, sentCredential) {
+	const contentType = (response.headers.get("content-type") || "").toLowerCase();
+	if (response.status !== 401 && response.status !== 429 && response.status < 500 && getAuthenticatedUser(response.headers) === "anonymous" && sentCredential?.() === true) {
+		response.body?.cancel().catch(() => void 0);
+		throw new AnonymousResponseError(response.status, {
+			headers: Object.fromEntries(response.headers.entries()),
+			status: response.status
+		});
+	}
+	let body;
+	let servedHtml = false;
+	if (contentType.startsWith("application/json")) {
+		const text = await response.text();
+		if (text.trimStart().startsWith("<")) {
+			servedHtml = true;
+			body = text;
+		} else body = text.trim().length > 0 ? JSON.parse(text) : null;
+	} else if (contentType.startsWith("text/") || contentType === "") {
+		body = await response.text();
+		servedHtml = contentType.startsWith("text/html") && body.trim().length > 0;
+	} else if (contentType.startsWith("application/vnd.github.raw+json")) body = await response.arrayBuffer();
+	else throw new Error(`Unsupported content-type: ${contentType}`);
+	const result = {
+		body,
+		headers: Object.fromEntries(response.headers.entries()),
+		status: response.status,
+		statusText: response.statusText
+	};
+	if (response.ok && servedHtml) throw new UnexpectedHtmlResponseError(response.status, contentType, result);
+	if (!response.ok) {
+		const status = `(${response.status})${response.statusText ? ` ${response.statusText}` : ""}.`;
+		const detail = getProviderResponseBodyMessage(body);
+		const error = new Error(detail != null ? `${status} ${detail}` : status);
+		Object.assign(error, { response: result });
+		throw error;
+	}
+	return result;
+}
+function hasAuthorization(headers) {
+	if (headers == null) return false;
+	return Object.entries(headers).some(([name, value]) => name.toLowerCase() === "authorization" && Boolean(value));
+}
+//#endregion
+export { createProviderApiRequest, createProviderApis, parseFetchResponseForApi };
+
+//# sourceMappingURL=providerApiClient.js.map

package/dist/plus/integrations/providers/providerApiClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"providerApiClient.js","names":[],"sources":["../../../../../plus/integrations/src/providers/providerApiClient.ts"],"sourcesContent":["import ProviderApis from '@gitkraken/provider-apis';\nimport { getAuthenticatedUser } from '../errors.js';\nimport type { ProviderRequestFunction, ProviderRequestOptions, ProviderRequestResponse } from './models.js';\nimport {\n\tAnonymousResponseError,\n\tgetProviderResponseBodyMessage,\n\tmarkRequestError,\n\tUnexpectedHtmlResponseError,\n} from './providerErrors.js';\n\n// `@gitkraken/provider-apis` is published as CommonJS with its factory on the `default` export.\n// How that surfaces depends on the consuming bundler's CJS->ESM interop: esbuild yields the\n// callable factory directly, while webpack and Node surface the module namespace (with the\n// factory under `.default`). Normalize to the callable factory so every consumer resolves it.\ntype ProviderApisFactory = typeof ProviderApis;\nexport const createProviderApis: ProviderApisFactory =\n\t(ProviderApis as ProviderApisFactory & { default?: ProviderApisFactory }).default ?? ProviderApis;\n\nexport function createProviderApiRequest(\n\tfetch: (input: string | URL, init?: RequestInit) => Promise<Response>,\n\tuserAgent?: string,\n): ProviderRequestFunction {\n\treturn async <T>({ url, ...options }: ProviderRequestOptions): Promise<ProviderRequestResponse<T>> => {\n\t\ttry {\n\t\t\tconst response = await fetch(url, {\n\t\t\t\t...options,\n\t\t\t\theaders: { ...(userAgent != null ? { 'User-Agent': userAgent } : {}), ...options.headers },\n\t\t\t});\n\t\t\treturn await parseFetchResponseForApi<T>(response, () => hasAuthorization(options.headers));\n\t\t} catch (ex) {\n\t\t\tthrow markRequestError(ex);\n\t\t}\n\t};\n}\n\nexport async function parseFetchResponseForApi<T>(\n\tresponse: Response,\n\tsentCredential?: () => boolean,\n): Promise<ProviderRequestResponse<T>> {\n\t// Media types are case-insensitive (RFC 9110 §8.3.1) and `fetch` hands the header back exactly as the server\n\t// wrote it, so match on a lowercased copy rather than the raw value.\n\tconst contentType = (response.headers.get('content-type') || '').toLowerCase();\n\n\t// A credential the server served as the anonymous user was rejected, whatever the body says; reading it as data\n\t// reports an account with nothing in it (see `AnonymousResponseError`). Checked before the body is parsed, which\n\t// may itself fail. A 401 already fails as the credential's rejection, with its body, and a throttle or a server\n\t// failure keeps its own error: neither proves anything about the credential.\n\tif (\n\t\tresponse.status !== 401 &&\n\t\tresponse.status !== 429 &&\n\t\tresponse.status < 500 &&\n\t\tgetAuthenticatedUser(response.headers) === 'anonymous' &&\n\t\tsentCredential?.() === true\n\t) {\n\t\t// Released rather than left for the collector: an unread body holds its connection.\n\t\tvoid response.body?.cancel().catch(() => undefined);\n\t\tthrow new AnonymousResponseError(response.status, {\n\t\t\theaders: Object.fromEntries(response.headers.entries()),\n\t\t\tstatus: response.status,\n\t\t});\n\t}\n\n\tlet body;\n\tlet servedHtml = false;\n\n\t// parse the response body\n\tif (contentType.startsWith('application/json')) {\n\t\tconst text = await response.text();\n\t\t// A sign-in page a server mislabels as JSON is the same page under another header, and `<` can never open\n\t\t// valid JSON — so recognize it rather than letting JSON.parse throw a SyntaxError carrying no status.\n\t\tif (text.trimStart().startsWith('<')) {\n\t\t\tservedHtml = true;\n\t\t\tbody = text;\n\t\t} else {\n\t\t\tbody = text.trim().length > 0 ? JSON.parse(text) : null;\n\t\t}\n\t} else if (contentType.startsWith('text/') || contentType === '') {\n\t\tbody = await response.text();\n\t\t// An empty body is never a sign-in page, and a write answering `204` can carry a stale `text/html` from\n\t\t// whatever its endpoint usually returns — so require actual markup, not just the header.\n\t\tservedHtml = contentType.startsWith('text/html') && body.trim().length > 0;\n\t} else if (contentType.startsWith('application/vnd.github.raw+json')) {\n\t\tbody = await response.arrayBuffer();\n\t} else {\n\t\tthrow new Error(`Unsupported content-type: ${contentType}`);\n\t}\n\n\tconst result = {\n\t\tbody: body,\n\t\theaders: Object.fromEntries(response.headers.entries()),\n\t\tstatus: response.status,\n\t\tstatusText: response.statusText,\n\t};\n\n\t// A 2xx carrying a page rather than data is a rejected credential wearing a success status (GKDEV-3617); a\n\t// non-2xx keeps its own status error below, which is the better diagnostic.\n\tif (response.ok && servedHtml) {\n\t\tthrow new UnexpectedHtmlResponseError(response.status, contentType, result);\n\t}\n\n\t// throw an error if the response is not ok\n\tif (!response.ok) {\n\t\tconst status = `(${response.status})${response.statusText ? ` ${response.statusText}` : ''}.`;\n\t\tconst detail = getProviderResponseBodyMessage(body);\n\t\tconst error = new Error(detail != null ? `${status} ${detail}` : status);\n\t\tObject.assign(error, { response: result });\n\t\tthrow error;\n\t}\n\n\treturn result;\n}\n\nfunction hasAuthorization(headers: ProviderRequestOptions['headers']): boolean {\n\tif (headers == null) return false;\n\n\treturn Object.entries(headers).some(([name, value]) => name.toLowerCase() === 'authorization' && Boolean(value));\n}\n"],"mappings":";;;;AAeA,MAAa,qBACX,aAAyE,WAAW;AAEtF,SAAgB,yBACf,OACA,WAC0B;CAC1B,OAAO,OAAU,EAAE,KAAK,GAAG,cAA2E;EACrG,IAAI;GAKH,OAAO,MAAM,yBAA4B,MAJlB,MAAM,KAAK;IACjC,GAAG;IACH,SAAS;KAAE,GAAI,aAAa,OAAO,EAAE,cAAc,UAAU,IAAI,CAAC;KAAI,GAAG,QAAQ;IAAQ;GAC1F,CAAC,SACwD,iBAAiB,QAAQ,OAAO,CAAC;EAC3F,SAAS,IAAI;GACZ,MAAM,iBAAiB,EAAE;EAC1B;CACD;AACD;AAEA,eAAsB,yBACrB,UACA,gBACsC;CAGtC,MAAM,eAAe,SAAS,QAAQ,IAAI,cAAc,KAAK,GAAA,CAAI,YAAY;CAM7E,IACC,SAAS,WAAW,OACpB,SAAS,WAAW,OACpB,SAAS,SAAS,OAClB,qBAAqB,SAAS,OAAO,MAAM,eAC3C,iBAAiB,MAAM,MACtB;EAED,SAAc,MAAM,OAAO,CAAC,CAAC,YAAY,KAAA,CAAS;EAClD,MAAM,IAAI,uBAAuB,SAAS,QAAQ;GACjD,SAAS,OAAO,YAAY,SAAS,QAAQ,QAAQ,CAAC;GACtD,QAAQ,SAAS;EAClB,CAAC;CACF;CAEA,IAAI;CACJ,IAAI,aAAa;CAGjB,IAAI,YAAY,WAAW,kBAAkB,GAAG;EAC/C,MAAM,OAAO,MAAM,SAAS,KAAK;EAGjC,IAAI,KAAK,UAAU,CAAC,CAAC,WAAW,GAAG,GAAG;GACrC,aAAa;GACb,OAAO;EACR,OACC,OAAO,KAAK,KAAK,CAAC,CAAC,SAAS,IAAI,KAAK,MAAM,IAAI,IAAI;CAErD,OAAO,IAAI,YAAY,WAAW,OAAO,KAAK,gBAAgB,IAAI;EACjE,OAAO,MAAM,SAAS,KAAK;EAG3B,aAAa,YAAY,WAAW,WAAW,KAAK,KAAK,KAAK,CAAC,CAAC,SAAS;CAC1E,OAAO,IAAI,YAAY,WAAW,iCAAiC,GAClE,OAAO,MAAM,SAAS,YAAY;MAElC,MAAM,IAAI,MAAM,6BAA6B,aAAa;CAG3D,MAAM,SAAS;EACR;EACN,SAAS,OAAO,YAAY,SAAS,QAAQ,QAAQ,CAAC;EACtD,QAAQ,SAAS;EACjB,YAAY,SAAS;CACtB;CAIA,IAAI,SAAS,MAAM,YAClB,MAAM,IAAI,4BAA4B,SAAS,QAAQ,aAAa,MAAM;CAI3E,IAAI,CAAC,SAAS,IAAI;EACjB,MAAM,SAAS,IAAI,SAAS,OAAO,GAAG,SAAS,aAAa,IAAI,SAAS,eAAe,GAAG;EAC3F,MAAM,SAAS,+BAA+B,IAAI;EAClD,MAAM,QAAQ,IAAI,MAAM,UAAU,OAAO,GAAG,OAAO,GAAG,WAAW,MAAM;EACvE,OAAO,OAAO,OAAO,EAAE,UAAU,OAAO,CAAC;EACzC,MAAM;CACP;CAEA,OAAO;AACR;AAEA,SAAS,iBAAiB,SAAqD;CAC9E,IAAI,WAAW,MAAM,OAAO;CAE5B,OAAO,OAAO,QAAQ,OAAO,CAAC,CAAC,MAAM,CAAC,MAAM,WAAW,KAAK,YAAY,MAAM,mBAAmB,QAAQ,KAAK,CAAC;AAChH"}

package/dist/plus/integrations/providers/providersApi.d.ts

@@ -1,3 +1,4 @@
+import { Disposable } from "../../../utils/disposable.js";
 import { PagedResult } from "../../../utils/paging.js";
 import { IssueSorting } from "../../../git/models/issue.js";
 import { PullRequest, PullRequestFilter, PullRequestMergeMethod } from "../../../git/models/pullRequest.js";
@@ -6,21 +7,26 @@ import { GitCloudHostIntegrationId, GitSelfManagedHostIntegrationId, Integration
 import { ProviderOrganization } from "../results.js";
 import { ProviderPullRequestCount, ProviderPullRequestSearchPage } from "../models/pullRequestReads.js";
 import { IssueFilter } from "../providerFilters.js";
-import { GetIssuesOptions, GetPullRequestsForUserOptions, GetPullRequestsOptions, GetReposOptions, JiraIssuePage, PageInfo, PagingInput, PagingMode, ProviderAccount, ProviderApiCollectionResult, ProviderApiPagedResult, ProviderAzureProject, ProviderAzureResource, ProviderBitbucketResource, ProviderGitHubOrganization, ProviderGitLabGroup, ProviderHierarchyResult, ProviderIssue, ProviderJiraProject, ProviderJiraResource, ProviderJiraServerProject, ProviderLinearOrganization, ProviderLinearTeam, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, ProviderRepository, ProviderRequestResponse } from "./models.js";
+import { GetIssuesOptions, GetPullRequestsForUserOptions, GetPullRequestsOptions, GetReposOptions, JiraIssuePage, PageInfo, PagingInput, PagingMode, ProviderAccount, ProviderApiCollectionResult, ProviderApiPagedResult, ProviderAzureProject, ProviderAzureResource, ProviderBitbucketResource, ProviderGitHubOrganization, ProviderGitLabGroup, ProviderHierarchyResult, ProviderIssue, ProviderJiraProject, ProviderJiraResource, ProviderJiraServerProject, ProviderLinearOrganization, ProviderLinearTeam, ProviderPullRequest, ProviderRepoInput, ProviderReposInput, ProviderRepository } from "./models.js";
 import { AzurePullRequest, AzureWorkItemEtagRead } from "./azure/models.js";
 import { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
+import { AzureWorkItemDescriptionsCache } from "./azure/workItemDescriptions.js";
 import { countBitbucketServerPullRequests, searchBitbucketServerPullRequestsPage } from "./bitbucket-server/pullRequestSearch.js";
 import { JiraIssueEtagResponse } from "./jiraIssueByKey.js";
 import { LinearIssueEtagNode } from "./linearIssuesEtag.js";
 import { IntegrationAuthenticationService } from "../authentication/integrationAuthenticationService.js";
 import { CollectionMetadata, GitIssueState, GitPullRequestState, TrelloBoard, TrelloList } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/providers/providersApi.d.ts
-export declare class ProvidersApi {
+export declare class ProvidersApi implements Disposable {
   private readonly authenticationService;
   private readonly azureWorkItemTypeStates;
+  private readonly azureWorkItemDescriptions;
   private readonly providers;
   private readonly request;
-  constructor(authenticationService: IntegrationAuthenticationService, azureWorkItemTypeStates?: AzureWorkItemStatesCache);
+  private azureRestApi;
+  private readonly disposable;
+  constructor(authenticationService: IntegrationAuthenticationService, azureWorkItemTypeStates?: AzureWorkItemStatesCache, azureWorkItemDescriptions?: AzureWorkItemDescriptionsCache);
+  dispose(): void;
   getScopesForProvider(providerId: IntegrationIds): string[] | undefined;
   getProviderDomain(providerId: IntegrationIds): string | undefined;
   getProviderPullRequestsPagingMode(providerId: IntegrationIds): PagingMode | undefined;
@@ -102,6 +108,7 @@ export declare class ProvidersApi {
     isPAT?: boolean;
     baseUrl?: string;
   }): Promise<ProviderIssue | undefined>;
+  private getAzureRestResource;
   /**
    * One Azure DevOps work item by id, converted as provider-apis converts its list rows (see
    * {@link fromAzureWorkItemToProviderIssue}). provider-apis has no single work item read, so this asks Azure
@@ -347,11 +354,6 @@ export declare class ProvidersApi {
   }): Promise<ProviderApiPagedResult<ProviderIssue>>;
   private azureStatesScope;
   private readAzureStatesMetadata;
-  /**
-   * The organization's rich text fields a work item's description may come from, as provider-apis reads them for
-   * its list rows. Best-effort: `undefined` on any failure, which leaves the description to the built-in fields
-   * rather than failing the work item. Logged for every failure, a body that isn't a catalog included.
-   */
   private getAzureWorkItemHtmlFields;
   private getAzureTypeStates;
   private getAzureProjectWorkItemStates;
@@ -451,6 +453,5 @@ export declare class ProvidersApi {
     baseUrl?: string;
   }): Promise<ProviderIssue | undefined>;
 }
-export declare function parseFetchResponseForApi<T>(response: Response, sentCredential?: () => boolean): Promise<ProviderRequestResponse<T>>;
 //#endregion
 //# sourceMappingURL=providersApi.d.ts.map

package/dist/plus/integrations/providers/providersApi.js

@@ -2,22 +2,23 @@ import { Logger as _logger } from "../../../utils/logger.js";
 import { mapSettledBounded } from "../../../utils/promise.js";
 import { RequestNotFoundError } from "../../../git/errors.js";
 import { base64 } from "../../../utils/base64.js";
-import { getAuthenticatedUser, toError } from "../errors.js";
+import { toError } from "../errors.js";
 import "../constants.js";
-import { AnonymousResponseError, UnexpectedHtmlResponseError, getProviderResponseBodyMessage, isAzureProviderId, isProviderIssueNotFoundError, markRequestError, throwProviderError } from "./providerErrors.js";
+import { isAzureProviderId, isProviderIssueNotFoundError, throwProviderError } from "./providerErrors.js";
 import { isIncompleteCollection, toCollectionScopeFailure, withValidSkippedItems } from "../collectionMetadata.js";
 import { toTokenWithInfo } from "../authentication/models.js";
 import { collectProviderPagedResult, mergeCollectionMetadata, parsePageCursor, toPageCursor } from "./utils/providerPaging.js";
 import { isRepoIdsInput, providersMetadata } from "./models.js";
 import { azureIssueStateCategory, azureWorkItemEtagFieldNames, encodeAzurePathSegment, fromAzureWorkItemToProviderIssue, toAzureWorkItemDescriptionFields } from "./azure/models.js";
-import { AzureWorkItemStatesCache, getAzureWorkItemFieldsPath, getAzureWorkItemTypeStatesUrl, getAzureWorkItemTypesUrl } from "./azure/workItemStateCategories.js";
+import { AzureWorkItemDescriptionsCache } from "./azure/workItemDescriptions.js";
+import { AzureWorkItemStatesCache, getAzureWorkItemTypeStatesUrl, getAzureWorkItemTypesUrl, requireAzureWorkItemStateCategories, resolveAzureWorkItemStateCategory } from "./azure/workItemStateCategories.js";
+import { createProviderApiRequest, createProviderApis } from "./providerApiClient.js";
 import { requestJiraIssueByKey, requestJiraIssuesEtagFields } from "./jiraIssueByKey.js";
 import { requestLinearIssuesEtagFields } from "./linearIssuesEtag.js";
 import { requestBitbucketServerProjects, requestBitbucketServerRepositories } from "./bitbucket-server/discovery.js";
 import { countBitbucketServerPullRequests, searchBitbucketServerPullRequestsPage } from "./bitbucket-server/pullRequestSearch.js";
-import ProviderApis, { GitIssueState, needsAzureWorkItemHtmlFields } from "@gitkraken/provider-apis";
+import { GitIssueState } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/providers/providersApi.ts
-const createProviderApis = ProviderApis.default ?? ProviderApis;
 const repoNotFoundMessage = /^Repository .+ not found$/i;
 function isGraphQLErrors(ex) {
 	return ex instanceof Error && Array.isArray(ex.graphQLErrors);
@@ -120,31 +121,41 @@ function toJiraIssuePage(result) {
 		...result.metadata != null ? { metadata: withValidSkippedItems(result.metadata) } : {}
 	};
 }
+function createAzureProviderInfo(id, azure) {
+	return {
+		...providersMetadata[id],
+		provider: azure,
+		getRepoOfProjectFn: azure.getRepo.bind(azure),
+		getCurrentUserFn: azure.getCurrentUser.bind(azure),
+		getCurrentUserForInstanceFn: azure.getCurrentUserForInstance.bind(azure),
+		getAzureResourcesForUserFn: id === "azureDevOps" ? azure.getOrgsForUser.bind(azure) : azure.getCollectionsForUser.bind(azure),
+		getAzureProjectsForResourceFn: azure.getAzureProjects.bind(azure),
+		getPullRequestsForReposFn: azure.getPullRequestsForRepos.bind(azure),
+		getPullRequestsForRepoFn: azure.getPullRequestsForRepo.bind(azure),
+		getPullRequestForRepoFn: azure.getPullRequestForRepo.bind(azure),
+		getPullRequestsForAzureProjectsFn: azure.getPullRequestsForProjects.bind(azure),
+		getPullRequestsForAzureProjectFn: azure.getPullRequestsForProject.bind(azure),
+		getIssuesForAzureProjectFn: azure.getIssuesForAzureProject.bind(azure),
+		getReposForAzureProjectFn: azure.getReposForAzureProject.bind(azure),
+		mergePullRequestFn: azure.mergePullRequest.bind(azure)
+	};
+}
 var ProvidersApi = class {
 	authenticationService;
 	azureWorkItemTypeStates;
+	azureWorkItemDescriptions;
 	providers;
 	request;
-	constructor(authenticationService, azureWorkItemTypeStates = new AzureWorkItemStatesCache()) {
+	azureRestApi;
+	disposable;
+	constructor(authenticationService, azureWorkItemTypeStates = new AzureWorkItemStatesCache(), azureWorkItemDescriptions = new AzureWorkItemDescriptionsCache()) {
 		this.authenticationService = authenticationService;
 		this.azureWorkItemTypeStates = azureWorkItemTypeStates;
+		this.azureWorkItemDescriptions = azureWorkItemDescriptions;
 		const http = authenticationService.ctx.http;
-		const userAgent = http.userAgent;
-		const customFetch = async ({ url, ...options }) => {
-			try {
-				return await parseFetchResponseForApi(await http.fetch(url, {
-					...options,
-					headers: {
-						"User-Agent": userAgent,
-						...options.headers
-					}
-				}), () => hasAuthorization(options.headers));
-			} catch (ex) {
-				throw markRequestError(ex);
-			}
-		};
-		this.request = customFetch;
-		const providerApis = createProviderApis({ request: customFetch });
+		this.request = createProviderApiRequest((input, init) => http.fetch(input, init), http.userAgent);
+		const providerApis = createProviderApis({ request: this.request });
+		this.azureRestApi = providerApis.azureDevOps;
 		this.providers = {
 			["github"]: {
 				...providersMetadata["github"],
@@ -228,40 +239,8 @@ var ProvidersApi = class {
 				getPullRequestsForRepoFn: providerApis.bitbucketServer.getPullRequestsForRepo.bind(providerApis.bitbucketServer),
 				mergePullRequestFn: providerApis.bitbucketServer.mergePullRequest.bind(providerApis.bitbucketServer)
 			},
-			["azureDevOps"]: {
-				...providersMetadata["azureDevOps"],
-				provider: providerApis.azureDevOps,
-				getRepoOfProjectFn: providerApis.azureDevOps.getRepo.bind(providerApis.azureDevOps),
-				getCurrentUserFn: providerApis.azureDevOps.getCurrentUser.bind(providerApis.azureDevOps),
-				getCurrentUserForInstanceFn: providerApis.azureDevOps.getCurrentUserForInstance.bind(providerApis.azureDevOps),
-				getAzureResourcesForUserFn: providerApis.azureDevOps.getOrgsForUser.bind(providerApis.azureDevOps),
-				getAzureProjectsForResourceFn: providerApis.azureDevOps.getAzureProjects.bind(providerApis.azureDevOps),
-				getPullRequestsForReposFn: providerApis.azureDevOps.getPullRequestsForRepos.bind(providerApis.azureDevOps),
-				getPullRequestsForRepoFn: providerApis.azureDevOps.getPullRequestsForRepo.bind(providerApis.azureDevOps),
-				getPullRequestForRepoFn: providerApis.azureDevOps.getPullRequestForRepo.bind(providerApis.azureDevOps),
-				getPullRequestsForAzureProjectsFn: providerApis.azureDevOps.getPullRequestsForProjects.bind(providerApis.azureDevOps),
-				getPullRequestsForAzureProjectFn: providerApis.azureDevOps.getPullRequestsForProject.bind(providerApis.azureDevOps),
-				getIssuesForAzureProjectFn: providerApis.azureDevOps.getIssuesForAzureProject.bind(providerApis.azureDevOps),
-				getReposForAzureProjectFn: providerApis.azureDevOps.getReposForAzureProject.bind(providerApis.azureDevOps),
-				mergePullRequestFn: providerApis.azureDevOps.mergePullRequest.bind(providerApis.azureDevOps)
-			},
-			["azure-devops-server"]: {
-				...providersMetadata["azure-devops-server"],
-				provider: providerApis.azureDevOps,
-				getRepoOfProjectFn: providerApis.azureDevOps.getRepo.bind(providerApis.azureDevOps),
-				getCurrentUserFn: providerApis.azureDevOps.getCurrentUser.bind(providerApis.azureDevOps),
-				getCurrentUserForInstanceFn: providerApis.azureDevOps.getCurrentUserForInstance.bind(providerApis.azureDevOps),
-				getAzureResourcesForUserFn: providerApis.azureDevOps.getCollectionsForUser.bind(providerApis.azureDevOps),
-				getAzureProjectsForResourceFn: providerApis.azureDevOps.getAzureProjects.bind(providerApis.azureDevOps),
-				getPullRequestsForReposFn: providerApis.azureDevOps.getPullRequestsForRepos.bind(providerApis.azureDevOps),
-				getPullRequestsForRepoFn: providerApis.azureDevOps.getPullRequestsForRepo.bind(providerApis.azureDevOps),
-				getPullRequestForRepoFn: providerApis.azureDevOps.getPullRequestForRepo.bind(providerApis.azureDevOps),
-				getPullRequestsForAzureProjectsFn: providerApis.azureDevOps.getPullRequestsForProjects.bind(providerApis.azureDevOps),
-				getPullRequestsForAzureProjectFn: providerApis.azureDevOps.getPullRequestsForProject.bind(providerApis.azureDevOps),
-				getIssuesForAzureProjectFn: providerApis.azureDevOps.getIssuesForAzureProject.bind(providerApis.azureDevOps),
-				getReposForAzureProjectFn: providerApis.azureDevOps.getReposForAzureProject.bind(providerApis.azureDevOps),
-				mergePullRequestFn: providerApis.azureDevOps.mergePullRequest.bind(providerApis.azureDevOps)
-			},
+			["azureDevOps"]: createAzureProviderInfo("azureDevOps", providerApis.azureDevOps),
+			["azure-devops-server"]: createAzureProviderInfo("azure-devops-server", providerApis.azureDevOps),
 			["jira"]: {
 				...providersMetadata["jira"],
 				provider: providerApis.jira,
@@ -305,6 +284,17 @@ var ProvidersApi = class {
 				getTrelloLabelsForBoardFn: providerApis.trello.getLabelsForBoard.bind(providerApis.trello)
 			}
 		};
+		this.disposable = authenticationService.ctx.config?.onDidChange((e) => {
+			if (!e.httpProxy) return;
+			this.azureWorkItemTypeStates.clear();
+			this.azureWorkItemDescriptions.clear();
+			this.azureRestApi = createProviderApis({ request: this.request }).azureDevOps;
+			this.providers["azureDevOps"] = createAzureProviderInfo("azureDevOps", this.azureRestApi);
+			this.providers["azure-devops-server"] = createAzureProviderInfo("azure-devops-server", this.azureRestApi);
+		});
+	}
+	dispose() {
+		this.disposable?.dispose();
 	}
 	getScopesForProvider(providerId) {
 		return this.providers[providerId]?.scopes;
@@ -559,10 +549,11 @@ var ProvidersApi = class {
 		};
 		let memberOf;
 		try {
+			const resource = await this.getAzureRestResource(tokenWithInfo, namespace, "identities", options, "5.0");
 			const params = new URLSearchParams({
 				identityIds: userId,
 				queryMembership: "Expanded",
-				"api-version": "5.0"
+				"api-version": resource.apiVersion
 			});
 			memberOf = (await this.request({
 				url: `${base}/_apis/identities?${params.toString()}`,
@@ -577,9 +568,10 @@ var ProvidersApi = class {
 		for (let i = 0; i < memberOf.length; i += azureIdentityBatchSize) chunks.push(memberOf.slice(i, i + azureIdentityBatchSize));
 		const batches = [];
 		try {
+			const resource = await this.getAzureRestResource(tokenWithInfo, namespace, "identityBatch", options, "5.0-preview.1");
 			for (const descriptors of chunks) {
 				const batch = await this.request({
-					url: `${base}/_apis/identitybatch?api-version=5.0-preview.1`,
+					url: `${base}/_apis/identitybatch?api-version=${resource.apiVersion}`,
 					method: "POST",
 					headers,
 					body: JSON.stringify({
@@ -624,6 +616,23 @@ var ProvidersApi = class {
 			return this.handleProviderError(tokenWithInfo, e);
 		}
 	}
+	async getAzureRestResource(token, namespace, resource, options, version) {
+		try {
+			encodeAzurePathSegment(namespace);
+			const result = await this.azureRestApi.getRestApiResource({
+				namespace,
+				resource,
+				version
+			}, {
+				...options,
+				token: token.accessToken
+			});
+			if (result == null) throw new Error(`Azure DevOps REST resource ${resource} is unavailable`);
+			return result;
+		} catch (ex) {
+			return this.handleProviderError(token, ex);
+		}
+	}
 	/**
 	* One Azure DevOps work item by id, converted as provider-apis converts its list rows (see
 	* {@link fromAzureWorkItemToProviderIssue}). provider-apis has no single work item read, so this asks Azure
@@ -635,30 +644,39 @@ var ProvidersApi = class {
 	* shape, an empty response, a work item the SDK's conversion would skip, and one in another project.
 	*/
 	async getAzureWorkItem(tokenOptInfo, scope, id, options) {
-		const { tokenWithInfo } = await this.ensureProviderToken(tokenOptInfo);
+		const { tokenWithInfo: providedToken } = await this.ensureProviderToken(tokenOptInfo);
+		const tokenWithInfo = { ...providedToken };
 		const token = tokenWithInfo.accessToken;
 		const baseUrl = (options.baseUrl ?? azureDevOpsBaseUrl).replace(/\/$/, "");
+		const requestOptions = {
+			baseUrl,
+			isPAT: options.isPAT ?? false
+		};
+		const encodedProject = encodeAzurePathSegment(scope.project);
+		const resource = await this.getAzureRestResource(tokenWithInfo, scope.namespace, "workItems", requestOptions);
 		const params = new URLSearchParams({
 			$expand: "Links",
-			"api-version": "6.0"
+			"api-version": resource.apiVersion
 		});
-		const url = `${baseUrl}/${encodeAzurePathSegment(scope.namespace)}/${encodeAzurePathSegment(scope.project)}/_apis/wit/workitems/${id}?${params.toString()}`;
+		const projectPath = resource.projectScoped ? `/${encodedProject}` : "";
+		const url = `${baseUrl}/${encodeAzurePathSegment(scope.namespace)}${projectPath}/_apis/wit/workitems/${id}?${params.toString()}`;
 		let workItem;
 		try {
 			workItem = (await this.request({
 				url,
-				headers: { Authorization: azureAuthorization(token, options.isPAT) }
+				headers: { Authorization: azureAuthorization(token, requestOptions.isPAT) }
 			})).body;
 		} catch (e) {
 			if (isAzureNotFoundResponse(e, azureWorkItemNotFoundTypeKeys)) return void 0;
 			return this.handleProviderError(tokenWithInfo, e);
 		}
+		const project = workItem?.fields?.["System.TeamProject"];
+		if (typeof project !== "string" || !project.trim()) throw new Error(`Azure DevOps work item ${id} has no project`);
+		if (project.toLowerCase() !== scope.project.toLowerCase()) throw new Error(`Azure DevOps work item ${id} is in project '${project}', not '${scope.project}'`);
 		const issue = workItem != null ? fromAzureWorkItemToProviderIssue(workItem, scope.namespace, scope.project) : void 0;
 		if (issue == null) throw new Error(`Azure DevOps returned no readable work item ${id}`);
-		const project = workItem?.fields?.["System.TeamProject"];
-		if (typeof project === "string" && project.toLowerCase() !== scope.project.toLowerCase()) throw new Error(`Azure DevOps work item ${id} is in project '${project}', not '${scope.project}'`);
-		const [htmlFields] = await Promise.all([needsAzureWorkItemHtmlFields(workItem?.fields) ? this.getAzureWorkItemHtmlFields(tokenWithInfo, scope.namespace, options) : void 0, this.classifyAzureIssueStates([issue], tokenWithInfo, scope.namespace, scope.project, options)]);
-		if (htmlFields != null) Object.assign(issue, toAzureWorkItemDescriptionFields(workItem?.fields, htmlFields));
+		const [htmlFields] = await Promise.all([this.getAzureWorkItemHtmlFields(tokenWithInfo, scope, workItem?.fields, requestOptions), this.classifyAzureIssueStates([issue], tokenWithInfo, scope.namespace, scope.project, requestOptions)]);
+		Object.assign(issue, toAzureWorkItemDescriptionFields(workItem?.fields, htmlFields));
 		return issue;
 	}
 	/**
@@ -674,8 +692,11 @@ var ProvidersApi = class {
 		const { tokenWithInfo } = await this.ensureProviderToken(tokenOptInfo);
 		const token = tokenWithInfo.accessToken;
 		const baseUrl = (options.baseUrl ?? azureDevOpsBaseUrl).replace(/\/$/, "");
-		const query = `ids=${ids.join(",")}&fields=${azureWorkItemEtagFieldNames.join(",")}&errorPolicy=omit&api-version=6.0`;
-		const url = `${baseUrl}/${encodeAzurePathSegment(scope.namespace)}/${encodeAzurePathSegment(scope.project)}/_apis/wit/workitems?${query}`;
+		const encodedProject = encodeAzurePathSegment(scope.project);
+		const resource = await this.getAzureRestResource(tokenWithInfo, scope.namespace, "workItems", options);
+		const query = `ids=${ids.join(",")}&fields=${azureWorkItemEtagFieldNames.join(",")}&errorPolicy=omit&api-version=${resource.apiVersion}`;
+		const projectPath = resource.projectScoped ? `/${encodedProject}` : "";
+		const url = `${baseUrl}/${encodeAzurePathSegment(scope.namespace)}${projectPath}/_apis/wit/workitems?${query}`;
 		try {
 			const workItems = (await this.request({
 				url,
@@ -709,7 +730,11 @@ var ProvidersApi = class {
 	async getAzurePullRequest(tokenOptInfo, repo, id, options) {
 		const { tokenWithInfo } = await this.ensureProviderToken(tokenOptInfo);
 		const token = tokenWithInfo.accessToken;
-		const url = `${(options.baseUrl ?? azureDevOpsBaseUrl).replace(/\/$/, "")}/${encodeAzurePathSegment(repo.namespace)}/${encodeAzurePathSegment(repo.project)}/_apis/git/repositories/${encodeAzurePathSegment(repo.name)}/pullrequests/${id}?api-version=6.0`;
+		const baseUrl = (options.baseUrl ?? azureDevOpsBaseUrl).replace(/\/$/, "");
+		encodeAzurePathSegment(repo.project);
+		encodeAzurePathSegment(repo.name);
+		const resource = await this.getAzureRestResource(tokenWithInfo, repo.namespace, "pullRequests", options);
+		const url = `${baseUrl}/${encodeAzurePathSegment(repo.namespace)}/${encodeAzurePathSegment(repo.project)}/_apis/git/repositories/${encodeAzurePathSegment(repo.name)}/pullrequests/${id}?api-version=${resource.apiVersion}`;
 		try {
 			const result = await this.request({
 				url,
@@ -1127,7 +1152,8 @@ var ProvidersApi = class {
 	}
 	async getIssuesForAzureProject(tokenOptInfo, namespace, project, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getIssuesForAzureProjectFn");
-		const workItemTypeStates = options?.states?.includes(GitIssueState.Open) && options.states.includes(GitIssueState.Closed) ? void 0 : await this.getAzureProjectWorkItemStates(tokenWithInfo, namespace, project, options);
+		const workflow = options?.states?.includes(GitIssueState.Open) && options.states.includes(GitIssueState.Closed) ? void 0 : await this.getAzureProjectWorkItemStates(tokenWithInfo, namespace, project, options);
+		const workItemTypeStates = workflow?.selection;
 		const page = await this.getPagedResult({
 			namespace,
 			project,
@@ -1146,7 +1172,7 @@ var ProvidersApi = class {
 			}
 		};
 		try {
-			await this.classifyAzureIssueStates(result.values, tokenWithInfo, namespace, project, options, workItemTypeStates);
+			await this.classifyAzureIssueStates(result.values, tokenWithInfo, namespace, project, options, workflow?.types);
 		} catch (ex) {
 			return {
 				...result,
@@ -1189,22 +1215,36 @@ var ProvidersApi = class {
 			return this.handleProviderError(token, ex);
 		}
 	}
-	/**
-	* The organization's rich text fields a work item's description may come from, as provider-apis reads them for
-	* its list rows. Best-effort: `undefined` on any failure, which leaves the description to the built-in fields
-	* rather than failing the work item. Logged for every failure, a body that isn't a catalog included.
-	*/
-	async getAzureWorkItemHtmlFields(token, namespace, options) {
-		const scope = this.azureStatesScope(token, namespace, "", options);
+	async getAzureWorkItemHtmlFields(tokenWithInfo, scope, fields, requestOptions) {
+		const token = tokenWithInfo.accessToken;
+		const baseUrl = requestOptions.baseUrl;
 		try {
-			return await this.azureWorkItemTypeStates.getHtmlFields(scope, () => this.readAzureStatesMetadata(token, `${scope.baseUrl.replace(/\/$/, "")}/${getAzureWorkItemFieldsPath(namespace)}`, scope.isPAT));
+			return await this.azureWorkItemDescriptions.getFields(fields, {
+				baseUrl,
+				namespace: scope.namespace,
+				token,
+				isPAT: requestOptions.isPAT
+			}, async () => {
+				const resource = await this.getAzureRestResource(tokenWithInfo, scope.namespace, "fields", requestOptions);
+				return (await this.request({
+					url: `${baseUrl}/${encodeAzurePathSegment(scope.namespace)}/_apis/wit/fields?api-version=${resource.apiVersion}`,
+					headers: { Authorization: azureAuthorization(token, requestOptions.isPAT) }
+				})).body;
+			});
 		} catch (ex) {
-			_logger.warn(`Unable to read the Azure DevOps field catalog of '${namespace}': ${String(ex)}`);
-			return;
+			_logger.warn(`Unable to read the Azure DevOps field catalog of '${scope.namespace}': ${String(ex)}`);
+			return [];
 		}
 	}
 	getAzureTypeStates(token, scope, type) {
-		return this.azureWorkItemTypeStates.getStates(scope, type, () => this.readAzureStatesMetadata(token, getAzureWorkItemTypeStatesUrl(scope.baseUrl, scope.namespace, scope.project, type), scope.isPAT));
+		return this.azureWorkItemTypeStates.getStates(scope, type, async () => {
+			const resource = await this.getAzureRestResource(token, scope.namespace, "workItemTypeStates", scope);
+			return this.readAzureStatesMetadata(token, getAzureWorkItemTypeStatesUrl(scope.baseUrl, scope.namespace, scope.project, type, resource.apiVersion), scope.isPAT);
+		}, void 0, async () => {
+			const resource = await this.getAzureRestResource(token, scope.namespace, "backlogConfiguration", scope);
+			const path = `${encodeAzurePathSegment(scope.namespace)}/${encodeAzurePathSegment(scope.project)}/_apis/work/backlogconfiguration`;
+			return this.readAzureStatesMetadata(token, `${scope.baseUrl.replace(/\/$/, "")}/${path}?api-version=${resource.apiVersion}`, scope.isPAT);
+		});
 	}
 	async getAzureProjectWorkItemStates(token, namespace, project, options) {
 		const scope = this.azureStatesScope(token, namespace, project, options);
@@ -1215,45 +1255,65 @@ var ProvidersApi = class {
 		};
 		let types;
 		try {
-			types = await this.azureWorkItemTypeStates.getTypes(scope, () => this.readAzureStatesMetadata(token, getAzureWorkItemTypesUrl(scope.baseUrl, namespace, project), scope.isPAT));
+			types = await this.azureWorkItemTypeStates.getTypes(scope, async () => {
+				const resource = await this.getAzureRestResource(token, namespace, "workItemTypes", scope);
+				return this.readAzureStatesMetadata(token, getAzureWorkItemTypesUrl(scope.baseUrl, namespace, project, resource.apiVersion), scope.isPAT);
+			});
 		} catch (ex) {
 			return {
-				types: [],
-				metadata: {
-					completeness: "partial",
-					failures: [toCollectionScopeFailure(failureScope, ex)]
-				}
+				selection: {
+					types: [],
+					metadata: {
+						completeness: "partial",
+						failures: [toCollectionScopeFailure(failureScope, ex)]
+					}
+				},
+				types: /* @__PURE__ */ new Map()
 			};
 		}
-		const results = await mapSettledBounded(types, 6, async (type) => ({
-			name: type,
-			states: await this.getAzureTypeStates(token, scope, type)
-		}));
+		const statesByType = new Map(types.map((type) => [type, void 0]));
+		const results = await mapSettledBounded(types, 6, async (type) => {
+			const states = await this.getAzureTypeStates(token, scope, type);
+			statesByType.set(type, states);
+			return {
+				name: type,
+				states: requireAzureWorkItemStateCategories(states)
+			};
+		});
 		const failures = results.flatMap((r) => r.status === "rejected" ? [toCollectionScopeFailure(failureScope, r.reason)] : []);
 		return {
-			types: results.map((r, i) => r.status === "fulfilled" ? r.value : { name: types[i] }),
-			...failures.length ? { metadata: {
-				completeness: "partial",
-				failures
-			} } : {}
+			selection: {
+				types: results.map((r, i) => r.status === "fulfilled" ? r.value : { name: types[i] }),
+				...failures.length ? { metadata: {
+					completeness: "partial",
+					failures
+				} } : {}
+			},
+			types: statesByType
 		};
 	}
 	async classifyAzureIssueStates(issues, tokenWithInfo, namespace, project, options, snapshot) {
 		const scope = this.azureStatesScope(tokenWithInfo, namespace, project, options);
-		const snapshotTypes = new Map(snapshot?.types.map((type) => [type.name, type.states]));
+		const snapshotTypes = new Map(snapshot);
 		const types = [...new Set(issues.flatMap((i) => i.state?.name && i.type && !snapshotTypes.has(i.type) ? [i.type] : []))];
 		const results = await mapSettledBounded(types, 6, async (type) => [type, await this.getAzureTypeStates(tokenWithInfo, scope, type)]);
 		const statesByType = new Map([...snapshotTypes, ...results.flatMap((r) => r.status === "fulfilled" ? [r.value] : [])]);
+		let categoryError;
 		for (const issue of issues) {
 			const states = issue.type ? statesByType.get(issue.type) : void 0;
 			if (states == null || issue.state == null) continue;
-			issue.state = {
-				...issue.state,
-				category: azureIssueStateCategory(states.find((s) => s.name === issue.state?.name)?.category)
-			};
+			try {
+				issue.state = {
+					...issue.state,
+					category: azureIssueStateCategory(resolveAzureWorkItemStateCategory(states, issue.state.name))
+				};
+			} catch (ex) {
+				categoryError ??= toError(ex);
+			}
 		}
 		const failure = results.find((r) => r.status === "rejected");
 		if (failure?.status === "rejected") throw failure.reason;
+		if (categoryError != null) throw categoryError;
 	}
 	async getIssuesForProject(tokenOptInfo, project, resourceId, options) {
 		const { provider, tokenWithInfo } = await this.ensureProviderTokenAndFunction(tokenOptInfo, "getIssuesForProjectFn");
@@ -1505,49 +1565,7 @@ var ProvidersApi = class {
 		}
 	}
 };
-async function parseFetchResponseForApi(response, sentCredential) {
-	const contentType = (response.headers.get("content-type") || "").toLowerCase();
-	if (response.status !== 401 && response.status !== 429 && response.status < 500 && getAuthenticatedUser(response.headers) === "anonymous" && sentCredential?.() === true) {
-		response.body?.cancel().catch(() => void 0);
-		throw new AnonymousResponseError(response.status, {
-			headers: Object.fromEntries(response.headers.entries()),
-			status: response.status
-		});
-	}
-	let body;
-	let servedHtml = false;
-	if (contentType.startsWith("application/json")) {
-		const text = await response.text();
-		if (text.trimStart().startsWith("<")) {
-			servedHtml = true;
-			body = text;
-		} else body = text.trim().length > 0 ? JSON.parse(text) : null;
-	} else if (contentType.startsWith("text/") || contentType === "") {
-		body = await response.text();
-		servedHtml = contentType.startsWith("text/html") && body.trim().length > 0;
-	} else if (contentType.startsWith("application/vnd.github.raw+json")) body = await response.arrayBuffer();
-	else throw new Error(`Unsupported content-type: ${contentType}`);
-	const result = {
-		body,
-		headers: Object.fromEntries(response.headers.entries()),
-		status: response.status,
-		statusText: response.statusText
-	};
-	if (response.ok && servedHtml) throw new UnexpectedHtmlResponseError(response.status, contentType, result);
-	if (!response.ok) {
-		const status = `(${response.status})${response.statusText ? ` ${response.statusText}` : ""}.`;
-		const detail = getProviderResponseBodyMessage(body);
-		const error = new Error(detail != null ? `${status} ${detail}` : status);
-		Object.assign(error, { response: result });
-		throw error;
-	}
-	return result;
-}
-function hasAuthorization(headers) {
-	if (headers == null) return false;
-	return Object.entries(headers).some(([name, value]) => name.toLowerCase() === "authorization" && Boolean(value));
-}
 //#endregion
-export { ProvidersApi, parseFetchResponseForApi };
+export { ProvidersApi };
 
 //# sourceMappingURL=providersApi.js.map