@uapkg/cli 1.1.9 → 1.2.0

package/dist/commands/RequestsCommand.js

@@ -0,0 +1,98 @@
+import { describeControlPlaneError } from '../control-plane/AccountManager.js';
+import { ControlPlaneClient } from '../control-plane/ControlPlaneClient.js';
+import { ControlPlaneError } from '../control-plane/ControlPlaneTypes.js';
+const TERMINAL_STATUSES = new Set([
+    'ready',
+    'ready_superseded',
+    'rejected',
+    'operationally_failed',
+]);
+export class RequestsCommand {
+    root;
+    options;
+    constructor(root, options) {
+        this.root = root;
+        this.options = options;
+    }
+    async execute() {
+        try {
+            const trust = await this.root.registryTrustResolver.resolve(this.options.registry);
+            let authentication = await this.root.accountManager.getAccessCredential(trust, ['publishing.request.read.self']);
+            const client = new ControlPlaneClient(trust.apiBaseUrl);
+            if (this.options.action === 'list') {
+                const requests = await client.listRegistryRequests(authentication.credential, trust.registryId, this.options.status);
+                this.printList(requests, trust.alias);
+                return 0;
+            }
+            if (!this.options.requestId)
+                throw new Error('`uapkg requests status` requires a request ID.');
+            let request = await client.getRegistryRequest(authentication.credential, this.options.requestId);
+            if (this.options.watch) {
+                let lastStatus = '';
+                while (!TERMINAL_STATUSES.has(request.status)) {
+                    if (this.options.outputFormat === 'text' && request.status !== lastStatus) {
+                        process.stdout.write(`${request.id}: ${request.status}${request.currentStep ? ` (${request.currentStep})` : ''}\n`);
+                        lastStatus = request.status;
+                    }
+                    await delay(2_000);
+                    try {
+                        request = await client.getRegistryRequest(authentication.credential, this.options.requestId);
+                    }
+                    catch (error) {
+                        if (!(error instanceof ControlPlaneError) || error.status !== 401)
+                            throw error;
+                        this.root.accountManager.invalidateAccessCredentials(trust);
+                        authentication = await this.root.accountManager.getAccessCredential(trust, [
+                            'publishing.request.read.self',
+                        ]);
+                        request = await client.getRegistryRequest(authentication.credential, this.options.requestId);
+                    }
+                }
+            }
+            this.printRequest(request, trust.alias);
+            return isSuccessStatus(request.status) || !TERMINAL_STATUSES.has(request.status) ? 0 : 1;
+        }
+        catch (error) {
+            process.stderr.write(`${describeControlPlaneError(error)}\n`);
+            return 1;
+        }
+    }
+    printList(requests, registryAlias) {
+        if (this.options.outputFormat === 'json') {
+            process.stdout.write(`${JSON.stringify({ ok: true, registry: registryAlias, requests })}\n`);
+            return;
+        }
+        if (requests.length === 0) {
+            process.stdout.write(`No publishing requests found for "${registryAlias}".\n`);
+            return;
+        }
+        for (const value of requests) {
+            const packageCoordinate = value.payload?.packageName
+                ? ` ${value.payload.packageName}${value.payload.packageVersion ? `@${value.payload.packageVersion}` : ''}`
+                : '';
+            process.stdout.write(`${value.id} ${value.status} ${value.kind}${packageCoordinate}\n`);
+        }
+    }
+    printRequest(request, registryAlias) {
+        const value = request;
+        if (this.options.outputFormat === 'json') {
+            const ok = isSuccessStatus(value.status) || !TERMINAL_STATUSES.has(value.status);
+            process.stdout.write(`${JSON.stringify({ ok, registry: registryAlias, request })}\n`);
+            return;
+        }
+        process.stdout.write(`Request: ${value.id}\n`);
+        process.stdout.write(`Status: ${value.status}\n`);
+        if (value.currentStep)
+            process.stdout.write(`Step: ${value.currentStep}\n`);
+        if (value.payload?.packageName) {
+            process.stdout.write(`Package: ${value.payload.packageName}${value.payload.packageVersion ? `@${value.payload.packageVersion}` : ''}\n`);
+        }
+    }
+}
+function isSuccessStatus(status) {
+    return status === 'ready' || status === 'ready_superseded';
+}
+function delay(milliseconds) {
+    return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+//# sourceMappingURL=RequestsCommand.js.map

package/dist/commands/RequestsCommand.js.map

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

package/dist/commands/WhoamiCommand.d.ts

@@ -0,0 +1,32 @@
+import type { CompositionRoot } from '../app/CompositionRoot.js';
+import type { UAPKGOutputFormat, UAPKGWhoamiField } from '../cli/UAPKGCommandLine.js';
+import type { Command } from './Command.js';
+export interface WhoamiCommandOptions {
+    readonly field?: UAPKGWhoamiField;
+    readonly registry?: string;
+    readonly outputFormat: UAPKGOutputFormat;
+}
+export interface WhoamiCommandData {
+    readonly account: {
+        readonly id: string;
+        readonly username: string;
+        readonly displayName: string;
+    };
+    readonly registry: {
+        readonly id: string;
+        readonly name: string;
+        readonly alias: string;
+    };
+    readonly deviceName: string;
+}
+export interface WhoamiFieldData {
+    readonly field: UAPKGWhoamiField;
+    readonly value: string;
+}
+export declare class WhoamiCommand implements Command {
+    private readonly root;
+    private readonly options;
+    constructor(root: CompositionRoot, options: WhoamiCommandOptions);
+    execute(): Promise<number>;
+}
+//# sourceMappingURL=WhoamiCommand.d.ts.map

package/dist/commands/WhoamiCommand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WhoamiCommand.d.ts","sourceRoot":"","sources":["../../src/commands/WhoamiCommand.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGtF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,aAAc,YAAW,OAAO;IAEzC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBADP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,oBAAoB;IAGnC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAiDxC"}

package/dist/commands/WhoamiCommand.js

@@ -0,0 +1,75 @@
+import { controlPlaneDiagnosticForError, describeControlPlaneError } from '../control-plane/AccountManager.js';
+import { ControlPlaneClient } from '../control-plane/ControlPlaneClient.js';
+export class WhoamiCommand {
+    root;
+    options;
+    constructor(root, options) {
+        this.root = root;
+        this.options = options;
+    }
+    async execute() {
+        try {
+            const trust = await this.root.registryTrustResolver.resolve(this.options.registry);
+            const access = await this.root.accountManager.getAccessCredential(trust, ['identity.self.read']);
+            const self = await new ControlPlaneClient(trust.apiBaseUrl).getSelf(access.credential);
+            if (self.registry.id !== trust.registryId || self.grant.id !== access.grant.grantId) {
+                throw new Error('The control plane returned identity information for an unexpected registry grant.');
+            }
+            const data = {
+                account: self.account,
+                registry: { id: trust.registryId, name: trust.registryName, alias: trust.alias },
+                deviceName: self.grant.deviceName,
+            };
+            if (this.options.field) {
+                const fieldData = {
+                    field: this.options.field,
+                    value: selectedFieldValue(this.options.field, data),
+                };
+                if (this.options.outputFormat === 'json') {
+                    this.root.json.emitSuccess('whoami', fieldData);
+                }
+                else {
+                    process.stdout.write(`${fieldData.value}\n`);
+                }
+                return 0;
+            }
+            if (this.options.outputFormat === 'json') {
+                this.root.json.emitSuccess('whoami', data);
+            }
+            else {
+                process.stdout.write(`Username: ${data.account.username}\n`);
+                process.stdout.write(`User ID: ${data.account.id}\n`);
+                process.stdout.write(`Display Name: ${data.account.displayName}\n`);
+                process.stdout.write(`Registry: ${data.registry.name}\n`);
+                process.stdout.write(`Registry ID: ${data.registry.id}\n`);
+                process.stdout.write(`Registry Alias: ${data.registry.alias}\n`);
+                process.stdout.write(`Device: ${data.deviceName}\n`);
+            }
+            return 0;
+        }
+        catch (error) {
+            if (this.options.outputFormat === 'json') {
+                this.root.json.emitError('whoami', [controlPlaneDiagnosticForError(error, 'whoami')]);
+            }
+            else {
+                process.stderr.write(`${describeControlPlaneError(error)}\n`);
+            }
+            return 1;
+        }
+    }
+}
+function selectedFieldValue(field, data) {
+    switch (field) {
+        case 'username':
+            return data.account.username;
+        case 'user-id':
+            return data.account.id;
+        case 'registry':
+            return data.registry.name;
+        case 'registry-id':
+            return data.registry.id;
+        default:
+            return field;
+    }
+}
+//# sourceMappingURL=WhoamiCommand.js.map

package/dist/commands/WhoamiCommand.js.map

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

package/dist/commands/add/DependencyAddResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DependencyAddResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/add/DependencyAddResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAA8C,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,qBAAa,qBAAqB;IACb,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,eAAe;IAE5C,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;CAgC5G"}
+{"version":3,"file":"DependencyAddResolver.d.ts","sourceRoot":"","sources":["../../../src/commands/add/DependencyAddResolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAA8C,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,qBAAa,qBAAqB;IACb,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,eAAe;IAE5C,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;CAoC5G"}

package/dist/commands/add/DependencyAddResolver.js

@@ -1,4 +1,4 @@
-import { RegistryNameSchema, VersionRangeSchema } from '@uapkg/common-schema';
+import { DEFAULT_REGISTRY_ALIAS, RegistryNameSchema, VersionRangeSchema } from '@uapkg/common-schema';
 import { createRegistryNotFoundDiagnostic, fail, ok } from '@uapkg/diagnostics';
 /**
  * Resolves an `add` request against the selected registry before mutating the
@@ -24,10 +24,12 @@ export class DependencyAddResolver {
         if (!resolution.ok)
             return resolution;
         const dependencyRange = spec.range ?? VersionRangeSchema.parse(`^${resolution.value.version}`);
+        // Only an explicit non-default --registry is recorded; the default alias stays absent in the manifest.
+        const recordedRegistry = registryNameInput !== undefined && registryName !== DEFAULT_REGISTRY_ALIAS ? registryName : undefined;
         return ok({
             dependency: {
                 version: dependencyRange,
-                registry: registryName,
+                ...(recordedRegistry !== undefined ? { registry: recordedRegistry } : {}),
             },
             resolvedVersion: resolution.value.version,
         }, resolution.diagnostics);

package/dist/commands/add/DependencyAddResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"DependencyAddResolver.js","sourceRoot":"","sources":["../../../src/commands/add/DependencyAddResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,gCAAgC,EAAE,IAAI,EAAE,EAAE,EAAe,MAAM,oBAAoB,CAAC;AAS7F;;;GAGG;AACH,MAAM,OAAO,qBAAqB;IACI;IAApC,YAAoC,IAAqB;QAArB,SAAI,GAAJ,IAAI,CAAiB;IAAG,CAAC;IAEtD,KAAK,CAAC,OAAO,CAAC,IAAiB,EAAE,iBAA0B;QAChE,MAAM,iBAAiB,GAAG,iBAAiB,IAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAmB,IAAI,SAAS,CAAC;QAChH,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3E,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,CAAC,gCAAgC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC;QAE7C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,CAAC,EAAE;YAAE,OAAO,cAA+B,CAAC;QAE/D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,IAAK,GAA+B,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,cAAc,CAC1D,IAAI,CAAC,IAAyB,EAC9B,cAAc,EACd,YAAY,CACb,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,EAAE;YAAE,OAAO,UAA2B,CAAC;QAEvD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,IAAI,kBAAkB,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/F,OAAO,EAAE,CACP;YACE,UAAU,EAAE;gBACV,OAAO,EAAE,eAAe;gBACxB,QAAQ,EAAE,YAAY;aACvB;YACD,eAAe,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO;SAC1C,EACD,UAAU,CAAC,WAAW,CACvB,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"DependencyAddResolver.js","sourceRoot":"","sources":["../../../src/commands/add/DependencyAddResolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,gCAAgC,EAAE,IAAI,EAAE,EAAE,EAAe,MAAM,oBAAoB,CAAC;AAS7F;;;GAGG;AACH,MAAM,OAAO,qBAAqB;IACI;IAApC,YAAoC,IAAqB;QAArB,SAAI,GAAJ,IAAI,CAAiB;IAAG,CAAC;IAEtD,KAAK,CAAC,OAAO,CAAC,IAAiB,EAAE,iBAA0B;QAChE,MAAM,iBAAiB,GAAG,iBAAiB,IAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAmB,IAAI,SAAS,CAAC;QAChH,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3E,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,CAAC,gCAAgC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC;QAE7C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,CAAC,EAAE;YAAE,OAAO,cAA+B,CAAC;QAE/D,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,IAAK,GAA+B,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,cAAc,CAC1D,IAAI,CAAC,IAAyB,EAC9B,cAAc,EACd,YAAY,CACb,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,EAAE;YAAE,OAAO,UAA2B,CAAC;QAEvD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,IAAI,kBAAkB,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/F,uGAAuG;QACvG,MAAM,gBAAgB,GACpB,iBAAiB,KAAK,SAAS,IAAI,YAAY,KAAK,sBAAsB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;QAExG,OAAO,EAAE,CACP;YACE,UAAU,EAAE;gBACV,OAAO,EAAE,eAAe;gBACxB,GAAG,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC1E;YACD,eAAe,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO;SAC1C,EACD,UAAU,CAAC,WAAW,CACvB,CAAC;IACJ,CAAC;CACF"}

package/dist/control-plane/AccountManager.d.ts

@@ -0,0 +1,110 @@
+import { type ControlPlaneCommandFailedDiagnostic, type ControlPlaneDiagnostic, type LoginDiagnosticCode } from '@uapkg/diagnostics';
+import { AuthMetadataStore } from './AuthMetadataStore.js';
+import { type ControlPlaneCredential } from './ControlPlaneClient.js';
+import { type RegistryGrantMetadata, type RegistryTrust, type UAPKGCliScope } from './ControlPlaneTypes.js';
+import { CredentialStore } from './CredentialStore.js';
+import { type RegistryGrantLock } from './RegistryGrantLock.js';
+export interface LoginOptions {
+    readonly deviceName?: string;
+    readonly reauthorize?: boolean;
+    readonly onProgress?: (event: LoginProgressEvent) => void;
+}
+export type LoginProgressEvent = {
+    readonly type: 'preparing';
+    readonly registryAlias: string;
+} | {
+    readonly type: 'opening-browser';
+} | {
+    readonly type: 'browser-open-failed';
+    readonly authorizationUrl: string;
+} | {
+    readonly type: 'waiting-for-decision';
+} | {
+    readonly type: 'approval-received';
+} | {
+    readonly type: 'saving-local-credentials';
+} | {
+    readonly type: 'confirming-with-service';
+};
+type LoginCompletionOutcome = 'success' | 'denied' | 'failed';
+export declare class LoginError extends Error {
+    readonly code: LoginDiagnosticCode;
+    readonly oauthError?: string | undefined;
+    constructor(code: LoginDiagnosticCode, message: string, oauthError?: string | undefined);
+}
+export interface LoginResult {
+    readonly grant: RegistryGrantMetadata;
+    readonly warnings: readonly string[];
+}
+export interface AccessCredential {
+    readonly credential: ControlPlaneCredential;
+    readonly grant: RegistryGrantMetadata;
+}
+export type BrowserOpener = (url: string) => Promise<void>;
+export declare class AccountManager {
+    private readonly metadata;
+    private readonly credentials;
+    private readonly openBrowser;
+    private readonly isInteractiveLogin;
+    private readonly interactiveLoginTimeoutMs;
+    private readonly interactiveLoginFinalizationTimeoutMs;
+    private readonly keyStore;
+    private readonly accessTokenCache;
+    private readonly grantOperationTails;
+    private readonly grantLock;
+    constructor(metadata?: AuthMetadataStore, credentials?: CredentialStore, openBrowser?: BrowserOpener, isInteractiveLogin?: () => boolean, grantLock?: RegistryGrantLock, interactiveLoginTimeoutMs?: number, interactiveLoginFinalizationTimeoutMs?: number);
+    hasGrant(trust: RegistryTrust): Promise<boolean>;
+    invalidateAccessCredentials(trust: RegistryTrust): void;
+    login(trust: RegistryTrust, options?: LoginOptions): Promise<LoginResult>;
+    getAccessCredential(trust: RegistryTrust, scopes: readonly UAPKGCliScope[]): Promise<AccessCredential>;
+    logout(trust: RegistryTrust, localOnly?: boolean): Promise<'not-logged-in' | 'removed'>;
+    private requireUsableGrant;
+    private revokeSavedGrant;
+    private activatePreparedGrant;
+    private reconcilePreparedGrant;
+    private persistPreparedGrant;
+    private rollbackPreparedGrant;
+    private cleanupPreviousLocalCredentials;
+    private revokeToken;
+    private discover;
+    private validateAuthorizationServer;
+    private assertIssuerSupportsScopes;
+    private client;
+    private assertPinnedTrust;
+    private assertInteractiveLogin;
+    private withDPoPNonceRetry;
+    private accessTokenCacheKey;
+    private serializeGrantOperation;
+}
+export interface LoopbackAuthorizationReceipt {
+    readonly url: URL;
+    complete(outcome: LoginCompletionOutcome): Promise<void>;
+}
+export declare class LoopbackAuthorizationReceiver {
+    private readonly server;
+    private readonly callbackPath;
+    private readonly expectedHost;
+    private readonly completionUrl;
+    readonly redirectUri: string;
+    private callbackPromise?;
+    private callbackResolve?;
+    private callbackReject?;
+    private receivedReceipt?;
+    private timeout?;
+    private state;
+    private terminalError?;
+    private pendingResponse?;
+    private completion?;
+    private constructor();
+    static listen(issuer: URL): Promise<LoopbackAuthorizationReceiver>;
+    waitForCallback(timeoutMs: number, registryAlias?: string): Promise<LoopbackAuthorizationReceipt>;
+    close(): void;
+    private receive;
+    private complete;
+    private terminate;
+}
+export declare function loginDiagnosticForError(error: unknown): ControlPlaneDiagnostic;
+export declare function controlPlaneDiagnosticForError(error: unknown, operation: string): ControlPlaneCommandFailedDiagnostic;
+export declare function describeControlPlaneError(error: unknown): string;
+export {};
+//# sourceMappingURL=AccountManager.d.ts.map

package/dist/control-plane/AccountManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AccountManager.d.ts","sourceRoot":"","sources":["../../src/control-plane/AccountManager.ts"],"names":[],"mappings":"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"}