@vertesia/cli 1.5.0-dev.20260905.011013Z → 1.5.0-dev.20260910.051115Z

package/README.md

@@ -32,3 +32,20 @@ See https://docs.vertesiahq.com/cli
 ## License
 
 Apache-2.0
+
+## Automatic token refresh
+
+Profile authentication refreshes short-lived access tokens using the refresh token in the native keychain.
+Concurrent commands coordinate through an exclusive localhost socket held until rotated credentials are saved.
+The OS releases ownership when the process exits; a slow keychain prompt does not expire the lock.
+Commands report waiting after five seconds and fail after 75 seconds without taking over a live owner's lock.
+A hash collision or an unrelated process occupying the selected port can cause contention, but cannot bypass coordination.
+Every process sharing a profile must use the updated CLI for this coordination to apply.
+
+After a failed proactive refresh, a stored access token is used only if it has more than five seconds remaining.
+Otherwise the original refresh error is surfaced. Failed exchanges do not delete stored refresh tokens.
+Saving a rotated replacement retries the same keychain write up to three times; it never repeats the token exchange.
+If saving still fails, the CLI reports the keychain error instead of reporting a successful refresh.
+A lost response after server-side rotation can still require interactive authentication.
+
+Refresh coordination uses the OS user identity and profile name, independently of home-directory overrides. If its local port is occupied, the CLI reports the address so you can identify the owning process. Coordination failures stop credential writes; allow loopback binding before retrying.

package/lib/profiles/auth-lock.d.ts

@@ -0,0 +1,14 @@
+export declare class AuthRefreshLockError extends Error {
+    constructor(message: string, cause: unknown);
+}
+export declare class AuthRefreshBusyError extends AuthRefreshLockError {
+    constructor(profileName: string, port: number, cause: unknown);
+}
+/**
+ * An exclusive loopback bind is owned by the OS until close/process exit, even
+ * while a synchronous keychain prompt blocks JS. Never steal from a live owner.
+ * Hash collisions (or unrelated port users) only cause contention, never bypass
+ * the lock. No credentials are transmitted, and no filesystem cleanup is needed.
+ */
+export declare function withProfileAuthLock<T>(profileName: string, operation: () => Promise<T>, namespace?: string, timeoutMs?: number): Promise<T>;
+//# sourceMappingURL=auth-lock.d.ts.map

package/lib/profiles/auth-lock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth-lock.d.ts","sourceRoot":"","sources":["../../src/profiles/auth-lock.ts"],"names":[],"mappings":"AAMA,qBAAa,oBAAqB,SAAQ,KAAK;IAC3C,YAAY,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAG1C;CACJ;AAED,qBAAa,oBAAqB,SAAQ,oBAAoB;IAC1D,YAAY,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAO5D;CACJ;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,CAAC,EACvC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,SAAS,CAAC,EAAE,MAAM,EAClB,SAAS,SAAS,GACnB,OAAO,CAAC,CAAC,CAAC,CAiDZ"}

package/lib/profiles/auth-lock.js

