@gitkraken/core-gitlens 0.16.0 → 0.16.2

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

@@ -1,6 +1,7 @@
 import { Disposable } from "../../../utils/disposable.js";
 import { GitHubApi } from "../../git-github/api/github.js";
 import { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
+import { AzureWorkItemDescriptionsCache } from "./azure/workItemDescriptions.js";
 import { AzureDevOpsApi } from "./azure/azure.js";
 import { BitbucketApi } from "./bitbucket/bitbucket.js";
 import "./github/github.js";
@@ -15,6 +16,7 @@ import { IntegrationServiceContext } from "../context.js";
  */
 export interface ApiClients {
   readonly azureWorkItemStates: AzureWorkItemStatesCache;
+  readonly azureWorkItemDescriptions: AzureWorkItemDescriptionsCache;
   readonly github: Promise<GitHubApi | undefined>;
   readonly gitlab: Promise<GitLabApi | undefined>;
   readonly bitbucket: Promise<BitbucketApi | undefined>;

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

@@ -1,4 +1,5 @@
 import { getScopedLogger } from "../../../utils/logger.scoped.js";
+import { AzureWorkItemDescriptionsCache } from "./azure/workItemDescriptions.js";
 import { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
 //#region ../plus/integrations/src/providers/apiClients.ts
 /**
@@ -8,9 +9,16 @@ import { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
 */
 function createApiClients(ctx, disposables) {
 	const azureWorkItemStates = new AzureWorkItemStatesCache();
+	const azureWorkItemDescriptions = new AzureWorkItemDescriptionsCache();
 	disposables.push(ctx.config.onDidChange((e) => {
-		if (e.httpProxy) azureWorkItemStates.clear();
-	}), { dispose: () => azureWorkItemStates.clear() });
+		if (e.httpProxy) {
+			azureWorkItemStates.clear();
+			azureWorkItemDescriptions.clear();
+		}
+	}), { dispose: () => {
+		azureWorkItemStates.clear();
+		azureWorkItemDescriptions.clear();
+	} });
 	let github;
 	let gitlab;
 	let bitbucket;
@@ -28,6 +36,7 @@ function createApiClients(ctx, disposables) {
 	};
 	return {
 		azureWorkItemStates,
+		azureWorkItemDescriptions,
 		get github() {
 			return github ??= build(async () => (await import(
 				/* webpackChunkName: "integrations" */
@@ -50,7 +59,7 @@ function createApiClients(ctx, disposables) {
 			return azure ??= build(async () => (await import(
 				/* webpackChunkName: "integrations" */
 				"./azure/azure.js"
-)).createAzureDevOpsApi(ctx, azureWorkItemStates));
+)).createAzureDevOpsApi(ctx, azureWorkItemStates, azureWorkItemDescriptions));
 		}
 	};
 }

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

@@ -1 +1 @@
-{"version":3,"file":"apiClients.js","names":[],"sources":["../../../../../plus/integrations/src/providers/apiClients.ts"],"sourcesContent":["import type { Disposable } from '@gitlens/utils/disposable.js';\nimport { getScopedLogger } from '@gitlens/utils/logger.scoped.js';\nimport type { IntegrationServiceContext } from '../context.js';\nimport type { AzureDevOpsApi } from './azure/azure.js';\nimport { AzureWorkItemStatesCache } from './azure/workItemStateCategories.js';\nimport type { BitbucketApi } from './bitbucket/bitbucket.js';\nimport type { GitHubApi } from './github/github.js';\nimport type { GitLabApi } from './gitlab/gitlab.js';\n\n/**\n * The per-provider API clients, owned and built by the package. `GitLabApi`/`BitbucketApi`/`AzureDevOpsApi`\n * live in the package; `GitHubApi` comes from `@gitlens/git-github` (shared with the host's GitHub git\n * provider, which reads the manager's memoized instance via `manager.github`). `undefined` is tolerated for\n * offline/limited runtimes.\n */\nexport interface ApiClients {\n\treadonly azureWorkItemStates: AzureWorkItemStatesCache;\n\treadonly github: Promise<GitHubApi | undefined>;\n\treadonly gitlab: Promise<GitLabApi | undefined>;\n\treadonly bitbucket: Promise<BitbucketApi | undefined>;\n\treadonly azure: Promise<AzureDevOpsApi | undefined>;\n}\n\n/**\n * Lazily constructs + memoizes the API clients from the runtime context, pushing each to `disposables` for\n * teardown. Mirrors the lazy-chunked construction the host's `Container` did before the package took\n * ownership (the host used to build these and inject them back through the context — a pure round-trip).\n */\nexport function createApiClients(ctx: IntegrationServiceContext, disposables: Disposable[]): ApiClients {\n\tconst azureWorkItemStates = new AzureWorkItemStatesCache();\n\tdisposables.push(\n\t\tctx.config.onDidChange(e => {\n\t\t\tif (e.httpProxy) {\n\t\t\t\tazureWorkItemStates.clear();\n\t\t\t}\n\t\t}),\n\t\t{ dispose: () => azureWorkItemStates.clear() },\n\t);\n\tlet github: Promise<GitHubApi | undefined> | undefined;\n\tlet gitlab: Promise<GitLabApi | undefined> | undefined;\n\tlet bitbucket: Promise<BitbucketApi | undefined> | undefined;\n\tlet azure: Promise<AzureDevOpsApi | undefined> | undefined;\n\n\tconst build = async <T extends Disposable>(load: () => Promise<T>): Promise<T | undefined> => {\n\t\tconst scope = getScopedLogger();\n\t\ttry {\n\t\t\tconst api = await load();\n\t\t\tdisposables.push(api);\n\t\t\treturn api;\n\t\t} catch (ex) {\n\t\t\tscope?.error(ex, 'Failed to construct integration API client');\n\t\t\treturn undefined;\n\t\t}\n\t};\n\n\treturn {\n\t\tazureWorkItemStates: azureWorkItemStates,\n\t\tget github() {\n\t\t\treturn (github ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './github/github.js')).createGitHubApi(ctx),\n\t\t\t));\n\t\t},\n\t\tget gitlab() {\n\t\t\treturn (gitlab ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './gitlab/gitlab.js')).createGitLabApi(ctx),\n\t\t\t));\n\t\t},\n\t\tget bitbucket() {\n\t\t\treturn (bitbucket ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './bitbucket/bitbucket.js')).createBitbucketApi(\n\t\t\t\t\tctx,\n\t\t\t\t),\n\t\t\t));\n\t\t},\n\t\tget azure() {\n\t\t\treturn (azure ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './azure/azure.js')).createAzureDevOpsApi(\n\t\t\t\t\tctx,\n\t\t\t\t\tazureWorkItemStates,\n\t\t\t\t),\n\t\t\t));\n\t\t},\n\t};\n}\n"],"mappings":";;;;;;;;AA4BA,SAAgB,iBAAiB,KAAgC,aAAuC;CACvG,MAAM,sBAAsB,IAAI,yBAAyB;CACzD,YAAY,KACX,IAAI,OAAO,aAAY,MAAK;EAC3B,IAAI,EAAE,WACL,oBAAoB,MAAM;CAE5B,CAAC,GACD,EAAE,eAAe,oBAAoB,MAAM,EAAE,CAC9C;CACA,IAAI;CACJ,IAAI;CACJ,IAAI;CACJ,IAAI;CAEJ,MAAM,QAAQ,OAA6B,SAAmD;EAC7F,MAAM,QAAQ,gBAAgB;EAC9B,IAAI;GACH,MAAM,MAAM,MAAM,KAAK;GACvB,YAAY,KAAK,GAAG;GACpB,OAAO;EACR,SAAS,IAAI;GACZ,OAAO,MAAM,IAAI,4CAA4C;GAC7D;EACD;CACD;CAEA,OAAO;EACe;EACrB,IAAI,SAAS;GACZ,OAAQ,WAAW,MAAM,aACvB,MAAM;;IAA8C;EAAqB,CAAE,gBAAgB,GAAG,CAChG;EACD;EACA,IAAI,SAAS;GACZ,OAAQ,WAAW,MAAM,aACvB,MAAM;;IAA8C;EAAqB,CAAE,gBAAgB,GAAG,CAChG;EACD;EACA,IAAI,YAAY;GACf,OAAQ,cAAc,MAAM,aAC1B,MAAM;;IAA8C;EAA2B,CAAE,mBACjF,GACD,CACD;EACD;EACA,IAAI,QAAQ;GACX,OAAQ,UAAU,MAAM,aACtB,MAAM;;IAA8C;EAAmB,CAAE,qBACzE,KACA,mBACD,CACD;EACD;CACD;AACD"}
+{"version":3,"file":"apiClients.js","names":[],"sources":["../../../../../plus/integrations/src/providers/apiClients.ts"],"sourcesContent":["import type { Disposable } from '@gitlens/utils/disposable.js';\nimport { getScopedLogger } from '@gitlens/utils/logger.scoped.js';\nimport type { IntegrationServiceContext } from '../context.js';\nimport type { AzureDevOpsApi } from './azure/azure.js';\nimport { AzureWorkItemDescriptionsCache } from './azure/workItemDescriptions.js';\nimport { AzureWorkItemStatesCache } from './azure/workItemStateCategories.js';\nimport type { BitbucketApi } from './bitbucket/bitbucket.js';\nimport type { GitHubApi } from './github/github.js';\nimport type { GitLabApi } from './gitlab/gitlab.js';\n\n/**\n * The per-provider API clients, owned and built by the package. `GitLabApi`/`BitbucketApi`/`AzureDevOpsApi`\n * live in the package; `GitHubApi` comes from `@gitlens/git-github` (shared with the host's GitHub git\n * provider, which reads the manager's memoized instance via `manager.github`). `undefined` is tolerated for\n * offline/limited runtimes.\n */\nexport interface ApiClients {\n\treadonly azureWorkItemStates: AzureWorkItemStatesCache;\n\treadonly azureWorkItemDescriptions: AzureWorkItemDescriptionsCache;\n\treadonly github: Promise<GitHubApi | undefined>;\n\treadonly gitlab: Promise<GitLabApi | undefined>;\n\treadonly bitbucket: Promise<BitbucketApi | undefined>;\n\treadonly azure: Promise<AzureDevOpsApi | undefined>;\n}\n\n/**\n * Lazily constructs + memoizes the API clients from the runtime context, pushing each to `disposables` for\n * teardown. Mirrors the lazy-chunked construction the host's `Container` did before the package took\n * ownership (the host used to build these and inject them back through the context — a pure round-trip).\n */\nexport function createApiClients(ctx: IntegrationServiceContext, disposables: Disposable[]): ApiClients {\n\tconst azureWorkItemStates = new AzureWorkItemStatesCache();\n\tconst azureWorkItemDescriptions = new AzureWorkItemDescriptionsCache();\n\tdisposables.push(\n\t\tctx.config.onDidChange(e => {\n\t\t\tif (e.httpProxy) {\n\t\t\t\tazureWorkItemStates.clear();\n\t\t\t\tazureWorkItemDescriptions.clear();\n\t\t\t}\n\t\t}),\n\t\t{\n\t\t\tdispose: () => {\n\t\t\t\tazureWorkItemStates.clear();\n\t\t\t\tazureWorkItemDescriptions.clear();\n\t\t\t},\n\t\t},\n\t);\n\tlet github: Promise<GitHubApi | undefined> | undefined;\n\tlet gitlab: Promise<GitLabApi | undefined> | undefined;\n\tlet bitbucket: Promise<BitbucketApi | undefined> | undefined;\n\tlet azure: Promise<AzureDevOpsApi | undefined> | undefined;\n\n\tconst build = async <T extends Disposable>(load: () => Promise<T>): Promise<T | undefined> => {\n\t\tconst scope = getScopedLogger();\n\t\ttry {\n\t\t\tconst api = await load();\n\t\t\tdisposables.push(api);\n\t\t\treturn api;\n\t\t} catch (ex) {\n\t\t\tscope?.error(ex, 'Failed to construct integration API client');\n\t\t\treturn undefined;\n\t\t}\n\t};\n\n\treturn {\n\t\tazureWorkItemStates: azureWorkItemStates,\n\t\tazureWorkItemDescriptions: azureWorkItemDescriptions,\n\t\tget github() {\n\t\t\treturn (github ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './github/github.js')).createGitHubApi(ctx),\n\t\t\t));\n\t\t},\n\t\tget gitlab() {\n\t\t\treturn (gitlab ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './gitlab/gitlab.js')).createGitLabApi(ctx),\n\t\t\t));\n\t\t},\n\t\tget bitbucket() {\n\t\t\treturn (bitbucket ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './bitbucket/bitbucket.js')).createBitbucketApi(\n\t\t\t\t\tctx,\n\t\t\t\t),\n\t\t\t));\n\t\t},\n\t\tget azure() {\n\t\t\treturn (azure ??= build(async () =>\n\t\t\t\t(await import(/* webpackChunkName: \"integrations\" */ './azure/azure.js')).createAzureDevOpsApi(\n\t\t\t\t\tctx,\n\t\t\t\t\tazureWorkItemStates,\n\t\t\t\t\tazureWorkItemDescriptions,\n\t\t\t\t),\n\t\t\t));\n\t\t},\n\t};\n}\n"],"mappings":";;;;;;;;;AA8BA,SAAgB,iBAAiB,KAAgC,aAAuC;CACvG,MAAM,sBAAsB,IAAI,yBAAyB;CACzD,MAAM,4BAA4B,IAAI,+BAA+B;CACrE,YAAY,KACX,IAAI,OAAO,aAAY,MAAK;EAC3B,IAAI,EAAE,WAAW;GAChB,oBAAoB,MAAM;GAC1B,0BAA0B,MAAM;EACjC;CACD,CAAC,GACD,EACC,eAAe;EACd,oBAAoB,MAAM;EAC1B,0BAA0B,MAAM;CACjC,EACD,CACD;CACA,IAAI;CACJ,IAAI;CACJ,IAAI;CACJ,IAAI;CAEJ,MAAM,QAAQ,OAA6B,SAAmD;EAC7F,MAAM,QAAQ,gBAAgB;EAC9B,IAAI;GACH,MAAM,MAAM,MAAM,KAAK;GACvB,YAAY,KAAK,GAAG;GACpB,OAAO;EACR,SAAS,IAAI;GACZ,OAAO,MAAM,IAAI,4CAA4C;GAC7D;EACD;CACD;CAEA,OAAO;EACe;EACM;EAC3B,IAAI,SAAS;GACZ,OAAQ,WAAW,MAAM,aACvB,MAAM;;IAA8C;EAAqB,CAAE,gBAAgB,GAAG,CAChG;EACD;EACA,IAAI,SAAS;GACZ,OAAQ,WAAW,MAAM,aACvB,MAAM;;IAA8C;EAAqB,CAAE,gBAAgB,GAAG,CAChG;EACD;EACA,IAAI,YAAY;GACf,OAAQ,cAAc,MAAM,aAC1B,MAAM;;IAA8C;EAA2B,CAAE,mBACjF,GACD,CACD;EACD;EACA,IAAI,QAAQ;GACX,OAAQ,UAAU,MAAM,aACtB,MAAM;;IAA8C;EAAmB,CAAE,qBACzE,KACA,qBACA,yBACD,CACD;EACD;CACD;AACD"}

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

@@ -9,6 +9,7 @@ import { RepositoryMetadata } from "../../../../git/models/repositoryMetadata.js
 import { TokenWithInfo } from "../../authentication/models.js";
 import { AzureProjectDescriptor, AzureWorkItemStateCategory } from "./models.js";
 import { AzureWorkItemStatesCache } from "./workItemStateCategories.js";
+import { AzureWorkItemDescriptionsCache } from "./workItemDescriptions.js";
 import { ProviderIssueSearchPage } from "../../models/issueReads.js";
 import { ProviderApiConfig } from "../apiConfig.js";
 import { IntegrationServiceContext } from "../../context.js";
@@ -21,9 +22,12 @@ type WorkItemSearchOptions = {
 };
 export declare class AzureDevOpsApi implements Disposable {
   private readonly config;
+  private readonly restApi;
   private readonly _disposable;
   private readonly _workItemStates;
   private readonly ownsWorkItemStates;
+  private readonly _workItemDescriptions;
+  private readonly ownsWorkItemDescriptions;
   private readonly _forkRepositoryUrls;
   /**
    * The ordered ids each filtered work-item search's first page queried, paged through by its continuations. Kept
@@ -31,7 +35,7 @@ export declare class AzureDevOpsApi implements Disposable {
    * the capacity leaves room for repeated first pages before an idle pagination's snapshot is the one evicted.
    */
   private readonly _workItemSearches;
-  constructor(config: ProviderApiConfig, workItemStates?: AzureWorkItemStatesCache);
+  constructor(config: ProviderApiConfig, workItemStates?: AzureWorkItemStatesCache, workItemDescriptions?: AzureWorkItemDescriptionsCache);
   dispose(): void;
   private resetCaches;
   getPullRequestForBranch(provider: Provider, token: TokenWithInfo, owner: string, repo: string, branch: string, options: {
@@ -76,6 +80,7 @@ export declare class AzureDevOpsApi implements Disposable {
   getWorkItemStateCategory(issueType: string, state: string, provider: Provider, token: TokenWithInfo, owner: string, projectName: string, options: {
     baseUrl: string;
   }, cancellation?: AbortSignal): Promise<AzureWorkItemStateCategory | undefined>;
+  private getWorkItemTypeStates;
   getRepositoryMetadata(provider: Provider, token: TokenWithInfo, owner: string, repo: string, options: {
     baseUrl: string;
   }, cancellation?: AbortSignal): Promise<RepositoryMetadata | undefined>;
@@ -118,19 +123,11 @@ export declare class AzureDevOpsApi implements Disposable {
   /**
    * The ids a collection-level WIQL query matches, in its order.
    *
-   * `api-version=5.0` is the oldest version every Azure DevOps Server release this search supports (2019 and later)
-   * answers; `timePrecision=true` is what lets the criteria's dates compare as instants — see `toWiqlDate`.
+   * `timePrecision=true` lets the criteria's dates compare as instants, including on legacy servers.
    */
   private queryWorkItemIds;
   private getRepository;
   private toPullRequest;
-  /**
-   * The organization's rich text fields a work item's description may come from, for a work item none of the
-   * built-in description fields describes. Best-effort: a failed read leaves the description to those fields rather
-   * than failing the work item, so it is `undefined` on any failure but a cancellation. Logs to the caller's `scope`,
-   * captured before its first `await`: a scope read here, after the caller's reads, can be stale in a browser.
-   */
-  private getWorkItemHtmlFields;
   /**
    * Resolves the web and HTTPS clone URLs of the fork a cross-repository pull request comes from. Every other
    * repository URL the model reports is rebuilt from the pull request payload; only a fork reference lacks the
@@ -142,10 +139,15 @@ export declare class AzureDevOpsApi implements Disposable {
    */
   private getForkRepositoryUrls;
   private fetchForkRepositoryUrls;
+  private getWorkItem;
+  private requireWorkItemProject;
+  private getWorkItemHtmlFields;
+  private getRestResource;
+  private requireRestResource;
   private request;
   private handleRequestError;
 }
 /** Wires an {@link AzureDevOpsApi} from the full runtime context, mapping `ctx` down to the narrow config. */
-export declare function createAzureDevOpsApi(ctx: IntegrationServiceContext, workItemStates?: AzureWorkItemStatesCache): AzureDevOpsApi;
+export declare function createAzureDevOpsApi(ctx: IntegrationServiceContext, workItemStates?: AzureWorkItemStatesCache, workItemDescriptions?: AzureWorkItemDescriptionsCache): AzureDevOpsApi;
 //#endregion
 //# sourceMappingURL=azure.d.ts.map

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

@@ -1,4 +1,4 @@
-import { CancellationError, isCancellationError } from "../../../../utils/cancellation.js";
+import { CancellationError, isCancellationError, raceWithSignal } from "../../../../utils/cancellation.js";
 import { Logger as _logger } from "../../../../utils/logger.js";
 import { getScopedLogger } from "../../../../utils/logger.scoped.js";
 import { mapBounded } from "../../../../utils/promise.js";
@@ -11,14 +11,16 @@ import { base64 } from "../../../../utils/base64.js";
 import { sha256, uuid } from "../../../../utils/crypto.js";
 import { effectiveIssueSort } from "../../../../git/utils/issue.utils.js";
 import { ProviderFetchError, isRateLimitResponse, toRateLimitError } from "../../errors.js";
+import { throwProviderError } from "../providerErrors.js";
 import { decodePathSegment } from "../../utils/domain.utils.js";
 import { azureWorkItemSearchResultLimit, parseAzureWorkItemSearchCursor, toAzureSearchPageSize, toAzureWorkItemSearchCursorKey, toAzureWorkItemSearchQueries, toAzureWorkItemSearchWiql } from "./search.js";
 import { azurePullRequestStatusToState, azureWorkItemsStateCategoryToState, encodeAzurePathSegment, fromAzurePullRequest, fromAzureWorkItem, getAzurePullRequestWebUrl, isClosedAzurePullRequestStatus, normalizeAzureBranchName, parseAzureWorkItemDate, sanitizeAzureRepositoryUrl } from "./models.js";
-import { AzureWorkItemStatesCache, getAzureWorkItemFieldsPath, getAzureWorkItemTypeStatesPath, getAzureWorkItemTypesUrl } from "./workItemStateCategories.js";
+import { AzureWorkItemDescriptionsCache } from "./workItemDescriptions.js";
+import { AzureWorkItemStatesCache, getAzureWorkItemTypeStatesPath, getAzureWorkItemTypesUrl, requireAzureWorkItemStateCategories, resolveAzureWorkItemStateCategory } from "./workItemStateCategories.js";
 import { baseProviderApiConfig } from "../apiConfig.js";
+import { createProviderApiRequest, createProviderApis } from "../providerApiClient.js";
 import { queryAzureWorkItemSearch } from "./workItemSearch.js";
 import * as l10n from "@vscode/l10n";
-import { needsAzureWorkItemHtmlFields } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/providers/azure/azure.ts
 const forkRepositoryUrlCacheTtl = 3e5;
 const workItemMetadataConcurrency = 6;
@@ -40,9 +42,12 @@ function parseAzureRepositoryDescriptor(repo) {
 }
 var AzureDevOpsApi = class {
 	config;
+	restApi;
 	_disposable;
 	_workItemStates;
 	ownsWorkItemStates;
+	_workItemDescriptions;
+	ownsWorkItemDescriptions;
 	_forkRepositoryUrls = new PromiseCache({
 		capacity: 100,
 		createTTL: forkRepositoryUrlCacheTtl
@@ -57,17 +62,22 @@ var AzureDevOpsApi = class {
 		accessTTL: workItemSearchSnapshotTtl,
 		createTTL: workItemSearchSnapshotMaxTtl
 	});
-	constructor(config, workItemStates) {
+	constructor(config, workItemStates, workItemDescriptions) {
 		this.config = config;
+		this.restApi = createProviderApis({ request: createProviderApiRequest((input, init) => config.fetch(input, init)) }).azureDevOps;
 		this._workItemStates = workItemStates ?? new AzureWorkItemStatesCache();
 		this.ownsWorkItemStates = workItemStates == null;
+		this._workItemDescriptions = workItemDescriptions ?? new AzureWorkItemDescriptionsCache();
+		this.ownsWorkItemDescriptions = workItemDescriptions == null;
 		this._disposable = config.onConfigChanged?.(() => this.resetCaches());
 	}
 	dispose() {
 		this._disposable?.dispose();
 	}
 	resetCaches() {
+		this.restApi.updateConfig({});
 		if (this.ownsWorkItemStates) this._workItemStates.clear();
+		if (this.ownsWorkItemDescriptions) this._workItemDescriptions.clear();
 		this._forkRepositoryUrls.clear();
 		this._workItemSearches.clear();
 	}
@@ -92,8 +102,11 @@ var AzureDevOpsApi = class {
 	async getPullRequestForCommit(provider, token, owner, repo, rev, baseUrl, _options, cancellation) {
 		const scope = getScopedLogger();
 		const { projectName, repoName } = parseAzureRepositoryDescriptor(repo);
+		const resource = await this.requireRestResource(provider, token, owner, baseUrl, "pullRequestQuery", "4.1", cancellation);
 		try {
-			const pr = (await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/git/repositories/${encodeAzurePathSegment(repoName)}/pullrequestquery?api-version=4.1`, {
+			const encodedProject = encodeAzurePathSegment(projectName);
+			const encodedRepo = encodeAzurePathSegment(repoName);
+			const pr = (await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/${encodedProject}/_apis/git/repositories/${encodedRepo}/pullrequestquery?api-version=${resource.apiVersion}`, {
 				method: "POST",
 				body: JSON.stringify({ queries: [{
 					items: [rev],
@@ -125,9 +138,10 @@ var AzureDevOpsApi = class {
 		const scope = getScopedLogger();
 		const { projectName, repoName } = parseAzureRepositoryDescriptor(repo);
 		if (options?.type === void 0 || options?.type === "issue") {
+			const resource = await this.requireRestResource(provider, token, owner, options.baseUrl, "workItems", "6.0");
 			let issueResult;
 			try {
-				issueResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/wit/workItems/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
+				issueResult = await this.getWorkItem(provider, token, owner, projectName, id, options.baseUrl, resource, scope);
 			} catch (ex) {
 				if (ex instanceof AuthenticationError) throw ex;
 				if (ex.original?.status !== 404) {
@@ -136,6 +150,7 @@ var AzureDevOpsApi = class {
 				}
 			}
 			if (issueResult != null) {
+				await this.requireWorkItemProject(provider, token, owner, projectName, issueResult, options.baseUrl, scope);
 				const issueType = issueResult.fields["System.WorkItemType"];
 				const state = issueResult.fields["System.State"];
 				const stateCategory = await this.getWorkItemStateCategory(issueType, state, provider, token, owner, projectName, options);
@@ -179,9 +194,10 @@ var AzureDevOpsApi = class {
 	}
 	async getIssue(provider, token, project, id, options) {
 		const scope = getScopedLogger();
+		const resource = await this.requireRestResource(provider, token, project.resourceName, options.baseUrl, "workItems", "6.0");
 		let issueResult;
 		try {
-			issueResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(project.resourceName)}/${encodeAzurePathSegment(project.name)}/_apis/wit/workItems/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
+			issueResult = await this.getWorkItem(provider, token, project.resourceName, project.name, id, options.baseUrl, resource, scope);
 		} catch (ex) {
 			if (ex instanceof AuthenticationError) throw ex;
 			if (ex.original?.status !== 404) {
@@ -190,9 +206,10 @@ var AzureDevOpsApi = class {
 			}
 		}
 		if (issueResult != null) {
+			await this.requireWorkItemProject(provider, token, project.resourceName, project.name, issueResult, options.baseUrl, scope);
 			const issueType = issueResult.fields["System.WorkItemType"];
 			const state = issueResult.fields["System.State"];
-			const [stateCategory, htmlFields] = await Promise.all([this.getWorkItemStateCategory(issueType, state, provider, token, project.resourceName, project.name, options), needsAzureWorkItemHtmlFields(issueResult.fields) ? this.getWorkItemHtmlFields(provider, token, options.baseUrl, project.resourceName, scope) : void 0]);
+			const [stateCategory, htmlFields] = await Promise.all([this.getWorkItemStateCategory(issueType, state, provider, token, project.resourceName, project.name, options), this.getWorkItemHtmlFields(provider, token, project.resourceName, options.baseUrl, issueResult.fields, scope)]);
 			return fromAzureWorkItem(issueResult, provider, project, stateCategory, "point", htmlFields);
 		}
 	}
@@ -258,18 +275,30 @@ var AzureDevOpsApi = class {
 		}
 	}
 	async getWorkItemStateCategory(issueType, state, provider, token, owner, projectName, options, cancellation) {
-		return (await this._workItemStates.getStates({
-			baseUrl: options.baseUrl,
+		const states = await this.getWorkItemTypeStates(provider, token, owner, projectName, issueType, options.baseUrl, cancellation);
+		return resolveAzureWorkItemStateCategory(states, state);
+	}
+	getWorkItemTypeStates(provider, token, owner, project, type, baseUrl, cancellation) {
+		return this._workItemStates.getStates({
+			baseUrl,
 			namespace: owner,
-			project: projectName,
+			project,
 			token: token.accessToken,
 			isPAT: true
-		}, issueType, (signal) => this.request(provider, token, options.baseUrl, getAzureWorkItemTypeStatesPath(owner, projectName, issueType), { method: "GET" }, void 0, signal), cancellation)).find((s) => s.name === state)?.category;
+		}, type, async (signal) => {
+			const resource = await this.requireRestResource(provider, token, owner, baseUrl, "workItemTypeStates", "6.0-preview.1", signal);
+			return this.request(provider, token, baseUrl, getAzureWorkItemTypeStatesPath(owner, project, type, resource.apiVersion), { method: "GET" }, void 0, signal);
+		}, cancellation, async (signal) => {
+			const resource = await this.requireRestResource(provider, token, owner, baseUrl, "backlogConfiguration", "6.0-preview.1", signal);
+			const path = `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(project)}/_apis/work/backlogconfiguration?api-version=${resource.apiVersion}`;
+			return this.request(provider, token, baseUrl, path, { method: "GET" }, void 0, signal);
+		});
 	}
 	async getRepositoryMetadata(provider, token, owner, repo, options, cancellation) {
 		const scope = getScopedLogger();
+		const resource = await this.requireRestResource(provider, token, owner, options.baseUrl, "repositories", "7.1", cancellation);
 		try {
-			const response = await this.getRepository(provider, token, owner, repo, options.baseUrl, scope, cancellation);
+			const response = await this.getRepository(provider, token, owner, repo, options.baseUrl, resource.apiVersion, scope, cancellation);
 			if (response == null) return void 0;
 			return {
 				provider,
@@ -289,8 +318,9 @@ var AzureDevOpsApi = class {
 	}
 	async getDefaultBranch(provider, token, owner, repo, options, cancellation) {
 		const scope = getScopedLogger();
+		const resource = await this.requireRestResource(provider, token, owner, options.baseUrl, "repositories", "7.1", cancellation);
 		try {
-			const response = await this.getRepository(provider, token, owner, repo, options.baseUrl, scope, cancellation);
+			const response = await this.getRepository(provider, token, owner, repo, options.baseUrl, resource.apiVersion, scope, cancellation);
 			if (response?.defaultBranch == null) return void 0;
 			return {
 				provider,
@@ -353,24 +383,28 @@ var AzureDevOpsApi = class {
 		const slice = ids.slice(offset, offset + pageSize);
 		const values = [];
 		if (slice.length > 0) {
-			const workItems = await this.request(provider, token, options.baseUrl, `${encodeAzurePathSegment(collection)}/_apis/wit/workitemsbatch?api-version=5.0`, {
+			const batch = await this.getRestResource(provider, token, collection, options.baseUrl, "workItemsBatch", "5.0", cancellation);
+			const resource = batch ?? await this.requireRestResource(provider, token, collection, options.baseUrl, "workItems", "5.0", cancellation);
+			const route = batch != null ? `workitemsbatch?api-version=${resource.apiVersion}` : `workitems?ids=${slice.join(",")}&$expand=Links&errorPolicy=Omit&api-version=${resource.apiVersion}`;
+			const workItems = await this.request(provider, token, options.baseUrl, `${encodeAzurePathSegment(collection)}/_apis/wit/${route}`, batch != null ? {
 				method: "POST",
 				body: JSON.stringify({
 					ids: slice,
 					$expand: "Links",
 					errorPolicy: "Omit"
 				})
-			}, scope, cancellation);
+			} : { method: "GET" }, scope, cancellation);
 			const byId = new Map((workItems?.value ?? []).filter((w) => w != null).map((w) => [w.id, w]));
-			const htmlFields = [...byId.values()].some((w) => needsAzureWorkItemHtmlFields(w.fields)) ? await this.getWorkItemHtmlFields(provider, token, options.baseUrl, collection, scope, cancellation) : void 0;
 			for (const id of slice) {
 				const workItem = byId.get(id);
 				if (workItem == null) continue;
 				const projectName = workItem.fields["System.TeamProject"];
+				if (options.projectNames?.length && !options.projectNames.some((name) => name.toLowerCase() === projectName?.toLowerCase())) throw new Error(`Azure DevOps work item ${id} is outside the requested projects`);
 				const project = options.resolveProject(projectName);
 				if (project == null) throw new Error(`Azure DevOps work item ${id} is in project '${projectName}', which isn't visible`);
 				if (cancellation?.aborted) throw new CancellationError();
 				const stateCategory = await this.getWorkItemStateCategory(workItem.fields["System.WorkItemType"], workItem.fields["System.State"], provider, token, collection, project.name, options, cancellation);
+				const htmlFields = await this.getWorkItemHtmlFields(provider, token, collection, options.baseUrl, workItem.fields, scope, cancellation);
 				values.push(fromAzureWorkItem(workItem, provider, project, stateCategory, "search", htmlFields));
 			}
 		}
@@ -428,7 +462,10 @@ var AzureDevOpsApi = class {
 					token: token.accessToken,
 					isPAT: true
 				};
-				return (await this._workItemStates.getTypes(scope, (signal) => this.request(provider, token, void 0, getAzureWorkItemTypesUrl(options.baseUrl, collection, project), { method: "GET" }, void 0, signal), cancellation)).map((name) => ({
+				return (await this._workItemStates.getTypes(scope, async (signal) => {
+					const resource = await this.requireRestResource(provider, token, collection, options.baseUrl, "workItemTypes", "6.0", signal);
+					return this.request(provider, token, void 0, getAzureWorkItemTypesUrl(options.baseUrl, collection, project, resource.apiVersion), { method: "GET" }, void 0, signal);
+				}, cancellation)).map((name) => ({
 					project,
 					name,
 					scope
@@ -437,7 +474,7 @@ var AzureDevOpsApi = class {
 			const states = await mapBounded(types, workItemMetadataConcurrency, async (type) => ({
 				name: type.name,
 				project: type.project,
-				states: await this._workItemStates.getStates(type.scope, type.name, (signal) => this.request(provider, token, options.baseUrl, getAzureWorkItemTypeStatesPath(collection, type.project, type.name), { method: "GET" }, void 0, signal), cancellation)
+				states: requireAzureWorkItemStateCategories(await this.getWorkItemTypeStates(provider, token, collection, type.project, type.name, options.baseUrl, cancellation))
 			}));
 			workflows = new Map(projectNames.map((project) => [project, { types: states.filter((type) => type.project === project) }]));
 		}
@@ -446,13 +483,13 @@ var AzureDevOpsApi = class {
 	/**
 	* The ids a collection-level WIQL query matches, in its order.
 	*
-	* `api-version=5.0` is the oldest version every Azure DevOps Server release this search supports (2019 and later)
-	* answers; `timePrecision=true` is what lets the criteria's dates compare as instants — see `toWiqlDate`.
+	* `timePrecision=true` lets the criteria's dates compare as instants, including on legacy servers.
 	*/
 	async queryWorkItemIds(provider, token, collection, baseUrl, wiql, top, scope, cancellation, asOf) {
 		const query = asOf == null ? wiql : `${wiql} ASOF '${asOf}'`;
 		if (query.length > 32e3) throw new Error("Azure DevOps work item search query is too long; narrow the search");
-		const result = await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(collection)}/_apis/wit/wiql?$top=${top}&timePrecision=true&api-version=5.0`, {
+		const resource = await this.requireRestResource(provider, token, collection, baseUrl, "wiql", "5.0", cancellation);
+		const result = await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(collection)}/_apis/wit/wiql?$top=${top}&timePrecision=true&api-version=${resource.apiVersion}`, {
 			method: "POST",
 			body: JSON.stringify({ query })
 		}, scope, cancellation);
@@ -462,35 +499,17 @@ var AzureDevOpsApi = class {
 			asOf: result.asOf
 		};
 	}
-	getRepository(provider, token, owner, repo, baseUrl, scope, cancellation) {
+	async getRepository(provider, token, owner, repo, baseUrl, apiVersion, scope, cancellation) {
 		const { projectName, repoName } = parseAzureRepositoryDescriptor(repo);
-		return this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/git/repositories/${encodeAzurePathSegment(repoName)}?api-version=7.1`, { method: "GET" }, scope, cancellation);
+		const encodedProject = encodeAzurePathSegment(projectName);
+		const encodedRepo = encodeAzurePathSegment(repoName);
+		return this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/${encodedProject}/_apis/git/repositories/${encodedRepo}?api-version=${apiVersion}`, { method: "GET" }, scope, cancellation);
 	}
 	async toPullRequest(pr, provider, token, owner, baseUrl, scope, cancellation) {
 		const forkRepositoryUrls = await this.getForkRepositoryUrls(provider, token, owner, baseUrl, pr.forkSource?.repository, scope, cancellation);
 		return fromAzurePullRequest(pr, provider, owner, baseUrl, forkRepositoryUrls, "point");
 	}
 	/**
-	* The organization's rich text fields a work item's description may come from, for a work item none of the
-	* built-in description fields describes. Best-effort: a failed read leaves the description to those fields rather
-	* than failing the work item, so it is `undefined` on any failure but a cancellation. Logs to the caller's `scope`,
-	* captured before its first `await`: a scope read here, after the caller's reads, can be stale in a browser.
-	*/
-	async getWorkItemHtmlFields(provider, token, baseUrl, organization, scope, cancellation) {
-		try {
-			return await this._workItemStates.getHtmlFields({
-				baseUrl,
-				namespace: organization,
-				token: token.accessToken,
-				isPAT: true
-			}, (signal) => this.request(provider, token, baseUrl, getAzureWorkItemFieldsPath(organization), { method: "GET" }, void 0, signal), cancellation);
-		} catch (ex) {
-			if (isCancellationError(ex) && cancellation?.aborted) throw ex;
-			scope?.warn(`Unable to read the Azure DevOps field catalog of '${organization}': ${ex}`);
-			return;
-		}
-	}
-	/**
 	* Resolves the web and HTTPS clone URLs of the fork a cross-repository pull request comes from. Every other
 	* repository URL the model reports is rebuilt from the pull request payload; only a fork reference lacks the
 	* project to do that, so only a fork costs a request.
@@ -517,7 +536,9 @@ var AzureDevOpsApi = class {
 	}
 	async fetchForkRepositoryUrls(provider, token, owner, baseUrl, repositoryId, cacheable, scope, cancellation) {
 		try {
-			const response = await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/_apis/git/repositories/${encodeAzurePathSegment(repositoryId)}?api-version=4.1`, { method: "GET" }, scope, cancellation);
+			encodeAzurePathSegment(repositoryId);
+			const resource = await this.requireRestResource(provider, token, owner, baseUrl, "repositories", "4.1", cancellation);
+			const response = await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/_apis/git/repositories/${encodeAzurePathSegment(repositoryId)}?api-version=${resource.apiVersion}`, { method: "GET" }, scope, cancellation);
 			const webUrl = sanitizeAzureRepositoryUrl(response?.webUrl, baseUrl, owner);
 			const cloneHttps = sanitizeAzureRepositoryUrl(response?.remoteUrl, baseUrl, owner);
 			const url = webUrl ?? cloneHttps;
@@ -536,6 +557,66 @@ var AzureDevOpsApi = class {
 			return;
 		}
 	}
+	async getWorkItem(provider, token, owner, project, id, baseUrl, resource, scope) {
+		const encodedProject = encodeAzurePathSegment(project);
+		const encodedId = encodeAzurePathSegment(id);
+		const projectPath = resource.projectScoped ? `/${encodedProject}` : "";
+		return this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}${projectPath}/_apis/wit/workItems/${encodedId}?api-version=${resource.apiVersion}`, { method: "GET" }, scope);
+	}
+	async requireWorkItemProject(provider, token, owner, project, workItem, baseUrl, scope) {
+		const actualProject = workItem.fields?.["System.TeamProject"];
+		if (typeof actualProject !== "string" || !actualProject.trim()) throw new Error(`Azure DevOps work item ${workItem.id} has no project`);
+		if (actualProject.toLowerCase() === project.toLowerCase()) return;
+		if ((await this.request(provider, token, baseUrl, `${encodeAzurePathSegment(owner)}/_apis/projects/${encodeAzurePathSegment(project)}`, { method: "GET" }, scope))?.name?.toLowerCase() !== actualProject.toLowerCase()) throw new Error(`Azure DevOps work item ${workItem.id} is outside the requested project`);
+	}
+	async getWorkItemHtmlFields(provider, token, namespace, baseUrl, fields, scope, cancellation) {
+		try {
+			const requestToken = { ...token };
+			return await this._workItemDescriptions.getFields(fields, {
+				baseUrl,
+				namespace,
+				token: requestToken.accessToken,
+				isPAT: true
+			}, async (signal) => {
+				const resource = await this.requireRestResource(provider, requestToken, namespace, baseUrl, "fields", "6.0", signal);
+				return this.request(provider, requestToken, baseUrl, `${encodeAzurePathSegment(namespace)}/_apis/wit/fields?api-version=${resource.apiVersion}`, { method: "GET" }, void 0, signal);
+			}, cancellation);
+		} catch (ex) {
+			if (isCancellationError(ex) && cancellation?.aborted) throw ex;
+			scope?.warn(`Unable to read the Azure DevOps field catalog of '${namespace}': ${ex}`);
+			return [];
+		}
+	}
+	async getRestResource(provider, token, namespace, baseUrl, resource, version, cancellation) {
+		try {
+			if (cancellation?.aborted) throw new CancellationError();
+			encodeAzurePathSegment(namespace);
+			const discovery = this.config.wrapForForcedInsecureSSL(provider.getIgnoreSSLErrors(), () => this.restApi.getRestApiResource({
+				namespace,
+				resource,
+				version
+			}, {
+				token: token.accessToken,
+				isPAT: true,
+				baseUrl
+			}));
+			if (cancellation?.aborted) discovery.catch(() => {});
+			return await (cancellation != null ? raceWithSignal(discovery, cancellation) : discovery);
+		} catch (ex) {
+			return throwProviderError(token, ex);
+		}
+	}
+	async requireRestResource(provider, token, namespace, baseUrl, resource, version, cancellation) {
+		let result;
+		try {
+			result = await this.getRestResource(provider, token, namespace, baseUrl, resource, version, cancellation);
+		} catch (ex) {
+			if (ex instanceof RequestNotFoundError) throw new Error("Azure DevOps REST resource discovery failed", { cause: ex });
+			throw ex;
+		}
+		if (result == null) throw new Error(`Azure DevOps REST resource ${resource} is unavailable`);
+		return result;
+	}
 	async request(provider, token, baseUrl, route, options, scope, cancellation) {
 		const { accessToken } = token;
 		const url = baseUrl ? `${baseUrl}/${route}` : route;
@@ -670,8 +751,8 @@ __decorate([trace({ args: (provider, token, collection) => ({
 	collection
 }) })], AzureDevOpsApi.prototype, "countWorkItems", null);
 /** Wires an {@link AzureDevOpsApi} from the full runtime context, mapping `ctx` down to the narrow config. */
-function createAzureDevOpsApi(ctx, workItemStates) {
-	return new AzureDevOpsApi(baseProviderApiConfig(ctx), workItemStates);
+function createAzureDevOpsApi(ctx, workItemStates, workItemDescriptions) {
+	return new AzureDevOpsApi(baseProviderApiConfig(ctx), workItemStates, workItemDescriptions);
 }
 //#endregion
 export { AzureDevOpsApi, createAzureDevOpsApi };