@tokenoftrust/storefront-runner 2.4.86 → 2.4.88

package/apps/storefront/src/lib/{social → engagement/social}/golive.ts

@@ -25,8 +25,8 @@
  * so the first ship after this hook deploys does NOT retro-announce the tenant's
  * whole back-catalog.
  */
-import { isVisibleOnLive } from "../blog/collection.js";
-import type { BlogPost, PostStatus } from "../blog/types.js";
+import { isVisibleOnLive } from "../../content/blog/collection.js";
+import type { BlogPost, PostStatus } from "../../content/blog/types.js";
 import { notifyPostPublished } from "./notify.js";
 
 /**

package/apps/storefront/src/lib/{social → engagement/social}/notify.ts

@@ -1,4 +1,4 @@
-import type { BlogPost } from "../blog/types.js";
+import type { BlogPost } from "../../content/blog/types.js";
 
 /** Swallow-and-log a soft failure — logging itself must never throw (mirrors `webhooks/emit.ts`). */
 function logDiag(fields: Record<string, unknown>): void {

package/apps/storefront/src/lib/{social → engagement/social}/tokenStore.ts

@@ -18,8 +18,8 @@
  * root that wires the real bindings (mirrors `getDispatcher()`); it returns
  * `null` when either binding is absent so callers degrade rather than throw.
  */
-import type { Queryable } from "../d1/catalog.js";
-import { readD1, readEnv } from "../env.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
+import { readD1, readEnv } from "../../env.js";
 
 /** The decrypted token material we persist as one JSON blob under AES-GCM. */
 export interface SocialTokenPayload {
@@ -162,7 +162,7 @@ export async function rotateSocialToken(
  */
 export async function resolveSocialTokenStore(): Promise<SocialTokenStoreDeps | null> {
   const [{ fromD1 }, d1, rawKek] = await Promise.all([
-    import("../d1/catalog.js"),
+    import("../../catalog/d1/catalog.js"),
     readD1("STOREFRONT_APPS_DB"),
     readEnv("SOCIAL_TOKEN_KEK"),
   ]);

package/apps/storefront/src/lib/env.ts

@@ -12,7 +12,7 @@
  * all, so a request-time D1 handle is unobtainable there rather than merely
  * unused.
  */
-import type { D1Like } from "./d1/catalog.js";
+import type { D1Like } from "./catalog/d1/catalog.js";
 
 export * from "./runtimeEnv.js";
 

package/apps/storefront/src/lib/fulfillment/store.ts

@@ -5,7 +5,7 @@
  * `scrappy_shipment_audit` (append-only). The commerce migration has no batch
  * table; this store does not create one.
  */
-import type { D1Like } from "../d1/catalog.js";
+import type { D1Like } from "../catalog/d1/catalog.js";
 
 export interface SqlStatement {
   sql: string;

package/apps/storefront/src/lib/integrations/apps/appVersionStore.ts

@@ -37,7 +37,7 @@ import type {
   NormalizedContribution,
 } from "@tot/public-runtime";
 import { findForbiddenFields } from "@tot/public-runtime";
-import type { Queryable, QueryStatement } from "../../d1/catalog.js";
+import type { Queryable, QueryStatement } from "../../catalog/d1/catalog.js";
 
 /**
  * One managed-app version's COMPLETE restorable facet set — everything a rollback

package/apps/storefront/src/lib/integrations/apps/credentials.ts

@@ -19,7 +19,7 @@
  */
 import { sha256Hex } from "@tot/public-runtime";
 import type { CredentialPort, IssuedCredential } from "./registryService.js";
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 /** `IssuedCredential` plus the one-time plaintext secret — never stored, never re-returned. */
 export type IssuedCredentialSecret = IssuedCredential & { secret: string };

package/apps/storefront/src/lib/integrations/apps/orders/idempotency.ts

@@ -14,7 +14,7 @@
  * idempotent write route can reuse this.
  */
 import { sha256Hex } from "@tot/public-runtime";
-import type { Queryable } from "../../../d1/catalog.js";
+import type { Queryable } from "../../../catalog/d1/catalog.js";
 
 export type IdempotencyCheck =
   | { status: "proceed" }

package/apps/storefront/src/lib/integrations/apps/registryAccess.ts

@@ -16,7 +16,7 @@
 import { AppRegistryService } from "./registryService.js";
 import { D1CredentialStore } from "./credentials.js";
 import { DEFAULT_APP_GATEWAY_KID, APP_GATEWAY_KID_ENV } from "./gatewayKeys.js";
-import { fromD1 } from "../../d1/catalog.js";
+import { fromD1 } from "../../catalog/d1/catalog.js";
 import { readD1, readEnv } from "../../env.js";
 
 /**

package/apps/storefront/src/lib/integrations/apps/registryService.ts

@@ -70,7 +70,7 @@ import {
   type PlanIntegrationEntry,
   type PlanIntegrationConsent,
 } from "@tot/public-runtime";
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 export type AppInstallStatus = "active" | "suspended" | "uninstalled";
 

package/apps/storefront/src/lib/integrations/integration/managedInstallDeclarations.ts

@@ -11,7 +11,7 @@ import {
   type IntegrationDeclarationInput,
 } from "@tot/public-runtime";
 import { AppVersionStore } from "../apps/appVersionStore.js";
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 import { migrateLegacyDestinationIds, parseStageDestinationIds } from "./stageDestinationIds.js";
 
 const MANAGED_KIND = "managed-analytics-v1";

package/apps/storefront/src/lib/integrations/webhooks/deliveryEngine.ts

@@ -28,7 +28,7 @@ import { buildCloudEventEnvelope } from "./events.js";
 import { computeBackoffDelaySeconds, MAX_DELIVERY_ATTEMPTS, type AttemptOutcome } from "./dispatcher.js";
 import { validateWebhookEndpoint } from "./endpointGuard.js";
 import { COMMERCE_SCHEDULER } from "@tot/public-runtime";
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 /** Bounded per-attempt timeout — a hung receiver must not hold a dispatcher slot open indefinitely. */
 const DEFAULT_TIMEOUT_MS = 10_000;

package/apps/storefront/src/lib/integrations/webhooks/deliveryStore.ts

@@ -39,7 +39,7 @@
  * the delivery via `getOrThrowDelivery` before returning it, the same
  * read-after-write discipline `AppRegistryService` uses.
  */
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 /** Mirrors the `Delivery.topic` / CloudEvents channel enum in the D1/D2 contract. */
 export type WebhookTopic =

package/apps/storefront/src/lib/integrations/webhooks/emit.ts

@@ -50,7 +50,7 @@ import { TOPIC_REQUIRED_SCOPE } from "./events.js";
 import { getDispatcher } from "./getDispatcher.js";
 import { getRegistryService } from "../apps/registryAccess.js";
 import type { AppInstall } from "../apps/registryService.js";
-import { fromD1 } from "../../d1/catalog.js";
+import { fromD1 } from "../../catalog/d1/catalog.js";
 import { readD1 } from "../../env.js";
 
 /** Contract-scoped payload schema version — `asyncapi.yaml`'s `dataschemaversion` is `const: "1"` for V1. */

package/apps/storefront/src/lib/integrations/webhooks/getDispatcher.ts

@@ -22,7 +22,7 @@ import { AppRegistryService } from "../apps/registryService.js";
 import { D1CredentialStore } from "../apps/credentials.js";
 import { DEFAULT_APP_GATEWAY_KID, APP_GATEWAY_KID_ENV } from "../apps/gatewayKeys.js";
 import { json } from "../apps/registryAccess.js";
-import { fromD1, type Queryable } from "../../d1/catalog.js";
+import { fromD1, type Queryable } from "../../catalog/d1/catalog.js";
 import { readD1, readEnv, readQueue } from "../../env.js";
 import { COMMERCE_SCHEDULER } from "@tot/public-runtime";
 

package/apps/storefront/src/lib/{apps/orders → measurement/attribution}/attributionService.ts

@@ -22,8 +22,8 @@
  * no-op replay (returns the row already on record) while differing content
  * is a conflict — once recorded, an attributionId's content is immutable.
  */
-import { OrdersStore } from "./ordersStore.js";
-import type { Queryable } from "../../d1/catalog.js";
+import { OrdersStore } from "../../orders/data/ordersStore.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 export interface CommissionInput {
   amount?: number;

package/apps/storefront/src/lib/{apps/orders → measurement/attribution}/orderConversionD1.ts

@@ -15,7 +15,7 @@
  * Both run over the `Queryable` seam, so they serve real D1 in the Worker and an
  * in-memory `node:sqlite` in tests unchanged.
  */
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 import { readEnv } from "@/lib/env";
 import {
   computeOrderConversion,
@@ -26,7 +26,7 @@ import {
   type OrderConversionResult,
   type StoredAttribution,
 } from "@tot/public-runtime";
-import type { OrderForwardInput, OrderForwardResult } from "./orderForwardReceiver.js";
+import type { OrderForwardInput, OrderForwardResult } from "../../orders/data/orderForwardReceiver.js";
 
 /** The server-only correlation-signing key binding, distinct from the cart secret. */
 const CORRELATION_SECRET_ENV = "COMMERCE_CORRELATION_SECRET";

package/apps/storefront/src/lib/{apps/orders → measurement/attribution}/verifiedProviderMeasurement.ts

@@ -13,8 +13,8 @@ import {
   type VerifiedOrderTruthResolution,
 } from "../../../../../../packages/public-runtime/src/regulated-commerce/purchase-truth/contract.js";
 import type { RegulatedCommerceIntent } from "../../../../../../packages/public-runtime/src/regulated-commerce/events/contract.js";
-import type { Queryable } from "../../d1/catalog.js";
-import type { OrderForwardInput } from "./orderForwardReceiver.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
+import type { OrderForwardInput } from "../../orders/data/orderForwardReceiver.js";
 
 const FOXY_PROVIDER = "foxycart";
 const LIVE_ENVS = new Set(["live", "production"]);

package/apps/storefront/src/lib/{apps → measurement/consent}/consentConfigRead.ts

@@ -5,7 +5,7 @@
  * latest validated configuration and none of the authoring or history surface.
  */
 import type { TenantConsentConfig } from "@tot/public-runtime";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 interface CurrentConsentConfigRow {
   config: string;

package/apps/storefront/src/lib/{tracking → measurement/tracking}/d1Control.ts

@@ -21,8 +21,8 @@
  * stores use (`d1/catalog.ts`), so the insert code in `interactionStore.ts` is
  * transport-agnostic and unit-testable against an in-memory sqlite.
  */
-import { readEnv } from "../env.js";
-import type { Queryable, QueryStatement } from "../d1/catalog.js";
+import { readEnv } from "../../env.js";
+import type { Queryable, QueryStatement } from "../../catalog/d1/catalog.js";
 
 const CF_API_BASE = "https://api.cloudflare.com/client/v4";
 

package/apps/storefront/src/lib/{tracking → measurement/tracking}/interactionCollector.ts

@@ -9,7 +9,7 @@
  * e.g. `dt-consent-environment-gate`):
  *
  *   import { onInteraction } from "@tot/public-runtime";
- *   import { collectInteraction } from "@/lib/tracking/interactionCollector";
+ *   import { collectInteraction } from "@/lib/measurement/tracking/interactionCollector";
  *   onInteraction((interaction) => {
  *     if (consentAndEnvironmentAllow()) collectInteraction(interaction);
  *   });
@@ -38,7 +38,7 @@ export const MAX_QUEUE_SIZE = 20;
 /** The wire shape POSTed to `INTERACTION_BEACON_PATH` — `TotInteraction`'s five
  *  fields plus this module's own synthesized correlation fields. Must stay in
  *  lockstep with `INTERACTION_WIRE_ALLOWLIST`
- *  (`apps/storefront/src/lib/tracking/collectorAllowlist.ts`). */
+ *  (`apps/storefront/src/lib/measurement/tracking/collectorAllowlist.ts`). */
 export interface InteractionWireEvent {
   type: TotInteraction["type"];
   el: string;

package/apps/storefront/src/lib/{tracking → measurement/tracking}/pruneRollup.ts

@@ -44,8 +44,8 @@
  * transient D1 fault) is caught, logged, and recorded in that tenant's
  * outcome — it never aborts the rest of the batch.
  */
-import type { Queryable } from "../d1/catalog.js";
-import type { AnalyticsEngineLike } from "../activity/store.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
+import type { AnalyticsEngineLike } from "../../activity/store.js";
 import { fromD1Rest, type D1ControlConfig } from "./d1Control.js";
 import { aggregateInteractions, writeInteractionAnalytics } from "./interactionStore.js";
 import type { StampedInteractionEvent } from "./collectorIngest.js";

package/apps/storefront/src/lib/{tracking → measurement/tracking}/publishSafetyNet.ts

@@ -6,7 +6,7 @@
  * that proposes `data-tot-el` for git-tracked tenant content and writes it
  * back to source as a reviewable diff. This module exists for everything
  * that bypasses that review — AI-edit drafts materialized into
- * `dev-draft:` KV (see `DevDraftContentProvider`, lib/storyblok/provider.ts)
+ * `dev-draft:` KV (see `DevDraftContentProvider`, lib/content/storyblok/provider.ts)
  * and direct KV-published edits (`PublishedContentProvider`'s overlay over
  * the customization store). Content sourced from `LocalContentProvider`
  * (build-bundled from git-tracked `tenants/<id>/content/*`) is explicitly

package/apps/storefront/src/lib/{tracking → measurement/tracking}/tenantD1Registry.ts

@@ -31,8 +31,8 @@
  * never fail because storage is unconfigured.
  */
 import { sha256Hex } from "@tot/public-runtime";
-import { readEnv } from "../env.js";
-import type { Queryable } from "../d1/catalog.js";
+import { readEnv } from "../../env.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 import {
   ensureDatabase,
   fromD1Rest,

package/apps/storefront/src/lib/monitoring/manifest.ts

@@ -132,7 +132,7 @@ export const MONITORS: readonly Monitor[] = [
     category: "commerce",
     signal: {
       source:
-        "Signed add-to-cart + cross-origin checkout POST (F11; lib/checkoutCommerce.ts, checkoutCspAdditions)",
+        "Signed add-to-cart + cross-origin checkout POST (F11; lib/checkout/shared/checkoutCommerce.ts, checkoutCspAdditions)",
       observe:
         "Worker logs on the signed add-to-cart path + checkout-host success beacon; alert on failure ratio",
     },

package/apps/storefront/src/lib/{apps/orders → orders/data}/orderForwardReceiver.ts

@@ -35,7 +35,7 @@
 import { OrdersStore, ScrappyOrderLedger, type OrderLineItem, type OrderStatus, type Order } from "./ordersStore.js";
 import { emitWebhookEvent } from "../../integrations/webhooks/emit.js";
 import type { WebhookTopic } from "../../integrations/webhooks/deliveryStore.js";
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 import {
   createLocalJWKSet,
   decodeJwt,

package/apps/storefront/src/lib/{apps/orders → orders/data}/orderMapper.ts

@@ -9,7 +9,7 @@
  * customer identity is always the per-(tenant, install) `customerHash`.
  */
 import { customerHash } from "../../integrations/apps/orders/customerHash.js";
-import type { FoxyOrder, FoxyOrderLineItem } from "./foxyOrderClient.js";
+import type { FoxyOrder, FoxyOrderLineItem } from "../providers/foxyOrderClient.js";
 import {
   COMPLIANCE_STATES,
   FULFILLMENT_STATES,

package/apps/storefront/src/lib/{apps/orders → orders/data}/ordersStore.ts

@@ -10,7 +10,7 @@
  * `AppRegistryService` uses, so this runs unchanged against real D1 in the
  * Worker and an in-memory `node:sqlite` in tests.
  */
-import type { Queryable, QueryStatement } from "../../d1/catalog.js";
+import type { Queryable, QueryStatement } from "../../catalog/d1/catalog.js";
 import {
   canonicalJson,
   idempotencyKey,

package/apps/storefront/src/lib/{admin/services/mock → orders/fixtures}/orders.ts

@@ -1,5 +1,5 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../seed";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../admin/seed";
 import type {
   OrderDetail,
   OrderEvidenceEvent,
@@ -7,9 +7,9 @@ import type {
   OrderQueueSummary,
   OrderRow,
   OrdersViewModel,
-} from "../../viewmodels/orders";
-import { tenantProfile } from "./tenants";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
+} from "../admin/viewmodels/orders";
+import { tenantProfile } from "../../admin/services/mock/tenants";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 
 // Must stay index-aligned with customers.ts's NAMES: an order's customerId is
 // derived from the picked name's position here, and customers.ts assigns each

package/apps/storefront/src/lib/previewReload.ts

@@ -108,7 +108,7 @@ export function buildPreviewReloadScript(opts: {
  */
 export function buildCspViolationBannerScript(basePath = ""): string {
   // A style-guide surface is `/_style-guide/…` or `/style-guide/…`, under the tenant
-  // prefix when path-routed (lib/styleGuidePaths.ts).
+  // prefix when path-routed (lib/content/shared/styleGuidePaths.ts).
   return `(() => {
   if (window.__totCspBanner) return; window.__totCspBanner = true;
   const seen = new Set();

package/apps/storefront/src/lib/publication/contentProvider.ts

@@ -2,13 +2,13 @@ import type {
   OpenPublicationArtifactV1,
   PublicationRouteRenderPlanV1,
 } from "@tot/public-runtime";
-import { hasHomeContentShape, type EditorialPage, type HomeContent } from "@/lib/storyblok/content-model.js";
-import type { ChromeConfig } from "@/lib/chrome/model.js";
-import { parseChromeConfig } from "@/lib/chrome/parseConfig.js";
-import { parseChromeAssignments } from "@/lib/chrome/model.js";
-import { renderRawChrome } from "@/lib/rawChrome.js";
-import { stampTrackingIdsAtPublish } from "@/lib/tracking/publishSafetyNet.js";
-import type { ContentProvider } from "@/lib/storyblok/provider.js";
+import { hasHomeContentShape, type EditorialPage, type HomeContent } from "@/lib/content/storyblok/content-model.js";
+import type { ChromeConfig } from "@/lib/content/chrome/model.js";
+import { parseChromeConfig } from "@/lib/content/chrome/parseConfig.js";
+import { parseChromeAssignments } from "@/lib/content/chrome/model.js";
+import { renderRawChrome } from "@/lib/content/shared/rawChrome.js";
+import { stampTrackingIdsAtPublish } from "@/lib/measurement/tracking/publishSafetyNet.js";
+import type { ContentProvider } from "@/lib/content/storyblok/provider.js";
 
 const EMPTY_CHROME_CONFIG: ChromeConfig = {
   header: { variant: "primary", brand: { label: "" }, nav: [] },

package/apps/storefront/src/lib/publication/mountedDiscovery.ts

@@ -29,7 +29,7 @@ import {
   type PublicationDiscoveryEntryKindV1,
 } from "@tot/public-runtime";
 import { publicationRecoveryActiveV1, publicationRecoveryKeyV1 } from "@tot/public-runtime/publication-recovery";
-import { rawPageCanonicalUrl } from "../rawMarketingHtml.js";
+import { rawPageCanonicalUrl } from "../content/shared/rawMarketingHtml.js";
 
 export type DiscoverySurfaceV1 = "sitemap" | "feeds" | "publicSearch" | "llms";
 

package/apps/storefront/src/lib/publication/rootDiscovery.ts

@@ -5,10 +5,10 @@
  * Paths are spelled exactly as the root sitemap lists them.
  */
 import type { APIContext } from "astro";
-import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
-import { listBuildPosts } from "@/lib/the-build/provider.js";
-import { isIndexableHtml, rawPageCanonicalUrl } from "@/lib/rawMarketingHtml.js";
-import { collectionPathsV1, blogPathOptsV1 } from "@/lib/blog/collectionPaths.js";
+import { getBlogSettings, listBlogPosts } from "@/lib/content/blog/provider.js";
+import { listBuildPosts } from "@/lib/content/the-build/provider.js";
+import { isIndexableHtml, rawPageCanonicalUrl } from "@/lib/content/shared/rawMarketingHtml.js";
+import { collectionPathsV1, blogPathOptsV1 } from "@/lib/content/blog/collectionPaths.js";
 
 export interface RootDiscoveryDocumentV1 {
   kind: "home" | "page" | "post";

package/apps/storefront/src/lib/{admin/services/mock → subscriptions/fixtures}/subscriptions.ts

@@ -7,16 +7,16 @@ import {
   isSubscriptionFrequency,
   purchaseOptionPrice,
 } from "@tot/public-runtime";
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 import {
   MOCK_ANCHOR_ISO,
   offsetIso,
   randomInt,
   seededRandom,
-} from "../../seed";
-import type { CustomerRow } from "../../../customers/admin/viewmodels/customers";
-import type { ProductDetail, ProductRow } from "../../viewmodels/products";
+} from "../../admin/seed";
+import type { CustomerRow } from "../../customers/admin/viewmodels/customers";
+import type { ProductDetail, ProductRow } from "../../catalog/admin/viewmodels/products";
 import type {
   SubscriptionAttentionRow,
   SubscriptionCheckoutField,
@@ -27,9 +27,9 @@ import type {
   SubscriptionRenewalEvent,
   SubscriptionSubscriberRow,
   SubscriptionsViewModel,
-} from "../../viewmodels/subscriptions";
-import { getCustomersViewModel } from "../../../customers/fixtures/customers";
-import { getProductsViewModel } from "./products";
+} from "../admin/viewmodels/subscriptions";
+import { getCustomersViewModel } from "../../customers/fixtures/customers";
+import { getProductsViewModel } from "../../catalog/fixtures/products";
 
 export interface SubscriptionProductSource {
   productId: string;

package/apps/storefront/src/lib/url.ts

@@ -8,7 +8,7 @@
  *   &opt.Size=M&tag=sale&priceMin=50&priceMax=200&q=wool
  */
 import type { ListProductsQuery } from "@tot/public-runtime";
-import type { PriceBucket } from "./priceBuckets.js";
+import type { PriceBucket } from "./catalog/shared/priceBuckets.js";
 
 export function parseQuery(url: URL): ListProductsQuery {
   const sp = url.searchParams;

package/apps/storefront/src/middleware/controlPlane.ts

@@ -8,8 +8,8 @@
  */
 import type { APIContext, MiddlewareNext } from "astro";
 import { readEnv, readD1, readKv } from "@/lib/env";
-import { fromD1, type D1Like } from "@/lib/d1/catalog";
-import { readCurrentTenantConsentConfig } from "@/lib/apps/consentConfigRead";
+import { fromD1, type D1Like } from "@/lib/catalog/d1/catalog";
+import { readCurrentTenantConsentConfig } from "@/lib/measurement/consent/consentConfigRead";
 import { loadActiveManagedInstallDeclarations } from "@/lib/integrations/integration/managedInstallDeclarations";
 import { buildTenantConsentBroker, verifyPreviewToken } from "@tot/public-runtime";
 import { tenantIsDeclaredPublic } from "@/config/tenants";

package/apps/storefront/src/middleware/index.ts

@@ -29,7 +29,7 @@ import { compileRouteTierIndexV1, resolvePublicationRoutePlanV1, type RouteTierI
 import type { PublicationArtifactBucketV1, TenantConfig } from "@tot/public-runtime";
 import { DEV_DRAFT_COOKIE } from "@/lib/dev/devDraft";
 import { applySecurityHeaders } from "@/lib/securityHeaders";
-import { visitorRegionFor, withVisitorRegionCookie } from "@/lib/visitorRegionCookie";
+import { visitorRegionFor, withVisitorRegionCookie } from "@/lib/compliance/shared/visitorRegionCookie";
 import { tryServeStaticBundle } from "./staticBundle.js";
 import { resolveCandidateContentPin } from "./candidatePin.js";
 import { parseGateMode } from "@/lib/auth/loginGate";
@@ -69,7 +69,7 @@ function routeTierIndexFor(tenant: TenantConfig): RouteTierIndexV1 {
 }
 
 /**
- * Every HTML document leaves with the visitor's region class (lib/visitorRegionCookie),
+ * Every HTML document leaves with the visitor's region class (lib/compliance/shared/visitorRegionCookie),
  * appended after the branch has read or written any edge cache.
  */
 export const onRequest = defineMiddleware(async (context, next) => {

package/apps/storefront/src/middleware/renderChain.ts

@@ -11,12 +11,12 @@
 import type { APIContext, MiddlewareNext } from "astro";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme, themeToCssVars } from "@/themes/schema";
-import { createToTClient } from "@/lib/tot/ToTClient";
+import { createToTClient } from "@/lib/catalog/tot/ToTClient";
 import { readEnv, readR2 } from "@/lib/runtimeEnv";
 import { tryServeStaticBundle } from "./staticBundle.js";
 import { isPlatformPublicDiscoveryPath } from "./routeBranch.js";
 import { resolveCandidateContentPin, type CandidateContentPin } from "./candidatePin.js";
-import { createContentProvider, DevDraftContentProvider } from "@/lib/storyblok/provider";
+import { createContentProvider, DevDraftContentProvider } from "@/lib/content/storyblok/provider";
 import { bindPublicationSpaceContentProviderV1 } from "@/lib/publication/contentProvider.js";
 import { resolvePublicationRuntimeSourceV1 } from "@/lib/publication/runtimeSource.js";
 import { DEV_DRAFT_COOKIE, devDraftKey, verifyDevDraftToken } from "@/lib/dev/devDraft";
@@ -85,7 +85,7 @@ import {
 } from "@tot/public-runtime";
 import { publicationContentRedirectLocationV1 } from "@tot/public-runtime/publication-content-redirects";
 import { loadTenantIntegrationDeclarations } from "@/lib/integrations/integration/tenantDeclarations";
-import { resolveTenantCommerce } from "@/lib/checkoutCommerce";
+import { resolveTenantCommerce } from "@/lib/checkout/shared/checkoutCommerce";
 import {
   requestBrowserEnvironment,
   previewBrowserEnvironment,

package/apps/storefront/src/pages/404.astro

@@ -12,7 +12,7 @@
 export const prerender = false;
 
 import Layout from "@/layouts/Layout.astro";
-import CollectionCard from "@/components/CollectionCard.astro";
+import CollectionCard from "@/components/catalog/storefront/CollectionCard.astro";
 import { withBase } from "@/lib/basePath";
 
 const { tenant, tot, basePath, features } = Astro.locals;

package/apps/storefront/src/pages/[...slug].astro

@@ -6,19 +6,19 @@
  * prefixes so a stray slug can never shadow a real route.
  */
 import Layout from "@/layouts/Layout.astro";
-import Breadcrumbs from "@/components/Breadcrumbs.astro";
-import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import ProseSections from "@/components/content/ProseSections.astro";
-import ProseToc from "@/components/content/ProseToc.astro";
-import { breadcrumbLd } from "@/lib/jsonld";
-import { truncate } from "@/lib/format";
-import { faqFromHtml, faqFromSections } from "@/lib/seo/faqItems";
-import { rawHtmlPolicy, rawHtmlResponse, rawPageCanonicalUrl } from "@/lib/rawMarketingHtml";
+import Breadcrumbs from "@/components/content/storefront/Breadcrumbs.astro";
+import { homeCrumbLabel, siteTrail } from "@/lib/content/shared/breadcrumbs";
+import ProseSections from "@/components/content/storefront/content/ProseSections.astro";
+import ProseToc from "@/components/content/storefront/content/ProseToc.astro";
+import { breadcrumbLd } from "@/lib/content/shared/jsonld";
+import { truncate } from "@/lib/content/shared/format";
+import { faqFromHtml, faqFromSections } from "@/lib/content/seo/faqItems";
+import { rawHtmlPolicy, rawHtmlResponse, rawPageCanonicalUrl } from "@/lib/content/shared/rawMarketingHtml";
 import { renderRawComplianceTop, renderRawComplianceBottom } from "@/lib/compliance/rawComplianceNotices";
-import { styleGuideAliasRewrite } from "@/lib/styleGuidePaths";
-import { getBlogSettings } from "@/lib/blog/provider.js";
-import { loadBlogPostViewV1, type BlogPostViewPropsV1 } from "@/lib/blog/postView.js";
-import BlogPostArticle from "@/components/blog/BlogPostArticle.astro";
+import { styleGuideAliasRewrite } from "@/lib/content/shared/styleGuidePaths";
+import { getBlogSettings } from "@/lib/content/blog/provider.js";
+import { loadBlogPostViewV1, type BlogPostViewPropsV1 } from "@/lib/content/blog/postView.js";
+import BlogPostArticle from "@/components/content/storefront/blog/BlogPostArticle.astro";
 
 const { tenant, canonicalBase, content, basePath, apiBasePath, capabilities, features } =
   Astro.locals;
@@ -45,7 +45,7 @@ if (styleGuideTarget !== undefined) {
   return Astro.rewrite(styleGuideTarget);
 }
 
-// A tenant that declares `BlogSettings.postsAtRoot` (see lib/blog/types.ts) serves its
+// A tenant that declares `BlogSettings.postsAtRoot` (see lib/content/blog/types.ts) serves its
 // individual posts at the site root — a single-segment slug tries the blog collection
 // before falling through to a raw marketing page or a CMS page. Multi-segment slugs are
 // never posts, so this never shadows a nested marketing/CMS path.

package/apps/storefront/src/pages/api/activity.ts

@@ -29,7 +29,7 @@
  */
 import type { APIContext } from "astro";
 import { readD1, readEnv, readAnalytics, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { verifyIngestAuth } from "@/lib/activity/ingestAuth";
 import { ingestEvents, type IngestRejection } from "@/lib/activity/ingest";
 import { fanOutActivity, type AnalyticsEngineLike, type ActivitySinks } from "@/lib/activity/store";

package/apps/storefront/src/pages/api/admin/activity-alerts.ts

@@ -27,7 +27,7 @@
 import type { APIContext } from "astro";
 import { requireAdminApiEntry } from "@/lib/auth/adminApiGuard";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { checkActivityAlerts } from "@/lib/activity/alerts";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/admin/interaction-insights.ts

@@ -30,10 +30,10 @@
 import type { APIContext } from "astro";
 import { requireAdminApiEntry } from "@/lib/auth/adminApiGuard";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
-import { resolveTenantStore, trackingNamePrefix } from "@/lib/tracking/tenantD1Registry";
-import { readD1Control } from "@/lib/tracking/d1Control";
-import { readTenantInteractionInsights } from "@/lib/tracking/tenantReadAccess";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
+import { resolveTenantStore, trackingNamePrefix } from "@/lib/measurement/tracking/tenantD1Registry";
+import { readD1Control } from "@/lib/measurement/tracking/d1Control";
+import { readTenantInteractionInsights } from "@/lib/measurement/tracking/tenantReadAccess";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/admin/orders/[id].ts

@@ -15,8 +15,8 @@ import {
   orderApiBaseUrl,
   OrderApiError,
   projectCheckoutOrder,
-} from "@/lib/admin/orderClient";
-import { assessCheckoutOrder } from "@/lib/admin/services/orders";
+} from "@/lib/orders/admin/orderClient";
+import { assessCheckoutOrder } from "@/lib/orders/admin/services/orders";
 import { commerceStageForEnv } from "@/lib/fulfillment/fulfillmentService";
 
 export const prerender = false;