@cmssy/core 10.2.0 → 10.4.0

package/dist/{content-client-D0EdiqbQ.d.cts → content-client-CJQ-nafm.d.cts}

@@ -3,15 +3,28 @@ import { CmssyClientConfig, CmssyLayoutGroup, CmssyPageData, CmssyPageMeta, Cmss
 /** HTTP-level failure from the cmssy API, with a machine-readable status. */
 declare class CmssyRequestError extends Error {
     readonly status: number;
-    constructor(message: string, status: number);
+    /**
+     * How long the server asked us to wait, in ms, when it said so. Present on a
+     * 429 that carried `Retry-After`; a caller can serve stale content for that
+     * long instead of guessing.
+     */
+    readonly retryAfterMs?: number;
+    constructor(message: string, status: number, retryAfterMs?: number);
 }
 interface RetryPolicy {
     /** Additional attempts after the first request (default 3). */
     maxRetries?: number;
     /** Exponential backoff base in ms: base * 2^attempt (default 300). */
     baseDelayMs?: number;
-    /** Upper bound for any single wait, including Retry-After (default 3000). */
+    /** Upper bound for a guessed backoff wait (default 3000). */
     maxDelayMs?: number;
+    /**
+     * Upper bound for a wait the server asked for by `Retry-After` (default
+     * 10000). Beyond it there is nothing to gain from holding a render open, so
+     * the request fails immediately and carries `retryAfterMs` - the caller is in
+     * a better position to decide between stale content and an error page.
+     */
+    maxRetryAfterMs?: number;
     /** HTTP statuses that trigger a retry (default [429, 503]). */
     retryStatuses?: number[];
 }

package/dist/{content-client-D0EdiqbQ.d.ts → content-client-CJQ-nafm.d.ts}

@@ -3,15 +3,28 @@ import { CmssyClientConfig, CmssyLayoutGroup, CmssyPageData, CmssyPageMeta, Cmss
 /** HTTP-level failure from the cmssy API, with a machine-readable status. */
 declare class CmssyRequestError extends Error {
     readonly status: number;
-    constructor(message: string, status: number);
+    /**
+     * How long the server asked us to wait, in ms, when it said so. Present on a
+     * 429 that carried `Retry-After`; a caller can serve stale content for that
+     * long instead of guessing.
+     */
+    readonly retryAfterMs?: number;
+    constructor(message: string, status: number, retryAfterMs?: number);
 }
 interface RetryPolicy {
     /** Additional attempts after the first request (default 3). */
     maxRetries?: number;
     /** Exponential backoff base in ms: base * 2^attempt (default 300). */
     baseDelayMs?: number;
-    /** Upper bound for any single wait, including Retry-After (default 3000). */
+    /** Upper bound for a guessed backoff wait (default 3000). */
     maxDelayMs?: number;
+    /**
+     * Upper bound for a wait the server asked for by `Retry-After` (default
+     * 10000). Beyond it there is nothing to gain from holding a render open, so
+     * the request fails immediately and carries `retryAfterMs` - the caller is in
+     * a better position to decide between stale content and an error page.
+     */
+    maxRetryAfterMs?: number;
     /** HTTP statuses that trigger a retry (default [429, 503]). */
     retryStatuses?: number[];
 }

package/dist/{csp-DlAEXYjA.d.cts → csp-BityT_ug.d.cts}

@@ -1,5 +1,5 @@
 import { CmssyClientConfig, BlockRect, BlockSchema, BlockMeta } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-rhYcXU5z.cjs';
+import { G as GraphqlRequestOptions } from './locale-C7sA46qu.cjs';
 
 declare const DEFAULT_CMSSY_EDITOR_ORIGINS: string[];
 declare function isDevelopment(): boolean;

package/dist/{csp-Blh6P15m.d.ts → csp-DJ17P3PN.d.ts}

@@ -1,5 +1,5 @@
 import { CmssyClientConfig, BlockRect, BlockSchema, BlockMeta } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-XintNd0n.js';
+import { G as GraphqlRequestOptions } from './locale-Ox_qVlNy.js';
 
 declare const DEFAULT_CMSSY_EDITOR_ORIGINS: string[];
 declare function isDevelopment(): boolean;

package/dist/index.cjs

@@ -64,10 +64,17 @@ Set the listed environment variables (e.g. in .env.local) and restart the dev se
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
   status;
-  constructor(message, status) {
+  /**
+   * How long the server asked us to wait, in ms, when it said so. Present on a
+   * 429 that carried `Retry-After`; a caller can serve stale content for that
+   * long instead of guessing.
+   */
+  retryAfterMs;
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
+    if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
   }
 };
 var DEFAULT_RETRY_STATUSES = [429, 503];
@@ -104,14 +111,17 @@ async function fetchWithRetry(doFetch, url, init, retry) {
   const maxRetries = retry.maxRetries ?? 3;
   const baseDelayMs = retry.baseDelayMs ?? 300;
   const maxDelayMs = retry.maxDelayMs ?? 3e3;
+  const maxRetryAfterMs = retry.maxRetryAfterMs ?? 1e4;
   const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (response.ok || !retryStatuses.includes(response.status)) {
       return response;
     }
+    const asked = retryAfterMs(response);
+    if (asked !== null && asked > maxRetryAfterMs) return response;
     const backoff = baseDelayMs * 2 ** attempt;
-    const wait = Math.min(retryAfterMs(response) ?? backoff, maxDelayMs);
+    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
     await sleep(wait, init.signal);
     response = await doFetch(url, init);
   }
@@ -145,9 +155,12 @@ async function postGraphql(url, query, variables, options) {
     } catch {
       detail = "";
     }
+    const asked = retryAfterMs(response);
+    const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}`,
-      response.status
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      response.status,
+      asked ?? void 0
     );
   }
   let json;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, P as PROTOCOL_VERSION, e as ParentReadyMessage, f as PatchMessage, g as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SelectMessage, h as applyCmssyCsp, i as createCmssyClient, j as defineCmssyConfig, k as isProtocolCompatible, n as normalizeOrigin, p as parseEditorMessage, l as postToEditor, r as resolveEditorOrigin } from './csp-DlAEXYjA.cjs';
-export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref } from './locale-rhYcXU5z.cjs';
-export { C as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, a as FetchLikeResponse, b as FetchPageOptions, R as RetryPolicy } from './content-client-D0EdiqbQ.cjs';
+export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, P as PROTOCOL_VERSION, e as ParentReadyMessage, f as PatchMessage, g as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SelectMessage, h as applyCmssyCsp, i as createCmssyClient, j as defineCmssyConfig, k as isProtocolCompatible, n as normalizeOrigin, p as parseEditorMessage, l as postToEditor, r as resolveEditorOrigin } from './csp-BityT_ug.cjs';
+export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref } from './locale-C7sA46qu.cjs';
+export { C as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, a as FetchLikeResponse, b as FetchPageOptions, R as RetryPolicy } from './content-client-CJQ-nafm.cjs';
 import * as _cmssy_types from '@cmssy/types';
 import { FieldOptions, TypedField, BlockPropsSchema, InferBlockContent, RelationMode, CmssyModelRecord, VerifyCmssyWebhookOptions, CmssyWebhookEvent } from '@cmssy/types';
 export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup } from '@cmssy/types';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, P as PROTOCOL_VERSION, e as ParentReadyMessage, f as PatchMessage, g as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SelectMessage, h as applyCmssyCsp, i as createCmssyClient, j as defineCmssyConfig, k as isProtocolCompatible, n as normalizeOrigin, p as parseEditorMessage, l as postToEditor, r as resolveEditorOrigin } from './csp-Blh6P15m.js';
-export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref } from './locale-XintNd0n.js';
-export { C as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, a as FetchLikeResponse, b as FetchPageOptions, R as RetryPolicy } from './content-client-D0EdiqbQ.js';
+export { A as AppToEditorMessage, B as BoundsMessage, C as ClickMessage, a as CmssyClient, b as CmssyConfig, c as CmssyCspOptions, d as CmssyEnvConfig, D as DEFAULT_CMSSY_EDITOR_ORIGINS, E as EditorToAppMessage, P as PROTOCOL_VERSION, e as ParentReadyMessage, f as PatchMessage, g as PostTarget, Q as QueryScopedOptions, R as ReadyMessage, S as SelectMessage, h as applyCmssyCsp, i as createCmssyClient, j as defineCmssyConfig, k as isProtocolCompatible, n as normalizeOrigin, p as parseEditorMessage, l as postToEditor, r as resolveEditorOrigin } from './csp-DJ17P3PN.js';
+export { C as CMSSY_LOCALE_HEADER, G as GraphqlRequestOptions, g as graphqlRequest, l as localizeHref } from './locale-Ox_qVlNy.js';
+export { C as CmssyRequestError, D as DEFAULT_CMSSY_API_URL, F as FetchLike, a as FetchLikeResponse, b as FetchPageOptions, R as RetryPolicy } from './content-client-CJQ-nafm.js';
 import * as _cmssy_types from '@cmssy/types';
 import { FieldOptions, TypedField, BlockPropsSchema, InferBlockContent, RelationMode, CmssyModelRecord, VerifyCmssyWebhookOptions, CmssyWebhookEvent } from '@cmssy/types';
 export { BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BuildBlockContextExtra, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssySiteConfig, CmssyWebhookEvent, CmssyWebhookOrder, FieldCondition, FieldConditionGroup, FieldConditionLogic, FieldControl, FieldDefinition, FieldOptions, FieldType, InferBlockContent, RawBlock, RawLayoutBlock, SubmitFormInput, TypedField, VerifyCmssyWebhookOptions, evaluateFieldConditionGroup } from '@cmssy/types';

package/dist/index.js

@@ -62,10 +62,17 @@ Set the listed environment variables (e.g. in .env.local) and restart the dev se
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
   status;
-  constructor(message, status) {
+  /**
+   * How long the server asked us to wait, in ms, when it said so. Present on a
+   * 429 that carried `Retry-After`; a caller can serve stale content for that
+   * long instead of guessing.
+   */
+  retryAfterMs;
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
+    if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
   }
 };
 var DEFAULT_RETRY_STATUSES = [429, 503];
@@ -102,14 +109,17 @@ async function fetchWithRetry(doFetch, url, init, retry) {
   const maxRetries = retry.maxRetries ?? 3;
   const baseDelayMs = retry.baseDelayMs ?? 300;
   const maxDelayMs = retry.maxDelayMs ?? 3e3;
+  const maxRetryAfterMs = retry.maxRetryAfterMs ?? 1e4;
   const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (response.ok || !retryStatuses.includes(response.status)) {
       return response;
     }
+    const asked = retryAfterMs(response);
+    if (asked !== null && asked > maxRetryAfterMs) return response;
     const backoff = baseDelayMs * 2 ** attempt;
-    const wait = Math.min(retryAfterMs(response) ?? backoff, maxDelayMs);
+    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
     await sleep(wait, init.signal);
     response = await doFetch(url, init);
   }
@@ -143,9 +153,12 @@ async function postGraphql(url, query, variables, options) {
     } catch {
       detail = "";
     }
+    const asked = retryAfterMs(response);
+    const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}`,
-      response.status
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      response.status,
+      asked ?? void 0
     );
   }
   let json;

