@tempoxyz/id 0.0.0-pr-681.sha-4ead0bb → 0.0.0-pr-682.sha-d0df8be

package/dist/{Connections-ZL3DMPMV.js → Connections-RTGUTHPP.js}

@@ -4,8 +4,8 @@ import {
   name,
   parseName,
   pending
-} from "./chunk-QIQD2DXD.js";
-import "./chunk-GMRE2WA3.js";
+} from "./chunk-GOY75KTX.js";
+import "./chunk-HU7IKUQX.js";
 import "./chunk-YW5DUQT3.js";
 import "./chunk-MLKGABMK.js";
 export {

package/dist/{Sheet-JJQ2IG6X.js → Sheet-IFKNYXEI.js}

@@ -4,7 +4,7 @@ import {
   machines,
   prompt,
   waiting
-} from "./chunk-GMRE2WA3.js";
+} from "./chunk-HU7IKUQX.js";
 import "./chunk-MLKGABMK.js";
 export {
   create,

package/dist/{chunk-QIQD2DXD.js → chunk-GOY75KTX.js}

@@ -5,7 +5,7 @@ import {
   expired,
   from,
   revokeAccessKey
-} from "./chunk-GMRE2WA3.js";
+} from "./chunk-HU7IKUQX.js";
 import {
   from as from2
 } from "./chunk-YW5DUQT3.js";

package/dist/{chunk-GMRE2WA3.js → chunk-HU7IKUQX.js}

