@detergent-software/atk 8.0.2 → 8.0.3-dev.1

package/build/lib/api-client.d.ts

@@ -1,79 +1,76 @@
 /**
- * Hand-written wrapper around the generated ATK API client (`src/lib/api/`).
+ * CLI wiring for the shared ATK API client (`./atk-api`, vendored from
+ * packages/api-client). Owns only what is CLI-specific:
+ * - base URL resolution (`ATK_API_URL` env > `apiUrl` config > production);
+ * - the credential chain (`getCredential`) as the client's `getToken`;
+ * - the Sunset-observing base fetch (deleted in step 5d);
+ * - the CLI's words for a failed call: {@link presentProblem} turns an
+ *   AtkError into the message, hint and command the CLI has always shown, and
+ *   {@link callApi} throws them as an {@link ApiRequestError}.
  *
- * Owns three concerns the generated code does not:
- * - Base URL resolution (`ATK_API_URL` env > `apiUrl` config > production).
- * - Wiring: bearer auth from the credential chain (`getCredential`) and
- *   retries through {@link fetchWithRetry}; `Sunset` headers become notices.
- * - Error mapping: every non-2xx result becomes an {@link ApiRequestError}
- *   with a stable `code`, an HTTP `status`, and CLI-friendly message/hint text.
- *
- * Nothing outside this module may import the generated default client in
- * `api/client.gen.ts`; it is generated without a base URL or auth, and an
- * ESLint `no-restricted-imports` rule enforces this.
+ * Call sites read as `await callApi('your identity', (atk) => atk.me())`.
  */
-import type { ApiErrorDetail } from './api/types.gen.js';
-import { type Client } from './api/client/index.js';
-export type { ApiErrorDetail } from './api/types.gen.js';
+import { type AtkClient, type AtkError } from './atk-api/index.js';
 /** Production ATK API. Used when neither `ATK_API_URL` nor `apiUrl` is set. */
 export declare const DEFAULT_API_URL = "https://func-atk-prod.azurewebsites.net";
 /** Environment variable that overrides the configured API base URL. */
 export declare const API_URL_ENV_VAR = "ATK_API_URL";
-/** Shape of a generated SDK call result with `throwOnError: false` and `responseStyle: 'fields'`. */
-export interface ApiResult<T> {
-    data?: T;
-    error?: unknown;
-    response?: Response;
-}
 /**
- * Thrown by {@link unwrap} for any failed ATK API call.
+ * Thrown by {@link callApi} for any failed ATK API call.
  *
  * `status` is the HTTP status (0 for a network failure). `code` is the API's
  * machine-readable error code (`not_found`, `version_not_bumped`, ...), or a
  * synthetic one (`network_error`, `http_error`) when the API did not send an
- * envelope. `details` carries per-item validation problems when present.
+ * envelope.
  */
 export declare class ApiRequestError extends Error {
     code: string;
     command?: string;
-    details?: ApiErrorDetail[];
     hint?: string;
     status: number;
     constructor(message: string, options: {
         code: string;
         command?: string;
-        details?: ApiErrorDetail[];
         hint?: string;
         status: number;
     });
 }
 /**
- * Build an ATK API client for a specific token (no process-wide caching).
+ * Run one API call, turning an AtkError into an {@link ApiRequestError}
+ * worded for `resource`. Anything else (an AuthError from the credential
+ * chain, a config error) propagates unchanged.
  *
- * Used where the token must be the one given rather than the resolved one,
- * e.g. `validateToken` in `atk doctor`.
+ * @param resource - Human-readable name of what was requested (used in messages)
+ * @param client - A specific client ({@link getAtkForToken}); the process-wide one by default
  */
-export declare function createApiClientForToken(token: string, baseUrl: string): Client;
+export declare function callApi<T>(resource: string, call: (atk: AtkClient) => Promise<T>, client?: AtkClient): Promise<T>;
 /**
- * The API error code (`branch_exists`, `not_found`, ...) of a raw generated-client
- * `error`, or undefined when the error is not the API's envelope.
+ * The process-wide client. Built once: base URL from {@link resolveApiUrl},
+ * bearer token resolved per request through `getCredential()`.
  */