package/dist/internal/locale.cjs

@@ -3,10 +3,17 @@
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
   status;
-  constructor(message, status) {
+  /**
+   * How long the server asked us to wait, in ms, when it said so. Present on a
+   * 429 that carried `Retry-After`; a caller can serve stale content for that
+   * long instead of guessing.
+   */
+  retryAfterMs;
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
+    if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
   }
 };
 var DEFAULT_RETRY_STATUSES = [429, 503];
@@ -43,14 +50,17 @@ async function fetchWithRetry(doFetch, url, init, retry) {
   const maxRetries = retry.maxRetries ?? 3;
   const baseDelayMs = retry.baseDelayMs ?? 300;
   const maxDelayMs = retry.maxDelayMs ?? 3e3;
+  const maxRetryAfterMs = retry.maxRetryAfterMs ?? 1e4;
   const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (response.ok || !retryStatuses.includes(response.status)) {
       return response;
     }
+    const asked = retryAfterMs(response);
+    if (asked !== null && asked > maxRetryAfterMs) return response;
     const backoff = baseDelayMs * 2 ** attempt;
-    const wait = Math.min(retryAfterMs(response) ?? backoff, maxDelayMs);
+    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
     await sleep(wait, init.signal);
     response = await doFetch(url, init);
   }
@@ -84,9 +94,12 @@ async function postGraphql(url, query, variables, options) {
     } catch {
       detail = "";
     }