@@ -0,0 +1,88 @@
+import { createHash } from 'node:crypto';
+import { createServer } from 'node:net';
+import { userInfo } from 'node:os';
+import { performance } from 'node:perf_hooks';
+import { setTimeout as delay } from 'node:timers/promises';
+export class AuthRefreshLockError extends Error {
+    constructor(message, cause) {
+        super(message, { cause });
+        this.name = 'AuthRefreshLockError';
+    }
+}
+export class AuthRefreshBusyError extends AuthRefreshLockError {
+    constructor(profileName, port, cause) {
+        super(`Authentication refresh for profile "${profileName}" could not acquire local port 127.0.0.1:${port}. ` +
+            'Another command or application may be using it. Retry later or check which process occupies the port.', cause);
+        this.name = 'AuthRefreshBusyError';
+    }
+}
+/**
+ * An exclusive loopback bind is owned by the OS until close/process exit, even
+ * while a synchronous keychain prompt blocks JS. Never steal from a live owner.
+ * Hash collisions (or unrelated port users) only cause contention, never bypass
+ * the lock. No credentials are transmitted, and no filesystem cleanup is needed.
+ */
+export async function withProfileAuthLock(profileName, operation, namespace, timeoutMs = 75_000) {
+    let userNamespace;
+    try {
+        userNamespace = namespace ?? authUserNamespace();
+    }
+    catch (error) {
+        throw new AuthRefreshLockError('Unable to identify the OS user for authentication coordination.', error);
+    }
+    const key = createHash('sha256')
+        .update(JSON.stringify(['vertesia-auth-v1', userNamespace, profileName]))
+        .digest();
+    const port = 49_152 + (key.readUInt32BE(0) % 16_384);
+    const started = performance.now();
+    let notified = false;
+    let server;
+    while (true) {
+        try {
+            server = await acquire(port);
+            break;
+        }
+        catch (error) {
+            if (!error || typeof error !== 'object' || !('code' in error) || error.code !== 'EADDRINUSE') {
+                throw new AuthRefreshLockError(`Unable to coordinate authentication refresh for profile "${profileName}". ` +
+                    `Allow this command to bind to 127.0.0.1:${port} and retry.`, error);
+            }
+            const elapsed = performance.now() - started;
+            if (elapsed >= timeoutMs)
+                throw new AuthRefreshBusyError(profileName, port, error);
+            if (!notified && elapsed >= 5_000) {
+                console.warn(`Waiting for authentication coordination for profile "${profileName}": ` +
+                    `local port 127.0.0.1:${port} is occupied...`);
+                notified = true;
+            }
+            await delay(Math.min(250, timeoutMs - elapsed));
+        }
+    }
+    try {
+        return await operation();
+    }
+    finally {
+        // Cleanup must never replace a refresh failure or a persisted success.
+        try {
+            await new Promise((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())));
+        }
+        catch (error) {
+            server.unref();
+            console.warn('Unable to release authentication coordination socket:', error);
+        }
+    }
+}
+function acquire(port) {
+    return new Promise((resolve, reject) => {
+        const server = createServer((socket) => socket.destroy());
+        server.once('error', reject);
+        server.listen({ host: '127.0.0.1', port, exclusive: true }, () => resolve(server));
+    });
+}
+function authUserNamespace() {
+    // Match the OS user that owns the keychain, regardless of HOME overrides.
+    // Windows reports uid -1; its OS-provided username is stable across shells.
+    const user = userInfo();
+    return user.uid >= 0 ? `uid:${user.uid}` : `username:${user.username}`;
+}
+//# sourceMappingURL=auth-lock.js.map

package/lib/profiles/auth-lock.js.map

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

package/lib/profiles/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/profiles/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAI1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,wBAAsB,wBAAwB,CAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAiBjF;AAoBD,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,OAAO,GAAE;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAWnC;AAED,wBAAsB,4BAA4B,CAC9C,WAAW,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,GAAE;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CA6BnC;AAaD,wBAAsB,mCAAmC,CACrD,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,GAAE;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/profiles/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAI1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,wBAAsB,wBAAwB,CAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAe7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAiBjF;AAyBD,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,OAAO,GAAE;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAwBD,wBAAsB,4BAA4B,CAC9C,WAAW,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,GAAE;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CA+BnC;AAaD,wBAAsB,mCAAmC,CACrD,QAAQ,CAAC,EAAE,gBAAgB,EAC3B,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,GAAE;IACL,SAAS,CAAC,EAAE,MAAM,CAAC;CACjB,GACP,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC"}

package/lib/profiles/auth.js

