@oxyhq/core 7.1.1 → 8.1.0

package/dist/esm/HttpService.js

@@ -53,7 +53,7 @@ const CSRF_FETCH_RETRY_DELAY_MS = 500;
 /**
  * Cooldown (ms) applied after a failed access-token refresh before another
  * refresh is attempted. Prevents a refresh storm (and server hammering) when
- * the AuthManager's refresh handler is failing — every in-flight request that
+ * the auth refresh handler is failing — every in-flight request that
  * hits a 401 would otherwise trigger its own refresh.
  */
 const TOKEN_REFRESH_COOLDOWN_MS = 15000;
@@ -140,7 +140,7 @@ export class HttpService {
         this.cacheSizeWarningSilentUntil = 0;
         /**
          * Fan-out listeners notified on EVERY access-token change on this instance:
-         * explicit `setTokens`, `clearTokens`, an AuthManager-owned refresh, and the
+         * explicit `setTokens`, `clearTokens`, a refresh-handler rotation, and the
          * internal 401-driven clear. This is a Set so multiple independent observers
          * can mirror token state without clobbering each other.
          *
@@ -358,9 +358,9 @@ export class HttpService {
                     clearTimeout(timeoutId);
                 // Handle response
                 if (!response.ok) {
-                    // On 401, delegate refresh to AuthManager and retry once before
-                    // giving up. HttpService deliberately does not know any session
-                    // routes; the AuthManager is the single session authority.
+                    // On 401, delegate to the installed auth refresh handler and retry
+                    // once before giving up. HttpService deliberately does not know any
+                    // session routes; the refresh handler owns session rotation.
                     if (response.status === 401 && !config._isAuthRetry && !config.skipAuth) {
                         const refreshed = await this.refreshAccessToken('response-401');
                         if (refreshed) {
@@ -820,7 +820,7 @@ export class HttpService {
                     this.tokenStore.setTokens(newToken);
                     this.notifyTokenChange();
                 }
-                this.logger.debug('Token refreshed via AuthManager');
+                this.logger.debug('Token refreshed via the auth refresh handler');
                 return newToken;
             })
                 .catch((error) => {

package/dist/esm/boot/coldBootV2.js

@@ -28,6 +28,7 @@
 import { resolveUserId } from '@oxyhq/contracts';
 import { runColdBoot } from '../utils/coldBoot.js';
 import { isWeb as detectWeb, isNative as detectNative } from '../utils/platform.js';
+import { extractErrorStatus } from '../utils/errorUtils.js';
 import { KeyManager } from '../crypto/keyManager.js';
 import { logger } from '../utils/loggerUtils.js';
 import { refreshPersistedSession } from '../session/refresh.js';
@@ -159,6 +160,18 @@ export function isSameApex(pageHost, apiHost) {
 function sessionFromPersisted(state, accessToken) {
     return { sessionId: state.sessionId, userId: state.userId, accessToken };
 }
+function classifyMintFailure(error) {
+    if (extractErrorStatus(error) === 401) {
+        // Structural read (not `instanceof Error`): the thrown value can be a plain
+        // ApiError-shaped object or come from another realm, where instanceof fails
+        // and a `no_active_session` would be misread as a stale secret and dropped.
+        const message = error?.message;
+        return typeof message === 'string' && message.includes('no_active_session')
+            ? 'no_active_session'
+            : 'invalid_secret';
+    }
+    return 'transient';
+}
 /**
  * Run the device-first cold boot. Resolves to the `runColdBoot` outcome and, as
  * a side effect, invokes `onSession` (winning session, token already planted)
@@ -174,7 +187,73 @@ export async function runSessionColdBoot(opts) {
     // they cannot leak across boots or break under bundler re-evaluation.
     let signedOutReason = 'no_session';
     let navigating = false;
+    // Set when the zero-cookie mint reports `no_active_session` (phase 2c): the
+    // device is authoritatively signed out, so the migratory fallback lanes below
+    // (stored-tokens / shared-key / bootstrap-hop) must NOT run — we already know
+    // there is no session and must not bounce a known-signed-out device.
+    let deviceKnownSignedOut = false;
     const steps = [];
+    // 0. device-secret-mint (phase 2c) — the zero-cookie fast path. When the
+    //    origin persisted a deviceId + deviceSecret, mint a short access token with
+    //    a single bearer-less POST (no cookie, no navigation). FIRST in the chain
+    //    so it wins over the migratory cookie lanes below. Gated OFF while a
+    //    #oxy_boot return fragment is present so `bootstrap-return` still consumes
+    //    + strips it first (a device holding a secret never triggers that hop, so
+    //    this only defers a rare stale/forged fragment). The rest of the chain
+    //    stays as the additive migratory fallback for devices not yet on the secret.
+    steps.push({
+        id: 'device-secret-mint',
+        enabled: () => !(isWeb && hashHasBootFragment(dom.getHash())),
+        run: async () => {
+            const persisted = await store.load();
+            if (!persisted?.deviceId || !persisted?.deviceSecret) {
+                return { kind: 'skip' };
+            }
+            try {
+                const mint = await oxy.mintFromDeviceSecret(persisted.deviceId, persisted.deviceSecret);
+                // Rotation-in-use anti-loss: persist the NEXT secret (+ refreshed warm
+                // fields, + the server's authoritative active account) BEFORE planting
+                // the minted access token, so a multi-tab race that rotates again can
+                // never strand this tab with a superseded secret.
+                const active = mint.state.accounts.find((a) => a.accountId === mint.state.activeAccountId);
+                const next = {
+                    ...persisted,
+                    deviceId: mint.state.deviceId,
+                    deviceSecret: mint.nextDeviceSecret,
+                    accessToken: mint.accessToken,
+                    expiresAt: mint.expiresAt,
+                    ...(active ? { sessionId: active.sessionId, userId: active.accountId } : {}),
+                };
+                await store.save(next);
+                oxy.setTokens(mint.accessToken);
+                return {
+                    kind: 'session',
+                    session: { sessionId: next.sessionId, userId: next.userId, accessToken: mint.accessToken },
+                };
+            }
+            catch (error) {
+                const failure = classifyMintFailure(error);
+                if (failure === 'invalid_secret') {
+                    // Stale/diverged secret — drop it so the mint lane stops firing, then
+                    // fall through to the migratory refresh/cookie lanes. Setting it
+                    // undefined drops the key on the store's JSON serialization, and the
+                    // mint guard treats undefined as absent.
+                    await store.save({ ...persisted, deviceSecret: undefined });
+                    return { kind: 'skip' };
+                }
+                if (failure === 'no_active_session') {
+                    // Device known, no live session — authoritative signed-out. KEEP the
+                    // secret and stop the chain (do not bounce a known-signed-out device).
+                    deviceKnownSignedOut = true;
+                    signedOutReason = 'no_session';
+                    return { kind: 'skip' };
+                }
+                // Transient (network / 5xx): keep the secret, let the fallback lanes try.
+                logger.debug('device-secret mint failed (transient) — keeping secret, falling back', { component: 'coldBootV2', method: 'device-secret-mint' }, error);
+                return { kind: 'skip' };
+            }
+        },
+    });
     // 1. bootstrap-return (web) — consume a #oxy_boot fragment.
     steps.push({
         id: 'bootstrap-return',
@@ -208,6 +287,7 @@ export async function runSessionColdBoot(opts) {
     // 2. stored-tokens — warm-plant or rotate the persisted refresh family.
     steps.push({
         id: 'stored-tokens',
+        enabled: () => !deviceKnownSignedOut,
         run: async () => {
             const persisted = await store.load();
             if (!persisted) {
@@ -234,7 +314,7 @@ export async function runSessionColdBoot(opts) {
     // 3. shared-key-signin (native) — re-mint from the shared identity.
     steps.push({
         id: 'shared-key-signin',
-        enabled: () => isNative,
+        enabled: () => isNative && !deviceKnownSignedOut,
         run: async () => {
             const session = await oxy.signInWithSharedIdentity();
             if (!session?.accessToken) {
@@ -267,7 +347,7 @@ export async function runSessionColdBoot(opts) {
     // 4. bootstrap-hop (web, terminal) — same-apex inline fetch OR cross-apex nav.
     steps.push({
         id: 'bootstrap-hop',
-        enabled: () => isWeb,
+        enabled: () => isWeb && !deviceKnownSignedOut,
         run: async () => {
             const pageHost = dom.getLocationHostname();
             let apiHost = null;
@@ -300,6 +380,21 @@ export async function runSessionColdBoot(opts) {
                         accessToken: bundle.accessToken,
                         expiresAt: bundle.expiresAt,
                     };
+                    // Phase 2c: the web-session bundle may carry a rotating `deviceSecret`
+                    // but NOT a deviceId. Persist the secret and carry any prior deviceId
+                    // (from a deviceId-bearing login lane) forward so the mint lane stays
+                    // usable — this overwrite must not orphan it.
+                    const prior = await store.load();
+                    if (prior?.deviceId) {
+                        next.deviceId = prior.deviceId;
+                    }
+                    // Prefer the bundle's secret (the server just rotated onto it); keep the
+                    // prior one when the bundle omits it — this lane also runs as the
+                    // TRANSIENT-mint fallback, and must not orphan a still-valid secret.
+                    const carriedSecret = bundle.deviceSecret ?? prior?.deviceSecret;
+                    if (carriedSecret) {
+                        next.deviceSecret = carriedSecret;
+                    }
                     await store.save(next);
                     oxy.setTokens(bundle.accessToken);
                     return { kind: 'session', session: sessionFromPersisted(next, bundle.accessToken) };

package/dist/esm/boot/deviceBootReturn.js

@@ -129,6 +129,21 @@ export async function consumeDeviceBootReturn(deps) {
                 accessToken: bundle.accessToken,
                 expiresAt: bundle.expiresAt,
             };
+            // Phase 2c: the cookie-bootstrap bundle may carry a rotating `deviceSecret`
+            // but NOT a deviceId. Persist the secret, and carry any prior deviceId
+            // forward (from a deviceId-bearing login lane) so the pair stays usable by
+            // the zero-cookie mint — an overwrite here must not orphan the mint lane.
+            const prior = await deps.store.load();
+            if (prior?.deviceId) {
+                next.deviceId = prior.deviceId;
+            }
+            // Prefer the bundle's secret (the server just rotated onto it); keep the
+            // prior one when the bundle omits it so a cookie-lane boot can never orphan
+            // a still-valid secret captured by an earlier login lane.
+            const carriedSecret = bundle.deviceSecret ?? prior?.deviceSecret;
+            if (carriedSecret) {
+                next.deviceSecret = carriedSecret;
+            }
             await deps.store.save(next);
             deps.plantAccessToken(bundle.accessToken);
             return {

package/dist/esm/i18n/locales/en-US.json

@@ -384,7 +384,11 @@
             "subtitle": "Add another account to switch between them quickly"
         },
         "label": "Account switcher",
-        "searchPlaceholder": "Search accounts"
+        "searchPlaceholder": "Search accounts",
+        "scanTitle": "Scan to sign in",
+        "scanSubtitle": "Open the Oxy app on your phone and scan this code",
+        "scanWithOxy": "Scan with the Oxy app to continue",
+        "scanQr": "Scan QR code"
     },
     "reputation": {
         "faq": {
@@ -1905,5 +1909,44 @@
             "earlyAdopter": "Early Adopter",
             "earlyAdopterDesc": "Been part of the community from the start"
         }
+    },
+    "consent": {
+        "title": "Continue to {{app}}",
+        "subtitle": "Use your Oxy account to sign in to {{app}}. Review what this connection means before you continue.",
+        "provenance": {
+            "title": "Who is requesting access",
+            "official": "Official Oxy application",
+            "developer": "Published by {{developer}}",
+            "thirdParty": "Third-party application"
+        },
+        "permissions": {
+            "title": "Permissions requested",
+            "basic": "Sign you in and read your basic profile"
+        },
+        "scopes": {
+            "openid": "Confirm your identity",
+            "profile": "Read your basic profile",
+            "email": "Read your email address",
+            "offlineAccess": "Keep you signed in when you're away",
+            "userRead": "Read your basic profile",
+            "filesRead": "Read your files",
+            "filesWrite": "Upload and modify your files",
+            "filesDelete": "Delete your files",
+            "webhooksReceive": "Receive webhooks",
+            "chatCompletions": "Use AI chat on your behalf",
+            "modelsRead": "List available AI models",
+            "federationWrite": "Act across federated services"
+        },
+        "account": {
+            "title": "Signing in as"
+        },
+        "links": {
+            "website": "Website",
+            "privacy": "Privacy Policy",
+            "terms": "Terms of Service"
+        },
+        "allow": "Continue to {{app}}",
+        "deny": "Cancel",
+        "disclaimer": "By continuing, {{app}} will be able to sign in with your Oxy account. You can manage connected apps anytime in your Oxy account settings."
     }
 }

package/dist/esm/i18n/locales/es-ES.json

@@ -581,7 +581,11 @@
             "subtitle": "Añade otra cuenta para cambiar rápidamente entre ellas"
         },
         "label": "Selector de cuentas",
-        "searchPlaceholder": "Buscar cuentas"
+        "searchPlaceholder": "Buscar cuentas",
+        "scanTitle": "Escanea para iniciar sesión",
+        "scanSubtitle": "Abre la app de Oxy en tu móvil y escanea este código",
+        "scanWithOxy": "Escanea con la app de Oxy para continuar",
+        "scanQr": "Escanear código QR"
     },
     "feedback": {
         "type": {
@@ -1905,5 +1909,44 @@
             "earlyAdopter": "Pionero",
             "earlyAdopterDesc": "Has formado parte de la comunidad desde el principio"
         }
+    },
+    "consent": {
+        "title": "Continuar a {{app}}",
+        "subtitle": "Usa tu cuenta de Oxy para iniciar sesión en {{app}}. Revisa qué implica esta conexión antes de continuar.",
+        "provenance": {
+            "title": "Quién solicita acceso",
+            "official": "Aplicación oficial de Oxy",
+            "developer": "Publicada por {{developer}}",
+            "thirdParty": "Aplicación de terceros"
+        },
+        "permissions": {
+            "title": "Permisos solicitados",
+            "basic": "Iniciar sesión y leer tu perfil básico"
+        },
+        "scopes": {
+            "openid": "Confirmar tu identidad",
+            "profile": "Leer tu perfil básico",
+            "email": "Leer tu dirección de correo",
+            "offlineAccess": "Mantener tu sesión iniciada cuando no estés",
+            "userRead": "Leer tu perfil básico",
+            "filesRead": "Leer tus archivos",
+            "filesWrite": "Subir y modificar tus archivos",
+            "filesDelete": "Eliminar tus archivos",
+            "webhooksReceive": "Recibir webhooks",
+            "chatCompletions": "Usar el chat con IA en tu nombre",
+            "modelsRead": "Ver los modelos de IA disponibles",
+            "federationWrite": "Actuar en servicios federados"
+        },
+        "account": {
+            "title": "Iniciando sesión como"
+        },
+        "links": {
+            "website": "Sitio web",
+            "privacy": "Política de privacidad",
+            "terms": "Términos del servicio"
+        },
+        "allow": "Continuar a {{app}}",
+        "deny": "Cancelar",
+        "disclaimer": "Al continuar, {{app}} podrá iniciar sesión con tu cuenta de Oxy. Puedes gestionar las apps conectadas cuando quieras en los ajustes de tu cuenta de Oxy."
     }
 }

package/dist/esm/i18n/locales/locales/en-US.json

@@ -384,7 +384,11 @@
       "subtitle": "Add another account to switch between them quickly"
     },
     "label": "Account switcher",
-    "searchPlaceholder": "Search accounts"
+    "searchPlaceholder": "Search accounts",
+    "scanTitle": "Scan to sign in",
+    "scanSubtitle": "Open the Oxy app on your phone and scan this code",
+    "scanWithOxy": "Scan with the Oxy app to continue",
+    "scanQr": "Scan QR code"
   },
   "reputation": {
     "faq": {
@@ -1905,5 +1909,44 @@
       "earlyAdopter": "Early Adopter",
       "earlyAdopterDesc": "Been part of the community from the start"
     }
+  },
+  "consent": {
+    "title": "Continue to {{app}}",
+    "subtitle": "Use your Oxy account to sign in to {{app}}. Review what this connection means before you continue.",
+    "provenance": {
+      "title": "Who is requesting access",
+      "official": "Official Oxy application",
+      "developer": "Published by {{developer}}",
+      "thirdParty": "Third-party application"
+    },
+    "permissions": {
+      "title": "Permissions requested",
+      "basic": "Sign you in and read your basic profile"
+    },
+    "scopes": {
+      "openid": "Confirm your identity",
+      "profile": "Read your basic profile",
+      "email": "Read your email address",
+      "offlineAccess": "Keep you signed in when you're away",
+      "userRead": "Read your basic profile",
+      "filesRead": "Read your files",
+      "filesWrite": "Upload and modify your files",
+      "filesDelete": "Delete your files",
+      "webhooksReceive": "Receive webhooks",
+      "chatCompletions": "Use AI chat on your behalf",
+      "modelsRead": "List available AI models",
+      "federationWrite": "Act across federated services"
+    },
+    "account": {
+      "title": "Signing in as"
+    },
+    "links": {
+      "website": "Website",
+      "privacy": "Privacy Policy",
+      "terms": "Terms of Service"
+    },
+    "allow": "Continue to {{app}}",
+    "deny": "Cancel",
+    "disclaimer": "By continuing, {{app}} will be able to sign in with your Oxy account. You can manage connected apps anytime in your Oxy account settings."
   }
-}
+}

package/dist/esm/i18n/locales/locales/es-ES.json

@@ -581,7 +581,11 @@
       "subtitle": "Añade otra cuenta para cambiar rápidamente entre ellas"
     },
     "label": "Selector de cuentas",
-    "searchPlaceholder": "Buscar cuentas"
+    "searchPlaceholder": "Buscar cuentas",
+    "scanTitle": "Escanea para iniciar sesión",
+    "scanSubtitle": "Abre la app de Oxy en tu móvil y escanea este código",
+    "scanWithOxy": "Escanea con la app de Oxy para continuar",
+    "scanQr": "Escanear código QR"
   },
   "feedback": {
     "type": {
@@ -1905,5 +1909,44 @@
       "earlyAdopter": "Pionero",
       "earlyAdopterDesc": "Has formado parte de la comunidad desde el principio"
     }
+  },
+  "consent": {
+    "title": "Continuar a {{app}}",
+    "subtitle": "Usa tu cuenta de Oxy para iniciar sesión en {{app}}. Revisa qué implica esta conexión antes de continuar.",
+    "provenance": {
+      "title": "Quién solicita acceso",
+      "official": "Aplicación oficial de Oxy",
+      "developer": "Publicada por {{developer}}",
+      "thirdParty": "Aplicación de terceros"
+    },
+    "permissions": {
+      "title": "Permisos solicitados",
+      "basic": "Iniciar sesión y leer tu perfil básico"
+    },
+    "scopes": {
+      "openid": "Confirmar tu identidad",
+      "profile": "Leer tu perfil básico",
+      "email": "Leer tu dirección de correo",
+      "offlineAccess": "Mantener tu sesión iniciada cuando no estés",
+      "userRead": "Leer tu perfil básico",
+      "filesRead": "Leer tus archivos",
+      "filesWrite": "Subir y modificar tus archivos",
+      "filesDelete": "Eliminar tus archivos",
+      "webhooksReceive": "Recibir webhooks",
+      "chatCompletions": "Usar el chat con IA en tu nombre",
+      "modelsRead": "Ver los modelos de IA disponibles",
+      "federationWrite": "Actuar en servicios federados"
+    },
+    "account": {
+      "title": "Iniciando sesión como"
+    },
+    "links": {
+      "website": "Sitio web",
+      "privacy": "Política de privacidad",
+      "terms": "Términos del servicio"
+    },
+    "allow": "Continuar a {{app}}",
+    "deny": "Cancelar",
+    "disclaimer": "Al continuar, {{app}} podrá iniciar sesión con tu cuenta de Oxy. Puedes gestionar las apps conectadas cuando quieras en los ajustes de tu cuenta de Oxy."
   }
-}
+}

package/dist/esm/index.js

@@ -119,28 +119,26 @@ export { buildAccountsArray, createQuickAccount, getAccountDisplayName, getAccou
 // ---------------------------------------------------------------------------
 // Registrable-domain + central-IdP-apex helpers.
 //
-// The client SSO-bounce / silent-iframe / FedCM machinery was removed in the
-// device-first cutover (wave 2, ecosystem-wide bump complete). `registrableApex`
-// (eTLD+1) and `CENTRAL_IDP_APEX` are still genuinely used: `registrableApex`
-// via the `@oxyhq/core/server` re-export consumed by
-// `packages/api/src/utils/sameSite.ts` for same-site origin checks, and
-// `CENTRAL_IDP_APEX` by `server/cors.ts`'s `createOxyCors` (auto-allows
-// `*.oxy.so`). `SSO_CALLBACK_PATH` has no remaining importer outside this
-// module as of wave 2 — kept exported for now rather than removed here (an
-// export deletion is a logic change, out of scope for a comment sweep); flag
-// for a follow-up dead-export cleanup pass.
+// `registrableApex` (eTLD+1) is consumed via the `@oxyhq/core/server`
+// re-export by `packages/api/src/utils/sameSite.ts` for same-site origin
+// checks; `CENTRAL_IDP_APEX` by `server/cors.ts`'s `createOxyCors` (auto-allows
+// `*.oxy.so`).
 // ---------------------------------------------------------------------------
 export { registrableApex } from './utils/registrableApex.js';
 export { CENTRAL_IDP_APEX } from './utils/authWebUrl.js';
-export { SSO_CALLBACK_PATH } from './utils/ssoBounce.js';
 export { runColdBoot } from './utils/coldBoot.js';
 // ---------------------------------------------------------------------------
+// OAuth 2.0 Authorization Code + PKCE helpers ("Sign in with Oxy" third party).
+// Standard OAuth against auth.oxy.so/authorize — no FedCM/cookies/SSO bounce.
+// ---------------------------------------------------------------------------
+export { buildOAuthAuthorizeUrl, computeCodeChallenge, generateOAuthState, generatePkcePair, DEFAULT_OAUTH_SCOPE, OXY_AUTHORIZE_URL, } from './utils/oauthPkce.js';
+// ---------------------------------------------------------------------------
 // Session sync (device-scoped multi-account session client)
 // ---------------------------------------------------------------------------
 export { SessionClient } from './session/SessionClient.js';
 // Shared SessionClient integration layer: the host adapter, the pure
 // DeviceSessionState projection helpers, and the client factory are defined
-// ONCE here so `@oxyhq/services` and `@oxyhq/auth` both reuse them instead of
+// ONCE here so every `@oxyhq/services` platform variant reuses them instead of
 // duplicating a local copy. Each consumer supplies its own `TokenTransport`
 // (native vs. web mint strategies differ) to `createSessionClient`.
 export { createSessionClientHost } from './session/sessionClientHost.js';
@@ -149,7 +147,7 @@ export { deviceStateToClientSessions, activeSessionIdOf, activeUserOf, accountId
 // Unified account-list projection (THE single source of truth for the account
 // chooser: device sign-ins ∪ account graph, deduped by accountId). Pure +
 // I/O-free — the caller hydrates profiles via `getUsersByIds`. Shared by
-// `@oxyhq/services`, `@oxyhq/auth`, and auth.oxy.so so the list can't diverge.
+// `@oxyhq/services` and auth.oxy.so so the list can't diverge.
 export { projectSwitchableAccounts, switchableAccountIds, } from './session/accountProjection.js';
 // Headless controller for the unified account dialog. Framework-agnostic
 // state machine + subscribe/getSnapshot store (bind via `useSyncExternalStore`)

package/dist/esm/mixins/OxyServices.deviceBoot.js

@@ -15,7 +15,7 @@
  * and `setTokens`, so the same network primitive can be reused from either
  * without double-planting.
  */
-import { authTokenBundleSchema, tokenRefreshResponseSchema, deviceTokenIssueResponseSchema, webSessionResultSchema, safeParseContract, } from '@oxyhq/contracts';
+import { authTokenBundleSchema, tokenRefreshResponseSchema, deviceTokenIssueResponseSchema, deviceTokenMintResponseSchema, webSessionResultSchema, safeParseContract, } from '@oxyhq/contracts';
 export function OxyServicesDeviceBootMixin(Base) {
     return class extends Base {
         /**
@@ -102,6 +102,34 @@ export function OxyServicesDeviceBootMixin(Base) {
                 throw this.handleError(error);
             }
         }
+        /**
+         * Zero-cookie mint (phase 2c). Present the first-party `deviceId` +
+         * `deviceSecret` to `POST /session/device/token` — NO bearer, NO cookies:
+         * possession of the secret IS the device-ownership proof. Returns a fresh
+         * short access token for the device's active account plus `nextDeviceSecret`
+         * (rotation-in-use) and the projected device-session `state`.
+         *
+         * `skipAuth` (like {@link refreshWithToken}): this call carries no bearer, so
+         * a 401 must surface DIRECTLY — never trigger `HttpService`'s 401→refresh→
+         * retry dance (which would pointlessly rotate the refresh family). The cold
+         * boot reads the 401 body (`invalid_device_secret` vs `no_active_session`) to
+         * decide whether to drop the secret and fall back or resolve signed-out.
+         *
+         * @throws if the response does not match {@link deviceTokenMintResponseSchema}.
+         */
+        async mintFromDeviceSecret(deviceId, deviceSecret) {
+            try {
+                const res = await this.makeRequest('POST', '/session/device/token', { deviceId, deviceSecret }, { cache: false, skipAuth: true });
+                const parsed = safeParseContract(deviceTokenMintResponseSchema, res);
+                if (!parsed) {
+                    throw new Error('session/device/token returned an unexpected response shape');
+                }
+                return parsed;
+            }
+            catch (error) {
+                throw this.handleError(error);
+            }
+        }
         /**
          * Build the top-level `GET /auth/device/bootstrap` URL for the cross-apex
          * hop. The server validates `return_to` against the trusted-origin lane and

package/dist/esm/server/index.js

@@ -27,8 +27,3 @@ export { verifySecret } from './verifySecret.js';
 // Pure host handling (no browser deps), so it is safe on the server subpath and
 // lets `@oxyhq/api` derive `auth.<apex>` without duplicating PSL logic.
 export { registrableApex } from '../utils/registrableApex.js';
-// The single RP callback path the IdP redirects back to. A pure wire-contract
-// constant (no browser deps at module top level), re-used server-side so the
-// `/sso/establish-token` `return_to` cannot drift from what `/sso/establish`
-// validates.
-export { SSO_CALLBACK_PATH } from '../utils/ssoBounce.js';

package/dist/esm/session/accountDialogController.js

@@ -3,7 +3,7 @@
  *
  * A framework-agnostic state machine + subscribe/getSnapshot store (the same
  * pattern {@link SessionClient} uses — no React, no RN) that both
- * `@oxyhq/services` (RN `OxyProvider`) and `@oxyhq/auth` (web `WebOxyProvider`)
+ * every `OxyProvider` platform variant (Expo/RN and RN-Web)
  * bind to via `useSyncExternalStore`, so the account chooser is ONE
  * implementation across the ecosystem instead of the five drifting copies it
  * replaces.

package/dist/esm/session/accountProjection.js

@@ -5,7 +5,7 @@
  * merging the device's server-authoritative session set (`DeviceSessionState`
  * from {@link SessionClient}) with the caller's account graph (`AccountNode[]`
  * from `oxyServices.listAccounts()`), deduped by `accountId`. This lives in
- * `@oxyhq/core` so `@oxyhq/services` (RN) and `@oxyhq/auth` (web) — and
+ * `@oxyhq/core` so every `@oxyhq/services` platform variant — and
  * `auth.oxy.so` — all render the SAME list from the SAME logic and cannot
  * diverge.
  *

package/dist/esm/session/authStateStore.js

@@ -64,6 +64,12 @@ function deserialize(raw) {
     if (typeof candidate.deviceToken === 'string' && candidate.deviceToken.length > 0) {
         state.deviceToken = candidate.deviceToken;
     }
+    if (typeof candidate.deviceId === 'string' && candidate.deviceId.length > 0) {
+        state.deviceId = candidate.deviceId;
+    }
+    if (typeof candidate.deviceSecret === 'string' && candidate.deviceSecret.length > 0) {
+        state.deviceSecret = candidate.deviceSecret;
+    }
     if (typeof candidate.accessToken === 'string' && candidate.accessToken.length > 0) {
         state.accessToken = candidate.accessToken;
     }

package/dist/esm/session/projectSessionState.js

@@ -1,7 +1,7 @@
 /**
  * Pure projection helpers: `DeviceSessionState` (the device-scoped
  * multi-account session-sync state produced by `SessionClient`) -> the
- * shapes consumers (`@oxyhq/services`, `@oxyhq/auth`) render today
+ * shapes `@oxyhq/services` consumers render today
  * (`ClientSession[]`, an active session id, an active `User`).
  *
  * No I/O. The caller fetches profiles via

package/dist/esm/session/refresh.js

@@ -85,6 +85,15 @@ export async function refreshPersistedSession(deps) {
             if (persisted.deviceToken) {
                 next.deviceToken = persisted.deviceToken;
             }
+            // The refresh response carries no device credentials — carry the persisted
+            // deviceId/deviceSecret (phase 2c) forward so a rotation never drops the
+            // zero-cookie mint lane (mirrors the deviceToken preservation above).
+            if (persisted.deviceId) {
+                next.deviceId = persisted.deviceId;
+            }
+            if (persisted.deviceSecret) {
+                next.deviceSecret = persisted.deviceSecret;
+            }
             await store.save(next);
             return rotated.accessToken;
         }

package/dist/esm/session/sessionClientHost.js

@@ -4,8 +4,7 @@
  * `SessionClient` is host-agnostic: it only needs a REST + token surface.
  * `OxyServices` already exposes all of that except `getCurrentAccountId`,
  * which has no direct equivalent — the adapter holds a mutable ref set by
- * the caller (`OxyContext` in `@oxyhq/services`, `WebOxyProvider` in
- * `@oxyhq/auth`) via `setCurrentAccountId`.
+ * the caller (`OxyContext` in `@oxyhq/services`) via `setCurrentAccountId`.
  *
  * Shared here (rather than duplicated per consumer) because it is entirely
  * platform-agnostic: every method it calls exists identically on

package/dist/esm/utils/accountUtils.js

@@ -1,6 +1,6 @@
 /**
  * Shared account types and pure helper functions.
- * Used by both @oxyhq/services (React Native) and @oxyhq/auth (Web) account stores.
+ * Used by the @oxyhq/services account stores (Expo/RN and RN-Web).
  */
 import { translate } from '../i18n/index.js';
 /**