+    const asked = retryAfterMs(response);
+    const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}`,
-      response.status
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      response.status,
+      asked ?? void 0
     );
   }
   let json;

package/dist/internal/locale.d.cts

@@ -1,8 +1,8 @@
-import { G as GraphqlRequestOptions } from '../locale-rhYcXU5z.cjs';
-export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from '../locale-rhYcXU5z.cjs';
+import { G as GraphqlRequestOptions } from '../locale-C7sA46qu.cjs';
+export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from '../locale-C7sA46qu.cjs';
 import { CmssySiteLocales, CmssyClientConfig } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
-import '../content-client-D0EdiqbQ.cjs';
+import '../content-client-CJQ-nafm.cjs';
 
 /**
  * Maps a workspace site config to its locale set. The single place that

package/dist/internal/locale.d.ts

@@ -1,8 +1,8 @@
-import { G as GraphqlRequestOptions } from '../locale-XintNd0n.js';
-export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from '../locale-XintNd0n.js';
+import { G as GraphqlRequestOptions } from '../locale-Ox_qVlNy.js';
+export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from '../locale-Ox_qVlNy.js';
 import { CmssySiteLocales, CmssyClientConfig } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
-import '../content-client-D0EdiqbQ.js';
+import '../content-client-CJQ-nafm.js';
 
 /**
  * Maps a workspace site config to its locale set. The single place that

package/dist/internal/locale.js

@@ -1,10 +1,17 @@
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
   status;
-  constructor(message, status) {
+  /**
+   * How long the server asked us to wait, in ms, when it said so. Present on a
+   * 429 that carried `Retry-After`; a caller can serve stale content for that
+   * long instead of guessing.
+   */
+  retryAfterMs;
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
+    if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
   }
 };
 var DEFAULT_RETRY_STATUSES = [429, 503];
@@ -41,14 +48,17 @@ async function fetchWithRetry(doFetch, url, init, retry) {
   const maxRetries = retry.maxRetries ?? 3;
   const baseDelayMs = retry.baseDelayMs ?? 300;
   const maxDelayMs = retry.maxDelayMs ?? 3e3;
+  const maxRetryAfterMs = retry.maxRetryAfterMs ?? 1e4;
   const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (response.ok || !retryStatuses.includes(response.status)) {
       return response;
     }
+    const asked = retryAfterMs(response);
+    if (asked !== null && asked > maxRetryAfterMs) return response;
     const backoff = baseDelayMs * 2 ** attempt;
-    const wait = Math.min(retryAfterMs(response) ?? backoff, maxDelayMs);
+    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
     await sleep(wait, init.signal);
     response = await doFetch(url, init);
   }
@@ -82,9 +92,12 @@ async function postGraphql(url, query, variables, options) {
     } catch {
       detail = "";
     }
+    const asked = retryAfterMs(response);
+    const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}`,
-      response.status
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      response.status,
+      asked ?? void 0
     );
   }
   let json;