@@ -1,13 +1,24 @@
-import { config, shouldRefreshProfileToken } from './index.js';
-import { readAuthBundle, readProfileAccessToken } from './keyring.js';
+import { AuthRefreshLockError, withProfileAuthLock } from './auth-lock.js';
+import { config } from './index.js';
+import { readAuthBundle, readUsableProfileToken, selectUsableProfileToken } from './keyring.js';
 import { canUseOAuthProfile, refreshOAuthSession } from './oauth.js';
 export async function ensureProfileAccessToken(profile, onResult) {
-    const token = await readProfileAccessToken(profile);
-    if (token && !(await shouldRefreshProfileToken(profile, 30))) {
-        return token;
-    }
-    const result = await refreshProfileAccessToken(profile, onResult);
-    return result?.token;
+    const currentBundle = await readAuthBundle(profile.name);
+    const currentToken = selectUsableProfileToken(profile, currentBundle, 30);
+    if (currentToken)
+        return currentToken;
+    if (!currentBundle?.refreshToken || !canUseOAuthProfile(profile))
+        return undefined;
+    return withProfileAuthLock(profile.name, async () => {
+        // Re-read under the lock: another process may have refreshed while we waited.
+        const bundle = await readAuthBundle(profile.name);
+        const token = selectUsableProfileToken(profile, bundle, 30);
+        if (token) {
+            return token;
+        }
+        const result = await refreshProfileAccessTokenUnlocked(profile, bundle, onResult);
+        return result?.token;
+    });
 }
 /**
  * Build an authorization callback that resolves the profile access token at call time.
@@ -41,21 +52,37 @@ async function resolveProfileToken(profile) {
         }
     }
     catch (error) {
-        // A refresh failure is often transient (network, STS hiccup). Report it and fall back to
-        // the stored token so a long-running command can recover on the next request.
+        // A proactive refresh may fail while the old token is still usable. Never
+        // hide the refresh error behind a subsequent request with an expired JWT.
+        const token = await readUsableProfileToken(profile, 5).catch(() => undefined);
+        if (!token) {
+            throw error;
+        }
         console.warn(`Failed to refresh the access token for profile "${profile.name}": ${error instanceof Error ? error.message : String(error)}`);
+        return token;
     }
-    return readProfileAccessToken(profile);
+    return undefined;
 }
 export async function refreshProfileAccessToken(profile, onResult, options = {}) {
-    const bundle = await readAuthBundle(profile.name);
+    if (!(await canRefreshProfile(profile)))
+        return undefined;
+    return withProfileAuthLock(profile.name, async () => {
+        const bundle = await readAuthBundle(profile.name);
+        return refreshProfileAccessTokenUnlocked(profile, bundle, onResult, options);
+    });
+}
+async function canRefreshProfile(profile) {
+    return canUseOAuthProfile(profile) && Boolean((await readAuthBundle(profile.name))?.refreshToken);
+}
+/** Caller must hold the profile lock until the rotated credentials have been persisted. */
+async function refreshProfileAccessTokenUnlocked(profile, bundle, onResult, options = {}) {
     if (!bundle?.refreshToken || !canUseOAuthProfile(profile)) {
         return undefined;
     }
     const result = await refreshOAuthSession(profile, bundle.refreshToken, bundle, options);
     const updater = config.updateProfile(profile.name);
     updater.onResultCallback = onResult;
-    await updater.persistConfigResult(result);
+    await updater.persistConfigResult(result, { requireKeyring: true, previousBundle: bundle });
     return result;
 }
 export async function refreshProfileAuthentication(profileName, onResult, signal, options = {}) {
@@ -71,6 +98,9 @@ export async function refreshProfileAuthentication(profileName, onResult, signal
         }
     }
     catch (error) {
+        // Without coordination we cannot safely start another credential writer.
+        if (error instanceof AuthRefreshLockError)
+            throw error;
         if (options.projectId) {
             throw error;
         }

package/lib/profiles/auth.js.map

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

package/lib/profiles/index.d.ts

@@ -1,4 +1,5 @@
 import type { OnResultCallback } from './commands.js';
+import { type StoredAuthBundle } from './keyring.js';
 import { type ConfigPayload, type ConfigResult } from './server/index.js';
 export declare function getConfigFile(path?: string): string;
 export type Region = 'us1' | 'eu1' | 'jp1' | 'dev1';
@@ -43,7 +44,10 @@ export declare class ConfigureProfile {
     onResultCallback?: OnResultCallback;
     constructor(config: Config, data: Partial<Profile>, isNew: boolean);
     getConfigPayload(): ConfigPayload;
-    persistConfigResult(result: ConfigResult | undefined): Promise<void>;
+    persistConfigResult(result: ConfigResult | undefined, options?: {
+        requireKeyring?: boolean;
+        previousBundle?: StoredAuthBundle;
+    }): Promise<void>;
     applyConfigResult(result: ConfigResult | undefined, options?: {
         logCompletion?: boolean;
         exitOnComplete?: boolean;

package/lib/profiles/index.d.ts.map

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

package/lib/profiles/index.js

@@ -3,7 +3,7 @@ import os from 'node:os';
 import { join } from 'node:path';
 import { hasErrorCode } from '../utils/options.js';
 import { readJsonFile, writeJsonFile } from '../utils/stdio.js';
-import { deleteAuthBundle, getAccessTokenExpiry, hasStoredAccessToken, isKeyringAvailable, readAuthBundle, writeAuthBundle, } from './keyring.js';
+import { deleteAuthBundle, hasStoredAccessToken, isKeyringAvailable, readAuthBundle, readUsableProfileToken, writeAuthBundle, writeRefreshedAuthBundle, } from './keyring.js';
 import { canUseOAuthProfile, OAuthUnavailableError, startOAuthSession } from './oauth.js';
 import { startConfigSession } from './server/index.js';
 import { readInlineTokenExpiry, readResultAccessTokenExpiry, readResultRefreshTokenExpiry } from './token-expiry.js';
@@ -122,16 +122,7 @@ export function getCloudTypeFromConfigUrl(url) {
     }
 }
 export async function shouldRefreshProfileToken(profile, thresholdInSeconds = 1) {
-    const bundle = await readAuthBundle(profile.name);
-    const token = bundle?.accessToken || profile.apikey;
-    if (token) {
-        const expiresAt = bundle?.accessTokenExpiresAt ?? getAccessTokenExpiry(token);
-        if (expiresAt) {
-            return expiresAt - thresholdInSeconds * 1000 < Date.now();
-        }
-    }
-    // if no token or no expiration set then refresh auth token
-    return true;
+    return !(await readUsableProfileToken(profile, thresholdInSeconds));
 }
 export class ConfigureProfile {
     config;
@@ -152,12 +143,12 @@ export class ConfigureProfile {
             project: this.data.project,
         };
     }
-    async persistConfigResult(result) {
+    async persistConfigResult(result, options = {}) {
         if (!result) {
             return;
         }
         const oldName = this.data.name;
-        const previousBundle = oldName ? await readAuthBundle(oldName) : undefined;
+        const previousBundle = options.previousBundle ?? (oldName ? await readAuthBundle(oldName) : undefined);
         this.data.name = result.profile;
         this.data.account = result.account;
         this.data.project = result.project;
@@ -167,7 +158,8 @@ export class ConfigureProfile {
             this.data.oauth_server_url = result.oauth_server_url;
         }
         try {
-            await writeAuthBundle(result.profile, {
+            const write = options.requireKeyring ? writeRefreshedAuthBundle : writeAuthBundle;
+            await write(result.profile, {
                 accessToken: result.token,
                 accessTokenExpiresAt: readResultAccessTokenExpiry(result),
                 idToken: result.id_token || previousBundle?.idToken,
@@ -180,6 +172,11 @@ export class ConfigureProfile {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
+            if (options.requireKeyring) {
+                throw new Error(`Unable to save refreshed credentials in the native keychain: ${message}`, {
+                    cause: error,
+                });
+            }
             console.warn(`Unable to store credentials in the native keychain; falling back to profile file storage: ${message}`);
             this.data.apikey = result.token;
         }

package/lib/profiles/index.js.map

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

package/lib/profiles/keyring.d.ts

@@ -13,6 +13,11 @@ type WritableAuthBundle = Omit<StoredAuthBundle, 'version'>;
 export declare function isKeyringAvailable(): boolean;
 export declare function readAuthBundle(profileName: string): Promise<StoredAuthBundle | undefined>;
 export declare function writeAuthBundle(profileName: string, bundle: WritableAuthBundle): Promise<void>;
+/** Retain the rotated replacement in memory and retry only its keychain write. */
+export declare function writeRefreshedAuthBundle(profileName: string, bundle: WritableAuthBundle): Promise<void>;
+/** Check each credential against its own expiry from one keychain snapshot. */
+export declare function readUsableProfileToken(profile: Pick<Profile, 'name' | 'apikey'>, thresholdSeconds: number): Promise<string | undefined>;
+export declare function selectUsableProfileToken(profile: Pick<Profile, 'apikey'>, bundle: StoredAuthBundle | undefined, thresholdSeconds: number): string | undefined;
 export declare function deleteAuthBundle(profileName: string): Promise<void>;
 export declare function readProfileAccessToken(profile: Pick<Profile, 'name' | 'apikey'>): Promise<string | undefined>;
 export declare function readProfileRefreshToken(profileName: string): Promise<string | undefined>;

package/lib/profiles/keyring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../src/profiles/keyring.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AA0B1C,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AAkE5D,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAUD,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAe/F;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBpG;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAGnH;AAED,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE9F;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASlF;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhF;AAED,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEjF"}
+{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../src/profiles/keyring.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AA0B1C,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AAkE5D,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAUD,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAe/F;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBpG;AAED,kFAAkF;AAClF,wBAAsB,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAU7G;AAED,+EAA+E;AAC/E,wBAAsB,sBAAsB,CACxC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC,EACzC,gBAAgB,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED,wBAAgB,wBAAwB,CACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAChC,MAAM,EAAE,gBAAgB,GAAG,SAAS,EACpC,gBAAgB,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CASpB;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAGnH;AAED,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE9F;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASlF;AAED,wBAAsB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEhF;AAED,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEjF"}

package/lib/profiles/keyring.js

@@ -105,6 +105,35 @@ export async function writeAuthBundle(profileName, bundle) {
         value: JSON.stringify(payload),
     });
 }
+/** Retain the rotated replacement in memory and retry only its keychain write. */
+export async function writeRefreshedAuthBundle(profileName, bundle) {
+    for (let attempt = 0;; attempt++) {
+        try {
+            await writeAuthBundle(profileName, bundle);
+            return;
+        }
+        catch (error) {
+            if (attempt === 2)
+                throw error;
+            await new Promise((resolve) => setTimeout(resolve, 500 * (attempt + 1)));
+        }
+    }
+}
+/** Check each credential against its own expiry from one keychain snapshot. */
+export async function readUsableProfileToken(profile, thresholdSeconds) {
+    return selectUsableProfileToken(profile, await readAuthBundle(profile.name), thresholdSeconds);
+}
+export function selectUsableProfileToken(profile, bundle, thresholdSeconds) {
+    const threshold = Date.now() + thresholdSeconds * 1000;
+    if (bundle?.accessToken) {
+        const expiresAt = bundle.accessTokenExpiresAt ?? getAccessTokenExpiry(bundle.accessToken);
+        if (expiresAt && expiresAt > threshold)
+            return bundle.accessToken;
+    }
+    // Legacy keychain-write failures may have saved a newer token in the profile file.
+    const expiresAt = getAccessTokenExpiry(profile.apikey);
+    return expiresAt && expiresAt > threshold ? profile.apikey : undefined;
+}
 export async function deleteAuthBundle(profileName) {
     const secrets = getSecrets();
     if (!secrets) {

package/lib/profiles/keyring.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertesia/cli",
-  "version": "1.5.0-dev.20260905.011013Z",
+  "version": "1.5.0-dev.20260910.051115Z",
   "description": "The Vertesia command-line interface (CLI) provides a set of commands to manage and interact with the Vertesia Platform.",
   "type": "module",
   "bin": {
@@ -48,15 +48,15 @@
     "signal-exit": "^4.1.0",
     "typescript": "7.0.2",
     "typescript-legacy": "npm:typescript@6.0.3",
-    "@llumiverse/common": "1.5.0-dev.20260905.004250Z",
-    "@vertesia/client": "1.5.0-dev.20260905.011013Z",
-    "@vertesia/common": "1.5.0-dev.20260905.011013Z",
-    "@vertesia/workflow": "1.5.0-dev.20260905.011013Z"
+    "@llumiverse/common": "1.5.0-dev.20260910.044936Z",
+    "@vertesia/client": "1.5.0-dev.20260910.051115Z",
+    "@vertesia/common": "1.5.0-dev.20260910.051115Z",
+    "@vertesia/workflow": "1.5.0-dev.20260910.051115Z"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "^1.3.0",
-    "@vertesia/cli-darwin-x64": "1.5.0-dev.20260905.011013Z",
-    "@vertesia/cli-darwin-arm64": "1.5.0-dev.20260905.011013Z"
+    "@vertesia/cli-darwin-arm64": "1.5.0-dev.20260910.051115Z",
+    "@vertesia/cli-darwin-x64": "1.5.0-dev.20260910.051115Z"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.10",
@@ -68,7 +68,7 @@
     "url": "https://github.com/vertesia/composableai.git",
     "directory": "packages/cli"
   },
-  "gitHead": "ea74a29f6885cec132eec4b6b319e40137df3b40",
+  "gitHead": "c02f799dc499a665ab6b2083bfa6708a05995d5f",
   "scripts": {
     "lint": "biome lint src",
     "test": "vitest run",