-export declare function errorCodeOf(error: unknown): string | undefined;
+export declare function getAtk(): Promise<AtkClient>;
 /**
- * Get the process-wide ATK API client.
- *
- * Built once: base URL from {@link resolveApiUrl}, bearer auth resolved
- * lazily per request via `getCredential()`, and every request routed
- * through {@link fetchWithRetry}.
+ * A client bound to one explicit token, never the process-cached one
+ * (`atk login` confirming a fresh session, `atk doctor` validating a token).
  */
-export declare function getApiClient(): Promise<Client>;
+export declare function getAtkForToken(token: string, baseUrl: string): AtkClient;
 /**
  * Type guard for {@link ApiRequestError}, optionally narrowed by API error
  * code and/or HTTP status.
  */
 export declare function isApiError(err: unknown, code?: string, status?: number): err is ApiRequestError;
 /**
- * Drop the memoised client so the next {@link getApiClient} call rebuilds it.
+ * The CLI's words for a failed call: the message (matching what the CLI
+ * showed before the API existed, where such a message existed), plus the hint
+ * and command that go with it. Exhaustive over the problem kinds.
+ */
+export declare function presentProblem(error: AtkError, resource: string): {
+    command?: string;
+    hint?: string;
+    message: string;
+};
+/**
+ * Drop the memoised client so the next {@link getAtk} call rebuilds it.
  * Intended for tests and for commands that change `apiUrl` mid-process.
  */
 export declare function resetApiClient(): void;
@@ -81,17 +78,11 @@ export declare function resetApiClient(): void;
  * Resolve the ATK API base URL.
  *
  * Precedence: `ATK_API_URL` env var > `apiUrl` from `~/.atkrc.json` > production.
- * A trailing slash is stripped so the generated client can append paths.
+ * A trailing slash is stripped so paths can be appended.
  */
 export declare function resolveApiUrl(config?: {
     apiUrl?: string;
 }): string;
-/**
- * Convert a generated-client result into its `data`, or throw an
- * {@link ApiRequestError} describing why the call failed.
- *
- * @param result - The `{ data, error, response }` object returned by an SDK function
- * @param resource - Human-readable name of what was requested (used in messages)
- */
-export declare function unwrap<T>(result: ApiResult<T>, resource: string): T;
+/** An AtkError as the {@link ApiRequestError} the CLI shows for `resource`. */
+export declare function toApiRequestError(error: AtkError, resource: string): ApiRequestError;
 //# sourceMappingURL=api-client.d.ts.map

