@comfyorg/account-core 1.0.0-alpha.1 → 1.0.0-alpha.2

package/dist/core/billing/operationState.d.ts

@@ -1,4 +1,4 @@
-import type { z } from 'zod';
+import { z } from 'zod';
 import type { BillingScope } from './billingScope.js';
 export declare const BillingOpStatusSchema: z.ZodObject<{
     action_url: z.ZodOptional<z.ZodString>;
@@ -26,6 +26,94 @@ export declare const BillingOpStatusSchema: z.ZodObject<{
 } & {
     amount_charged_cents: z.ZodOptional<z.ZodNumber>;
     credits_added: z.ZodOptional<z.ZodNumber>;
+    charge_breakdown: z.ZodOptional<z.ZodObject<{
+        currency: z.ZodString;
+        prorated: z.ZodBoolean;
+    } & {
+        amount_charged_cents: z.ZodNumber;
+        reasons: z.ZodArray<z.ZodObject<{
+            kind: z.ZodEnum<["promo_code", "subscription_discount", "account_balance"]>;
+        } & {
+            amount_cents: z.ZodNumber;
+            discount: z.ZodOptional<z.ZodObject<{
+                code: z.ZodString;
+                duration: z.ZodOptional<z.ZodEnum<["once", "repeating", "forever"]>>;
+                kind: z.ZodEnum<["plan", "promotion"]>;
+                name: z.ZodOptional<z.ZodString>;
+            } & {
+                amount_off_cents: z.ZodOptional<z.ZodNumber>;
+                duration_in_months: z.ZodOptional<z.ZodNumber>;
+            }, "strip", z.ZodTypeAny, {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            }, {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            }>>;
+        }, "strip", z.ZodTypeAny, {
+            amount_cents: number;
+            kind: "promo_code" | "subscription_discount" | "account_balance";
+            discount?: {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            } | undefined;
+        }, {
+            amount_cents: number;
+            kind: "promo_code" | "subscription_discount" | "account_balance";
+            discount?: {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            } | undefined;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        currency: string;
+        amount_charged_cents: number;
+        prorated: boolean;
+        reasons: {
+            amount_cents: number;
+            kind: "promo_code" | "subscription_discount" | "account_balance";
+            discount?: {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            } | undefined;
+        }[];
+    }, {
+        currency: string;
+        amount_charged_cents: number;
+        prorated: boolean;
+        reasons: {
+            amount_cents: number;
+            kind: "promo_code" | "subscription_discount" | "account_balance";
+            discount?: {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            } | undefined;
+        }[];
+    }>>;
 }, "strip", z.ZodTypeAny, {
     status: "failed" | "pending" | "succeeded" | "reconciliation_needed";
     id: string;
@@ -40,6 +128,23 @@ export declare const BillingOpStatusSchema: z.ZodObject<{
     payment_intent_client_secret?: string | undefined;
     amount_charged_cents?: number | undefined;
     authentication_state?: "requires_action" | "processing" | "failed_retryable" | "succeeded" | "reconciliation_needed" | undefined;
+    charge_breakdown?: {
+        currency: string;
+        amount_charged_cents: number;
+        prorated: boolean;
+        reasons: {
+            amount_cents: number;
+            kind: "promo_code" | "subscription_discount" | "account_balance";
+            discount?: {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            } | undefined;
+        }[];
+    } | undefined;
     credits_added?: number | undefined;
     decline_reason?: "card_declined" | "insufficient_funds" | "expired_card" | "incorrect_cvc" | "authentication_required" | "authentication_failed" | "processing_error" | "payment_not_completed" | "generic" | undefined;
     phase?: "in_progress" | "awaiting_payment_method" | "awaiting_invoice_payment" | undefined;
@@ -59,6 +164,23 @@ export declare const BillingOpStatusSchema: z.ZodObject<{
     payment_intent_client_secret?: string | undefined;
     amount_charged_cents?: number | undefined;
     authentication_state?: "requires_action" | "processing" | "failed_retryable" | "succeeded" | "reconciliation_needed" | undefined;
+    charge_breakdown?: {
+        currency: string;
+        amount_charged_cents: number;
+        prorated: boolean;
+        reasons: {
+            amount_cents: number;
+            kind: "promo_code" | "subscription_discount" | "account_balance";
+            discount?: {
+                code: string;
+                kind: "plan" | "promotion";
+                name?: string | undefined;
+                amount_off_cents?: number | undefined;
+                duration?: "once" | "repeating" | "forever" | undefined;
+                duration_in_months?: number | undefined;
+            } | undefined;
+        }[];
+    } | undefined;
     credits_added?: number | undefined;
     decline_reason?: "card_declined" | "insufficient_funds" | "expired_card" | "incorrect_cvc" | "authentication_required" | "authentication_failed" | "processing_error" | "payment_not_completed" | "generic" | undefined;
     phase?: "in_progress" | "awaiting_payment_method" | "awaiting_invoice_payment" | undefined;

package/dist/core/billing/operationState.js

@@ -11,11 +11,26 @@
  * so no server or payment-provider text can reach a consumer through this
  * state.
  */
-import { zBillingOpStatusResponse } from '@comfyorg/ingest-types/zod';
+import { zBillingOpChargeBreakdown, zBillingOpChargeReason, zBillingOpStatusResponse, zSubscriptionDiscount } from '@comfyorg/ingest-types/zod';
+import { z } from 'zod';
 import { wireCents } from './wireCents.js';
 export const BillingOpStatusSchema = zBillingOpStatusResponse.extend({
     amount_charged_cents: wireCents.optional(),
-    credits_added: wireCents.optional()
+    credits_added: wireCents.optional(),
+    charge_breakdown: zBillingOpChargeBreakdown
+        .extend({
+        amount_charged_cents: wireCents,
+        reasons: z.array(zBillingOpChargeReason.extend({
+            amount_cents: wireCents,
+            discount: zSubscriptionDiscount
+                .extend({
+                amount_off_cents: wireCents.optional(),
+                duration_in_months: wireCents.optional()
+            })
+                .optional()
+        }))
+    })
+        .optional()
 });
 /**
  * The phases the contract defines as blocked on the customer. Neither advances

package/dist/core/billing/subscriptionCommands.d.ts

@@ -93,6 +93,8 @@ declare const PreviewSchema: z.ZodObject<{
     renewal_amount_cents: z.ZodOptional<z.ZodNumber>;
     subtotal_cents: z.ZodOptional<z.ZodNumber>;
     balance_applied_cents: z.ZodOptional<z.ZodNumber>;
+    proration_remaining_cents: z.ZodOptional<z.ZodNumber>;
+    proration_unused_cents: z.ZodOptional<z.ZodNumber>;
     current_plan: z.ZodOptional<z.ZodObject<{
         duration: z.ZodEnum<["MONTHLY", "ANNUAL"]>;
         period_end: z.ZodOptional<z.ZodString>;
@@ -103,6 +105,8 @@ declare const PreviewSchema: z.ZodObject<{
         credits_cents: z.ZodNumber;
         price_cents: z.ZodNumber;
         list_price_cents: z.ZodOptional<z.ZodNumber>;
+        monthly_list_price_cents: z.ZodOptional<z.ZodNumber>;
+        monthly_price_cents: z.ZodOptional<z.ZodNumber>;
         seat_summary: z.ZodObject<{
             seat_count: z.ZodNumber;
         } & {
@@ -131,6 +135,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     }, {
         price_cents: number;
         duration: "MONTHLY" | "ANNUAL";
@@ -145,6 +151,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     }>>;
     new_plan: z.ZodObject<{
         duration: z.ZodEnum<["MONTHLY", "ANNUAL"]>;
@@ -156,6 +164,8 @@ declare const PreviewSchema: z.ZodObject<{
         credits_cents: z.ZodNumber;
         price_cents: z.ZodNumber;
         list_price_cents: z.ZodOptional<z.ZodNumber>;
+        monthly_list_price_cents: z.ZodOptional<z.ZodNumber>;
+        monthly_price_cents: z.ZodOptional<z.ZodNumber>;
         seat_summary: z.ZodObject<{
             seat_count: z.ZodNumber;
         } & {
@@ -184,6 +194,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     }, {
         price_cents: number;
         duration: "MONTHLY" | "ANNUAL";
@@ -198,6 +210,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     }>;
     discounts: z.ZodOptional<z.ZodArray<z.ZodObject<{
         code: z.ZodString;
@@ -244,6 +258,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     };
     transition_type: "new_subscription" | "upgrade" | "downgrade" | "duration_change";
     currency?: string | undefined;
@@ -267,6 +283,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     } | undefined;
     discounts?: {
         code: string;
@@ -277,6 +295,8 @@ declare const PreviewSchema: z.ZodObject<{
         duration_in_months?: number | undefined;
     }[] | undefined;
     payment_method_configuration_id?: string | undefined;
+    proration_remaining_cents?: number | undefined;
+    proration_unused_cents?: number | undefined;
     reason?: string | undefined;
     renewal_amount_cents?: number | undefined;
     renewal_at?: string | undefined;
@@ -304,6 +324,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     };
     transition_type: "new_subscription" | "upgrade" | "downgrade" | "duration_change";
     currency?: string | undefined;
@@ -327,6 +349,8 @@ declare const PreviewSchema: z.ZodObject<{
         period_end?: string | undefined;
         period_start?: string | undefined;
         list_price_cents?: number | undefined;
+        monthly_list_price_cents?: number | undefined;
+        monthly_price_cents?: number | undefined;
     } | undefined;
     discounts?: {
         code: string;
@@ -337,6 +361,8 @@ declare const PreviewSchema: z.ZodObject<{
         duration_in_months?: number | undefined;
     }[] | undefined;
     payment_method_configuration_id?: string | undefined;
+    proration_remaining_cents?: number | undefined;
+    proration_unused_cents?: number | undefined;
     reason?: string | undefined;
     renewal_amount_cents?: number | undefined;
     renewal_at?: string | undefined;

package/dist/core/billing/subscriptionCommands.js

@@ -33,6 +33,8 @@ const PlanInfoSchema = zPreviewPlanInfo.extend({
     credits_cents: wireCents,
     price_cents: wireCents,
     list_price_cents: wireCents.optional(),
+    monthly_list_price_cents: wireCents.optional(),
+    monthly_price_cents: wireCents.optional(),
     seat_summary: zPreviewPlanInfo.shape.seat_summary.extend({
         total_cost_cents: wireCents,
         total_credits_cents: wireCents
@@ -47,6 +49,8 @@ const PreviewSchema = zPreviewSubscribeResponse.extend({
     renewal_amount_cents: wireCents.optional(),
     subtotal_cents: wireCents.optional(),
     balance_applied_cents: wireCents.optional(),
+    proration_remaining_cents: wireCents.optional(),
+    proration_unused_cents: wireCents.optional(),
     current_plan: PlanInfoSchema.optional(),
     new_plan: PlanInfoSchema,
     discounts: z

package/dist/core/requestTimeout.d.ts

@@ -0,0 +1,7 @@
+export interface TimedSignal {
+    readonly signal: AbortSignal | undefined;
+    /** Disarms the timer; call once the response body has been read. */
+    readonly release: () => void;
+}
+/** Joins the caller's signal with an abort after `timeoutMs`, if one is set. */
+export declare function timedSignal(signal: AbortSignal | undefined, timeoutMs: number | undefined): TimedSignal;

package/dist/core/requestTimeout.js

@@ -0,0 +1,13 @@
+/** Joins the caller's signal with an abort after `timeoutMs`, if one is set. */
+export function timedSignal(signal, timeoutMs) {
+    if (timeoutMs === undefined)
+        return { signal, release: () => undefined };
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    return {
+        signal: signal
+            ? AbortSignal.any([signal, controller.signal])
+            : controller.signal,
+        release: () => clearTimeout(timer)
+    };
+}

package/dist/core/sessionTokenMint.d.ts

@@ -8,6 +8,8 @@ export interface SessionTokenMintOptions {
     readonly now?: () => number;
     /** Re-mint once a cached token has this long left. Default 60s. */
     readonly refreshBufferMs?: number;
+    /** Caps each mint, body included; a timeout is `SESSION_UNAVAILABLE`. Default: none. */
+    readonly timeoutMs?: number;
 }
 export interface SessionTokenFailure extends WebSessionFailure {
     /** From a 429's `Retry-After`; no request is sent until it passes. */
@@ -30,4 +32,4 @@ export interface SessionTokenMint {
     readonly getWorkspaceToken: (workspaceId?: string) => Promise<string>;
 }
 export declare const DEFAULT_REFRESH_BUFFER_MS = 60000;
-export declare function createSessionTokenMint({ apiBaseUrl, fetchImpl, getSession, now, refreshBufferMs }: SessionTokenMintOptions): SessionTokenMint;
+export declare function createSessionTokenMint({ apiBaseUrl, fetchImpl, getSession, now, refreshBufferMs, timeoutMs }: SessionTokenMintOptions): SessionTokenMint;

package/dist/core/sessionTokenMint.js

@@ -7,6 +7,7 @@
 import { zErrorResponse, zExchangeTokenResponse } from '@comfyorg/ingest-types/zod';
 import { isCredentialFresh } from './credentialCache.js';
 import { COMFY_CLIENT } from './requestAuth.js';
+import { timedSignal } from './requestTimeout.js';
 export class SessionTokenError extends Error {
     failure;
     constructor(failure) {
@@ -21,7 +22,8 @@ const STATUS_RULES = {
     401: {
         byServerCode: {
             session_expired: 'SESSION_EXPIRED',
-            session_revoked: 'SESSION_REVOKED'
+            session_revoked: 'SESSION_REVOKED',
+            TOKEN_REVOKED: 'SESSION_REVOKED'
         },
         fallback: 'NO_SESSION'
     },
@@ -31,6 +33,11 @@ const STATUS_RULES = {
             workspace_access_denied: 'WORKSPACE_ACCESS_DENIED'
         },
         fallback: 'SESSION_REQUEST_REFUSED'
+    },
+    /** The workspace is unknown, deleted, or not the user's: one remedy. */
+    404: {
+        byServerCode: { NOT_FOUND: 'WORKSPACE_ACCESS_DENIED' },
+        fallback: 'SESSION_REQUEST_REFUSED'
     }
 };
 const zServerCode = zErrorResponse.pick({ code: true });
@@ -72,17 +79,17 @@ function codeFor(status, serverCode) {
         return 'SESSION_REQUEST_REFUSED';
     return rule.byServerCode[serverCode ?? ''] ?? rule.fallback;
 }
-async function classifyFailure(response, nowMs) {
+function classifyFailure(response, body, nowMs) {
     const { status } = response;
     if (status === 429)
         return rateLimited(response, nowMs);
     if (status >= 500)
         return failure('SESSION_UNAVAILABLE', status);
-    const parsed = zServerCode.safeParse(await readJson(response));
+    const parsed = zServerCode.safeParse(body);
     const serverCode = parsed.success ? parsed.data.code : undefined;
     return failure(codeFor(status, serverCode), status, serverCode);
 }
-export function createSessionTokenMint({ apiBaseUrl, fetchImpl, getSession, now = Date.now, refreshBufferMs = DEFAULT_REFRESH_BUFFER_MS }) {
+export function createSessionTokenMint({ apiBaseUrl, fetchImpl, getSession, now = Date.now, refreshBufferMs = DEFAULT_REFRESH_BUFFER_MS, timeoutMs }) {
     const tokenUrl = `${apiBaseUrl.replace(/\/+$/, '')}/auth/token`;
     /** Keyed by workspace; every entry belongs to `cacheOwner`. */
     const cache = new Map();
@@ -101,9 +108,9 @@ export function createSessionTokenMint({ apiBaseUrl, fetchImpl, getSession, now
         rateLimit = undefined;
     }
     async function request(session, workspaceId) {
-        let response;
+        const { signal, release } = timedSignal(undefined, timeoutMs);
         try {
-            response = await fetchImpl(tokenUrl, {
+            const response = await fetchImpl(tokenUrl, {
                 method: 'POST',
                 credentials: 'include',
                 headers: {
@@ -114,20 +121,30 @@ export function createSessionTokenMint({ apiBaseUrl, fetchImpl, getSession, now
                         ? {}
                         : { 'X-Comfy-Workspace-ID': workspaceId })
                 },
-                body: JSON.stringify(workspaceId === undefined ? {} : { workspace_id: workspaceId })
+                body: JSON.stringify(workspaceId === undefined ? {} : { workspace_id: workspaceId }),
+                signal
             });
+            const body = await readJson(response);
+            if (signal?.aborted)
+                return failure('SESSION_UNAVAILABLE');
+            return response.ok
+                ? credentialFrom(session, response.status, body)
+                : classifyFailure(response, body, now());
         }
         catch {
             return failure('SESSION_UNAVAILABLE');
         }
-        if (!response.ok)
-            return classifyFailure(response, now());
-        const parsed = zExchangeTokenResponse.safeParse(await readJson(response));
+        finally {
+            release();
+        }
+    }
+    function credentialFrom(session, status, body) {
+        const parsed = zExchangeTokenResponse.safeParse(body);
         const expiresAt = parsed.success
             ? Date.parse(parsed.data.expires_at)
             : Number.NaN;
         if (!parsed.success || parsed.data.token === '' || !(expiresAt > now())) {
-            return failure('SESSION_UNAVAILABLE', response.status);
+            return failure('SESSION_UNAVAILABLE', status);
         }
         return {
             status: 'ok',

package/dist/core/webSession.d.ts

@@ -5,6 +5,8 @@ export interface WebSessionOptions {
     readonly apiBaseUrl: string;
     readonly fetchImpl: typeof fetch;
     readonly signal?: AbortSignal;
+    /** Caps each request, body included; a timeout is `SESSION_UNAVAILABLE`. Default: none. */
+    readonly timeoutMs?: number;
 }
 export declare function readWebSession(options: WebSessionOptions, { expectedUserId }?: {
     readonly expectedUserId?: string;

package/dist/core/webSession.js

@@ -4,6 +4,7 @@
  * Identity proof is an opaque string from the caller, so no provider leaks in.
  */
 import { zCreateSessionResponse, zDeleteSessionResponse, zErrorResponse, zGetSessionResponse, zRevokeAllSessionsResponse } from '@comfyorg/ingest-types/zod';
+import { timedSignal } from './requestTimeout.js';
 const UNAUTHORIZED_CODES = {
     no_session: 'NO_SESSION',
     session_expired: 'SESSION_EXPIRED',
@@ -31,12 +32,11 @@ async function readJson(response) {
         return undefined;
     }
 }
-async function classifyFailure(response) {
-    const { status } = response;
+function classifyFailure(status, body) {
     if (status === 429 || status >= 500) {
         return failure('SESSION_UNAVAILABLE', status);
     }
-    const parsed = zErrorResponse.safeParse(await readJson(response));
+    const parsed = zErrorResponse.safeParse(body);
     if (!parsed.success)
         return failure('SESSION_REQUEST_REFUSED', status);
     const serverCode = parsed.data.code;
@@ -48,24 +48,31 @@ async function classifyFailure(response) {
     return failure(byServerCode, status, serverCode);
 }
 async function send(options, path, init) {
-    let response;
+    const { signal, release } = timedSignal(options.signal, options.timeoutMs);
     try {
-        response = await options.fetchImpl(`${options.apiBaseUrl.replace(/\/+$/, '')}${path}`, { ...init, credentials: 'include', signal: options.signal });
+        const response = await options.fetchImpl(`${options.apiBaseUrl.replace(/\/+$/, '')}${path}`, { ...init, credentials: 'include', signal });
+        const body = await readJson(response);
+        if (signal?.aborted)
+            return failure('SESSION_UNAVAILABLE');
+        const { status } = response;
+        return response.ok ? { status, body } : classifyFailure(status, body);
     }
     catch {
         return failure('SESSION_UNAVAILABLE');
     }
-    return response.ok ? { response } : classifyFailure(response);
+    finally {
+        release();
+    }
 }
 export async function readWebSession(options, { expectedUserId } = {}) {
     const sent = await send(options, '/auth/session', {
         method: 'GET',
         cache: 'no-store'
     });
-    if (!('response' in sent))
+    if ('code' in sent)
         return sent;
-    const { status } = sent.response;
-    const parsed = zGetSessionResponse.safeParse(await readJson(sent.response));
+    const { status } = sent;
+    const parsed = zGetSessionResponse.safeParse(sent.body);
     if (!parsed.success)
         return failure('SESSION_UNAVAILABLE', status);
     const { user, csrf_token, expires_at, absolute_expires_at } = parsed.data;
@@ -98,22 +105,22 @@ export async function createWebSession(options, getIdentityProof, { expectedUser
         method: 'POST',
         headers: { Authorization: `Bearer ${proof}` }
     });
-    if (!('response' in sent))
+    if ('code' in sent)
         return sent;
-    const parsed = zCreateSessionResponse.safeParse(await readJson(sent.response));
+    const parsed = zCreateSessionResponse.safeParse(sent.body);
     if (!parsed.success || !parsed.data.success) {
-        return failure('SESSION_UNAVAILABLE', sent.response.status);
+        return failure('SESSION_UNAVAILABLE', sent.status);
     }
     return readWebSession(options, { expectedUserId });
 }
 /** Sends no CSRF token: sign-out must work against a dead session. */
 export async function deleteWebSession(options) {
     const sent = await send(options, '/auth/session', { method: 'DELETE' });
-    if (!('response' in sent))
+    if ('code' in sent)
         return sent;
-    const parsed = zDeleteSessionResponse.safeParse(await readJson(sent.response));
+    const parsed = zDeleteSessionResponse.safeParse(sent.body);
     if (!parsed.success || !parsed.data.success) {
-        return failure('SESSION_UNAVAILABLE', sent.response.status);
+        return failure('SESSION_UNAVAILABLE', sent.status);
     }
     return { status: 'ok' };
 }
@@ -127,11 +134,11 @@ export async function revokeAllWebSessions(options, csrfToken, getIdentityProof)
         method: 'POST',
         headers: { Authorization: `Bearer ${proof}`, 'X-CSRF-Token': csrfToken }
     });
-    if (!('response' in sent))
+    if ('code' in sent)
         return sent;
-    const parsed = zRevokeAllSessionsResponse.safeParse(await readJson(sent.response));
+    const parsed = zRevokeAllSessionsResponse.safeParse(sent.body);
     if (!parsed.success) {
-        return failure('SESSION_UNAVAILABLE', sent.response.status);
+        return failure('SESSION_UNAVAILABLE', sent.status);
     }
     return { status: 'ok' };
 }

package/dist/core/webSessionFlag.d.ts

@@ -2,8 +2,7 @@
  * `unified_web_session` for a site with no sign-in of its own to ask with.
  * The anonymous `/api/features` document's global `web_session_probe` only
  * decides whether to ask; the answer is the credentialed read's
- * `unified_web_session` (cloud#10689). `web_session_probe` is a backend
- * follow-up to cloud#10689 and not served yet. Every failure is `false`.
+ * `unified_web_session` (cloud#10689). Every failure is `false`.
  */
 export interface FeaturesReadOptions {
     /** Cloud origin, e.g. `https://cloud.comfy.org`. */

package/dist/core/webSessionFlag.js

@@ -2,8 +2,7 @@
  * `unified_web_session` for a site with no sign-in of its own to ask with.
  * The anonymous `/api/features` document's global `web_session_probe` only
  * decides whether to ask; the answer is the credentialed read's
- * `unified_web_session` (cloud#10689). `web_session_probe` is a backend
- * follow-up to cloud#10689 and not served yet. Every failure is `false`.
+ * `unified_web_session` (cloud#10689). Every failure is `false`.
  */
 const DEFAULT_TIMEOUT_MS = 5000;
 function readsLiteralTrue(body, key) {

package/dist/core/webSessionIdentity.d.ts

@@ -136,6 +136,12 @@ export interface WebSessionIdentity {
     /** Only after an interactive sign-in; a token refresh must never call it. */
     signedIn: (getProof: () => Promise<string>) => Promise<WebSessionResult>;
     signOut: () => Promise<WebSessionCommandResult>;
+    /**
+     * Reads the session now, as a heartbeat would, and resolves once the answer
+     * and any restore it starts have settled. Reads nothing unless signed in as
+     * `expectedUserId` (any user when omitted).
+     */
+    refresh: (expectedUserId?: string) => Promise<WebSessionIdentityState>;
     /** Changes with the account; an answer started under an older epoch is stale. */
     getEpoch: () => number;
     /** Cancels timers, ignores answers in flight, and returns to idle. */

package/dist/core/webSessionIdentity.js

@@ -261,6 +261,7 @@ function createApiKeyIdentity() {
             retryable: false
         }),
         signOut: async () => ({ status: 'ok' }),
+        refresh: async () => state,
         getEpoch: () => 0,
         dispose: () => undefined
     };
@@ -280,6 +281,7 @@ function createAccountIdentity(options, login) {
     let cancelBeat;
     let releaseLeadership;
     let stopWatching = [];
+    let restoring = { epoch, settled: Promise.resolve() };
     function dispatch(event) {
         const next = transitionWebSessionIdentity(state, event);
         const changed = next.state !== state;
@@ -311,7 +313,7 @@ function createAccountIdentity(options, login) {
     function beat() {
         const started = epoch;
         const observed = { type: 'session_observed', from: 'this_tab' };
-        void answer(started, observed, async () => {
+        return answer(started, observed, async () => {
             const result = await readWebSession(options.session);
             const shared = result.status === 'ok' || result.code === 'SESSION_REVOKED';
             if (shared && started === epoch)
@@ -343,7 +345,7 @@ function createAccountIdentity(options, login) {
     }
     function armBeat() {
         cancelBeat = schedule(() => {
-            beat();
+            void beat();
             armBeat();
         }, heartbeat?.intervalMs ?? HEARTBEAT_INTERVAL_MS);
     }
@@ -377,7 +379,7 @@ function createAccountIdentity(options, login) {
         stopWatching = [
             visibility.onChange((visible) => {
                 if (visible && state.phase === 'signed_in')
-                    beat();
+                    void beat();
                 syncLeadership();
             }),
             ...(crossTab ? [crossTab.onCredential(HEARTBEAT_KEY, adopt)] : [])
@@ -400,7 +402,7 @@ function createAccountIdentity(options, login) {
                 void answer(epoch, { type: 'read_answered' }, () => readWebSession(options.session));
                 return;
             case 'restore':
-                void restore(epoch, effect.expectedUserId);
+                restoring = { epoch, settled: restore(epoch, effect.expectedUserId) };
                 return;
             case 'schedule_retry':
                 cancelRetry = schedule(() => {
@@ -477,6 +479,17 @@ function createAccountIdentity(options, login) {
                 publish('sign_out', revoked);
             return result;
         },
+        refresh: async (expectedUserId) => {
+            if (state.phase !== 'signed_in')
+                return state;
+            if ((expectedUserId ?? state.session.user.id) !== state.session.user.id) {
+                return state;
+            }
+            await beat();
+            if (restoring.epoch === epoch)
+                await restoring.settled;
+            return state;
+        },
         getEpoch: () => epoch,
         dispose: () => {
             epoch += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/account-core",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "Shared account layer: a framework-free session core that exchanges a signed-in identity for the workspace-scoped Cloud JWT with valid-on-read freshness, plus the package-owned Firebase identity entry. It has no view layer and no Vue dependency; the composables and unstyled components ship from @comfyorg/account-ui",
   "keywords": [],
   "homepage": "https://comfy.org",