package/dist/internal.cjs

@@ -3,10 +3,17 @@
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
   status;
-  constructor(message, status) {
+  /**
+   * How long the server asked us to wait, in ms, when it said so. Present on a
+   * 429 that carried `Retry-After`; a caller can serve stale content for that
+   * long instead of guessing.
+   */
+  retryAfterMs;
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
+    if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
   }
 };
 var DEFAULT_RETRY_STATUSES = [429, 503];
@@ -43,14 +50,17 @@ async function fetchWithRetry(doFetch, url, init, retry) {
   const maxRetries = retry.maxRetries ?? 3;
   const baseDelayMs = retry.baseDelayMs ?? 300;
   const maxDelayMs = retry.maxDelayMs ?? 3e3;
+  const maxRetryAfterMs = retry.maxRetryAfterMs ?? 1e4;
   const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (response.ok || !retryStatuses.includes(response.status)) {
       return response;
     }
+    const asked = retryAfterMs(response);
+    if (asked !== null && asked > maxRetryAfterMs) return response;
     const backoff = baseDelayMs * 2 ** attempt;
-    const wait = Math.min(retryAfterMs(response) ?? backoff, maxDelayMs);
+    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
     await sleep(wait, init.signal);
     response = await doFetch(url, init);
   }
@@ -84,9 +94,12 @@ async function postGraphql(url, query, variables, options) {
     } catch {
       detail = "";
     }
