@juo/blocks 1.12.0-alpha.0 → 1.12.0-alpha.1

package/dist/core.js

@@ -1,8 +1,9 @@
 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 { c as createContext, d, w, r as registerBlock, E, u } from "./juo-workflow-CkyZRq60.js";
-import { B, C, a, D, S, T, b, W, e, f, g, h, i, j, k, l, m, n, o, p, q, s, t, v, x, y, z, A, F, G, H, I, J, K, L } from "./juo-workflow-CkyZRq60.js";
+import { c as createContext, d, w, a as defineBlock, b as createBlockInstance, r as registerBlock, E, u } from "./block-Bh3z0B3y.js";
+import { B, C, e, S, _, f, g, h, i, j, k, l, m, n, o, p, q, s, t, v, x, y, z, A, D, F } from "./block-Bh3z0B3y.js";
+import { D as D2, T, a, W, c, b, d as d2, e as e2, g as g2, h as h2, i as i2 } from "./juo-workflow-D3c29mxb.js";
 import { reportBlockWarning, reportBlockError } from "./observability.js";
 function createState() {
   const discountCode = d(null);
@@ -72,6 +73,49 @@ 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, {
+    group: "internal",
+    schema: OVERLAY_WRAPPER_SCHEMA,
+    initialValue: () => ({
+      props: { layout, canAbort },
+      slots: {
+        content: [createBlockInstance(opts.content)]
+      }
+    }),
+    renderer: () => null
+  });
+}
 function isLocalhostOrigin(origin) {
   try {
     const url = new URL(origin);
@@ -132,7 +176,7 @@ async function loadBlockRegistry(options = {}) {
       if ("registerBlocks" in module && typeof module.registerBlocks === "function") {
         module.registerBlocks();
       } else {
-        Object.entries(module).forEach(([_, item]) => {
+        Object.entries(module).forEach(([_2, item]) => {
           if (typeof item === "object" && item != null) {
             registerBlock(item);
           }
@@ -187,8 +231,8 @@ function createApiCustomerAdapter(fetcher) {
           _tag: "Success",
           data: { id: data.id, name, email: data.email }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     }
   };
@@ -206,7 +250,7 @@ const PARAMS = {
 function uuid() {
   return ("10000000-1000-4000-8000" + -1e11).replace(
     /[018]/g,
-    (c) => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+    (c2) => (c2 ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c2 / 4).toString(16)
   );
 }
 function createMockLoginAdapter() {
@@ -276,8 +320,8 @@ function createApiLoginAdapter(fetcher, opts) {
           lang
         );
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async authenticate(params) {
@@ -311,8 +355,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     getAuthorizeUrl({ connection, state, shop }) {
@@ -576,10 +620,56 @@ function createLoginService(init) {
 }
 const LoginServiceContext = createContext("services/login");
 function createMockOrdersAdapter() {
+  const mockOrders = [
+    {
+      id: "10001",
+      createdAt: "2024-10-15T09:30:00Z",
+      placedAt: "2024-10-15T09:30:00Z",
+      currencyCode: "USD",
+      totalPrice: 89.97,
+      financialStatus: "PAID",
+      fulfillmentStatus: "FULFILLED",
+      lines: [
+        {
+          id: "line_1",
+          title: "Monthly Coffee Subscription",
+          quantity: 1,
+          variantImage: null,
+          customAttributes: [
+            { key: "roast", value: "dark" },
+            { key: "size", value: "1lb" }
+          ]
+        }
+      ],
+      customAttributes: [
+        { key: "order_type", value: "subscription_renewal" },
+        { key: "gift_wrap", value: "false" }
+      ]
+    },
+    {
+      id: "10002",
+      createdAt: "2024-09-20T14:15:00Z",
+      placedAt: "2024-09-20T14:15:00Z",
+      currencyCode: "USD",
+      totalPrice: 45.99,
+      financialStatus: "PAID",
+      fulfillmentStatus: "PARTIALLY_FULFILLED",
+      lines: [
+        {
+          id: "line_2",
+          title: "Premium Tea Set",
+          quantity: 2,
+          variantImage: null,
+          customAttributes: []
+        }
+      ],
+      customAttributes: []
+    }
+  ];
   return {
     async getOrders() {
       return {
-        items: [],
+        items: mockOrders,
         pageInfo: {
           hasNextPage: false,
           hasPrevPage: false,
@@ -743,6 +833,18 @@ function createMockProductAdapter() {
       );
       return product == null ? null : processProduct(product);
     },
+    async getProductsByIds() {
+      return [];
+    },
+    async getBoxVariants() {
+      return [];
+    },
+    async getAvailableProducts() {
+      return [];
+    },
+    async getBox() {
+      return null;
+    },
     async search(opts) {
       await new Promise((resolve) => setTimeout(resolve, 100));
       let filteredProducts = [...products];
@@ -880,6 +982,85 @@ function createApiProductAdapter(fetcher, opts = { currencyCode: "USD" }) {
           }
         };
       }
+    },
+    async getProductsByIds({ ids }) {
+      const params = new URLSearchParams();
+      for (const id of ids) params.append("ids", id);
+      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,
+        hasOnlyDefaultVariant: true,
+        collections: []
+      }));
+    },
+    async getBoxVariants({ ids, subscriptionId }) {
+      const params = new URLSearchParams();
+      for (const id of ids) params.append("ids", id);
+      params.set("subscriptionId", subscriptionId);
+      const res = await fetcher(`/customer/products/variants?${params.toString()}`);
+      if (!res.ok) return [];
+      const data = await res.json();
+      return (data ?? []).map((p2) => {
+        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
+          }))
+        };
+      });
+    },
+    async getAvailableProducts({ subscriptionId, lineId, q: q2, mode, action, pagination }) {
+      const params = new URLSearchParams();
+      params.set("action", action);
+      if (q2) params.set("q", q2);
+      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);
+      const res = await fetcher(
+        `/customer/subscriptions/${subscriptionId}/lines/${lineId}/available-products?${params.toString()}`
+      );
+      if (!res.ok) return [];
+      const data = await res.json();
+      return (data ?? []).map((p2) => {
+        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
+          }))
+        };
+      });
+    },
+    async getBox({ id }) {
+      const res = await fetcher(`/customer/boxes/${id}`);
+      if (!res.ok) return null;
+      const data = await res.json();
+      return { id, ...data };
     }
   };
 }
