@juo/blocks 1.20.0 → 2.0.0-alpha.10

package/dist/core.js

@@ -1,11 +1,13 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { f as createContext, g as d, h as w, j as registerBlock, E, u, k as getDefinedBlocks, l as createBlockInstance, m as defineBlock, s as subscribeContext, G as GRID_V1_ENGINE_ID, n as clampRect, p as applyFillExpansion, q as compactItems, t as findFreeRect, D as DEFAULT_GRID } from "./css-runtime-DTiXcYSs.js";
-import { B, v, x, y, z, L, P, S, c, T, A, d as d2, b, F, H, I, J, K, N, O, Q, R, U, V, W, X, Y, Z, i, _, a, $, a0, o, a1, a2, a3, e, a4, r, a5, a6, a7, w as w2 } from "./css-runtime-DTiXcYSs.js";
+import { e as createContext, f as d, m as w, n as defineBlock, h as createBlockInstance, j as getDefinedBlocks, p as registerBlock, E, u, s as subscribeContext } from "./block-BjJztStr.js";
+import { B, q, t, S, v, _, x, c, y, g, z, A, D, F, G, i, H, b, I, o, J, k, K, l, L, w as w2 } from "./block-BjJztStr.js";
+import { G as GRID_V1_ENGINE_ID, d as clampRect, e as applyFillExpansion, f as compactItems, g as findFreeRect, D as DEFAULT_GRID } from "./css-runtime-CjZl0K48.js";
+import { h, i as i2, L as L2, P, a, T, b as b2, j, k as k2, l as l2, m, n, o as o2, p, q as q2, s, t as t2, u as u2, v as v2, c as c2, w as w3, r } from "./css-runtime-CjZl0K48.js";
 import { reportBlockWarning, reportBlockError } from "./observability.js";
-import { a as createEditorBridge, D as createSelectBlockMessage } from "./bridge-4Eq-G73Z.js";
-import { p } from "./project-gridstack-C2cSYRMx.js";
+import { a as createEditorBridge, E as createSelectBlockMessage } from "./bridge-Bss7Xq3D.js";
+import { p as p2 } from "./project-gridstack-CRZ_7HoT.js";
 import { clearLayoutModeAdapter, getLayoutModeAdapter, registerLayoutModeAdapter } from "./layout-mode-adapter-BBd4JRQd.js";
 const SUPPORTED_UI_LANGUAGES = [
   { code: "cs", label: "Czech" },
@@ -96,6 +98,111 @@ function createState() {
   };
 }
 const StateContext = createContext("state");
+const OVERLAY_WRAPPER_SCHEMA = {
+  type: "object",
+  properties: {
+    props: {
+      type: "object",
+      properties: {
+        layout: {
+          type: "string",
+          enum: ["modal", "sidebar"]
+        },
+        canAbort: {
+          type: "boolean"
+        }
+      },
+      required: ["layout"],
+      additionalProperties: false
+    },
+    slots: {
+      type: "object",
+      properties: {
+        content: {}
+      },
+      additionalProperties: false
+    }
+  },
+  required: ["props", "slots"],
+  additionalProperties: false
+};
+function defineOverlayWrapper(opts) {
+  const layout = opts.layout ?? "sidebar";
+  const canAbort = opts.canAbort ?? true;
+  return defineBlock(opts.name, {
+    displayName: opts.title,
+    group: "internal",
+    schema: OVERLAY_WRAPPER_SCHEMA,
+    initialValue: () => ({
+      props: { layout, canAbort },
+      slots: {
+        content: [createBlockInstance(opts.content)]
+      }
+    }),
+    renderer: () => null
+  });
+}
+const OVERLAY_PREFIX$1 = "overlay:";
+function callInitialValue(block) {
+  if (typeof block.initialValue !== "function") return block.initialValue;
+  try {
+    return block.initialValue();
+  } catch (error) {
+    console.warn(
+      `[overlays] initialValue() threw for "${block.name}"; its content block will not be hidden from the palette.`,
+      error
+    );
+    return void 0;
+  }
+}
+function buildOverlayRegistry(blocks) {
+  var _a, _b;
+  const registry = {};
+  for (const block of blocks) {
+    if (!block.name.startsWith(OVERLAY_PREFIX$1)) continue;
+    const id = block.name.slice(OVERLAY_PREFIX$1.length);
+    const initial = callInitialValue(block);
+    const first = (_b = (_a = initial == null ? void 0 : initial.slots) == null ? void 0 : _a.content) == null ? void 0 : _b[0];
+    const contentBlock = typeof (first == null ? void 0 : first.type) === "string" ? first.type : "";
+    registry[id] = {
+      block: block.name,
+      title: block.displayName ?? id,
+      contentBlock
+    };
+  }
+  return registry;
+}
+const OVERLAY_PREFIX = "overlay:";
+const OverlayServiceContext = createContext("services/overlay");
+function createOverlayService(themeState, options = {}) {
+  const getBlocks = options.getBlocks ?? getDefinedBlocks;
+  const current = w(() => {
+    const root = themeState.overlay.blocks.value[0];
+    const type = root == null ? void 0 : root.type;
+    if (typeof type !== "string" || !type.startsWith(OVERLAY_PREFIX)) {
+      return null;
+    }
+    const props = root.props ?? {};
+    return {
+      name: type,
+      // Defaults mirror defineOverlayWrapper's seeding in overlay-wrapper.ts — keep in sync.
+      layout: props.layout ?? "sidebar",
+      canAbort: Boolean(props.canAbort ?? true)
+    };
+  });
+  return {
+    getEditableOverlays() {
+      return buildOverlayRegistry(getBlocks());
+    },
+    open(name, params) {
+      void themeState.resolve("overlay", name, params);
+    },
+    close() {
+      themeState.overlay.blocks.value = [];
+    },
+    current
+  };
+}
 function isLocalhostOrigin(origin) {
   try {
     const url = new URL(origin);
@@ -187,32 +294,232 @@ function createCustomerService(options) {
       const result = await options.adapter.getCurrent();
       if (result._tag === "Success") current.value = result.data;
       return result;
+    },
+    createPaymentMethod(params) {
+      return options.adapter.createPaymentMethod(params);
+    },
+    async updateAttributes(attributes) {
+      var _a;
+      const merged = { ...(_a = current.value) == null ? void 0 : _a.attributes, ...attributes };
+      const result = await options.adapter.updateAttributes(merged);
+      if (result._tag === "Success") current.value = result.data;
+      return result;
     }
   };
 }
 const CustomerServiceContext = createContext("services/customer");
+const PAYMENT_INSTRUMENT_TYPES = [
+  "credit_card",
+  "paypal",
+  "shop_pay",
+  "sepa_direct_debit",
+  "blik",
+  "mbway",
+  "bacs",
+  "manual"
+];
+const INSTRUMENT_TYPE_TO_NAME = {
+  credit_card: null,
+  paypal: "PayPal",
+  blik: "BLIK",
+  sepa_direct_debit: "SEPA",
+  mbway: "MB WAY",
+  shop_pay: "Shop Pay",
+  bacs: "Bacs",
+  manual: "Shopify Checkout"
+};
+function getPaymentInstrumentName(instrument) {
+  const name = INSTRUMENT_TYPE_TO_NAME[instrument.type] ?? null;
+  if (name != null) return name;
+  return instrument.type === "credit_card" ? instrument.brand || instrument.type : instrument.type;
+}
+function getPaymentInstrumentDigits(instrument) {
+  switch (instrument.type) {
+    case "credit_card":
+    case "shop_pay":
+    case "bacs":
+      return instrument.maskedNumber.slice(-4) || null;
+    case "sepa_direct_debit":
+      return instrument.consumerAccount.slice(-4) || null;
+    default:
+      return null;
+  }
+}
+function getPaymentInstrumentDetail(instrument) {
+  switch (instrument.type) {
+    case "paypal":
+      return instrument.paypalAccountEmail ?? null;
+    case "sepa_direct_debit":
+      return instrument.consumerName ?? null;
+    case "blik":
+      return instrument.label ?? null;
+    case "mbway":
+      return instrument.phone ?? null;
+    default:
+      return null;
+  }
+}
+function getPaymentInstrumentExpiry(instrument, now = /* @__PURE__ */ new Date()) {
+  if (instrument.type !== "credit_card" && instrument.type !== "shop_pay") {
+    return null;
+  }
+  const { expiryMonth: month, expiryYear: year } = instrument;
+  if (month == null || year == null) return null;
+  const nowYear = now.getFullYear();
+  const nowMonth = now.getMonth() + 1;
+  const expiresThisMonth = year === nowYear && month === nowMonth;
+  const isExpired = year < nowYear || year === nowYear && month < nowMonth;
+  return { month, year, isExpired, expiresThisMonth };
+}
+function serializeV1PaymentInstrument(raw) {
+  if (raw == null || typeof raw !== "object") return null;
+  const r2 = raw;
+  if (typeof r2.type !== "string") return null;
+  switch (r2.type) {
+    case "credit-card":
+      return {
+        type: "credit_card",
+        brand: r2.brand ?? "",
+        maskedNumber: r2.maskedNumber ?? "",
+        ...r2.expiryMonth != null ? { expiryMonth: r2.expiryMonth } : {},
+        ...r2.expiryYear != null ? { expiryYear: r2.expiryYear } : {},
+        ...r2.cardholderName != null ? { cardholderName: r2.cardholderName } : {}
+      };
+    case "paypal":
+      return { type: "paypal", paypalAccountEmail: r2.paypalAccountEmail ?? null };
+    case "shop-pay":
+      return {
+        type: "shop_pay",
+        maskedNumber: r2.maskedNumber ?? "",
+        ...r2.expiryMonth != null ? { expiryMonth: r2.expiryMonth } : {},
+        ...r2.expiryYear != null ? { expiryYear: r2.expiryYear } : {},
+        ...r2.cardholderName != null ? { cardholderName: r2.cardholderName } : {}
+      };
+    case "sepa-direct-debit":
+      return {
+        type: "sepa_direct_debit",
+        consumerName: r2.consumerName ?? "",
+        consumerBic: r2.consumerBic ?? null,
+        consumerAccount: r2.maskedConsumerAccount ?? ""
+      };
+    case "blik":
+      return { type: "blik" };
+    case "mbway":
+      return { type: "mbway", ...r2.phone != null ? { phone: r2.phone } : {} };
+    case "bacs":
+      return { type: "bacs", maskedNumber: r2.maskedNumber ?? "" };
+    case "manual":
+      return { type: "manual" };
+    default:
+      return null;
+  }
+}
 function createMockCustomerAdapter() {
-  const customer = { id: "customer-1", name: "Customer 1" };
+  let customer = { id: "customer-1", name: "Customer 1", attributes: {} };
   return {
     async getCurrent() {
       return { _tag: "Success", data: customer };
+    },
+    async updateAttributes(attributes) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      customer = { ...customer, attributes: { ...attributes } };
+      return { _tag: "Success", data: customer };
+    },
+    async createPaymentMethod(params) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      if (params.provider === "shopify") {
+        return {
+          _tag: "Success",
+          data: {
+            kind: "email_sent",
+            paymentMethodId: "pm_mock_1",
+            instrument: { type: "credit_card", brand: "visa", maskedNumber: "•••• 4242" }
+          }
+        };
+      }
+      if (params.provider === "mollie") {
+        return {
+          _tag: "Success",
+          data: { kind: "redirect", redirectUrl: params.returnUrl }
+        };
+      }
+      return { _tag: "Failure", error: new Error(`Payment provider "${params.provider}" is not supported`) };
     }
   };
 }
