@gitkraken/core-gitlens 0.11.1 → 0.13.0

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

@@ -12,9 +12,9 @@ import { isProviderUnreachableError, toError } from "../errors.js";
 import "../constants.js";
 import { isAzureProviderId } from "../providers/providerErrors.js";
 import { attributeScopedAuthFailures, hasOnlyScopedAuthFailures, markCredentialRefusals, toCollectionScopeFailure } from "../collectionMetadata.js";
-import { throwIfAllSettledFailed } from "../providers/utils/providerPaging.js";
 import { areDomainsOnSameHost } from "../utils/domain.utils.js";
 import { isSelfManagedHostIntegrationId } from "../utils/integration.utils.js";
+import { throwIfAllSettledFailed } from "../providers/utils/providerPaging.js";
 import { providersMetadata } from "../providers/models.js";
 import { RejectedTokenTracker } from "../authentication/rejectedTokenTracker.js";
 import { getCachedIssue } from "./issueCache.js";

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

@@ -1,6 +1,6 @@
 import { IssueShape, IssueSorting, IssueStateFilter } from "../../../git/models/issue.js";
 import { IssueFilter } from "../providerFilters.js";
-import { CollectionMetadata } from "@gitkraken/provider-apis";
+import { CollectionMetadata, CollectionScope } from "@gitkraken/provider-apis";
 //#region ../plus/integrations/src/models/issueReads.d.ts
 /**
  * The result and option contracts of the integration layer's issue reads — the shapes a PROVIDER returns to the
@@ -105,9 +105,22 @@ export type ProjectIssuesRequest<T> = {
   project: T;
   options: IssuesForProjectOptions;
 };
+/** How a truncated project read could be recovered: see {@link ProjectIssuesDrain}. */
+export type ProjectIssuesRecovery = 'narrow-scope' | 'none';
+/**
+ * One project's issues as a tracker read them. A truncated result whose `metadata` reports a failure or an omission is
+ * explained by it; one whose metadata reports neither is a cut the facade reports for the project when it names its
+ * `scope` (Jira, whose drains record every other cut in their metadata), and for the read as a whole otherwise, where
+ * `narrow-scope` is not offered.
+ */
 export type ProjectIssuesDrain = {
   values: IssueShape[];
   metadata?: CollectionMetadata;
+  /**
+   * The scope the provider records this project's failures under, so a cut the facade reports names the project
+   * the same way: a Jira Cloud project by its key, a Jira Data Center one by its id. Omitted names no scope.
+   */
+  scope?: CollectionScope;
 } & ({
   truncated: false;
 } | {
@@ -116,7 +129,7 @@ export type ProjectIssuesDrain = {
    * `narrow-scope` means a smaller server-side scope avoids this truncation. `none` covers incomplete
    * results without that guarantee, including Linear's client-side assignee filtering.
    */
-  recovery: 'narrow-scope' | 'none';
+  recovery: ProjectIssuesRecovery;
 });
 /**
  * Options for the REPO-scoped issue read (`GitHostIntegration.getMyIssuesForRepos*`), the git-host counterpart of
@@ -183,8 +196,8 @@ export type SearchMyIssuesOptions = {
   /**
    * Which issue states to read. Omitted reads open issues only.
    *
-   * Honored by the issue trackers that declare `ProviderMetadata.supportsIssueStates` (Jira, Jira Data Center,
-   * Linear). The git hosts' account-wide reads ignore it and keep their own open-only default.
+   * Honored by providers declaring `ProviderMetadata.supportsIssueStates`, including Azure DevOps Services and
+   * Server. Other git hosts keep their own open-only account-wide default.
    */
   state?: IssueStateFilter;
   /**

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

@@ -1,5 +1,6 @@
 import { Disposable } from "../../../utils/disposable.js";
 import { GitHubApi } from "../../git-github/api/github.js";
+import { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
 import { AzureDevOpsApi } from "./azure/azure.js";
 import { BitbucketApi } from "./bitbucket/bitbucket.js";
 import "./github/github.js";
@@ -13,6 +14,7 @@ import { IntegrationServiceContext } from "../context.js";
  * offline/limited runtimes.
  */
 export interface ApiClients {
+  readonly azureWorkItemStates: AzureWorkItemStatesCache;
   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 { AzureWorkItemStatesCache } from "./azure/workItemStateCategories.js";
 //#region ../plus/integrations/src/providers/apiClients.ts
 /**
 * Lazily constructs + memoizes the API clients from the runtime context, pushing each to `disposables` for
@@ -6,6 +7,10 @@ import { getScopedLogger } from "../../../utils/logger.scoped.js";
 * ownership (the host used to build these and inject them back through the context — a pure round-trip).
 */
 function createApiClients(ctx, disposables) {
+	const azureWorkItemStates = new AzureWorkItemStatesCache();
+	disposables.push(ctx.config.onDidChange((e) => {
+		if (e.httpProxy) azureWorkItemStates.clear();
+	}), { dispose: () => azureWorkItemStates.clear() });
 	let github;
 	let gitlab;
 	let bitbucket;
@@ -22,6 +27,7 @@ function createApiClients(ctx, disposables) {
 		}
 	};
 	return {
+		azureWorkItemStates,
 		get github() {
 			return github ??= build(async () => (await import(
 				/* webpackChunkName: "integrations" */
@@ -44,7 +50,7 @@ function createApiClients(ctx, disposables) {
 			return azure ??= build(async () => (await import(
 				/* webpackChunkName: "integrations" */
 				"./azure/azure.js"
-)).createAzureDevOpsApi(ctx));
+)).createAzureDevOpsApi(ctx, azureWorkItemStates));
 		}
 	};
 }

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 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 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\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\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(ctx),\n\t\t\t));\n\t\t},\n\t};\n}\n"],"mappings":";;;;;;;AA0BA,SAAgB,iBAAiB,KAAgC,aAAuC;CACvG,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;EACN,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,qBAAqB,GAAG,CACnG;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 { 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"}

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

@@ -8,6 +8,7 @@ import { DefaultBranch } from "../../../../git/models/defaultBranch.js";
 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 { ProviderIssueSearchPage } from "../../models/issueReads.js";
 import { ProviderApiConfig } from "../apiConfig.js";
 import { IntegrationServiceContext } from "../../context.js";
@@ -15,7 +16,8 @@ import { IntegrationServiceContext } from "../../context.js";
 export declare class AzureDevOpsApi implements Disposable {
   private readonly config;
   private readonly _disposable;
-  private _workItemStates;
+  private readonly _workItemStates;
+  private readonly ownsWorkItemStates;
   private readonly _forkRepositoryUrls;
   /**
    * The ordered ids each filtered work-item search's first page queried, paged through by its continuations. Kept
@@ -23,7 +25,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);
+  constructor(config: ProviderApiConfig, workItemStates?: AzureWorkItemStatesCache);
   dispose(): void;
   private resetCaches;
   getPullRequestForBranch(provider: Provider, token: TokenWithInfo, owner: string, repo: string, branch: string, options: {
@@ -68,7 +70,6 @@ export declare class AzureDevOpsApi implements Disposable {
   getWorkItemStateCategory(issueType: string, state: string, provider: Provider, token: TokenWithInfo, owner: string, projectName: string, options: {
     baseUrl: string;
   }): Promise<AzureWorkItemStateCategory | undefined>;
-  private retrieveWorkItemTypeStates;
   getRepositoryMetadata(provider: Provider, token: TokenWithInfo, owner: string, repo: string, options: {
     baseUrl: string;
   }, cancellation?: AbortSignal): Promise<RepositoryMetadata | undefined>;
@@ -137,6 +138,6 @@ export declare class AzureDevOpsApi implements Disposable {
   private handleRequestError;
 }
 /** Wires an {@link AzureDevOpsApi} from the full runtime context, mapping `ctx` down to the narrow config. */
-export declare function createAzureDevOpsApi(ctx: IntegrationServiceContext): AzureDevOpsApi;
+export declare function createAzureDevOpsApi(ctx: IntegrationServiceContext, workItemStates?: AzureWorkItemStatesCache): AzureDevOpsApi;
 //#endregion
 //# sourceMappingURL=azure.d.ts.map

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

@@ -5,15 +5,16 @@ import { trace } from "../../../../utils/decorators/log.js";
 import { PromiseCache } from "../../../../utils/promiseCache.js";
 import __decorate from "../../../../_virtual/@oxc-project+runtime/helpers/esm/decorate.js";
 import { AuthenticationError, RequestClientError, RequestNotFoundError } from "../../../../git/errors.js";
+import { sha256, uuid } from "../../../../utils/crypto.js";
 import { maybeStopWatch } from "../../../../utils/stopwatch.js";
 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 { azureWorkItemSearchResultLimit, parseAzureWorkItemSearchCursor, toAzureSearchPageSize, toAzureWorkItemSearchCursorKey, toAzureWorkItemSearchWiql } from "./search.js";
 import { decodePathSegment } from "../../utils/domain.utils.js";
-import { baseProviderApiConfig } from "../apiConfig.js";
+import { azureWorkItemSearchResultLimit, parseAzureWorkItemSearchCursor, toAzureSearchPageSize, toAzureWorkItemSearchCursorKey, toAzureWorkItemSearchWiql } from "./search.js";
 import { azurePullRequestStatusToState, azureWorkItemsStateCategoryToState, encodeAzurePathSegment, fromAzurePullRequest, fromAzureWorkItem, getAzurePullRequestWebUrl, isClosedAzurePullRequestStatus, isClosedAzureWorkItemStateCategory, normalizeAzureBranchName, sanitizeAzureRepositoryUrl } from "./models.js";
+import { AzureWorkItemStatesCache, getAzureWorkItemTypeStatesPath } from "./workItemStateCategories.js";
+import { baseProviderApiConfig } from "../apiConfig.js";
 import * as l10n from "@vscode/l10n";
 //#region ../plus/integrations/src/providers/azure/azure.ts
 const forkRepositoryUrlCacheTtl = 3e5;
@@ -33,44 +34,11 @@ function parseAzureRepositoryDescriptor(repo) {
 		repoName
 	};
 }
-var WorkItemStates = class {
-	_categories = /* @__PURE__ */ new Map();
-	_types = /* @__PURE__ */ new Map();
-	getStateCategory(project, workItemType, stateName) {
-		return this._categories.get(this.getStateKey(project, workItemType, stateName));
-	}
-	clear() {
-		this._categories.clear();
-		this._types.clear();
-	}
-	saveTypeStates(project, workItemType, states) {
-		this.clearTypeStates(project, workItemType);
-		this._types.set(this.getTypeKey(project, workItemType), states);
-		for (const state of states) this._categories.set(this.getStateKey(project, workItemType, state.name), state.category);
-	}
-	hasTypeStates(project, workItemType) {
-		return this._types.has(this.getTypeKey(project, workItemType));
-	}
-	clearTypeStates(project, workItemType) {
-		const states = this._types.get(this.getTypeKey(project, workItemType));
-		if (states == null) return;
-		for (const state of states) this._categories.delete(this.getStateKey(project, workItemType, state.name));
-	}
-	getStateKey(project, workItemType, stateName) {
-		return JSON.stringify([
-			project,
-			workItemType,
-			stateName
-		]);
-	}
-	getTypeKey(project, workItemType) {
-		return JSON.stringify([project, workItemType]);
-	}
-};
 var AzureDevOpsApi = class {
 	config;
 	_disposable;
-	_workItemStates = new WorkItemStates();
+	_workItemStates;
+	ownsWorkItemStates;
 	_forkRepositoryUrls = new PromiseCache({
 		capacity: 100,
 		createTTL: forkRepositoryUrlCacheTtl
@@ -85,15 +53,17 @@ var AzureDevOpsApi = class {
 		accessTTL: workItemSearchSnapshotTtl,
 		createTTL: workItemSearchSnapshotMaxTtl
 	});
-	constructor(config) {
+	constructor(config, workItemStates) {
 		this.config = config;
+		this._workItemStates = workItemStates ?? new AzureWorkItemStatesCache();
+		this.ownsWorkItemStates = workItemStates == null;
 		this._disposable = config.onConfigChanged?.(() => this.resetCaches());
 	}
 	dispose() {
 		this._disposable?.dispose();
 	}
 	resetCaches() {
-		this._workItemStates.clear();
+		if (this.ownsWorkItemStates) this._workItemStates.clear();
 		this._forkRepositoryUrls.clear();
 		this._workItemSearches.clear();
 	}
@@ -150,8 +120,17 @@ var AzureDevOpsApi = class {
 	async getIssueOrPullRequest(provider, token, owner, repo, id, options) {
 		const scope = getScopedLogger();
 		const { projectName, repoName } = parseAzureRepositoryDescriptor(repo);
-		if (options?.type === void 0 || options?.type === "issue") try {
-			const issueResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/wit/workItems/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
+		if (options?.type === void 0 || options?.type === "issue") {
+			let issueResult;
+			try {
+				issueResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/wit/workItems/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
+			} catch (ex) {
+				if (ex instanceof AuthenticationError) throw ex;
+				if (ex.original?.status !== 404) {
+					scope?.error(ex);
+					return;
+				}
+			}
 			if (issueResult != null) {
 				const issueType = issueResult.fields["System.WorkItemType"];
 				const state = issueResult.fields["System.State"];
@@ -169,12 +148,6 @@ var AzureDevOpsApi = class {
 					url: issueResult._links.html.href
 				};
 			}
-		} catch (ex) {
-			if (ex instanceof AuthenticationError) throw ex;
-			if (ex.original?.status !== 404) {
-				scope?.error(ex);
-				return;
-			}
 		}
 		if (options?.type === void 0 || options?.type === "pullrequest") try {
 			const prResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/git/repositories/${encodeAzurePathSegment(repoName)}/pullRequests/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
@@ -201,14 +174,9 @@ var AzureDevOpsApi = class {
 	}
 	async getIssue(provider, token, project, id, options) {
 		const scope = getScopedLogger();
+		let issueResult;
 		try {
-			const issueResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(project.resourceName)}/${encodeAzurePathSegment(project.name)}/_apis/wit/workItems/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
-			if (issueResult != null) {
-				const issueType = issueResult.fields["System.WorkItemType"];
-				const state = issueResult.fields["System.State"];
-				const stateCategory = await this.getWorkItemStateCategory(issueType, state, provider, token, project.resourceName, project.name, options);
-				return fromAzureWorkItem(issueResult, provider, project, stateCategory, "point");
-			}
+			issueResult = await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(project.resourceName)}/${encodeAzurePathSegment(project.name)}/_apis/wit/workItems/${encodeAzurePathSegment(id)}`, { method: "GET" }, scope);
 		} catch (ex) {
 			if (ex instanceof AuthenticationError) throw ex;
 			if (ex.original?.status !== 404) {
@@ -216,6 +184,12 @@ var AzureDevOpsApi = class {
 				return;
 			}
 		}
+		if (issueResult != null) {
+			const issueType = issueResult.fields["System.WorkItemType"];
+			const state = issueResult.fields["System.State"];
+			const stateCategory = await this.getWorkItemStateCategory(issueType, state, provider, token, project.resourceName, project.name, options);
+			return fromAzureWorkItem(issueResult, provider, project, stateCategory, "point");
+		}
 	}
 	async getAccountForCommit(provider, token, owner, repo, rev, baseUrl, _options) {
 		const scope = getScopedLogger();
@@ -279,26 +253,13 @@ var AzureDevOpsApi = class {
 		}
 	}
 	async getWorkItemStateCategory(issueType, state, provider, token, owner, projectName, options) {
-		const project = JSON.stringify([
-			options.baseUrl,
-			owner,
-			projectName
-		]);
-		const category = this._workItemStates.getStateCategory(project, issueType, state);
-		if (category != null) return category;
-		const states = await this.retrieveWorkItemTypeStates(issueType, provider, token, owner, projectName, options);
-		this._workItemStates.saveTypeStates(project, issueType, states);
-		return this._workItemStates.getStateCategory(project, issueType, state);
-	}
-	async retrieveWorkItemTypeStates(workItemType, provider, token, owner, projectName, options) {
-		const scope = getScopedLogger();
-		try {
-			return (await this.request(provider, token, options?.baseUrl, `${encodeAzurePathSegment(owner)}/${encodeAzurePathSegment(projectName)}/_apis/wit/workItemTypes/${encodeAzurePathSegment(workItemType)}/states`, { method: "GET" }, scope))?.value ?? [];
-		} catch (ex) {
-			if (ex instanceof AuthenticationError) throw ex;
-			scope?.error(ex);
-			return [];
-		}
+		return (await this._workItemStates.getStates({
+			baseUrl: options.baseUrl,
+			namespace: owner,
+			project: projectName,
+			token: token.accessToken,
+			isPAT: true
+		}, issueType, () => this.request(provider, token, options.baseUrl, getAzureWorkItemTypeStatesPath(owner, projectName, issueType), { method: "GET" }, void 0))).find((s) => s.name === state)?.category;
 	}
 	async getRepositoryMetadata(provider, token, owner, repo, options, cancellation) {
 		const scope = getScopedLogger();
@@ -638,8 +599,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) {
-	return new AzureDevOpsApi(baseProviderApiConfig(ctx));
+function createAzureDevOpsApi(ctx, workItemStates) {
+	return new AzureDevOpsApi(baseProviderApiConfig(ctx), workItemStates);
 }
 //#endregion
 export { AzureDevOpsApi, createAzureDevOpsApi };