package/build/lib/api-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAMlE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,+EAA+E;AAC/E,eAAO,MAAM,eAAe,4CAA4C,CAAC;AAEzE,uEAAuE;AACvE,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C,qGAAqG;AACrG,MAAM,WAAW,SAAS,CAAC,CAAC;IAC1B,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AASD;;;;;;;GAOG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;gBAGb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAUzG;AAoBD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAO9E;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAK9D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAG9C;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,eAAe,CAW/F;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAErC;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAIlE;AAED;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAwBnE"}
+{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAA+B,MAAM,oBAAoB,CAAC;AAKhG,+EAA+E;AAC/E,eAAO,MAAM,eAAe,4CAA4C,CAAC;AAEzE,uEAAuE;AACvE,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C;;;;;;;GAOG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;gBAEH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAQxG;AAwBD;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,EACpC,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,CAAC,CAAC,CAOZ;AAED;;;GAGG;AACH,wBAAgB,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAS3C;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAExE;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,eAAe,CAW/F;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,MAAM,GACf;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CA+DtD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAErC;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAIlE;AAED,+EAA+E;AAC/E,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,eAAe,CAIpF"}

package/build/lib/api-client.js

@@ -1,38 +1,34 @@
 /**
- * Hand-written wrapper around the generated ATK API client (`src/lib/api/`).
+ * CLI wiring for the shared ATK API client (`./atk-api`, vendored from
+ * packages/api-client). Owns only what is CLI-specific:
+ * - base URL resolution (`ATK_API_URL` env > `apiUrl` config > production);
+ * - the credential chain (`getCredential`) as the client's `getToken`;
+ * - the Sunset-observing base fetch (deleted in step 5d);
+ * - the CLI's words for a failed call: {@link presentProblem} turns an
+ *   AtkError into the message, hint and command the CLI has always shown, and
+ *   {@link callApi} throws them as an {@link ApiRequestError}.
  *
- * Owns three concerns the generated code does not:
- * - Base URL resolution (`ATK_API_URL` env > `apiUrl` config > production).
- * - Wiring: bearer auth from the credential chain (`getCredential`) and
- *   retries through {@link fetchWithRetry}; `Sunset` headers become notices.
- * - Error mapping: every non-2xx result becomes an {@link ApiRequestError}
- *   with a stable `code`, an HTTP `status`, and CLI-friendly message/hint text.
- *
- * Nothing outside this module may import the generated default client in
- * `api/client.gen.ts`; it is generated without a base URL or auth, and an
- * ESLint `no-restricted-imports` rule enforces this.
+ * Call sites read as `await callApi('your identity', (atk) => atk.me())`.
  */
-import { createClient } from './api/client/index.js';
+import { createAtkClient, isAtkError } from './atk-api/index.js';
 import { getCredential } from './auth.js';
 import { loadConfig } from './config.js';
-import { fetchWithRetry } from './fetch-retry.js';
 import { addNotice } from './notices.js';
 /** Production ATK API. Used when neither `ATK_API_URL` nor `apiUrl` is set. */
 export const DEFAULT_API_URL = 'https://func-atk-prod.azurewebsites.net';
 /** Environment variable that overrides the configured API base URL. */
 export const API_URL_ENV_VAR = 'ATK_API_URL';
 /**
- * Thrown by {@link unwrap} for any failed ATK API call.
+ * Thrown by {@link callApi} for any failed ATK API call.
  *
  * `status` is the HTTP status (0 for a network failure). `code` is the API's
  * machine-readable error code (`not_found`, `version_not_bumped`, ...), or a
  * synthetic one (`network_error`, `http_error`) when the API did not send an
- * envelope. `details` carries per-item validation problems when present.
+ * envelope.
  */
 export class ApiRequestError extends Error {
     code;
     command;
-    details;
     hint;
     status;
     constructor(message, options) {
@@ -40,7 +36,6 @@ export class ApiRequestError extends Error {
         this.name = 'ApiRequestError';
         this.status = options.status;
         this.code = options.code;
-        this.details = options.details;
         this.hint = options.hint;
         this.command = options.command;
     }
@@ -54,43 +49,49 @@ const NOT_MEMBER_HINT = 'Ask an org admin to add you, or re-authorise your token
 const UNAVAILABLE_HINT = 'The registry may be temporarily unavailable. Retry in a moment.';
 const AMBIGUOUS_NAME_HINT = 'Pass `--type <type>` (or `--type bundle`) to choose one.';
 const REGISTRY_CHANGED_HINT = 'The registry changed while the pull request was being prepared. Retry the command.';
-/** Error codes whose `details` list the items the message refers to (one per line). */
-const LISTING_CODES = new Set(['ambiguous_name', 'bundle_scope_invalid', 'referenced_by_bundles']);
-let clientPromise;
+/** `ApiRequestError.code` for problems the client made itself (no API code to carry). */
+const SYNTHETIC_CODES = {
+    invalid_input: 'invalid_input',
+    network: 'network_error',
+    unexpected_response: 'unexpected_response',
+};
+let atkPromise;
 /**
- * Build an ATK API client for a specific token (no process-wide caching).
+ * Run one API call, turning an AtkError into an {@link ApiRequestError}
+ * worded for `resource`. Anything else (an AuthError from the credential
+ * chain, a config error) propagates unchanged.
  *
- * Used where the token must be the one given rather than the resolved one,
- * e.g. `validateToken` in `atk doctor`.
+ * @param resource - Human-readable name of what was requested (used in messages)
+ * @param client - A specific client ({@link getAtkForToken}); the process-wide one by default
  */
-export function createApiClientForToken(token, baseUrl) {
-    return createClient({
-        auth: () => token,
-        baseUrl,
-        fetch: observingFetch,
-        throwOnError: false,
-    });
+export async function callApi(resource, call, client) {
+    const atk = client ?? (await getAtk());
+    try {
+        return await call(atk);
+    }
+    catch (err) {
+        throw isAtkError(err) ? toApiRequestError(err, resource) : err;
+    }
 }
 /**
- * The API error code (`branch_exists`, `not_found`, ...) of a raw generated-client
- * `error`, or undefined when the error is not the API's envelope.
+ * The process-wide client. Built once: base URL from {@link resolveApiUrl},
+ * bearer token resolved per request through `getCredential()`.
  */
-export function errorCodeOf(error) {
-    if (typeof error === 'object' && error !== null && typeof error.error === 'string') {
-        return error.error;
-    }
-    return undefined;
+export function getAtk() {
+    atkPromise ??= (async () => createAtkClient({
+        app: 'cli',
+        baseUrl: resolveApiUrl(await loadConfig()),
+        fetch: observingFetch,
+        getToken: async () => (await getCredential()).token,
+    }))();
+    return atkPromise;
 }
 /**
- * Get the process-wide ATK API client.
- *
- * Built once: base URL from {@link resolveApiUrl}, bearer auth resolved
- * lazily per request via `getCredential()`, and every request routed
- * through {@link fetchWithRetry}.
+ * A client bound to one explicit token, never the process-cached one
+ * (`atk login` confirming a fresh session, `atk doctor` validating a token).
  */
-export function getApiClient() {
-    clientPromise ??= buildClient();
-    return clientPromise;
+export function getAtkForToken(token, baseUrl) {
+    return createAtkClient({ app: 'cli', baseUrl, fetch: observingFetch, getToken: async () => token });
 }
 /**
  * Type guard for {@link ApiRequestError}, optionally narrowed by API error
@@ -109,59 +110,96 @@ export function isApiError(err, code, status) {
     return true;
 }
 /**
- * Drop the memoised client so the next {@link getApiClient} call rebuilds it.
+ * The CLI's words for a failed call: the message (matching what the CLI
+ * showed before the API existed, where such a message existed), plus the hint
+ * and command that go with it. Exhaustive over the problem kinds.
+ */
+export function presentProblem(error, resource) {
+    const { apiCode, apiMessage, problem, status } = error;
+    const fallback = { message: apiMessage ?? `Failed to fetch ${resource}: HTTP ${status}` };
+    const listing = (lines) => [apiMessage, ...lines.map((line) => `  - ${line}`)].join('\n');
+    switch (problem.kind) {
+        case 'ambiguous':
+            return apiMessage ? { hint: AMBIGUOUS_NAME_HINT, message: listing(problem.candidates) } : fallback;
+        case 'auth_retired':
+            // The API's message names the date and the upgrade path; show it as-is.
+            return apiMessage
+                ? { command: AUTH_COMMAND, message: apiMessage }
+                : { command: AUTH_COMMAND, hint: AUTH_HINT, message: AUTH_MESSAGE };
+        case 'conflict':
+            if ((problem.code === 'referenced_by_bundles' || problem.code === 'bundle_scope_invalid') && apiMessage) {
+                return { message: listing(problem.items) };
+            }
+            if (problem.code === 'registry_changed') {
+                return { hint: REGISTRY_CHANGED_HINT, message: apiMessage ?? 'The registry changed.' };
+            }
+            return fallback;
+        case 'forbidden':
+            if (problem.code === 'not_org_member' || problem.code === 'org_membership_unverifiable') {
+                return { hint: NOT_MEMBER_HINT, message: NOT_MEMBER_MESSAGE };
+            }
+            if (problem.code === 'guest_not_allowed' && apiMessage) {
+                return { hint: GUEST_HINT, message: apiMessage };
+            }
+            return { message: apiMessage ?? `Access denied while fetching ${resource}.` };
+        case 'invalid':
+            if ((problem.code === 'validation_failed' || problem.code === 'schema_invalid') && problem.issues.length > 0) {
+                const lines = problem.issues.map((issue) => `  ${issue.path ?? '-'}: ${issue.message}`);
+                return { message: [apiMessage ?? 'Validation failed.', ...lines].join('\n') };
+            }
+            return fallback;
+        case 'invalid_input':
+            return { message: problem.message };
+        case 'network':
+            return { hint: 'Check your internet connection.', message: `Failed to fetch ${resource}: ${problem.message}` };
+        case 'not_found':
+            return { message: apiMessage ?? `${resource} not found.` };
+        case 'rate_limited':
+            return {
+                hint: 'Wait a minute and retry.',
+                message: apiMessage ?? 'Too many requests to the ATK API. Try again later.',
+            };
+        case 'server_error':
+        case 'unavailable': {
+            if (status < 500) {
+                return fallback;
+            }
+            const detail = apiMessage ? ` (${apiCode ?? 'http_error'}: ${apiMessage})` : '';
+            return { hint: UNAVAILABLE_HINT, message: `Failed to fetch ${resource}: HTTP ${status}${detail}` };
+        }
+        case 'unauthenticated':
+            return { command: AUTH_COMMAND, hint: AUTH_HINT, message: AUTH_MESSAGE };
+        case 'unexpected_response':
+            return { message: `Unexpected response for ${resource}: ${problem.message}` };
+        default: {
+            const unhandled = problem;
+            return unhandled;
+        }
+    }
+}
+/**
+ * Drop the memoised client so the next {@link getAtk} call rebuilds it.
  * Intended for tests and for commands that change `apiUrl` mid-process.
  */
 export function resetApiClient() {
-    clientPromise = undefined;
+    atkPromise = undefined;
 }
 /**
  * Resolve the ATK API base URL.
  *
  * Precedence: `ATK_API_URL` env var > `apiUrl` from `~/.atkrc.json` > production.
- * A trailing slash is stripped so the generated client can append paths.
+ * A trailing slash is stripped so paths can be appended.
  */
 export function resolveApiUrl(config) {
     const envUrl = process.env[API_URL_ENV_VAR]?.trim();
     const raw = envUrl || config?.apiUrl?.trim() || DEFAULT_API_URL;
     return raw.replace(/\/+$/, '');
 }
-/**
- * Convert a generated-client result into its `data`, or throw an
- * {@link ApiRequestError} describing why the call failed.
- *
- * @param result - The `{ data, error, response }` object returned by an SDK function
- * @param resource - Human-readable name of what was requested (used in messages)
- */
-export function unwrap(result, resource) {
-    const { data, error, response } = result;
-    if (response === undefined) {
-        // The client's auth hook (getCredential) threw before any request was
-        // sent: surface it as the auth problem it is, hint and command intact.
-        if (isAuthError(error)) {
-            throw error;
-        }
-        // The fetch itself threw (DNS, connection refused, abort, ...).
-        const cause = error instanceof Error ? error.message : error ? String(error) : 'Network request failed';
-        throw new ApiRequestError(`Failed to fetch ${resource}: ${cause}`, {
-            code: 'network_error',
-            hint: 'Check your internet connection.',
-            status: 0,
-        });
-    }
-    if (response.ok && error === undefined) {
-        return data;
-    }
-    throw toApiRequestError(response.status, error, resource);
-}
-async function buildClient() {
-    const config = await loadConfig();
-    return createClient({
-        auth: async () => (await getCredential()).token,
-        baseUrl: resolveApiUrl(config),
-        fetch: observingFetch,
-        throwOnError: false,
-    });
+/** An AtkError as the {@link ApiRequestError} the CLI shows for `resource`. */
+export function toApiRequestError(error, resource) {
+    const { message, ...guidance } = presentProblem(error, resource);
+    const code = error.apiCode ?? SYNTHETIC_CODES[error.problem.kind] ?? 'http_error';
+    return new ApiRequestError(message, { code, ...guidance, status: error.status });
 }
 /** `Sunset` is an HTTP-date; show it as `YYYY-MM-DD`, or verbatim if unparseable. */
 function formatSunsetDate(headerValue) {
@@ -169,101 +207,17 @@ function formatSunsetDate(headerValue) {
     return Number.isNaN(parsed.getTime()) ? headerValue : parsed.toISOString().slice(0, 10);
 }
 /**
- * Recognise an {@link AuthError} by name rather than by `instanceof` so the
- * check holds even when `./auth.js` is module-mocked (as most command tests do).
- */
-function isAuthError(err) {
-    return err instanceof Error && err.name === 'AuthError';
-}
-function isErrorEnvelope(value) {
-    return (typeof value === 'object' &&
-        value !== null &&
-        typeof value.error === 'string' &&
-        typeof value.message === 'string');
-}
-/**
- * {@link fetchWithRetry} plus response observation: a `Sunset` header (sent
- * on GitHub-authenticated requests while a GitHub sign-in cutoff is
- * scheduled) records a once-per-run notice for the App shell.
+ * The client's base fetch: `globalThis.fetch` (looked up per request) plus
+ * response observation. A `Sunset` header (sent on GitHub-authenticated
+ * requests while a GitHub sign-in cutoff is scheduled) records a once-per-run
+ * notice for the App shell. It must not retry: the client retries around it.
  */
 async function observingFetch(input, init) {
-    const response = await fetchWithRetry(input, init);
+    const response = await globalThis.fetch(input, init);
     const sunset = response.headers.get('Sunset');
     if (sunset) {
         addNotice({ date: formatSunsetDate(sunset), kind: 'github-sunset' });
     }
     return response;
 }
-/**
- * Map an HTTP status plus the API's error envelope (when present) to an
- * {@link ApiRequestError} whose message matches what the CLI showed before
- * the API existed, where such a message existed.
- */
-function toApiRequestError(status, error, resource) {
-    const envelope = isErrorEnvelope(error) ? error : undefined;
-    const code = envelope?.error ?? 'http_error';
-    const apiMessage = envelope?.message ?? (typeof error === 'string' && error ? error : undefined);
-    const details = envelope?.details ?? undefined;
-    if (status === 401) {
-        if (code === 'github_auth_retired' && apiMessage) {
-            // The API's message names the date and the upgrade path; show it as-is.
-            return new ApiRequestError(apiMessage, { code, command: AUTH_COMMAND, status });
-        }
-        return new ApiRequestError(AUTH_MESSAGE, { code, command: AUTH_COMMAND, hint: AUTH_HINT, status });
-    }
-    if (status === 403) {
-        if (code === 'not_org_member' || code === 'org_membership_unverifiable') {
-            return new ApiRequestError(NOT_MEMBER_MESSAGE, { code, hint: NOT_MEMBER_HINT, status });
-        }
-        if (code === 'guest_not_allowed' && apiMessage) {
-            return new ApiRequestError(apiMessage, { code, hint: GUEST_HINT, status });
-        }
-        return new ApiRequestError(apiMessage ?? `Access denied while fetching ${resource}.`, { code, status });
-    }
-    if (status === 404) {
-        return new ApiRequestError(apiMessage ?? `${resource} not found.`, { code, status });
-    }
-    if (status === 429) {
-        return new ApiRequestError(apiMessage ?? 'Too many requests to the ATK API. Try again later.', {
-            code,
-            hint: 'Wait a minute and retry.',
-            status,
-        });
-    }
-    if (status === 400 && (code === 'validation_failed' || code === 'schema_invalid') && details?.length) {
-        const lines = details.map((d) => `  ${d.path ?? '-'}: ${d.message}`);
-        return new ApiRequestError([apiMessage ?? 'Validation failed.', ...lines].join('\n'), { code, details, status });
-    }
-    if (LISTING_CODES.has(code) && apiMessage) {
-        // The message is one sentence; the candidates / bundles / refs are in details.
-        const lines = (details ?? []).map((d) => `  - ${d.message}`);
-        return new ApiRequestError([apiMessage, ...lines].join('\n'), {
-            code,
-            details,
-            ...(code === 'ambiguous_name' ? { hint: AMBIGUOUS_NAME_HINT } : {}),
-            status,
-        });
-    }
-    if (code === 'registry_changed') {
-        return new ApiRequestError(apiMessage ?? 'The registry changed.', {
-            code,
-            hint: REGISTRY_CHANGED_HINT,
-            status,
-        });
-    }
-    if (status >= 500) {
-        const detail = apiMessage ? ` (${code}: ${apiMessage})` : '';
-        return new ApiRequestError(`Failed to fetch ${resource}: HTTP ${status}${detail}`, {
-            code,
-            hint: UNAVAILABLE_HINT,
-            status,
-        });
-    }
-    // 400/409 and anything else: the API message is the best text we have.
-    return new ApiRequestError(apiMessage ?? `Failed to fetch ${resource}: HTTP ${status}`, {
-        code,
-        details,
-        status,
-    });
-}
 //# sourceMappingURL=api-client.js.map

package/build/lib/api-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"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"}