+function fromV1Customer(body) {
+  return {
+    id: body.id,
+    name: body.displayName,
+    email: body.email ?? void 0,
+    attributes: Object.fromEntries(
+      body.customAttributes.map(({ key, value }) => [key, value])
+    )
+  };
+}
 function createApiCustomerAdapter(fetcher) {
   return {
     async getCurrent() {
       try {
-        const res = await fetcher("/customer/info");
+        const res = await fetcher("/customer/v1/customer");
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        return {
+          _tag: "Success",
+          data: fromV1Customer(await res.json())
+        };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    async updateAttributes(attributes) {
+      try {
+        const res = await fetcher("/customer/v1/customer", {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ customAttributes: attributes })
+        });
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
-        const data = await res.json();
-        const name = [data.firstName, data.lastName].filter(Boolean).join(" ") || data.email || "";
         return {
           _tag: "Success",
-          data: { id: data.id, name, email: data.email }
+          data: fromV1Customer(await res.json())
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    async createPaymentMethod(params) {
+      try {
+        if (params.provider === "shopify") {
+          const res = await fetcher("/customer/v1/payment-methods", {
+            method: "POST"
+          });
+          if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+          const body = await res.json();
+          return {
+            _tag: "Success",
+            data: {
+              kind: "email_sent",
+              paymentMethodId: body.id,
+              instrument: serializeV1PaymentInstrument(body.instrument) ?? void 0
+            }
+          };
+        }
+        if (params.provider === "mollie") {
+          const res = await fetcher("/customer/payment-methods", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ redirectUrl: params.returnUrl })
+          });
+          if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+          const body = await res.json();
+          return {
+            _tag: "Success",
+            data: { kind: "redirect", redirectUrl: body.redirectUrl }
+          };
+        }
+        return { _tag: "Failure", error: new Error(`Payment provider "${params.provider}" is not supported`) };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     }
   };
@@ -230,47 +537,35 @@ const PARAMS = {
 function uuid() {
   return ("10000000-1000-4000-8000" + -1e11).replace(
     /[018]/g,
-    (c2) => (c2 ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c2 / 4).toString(16)
+    (c3) => (c3 ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c3 / 4).toString(16)
   );
 }
-var AuthenticationErrorReason = /* @__PURE__ */ ((AuthenticationErrorReason2) => {
-  AuthenticationErrorReason2["Expired"] = "expired";
-  AuthenticationErrorReason2["IncorrectCode"] = "wrong-code";
-  AuthenticationErrorReason2["TooManyTries"] = "too-many-tries";
-  AuthenticationErrorReason2["NoEmail"] = "no-email";
-  AuthenticationErrorReason2["Unknown"] = "unknown";
-  AuthenticationErrorReason2["Missing"] = "missing";
-  return AuthenticationErrorReason2;
-})(AuthenticationErrorReason || {});
-class AuthenticationError extends Error {
-  constructor(reason, data) {
-    super("Authentication error");
-    __publicField(this, "reason");
-    __publicField(this, "data");
-    this.reason = reason;
-    this.data = data ?? {};
-  }
+const REFRESH_LOCK_NAME = "juo:auth:refresh";
+const LOCK_WAIT_TIMEOUT_MS = 1e4;
+let fallbackQueue = Promise.resolve();
+function runQueued(run) {
+  const result = fallbackQueue.then(run, run);
+  fallbackQueue = result.catch(() => void 0);
+  return result;
 }
-const OTP_ERROR_REASONS = {
-  INCORRECT_CODE: AuthenticationErrorReason.IncorrectCode,
-  TOO_MANY_TRIES: AuthenticationErrorReason.TooManyTries,
-  EXPIRED: AuthenticationErrorReason.Expired
-};
-function authenticationErrorFromBody(data) {
-  if (data == null || typeof data !== "object") {
-    return void 0;
-  }
-  const { code, connection } = data;
-  if (typeof code !== "string") {
-    return void 0;
+function withRefreshLock(run) {
+  const locks = typeof navigator === "undefined" ? void 0 : navigator.locks;
+  if (locks == null) {
+    return runQueued(run);
   }
-  if (code === "AUTH_ERROR") {
-    return new AuthenticationError(AuthenticationErrorReason.NoEmail, {
-      connection
-    });
-  }
-  const reason = OTP_ERROR_REASONS[code];
-  return reason == null ? void 0 : new AuthenticationError(reason);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), LOCK_WAIT_TIMEOUT_MS);
+  let granted = false;
+  return locks.request(REFRESH_LOCK_NAME, { signal: controller.signal }, () => {
+    granted = true;
+    clearTimeout(timer);
+    return run();
+  }).catch((error) => {
+    if (!granted && controller.signal.aborted) {
+      return run();
+    }
+    throw error;
+  }).finally(() => clearTimeout(timer));
 }
 function createMockLoginAdapter(opts = {}) {
   const appUrl = opts.appUrl ?? "https://admin.juo.io";
@@ -311,9 +606,19 @@ function createApiLoginAdapter(fetcher, opts) {
       body: JSON.stringify(body)
     });
     if (res.status === 403) {
-      const error = authenticationErrorFromBody(await res.json());
-      if (error != null) {
-        throw error;
+      const data = await res.json();
+      if ("error_description" in data) {
+        if (data.error_description === "Wrong email or verification code.") {
+          throw new AuthenticationError(AuthenticationErrorReason.IncorrectCode);
+        } else if (data.error_description === "You've reached the maximum number of attempts. Please try to login again.") {
+          throw new AuthenticationError(AuthenticationErrorReason.TooManyTries);
+        } else if (data.error_description === "The verification code has expired. Please try to login again.") {
+          throw new AuthenticationError(AuthenticationErrorReason.Expired);
+        }
+      } else if ("code" in data && data.code === "AUTH_ERROR") {
+        throw new AuthenticationError(AuthenticationErrorReason.NoEmail, {
+          connection: data.connection
+        });
       }
     }
     if (!res.ok) {
@@ -330,8 +635,8 @@ function createApiLoginAdapter(fetcher, opts) {
           lang
         );
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async authenticate(params) {
@@ -346,9 +651,19 @@ function createApiLoginAdapter(fetcher, opts) {
           body: JSON.stringify(params)
         });
         if (res.status === 403) {
-          const error = authenticationErrorFromBody(await res.json());
-          if (error != null) {
-            throw error;
+          const data = await res.json();
+          if ("error_description" in data) {
+            if (data.error_description === "Wrong email or verification code.") {
+              throw new AuthenticationError(AuthenticationErrorReason.IncorrectCode);
+            } else if (data.error_description === "You've reached the maximum number of attempts. Please try to login again.") {
+              throw new AuthenticationError(AuthenticationErrorReason.TooManyTries);
+            } else if (data.error_description === "The verification code has expired. Please try to login again.") {
+              throw new AuthenticationError(AuthenticationErrorReason.Expired);
+            }
+          } else if ("code" in data && data.code === "AUTH_ERROR") {
+            throw new AuthenticationError(AuthenticationErrorReason.NoEmail, {
+              connection: data.connection
+            });
           }
         }
         if (res.status === 401) {
@@ -361,8 +676,8 @@ function createApiLoginAdapter(fetcher, opts) {
           throw new Error(`Unexpected response: ${res.statusText}`);
         }
         return { _tag: "Success", data: await res.json() };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     getAuthorizeUrl({ connection, state, shop }) {
@@ -375,23 +690,82 @@ function createApiLoginAdapter(fetcher, opts) {
   };
 }
 const __vite_import_meta_env__ = {};
+var AuthenticationErrorReason = /* @__PURE__ */ ((AuthenticationErrorReason2) => {
+  AuthenticationErrorReason2["Expired"] = "expired";
+  AuthenticationErrorReason2["IncorrectCode"] = "wrong-code";
+  AuthenticationErrorReason2["TooManyTries"] = "too-many-tries";
+  AuthenticationErrorReason2["NoEmail"] = "no-email";
+  AuthenticationErrorReason2["Unknown"] = "unknown";
+  AuthenticationErrorReason2["Missing"] = "missing";
+  return AuthenticationErrorReason2;
+})(AuthenticationErrorReason || {});
+class AuthenticationError extends Error {
+  constructor(reason, data) {
+    super("Authentication error");
+    __publicField(this, "reason");
+    __publicField(this, "data");
+    this.reason = reason;
+    this.data = data ?? {};
+  }
+}
 const STORAGE_DELEGATED_TOKEN = "delegated-token";
 const STORAGE_REFRESH_TOKEN_KEY = "refresh-token";
 const STORAGE_STATE_KEY = "state";
-function storage(key, value) {
-  const storageKey = `auth:${key}`;
+function webStorage(kind) {
   try {
-    if (value === null) {
-      sessionStorage.removeItem(storageKey);
-    } else if (value !== void 0) {
-      sessionStorage.setItem(storageKey, value);
-    } else {
-      return sessionStorage.getItem("auth:" + key);
+    return (kind === "local" ? localStorage : sessionStorage) ?? null;
+  } catch (error) {
+    console.warn(`Failed to reach ${kind} storage: ${error}`);
+    return null;
+  }
+}
+function readFrom(store, key) {
+  try {
+    return (store == null ? void 0 : store.getItem(key)) ?? null;
+  } catch (error) {
+    console.warn(`Failed to read web storage: ${error}`);
+    return null;
+  }
+}
+function writeTo(store, key, value) {
+  try {
+    if (store != null && store.getItem(key) !== value) {
+      store.setItem(key, value);
     }
   } catch (error) {
-    console.warn(`Failed to use session storage: ${error}`);
+    console.warn(`Failed to write web storage: ${error}`);
+  }
+}
+function removeFrom(store, key) {
+  try {
+    store == null ? void 0 : store.removeItem(key);
+  } catch (error) {
+    console.warn(`Failed to clear web storage: ${error}`);
   }
-  return null;
+}
+function storage(key, value) {
+  const storageKey = `auth:${key}`;
+  const isRefreshToken = key === STORAGE_REFRESH_TOKEN_KEY;
+  const store = webStorage(isRefreshToken ? "local" : "session");
+  const legacyStore = isRefreshToken ? webStorage("session") : null;
+  if (value === null) {
+    removeFrom(store, storageKey);
+    removeFrom(legacyStore, storageKey);
+    return null;
+  }
+  if (value !== void 0) {
+    writeTo(store, storageKey, value);
+    return null;
+  }
+  const stored = readFrom(store, storageKey);
+  if (stored !== null || legacyStore == null) {
+    return stored;
+  }
+  const legacy = readFrom(legacyStore, storageKey);
+  if (legacy !== null) {
+    writeTo(store, storageKey, legacy);
+  }
+  return legacy;
 }
 function nonce(len = 10) {
   return uuid().replace(/-/g, "").slice(0, len);
@@ -431,6 +805,22 @@ function createLoginService(init) {
   E(() => {
     storage(STORAGE_STATE_KEY, state.value);
   });
+  if (typeof window !== "undefined") {
+    window.addEventListener("storage", (event) => {
+      if (event.storageArea !== webStorage("local") || event.key !== `auth:${STORAGE_REFRESH_TOKEN_KEY}`) {
+        return;
+      }
+      if (event.newValue == null) {
+        accessToken.value = null;
+        expires.value = null;
+        refreshToken.value = null;
+        return;
+      }
+      if (event.newValue !== refreshToken.value) {
+        refreshToken.value = event.newValue;
+      }
+    });
+  }
   function storeTokens(data) {
     const { access_token, refresh_token, expires_in } = data;
     accessToken.value = access_token;
@@ -441,19 +831,49 @@ function createLoginService(init) {
     const margin = Math.min(60, lifetime / 2);
     expires.value = new Date(Date.now() + (lifetime - margin) * 1e3);
   }
+  async function rotate(token) {
+    const result = await adapter.authenticate({ refreshToken: token });
+    if (result._tag === "Failure") {
+      throw result.error;
+    }
+    if (refreshToken.value === token) {
+      storeTokens(result.data);
+    } else {
+      accessToken.value = null;
+      expires.value = null;
+    }
+    return result.data.access_token;
+  }
+  async function refreshLocked() {
+    const stored = storage(STORAGE_REFRESH_TOKEN_KEY);
+    if (stored != null && stored !== refreshToken.value) {
+      refreshToken.value = stored;
+    }
+    const current = refreshToken.value;
+    if (current == null) {
+      throw new AuthenticationError(
+        "expired"
+        /* Expired */
+      );
+    }
+    try {
+      return await rotate(current);
+    } catch (error) {
+      const latest = storage(STORAGE_REFRESH_TOKEN_KEY);
+      if (latest != null && latest !== current) {
+        refreshToken.value = latest;
+        return await rotate(latest);
+      }
+      throw error;
+    }
+  }
   async function getToken() {
     if (refreshToken.value == null) return null;
     if (accessToken.value == null || typeof accessToken.value === "string" && (expires.value == null || expires.value < /* @__PURE__ */ new Date())) {
-      accessToken.value = new Promise(
-        (resolve, reject) => adapter.authenticate({ refreshToken: refreshToken.value }).then((result) => {
-          if (result._tag === "Failure") {
-            reject(result.error);
-            return;
-          }
-          storeTokens(result.data);
-          resolve(result.data.access_token);
-        }).catch(reject)
-      );
+      accessToken.value = withRefreshLock(refreshLocked).catch((error) => {
+        accessToken.value = null;
+        throw error;
+      });
     }
     return Promise.resolve(accessToken.value);
   }
@@ -580,7 +1000,10 @@ function createLoginService(init) {
         return {
           _tag: "Failure",
           error: formatError(
-            new AuthenticationError(AuthenticationErrorReason.Missing)
+            new AuthenticationError(
+              "missing"
+              /* Missing */
+            )
           )
         };
       }
@@ -604,7 +1027,7 @@ function createLoginService(init) {
   return service;
 }
 const LoginServiceContext = createContext("services/login");
-function createMockOrdersAdapter() {
+function createMockOrderAdapter() {
   const mockOrders = [
     {
       id: "10001",
@@ -613,7 +1036,10 @@ function createMockOrdersAdapter() {
       currencyCode: "USD",
       totalPrice: 89.97,
       financialStatus: "PAID",
+      paymentStatus: "paid",
+      paidAt: "2024-10-15T09:31:00Z",
       fulfillmentStatus: "FULFILLED",
+      subscriptionIds: ["subscription_1"],
       lines: [
         {
           id: "line_1",
@@ -638,7 +1064,10 @@ function createMockOrdersAdapter() {
       currencyCode: "USD",
       totalPrice: 45.99,
       financialStatus: "PAID",
+      paymentStatus: "paid",
+      paidAt: "2024-09-20T14:16:00Z",
       fulfillmentStatus: "PARTIALLY_FULFILLED",
+      subscriptionIds: [],
       lines: [
         {
           id: "line_2",
@@ -683,21 +1112,39 @@ function mapOrder(order) {
     currencyCode: order.currencyCode,
     totalPrice: order.totalPrice,
     financialStatus: order.financialStatus,
+    // Defaulted rather than required so an older backend (which returns neither
+    // field) degrades to "settled, time unknown" instead of producing an Order
+    // with holes in it. Matches the endpoint's own fallback for an order it
+    // never tracked.
+    paymentStatus: order.paymentStatus ?? "paid",
+    paidAt: order.paidAt ?? null,
     fulfillmentStatus: order.fulfillmentStatus,
     lines: order.items.map(mapOrderLine),
-    customAttributes: order.customAttributes
+    customAttributes: order.customAttributes,
+    subscriptionIds: order.subscriptionIds ?? []
   };
 }
-function createApiOrdersAdapter(fetcher) {
+function quoteSearchValue(value) {
+  return `'${value.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}'`;
+}
+function buildOrdersQuery(params) {
+  const callerQuery = (params == null ? void 0 : params.query) != null && params.query.trim() !== "" ? params.query : null;
+  const subscriptionTerm = (params == null ? void 0 : params.subscriptionId) != null ? `subscriptionId:${quoteSearchValue(params.subscriptionId)}` : null;
+  if (callerQuery == null) return subscriptionTerm;
+  if (subscriptionTerm == null) return callerQuery;
+  return `(${callerQuery}) AND ${subscriptionTerm}`;
+}
+function createApiOrderAdapter(fetcher) {
   return {
     async getOrders(params) {
       const query = new URLSearchParams();
       if ((params == null ? void 0 : params.limit) != null) query.set("limit", String(params.limit));
       if ((params == null ? void 0 : params.after) != null) query.set("after", params.after);
       if ((params == null ? void 0 : params.before) != null) query.set("before", params.before);
-      if ((params == null ? void 0 : params.query) != null) query.set("query", params.query);
       if ((params == null ? void 0 : params.includeOneTime) != null) query.set("includeOneTime", String(params.includeOneTime));
       if ((params == null ? void 0 : params.sort) != null) query.set("sort", params.sort);
+      const searchQuery = buildOrdersQuery(params);
+      if (searchQuery != null) query.set("query", searchQuery);
       const qs = query.toString();
       const res = await fetcher(`/customer/v1/orders${qs ? `?${qs}` : ""}`);
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
@@ -714,7 +1161,7 @@ function createApiOrdersAdapter(fetcher) {
     }
   };
 }
-function createOrdersService(adapter) {
+function createOrderService(adapter) {
   return {
     async getOrders(params) {
       try {
@@ -726,7 +1173,7 @@ function createOrdersService(adapter) {
     }
   };
 }
-const OrdersServiceContext = createContext("services/orders");
+const OrderServiceContext = createContext("services/order");
 function createMockProductAdapter() {
   const products = [
     {
@@ -917,9 +1364,9 @@ function createMockProductAdapter() {
       await new Promise((resolve) => setTimeout(resolve, 100));
       return products.filter((product) => ids.includes(product.id)).map(toAvailableProduct);
     },
-    async getAvailableProducts({ q }) {
+    async getAvailableProducts({ q: q3 }) {
       await new Promise((resolve) => setTimeout(resolve, 100));
-      const queryLower = q == null ? void 0 : q.toLowerCase();
+      const queryLower = q3 == null ? void 0 : q3.toLowerCase();
       return products.filter(
         (product) => !queryLower || product.title.toLowerCase().includes(queryLower) || product.variants.some(
           (variant) => variant.title.toLowerCase().includes(queryLower)
@@ -986,6 +1433,13 @@ function mapVariant(variant, currencyCode) {
     } : {}
   };
 }
+const IDENTIFIER = String.raw`[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*`;
+const VALUE = String.raw`(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|${IDENTIFIER})`;
+const TERM = String.raw`(?:NOT\s+|-)?${IDENTIFIER}:(?:>=|<=|>|<)?${VALUE}`;
+const FILTER_QUERY = new RegExp(String.raw`^${TERM}(?:\s+(?:AND|OR)\s+${TERM})*$`);
+function isFilterQuery(query) {
+  return FILTER_QUERY.test(query);
+}
 function mapProduct(product, currencyCode) {
   return {
     id: product.id,
@@ -993,7 +1447,7 @@ function mapProduct(product, currencyCode) {
     featuredImage: product.image == null ? null : { url: product.image.url, altText: product.image.altText ?? void 0 },
     hasOnlyDefaultVariant: product.variants.length <= 1,
     variants: {
-      items: product.variants.map((v2) => mapVariant(v2, currencyCode)),
+      items: product.variants.map((v3) => mapVariant(v3, currencyCode)),
       pageInfo: {
         hasNextPage: false,
         hasPrevPage: false,
@@ -1038,7 +1492,11 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       try {
         const params = new URLSearchParams();
         if (opts2 == null ? void 0 : opts2.query) {
-          params.set("query", `"${opts2.query.trim().replace(/"/g, '\\"')}"`);
+          const trimmed = opts2.query.trim();
+          params.set(
+            "query",
+            isFilterQuery(trimmed) ? trimmed : `"${trimmed.replace(/"/g, '\\"')}"`
+          );
         }
         if (opts2 == null ? void 0 : opts2.pagination) {
           if ("after" in opts2.pagination)
@@ -1048,7 +1506,7 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
         }
         const body = await fetchProducts(params);
         return {
-          items: body.data.map((p2) => mapProduct(p2, currencyCode)),
+          items: body.data.map((p3) => mapProduct(p3, currencyCode)),
           pageInfo: {
             hasNextPage: body.hasNextPage,
             hasPrevPage: body.hasPrevPage,
@@ -1074,10 +1532,10 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       const res = await fetcher(`/customer/products/by-ids?${params.toString()}`);
       if (!res.ok) return [];
       const data = await res.json();
-      return (data ?? []).map((p2) => ({
-        id: p2.id,
-        title: p2.title ?? "",
-        featuredImage: p2.featuredImage ? { url: p2.featuredImage.url, altText: p2.featuredImage.altText } : null,
+      return (data ?? []).map((p3) => ({
+        id: p3.id,
+        title: p3.title ?? "",
+        featuredImage: p3.featuredImage ? { url: p3.featuredImage.url, altText: p3.featuredImage.altText } : null,
         hasOnlyDefaultVariant: true,
         collections: []
       }));
@@ -1089,30 +1547,30 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       const res = await fetcher(`/customer/products/variants?${params.toString()}`);
       if (!res.ok) return [];
       const data = await res.json();
-      return (data ?? []).map((p2) => {
+      return (data ?? []).map((p3) => {
         var _a;
         return {
-          id: p2.id,
-          title: p2.title,
-          description: p2.description ?? "",
-          featuredImage: p2.featuredImage,
-          hasOnlyDefaultVariant: p2.hasOnlyDefaultVariant ?? (((_a = p2.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
-          variants: (p2.variants ?? []).map((v2) => ({
-            id: v2.id,
-            availableForSale: v2.availableForSale,
-            title: v2.title,
-            currentPrice: v2.currentPrice,
-            basePrice: v2.basePrice,
-            image: v2.image,
-            recurring: v2.recurring
+          id: p3.id,
+          title: p3.title,
+          description: p3.description ?? "",
+          featuredImage: p3.featuredImage,
+          hasOnlyDefaultVariant: p3.hasOnlyDefaultVariant ?? (((_a = p3.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
+          variants: (p3.variants ?? []).map((v3) => ({
+            id: v3.id,
+            availableForSale: v3.availableForSale,
+            title: v3.title,
+            currentPrice: v3.currentPrice,
+            basePrice: v3.basePrice,
+            image: v3.image,
+            recurring: v3.recurring
           }))
         };
       });
     },
-    async getAvailableProducts({ subscriptionId, lineId, q, mode, action, pagination }) {
+    async getAvailableProducts({ subscriptionId, lineId, q: q3, mode, action, pagination }) {
       const params = new URLSearchParams();
       params.set("action", action);
-      if (q) params.set("q", q);
+      if (q3) params.set("q", q3);
       if (mode) params.set("mode", mode);
       if (pagination && "after" in pagination) params.set("after", pagination.after);
       if (pagination && "before" in pagination) params.set("before", pagination.before);
@@ -1121,22 +1579,22 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
       );
       if (!res.ok) return [];
       const data = await res.json();
-      return (data ?? []).map((p2) => {
+      return (data ?? []).map((p3) => {
         var _a;
         return {
-          id: p2.id,
-          title: p2.title,
-          description: p2.description ?? "",
-          featuredImage: p2.featuredImage,
-          hasOnlyDefaultVariant: p2.hasOnlyDefaultVariant ?? (((_a = p2.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
-          variants: (p2.variants ?? []).map((v2) => ({
-            id: v2.id,
-            availableForSale: v2.availableForSale,
-            title: v2.title,
-            currentPrice: v2.currentPrice,
-            basePrice: v2.basePrice,
-            image: v2.image,
-            recurring: v2.recurring
+          id: p3.id,
+          title: p3.title,
+          description: p3.description ?? "",
+          featuredImage: p3.featuredImage,
+          hasOnlyDefaultVariant: p3.hasOnlyDefaultVariant ?? (((_a = p3.variants) == null ? void 0 : _a.length) ?? 0) <= 1,
+          variants: (p3.variants ?? []).map((v3) => ({
+            id: v3.id,
+            availableForSale: v3.availableForSale,
+            title: v3.title,
+            currentPrice: v3.currentPrice,
+            basePrice: v3.basePrice,
+            image: v3.image,
+            recurring: v3.recurring
           }))
         };
       });
@@ -1181,7 +1639,7 @@ function routeNameTableFromPages(pages) {
 function createRouterService(options) {
   const { pages, pushImplementation } = options;
   const routeNameToPagePath = routeNameTableFromPages(pages);
-  const pathSet = new Set(pages.map((p2) => p2.path));
+  const pathSet = new Set(pages.map((p3) => p3.path));
   const navigationSubscribers = [];
   function notifySubscribers(logicalPath) {
     for (const cb of navigationSubscribers) cb({ path: logicalPath });
@@ -1232,6 +1690,49 @@ const DISCOUNT_REJECTION_REASONS = [
 function toAttributeArray(next) {
   return Object.entries(next).map(([key, value]) => ({ key, value }));
 }
+const MOCK_SHIPPING_METHODS = [
+  {
+    handle: "standard-shipping",
+    title: "Standard shipping",
+    price: { amount: "0.00", currencyCode: "EUR" }
+  },
+  {
+    handle: "dhl-express",
+    title: "DHL Express",
+    price: { amount: "9.99", currencyCode: "EUR" }
+  },
+  {
+    handle: "next-day",
+    title: "Next day delivery",
+    price: { amount: "14.99", currencyCode: "EUR" }
+  }
+];
+function toShippingAddressBody(address) {
+  return {
+    firstName: address.firstName,
+    lastName: address.lastName,
+    address1: address.address1,
+    zip: address.zip,
+    city: address.city,
+    ...address.address2 ? { address2: address.address2 } : {},
+    ...address.province ? { province: address.province } : {},
+    ...address.phone ? { phone: address.phone } : {},
+    ...address.company ? { company: address.company } : {}
+  };
+}
+function isStaleSubscriptionMessage(message) {
+  return message ? message.toLowerCase().includes("changed since last fetch") : false;
+}
+function toNonEmptyAttributeArray(next) {
+  if (next == null) return [];
+  return toAttributeArray(next).filter(
+    ({ key, value }) => key !== "" && value !== ""
+  );
+}
+const MOCK_INSTANT_ORDER_MIN_ITEMS = 1;
+const MOCK_INSTANT_ORDER_MAX_ITEMS = 20;
+const MOCK_INSTANT_ORDER_MIN_QUANTITY = 1;
+const MOCK_INSTANT_ORDER_MAX_QUANTITY = 10;
 function createMockSubscriptionAdapter(options = {}) {
   const richBase = (id, itemId, renewalId) => ({
     id,
@@ -1295,7 +1796,24 @@ function createMockSubscriptionAdapter(options = {}) {
     renewal: { id: renewalId, isInActiveProcessState: false },
     lastPaymentStatus: "succeeded",
     pausePeriod: null,
-    isEditable: true
+    isEditable: true,
+    // Shaped like the v1 mapping produces it: one option slot filled, no
+    // presentmentTitle (v1 has no such field). Previews would otherwise render
+    // ContractSelect's address / method rows as "-".
+    deliveryMethod: {
+      address: {
+        firstName: "Ada",
+        lastName: "Lovelace",
+        address1: "Wilcza 12/4",
+        zip: "00-538",
+        city: "Warsaw",
+        country: "Poland",
+        countryCode: "PL"
+      },
+      shippingOption: { title: "Standard shipping" },
+      pickupOption: null,
+      localDeliveryOption: null
+    }
   });
   const mockSubscriptions = [
     {
@@ -1364,6 +1882,20 @@ function createMockSubscriptionAdapter(options = {}) {
       lastPaymentStatus: "succeeded",
       pausePeriod: null,
       isEditable: true,
+      deliveryMethod: {
+        address: {
+          firstName: "Ada",
+          lastName: "Lovelace",
+          address1: "Wilcza 12/4",
+          zip: "00-538",
+          city: "Warsaw",
+          country: "Poland",
+          countryCode: "PL"
+        },
+        shippingOption: { title: "DHL Express" },
+        pickupOption: null,
+        localDeliveryOption: null
+      },
       customAttributes: [
         { key: "subscription_tier", value: "premium" },
         { key: "gift_message", value: "Enjoy your skincare routine!" }
@@ -1395,6 +1927,14 @@ function createMockSubscriptionAdapter(options = {}) {
       frequency: "2 WEEK",
       createdAt: "2024-09-15T00:00:00Z",
       updatedAt: "2024-10-10T00:00:00Z",
+      // Pickup, with no address — the other branch of the option coalescing in
+      // ContractSelect's delivery-method label.
+      deliveryMethod: {
+        address: null,
+        shippingOption: null,
+        pickupOption: { title: "Pickup in store" },
+        localDeliveryOption: null
+      },
       customAttributes: []
     },
     // Per-status fixtures: groundwork for the deferred editor preview picker
@@ -1403,18 +1943,55 @@ function createMockSubscriptionAdapter(options = {}) {
     {
       ...richBase("sub_paused", "item_paused", "ren_paused"),
       status: "paused",
-      pausePeriod: { start: "2025-11-01T00:00:00Z", end: "2026-01-01T00:00:00Z" }
+      pausePeriod: { start: "2025-11-01T00:00:00Z", end: "2026-01-01T00:00:00Z" },
+      // BLIK with a non-recurring alias — the shape that gates the
+      // re-authorization prompt in RenewalSummary. Only the legacy-sourced
+      // payment method can express this, so previews would otherwise never
+      // exercise the branch.
+      customerPaymentMethod: {
+        id: "pm_blik",
+        instrument: { type: "blik", label: "my-blik-alias" },
+        active: true,
+        isRecurring: false
+      }
     },
     {
       ...richBase("sub_canceled", "item_canceled", "ren_canceled"),
       status: "canceled",
-      pausePeriod: null
+      pausePeriod: null,
+      // SEPA — identified by a masked IBAN rather than card digits.
+      customerPaymentMethod: {
+        id: "pm_sepa",
+        instrument: {
+          type: "sepa_direct_debit",
+          consumerName: "Ada Lovelace",
+          consumerBic: "ABCDEFGH",
+          consumerAccount: "DE12****6789"
+        },
+        active: true,
+        isRecurring: true
+      }
     },
     {
       ...richBase("sub_failed", "item_failed", "ren_failed"),
       status: "failed",
       lastPaymentStatus: "failed",
-      pausePeriod: null
+      pausePeriod: null,
+      // An expired card — pairs with the failed payment, and exercises
+      // getPaymentInstrumentExpiry's isExpired branch.
+      customerPaymentMethod: {
+        id: "pm_expired_card",
+        instrument: {
+          type: "credit_card",
+          brand: "mastercard",
+          maskedNumber: "************5100",
+          expiryMonth: 1,
+          expiryYear: 2024,
+          cardholderName: "Ada Lovelace"
+        },
+        active: true,
+        isRecurring: true
+      }
     },
     {
       ...richBase("sub_expired", "item_expired", "ren_expired"),
@@ -1440,6 +2017,60 @@ function createMockSubscriptionAdapter(options = {}) {
       description: "Lightweight daily sun protection"
     }
   ];
+  const mockInstantOrderImages = {
+    "io-product-1": "https://images.unsplash.com/photo-1447933601403-0c6688de566e?w=200",
+    "io-product-2": "https://images.unsplash.com/photo-1495474472287-4d71bcdd2085?w=200"
+  };
+  const mockInstantOrderProducts = [
+    {
+      id: "io-product-1",
+      title: "Single-Origin Espresso",
+      hasOnlyDefaultVariant: false,
+      featuredImage: {
+        url: mockInstantOrderImages["io-product-1"],
+        altText: "Single-Origin Espresso"
+      },
+      variants: {
+        items: [
+          {
+            id: "io-variant-1",
+            title: "250 g",
+            image: { url: mockInstantOrderImages["io-product-1"] },
+            price: { amount: "12.00", currencyCode: "USD" },
+            availableForSale: true
+          },
+          {
+            id: "io-variant-2",
+            title: "1 kg",
+            image: { url: mockInstantOrderImages["io-product-1"] },
+            price: { amount: "38.00", currencyCode: "USD" },
+            availableForSale: true
+          }
+        ]
+      }
+    },
+    {
+      id: "io-product-2",
+      title: "Ceramic Pour-Over Dripper",
+      hasOnlyDefaultVariant: true,
+      featuredImage: {
+        url: mockInstantOrderImages["io-product-2"],
+        altText: "Ceramic Pour-Over Dripper"
+      },
+      variants: {
+        items: [
+          {
+            id: "io-variant-3",
+            title: "Default Title",
+            image: { url: mockInstantOrderImages["io-product-2"] },
+            price: { amount: "24.50", currencyCode: "USD" },
+            availableForSale: true
+          }
+        ]
+      }
+    }
+  ];
+  let placedInstantOrders = 0;
   return {
     async getById(id) {
       await new Promise((resolve) => setTimeout(resolve, 300));
@@ -1449,7 +2080,7 @@ function createMockSubscriptionAdapter(options = {}) {
         data: subscription ? {
           ...subscription,
           items: subscription.items.map((item) => ({ ...item })),
-          discounts: subscription.discounts.map((d3) => ({ ...d3 }))
+          discounts: subscription.discounts.map((d2) => ({ ...d2 }))
         } : null
       };
     },
@@ -1497,7 +2128,7 @@ function createMockSubscriptionAdapter(options = {}) {
       }
       const currencyCode = ((_a = subscription.items[0]) == null ? void 0 : _a.price.currencyCode) ?? "USD";
       const product = await ((_b = options.productAdapter) == null ? void 0 : _b.getByVariantId(item.variantId)) ?? await ((_c = options.productAdapter) == null ? void 0 : _c.getById(item.variantId)) ?? null;
-      const variant = (product == null ? void 0 : product.variants.items.find((v2) => v2.id === item.variantId)) ?? (product == null ? void 0 : product.variants.items[0]);
+      const variant = (product == null ? void 0 : product.variants.items.find((v3) => v3.id === item.variantId)) ?? (product == null ? void 0 : product.variants.items[0]);
       const linePrice = ((_e = (_d = variant == null ? void 0 : variant.purchaseOptions) == null ? void 0 : _d[0]) == null ? void 0 : _e.price) ?? (variant == null ? void 0 : variant.price);
       subscription.items.push({
         id: `item_${Date.now()}_${subscription.items.length}`,
@@ -1510,8 +2141,11 @@ function createMockSubscriptionAdapter(options = {}) {
         ...variant && product && !product.hasOnlyDefaultVariant ? { variantTitle: variant.title } : {},
         ...(variant == null ? void 0 : variant.image) ? { variantImage: variant.image } : {},
         variantAvailableForSale: true,
-        billingPolicy: ((_f = subscription.items[0]) == null ? void 0 : _f.billingPolicy) ?? subscription.billingPolicy ?? null,
-        deliveryPolicy: ((_g = subscription.items[0]) == null ? void 0 : _g.deliveryPolicy) ?? subscription.deliveryPolicy ?? null
+        // An explicit per-line billingPolicy wins; otherwise inherit the plan's.
+        billingPolicy: item.billingPolicy ?? ((_f = subscription.items[0]) == null ? void 0 : _f.billingPolicy) ?? subscription.billingPolicy ?? null,
+        deliveryPolicy: ((_g = subscription.items[0]) == null ? void 0 : _g.deliveryPolicy) ?? subscription.deliveryPolicy ?? null,
+        ...item.recurringCycleLimit != null ? { recurringCycleLimit: item.recurringCycleLimit } : {},
+        ...item.customAttributes != null ? { customAttributes: toAttributeArray(item.customAttributes) } : {}
       });
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       return { _tag: "Success", data: void 0 };
@@ -1522,7 +2156,7 @@ function createMockSubscriptionAdapter(options = {}) {
       if (!subscription) {
         return { _tag: "Failure", error: "Subscription not found" };
       }
-      subscription.items = subscription.items.filter((i2) => i2.id !== itemId);
+      subscription.items = subscription.items.filter((i3) => i3.id !== itemId);
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       return { _tag: "Success", data: void 0 };
     },
@@ -1532,13 +2166,16 @@ function createMockSubscriptionAdapter(options = {}) {
       if (!subscription) {
         return { _tag: "Failure", error: "Subscription not found" };
       }
-      const item = subscription.items.find((i2) => i2.id === lineId);
+      const item = subscription.items.find((i3) => i3.id === lineId);
       if (!item) {
         return { _tag: "Failure", error: "Line item not found" };
       }
       if (update.variantId !== void 0) item.variantId = update.variantId;
       if (update.quantity !== void 0) item.quantity = update.quantity;
       if (update.billingPolicy !== void 0) item.billingPolicy = update.billingPolicy;
+      if (update.customAttributes !== void 0) {
+        item.customAttributes = toAttributeArray(update.customAttributes);
+      }
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       return { _tag: "Success", data: void 0 };
     },
@@ -1548,7 +2185,7 @@ function createMockSubscriptionAdapter(options = {}) {
       if (!subscription) {
         return { _tag: "Failure", error: "Subscription not found" };
       }
-      const item = subscription.items.find((i2) => i2.id === lineId);
+      const item = subscription.items.find((i3) => i3.id === lineId);
       if (!item) {
         return { _tag: "Failure", error: "Line item not found" };
       }
@@ -1623,7 +2260,93 @@ function createMockSubscriptionAdapter(options = {}) {
       );
       subscription.customAttributes = [...preserved, ...next];
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-      return { _tag: "Success", data: { ...subscription } };
+      return { _tag: "Success", data: { ...subscription } };
+    },
+    async updateDeliveryAddress({
+      subscriptionId,
+      address
+    }) {
+      var _a;
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find(
+        (sub) => sub.id === subscriptionId
+      );
+      if (!subscription) {
+        return { _tag: "Failure", error: { kind: "SUBSCRIPTION_NOT_FOUND" } };
+      }
+      const previous = (_a = subscription.deliveryMethod) == null ? void 0 : _a.address;
+      subscription.deliveryMethod = {
+        ...subscription.deliveryMethod,
+        address: {
+          firstName: address.firstName,
+          lastName: address.lastName,
+          address1: address.address1,
+          zip: address.zip,
+          city: address.city,
+          ...address.address2 ? { address2: address.address2 } : {},
+          ...address.province ? { province: address.province } : {},
+          ...address.phone ? { phone: address.phone } : {},
+          ...address.company ? { company: address.company } : {},
+          ...(previous == null ? void 0 : previous.country) != null ? { country: previous.country } : {},
+          ...(previous == null ? void 0 : previous.countryCode) != null ? { countryCode: previous.countryCode } : {}
+        }
+      };
+      subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      return { _tag: "Success", data: void 0 };
+    },
+    async getAvailableShippingMethods({
+      subscriptionId
+    }) {
+      var _a, _b, _c;
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find(
+        (sub) => sub.id === subscriptionId
+      );
+      if (!subscription) {
+        return { _tag: "Failure", error: "Subscription not found" };
+      }
+      const currentTitle = (_b = (_a = subscription.deliveryMethod) == null ? void 0 : _a.shippingOption) == null ? void 0 : _b.title;
+      const currencyCode = ((_c = subscription.items[0]) == null ? void 0 : _c.price.currencyCode) ?? "EUR";
+      return {
+        _tag: "Success",
+        data: MOCK_SHIPPING_METHODS.map((method) => ({
+          ...method,
+          price: { ...method.price, currencyCode },
+          isActive: method.title === currentTitle
+        }))
+      };
+    },
+    async updateDeliveryMethod({
+      subscriptionId,
+      shippingMethodHandle
+    }) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find(
+        (sub) => sub.id === subscriptionId
+      );
+      if (!subscription) {
+        return { _tag: "Failure", error: { kind: "SUBSCRIPTION_NOT_FOUND" } };
+      }
+      const method = MOCK_SHIPPING_METHODS.find(
+        (m2) => m2.handle === shippingMethodHandle
+      );
+      if (!method) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "UNKNOWN",
+            message: `Provided shipping method handle "${shippingMethodHandle}" is not available`
+          }
+        };
+      }
+      subscription.deliveryMethod = {
+        ...subscription.deliveryMethod,
+        shippingOption: { title: method.title },
+        pickupOption: null,
+        localDeliveryOption: null
+      };
+      subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      return { _tag: "Success", data: void 0 };
     },
     async resume(params) {
       await new Promise((resolve) => setTimeout(resolve, 300));
@@ -1738,7 +2461,7 @@ function createMockSubscriptionAdapter(options = {}) {
         data: {
           ...subscription,
           items: subscription.items.map((item) => ({ ...item })),
-          discounts: subscription.discounts.map((d3) => ({ ...d3 }))
+          discounts: subscription.discounts.map((d2) => ({ ...d2 }))
         }
       };
     },
@@ -1754,27 +2477,165 @@ function createMockSubscriptionAdapter(options = {}) {
     async addUpsellProduct() {
       await new Promise((resolve) => setTimeout(resolve, 400));
       return { _tag: "Success", data: void 0 };
+    },
+    async getInstantOrderProducts({
+      query
+    }) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const term = query == null ? void 0 : query.trim().toLowerCase();
+      const products = term ? mockInstantOrderProducts.filter(
+        (product) => product.title.toLowerCase().includes(term)
+      ) : [...mockInstantOrderProducts];
+      return {
+        _tag: "Success",
+        data: {
+          // Deliberately independent of `query`, mirroring the endpoint: a search
+          // that matches nothing must not read as "the feature is unavailable"
+          // and make a consumer hide its entry point mid-interaction.
+          available: mockInstantOrderProducts.length > 0,
+          requiresCheckout: false,
+          products,
+          hasNextPage: false,
+          endCursor: null
+        }
+      };
+    },
+    async placeInstantOrder({
+      items,
+      shippingMethodTitle
+    }) {
+      var _a;
+      await new Promise((resolve) => setTimeout(resolve, 400));
+      const malformed = items.length < MOCK_INSTANT_ORDER_MIN_ITEMS || items.length > MOCK_INSTANT_ORDER_MAX_ITEMS || items.some(
+        (item) => !Number.isInteger(item.quantity) || item.quantity < MOCK_INSTANT_ORDER_MIN_QUANTITY || item.quantity > MOCK_INSTANT_ORDER_MAX_QUANTITY
+      );
+      if (malformed) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "INVALID_REQUEST",
+            message: "Malformed item list"
+          }
+        };
+      }
+      const variants = mockInstantOrderProducts.flatMap(
+        (product) => product.variants.items
+      );
+      const unknown = items.find(
+        (item) => !variants.some((variant) => variant.id === item.variantId)
+      );
+      if (unknown) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "INVALID_REQUEST",
+            message: `Unknown variant ${unknown.variantId}`
+          }
+        };
+      }
+      const rate = MOCK_SHIPPING_METHODS.find(
+        (method) => method.title === shippingMethodTitle
+      );
+      if (shippingMethodTitle != null && rate == null) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "INVALID_REQUEST",
+            message: `Shipping method "${shippingMethodTitle}" is not available for this order`
+          }
+        };
+      }
+      const total = items.reduce(
+        (sum, item) => {
+          const variant = variants.find((v3) => v3.id === item.variantId);
+          return sum + Number((variant == null ? void 0 : variant.price.amount) ?? 0) * item.quantity;
+        },
+        // Only when a rate was chosen: an instant order left on the
+        // subscription's own delivery method has no separate delivery price the
+        // mock catalog can know.
+        Number((rate == null ? void 0 : rate.price.amount) ?? 0)
+      );
+      placedInstantOrders += 1;
+      return {
+        _tag: "Success",
+        data: {
+          orderId: `io-order-${placedInstantOrders}`,
+          totalPrice: total.toFixed(2),
+          currencyCode: ((_a = variants[0]) == null ? void 0 : _a.price.currencyCode) ?? "USD",
+          status: "paid"
+        }
+      };
     }
   };
 }
-function normalizeInstrumentType(type) {
-  return type.replace(/-/g, "_");
+function mapV1Instrument(raw) {
+  return serializeV1PaymentInstrument(raw);
+}
+function mapV1BillingAddress(raw) {
+  if (raw == null || typeof raw !== "object") return null;
+  const address = {
+    firstName: raw.firstName ?? null,
+    lastName: raw.lastName ?? null,
+    address1: raw.address1 ?? null,
+    address2: raw.address2 ?? null,
+    zip: raw.zip ?? null,
+    city: raw.city ?? null,
+    country: raw.country ?? null,
+    countryCode: raw.countryCode ?? null,
+    province: raw.province ?? null,
+    provinceCode: raw.provinceCode ?? null,
+    phone: raw.phone ?? null,
+    company: raw.company ?? null
+  };
+  return Object.values(address).some((v3) => v3 != null) ? address : null;
+}
+function mapV1DeliveryAddress(raw) {
+  if (raw == null || typeof raw !== "object") return null;
+  const address = {
+    ...raw.firstName != null ? { firstName: raw.firstName } : {},
+    ...raw.lastName != null ? { lastName: raw.lastName } : {},
+    ...raw.address1 != null ? { address1: raw.address1 } : {},
+    ...raw.address2 != null ? { address2: raw.address2 } : {},
+    ...raw.zip != null ? { zip: raw.zip } : {},
+    ...raw.city != null ? { city: raw.city } : {},
+    ...raw.country != null ? { country: raw.country } : {},
+    ...raw.countryCode != null ? { countryCode: raw.countryCode } : {},
+    ...raw.province != null ? { province: raw.province } : {},
+    ...raw.provinceCode != null ? { provinceCode: raw.provinceCode } : {},
+    ...raw.phone != null ? { phone: raw.phone } : {},
+    ...raw.company != null ? { company: raw.company } : {}
+  };
+  return Object.keys(address).length > 0 ? address : null;
+}
+function mapV1DeliveryMethod(raw) {
+  const address = mapV1DeliveryAddress(raw == null ? void 0 : raw.deliveryAddress);
+  const method = raw == null ? void 0 : raw.deliveryMethod;
+  if (address == null && (method == null || typeof method !== "object")) {
+    return null;
+  }
+  const option = method != null && typeof method === "object" ? {
+    ...method.title != null ? { title: method.title } : {},
+    ...method.description != null ? { description: method.description } : {}
+  } : null;
+  return {
+    address,
+    shippingOption: (method == null ? void 0 : method.type) === "shipping" ? option : null,
+    pickupOption: (method == null ? void 0 : method.type) === "pickup" ? option : null,
+    localDeliveryOption: (method == null ? void 0 : method.type) === "local-delivery" ? option : null
+  };
 }
 function mapPaymentMethod(rawPm) {
   if (!rawPm) return null;
   if (typeof rawPm === "string") {
     return { id: rawPm };
   }
+  const instrument = mapV1Instrument(rawPm.instrument);
+  const billingAddress = mapV1BillingAddress(rawPm.billingAddress);
   return {
     id: rawPm.id ?? "",
-    ...rawPm.instrument != null ? {
-      instrument: {
-        ...rawPm.instrument,
-        type: normalizeInstrumentType(rawPm.instrument.type)
-      }
-    } : {},
-    ...rawPm.active != null ? { active: rawPm.active } : {},
-    ...rawPm.isRecurring != null ? { isRecurring: rawPm.isRecurring } : {}
+    ...instrument != null ? { instrument } : {},
+    // v1 is the ONLY customer-facing source of a billing address.
+    ...billingAddress != null ? { billingAddress } : {}
   };
 }
 function mapSubscription(raw) {
@@ -1810,14 +2671,14 @@ function mapSubscription(raw) {
     ),
     discounts: (raw.discounts ?? []).map(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (d3) => {
+      (d2) => {
         var _a2, _b2, _c;
         return {
-          id: d3.id,
-          type: ((_a2 = d3.value) == null ? void 0 : _a2.type) === "fixed-amount" || d3.type === "fixed_amount" ? "fixed_amount" : "percentage",
-          value: ((_b2 = d3.value) == null ? void 0 : _b2.amount) ?? ((_c = d3.value) == null ? void 0 : _c.percentage) ?? d3.value ?? 0,
-          code: d3.title ?? d3.code ?? "",
-          description: d3.description ?? ""
+          id: d2.id,
+          type: ((_a2 = d2.value) == null ? void 0 : _a2.type) === "fixed-amount" || d2.type === "fixed_amount" ? "fixed_amount" : "percentage",
+          value: ((_b2 = d2.value) == null ? void 0 : _b2.amount) ?? ((_c = d2.value) == null ? void 0 : _c.percentage) ?? d2.value ?? 0,
+          code: d2.title ?? d2.code ?? "",
+          description: d2.description ?? ""
         };
       }
     ),
@@ -1828,6 +2689,8 @@ function mapSubscription(raw) {
     // Map customerPaymentMethod — expanded to an object (id + instrument) via the
     // adapter's ?expand=paymentMethod request; mapPaymentMethod tolerates a bare id too.
     customerPaymentMethod: mapPaymentMethod(raw.paymentMethod),
+    // v1 returns deliveryAddress + deliveryMethod on every read, no expand needed.
+    deliveryMethod: mapV1DeliveryMethod(raw),
     frequency,
     createdAt: raw.createdAt,
     updatedAt: raw.updatedAt,
@@ -1844,6 +2707,51 @@ async function readErrorBody(res) {
     return {};
   }
 }
+async function readErrorMessage(res) {
+  const body = await readErrorBody(res);
+  return typeof body.message === "string" ? body.message : void 0;
+}
+const PLACE_INSTANT_ORDER_ERROR_KINDS = {
+  400: "INVALID_REQUEST",
+  403: "REFUSED",
+  409: "DUPLICATE_REQUEST",
+  429: "RATE_LIMITED"
+};
+function mapInstantOrderProducts(body) {
+  const currencyCode = body.currencyCode;
+  const products = (body.products ?? []).map(
+    (product) => {
+      const image = product.featuredImage ? {
+        url: product.featuredImage.url,
+        ...product.featuredImage.altText != null ? { altText: product.featuredImage.altText } : {}
+      } : null;
+      return {
+        id: product.productId,
+        title: product.title,
+        // Shopify's own flag, not a count of the variants this response happens
+        // to carry — the two differ whenever some are filtered.
+        hasOnlyDefaultVariant: product.hasOnlyDefaultVariant,
+        featuredImage: image,
+        variants: {
+          items: (product.variants ?? []).map((variant) => ({
+            id: variant.id,
+            title: variant.title,
+            image,
+            price: { amount: variant.price, currencyCode },
+            availableForSale: variant.availableForSale
+          }))
+        }
+      };
+    }
+  );
+  return {
+    available: body.available,
+    requiresCheckout: body.requiresCheckout,
+    products,
+    hasNextPage: body.hasNextPage,
+    endCursor: body.endCursor ?? null
+  };
+}
 function createApiSubscriptionAdapter(fetcher) {
   const adapter = {
     async search(options) {
@@ -1851,8 +2759,8 @@ function createApiSubscriptionAdapter(fetcher) {
       try {
         const params = new URLSearchParams();
         if ((_a = options == null ? void 0 : options.filters) == null ? void 0 : _a.length) {
-          const groups = options.filters.filter((f) => Object.keys(f).length > 0).map((f) => Object.entries(f).filter(([, v2]) => Boolean(v2))).filter((entries) => entries.length > 0).map(
-            (entries) => "(" + entries.map(([k, v2]) => `${k}:'${v2}'`).join(" AND ") + ")"
+          const groups = options.filters.filter((f) => Object.keys(f).length > 0).map((f) => Object.entries(f).filter(([, v3]) => Boolean(v3))).filter((entries) => entries.length > 0).map(
+            (entries) => "(" + entries.map(([k3, v3]) => `${k3}:'${v3}'`).join(" AND ") + ")"
           );
           if (groups.length) params.set("query", groups.join(" OR "));
         }
@@ -1882,8 +2790,8 @@ function createApiSubscriptionAdapter(fetcher) {
             }
           }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async getById(id) {
@@ -1895,24 +2803,43 @@ function createApiSubscriptionAdapter(fetcher) {
         const body = await res.json();
         const raw = body.data[0];
         return { _tag: "Success", data: raw ? mapSubscription(raw) : null };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
+    // Uses the legacy POST /customer/subscriptions/{id}/lines rather than
+    // POST /customer/v1/subscriptions/{id}/items: only the legacy endpoint
+    // accepts a per-line `billingPolicy`. It answers 204 with no body.
+    // Behavioural differences vs the v1 route, both intentional here:
+    //   - it rejects membership subscriptions with 403 (v1 does not),
+    //   - it skips the availableForSale check (v1 enforces it), so callers are
+    //     responsible for only offering purchasable variants — which the
+    //     product picker already does.
     async addItem({ subscriptionId, item }) {
       try {
+        const attributes = toNonEmptyAttributeArray(item.customAttributes);
+        const body = {
+          productVariantId: item.variantId,
+          quantity: item.quantity,
+          // `!= null` on purpose: null means "inherit"/"no limit", and the
+          // endpoint rejects an explicit null on either field.
+          ...item.billingPolicy != null ? { billingPolicy: item.billingPolicy } : {},
+          ...item.recurringCycleLimit != null ? { renewalLimit: item.recurringCycleLimit } : {},
+          ...item.shippingMethodHandle != null ? { shippingMethodHandle: item.shippingMethodHandle } : {},
+          ...attributes.length > 0 ? { customAttributes: attributes } : {}
+        };
         const res = await fetcher(
-          `/customer/v1/subscriptions/${subscriptionId}/items`,
+          `/customer/subscriptions/${subscriptionId}/lines`,
           {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ variant: item.variantId, quantity: item.quantity })
+            body: JSON.stringify(body)
           }
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async removeItem({ subscriptionId, itemId }) {
@@ -1923,8 +2850,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateItem({ subscriptionId, lineId, update }) {
@@ -1933,7 +2860,11 @@ function createApiSubscriptionAdapter(fetcher) {
           ...update.variantId !== void 0 ? { productVariantId: update.variantId } : {},
           ...update.quantity !== void 0 ? { quantity: update.quantity } : {},
           ...update.billingPolicy !== void 0 ? { billingPolicy: update.billingPolicy } : {},
-          ...update.shippingMethodHandle !== void 0 ? { shippingMethodHandle: update.shippingMethodHandle } : {}
+          ...update.shippingMethodHandle !== void 0 ? { shippingMethodHandle: update.shippingMethodHandle } : {},
+          // Record shape (not the array the add-line endpoint takes). Guarded on
+          // `!== undefined` so `{}` — clear every customer-visible attribute —
+          // reaches the endpoint instead of being dropped as falsy.
+          ...update.customAttributes !== void 0 ? { customAttributes: update.customAttributes } : {}
         };
         const res = await fetcher(
           `/customer/subscriptions/${subscriptionId}/lines/${lineId}`,
@@ -1945,8 +2876,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateItemAttributes({ subscriptionId, lineId, customAttributes }) {
@@ -1961,8 +2892,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateAttributes({ subscriptionId, customAttributes }) {
@@ -1977,8 +2908,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async skipLineItem({ subscriptionId, lineId, nextBillingDate }) {
@@ -1993,8 +2924,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async updateBoxItems({ subscriptionId, parentId, items, shippingMethodHandle }) {
@@ -2009,8 +2940,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async addDiscount({ subscriptionId, code }) {
@@ -2036,10 +2967,10 @@ function createApiSubscriptionAdapter(fetcher) {
           return { _tag: "Failure", error: { kind: "UNKNOWN", message: `HTTP ${res.status}` } };
         }
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
+      } catch (e) {
         return {
           _tag: "Failure",
-          error: { kind: "NETWORK", message: e2 instanceof Error ? e2.message : void 0 }
+          error: { kind: "NETWORK", message: e instanceof Error ? e.message : void 0 }
         };
       }
     },
@@ -2061,10 +2992,10 @@ function createApiSubscriptionAdapter(fetcher) {
           return { _tag: "Failure", error: { kind: "UNKNOWN", message: `HTTP ${res.status}` } };
         }
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
+      } catch (e) {
         return {
           _tag: "Failure",
-          error: { kind: "NETWORK", message: e2 instanceof Error ? e2.message : void 0 }
+          error: { kind: "NETWORK", message: e instanceof Error ? e.message : void 0 }
         };
       }
     },
@@ -2082,8 +3013,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // PATCH /customer/v1/subscriptions/{id} with the full customer-visible set.
@@ -2100,8 +3031,123 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    // Legacy endpoint on purpose — see SubscriptionAdapter.updateDeliveryAddress
+    // for why the documented v1 `deliveryAddress` patch is not used here.
+    async updateDeliveryAddress({ subscriptionId, address }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/shipping-address`,
+          {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(toShippingAddressBody(address))
+          }
+        );
+        if (!res.ok) {
+          if (res.status === 403) {
+            return { _tag: "Failure", error: { kind: "NOT_ALLOWED" } };
+          }
+          if (res.status === 404) {
+            return {
+              _tag: "Failure",
+              error: { kind: "SUBSCRIPTION_NOT_FOUND" }
+            };
+          }
+          if (res.status === 400) {
+            const body = await readErrorBody(res);
+            const message = typeof body.message === "string" ? body.message : void 0;
+            if (isStaleSubscriptionMessage(message)) {
+              return { _tag: "Failure", error: { kind: "STALE" } };
+            }
+            return {
+              _tag: "Failure",
+              error: {
+                kind: "INVALID_ADDRESS",
+                ...message ? { message } : {}
+              }
+            };
+          }
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: `HTTP ${res.status}` }
+          };
+        }
+        return { _tag: "Success", data: void 0 };
+      } catch (e) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "NETWORK",
+            message: e instanceof Error ? e.message : void 0
+          }
+        };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet.
+    async getAvailableShippingMethods({ subscriptionId }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/available-shipping-methods`
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        const data = await res.json();
+        return { _tag: "Success", data };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet. No `extra` is
+    // sent: pickup points are out of scope, and omitting it is what tells the
+    // endpoint to leave any existing parcel-locker attributes alone.
+    async updateDeliveryMethod({ subscriptionId, shippingMethodHandle }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/shipping-method`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ shippingMethodHandle })
+          }
+        );
+        if (!res.ok) {
+          if (res.status === 403) {
+            return { _tag: "Failure", error: { kind: "NOT_ALLOWED" } };
+          }
+          if (res.status === 404) {
+            return {
+              _tag: "Failure",
+              error: { kind: "SUBSCRIPTION_NOT_FOUND" }
+            };
+          }
+          if (res.status === 400) {
+            const body = await readErrorBody(res);
+            const message = typeof body.message === "string" ? body.message : void 0;
+            if (isStaleSubscriptionMessage(message)) {
+              return { _tag: "Failure", error: { kind: "STALE" } };
+            }
+            return {
+              _tag: "Failure",
+              error: { kind: "UNKNOWN", ...message ? { message } : {} }
+            };
+          }
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: `HTTP ${res.status}` }
+          };
+        }
+        return { _tag: "Success", data: void 0 };
+      } catch (e) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "NETWORK",
+            message: e instanceof Error ? e.message : void 0
+          }
+        };
       }
     },
     async resume({ subscriptionId }) {
@@ -2113,8 +3159,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async pause({ subscriptionId }) {
@@ -2126,8 +3172,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async reactivate({ subscriptionId }) {
@@ -2139,8 +3185,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async cancel({ subscriptionId, reason }) {
@@ -2156,8 +3202,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: mapSubscription(data) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/plans exists yet.
@@ -2169,8 +3215,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1 equivalent exists yet.
@@ -2182,8 +3228,8 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: (data == null ? void 0 : data.id) ?? null };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/upsells exists yet.
@@ -2194,24 +3240,24 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
-        const products = data.map((p2) => {
+        const products = data.map((p3) => {
           var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           return {
-            id: p2.id,
-            variantId: ((_b = (_a = p2.variants) == null ? void 0 : _a[0]) == null ? void 0 : _b.id) ?? "",
-            title: p2.title ?? "",
-            imageUrl: ((_c = p2.featuredImage) == null ? void 0 : _c.url) ?? void 0,
+            id: p3.id,
+            variantId: ((_b = (_a = p3.variants) == null ? void 0 : _a[0]) == null ? void 0 : _b.id) ?? "",
+            title: p3.title ?? "",
+            imageUrl: ((_c = p3.featuredImage) == null ? void 0 : _c.url) ?? void 0,
             price: {
-              amount: String(((_f = (_e = (_d = p2.variants) == null ? void 0 : _d[0]) == null ? void 0 : _e.currentPrice) == null ? void 0 : _f.amount) ?? 0),
-              currencyCode: ((_i = (_h = (_g = p2.variants) == null ? void 0 : _g[0]) == null ? void 0 : _h.currentPrice) == null ? void 0 : _i.currencyCode) ?? ""
+              amount: String(((_f = (_e = (_d = p3.variants) == null ? void 0 : _d[0]) == null ? void 0 : _e.currentPrice) == null ? void 0 : _f.amount) ?? 0),
+              currencyCode: ((_i = (_h = (_g = p3.variants) == null ? void 0 : _g[0]) == null ? void 0 : _h.currentPrice) == null ? void 0 : _i.currencyCode) ?? ""
             },
             // recurring comes from the upsell rule on variants[0]; present in PreparedProductSchema
-            recurring: (_k = (_j = p2.variants) == null ? void 0 : _j[0]) == null ? void 0 : _k.recurring
+            recurring: (_k = (_j = p3.variants) == null ? void 0 : _j[0]) == null ? void 0 : _k.recurring
           };
         });
         return { _tag: "Success", data: products };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/upsells POST exists yet.
@@ -2231,8 +3277,118 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet.
+    async getInstantOrderProducts({ subscriptionId, query, after, limit }) {
+      try {
+        const params = new URLSearchParams();
+        if (query) params.set("q", query);
+        if (after != null) params.set("after", after);
+        if (limit != null) params.set("limit", String(limit));
+        const search = params.toString() ? `?${params.toString()}` : "";
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/instant-orders/products${search}`
+        );
+        if (!res.ok) {
+          if (res.status === 404) {
+            return { _tag: "Failure", error: { kind: "SUBSCRIPTION_NOT_FOUND" } };
+          }
+          const message = await readErrorMessage(res);
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: message ?? `HTTP ${res.status}` }
+          };
+        }
+        const body = await res.json().catch(() => null);
+        if (body == null) {
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: "Malformed response" }
+          };
+        }
+        return { _tag: "Success", data: mapInstantOrderProducts(body) };
+      } catch (e) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "NETWORK",
+            message: e instanceof Error ? e.message : void 0
+          }
+        };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet.
+    //
+    // No X-Last-Updated-At header: an instant order never mutates the
+    // subscription, so the optimistic-lock preValidation (which only fires when
+    // the header is present) has nothing to guard here.
+    async placeInstantOrder({
+      subscriptionId,
+      requestKey,
+      items,
+      shippingMethodTitle
+    }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/instant-orders`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+              requestKey,
+              // Narrowed to what the endpoint accepts: the rest of
+              // PostableSubscriptionItem describes a subscription line (its
+              // billing policy, its cycle limit), and an instant order is not one.
+              items: items.map(({ variantId, quantity }) => ({
+                variantId,
+                quantity
+              })),
+              // Basket-level, not per-line: the endpoint prices one delivery
+              // rate for the whole instant order.
+              ...shippingMethodTitle != null ? { shippingMethodTitle } : {}
+            })
+          }
+        );
+        if (!res.ok) {
+          if (res.status === 404) {
+            return { _tag: "Failure", error: { kind: "SUBSCRIPTION_NOT_FOUND" } };
+          }
+          const message = await readErrorMessage(res);
+          const kind = PLACE_INSTANT_ORDER_ERROR_KINDS[res.status] ?? "UNKNOWN";
+          return {
+            _tag: "Failure",
+            error: { kind, message: message ?? `HTTP ${res.status}` }
+          };
+        }
+        const body = await res.json().catch(() => null);
+        if (body == null) {
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: "Malformed response" }
+          };
+        }
+        return {
+          _tag: "Success",
+          data: {
+            orderId: body.orderId,
+            totalPrice: body.totalPrice ?? null,
+            currencyCode: body.currencyCode,
+            status: body.status,
+            ...body.paymentUrl != null ? { paymentUrl: body.paymentUrl } : {},
+            ...body.reason != null ? { reason: body.reason } : {}
+          }
+        };
+      } catch (e) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "NETWORK",
+            message: e instanceof Error ? e.message : void 0
+          }
+        };
       }
     },
     // Legacy endpoint — no /customer/v1 equivalent exists yet.
@@ -2248,8 +3404,8 @@ function createApiSubscriptionAdapter(fetcher) {
           _tag: "Success",
           data: { id: data.id, createdAt: data.createdAt }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoints, split by stage (see SubscriptionService.renewNow docs):
@@ -2269,8 +3425,8 @@ function createApiSubscriptionAdapter(fetcher) {
             result: (body == null ? void 0 : body.result) ?? "success"
           }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     // Legacy endpoint — POST /plan returns 204; re-fetch to return the updated subscription.
@@ -2292,8 +3448,8 @@ function createApiSubscriptionAdapter(fetcher) {
           _tag: "Failure",
           error: "Subscription not found after frequency change"
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     }
   };
@@ -2354,13 +3510,13 @@ function mapScheduleOrder(order) {
       };
     }),
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    discounts: (order.discounts ?? []).map((d3) => {
+    discounts: (order.discounts ?? []).map((d2) => {
       var _a, _b, _c;
       return {
-        id: d3.id,
-        title: d3.title ?? void 0,
-        type: ((_a = d3.value) == null ? void 0 : _a.type) === "fixed-amount" ? "fixed_amount" : "percentage",
-        value: ((_b = d3.value) == null ? void 0 : _b.amount) ?? ((_c = d3.value) == null ? void 0 : _c.percentage) ?? 0
+        id: d2.id,
+        title: d2.title ?? void 0,
+        type: ((_a = d2.value) == null ? void 0 : _a.type) === "fixed-amount" ? "fixed_amount" : "percentage",
+        value: ((_b = d2.value) == null ? void 0 : _b.amount) ?? ((_c = d2.value) == null ? void 0 : _c.percentage) ?? 0
       };
     })
   };
@@ -2399,26 +3555,26 @@ function buildSkipItemMatcher(params) {
 const DELIVERY_PRICE = 5;
 const DELIVERY_OFFSET_DAYS = 2;
 function toPrice(amount) {
-  const n = Number.parseFloat(amount ?? "0");
-  return Number.isFinite(n) ? n : 0;
+  const n2 = Number.parseFloat(amount ?? "0");
+  return Number.isFinite(n2) ? n2 : 0;
 }
 function addInterval(date, interval, units) {
-  const d3 = new Date(date);
+  const d2 = new Date(date);
   switch (interval) {
     case "DAY":
-      d3.setDate(d3.getDate() + units);
+      d2.setDate(d2.getDate() + units);
       break;
     case "WEEK":
-      d3.setDate(d3.getDate() + units * 7);
+      d2.setDate(d2.getDate() + units * 7);
       break;
     case "YEAR":
-      d3.setFullYear(d3.getFullYear() + units);
+      d2.setFullYear(d2.getFullYear() + units);
       break;
     default:
-      d3.setMonth(d3.getMonth() + units);
+      d2.setMonth(d2.getMonth() + units);
       break;
   }
-  return d3;
+  return d2;
 }
 function mapItem(sub, item, cycle) {
   var _a, _b;
@@ -2476,11 +3632,11 @@ function projectUpcomingOrders(sub, count) {
       deliveryDate: deliveryDate.toISOString(),
       status: "scheduled",
       items,
-      discounts: sub.discounts.map((d3) => ({
-        id: d3.id,
-        title: d3.code,
-        type: d3.type,
-        value: d3.value
+      discounts: sub.discounts.map((d2) => ({
+        id: d2.id,
+        title: d2.code,
+        type: d2.type,
+        value: d2.value
       }))
     });
   }
@@ -2508,7 +3664,7 @@ function applyAdjustments(orders, stored) {
         );
         const subtotal = items.reduce((sum, it) => sum + it.totalPrice, 0);
         next = { ...next, items, subtotal };
-        if (items.length > 0 && items.every((i2) => i2.skipped)) {
+        if (items.length > 0 && items.every((i3) => i3.skipped)) {
           next = { ...next, skipped: true, status: "skipped", deliveryPrice: 0 };
         }
       }
@@ -2543,11 +3699,11 @@ function createMockSchedulesAdapter(subscriptions = createMockSubscriptionAdapte
       const iso = toIsoOrNull(opts.date);
       const target = iso == null ? void 0 : iso.split("T")[0];
       const match = target ? orders.find(
-        (o2) => o2.deliveryDate.split("T")[0] === target || o2.date.split("T")[0] === target
+        (o3) => o3.deliveryDate.split("T")[0] === target || o3.date.split("T")[0] === target
       ) : void 0;
       return match ? match.cycleIndex : null;
     }
-    const firstScheduled = orders.find((o2) => o2.status === "scheduled");
+    const firstScheduled = orders.find((o3) => o3.status === "scheduled");
     return (firstScheduled == null ? void 0 : firstScheduled.cycleIndex) ?? null;
   }
   async function recordAdjustment(subscriptionId, opts, buildAction, matcherOverride) {
@@ -2580,25 +3736,25 @@ function createMockSchedulesAdapter(subscriptions = createMockSubscriptionAdapte
       const subs = await subscriptionsToProject(subscriptionId);
       const skipCount = new Set(
         stored.filter(
-          (s) => s.adjustment.action.type === "SKIP_ORDER" || s.adjustment.action.type === "SKIP_ITEM"
-        ).map((s) => `${s.subscriptionId}:${s.cycle}`)
+          (s2) => s2.adjustment.action.type === "SKIP_ORDER" || s2.adjustment.action.type === "SKIP_ITEM"
+        ).map((s2) => `${s2.subscriptionId}:${s2.cycle}`)
       ).size;
       const depth = excludeSkipped ? count + skipCount : count;
       const orders = subs.flatMap(
         (sub) => applyAdjustments(projectUpcomingOrders(sub, depth), stored)
-      ).filter((o2) => excludeSkipped ? !o2.skipped : true).map(
-        (o2) => (
+      ).filter((o3) => excludeSkipped ? !o3.skipped : true).map(
+        (o3) => (
           // Mirror backend removeSkippedItems: the billable view also strips
           // skipped lines from surviving (partially-skipped) orders. No
           // recompute needed — skipped lines already carry totalPrice 0 (R4).
-          excludeSkipped && o2.items.some((i2) => i2.skipped) ? { ...o2, items: o2.items.filter((i2) => !i2.skipped) } : o2
+          excludeSkipped && o3.items.some((i3) => i3.skipped) ? { ...o3, items: o3.items.filter((i3) => !i3.skipped) } : o3
         )
-      ).sort((a8, b2) => a8.date.localeCompare(b2.date));
+      ).sort((a2, b3) => a2.date.localeCompare(b3.date));
       return { _tag: "Success", data: orders.slice(0, count) };
     },
     async getAdjustments() {
       await new Promise((r2) => setTimeout(r2, 200));
-      return { _tag: "Success", data: stored.map((s) => s.adjustment) };
+      return { _tag: "Success", data: stored.map((s2) => s2.adjustment) };
     },
     async skipOrder({ subscriptionId, cycle, date }) {
       await new Promise((r2) => setTimeout(r2, 300));
@@ -2671,7 +3827,7 @@ function createMockSchedulesAdapter(subscriptions = createMockSubscriptionAdapte
     },
     async removeAdjustment({ adjustmentId }) {
       await new Promise((r2) => setTimeout(r2, 200));
-      stored = stored.filter((s) => s.adjustment.id !== adjustmentId);
+      stored = stored.filter((s2) => s2.adjustment.id !== adjustmentId);
       return { _tag: "Success", data: void 0 };
     }
   };
@@ -2686,8 +3842,8 @@ function createApiSchedulesAdapter(fetcher) {
       });
       if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
       return { _tag: "Success", data: void 0 };
-    } catch (e2) {
-      return { _tag: "Failure", error: e2 };
+    } catch (e) {
+      return { _tag: "Failure", error: e };
     }
   }
   return {
@@ -2700,8 +3856,8 @@ function createApiSchedulesAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: (data.orders ?? []).map(mapScheduleOrder) };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async getAdjustments() {
@@ -2717,10 +3873,10 @@ function createApiSchedulesAdapter(fetcher) {
           if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
           const body = await res.json();
           all.push(
-            ...body.data.map((a8) => ({
-              id: a8.id,
-              matcher: a8.matcher,
-              action: a8.action
+            ...body.data.map((a2) => ({
+              id: a2.id,
+              matcher: a2.matcher,
+              action: a2.action
             }))
           );
           if (!body.hasNextPage) return { _tag: "Success", data: all };
@@ -2736,8 +3892,8 @@ function createApiSchedulesAdapter(fetcher) {
           _tag: "Failure",
           error: "Adjustments pagination exceeded 50 pages"
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     },
     async skipOrder({ cycle, date }) {
@@ -2813,16 +3969,16 @@ function createApiSchedulesAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
       }
     }
   };
 }
 const SchedulesServiceContext = createContext("services/schedules");
-function isSameCalendarDay(a8, b2) {
-  const da = new Date(a8);
-  const db = new Date(b2);
+function isSameCalendarDay(a2, b3) {
+  const da = new Date(a2);
+  const db = new Date(b3);
   if (Number.isNaN(da.getTime()) || Number.isNaN(db.getTime())) return false;
   return da.toISOString().slice(0, 10) === db.toISOString().slice(0, 10);
 }
@@ -2902,26 +4058,26 @@ function createSchedulesService(adapter, opts) {
       const adjustments = await adapter.getAdjustments();
       if (adjustments._tag === "Failure") return adjustments;
       const covering = adjustments.data.filter(
-        (a8) => a8.action.type === "SKIP_ITEM" && a8.action.input.lineIds.includes(lineId) && matcherAffects(a8.matcher, { cycle, date })
+        (a2) => a2.action.type === "SKIP_ITEM" && a2.action.input.lineIds.includes(lineId) && matcherAffects(a2.matcher, { cycle, date })
       );
       if (covering.length === 0) {
         return { _tag: "Failure", error: "No skip found for this item" };
       }
-      if (covering.some((a8) => a8.action.input.lineIds.length > 1)) {
+      if (covering.some((a2) => a2.action.input.lineIds.length > 1)) {
         return {
           _tag: "Failure",
           error: "This item was skipped together with other items and can't be unskipped individually"
         };
       }
-      if (covering.some((a8) => !matcherExactlyTargets(a8.matcher, { cycle, date }))) {
+      if (covering.some((a2) => !matcherExactlyTargets(a2.matcher, { cycle, date }))) {
         return {
           _tag: "Failure",
           error: "This skip also affects another order and can't be removed from here"
         };
       }
       let deleted = 0;
-      for (const a8 of covering) {
-        const result = await adapter.removeAdjustment({ adjustmentId: a8.id });
+      for (const a2 of covering) {
+        const result = await adapter.removeAdjustment({ adjustmentId: a2.id });
         if (result._tag === "Failure") {
           if (deleted > 0) await notifyChanged(subscriptionId);
           return result;
@@ -3005,6 +4161,19 @@ function getCurrentSubscriptionId() {
   }
   return null;
 }
+async function countRatesTitled(adapter, subscriptionId, title) {
+  try {
+    const available = await adapter.getAvailableShippingMethods({
+      subscriptionId
+    });
+    if (available._tag !== "Success") {
+      return 0;
+    }
+    return available.data.filter((option) => option.title === title).length;
+  } catch {
+    return 0;
+  }
+}
 function createSubscriptionService(adapter) {
   const current = d(null);
   const hasPendingBilling = w(
@@ -3139,6 +4308,27 @@ function createSubscriptionService(adapter) {
     },
     reschedule: (subscriptionId, newDate) => adapter.reschedule({ subscriptionId, newDate }),
     updateCustomAttributes: (subscriptionId, customAttributes) => adapter.updateCustomAttributes({ subscriptionId, customAttributes }),
+    updateDeliveryAddress: async (subscriptionId, address) => {
+      const result = await adapter.updateDeliveryAddress({
+        subscriptionId,
+        address
+      });
+      if (result._tag === "Success") {
+        await reload();
+      }
+      return result;
+    },
+    getAvailableShippingMethods: (subscriptionId) => adapter.getAvailableShippingMethods({ subscriptionId }),
+    updateDeliveryMethod: async (subscriptionId, shippingMethodHandle) => {
+      const result = await adapter.updateDeliveryMethod({
+        subscriptionId,
+        shippingMethodHandle
+      });
+      if (result._tag === "Success") {
+        await reload();
+      }
+      return result;
+    },
     resume: (subscriptionId) => adapter.resume({ subscriptionId }),
     pause: (subscriptionId) => adapter.pause({ subscriptionId }),
     reactivate: (subscriptionId) => adapter.reactivate({ subscriptionId }),
@@ -3155,37 +4345,114 @@ function createSubscriptionService(adapter) {
       data: {
         available: false,
         requiresCheckout: false,
-        paymentMethods: [],
         products: [],
         hasNextPage: false,
         endCursor: null
       }
     }),
-    placeInstantOrder: (subscriptionId, requestKey, items, paymentMethodId) => adapter.placeInstantOrder ? adapter.placeInstantOrder({
-      subscriptionId,
-      requestKey,
-      items,
-      paymentMethodId
-    }) : (
-      // Distinguishable from every server-side refusal, so a consumer can
-      // treat "this host cannot do instant orders" as a missing capability
-      // rather than telling the customer their order was declined.
-      Promise.resolve({
-        _tag: "Failure",
-        error: { kind: "UNSUPPORTED" }
-      })
-    ),
-    getInstantOrder: (subscriptionId, orderId) => adapter.getInstantOrder ? adapter.getInstantOrder({ subscriptionId, orderId }) : Promise.resolve({
-      _tag: "Failure",
-      error: { kind: "UNSUPPORTED" }
-    })
+    placeInstantOrder: async (subscriptionId, requestKey, items, options) => {
+      const placeOrder = adapter.placeInstantOrder;
+      if (!placeOrder) {
+        return {
+          _tag: "Failure",
+          error: { kind: "UNSUPPORTED" }
+        };
+      }
+      const chosenTitle = options == null ? void 0 : options.shippingMethodTitle;
+      if (chosenTitle != null) {
+        const matches = await countRatesTitled(
+          adapter,
+          subscriptionId,
+          chosenTitle
+        );
+        if (matches > 1) {
+          return {
+            _tag: "Failure",
+            error: {
+              kind: "AMBIGUOUS_SHIPPING_METHOD",
+              message: `${matches} available shipping methods are titled "${chosenTitle}", so the title cannot say which one was chosen.`
+            }
+          };
+        }
+      }
+      return placeOrder({ subscriptionId, requestKey, items, ...options });
+    }
   };
   return service;
 }
+function isOneTimeLine(line) {
+  return line.isOneTime === true || line.recurringCycleLimit === 1;
+}
+function hasValue(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function hasIdentity(line) {
+  return hasValue(line.subscriptionId) && hasValue(line.subscriptionLineId);
+}
+function isSameLine(a2, b3) {
+  return hasValue(a2.subscriptionLineId) && a2.subscriptionLineId === b3.subscriptionLineId;
+}
+function belongsToSameSubscription(a2, b3) {
+  return hasValue(a2.subscriptionId) && a2.subscriptionId === b3.subscriptionId;
+}
+function parentLineFor(child, lines) {
+  if (!hasValue(child.parentLineId)) {
+    return void 0;
+  }
+  return lines.find(
+    (candidate) => belongsToSameSubscription(candidate, child) && (candidate.subscriptionLineId === child.parentLineId || candidate.id === child.parentLineId)
+  );
+}
+function productKey(line, lines) {
+  if (hasValue(line.parentProductId)) {
+    return `product:${line.parentProductId}`;
+  }
+  if (hasValue(line.parentLineId)) {
+    const parent = parentLineFor(line, lines);
+    if (hasValue(parent == null ? void 0 : parent.productId)) {
+      return `product:${parent.productId}`;
+    }
+    return `line:${line.parentLineId}`;
+  }
+  const lineIdentity = hasValue(line.subscriptionLineId) ? line.subscriptionLineId : line.id;
+  if (!hasValue(lineIdentity)) {
+    return null;
+  }
+  const isReferencedAsParent = lines.some(
+    (candidate) => belongsToSameSubscription(candidate, line) && (hasValue(line.productId) && candidate.parentProductId === line.productId || hasValue(candidate.parentLineId) && (candidate.parentLineId === line.subscriptionLineId || candidate.parentLineId === line.id))
+  );
+  if (isReferencedAsParent && hasValue(line.productId)) {
+    return `product:${line.productId}`;
+  }
+  return `line:${lineIdentity}`;
+}
+function remainingRecurringProductKeys(line, lines) {
+  const removedProductKey = productKey(line, lines);
+  return new Set(
+    lines.filter(
+      (item) => belongsToSameSubscription(item, line) && !isOneTimeLine(item)
+    ).map((item) => productKey(item, lines)).filter((key) => key != null && key !== removedProductKey)
+  );
+}
+function canRemoveLine(line, lines) {
+  if (!hasIdentity(line)) {
+    return false;
+  }
+  const targetExists = lines.some(
+    (item) => belongsToSameSubscription(item, line) && isSameLine(item, line)
+  );
+  if (!targetExists) {
+    return false;
+  }
+  if (isOneTimeLine(line)) {
+    return true;
+  }
+  return remainingRecurringProductKeys(line, lines).size > 0;
+}
 function getDefaultBlockForAction(actionType, actionConfig, blockId) {
   const blockName = `action:${actionType}`;
   const definedBlocks = getDefinedBlocks();
-  const exists = definedBlocks.some((b2) => b2.name === blockName);
+  const exists = definedBlocks.some((b3) => b3.name === blockName);
   if (!exists) {
     throw new Error(
       `No default block registered for action type "${actionType}". Expected a block named "${blockName}" to be registered in blocks-extensions.`
@@ -3195,7 +4462,7 @@ function getDefaultBlockForAction(actionType, actionConfig, blockId) {
 }
 function hasDefaultBlockForAction(actionType) {
   const blockName = `action:${actionType}`;
-  return getDefinedBlocks().some((b2) => b2.name === blockName);
+  return getDefinedBlocks().some((b3) => b3.name === blockName);
 }
 const WorkflowServiceContext = createContext("services/workflow");
 const RUN_SCOPED_RESET = {
@@ -3333,7 +4600,7 @@ function createWorkflowService(deps) {
         outcome: null
       });
       if (editor.isEditorMode) {
-        const displayStepId = isInitialResponse && previewStepId && ((_e = data.interactiveSteps) == null ? void 0 : _e.some((s) => s.stepId === previewStepId)) ? previewStepId : currentStepId;
+        const displayStepId = isInitialResponse && previewStepId && ((_e = data.interactiveSteps) == null ? void 0 : _e.some((s2) => s2.stepId === previewStepId)) ? previewStepId : currentStepId;
         const overlayBlocks = deps.themeState.overlay.blocks.value;
         const rootBlock = overlayBlocks[0];
         const stepSlot = displayStepId ? (_f = rootBlock == null ? void 0 : rootBlock.slots) == null ? void 0 : _f[displayStepId] : null;
@@ -3428,7 +4695,7 @@ function createWorkflowService(deps) {
     const presets = {};
     const baseLabelFor = (step) => {
       var _a;
-      return ((_a = getDefinedBlocks().find((b2) => b2.name === `action:${step.actionType}`)) == null ? void 0 : _a.displayName) ?? step.stepId;
+      return ((_a = getDefinedBlocks().find((b3) => b3.name === `action:${step.actionType}`)) == null ? void 0 : _a.displayName) ?? step.stepId;
     };
     const totalCounts = /* @__PURE__ */ new Map();
     for (const step of allSteps) {
@@ -4023,9 +5290,9 @@ const gridV1Engine = {
       case "resize": {
         const current = layout.items[cmd.blockId];
         if (current) {
-          const w3 = Math.max(1, Math.min(cmd.size.w, ctx2.cols - current.c));
-          const h = Math.max(1, cmd.size.h);
-          layout.items[cmd.blockId] = { ...current, w: w3, h };
+          const w4 = Math.max(1, Math.min(cmd.size.w, ctx2.cols - current.c));
+          const h2 = Math.max(1, cmd.size.h);
+          layout.items[cmd.blockId] = { ...current, w: w4, h: h2 };
         }
         break;
       }
@@ -4092,7 +5359,7 @@ function insertRectRelative(doc, args) {
     if (!layout) continue;
     const target = layout.items[args.targetId];
     if (!target) continue;
-    const cols = ((_a = doc.breakpoints.find((b2) => b2.id === breakpointId)) == null ? void 0 : _a.cols) ?? ((_b = layout.grid) == null ? void 0 : _b.cols) ?? DEFAULT_GRID.cols;
+    const cols = ((_a = doc.breakpoints.find((b3) => b3.id === breakpointId)) == null ? void 0 : _a.cols) ?? ((_b = layout.grid) == null ? void 0 : _b.cols) ?? DEFAULT_GRID.cols;
     const insertRow = args.position === "before" ? target.r : target.r + target.h;
     for (const [id, rect] of Object.entries(layout.items)) {
       if (id === args.blockId) continue;
@@ -4143,20 +5410,23 @@ export {
   AuthenticationError,
   AuthenticationErrorReason,
   B as BlockWrapperEvent,
-  v as ContextProvideEvent,
-  x as ContextRequestEvent,
+  q as ContextProvideEvent,
+  t as ContextRequestEvent,
   CustomerServiceContext,
-  y as DEFAULT_BREAKPOINTS,
-  z as DEFAULT_GLOBAL_STYLES,
+  h as DEFAULT_BREAKPOINTS,
+  i2 as DEFAULT_GLOBAL_STYLES,
   DEFAULT_GRID,
   DEFAULT_NEW_BLOCK_HEIGHT,
   DISCOUNT_REJECTION_REASONS,
   GRID_V1_ENGINE_ID,
-  L as LAYOUT_SCOPE_ATTR,
+  L2 as LAYOUT_SCOPE_ATTR,
   LoginServiceContext,
-  OrdersServiceContext,
+  OrderServiceContext,
+  OverlayServiceContext,
   P as PAGE_ROOT_SLOT,
+  PAYMENT_INSTRUMENT_TYPES,
   ProductServiceContext,
+  REFRESH_LOCK_NAME,
   RouterServiceContext,
   SUPPORTED_UI_LANGUAGES,
   SUPPORTED_UI_LANGUAGE_OPTIONS,
@@ -4167,101 +5437,118 @@ export {
   u as Signal,
   StateContext,
   SubscriptionServiceContext,
-  c as ThemeStateContext,
+  a as ThemeStateContext,
   T as TranslationContext,
   WorkflowServiceContext,
-  A as attachEmptyTracking,
-  authenticationErrorFromBody,
-  d2 as backfillInstanceDefaults,
-  b as buildGridLayout,
-  F as buildLayoutCss,
+  v as __recordDevtoolsInstance,
+  _ as __recordDevtoolsPropSetter,
+  x as attachEmptyTracking,
+  c as backfillInstanceDefaults,
+  b2 as buildGridLayout,
+  j as buildLayoutCss,
+  buildOrdersQuery,
+  canRemoveLine,
   canvasMode,
   clampRect,
-  H as classifyRowDividers,
+  k2 as classifyRowDividers,
   clearAllSurfaceContexts,
   clearLayoutModeAdapter,
   compactItems,
-  I as compactLayoutDocument,
+  l2 as compactLayoutDocument,
   w as computed,
   createApiCustomerAdapter,
   createApiLoginAdapter,
-  createApiOrdersAdapter,
+  createApiOrderAdapter,
   createApiProductAdapter,
   createApiSchedulesAdapter,
   createApiSubscriptionAdapter,
   createBlockInstance,
-  J as createBlockInstanceFromJSON,
-  K as createBlockInstanceFromObject,
-  N as createCeRenderer,
+  y as createBlockInstanceFromJSON,
+  g as createBlockInstanceFromObject,
+  z as createCeRenderer,
   createContext,
   createCustomerService,
-  O as createDefaultLayoutDocument,
+  m as createDefaultLayoutDocument,
   createLoginService,
   createMockCustomerAdapter,
   createMockLoginAdapter,
-  createMockOrdersAdapter,
+  createMockOrderAdapter,
   createMockProductAdapter,
   createMockRouterService,
   createMockSchedulesAdapter,
   createMockSubscriptionAdapter,
   createMockWorkflowApiAdapter,
-  createOrdersService,
+  createOrderService,
+  createOverlayService,
   createProductService,
   createRouterService,
   createSchedulesService,
-  Q as createSelectedBlock,
+  A as createSelectedBlock,
   createSettingsService,
   createShopService,
   createState,
   createSubscriptionService,
-  R as createThemeState,
-  U as createTranslationService,
+  n as createThemeState,
+  o2 as createTranslationService,
   createWorkflowApiAdapter,
   createWorkflowService,
   defineBlock,
-  V as defineBlockRuntime,
-  W as deriveLayout,
+  D as defineBlockRuntime,
+  defineOverlayWrapper,
+  p as deriveLayout,
   E as effect,
   emitLayoutCommand,
   emitLayoutSetRects,
-  X as expandFillLayoutDocument,
+  q2 as expandFillLayoutDocument,
   findFreeRect,
+  fromV1Customer,
   getActiveSurfaceContext,
   getDefaultBlockForAction,
   getDefinedBlocks,
+  F as getDevtoolsBlockState,
   getLayoutModeAdapter,
+  getPaymentInstrumentDetail,
+  getPaymentInstrumentDigits,
+  getPaymentInstrumentExpiry,
+  getPaymentInstrumentName,
   gridV1Engine,
   hasDefaultBlockForAction,
-  Y as hasRenderedContent,
-  Z as indexOverrides,
+  G as hasRenderedContent,
+  s as indexOverrides,
   i as injectContext,
   insertRectRelative,
-  _ as isEditorPreview,
-  a as isStubDefinition,
-  $ as layoutScopeSelector,
-  a0 as layoutSystemEnabled,
+  H as isEditorPreview,
+  isFilterQuery,
+  isOneTimeLine,
+  isStaleSubscriptionMessage,
+  b as isStubDefinition,
+  t2 as layoutScopeSelector,
+  I as layoutSystemEnabled,
   loadBlockRegistry,
   loginService,
   o as onRegisterBlock,
-  a1 as projectToCss,
-  p as projectToGridStack,
-  a2 as provideContext,
-  a3 as readingOrder,
-  e as reconcileLayout,
-  a4 as rectsOverlap,
+  u2 as projectToCss,
+  p2 as projectToGridStack,
+  J as provideContext,
+  v2 as readingOrder,
+  c2 as reconcileLayout,
+  w3 as rectsOverlap,
   registerBlock,
   registerLayoutModeAdapter,
   resetBreakpoint,
   r as resolveLayout,
-  a5 as serializeBlocks,
+  k as serializeBlocks,
+  serializeV1PaymentInstrument,
   setActiveSurfaceContext,
+  K as setDevtoolsBlockProp,
   setLayoutCommandDispatcher,
   setLayoutCommandEmitter,
-  a6 as setLayoutSystemEnabled,
+  l as setLayoutSystemEnabled,
   d as signal,
   subscribeContext,
   toLanguageSelectOptions,
-  a7 as untracked,
+  L as untracked,
   waitForDevBlocksUrl,
+  withRefreshLock,
   w2 as withWrapper
 };