@@ -894,7 +1075,11 @@ function createProductService(adapter) {
     },
     async search(opts) {
       return adapter.search(opts);
-    }
+    },
+    getProductsByIds: (ids) => adapter.getProductsByIds({ ids }),
+    getBoxVariants: (ids, subscriptionId) => adapter.getBoxVariants({ ids, subscriptionId }),
+    getAvailableProducts: (params) => adapter.getAvailableProducts(params),
+    getBox: (id) => adapter.getBox({ id })
   };
 }
 function routeNameTableFromPages(pages) {
@@ -949,66 +1134,135 @@ function createMockRouterService() {
   }).routerService;
 }
 function futureDateStr(daysFromNow) {
-  const d2 = /* @__PURE__ */ new Date();
-  d2.setDate(d2.getDate() + daysFromNow);
-  return d2.toISOString().split("T")[0] ?? "";
+  const d3 = /* @__PURE__ */ new Date();
+  d3.setDate(d3.getDate() + daysFromNow);
+  return d3.toISOString().split("T")[0] ?? "";
 }
 function createMockSchedulesAdapter() {
   let orders = [
     {
-      id: "schedule-order-1",
+      id: "sched_1",
+      customerId: "customer_1",
       subscriptionId: "sub_1",
+      date: "2026-05-22T12:00:00Z",
+      skipped: false,
+      currencyCode: "USD",
+      subtotal: 2999,
+      deliveryPrice: 500,
+      cycleIndex: 4,
       deliveryDate: futureDateStr(7),
+      status: "scheduled",
       items: [
         {
-          id: "si-1",
-          productId: "p-beauty-1",
-          variantId: "v-beauty-1",
-          quantity: 1,
+          id: "sched_item_1",
           title: "Rose Face Serum",
-          imageUrl: "https://images.unsplash.com/photo-1611930022073-b7a4ba5fcccd?w=200"
+          subtitle: null,
+          imageUrl: "https://images.unsplash.com/photo-1611930022073-b7a4ba5fcccd?w=200",
+          variantId: "variant_1",
+          quantity: 1,
+          price: 2999,
+          totalPrice: 2999,
+          variantImage: null,
+          variantAvailableForSale: true,
+          subscriptionId: "sub_1",
+          subscriptionLineId: "item_1",
+          productId: "product_1",
+          parentProductId: null,
+          parentLineId: null,
+          isVirtual: false,
+          isUpsell: false,
+          isOneTime: false,
+          customAttributes: []
         },
         {
-          id: "si-2",
-          productId: "p-beauty-2",
-          variantId: "v-beauty-2",
-          quantity: 1,
+          id: "sched_item_2",
           title: "Vitamin C Moisturizer",
-          imageUrl: "https://images.unsplash.com/photo-1556228578-8c89e6adf883?w=200"
+          subtitle: null,
+          imageUrl: "https://images.unsplash.com/photo-1556228578-8c89e6adf883?w=200",
+          variantId: "variant_2",
+          quantity: 1,
+          price: 2999,
+          totalPrice: 2999,
+          variantImage: null,
+          variantAvailableForSale: true,
+          subscriptionId: "sub_1",
+          subscriptionLineId: "item_2",
+          productId: "product_2",
+          parentProductId: null,
+          parentLineId: null,
+          isVirtual: false,
+          isUpsell: false,
+          isOneTime: false,
+          customAttributes: []
         }
       ],
-      status: "scheduled"
+      discounts: []
     },
     {
-      id: "schedule-order-2",
+      id: "sched_2",
+      customerId: "customer_1",
       subscriptionId: "sub_1",
-      deliveryDate: futureDateStr(35),
+      date: "2026-05-22T12:00:00Z",
+      skipped: false,
+      currencyCode: "USD",
+      subtotal: 2999,
+      deliveryPrice: 500,
+      cycleIndex: 4,
+      deliveryDate: futureDateStr(7),
+      status: "scheduled",
       items: [
         {
-          id: "si-3",
-          productId: "p-beauty-1",
-          variantId: "v-beauty-1",
-          quantity: 1,
+          id: "sched_item_3",
           title: "Rose Face Serum",
-          imageUrl: "https://images.unsplash.com/photo-1611930022073-b7a4ba5fcccd?w=200"
+          subtitle: null,
+          imageUrl: "https://images.unsplash.com/photo-1611930022073-b7a4ba5fcccd?w=200",
+          variantId: "variant_1",
+          quantity: 1,
+          price: 2999,
+          totalPrice: 2999,
+          variantImage: null,
+          variantAvailableForSale: true,
+          subscriptionId: "sub_1",
+          subscriptionLineId: "item_1",
+          productId: "product_1",
+          parentProductId: null,
+          parentLineId: null,
+          isVirtual: false,
+          isUpsell: false,
+          isOneTime: false,
+          customAttributes: []
         },
         {
-          id: "si-4",
-          productId: "p-beauty-3",
-          variantId: "v-beauty-3",
-          quantity: 1,
+          id: "sched_item_4",
           title: "Hyaluronic Acid Serum",
-          imageUrl: "https://images.unsplash.com/photo-1621232201696-ba6c9db10a97?w=200"
+          subtitle: null,
+          imageUrl: "https://images.unsplash.com/photo-1621232201696-ba6c9db10a97?w=200",
+          variantId: "variant_3",
+          quantity: 1,
+          price: 2999,
+          totalPrice: 2999,
+          variantImage: null,
+          variantAvailableForSale: true,
+          subscriptionId: "sub_1",
+          subscriptionLineId: "item_3",
+          productId: "product_3",
+          parentProductId: null,
+          parentLineId: null,
+          isVirtual: false,
+          isUpsell: false,
+          isOneTime: false,
+          customAttributes: []
         }
       ],
-      status: "scheduled"
+      discounts: []
     }
   ];
   let adjustments = [];
   return {
-    async getUpcomingOrders(count) {
+    async getUpcomingOrders(params) {
       await new Promise((r) => setTimeout(r, 200));
-      return { _tag: "Success", data: orders.slice(0, count) };
+      const filtered = params.subscriptionId ? orders.filter((o2) => o2.subscriptionId === params.subscriptionId) : orders;
+      return { _tag: "Success", data: filtered.slice(0, params.count) };
     },
     async getAdjustments() {
       await new Promise((r) => setTimeout(r, 200));
@@ -1058,14 +1312,16 @@ function createMockSchedulesAdapter() {
 }
 function createApiSchedulesAdapter(fetcher) {
   return {
-    async getUpcomingOrders(count) {
+    async getUpcomingOrders({ count, subscriptionId }) {
       try {
-        const res = await fetcher(`/customer/v1/schedules/?count=${count}`);
+        const params = new URLSearchParams({ count: String(count) });
+        if (subscriptionId) params.set("query", `id:"${subscriptionId}"`);
+        const res = await fetcher(`/customer/v1/schedules/?${params.toString()}`);
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         return { _tag: "Success", data: data.orders };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async getAdjustments() {
@@ -1080,8 +1336,8 @@ function createApiSchedulesAdapter(fetcher) {
           newDate: a2.newDate
         }));
         return { _tag: "Success", data: adjustments };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async skipOrder({ cycle, date }) {
@@ -1100,8 +1356,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async changeDateAdjustment({ newDate, currentDate }) {
@@ -1126,8 +1382,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async removeAdjustment({ adjustmentId }) {
@@ -1138,61 +1394,143 @@ 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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     }
   };
 }
 const SchedulesServiceContext = createContext("services/schedules");
 function createSchedulesService(adapter, opts) {
-  const upcoming = d([]);
-  async function refreshUpcoming() {
-    const count = Math.max(upcoming.value.length, 3);
-    const result = await adapter.getUpcomingOrders(count);
+  const current = d(null);
+  const currentLoading = d(false);
+  const hasPendingBilling = (opts == null ? void 0 : opts.hasPendingBilling) ?? d(false);
+  let reloadToken = 0;
+  async function getUpcomingOrder() {
+    const result = await adapter.getUpcomingOrders({ count: 1 });
+    if (result._tag === "Failure") return result;
+    return { _tag: "Success", data: result.data[0] ?? null };
+  }
+  async function getUpcomingOrders(count) {
+    return adapter.getUpcomingOrders({ count });
+  }
+  async function reloadCurrent(subscriptionId) {
+    var _a;
+    const token = ++reloadToken;
+    currentLoading.value = true;
+    const count = Math.max(((_a = current.value) == null ? void 0 : _a.length) ?? 0, 3);
+    const result = await adapter.getUpcomingOrders({
+      count,
+      subscriptionId
+    });
+    if (token !== reloadToken) return;
+    currentLoading.value = false;
     if (result._tag === "Success") {
-      upcoming.value = result.data;
+      current.value = result.data;
     }
   }
   return {
-    upcoming,
-    hasPendingBilling: opts.hasPendingBilling,
-    async getUpcomingOrder() {
-      const result = await adapter.getUpcomingOrders(1);
-      if (result._tag === "Failure") return result;
-      upcoming.value = result.data;
-      return { _tag: "Success", data: result.data[0] ?? null };
-    },
-    async getUpcomingOrders(count) {
-      const result = await adapter.getUpcomingOrders(count);
-      if (result._tag === "Success") {
-        upcoming.value = result.data;
-      }
-      return result;
-    },
+    current,
+    currentLoading,
+    hasPendingBilling,
+    getUpcomingOrder,
+    getUpcomingOrders,
     async getAdjustments() {
       return adapter.getAdjustments();
     },
     async skipOrder(params) {
       const result = await adapter.skipOrder(params);
       if (result._tag === "Success") {
-        await refreshUpcoming();
+        await reloadCurrent(params.subscriptionId);
       }
       return result;
     },
     async changeDateAdjustment(params) {
       const result = await adapter.changeDateAdjustment(params);
       if (result._tag === "Success") {
-        await refreshUpcoming();
+        await reloadCurrent(params.subscriptionId);
       }
       return result;
     },
     async removeAdjustment(params) {
       return adapter.removeAdjustment(params);
+    },
+    reloadCurrent
+  };
+}
+const SettingsServiceContext = createContext("services/settings");
+function createSettingsService(initial = {}) {
+  const current = d(initial);
+  return {
+    current,
+    get(key) {
+      return current.value[key];
     }
   };
 }
+function createShopService(options) {
+  const contactEmail = d(options.getContactEmail());
+  const service = { contactEmail };
+  return service;
+}
+const ShopServiceContext = createContext("services/shop");
 function createMockSubscriptionAdapter(options = {}) {
+  const richBase = (id, itemId, renewalId) => ({
+    id,
+    customerId: "customer_1",
+    items: [
+      {
+        id: itemId,
+        productId: "product_1",
+        variantId: "variant_1",
+        quantity: 2,
+        price: { amount: "29.99", currencyCode: "USD" },
+        nextDeliveryDate: /* @__PURE__ */ new Date("2025-11-15"),
+        isUpsell: false,
+        isVirtual: false,
+        nextBillingDate: "2025-11-15T00:00:00Z",
+        currentPrice: { amount: "29.99", currencyCode: "USD" },
+        lineDiscountedPrice: { amount: "26.99", currencyCode: "USD" },
+        variantAvailableForSale: true
+      }
+    ],
+    discounts: [
+      {
+        id: "discount_1",
+        type: "percentage",
+        value: 10,
+        code: "SAVE10",
+        description: "10% off subscription"
+      }
+    ],
+    status: "active",
+    nextDeliveryDate: /* @__PURE__ */ new Date("2025-11-15"),
+    frequency: "1 MONTH",
+    createdAt: "2024-10-01T00:00:00Z",
+    updatedAt: "2024-10-14T00:00:00Z",
+    billingPolicy: { intervalCount: 1, interval: "MONTH", minCycles: 6 },
+    deliveryPolicy: {
+      intervalCount: 1,
+      interval: "MONTH",
+      anchors: [{ day: 15, type: "MONTHDAY" }]
+    },
+    nextBillingDate: "2025-11-15T00:00:00Z",
+    nextBillingAttempt: { date: "2025-11-15T00:00:00Z", attempt: 1, ready: true },
+    lastBillingAttempt: { date: "2025-10-15T00:00:00Z", ready: true },
+    nextFulfillment: "2025-11-17T00:00:00Z",
+    estimatedOrderDate: "2025-11-13T00:00:00Z",
+    customerPaymentMethod: {
+      id: "pm_1",
+      instrument: { type: "credit_card", brand: "visa", maskedNumber: "************4242" },
+      active: true,
+      isRecurring: true
+    },
+    requiredBillingCyclesLeft: 3,
+    renewal: { id: renewalId, isInActiveProcessState: false },
+    lastPaymentStatus: "succeeded",
+    pausePeriod: null,
+    isEditable: true
+  });
   const mockSubscriptions = [
     {
       id: "sub_1",
@@ -1205,8 +1543,18 @@ function createMockSubscriptionAdapter(options = {}) {
           quantity: 2,
           price: { amount: "29.99", currencyCode: "USD" },
           nextDeliveryDate: /* @__PURE__ */ new Date("2025-11-15"),
+          isUpsell: false,
+          isVirtual: false,
+          nextBillingDate: "2025-11-15T00:00:00Z",
+          currentPrice: { amount: "29.99", currencyCode: "USD" },
+          lineDiscountedPrice: { amount: "26.99", currencyCode: "USD" },
+          variantAvailableForSale: true,
           billingPolicy: { intervalCount: 1, interval: "MONTH" },
-          deliveryPolicy: { intervalCount: 1, interval: "MONTH" }
+          deliveryPolicy: { intervalCount: 1, interval: "MONTH" },
+          customAttributes: [
+            { key: "roast_level", value: "medium" },
+            { key: "grind_type", value: "whole_bean" }
+          ]
         }
       ],
       discounts: [
@@ -1222,7 +1570,33 @@ function createMockSubscriptionAdapter(options = {}) {
       nextDeliveryDate: /* @__PURE__ */ new Date("2025-11-15"),
       frequency: "1 MONTH",
       createdAt: "2024-10-01T00:00:00Z",
-      updatedAt: "2024-10-14T00:00:00Z"
+      updatedAt: "2024-10-14T00:00:00Z",
+      billingPolicy: { intervalCount: 1, interval: "MONTH", minCycles: 6 },
+      deliveryPolicy: {
+        intervalCount: 1,
+        interval: "MONTH",
+        anchors: [{ day: 15, type: "MONTHDAY" }]
+      },
+      nextBillingDate: "2025-11-15T00:00:00Z",
+      nextBillingAttempt: { date: "2025-11-15T00:00:00Z", attempt: 1, ready: true },
+      lastBillingAttempt: { date: "2025-10-15T00:00:00Z", ready: true },
+      nextFulfillment: "2025-11-17T00:00:00Z",
+      estimatedOrderDate: "2025-11-13T00:00:00Z",
+      customerPaymentMethod: {
+        id: "pm_1",
+        instrument: { type: "credit_card", brand: "visa", maskedNumber: "************4242" },
+        active: true,
+        isRecurring: true
+      },
+      requiredBillingCyclesLeft: 3,
+      renewal: { id: "ren_1", isInActiveProcessState: false },
+      lastPaymentStatus: "succeeded",
+      pausePeriod: null,
+      isEditable: true,
+      customAttributes: [
+        { key: "subscription_tier", value: "premium" },
+        { key: "gift_message", value: "Enjoy your coffee!" }
+      ]
     },
     {
       id: "sub_2",
@@ -1236,7 +1610,8 @@ function createMockSubscriptionAdapter(options = {}) {
           price: { amount: "49.99", currencyCode: "USD" },
           nextDeliveryDate: /* @__PURE__ */ new Date("2025-11-20"),
           billingPolicy: { intervalCount: 2, interval: "WEEK" },
-          deliveryPolicy: { intervalCount: 2, interval: "WEEK" }
+          deliveryPolicy: { intervalCount: 2, interval: "WEEK" },
+          customAttributes: []
         }
       ],
       discounts: [],
@@ -1244,7 +1619,32 @@ function createMockSubscriptionAdapter(options = {}) {
       nextDeliveryDate: /* @__PURE__ */ new Date("2025-11-20"),
       frequency: "2 WEEK",
       createdAt: "2024-09-15T00:00:00Z",
-      updatedAt: "2024-10-10T00:00:00Z"
+      updatedAt: "2024-10-10T00:00:00Z",
+      customAttributes: []
+    },
+    // Per-status fixtures: groundwork for the deferred editor preview picker
+    // (docs/superpowers/specs/2026-06-17-renewalsummary-parity-and-mock-groundwork-design.md §9).
+    // Not consumed yet — the editor still seeds the active sub_1 via getDefaultSubscriptionId().
+    {
+      ...richBase("sub_paused", "item_paused", "ren_paused"),
+      status: "paused",
+      pausePeriod: { start: "2025-11-01T00:00:00Z", end: "2026-01-01T00:00:00Z" }
+    },
+    {
+      ...richBase("sub_canceled", "item_canceled", "ren_canceled"),
+      status: "canceled",
+      pausePeriod: null
+    },
+    {
+      ...richBase("sub_failed", "item_failed", "ren_failed"),
+      status: "failed",
+      lastPaymentStatus: "failed",
+      pausePeriod: null
+    },
+    {
+      ...richBase("sub_expired", "item_expired", "ren_expired"),
+      status: "expired",
+      pausePeriod: null
     }
   ];
   const mockUpsellProducts = [
@@ -1314,6 +1714,17 @@ function createMockSubscriptionAdapter(options = {}) {
       await new Promise((resolve) => setTimeout(resolve, 300));
       return { _tag: "Success", data: void 0 };
     },
+    async updateItem() {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      return { _tag: "Success", data: void 0 };
+    },
+    async skipLineItem() {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      return { _tag: "Success", data: void 0 };
+    },
+    async updateBoxItems() {
+      return { _tag: "Success", data: void 0 };
+    },
     async addDiscount() {
       await new Promise((resolve) => setTimeout(resolve, 300));
       const behavior = options.addDiscountBehavior ?? { kind: "success" };
@@ -1422,6 +1833,49 @@ function createMockSubscriptionAdapter(options = {}) {
         ]
       };
     },
+    async getLastOrder(params) {
+      await new Promise((resolve) => setTimeout(resolve, 200));
+      const subscription = mockSubscriptions.find((sub) => sub.id === params.subscriptionId);
+      if (!subscription) return { _tag: "Success", data: null };
+      return {
+        _tag: "Success",
+        data: {
+          id: `mock_last_order_${params.subscriptionId}`,
+          createdAt: "2026-04-22T12:00:00Z"
+        }
+      };
+    },
+    async renewNow(_params) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      return { _tag: "Success", data: { result: "success" } };
+    },
+    async changeFrequency(params) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find((sub) => sub.id === params.subscriptionId);
+      if (!subscription) {
+        return { _tag: "Failure", error: "Subscription not found" };
+      }
+      if (typeof params.plan === "string") {
+        subscription.frequency = `1 ${params.plan}`;
+      } else {
+        subscription.frequency = `${params.plan.intervalCount} ${params.plan.interval}`;
+        if (subscription.billingPolicy) {
+          subscription.billingPolicy = { ...subscription.billingPolicy, ...params.plan };
+        }
+        if (subscription.deliveryPolicy) {
+          subscription.deliveryPolicy = { ...subscription.deliveryPolicy, ...params.plan };
+        }
+      }
+      subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      return {
+        _tag: "Success",
+        data: {
+          ...subscription,
+          items: subscription.items.map((item) => ({ ...item })),
+          discounts: subscription.discounts.map((d3) => ({ ...d3 }))
+        }
+      };
+    },
     async getDefaultSubscriptionId() {
       var _a;
       await new Promise((resolve) => setTimeout(resolve, 300));
@@ -1437,6 +1891,26 @@ function createMockSubscriptionAdapter(options = {}) {
     }
   };
 }
+function normalizeInstrumentType(type) {
+  return type.replace(/-/g, "_");
+}
+function mapPaymentMethod(rawPm) {
+  if (!rawPm) return null;
+  if (typeof rawPm === "string") {
+    return { id: rawPm };
+  }
+  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 } : {}
+  };
+}
 function mapSubscription(raw) {
   var _a, _b;
   const status = raw.status === "merged" ? "canceled" : raw.status;
@@ -1445,6 +1919,7 @@ function mapSubscription(raw) {
   return {
     id: raw.id,
     customerId: "",
+    serial: raw.serial,
     items: (raw.items ?? []).map(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (item) => ({
@@ -1458,31 +1933,44 @@ function mapSubscription(raw) {
         },
         nextDeliveryDate: item.nextDeliveryDate ? new Date(item.nextDeliveryDate) : null,
         billingPolicy: item.billingPolicy ?? raw.billingPolicy ?? null,
-        deliveryPolicy: item.deliveryPolicy ?? raw.deliveryPolicy ?? null
+        deliveryPolicy: item.deliveryPolicy ?? raw.deliveryPolicy ?? null,
+        // Map human-readable titles from the v1 SubscriptionItemResource
+        title: item.title,
+        variantTitle: item.subtitle ?? void 0,
+        // recurringCycleLimit === 1 means the item charges exactly once (one-time upsell)
+        isOneTime: item.recurringCycleLimit === 1
       })
     ),
     discounts: (raw.discounts ?? []).map(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (d2) => {
+      (d3) => {
         var _a2, _b2, _c;
         return {
-          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 ?? ""
+          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 ?? ""
         };
       }
     ),
     status,
     nextDeliveryDate: raw.nextBillingDate ? new Date(raw.nextBillingDate) : raw.nextDeliveryDate ? new Date(raw.nextDeliveryDate) : null,
+    // Map nextBillingDate as the raw ISO string for ProductSelect skip() and other consumers
+    nextBillingDate: raw.nextBillingDate ?? null,
+    // Map customerPaymentMethod — note: arrives as bare id (not expanded) since the
+    // subscriptions endpoint does not support ?expand=paymentMethod; instrument digits
+    // remain a data gap pending backend API extension.
+    customerPaymentMethod: mapPaymentMethod(raw.paymentMethod),
     frequency,
     createdAt: raw.createdAt,
-    updatedAt: raw.updatedAt
+    updatedAt: raw.updatedAt,
+    billingPolicy: raw.billingPolicy ?? null,
+    deliveryPolicy: raw.deliveryPolicy ?? null
   };
 }
 function createApiSubscriptionAdapter(fetcher) {
-  return {
+  const adapter = {
     async search(options) {
       var _a;
       try {
@@ -1513,8 +2001,8 @@ function createApiSubscriptionAdapter(fetcher) {
             }
           }
         };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async getById(id) {
@@ -1526,8 +2014,8 @@ 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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async addItem({ subscriptionId, item }) {
@@ -1542,8 +2030,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async removeItem({ subscriptionId, itemId }) {
@@ -1554,8 +2042,62 @@ 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 (e3) {
+        return { _tag: "Failure", error: e3 };
+      }
+    },
+    async updateItem({ subscriptionId, lineId, update }) {
+      try {
+        const body = {
+          ...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 } : {}
+        };
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/lines/${lineId}`,
+          {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(body)
+          }
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        return { _tag: "Success", data: void 0 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
+      }
+    },
+    async skipLineItem({ subscriptionId, lineId, nextBillingDate }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/lines/${lineId}`,
+          {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ nextBillingDate })
+          }
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        return { _tag: "Success", data: void 0 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
+      }
+    },
+    async updateBoxItems({ subscriptionId, parentId, items, shippingMethodHandle }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/update-box-products`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ parentId, items, shippingMethodHandle })
+          }
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        return { _tag: "Success", data: void 0 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async addDiscount({ subscriptionId, code }) {
@@ -1570,8 +2112,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: { kind: "NETWORK", message: `HTTP ${res.status}` } };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: { kind: "UNKNOWN", message: e2 instanceof Error ? e2.message : void 0 } };
+      } catch (e3) {
+        return { _tag: "Failure", error: { kind: "UNKNOWN", message: e3 instanceof Error ? e3.message : void 0 } };
       }
     },
     async removeDiscount({ subscriptionId, discountId }) {
@@ -1582,8 +2124,8 @@ function createApiSubscriptionAdapter(fetcher) {
         );
         if (!res.ok) return { _tag: "Failure", error: { kind: "NETWORK", message: `HTTP ${res.status}` } };
         return { _tag: "Success", data: void 0 };
-      } catch (e2) {
-        return { _tag: "Failure", error: { kind: "UNKNOWN", message: e2 instanceof Error ? e2.message : void 0 } };
+      } catch (e3) {
+        return { _tag: "Failure", error: { kind: "UNKNOWN", message: e3 instanceof Error ? e3.message : void 0 } };
       }
     },
     // Uses PATCH /customer/v1/subscriptions/{id} — the dedicated /reschedule route does not exist.
@@ -1600,8 +2142,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async resume({ subscriptionId }) {
@@ -1613,8 +2155,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async pause({ subscriptionId }) {
@@ -1626,8 +2168,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async reactivate({ subscriptionId }) {
@@ -1639,8 +2181,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     async cancel({ subscriptionId, reason }) {
@@ -1656,8 +2198,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/plans exists yet.
@@ -1669,8 +2211,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     // Legacy endpoint — no /customer/v1 equivalent exists yet.
@@ -1682,8 +2224,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 (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/upsells exists yet.
@@ -1695,21 +2237,23 @@ function createApiSubscriptionAdapter(fetcher) {
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
         const data = await res.json();
         const products = data.map((p2) => {
-          var _a, _b, _c, _d, _e;
+          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,
             price: {
-              amount: String(((_e = (_d = p2.variants) == null ? void 0 : _d[0]) == null ? void 0 : _e.price) ?? 0),
-              currencyCode: p2.currencyCode ?? ""
-            }
+              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) ?? ""
+            },
+            // 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
           };
         });
         return { _tag: "Success", data: products };
-      } catch (e2) {
-        return { _tag: "Failure", error: e2 };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     },
     // Legacy endpoint — no /customer/v1/subscriptions/{id}/upsells POST exists yet.
@@ -1729,11 +2273,73 @@ 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 (e3) {
+        return { _tag: "Failure", error: e3 };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet.
+    async getLastOrder({ subscriptionId }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/last-order`
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        const data = await res.json();
+        if (!data) return { _tag: "Success", data: null };
+        return {
+          _tag: "Success",
+          data: { id: data.id, createdAt: data.createdAt }
+        };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
+      }
+    },
+    // Legacy endpoints, split by stage (see SubscriptionService.renewNow docs):
+    //   retry      → POST /customer/subscriptions/{id}/retry
+    //   renewalId  → POST /customer/renewals/{renewalId}/renew
+    //   default    → POST /customer/subscriptions/{id}/order-now
+    async renewNow({ subscriptionId, renewalId, retry }) {
+      try {
+        const url = retry ? `/customer/subscriptions/${subscriptionId}/retry` : renewalId ? `/customer/renewals/${renewalId}/renew` : `/customer/subscriptions/${subscriptionId}/order-now`;
+        const res = await fetcher(url, { method: "POST" });
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        const body = res.status === 204 ? null : await res.json();
+        return {
+          _tag: "Success",
+          data: {
+            nextActionUrl: (body == null ? void 0 : body.nextActionUrl) ?? void 0,
+            result: (body == null ? void 0 : body.result) ?? "success"
+          }
+        };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
+      }
+    },
+    // Legacy endpoint — POST /plan returns 204; re-fetch to return the updated subscription.
+    async changeFrequency({ subscriptionId, plan }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/plan`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ plan })
+          }
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        const refreshed = await adapter.getById(subscriptionId);
+        if (refreshed._tag === "Failure") return refreshed;
+        if (refreshed.data) return { _tag: "Success", data: refreshed.data };
+        return {
+          _tag: "Failure",
+          error: "Subscription not found after frequency change"
+        };
+      } catch (e3) {
+        return { _tag: "Failure", error: e3 };
       }
     }
   };
+  return adapter;
 }
 const SubscriptionServiceContext = createContext("services/subscription");
 function getCurrentSubscriptionId() {
@@ -1758,57 +2364,74 @@ function getCurrentSubscriptionId() {
 function createSubscriptionService(adapter) {
   const current = d(null);
   const hasPendingBilling = d(false);
-  const discountsChangedAtSignal = d(0);
-  const itemsChangedAtSignal = d(0);
-  async function refreshCurrent(subscriptionId) {
-    const result = await adapter.getById(subscriptionId);
-    if (result._tag === "Success" && result.data != null) {
-      current.value = result.data;
-    }
-  }
-  async function refreshAfterDiscountChange(subscriptionId) {
-    await refreshCurrent(subscriptionId);
-    discountsChangedAtSignal.value = discountsChangedAtSignal.value + 1;
+  const discountsChangedAt = d(0);
+  const itemsChangedAt = d(0);
+  const lastOrder = d(null);
+  async function refreshAfterDiscountChange() {
+    await reload();
+    discountsChangedAt.value = discountsChangedAt.value + 1;
   }
-  async function refreshAfterItemChange(subscriptionId) {
-    await refreshCurrent(subscriptionId);
-    itemsChangedAtSignal.value = itemsChangedAtSignal.value + 1;
+  async function refreshAfterItemChange() {
+    await reload();
+    itemsChangedAt.value = itemsChangedAt.value + 1;
   }
   function subscriptionIdFromCurrent() {
     var _a;
     return ((_a = current.value) == null ? void 0 : _a.id) ?? null;
   }
-  return {
+  async function reload() {
+    var _a, _b;
+    const id = (_a = current.value) == null ? void 0 : _a.id;
+    if (!id) return;
+    const [subResult, lastOrderResult] = await Promise.all([
+      adapter.getById(id),
+      adapter.getLastOrder({ subscriptionId: id })
+    ]);
+    if (((_b = current.value) == null ? void 0 : _b.id) !== id) return;
+    if (subResult._tag === "Success") current.value = subResult.data;
+    if (lastOrderResult._tag === "Success") lastOrder.value = lastOrderResult.data;
+  }
+  const service = {
     current,
     hasPendingBilling,
-    discountsChangedAt: discountsChangedAtSignal,
-    itemsChangedAt: itemsChangedAtSignal,
-    async search(options) {
-      const result = await adapter.search(options);
+    discountsChangedAt,
+    itemsChangedAt,
+    lastOrder,
+    search: adapter.search,
+    getById: adapter.getById,
+    getCurrentSubscriptionId,
+    addItem: async (subscriptionId, item) => {
+      const result = await adapter.addItem({ subscriptionId, item });
       if (result._tag === "Success") {
-        current.value = result.data.items[0] ?? null;
+        await refreshAfterItemChange();
       }
       return result;
     },
-    async getById(id) {
-      const result = await adapter.getById(id);
-      if (result._tag === "Success" && result.data) {
-        current.value = result.data;
+    removeItem: async (subscriptionId, itemId) => {
+      const result = await adapter.removeItem({ subscriptionId, itemId });
+      if (result._tag === "Success") {
+        await refreshAfterItemChange();
       }
       return result;
     },
-    getCurrentSubscriptionId,
-    addItem: async (subscriptionId, item) => {
-      const result = await adapter.addItem({ subscriptionId, item });
+    updateItem: async (subscriptionId, lineId, update) => {
+      const result = await adapter.updateItem({ subscriptionId, lineId, update });
       if (result._tag === "Success") {
-        await refreshAfterItemChange(subscriptionId);
+        await refreshAfterItemChange();
       }
       return result;
     },
-    removeItem: async (subscriptionId, itemId) => {
-      const result = await adapter.removeItem({ subscriptionId, itemId });
+    skipLineItem: async (subscriptionId, lineId, nextBillingDate) => {
+      const result = await adapter.skipLineItem({ subscriptionId, lineId, nextBillingDate });
+      if (result._tag === "Success") {
+        await refreshAfterItemChange();
+      }
+      return result;
+    },
+    updateBoxItems: async (subscriptionId, params) => {
+      const result = await adapter.updateBoxItems({ subscriptionId, ...params });
       if (result._tag === "Success") {
-        await refreshAfterItemChange(subscriptionId);
+        await refreshAfterItemChange();
       }
       return result;
     },
@@ -1822,7 +2445,7 @@ function createSubscriptionService(adapter) {
       }
       const result = await adapter.addDiscount({ subscriptionId: id, code });
       if (result._tag === "Success") {
-        await refreshAfterDiscountChange(id);
+        await refreshAfterDiscountChange();
       }
       return result;
     },
@@ -1839,7 +2462,7 @@ function createSubscriptionService(adapter) {
         discountId
       });
       if (result._tag === "Success") {
-        await refreshAfterDiscountChange(id);
+        await refreshAfterDiscountChange();
       }
       return result;
     },
@@ -1848,11 +2471,15 @@ function createSubscriptionService(adapter) {
     pause: (subscriptionId) => adapter.pause({ subscriptionId }),
     reactivate: (subscriptionId) => adapter.reactivate({ subscriptionId }),
     cancel: (subscriptionId, reason) => adapter.cancel({ subscriptionId, reason }),
+    renewNow: (params) => adapter.renewNow(params),
+    changeFrequency: (subscriptionId, plan) => adapter.changeFrequency({ subscriptionId, plan }),
+    reload,
     getAvailablePlans: (subscriptionId) => adapter.getAvailablePlans({ subscriptionId }),
     getDefaultSubscriptionId: () => adapter.getDefaultSubscriptionId(),
     getUpsellProducts: (params) => adapter.getUpsellProducts ? adapter.getUpsellProducts(params) : Promise.resolve({ _tag: "Success", data: [] }),
     addUpsellProduct: (params) => adapter.addUpsellProduct ? adapter.addUpsellProduct(params) : Promise.resolve({ _tag: "Success", data: void 0 })
   };
+  return service;
 }
 const DISCOUNT_REJECTION_REASONS = [
   "INVALID_CODE",
@@ -2120,9 +2747,9 @@ export {
   AuthenticationErrorReason,
   B as BlockWrapperEvent,
   C as ContextProvideEvent,
-  a as ContextRequestEvent,
+  e as ContextRequestEvent,
   CustomerServiceContext,
-  D as DEFAULT_GLOBAL_STYLES,
+  D2 as DEFAULT_GLOBAL_STYLES,
   DISCOUNT_REJECTION_REASONS,
   LoginServiceContext,
   OrdersServiceContext,
@@ -2130,24 +2757,28 @@ export {
   RouterServiceContext,
   SchedulesServiceContext,
   S as SelectedBlockContext,
+  SettingsServiceContext,
+  ShopServiceContext,
   u as Signal,
   StateContext,
   SubscriptionServiceContext,
   T as ThemeStateContext,
-  b as TranslationContext,
+  a as TranslationContext,
   W as WorkflowServiceContext,
-  e as attachEmptyTracking,
-  f as backfillInstanceDefaults,
+  _ as __recordDevtoolsInstance,
+  f as __recordDevtoolsPropSetter,
+  g as attachEmptyTracking,
+  h as backfillInstanceDefaults,
   w as computed,
   createApiCustomerAdapter,
   createApiLoginAdapter,
   createApiProductAdapter,
   createApiSchedulesAdapter,
   createApiSubscriptionAdapter,
-  g as createBlockInstance,
-  h as createBlockInstanceFromJSON,
-  i as createBlockInstanceFromObject,
-  j as createCeRenderer,
+  createBlockInstance,
+  i as createBlockInstanceFromJSON,
+  j as createBlockInstanceFromObject,
+  k as createCeRenderer,
   createContext,
   createCustomerService,
   createLoginService,
@@ -2163,33 +2794,38 @@ export {
   createProductService,
   createRouterService,
   createSchedulesService,
-  k as createSelectedBlock,
+  l as createSelectedBlock,
+  createSettingsService,
+  createShopService,
   createState,
   createSubscriptionService,
-  l as createThemeState,
-  m as createTranslationService,
-  n as createWorkflowApiAdapter,
-  o as createWorkflowService,
-  p as defineBlock,
-  q as defineBlockRuntime,
+  c as createThemeState,
+  b as createTranslationService,
+  d2 as createWorkflowApiAdapter,
+  e2 as createWorkflowService,
+  defineBlock,
+  m as defineBlockRuntime,
+  defineOverlayWrapper,
   E as effect,
-  s as getDefaultBlockForAction,
-  t as getDefinedBlocks,
-  v as hasDefaultBlockForAction,
-  x as hasRenderedContent,
-  y as indexOverrides,
-  z as injectContext,
-  A as isEditorPreview,
-  F as isStubDefinition,
+  g2 as getDefaultBlockForAction,
+  n as getDefinedBlocks,
+  o as getDevtoolsBlockState,
+  h2 as hasDefaultBlockForAction,
+  p as hasRenderedContent,
+  i2 as indexOverrides,
+  q as injectContext,
+  s as isEditorPreview,
+  t as isStubDefinition,
   loadBlockRegistry,
   loginService,
-  G as onRegisterBlock,
-  H as provideContext,
+  v as onRegisterBlock,
+  x as provideContext,
   registerBlock,
-  I as serializeBlocks,
+  y as serializeBlocks,
+  z as setDevtoolsBlockProp,
   d as signal,
-  J as subscribeContext,
-  K as untracked,
+  A as subscribeContext,
+  D as untracked,
   waitForDevBlocksUrl,
-  L as withWrapper
+  F as withWrapper
 };