@@ -1658,7 +1658,7 @@ async function open(auth, options) {
     throw new OriginError({ origin: window.location.origin, redirectUri });
   if (mode === "popup" && options.mode !== "popup" && !activated()) {
     const address2 = await abortable(read2(), { signal });
-    const Sheet = await import("./Sheet-JJQ2IG6X.js");
+    const Sheet = await import("./Sheet-IFKNYXEI.js");
     return await new Promise((resolve3, reject) => {
       const abort = () => {
         close();
@@ -1709,7 +1709,7 @@ async function watch(auth, options) {
   try {
     return await new Promise(
       (resolve3, reject) => {
-        void import("./Sheet-JJQ2IG6X.js").then(
+        void import("./Sheet-IFKNYXEI.js").then(
           (Sheet) => {
             if (settled) return;
             unblock = Sheet.waiting({
@@ -1774,7 +1774,7 @@ function parse(url, options) {
 async function frame(auth, options) {
   const { redirectUri, signal, toUrl } = options;
   const address2 = await abortable(options.address, { signal });
-  const Sheet = await import("./Sheet-JJQ2IG6X.js");
+  const Sheet = await import("./Sheet-IFKNYXEI.js");
   signal?.throwIfAborted();
   let close;
   let abort;
@@ -2694,6 +2694,70 @@ import {
   Credential,
   Registration
 } from "ox/webauthn";
+
+// ../../accounts/src/internal/SignIn.ts
+import { KeyAuthorization as KeyAuthorization2 } from "ox/tempo";
+
+// ../../accounts/src/Session.ts
+function from4(value) {
+  return value;
+}
+function expired2(session2) {
+  if (session2.key) return expired(session2.key);
+  return !session2.refreshToken && session2.expiresAt <= Date.now();
+}
+
+// ../../accounts/src/internal/SignIn.ts
+function accessKey(context, value) {
+  if (value === false) return void 0;
+  if (typeof value === "function") return value();
+  if (value) return value;
+  return context.accessKey();
+}
+function toSession(result) {
+  return from4({
+    accessToken: result.accessToken,
+    ...result.account ? { account: result.account } : {},
+    expiresAt: result.expiresAt,
+    ...result.idToken !== void 0 ? { idToken: result.idToken } : {},
+    ...result.key ? { key: withLifetime(result.key) } : {},
+    ...result.refreshToken !== void 0 ? { refreshToken: result.refreshToken } : {},
+    user: result.user
+  });
+}
+function withLifetime(key) {
+  const { expiry } = KeyAuthorization2.fromRpc(key.keyAuthorization);
+  if (!expiry) return key;
+  return { ...key, lifetime: expiry - Math.floor(Date.now() / 1e3) };
+}
+async function account(config, options) {
+  const listed = await (async () => {
+    try {
+      return await json(
+        await (config.fetch ?? fetch)(
+          new URL(
+            `/v1/account?${new URLSearchParams({ chain: String(config.chainId), client_id: config.clientId })}`,
+            config.url
+          ),
+          { credentials: "include" }
+        )
+      );
+    } catch (error3) {
+      if (unlisted(error3, { field: "chain" })) return void 0;
+      return signedIn(error3, {
+        message: "The account read failed after the sign-in, with no response from Tempo ID. The user is signed in, so sign in again."
+      });
+    }
+  })();
+  if (!listed || listed.id !== options.userId) return void 0;
+  const [first] = listed.tempo;
+  return first && tempoAccount(first, { getFn: options.getFn });
+}
+function unlisted(error3, options) {
+  return error3 instanceof RequestError && error3.reason === "invalid_field" && error3.field === options.field;
+}
+
+// ../../accounts/src/actions/passkey.ts
 async function available(auth) {
   const response = await (auth.fetch ?? fetch)(
     new URL(
@@ -2892,21 +2956,42 @@ async function sign2(prepared, options) {
 }
 async function verify(auth, options) {
   const { assertion, prepared } = options;
-  const body = await read(
+  const requested = prepared.key ? void 0 : prepared.request.account;
+  const chain = requested?.chain ?? requested?.chainId;
+  const send2 = async (withAccount) => read(
     await post(auth, "/v1/auth/passkey/verify", {
       // The prepared authorization's code redeems in the same request.
       headers: await redemption(auth),
-      json: { assertion }
+      json: {
+        ...withAccount ? {
+          account: {
+            ...chain !== void 0 ? { chain } : {},
+            client_id: auth.clientId
+          }
+        } : {},
+        assertion
+      }
     })
   );
+  const body = await send2(requested !== void 0).catch((error3) => {
+    if (!requested || !unlisted(error3, { field: "account.chain" }))
+      throw error3;
+    return send2(false);
+  });
   if ("step" in body)
     return { step: { link: body.step.link, type: body.step.type } };
-  return await complete(auth, {
+  const authorization2 = await complete(auth, {
     authorize: prepared.authorize,
     body,
     key: prepared.key,
     request: prepared.request
   });
+  if (!requested || !body.tempo) return authorization2;
+  const [first] = body.tempo;
+  return {
+    ...authorization2,
+    account: first ? tempoAccount(first, { getFn: requested.getFn }) : void 0
+  };
 }
 
 // ../../accounts/src/actions/realm.ts
@@ -3026,70 +3111,6 @@ function thirdParty(clientId) {
 // ../../accounts/src/internal/Core.ts
 import { Address as Address4 } from "ox";
 import { KeyAuthorization as KeyAuthorization3 } from "ox/tempo";
-
-// ../../accounts/src/internal/SignIn.ts
-import { KeyAuthorization as KeyAuthorization2 } from "ox/tempo";
-
-// ../../accounts/src/Session.ts
-function from4(value) {
-  return value;
-}
-function expired2(session2) {
-  if (session2.key) return expired(session2.key);
-  return !session2.refreshToken && session2.expiresAt <= Date.now();
-}
-
-// ../../accounts/src/internal/SignIn.ts
-function accessKey(context, value) {
-  if (value === false) return void 0;
-  if (typeof value === "function") return value();
-  if (value) return value;
-  return context.accessKey();
-}
-function toSession(result) {
-  return from4({
-    accessToken: result.accessToken,
-    ...result.account ? { account: result.account } : {},
-    expiresAt: result.expiresAt,
-    ...result.idToken !== void 0 ? { idToken: result.idToken } : {},
-    ...result.key ? { key: withLifetime(result.key) } : {},
-    ...result.refreshToken !== void 0 ? { refreshToken: result.refreshToken } : {},
-    user: result.user
-  });
-}
-function withLifetime(key) {
-  const { expiry } = KeyAuthorization2.fromRpc(key.keyAuthorization);
-  if (!expiry) return key;
-  return { ...key, lifetime: expiry - Math.floor(Date.now() / 1e3) };
-}
-async function account(config, options) {
-  const listed = await (async () => {
-    try {
-      return await json(
-        await (config.fetch ?? fetch)(
-          new URL(
-            `/v1/account?${new URLSearchParams({ chain: String(config.chainId), client_id: config.clientId })}`,
-            config.url
-          ),
-          { credentials: "include" }
-        )
-      );
-    } catch (error3) {
-      if (unlisted(error3, { field: "chain" })) return void 0;
-      return signedIn(error3, {
-        message: "The account read failed after the sign-in, with no response from Tempo ID. The user is signed in, so sign in again."
-      });
-    }
-  })();
-  if (!listed || listed.id !== options.userId) return void 0;
-  const [first] = listed.tempo;
-  return first && tempoAccount(first, { getFn: options.getFn });
-}
-function unlisted(error3, options) {
-  return error3 instanceof RequestError && error3.reason === "invalid_field" && error3.field === options.field;
-}
-
-// ../../accounts/src/internal/Core.ts
 function authorize5(context, options = {}) {
   return context.session.authorize(() => run(context, options));
 }
@@ -3220,6 +3241,8 @@ async function getSession(context, options) {
   const { restore } = options;
   if (!options.reauthorize) {
     await restore();
+    const loaded = await context.session.load();
+    if (loaded || !await context.session.settled()) return loaded;
     return await context.session.load();
   }
   const fn = (() => {
@@ -3242,6 +3265,7 @@ async function getSession(context, options) {
     await restore();
     return await context.session.load();
   }
+  await context.session.settled();
   return await context.session.authorize(async () => {
     await restore();
     const loaded = await context.session.load();
@@ -3303,7 +3327,7 @@ var signInIds = /* @__PURE__ */ new Set([
 function plugin() {
   let loading;
   function load() {
-    loading ??= import("./dialog-6645IIOG.js").then((module) => module.dialog()).catch((error3) => {
+    loading ??= import("./dialog-4273L5TD.js").then((module) => module.dialog()).catch((error3) => {
       loading = void 0;
       throw error3;
     });
@@ -3578,14 +3602,22 @@ function create3(options) {
     return () => subscription.unsubscribe();
   }
   const rotated = /* @__PURE__ */ new Map();
+  const authorizations = /* @__PURE__ */ new Set();
   return {
     actor,
     async authorize(fn) {
       if (!actor) return await fn();
       actor.send({ type: "authorize.start" });
+      const promise = fn();
+      const entry = promise.then(
+        () => void 0,
+        () => void 0
+      );
+      authorizations.add(entry);
       try {
-        return await fn();
+        return await promise;
       } finally {
+        authorizations.delete(entry);
         actor.send({ type: "authorize.end" });
       }
     },
@@ -3688,6 +3720,11 @@ function create3(options) {
     },
     reload,
     renewing: () => actor?.getSnapshot().context.renewing,
+    async settled() {
+      if (authorizations.size === 0) return false;
+      await Promise.all(authorizations);
+      return true;
+    },
     async signedOut() {
       if (actor ? context().marked : markedLocal) return true;
       const stored = await (async () => store2?.getItem(`${name}:signed-out`))().catch(() => void 0);
@@ -4457,7 +4494,8 @@ function create4(options = {}) {
       get: session2.get,
       load: session2.load,
       reload: session2.reload,
-      renewing: session2.renewing
+      renewing: session2.renewing,
+      settled: session2.settled
     }
   };
   const namespaces = {};
@@ -4481,6 +4519,10 @@ function create4(options = {}) {
       refreshing ??= refresh2(context, { margin: 3e4 }).finally(() => {
         refreshing = void 0;
       });
+      if (current.expiresAt - 5e3 > Date.now()) {
+        refreshing.catch(() => void 0);
+        return current.accessToken;
+      }
       const latest = await refreshing ?? context.session.get();
       if (!latest) throw new SignedOutError2();
       if (latest.user.id !== current.user.id) throw new SignedOutError2();
@@ -4493,7 +4535,7 @@ function create4(options = {}) {
   function connections2() {
     if (!connectionsOptions)
       return Promise.reject(new ConnectionsRequiredError());
-    attached ??= import("./Connections-ZL3DMPMV.js").then(
+    attached ??= import("./Connections-RTGUTHPP.js").then(
       (module) => module.attach(config, connectionsOptions)
     );
     return attached;
@@ -4551,6 +4593,7 @@ function create4(options = {}) {
       }
     },
     session: {
+      accessToken: accessToken2,
       actor: session2.actor,
       fetch: async (parameters) => fetch2(config, {
         ...parameters,
@@ -5568,10 +5611,10 @@ export {
   frame2 as frame,
   machines3 as machines,
   dialog_exports,
-  Actions_exports,
   expired2,
   accessKey,
   toSession,
+  Actions_exports,
   from5 as from2,
   PendingNotFoundError,
   RequestError,

package/dist/{chunk-HOCQX34A.js → chunk-KUGGMQNM.js}

@@ -2,7 +2,7 @@ import {
   AccessKey_exports,
   Accounts_exports,
   Actions_exports
-} from "./chunk-GMRE2WA3.js";
+} from "./chunk-HU7IKUQX.js";
 
 // src/Session.ts
 import * as Fs from "node:fs/promises";

package/dist/commands/login.js

@@ -1,9 +1,9 @@
 import {
   env,
   login
-} from "../chunk-HOCQX34A.js";
-import "../chunk-QIQD2DXD.js";
-import "../chunk-GMRE2WA3.js";
+} from "../chunk-KUGGMQNM.js";
+import "../chunk-GOY75KTX.js";
+import "../chunk-HU7IKUQX.js";
 import "../chunk-YW5DUQT3.js";
 import "../chunk-MLKGABMK.js";
 

package/dist/commands/logout.js

@@ -1,9 +1,9 @@
 import {
   env,
   remove
-} from "../chunk-HOCQX34A.js";
-import "../chunk-QIQD2DXD.js";
-import "../chunk-GMRE2WA3.js";
+} from "../chunk-KUGGMQNM.js";
+import "../chunk-GOY75KTX.js";
+import "../chunk-HU7IKUQX.js";
 import "../chunk-YW5DUQT3.js";
 import "../chunk-MLKGABMK.js";
 

package/dist/commands/whoami.js

@@ -2,9 +2,9 @@ import {
   env,
   signedOut,
   whoami
-} from "../chunk-HOCQX34A.js";
-import "../chunk-QIQD2DXD.js";
-import "../chunk-GMRE2WA3.js";
+} from "../chunk-KUGGMQNM.js";
+import "../chunk-GOY75KTX.js";
+import "../chunk-HU7IKUQX.js";
 import "../chunk-YW5DUQT3.js";
 import "../chunk-MLKGABMK.js";
 

package/dist/{dialog-6645IIOG.js → dialog-4273L5TD.js}

@@ -4,7 +4,7 @@ import {
   expired2 as expired,
   from2 as from,
   toSession
-} from "./chunk-GMRE2WA3.js";
+} from "./chunk-HU7IKUQX.js";
 import "./chunk-MLKGABMK.js";
 
 // ../../accounts/src/plugins/dialog.ts

package/package.json

@@ -9,7 +9,7 @@
     "node": ">=24.21"
   },
   "name": "@tempoxyz/id",
-  "version": "0.0.0-pr-681.sha-4ead0bb",
+  "version": "0.0.0-pr-682.sha-d0df8be",
   "description": "The tempo-id CLI: sign in to Tempo ID, and call its API and the Admin API.",
   "type": "module",
   "bin": {