+    const asked = retryAfterMs(response);
+    const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}`,
-      response.status
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      response.status,
+      asked ?? void 0
     );
   }
   let json;
@@ -819,14 +832,6 @@ function localizedPath(slug, locale, defaultLocale) {
 }
 
 // src/block-context.ts
-function blockPageOf(page) {
-  if (!page?.slug) return void 0;
-  return {
-    id: page.id,
-    slug: page.slug,
-    pageType: page.pageType ?? null
-  };
-}
 function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, forms, extra) {
   return {
     locale: {
@@ -838,7 +843,18 @@ function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, for
     forms,
     ...extra?.auth ? { auth: extra.auth } : {},
     ...extra?.workspace ? { workspace: extra.workspace } : {},
-    ...extra?.page ? { page: extra.page } : {}
+    // Identity only, and only when the page has one. A page fetched by an older
+    // SDK has no slug, and then a block gets no `page` at all rather than one
+    // with a hole in it: "I don't know where I am" has to stay distinguishable
+    // from "I am at /".
+    ...extra?.page?.slug ? {
+      page: {
+        id: extra.page.id,
+        slug: extra.page.slug,
+        pageType: extra.page.pageType ?? null
+      }
+    } : {},
+    ...extra?.app ? { app: extra.app } : {}
   };
 }
 
@@ -945,7 +961,6 @@ exports.RECORDS_BY_IDS_QUERY = RECORDS_BY_IDS_QUERY;
 exports.SITE_CONFIG_QUERY = SITE_CONFIG_QUERY;
 exports.SUBMIT_FORM_MUTATION = SUBMIT_FORM_MUTATION;
 exports.asBucket = asBucket;
-exports.blockPageOf = blockPageOf;
 exports.buildBlockContext = buildBlockContext;
 exports.buildLocaleSwitchHref = buildLocaleSwitchHref;
 exports.cachedWorkspaceId = cachedWorkspaceId;

package/dist/internal.d.cts

@@ -1,10 +1,10 @@
-export { f as fetchLayouts, c as fetchPage, d as fetchPageById, e as fetchPageMeta, g as fetchPages, n as normalizeSlug, r as resolveApiUrl, h as resolvePublicUrl } from './content-client-D0EdiqbQ.cjs';
-import { CmssyPageData, CmssyBlockPage, CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
+export { f as fetchLayouts, c as fetchPage, d as fetchPageById, e as fetchPageMeta, g as fetchPages, n as normalizeSlug, r as resolveApiUrl, h as resolvePublicUrl } from './content-client-CJQ-nafm.cjs';
+import { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-rhYcXU5z.cjs';
-export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from './locale-rhYcXU5z.cjs';
-import { Q as QueryScopedOptions } from './csp-DlAEXYjA.cjs';
-export { m as cmssyCspHeaders, o as isDevelopment, q as resolveInitialTarget, t as toCspOrigin } from './csp-DlAEXYjA.cjs';
+import { G as GraphqlRequestOptions } from './locale-C7sA46qu.cjs';
+export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from './locale-C7sA46qu.cjs';
+import { Q as QueryScopedOptions } from './csp-BityT_ug.cjs';
+export { m as cmssyCspHeaders, o as isDevelopment, q as resolveInitialTarget, t as toCspOrigin } from './csp-BityT_ug.cjs';
 export { localesFromSiteConfig, localizedPath, resolveSiteLocales, splitLocaleFromPath } from './internal/locale.cjs';
 
 declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  public {\n    siteConfig(workspaceSlug: $workspaceSlug) {\n      id\n      workspaceId\n      siteName\n      defaultLanguage\n      enabledLanguages\n      enabledFeatures\n      notFoundPageId\n      previewUrl\n      branding {\n        brandName\n        logoUrl\n        faviconUrl\n        ogImageUrl\n      }\n    }\n  }\n}";
@@ -13,14 +13,6 @@ declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: Stri
 declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  public {\n    form {\n      get(formId: $formId) {\n        id\n        name\n        slug\n        description\n        fields {\n          id name fieldType label placeholder helpText\n          defaultValue width order showWhen requiredWhen\n          options { value label disabled }\n          validation { required minLength maxLength minValue maxValue pattern customMessage }\n        }\n        settings {\n          actionType submitButtonLabel successMessage errorMessage\n          redirectUrl requireLogin enableCaptcha\n        }\n      }\n    }\n  }\n}";
 declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  public {\n    form {\n      submit(formId: $formId, input: $input) {\n        success message submissionId redirectUrl accessToken customer\n      }\n    }\n  }\n}";
 
-/**
- * The identity half of a fetched page, for `context.page`.
- *
- * A page fetched by an older SDK - or by a consumer that builds `CmssyPageData`
- * itself - has no slug, and then a block gets no `page` at all rather than one
- * with a hole in it: `context.page ? … : …` is a question a block can answer.
- */
-declare function blockPageOf(page: CmssyPageData | null | undefined): CmssyBlockPage | undefined;
 declare function buildBlockContext(locale: string, defaultLocale: string, enabledLocales?: string[], isPreview?: boolean, forms?: Record<string, CmssyFormDefinition>, extra?: BuildBlockContextExtra): CmssyBlockContext;
 
 declare function getBlockContentForLanguage(content: unknown, locale: string, defaultLocale?: string, availableLocales?: string[]): Record<string, unknown>;
@@ -70,4 +62,4 @@ declare function resolveRelationContent(config: CmssyClientConfig, entries: Rela
 
 declare function cmssySecretsMatch(a: string, b: string): Promise<boolean>;
 
-export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, blockPageOf, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };
+export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };

package/dist/internal.d.ts

@@ -1,10 +1,10 @@
-export { f as fetchLayouts, c as fetchPage, d as fetchPageById, e as fetchPageMeta, g as fetchPages, n as normalizeSlug, r as resolveApiUrl, h as resolvePublicUrl } from './content-client-D0EdiqbQ.js';
-import { CmssyPageData, CmssyBlockPage, CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
+export { f as fetchLayouts, c as fetchPage, d as fetchPageById, e as fetchPageMeta, g as fetchPages, n as normalizeSlug, r as resolveApiUrl, h as resolvePublicUrl } from './content-client-CJQ-nafm.js';
+import { CmssyFormDefinition, BuildBlockContextExtra, CmssyBlockContext, CmssyClientConfig, CmssySiteConfig, RawBlock, FieldDefinition } from '@cmssy/types';
 export { CmssySiteLocales } from '@cmssy/types';
-import { G as GraphqlRequestOptions } from './locale-XintNd0n.js';
-export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from './locale-XintNd0n.js';
-import { Q as QueryScopedOptions } from './csp-Blh6P15m.js';
-export { m as cmssyCspHeaders, o as isDevelopment, q as resolveInitialTarget, t as toCspOrigin } from './csp-Blh6P15m.js';
+import { G as GraphqlRequestOptions } from './locale-Ox_qVlNy.js';
+export { C as CMSSY_LOCALE_HEADER, b as buildLocaleSwitchHref, a as localeForPath, c as localeForPathname, l as localizeHref, d as localizeHtmlLinks, s as splitCmssyLocale } from './locale-Ox_qVlNy.js';
+import { Q as QueryScopedOptions } from './csp-DJ17P3PN.js';
+export { m as cmssyCspHeaders, o as isDevelopment, q as resolveInitialTarget, t as toCspOrigin } from './csp-DJ17P3PN.js';
 export { localesFromSiteConfig, localizedPath, resolveSiteLocales, splitLocaleFromPath } from './internal/locale.js';
 
 declare const SITE_CONFIG_QUERY = "query PublicSiteConfig($workspaceSlug: String!) {\n  public {\n    siteConfig(workspaceSlug: $workspaceSlug) {\n      id\n      workspaceId\n      siteName\n      defaultLanguage\n      enabledLanguages\n      enabledFeatures\n      notFoundPageId\n      previewUrl\n      branding {\n        brandName\n        logoUrl\n        faviconUrl\n        ogImageUrl\n      }\n    }\n  }\n}";
@@ -13,14 +13,6 @@ declare const MODEL_RECORDS_QUERY = "query PublicModelRecords($workspaceId: Stri
 declare const FORM_QUERY = "query PublicForm($formId: ID!) {\n  public {\n    form {\n      get(formId: $formId) {\n        id\n        name\n        slug\n        description\n        fields {\n          id name fieldType label placeholder helpText\n          defaultValue width order showWhen requiredWhen\n          options { value label disabled }\n          validation { required minLength maxLength minValue maxValue pattern customMessage }\n        }\n        settings {\n          actionType submitButtonLabel successMessage errorMessage\n          redirectUrl requireLogin enableCaptcha\n        }\n      }\n    }\n  }\n}";
 declare const SUBMIT_FORM_MUTATION = "mutation SubmitForm($formId: ID!, $input: SubmitFormInput!) {\n  public {\n    form {\n      submit(formId: $formId, input: $input) {\n        success message submissionId redirectUrl accessToken customer\n      }\n    }\n  }\n}";
 
-/**
- * The identity half of a fetched page, for `context.page`.
- *
- * A page fetched by an older SDK - or by a consumer that builds `CmssyPageData`
- * itself - has no slug, and then a block gets no `page` at all rather than one
- * with a hole in it: `context.page ? … : …` is a question a block can answer.
- */
-declare function blockPageOf(page: CmssyPageData | null | undefined): CmssyBlockPage | undefined;
 declare function buildBlockContext(locale: string, defaultLocale: string, enabledLocales?: string[], isPreview?: boolean, forms?: Record<string, CmssyFormDefinition>, extra?: BuildBlockContextExtra): CmssyBlockContext;
 
 declare function getBlockContentForLanguage(content: unknown, locale: string, defaultLocale?: string, availableLocales?: string[]): Record<string, unknown>;
@@ -70,4 +62,4 @@ declare function resolveRelationContent(config: CmssyClientConfig, entries: Rela
 
 declare function cmssySecretsMatch(a: string, b: string): Promise<boolean>;
 
-export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, blockPageOf, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };
+export { type BlockSchemaMap, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, type RelationContentEntry, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, buildBlockContext, cachedWorkspaceId, clearWorkspaceIdCache, cmssySecretsMatch, collectFormIds, fetchSiteConfig, getBlockContentForLanguage, normalizeRelationContent, resolveForms, resolveRelationContent, resolveWorkspaceId };

package/dist/internal.js

@@ -1,10 +1,17 @@
 // src/data/http.ts
 var CmssyRequestError = class extends Error {
   status;
-  constructor(message, status) {
+  /**
+   * How long the server asked us to wait, in ms, when it said so. Present on a
+   * 429 that carried `Retry-After`; a caller can serve stale content for that
+   * long instead of guessing.
+   */
+  retryAfterMs;
+  constructor(message, status, retryAfterMs2) {
     super(message);
     this.name = "CmssyRequestError";
     this.status = status;
+    if (retryAfterMs2 !== void 0) this.retryAfterMs = retryAfterMs2;
   }
 };
 var DEFAULT_RETRY_STATUSES = [429, 503];
@@ -41,14 +48,17 @@ async function fetchWithRetry(doFetch, url, init, retry) {
   const maxRetries = retry.maxRetries ?? 3;
   const baseDelayMs = retry.baseDelayMs ?? 300;
   const maxDelayMs = retry.maxDelayMs ?? 3e3;
+  const maxRetryAfterMs = retry.maxRetryAfterMs ?? 1e4;
   const retryStatuses = retry.retryStatuses ?? DEFAULT_RETRY_STATUSES;
   let response = await doFetch(url, init);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (response.ok || !retryStatuses.includes(response.status)) {
       return response;
     }
+    const asked = retryAfterMs(response);
+    if (asked !== null && asked > maxRetryAfterMs) return response;
     const backoff = baseDelayMs * 2 ** attempt;
-    const wait = Math.min(retryAfterMs(response) ?? backoff, maxDelayMs);
+    const wait = asked !== null ? asked : Math.min(backoff, maxDelayMs);
     await sleep(wait, init.signal);
     response = await doFetch(url, init);
   }
@@ -82,9 +92,12 @@ async function postGraphql(url, query, variables, options) {
     } catch {
       detail = "";
     }
+    const asked = retryAfterMs(response);
+    const wait = asked !== null ? ` - retry after ${Math.ceil(asked / 1e3)}s` : "";
     throw new CmssyRequestError(
-      `cmssy: ${options.label} failed (${response.status})${detail}`,
-      response.status
+      `cmssy: ${options.label} failed (${response.status})${detail}${wait}`,
+      response.status,
+      asked ?? void 0
     );
   }
   let json;
@@ -817,14 +830,6 @@ function localizedPath(slug, locale, defaultLocale) {
 }
 
 // src/block-context.ts
-function blockPageOf(page) {
-  if (!page?.slug) return void 0;
-  return {
-    id: page.id,
-    slug: page.slug,
-    pageType: page.pageType ?? null
-  };
-}
 function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, forms, extra) {
   return {
     locale: {
@@ -836,7 +841,18 @@ function buildBlockContext(locale, defaultLocale, enabledLocales, isPreview, for
     forms,
     ...extra?.auth ? { auth: extra.auth } : {},
     ...extra?.workspace ? { workspace: extra.workspace } : {},
-    ...extra?.page ? { page: extra.page } : {}
+    // Identity only, and only when the page has one. A page fetched by an older
+    // SDK has no slug, and then a block gets no `page` at all rather than one
+    // with a hole in it: "I don't know where I am" has to stay distinguishable
+    // from "I am at /".
+    ...extra?.page?.slug ? {
+      page: {
+        id: extra.page.id,
+        slug: extra.page.slug,
+        pageType: extra.page.pageType ?? null
+      }
+    } : {},
+    ...extra?.app ? { app: extra.app } : {}
   };
 }
 
@@ -935,4 +951,4 @@ function cmssyCspHeaders(options) {
   };
 }
 
-export { CMSSY_LOCALE_HEADER, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, blockPageOf, buildBlockContext, buildLocaleSwitchHref, cachedWorkspaceId, clearWorkspaceIdCache, cmssyCspHeaders, cmssySecretsMatch, collectFormIds, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, getBlockContentForLanguage, isDevelopment, localeForPath, localeForPathname, localesFromSiteConfig, localizeHref, localizeHtmlLinks, localizedPath, normalizeRelationContent, normalizeSlug, resolveApiUrl, resolveForms, resolveInitialTarget, resolvePublicUrl, resolveRelationContent, resolveSiteLocales, resolveWorkspaceId, splitCmssyLocale, splitLocaleFromPath, toCspOrigin };
+export { CMSSY_LOCALE_HEADER, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, RECORDS_BY_IDS_QUERY, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, asBucket, buildBlockContext, buildLocaleSwitchHref, cachedWorkspaceId, clearWorkspaceIdCache, cmssyCspHeaders, cmssySecretsMatch, collectFormIds, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, getBlockContentForLanguage, isDevelopment, localeForPath, localeForPathname, localesFromSiteConfig, localizeHref, localizeHtmlLinks, localizedPath, normalizeRelationContent, normalizeSlug, resolveApiUrl, resolveForms, resolveInitialTarget, resolvePublicUrl, resolveRelationContent, resolveSiteLocales, resolveWorkspaceId, splitCmssyLocale, splitLocaleFromPath, toCspOrigin };

package/dist/{locale-rhYcXU5z.d.cts → locale-C7sA46qu.d.cts}

@@ -1,4 +1,4 @@
-import { F as FetchLike, R as RetryPolicy } from './content-client-D0EdiqbQ.cjs';
+import { F as FetchLike, R as RetryPolicy } from './content-client-CJQ-nafm.cjs';
 import { CmssyClientConfig, CmssyLocaleContext } from '@cmssy/types';
 
 interface GraphqlRequestOptions {

package/dist/{locale-XintNd0n.d.ts → locale-Ox_qVlNy.d.ts}

@@ -1,4 +1,4 @@
-import { F as FetchLike, R as RetryPolicy } from './content-client-D0EdiqbQ.js';
+import { F as FetchLike, R as RetryPolicy } from './content-client-CJQ-nafm.js';
 import { CmssyClientConfig, CmssyLocaleContext } from '@cmssy/types';
 
 interface GraphqlRequestOptions {

package/dist/preflight.d.cts

@@ -1,4 +1,4 @@
-import { F as FetchLike } from './content-client-D0EdiqbQ.cjs';
+import { F as FetchLike } from './content-client-CJQ-nafm.cjs';
 import { CmssyClientConfig } from '@cmssy/types';
 
 interface EditDiagnosticsConfig {

package/dist/preflight.d.ts

@@ -1,4 +1,4 @@
-import { F as FetchLike } from './content-client-D0EdiqbQ.js';
+import { F as FetchLike } from './content-client-CJQ-nafm.js';
 import { CmssyClientConfig } from '@cmssy/types';
 
 interface EditDiagnosticsConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/core",
-  "version": "10.2.0",
+  "version": "10.4.0",
   "description": "Framework-agnostic cmssy gateway: GraphQL client, block/field system, editor protocol. No React, no Next.",
   "keywords": [
     "cmssy",
@@ -62,7 +62,7 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.30.0",
+    "@cmssy/types": "0.31.0",
     "jose": "^6.2.3"
   },
   "scripts": {