@tokenoftrust/storefront-runner 2.4.85 → 2.4.87

package/apps/storefront/env.d.ts

@@ -15,7 +15,7 @@ import type {
   ResolvedRouteTierV1,
   PublicationRoutePlanV1,
 } from "@tot/public-runtime";
-import type { ToTClient } from "@/lib/tot/ToTClient";
+import type { ToTClient } from "@/lib/catalog/tot/ToTClient";
 import type { ContentProvider } from "@/lib/storyblok/provider";
 
 /**

package/apps/storefront/package.json

@@ -14,7 +14,7 @@
     "preview": "wrangler dev",
     "typecheck": "astro check && tsc --noEmit",
     "astro": "astro",
-    "test": "NODE_OPTIONS=--experimental-sqlite vitest run --exclude src/lib/apps/v84CleanCloneReplay.test.ts --exclude src/lib/apps/v84NonportableRouteDogfood.test.ts --exclude src/lib/apps/v84CloneLifecycleEvidence.test.ts && NODE_OPTIONS=--experimental-sqlite vitest run src/lib/apps/v84CleanCloneReplay.test.ts src/lib/apps/v84NonportableRouteDogfood.test.ts src/lib/apps/v84CloneLifecycleEvidence.test.ts --fileParallelism=false && pnpm run test:pipeline && pnpm run test:pipeline-faults"
+    "test": "NODE_OPTIONS=--experimental-sqlite vitest run --exclude src/lib/integrations/apps/v84CleanCloneReplay.test.ts --exclude src/lib/integrations/apps/v84NonportableRouteDogfood.test.ts --exclude src/lib/integrations/apps/v84CloneLifecycleEvidence.test.ts && NODE_OPTIONS=--experimental-sqlite vitest run src/lib/integrations/apps/v84CleanCloneReplay.test.ts src/lib/integrations/apps/v84NonportableRouteDogfood.test.ts src/lib/integrations/apps/v84CloneLifecycleEvidence.test.ts --fileParallelism=false && pnpm run test:pipeline && pnpm run test:pipeline-faults"
   },
   "dependencies": {
     "@astrojs/cloudflare": "^14.0.1",

package/apps/storefront/src/components/{ProductCard.astro → catalog/storefront/ProductCard.astro}

@@ -8,12 +8,12 @@
  */
 import type { CatalogProduct } from "@tot/public-runtime";
 import { discountPercent, truncate } from "@/lib/format";
-import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
+import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/catalog/tot/query";
 import { colorOptionValues, resolveSwatch, isLightFill } from "@/lib/colors";
 import Img from "@/components/assets/storefront/Img.astro";
 import Badge from "@/components/Badge.astro";
-import PriceDisplay from "@/components/commerce/PriceDisplay.astro";
-import RatingStars from "@/components/commerce/RatingStars.astro";
+import PriceDisplay from "@/components/catalog/storefront/commerce/PriceDisplay.astro";
+import RatingStars from "@/components/catalog/storefront/commerce/RatingStars.astro";
 import { withBase } from "@/lib/basePath";
 import { pageUrlForm } from "@/lib/seo/urlForm";
 

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/PriceDisplay.astro

@@ -11,7 +11,7 @@
  */
 import type { CatalogProduct } from "@tot/public-runtime";
 import { formatPrice, discountPercent } from "@/lib/format";
-import { fromPrice, isOnSale } from "@/lib/tot/query";
+import { fromPrice, isOnSale } from "@/lib/catalog/tot/query";
 import Badge from "@/components/Badge.astro";
 
 interface Props {

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/ProductCarousel.astro

@@ -15,7 +15,7 @@
  */
 import type { CatalogProduct } from "@tot/public-runtime";
 import Section from "@/components/Section.astro";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import {
   resolveSectionSource,
   DEFAULT_SECTION_LIMIT,

package/apps/storefront/src/components/{commerce → catalog/storefront/commerce}/ProductGrid.astro

@@ -10,7 +10,7 @@
  */
 import type { CatalogProduct } from "@tot/public-runtime";
 import Section from "@/components/Section.astro";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import EmptyState from "@/components/EmptyState.astro";
 import {
   resolveSectionSource,

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/SearchTypeahead.tsx

@@ -11,7 +11,7 @@
  * open a product, Escape to dismiss. Fetch failures degrade to "no dropdown".
  */
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";
-import type { TypeaheadDoc } from "@/lib/search";
+import type { TypeaheadDoc } from "@/lib/catalog/search/index";
 import { formatPrice } from "@/lib/format";
 import { placeholderDataUri, isUsableImageUrl } from "@/lib/placeholder";
 import { withClientBase } from "@/lib/basePath";

package/apps/storefront/src/components/{islands → catalog/storefront/islands}/VariantSelector.tsx

@@ -27,7 +27,7 @@ import type {
 } from "@tot/public-runtime";
 import { priceForPurchaseOption } from "@tot/public-runtime";
 import { formatPrice } from "@/lib/format";
-import { useCheckoutHandoffCorrelation } from "@/components/islands/useCheckoutHandoffCorrelation";
+import { useCheckoutHandoffCorrelation } from "@/lib/checkout/browser/useCheckoutHandoffCorrelation";
 
 export type PublicSelectorVariant = Pick<CatalogVariant,
   "id" | "sku" | "price" | "compare_at_price" | "option_values" | "inventory" | "image_id">;

package/apps/storefront/src/components/{plp → catalog/storefront/plp}/FacetSidebar.astro

@@ -8,7 +8,7 @@
  */
 import type { Facet, ListProductsQuery } from "@tot/public-runtime";
 import { toggleFacet, buildQueryString, isPriceBucketActive, togglePriceBucket } from "@/lib/url";
-import { PRICE_BUCKETS, bucketByKey } from "@/lib/priceBuckets";
+import { PRICE_BUCKETS, bucketByKey } from "@/lib/catalog/shared/priceBuckets";
 
 interface Props {
   facets: Facet[];

package/apps/storefront/src/components/chrome/SiteHeader.astro

@@ -16,7 +16,7 @@
 import type { ChromeNavItem, ChromeLogo, ChromeCta, HeaderVariant } from "@/lib/chrome/model";
 import MegaMenu from "@/components/chrome/MegaMenu.astro";
 import NavDropdown from "@/components/chrome/NavDropdown.astro";
-import SearchTypeahead from "@/components/islands/SearchTypeahead.tsx";
+import SearchTypeahead from "@/components/catalog/storefront/islands/SearchTypeahead.tsx";
 import MobileNav from "@/components/islands/MobileNav.tsx";
 import { withBase } from "@/lib/basePath";
 import { ctaIdentityAttr } from "@/lib/chrome/ctaIdentity";

package/apps/storefront/src/components/compliance/{NicotineWarning.astro → storefront/compliance/NicotineWarning.astro}

@@ -10,7 +10,7 @@
  * owner-reviewed custom style), never below the conspicuity floor and never
  * hideable. The markup is nicotineWarningHtml's, shared with the raw-HTML serve path.
  */
-import { nicotineWarningHtml } from "../../../../../packages/cli/src/declared-config.mjs";
+import { nicotineWarningHtml } from "../../../../../../../packages/cli/src/declared-config.mjs";
 
 interface Props {
   variant?: "bar" | "block";

package/apps/storefront/src/components/{islands → compliance/storefront/islands}/CheckoutComplianceGate.tsx

@@ -35,7 +35,7 @@ import {
   writeStoredRef,
   type PreflightResponse,
   type VerificationPhase,
-} from "./checkoutVerificationFlow.js";
+} from "../../../../lib/compliance/browser/checkoutVerificationFlow.js";
 
 interface Props {
   /** Absolute (base-path-aware) URL of the preflight endpoint. */

package/apps/storefront/src/components/{apps → integrations/storefront/apps}/AppWidgetFrame.astro

@@ -10,7 +10,7 @@
  * `<iframe>` for the parent-side `mountWidgetPostMessageBridge()`
  * (`@tot/public-runtime`) to scan for.
  */
-import { buildAppWidgetFrameAttrs, type AppWidgetFrameProps } from "@/lib/apps/widgets/frameProps.js";
+import { buildAppWidgetFrameAttrs, type AppWidgetFrameProps } from "@/lib/integrations/apps/widgets/frameProps.js";
 
 type Props = AppWidgetFrameProps;
 

package/apps/storefront/src/components/{subscription → subscriptions/storefront/subscription}/HowItWorksSteps.astro

@@ -10,7 +10,7 @@
  * (--color-…, --radius-…); no hardcoded brand color.
  * data-widget="subscription-how-it-works" is the audit/test hook.
  */
-import type { SubscriptionStep } from "@/lib/subscription/model";
+import type { SubscriptionStep } from "@/lib/subscriptions/subscription/model";
 
 interface Props {
   steps: SubscriptionStep[];

package/apps/storefront/src/components/{subscription → subscriptions/storefront/subscription}/ManageSubscriptionEntry.astro

@@ -9,7 +9,7 @@
  * Token-styled only; data-widget="subscription-manage-entry" is the
  * audit/test hook.
  */
-import type { SubscriptionManageEntry } from "@/lib/subscription/model";
+import type { SubscriptionManageEntry } from "@/lib/subscriptions/subscription/model";
 
 interface Props {
   entries: SubscriptionManageEntry[];

package/apps/storefront/src/components/{subscription → subscriptions/storefront/subscription}/SavingsExplainer.astro

@@ -16,8 +16,8 @@
  * Token-styled only; data-widget="subscription-savings-explainer" is the
  * audit/test hook.
  */
-import type { SubscriptionFigure } from "@/lib/subscription/model";
-import { isIllustrative } from "@/lib/subscription/model";
+import type { SubscriptionFigure } from "@/lib/subscriptions/subscription/model";
+import { isIllustrative } from "@/lib/subscriptions/subscription/model";
 import IllustrativeLabel from "@/components/membership/storefront/membership/IllustrativeLabel.astro";
 
 interface Props {

package/apps/storefront/src/config/devTenantSeed.ts

@@ -28,7 +28,7 @@
 import type { DeepPartial, TenantConfig, ThemeTokens } from "@tot/public-runtime";
 import { SHARED_DEMO_CHECKOUT } from "@tot/public-runtime";
 import { rootPublicationSpaceConfig } from "./publicationSpaceConfig";
-import { loadTenantAnalyticsDeclarations } from "@/lib/integration/tenantAnalyticsDeclarations";
+import { loadTenantAnalyticsDeclarations } from "@/lib/integrations/integration/tenantAnalyticsDeclarations";
 
 /** Per-dir overrides the resolver derives from disk before synthesis. */
 export interface DevTenantHints {

package/apps/storefront/src/layouts/Layout.astro

@@ -12,15 +12,15 @@ import Seo from "@/components/Seo.astro";
 import AnnouncementBar from "@/components/chrome/AnnouncementBar.astro";
 import SiteHeader from "@/components/chrome/SiteHeader.astro";
 import SiteFooter from "@/components/chrome/SiteFooter.astro";
-import QuickView from "@/components/islands/QuickView.tsx";
-import CheckoutLoader from "@/components/commerce/CheckoutLoader.astro";
-import CartDrawerStyles from "@/components/commerce/CartDrawerStyles.astro";
-import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
-import PactActNotice from "@/components/compliance/PactActNotice.astro";
-import ShippingRestrictionNotice from "@/components/compliance/ShippingRestrictionNotice.astro";
-import ExciseTaxNotice from "@/components/compliance/ExciseTaxNotice.astro";
+import QuickView from "@/components/catalog/storefront/islands/QuickView.tsx";
+import CheckoutLoader from "@/components/checkout/storefront/commerce/CheckoutLoader.astro";
+import CartDrawerStyles from "@/components/checkout/storefront/commerce/CartDrawerStyles.astro";
+import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
+import PactActNotice from "@/components/compliance/storefront/compliance/PactActNotice.astro";
+import ShippingRestrictionNotice from "@/components/compliance/storefront/compliance/ShippingRestrictionNotice.astro";
+import ExciseTaxNotice from "@/components/compliance/storefront/compliance/ExciseTaxNotice.astro";
 import { EXCISE_TAX_DISCLOSURE_TEXT } from "@/lib/compliance/rawComplianceNotices";
-import IsolatedAgeGate from "@/components/islands/IsolatedAgeGate.tsx";
+import IsolatedAgeGate from "@/components/compliance/storefront/islands/IsolatedAgeGate.tsx";
 import AuthBadge from "@/components/auth/AuthBadge.astro";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme } from "@/themes/schema";
@@ -38,9 +38,9 @@ import { bindManagedCartAnchors, managedCartHref } from "@/lib/chrome/managedCar
 import type { HeaderVariant, FooterVariant } from "@/lib/chrome/model";
 import { renderIntegrationPhases, INTERACTION_TRACKING_BOOT_JS } from "@tot/public-runtime";
 import { readViewerSession } from "@/lib/auth/route";
-import AppWidgetFrame from "@/components/apps/AppWidgetFrame.astro";
-import { getRegistryService } from "@/lib/apps/registryAccess.js";
-import { renderWidgetSlot } from "@/lib/apps/widgets/renderSlot.js";
+import AppWidgetFrame from "@/components/integrations/storefront/apps/AppWidgetFrame.astro";
+import { getRegistryService } from "@/lib/integrations/apps/registryAccess.js";
+import { renderWidgetSlot } from "@/lib/integrations/apps/widgets/renderSlot.js";
 
 interface Props {
   title: string;

package/apps/storefront/src/lib/activity/alerts.ts

@@ -59,7 +59,7 @@ import {
   type ActivityTimelineRow,
   type DeploySkewSummary,
 } from "./query.js";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 
 /** Severity, mirroring `rumAlert.AlertSeverity` / `manifest.Severity`. */
 export type AlertSeverity = "page" | "critical" | "warning" | "info";

package/apps/storefront/src/lib/activity/candidateSubmitLease.ts

@@ -1,4 +1,4 @@
-import type { D1Like } from "@/lib/d1/catalog";
+import type { D1Like } from "@/lib/catalog/d1/catalog";
 
 const DIAGNOSTIC_STUCK_AFTER_MS = 5 * 60 * 1000;
 

package/apps/storefront/src/lib/activity/fixtures/evidence.ts

@@ -2,8 +2,8 @@ import type { AdminTenantEnvelope } from "../../admin/envelope";
 import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 import type { EvidenceReference } from "../evidence/evidenceReference";
 import { getCustomersViewModel } from "../../customers/fixtures/customers";
-import { getOrdersViewModel } from "../../admin/services/mock/orders";
-import { getProductsViewModel } from "../../admin/services/mock/products";
+import { getOrdersViewModel } from "../../orders/fixtures/orders";
+import { getProductsViewModel } from "../../catalog/fixtures/products";
 
 /**
  * Deterministic evidence graph, built by connecting the domains already

package/apps/storefront/src/lib/activity/query.ts

@@ -5,7 +5,7 @@
  * tenant's lifecycle activity newest-first for the `/admin` ops timeline UI
  * ("who shipped/rejected what, when, why — and what happened to my change/
  * deploy"). PURE over the injected `Queryable` seam (D1 in the Worker, an
- * in-memory `node:sqlite` in tests), same posture as `lib/d1/catalog.ts` and the
+ * in-memory `node:sqlite` in tests), same posture as `lib/catalog/d1/catalog.ts` and the
  * write path (`store.ts`).
  *
  * TENANT ISOLATION IS THE INVARIANT. `tenantId` is REQUIRED on every query and is
@@ -38,7 +38,7 @@ import {
   type ActivitySource,
   type ActivityStatus,
 } from "@tot/public-runtime";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 import { workerCommitShort, UNKNOWN_COMMIT } from "./workerCommit.js";
 
 /** Hard cap on rows returned by one query — the ops timeline is paged/bounded,

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

@@ -19,7 +19,7 @@
  * critical path via `runAfterResponse` at the call site.
  */
 import { getActionSpec, type ActivityEvent, type ActivitySink } from "@tot/public-runtime";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 
 /** The slice of Cloudflare's Analytics Engine dataset binding we use. */
 export interface AnalyticsEngineLike {

package/apps/storefront/src/lib/admin/services/mock/index.ts

@@ -1,11 +1,11 @@
-export { getOrdersViewModel } from "./orders";
-export { getProductsViewModel } from "./products";
+export { getOrdersViewModel } from "../../../orders/fixtures/orders";
+export { getProductsViewModel } from "../../../catalog/fixtures/products";
 export { getCustomersViewModel } from "../../../customers/fixtures/customers";
 export { getReportingViewModel } from "../../../reporting/fixtures/reporting";
 export { getSettingsViewModel } from "./settings";
-export { getCheckoutSettingsViewModel } from "./checkoutSettings";
-export type { CheckoutSettingsViewModel } from "./checkoutSettings";
-export { getSubscriptionsViewModel } from "./subscriptions";
+export { getCheckoutSettingsViewModel } from "../../../checkout/fixtures/checkoutSettings";
+export type { CheckoutSettingsViewModel } from "../../../checkout/fixtures/checkoutSettings";
+export { getSubscriptionsViewModel } from "../../../subscriptions/fixtures/subscriptions";
 export { getAiWorkflowsViewModel } from "./aiWorkflows";
 export { getEvidenceViewModel } from "../../../activity/fixtures/evidence";
 export { SEEDED_TENANTS, tenantProfile } from "./tenants";

package/apps/storefront/src/lib/apps/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/apps/orders/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/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/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/{admin → catalog/admin}/catalogSettingsClient.ts

@@ -2,8 +2,8 @@
 import {
   applySaveAfterEdits, draftIsDirty, editorFromPayload, parseSettingsNumber, saveBody, selectDraftMethod,
   type SettingsEditorState, type SettingsPayload,
-} from "@/lib/admin/catalogSettingsState";
-import { latestPreview, type PreviewStatus } from "@/lib/admin/catalogSettingsPreview";
+} from "@/lib/catalog/admin/catalogSettingsState";
+import { latestPreview, type PreviewStatus } from "@/lib/catalog/admin/catalogSettingsPreview";
 
 interface MethodOption { id: string; title: string; reason: string }
 interface SettingsResponse extends SettingsPayload {

package/apps/storefront/src/lib/{admin → catalog/admin}/services/catalogProducts.ts

@@ -5,8 +5,8 @@
  */
 import type { CatalogProduct, TenantConfig } from "@tot/public-runtime";
 import { CatalogFileError } from "@tot/public-runtime/catalog-files";
-import { readGrandfatheredSnapshot } from "@/lib/tot/ToTClient";
-import { readTenantCatalogFiles, type CatalogArtifactSource } from "@/lib/tot/tenantCatalog";
+import { readGrandfatheredSnapshot } from "@/lib/catalog/tot/ToTClient";
+import { readTenantCatalogFiles, type CatalogArtifactSource } from "@/lib/catalog/tot/tenantCatalog";
 
 export type CatalogOrigin = "files" | "snapshot" | "none";
 

package/apps/storefront/src/lib/{d1 → catalog/d1}/catalog.ts

@@ -19,7 +19,7 @@ import {
   type ListProductsQuery,
   type ListProductsResponse,
 } from "@tot/public-runtime";
-import { PRICE_BUCKETS } from "../priceBuckets.js";
+import { PRICE_BUCKETS } from "../shared/priceBuckets.js";
 
 /** Minimal async query seam — implemented by D1 and by the node:sqlite test shim. */
 export interface Queryable {

package/apps/storefront/src/lib/{admin/services/mock → catalog/fixtures}/products.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 {
   ExciseCheckKey,
   ExciseReadinessCheck,
@@ -7,9 +7,9 @@ import type {
   ProductRow,
   ProductsViewModel,
   ProductVariant,
-} from "../../viewmodels/products";
-import { tenantProfile } from "./tenants";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
+} from "../admin/viewmodels/products";
+import { tenantProfile } from "../../admin/services/mock/tenants";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 
 // Must stay index-aligned with orders.ts's ITEM_POOLS: a product's id is
 // `prod-<tenant>-<position here>`, and orders.ts derives each order's productId

package/apps/storefront/src/lib/{search → catalog/search}/index.ts

@@ -3,7 +3,7 @@
  *
  * Used by FixtureToTClient.search (no D1 binding): typo-tolerant, relevance-ranked
  * search over the bundled catalog snapshot, zero infra. When a D1 binding is wired
- * (D1ToTClient), search instead goes through FTS5 — see lib/d1/catalog.ts.
+ * (D1ToTClient), search instead goes through FTS5 — see lib/catalog/d1/catalog.ts.
  * This module is the portable floor an extracted
  * merchant gets out of the box (docs/extraction-runbook.md).
  */

package/apps/storefront/src/lib/{priceBuckets.ts → catalog/shared/priceBuckets.ts}

@@ -3,7 +3,7 @@
  * product's "from" price (price_range.min — the same figure ProductCard shows
  * and price-asc/desc sorts by), so a product falls into exactly one bucket
  * (no double-counting across buckets). Shared by both listProducts engines
- * (lib/tot/query.ts, lib/d1/catalog.ts) and the FacetSidebar so bucket
+ * (lib/catalog/tot/query.ts, lib/catalog/d1/catalog.ts) and the FacetSidebar so bucket
  * boundaries + labels never drift between them.
  */
 export interface PriceBucket {

package/apps/storefront/src/lib/{tot → catalog/tot}/ToTClient.ts

@@ -128,15 +128,15 @@ type FixtureBundle = {
 // tracked only for the tenants in scripts/tenant/catalog-in-repo-exceptions.json (plus
 // the e2e scopes). Vite resolves these globs at build time. reviews.json is optional.
 const productGlobs = import.meta.glob<CatalogProduct[]>(
-  "../../../../../packages/migration/out/catalog/*/products.json",
+  "../../../../../../packages/migration/out/catalog/*/products.json",
   { import: "default" },
 );
 const collectionGlobs = import.meta.glob<CatalogCollection[]>(
-  "../../../../../packages/migration/out/catalog/*/collections.json",
+  "../../../../../../packages/migration/out/catalog/*/collections.json",
   { import: "default" },
 );
 const reviewGlobs = import.meta.glob<Record<string, Review[]>>(
-  "../../../../../packages/migration/out/catalog/*/reviews.json",
+  "../../../../../../packages/migration/out/catalog/*/reviews.json",
   { import: "default" },
 );
 

package/apps/storefront/src/lib/{tot → catalog/tot}/query.ts

@@ -10,7 +10,7 @@ import type {
   FacetValue,
   ListProductsQuery,
 } from "@tot/public-runtime";
-import { PRICE_BUCKETS, bucketForPrice } from "../priceBuckets.js";
+import { PRICE_BUCKETS, bucketForPrice } from "../shared/priceBuckets.js";
 
 /** Lowest variant price (the "from" price shown on cards). */
 export function fromPrice(p: CatalogProduct): number {

package/apps/storefront/src/lib/{tot → catalog/tot}/syncState.ts

@@ -101,7 +101,7 @@ export interface CatalogSyncState {
 // document, so the Worker has no runtime filesystem dependency — same pattern
 // as productGlobs/collectionGlobs/reviewGlobs in ToTClient.ts.
 const syncStateGlobs = import.meta.glob<CatalogSyncState>(
-  "../../../../../packages/migration/out/catalog/*/sync-state.json",
+  "../../../../../../packages/migration/out/catalog/*/sync-state.json",
   { import: "default" },
 );
 

package/apps/storefront/src/lib/{tot → catalog/tot}/tenantCatalog.ts

@@ -26,7 +26,7 @@ import {
   readCatalogListing,
   type CatalogStore,
 } from "@tot/public-runtime/catalog-files";
-import { LocalContentProvider, type ContentProvider } from "../storyblok/provider.js";
+import { LocalContentProvider, type ContentProvider } from "../../storyblok/provider.js";
 
 export type CatalogArtifactSource = Pick<
   ContentProvider,

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

@@ -18,13 +18,13 @@ import { resolveManagedCheckout } from "@tot/public-runtime";
 import type { TenantConfig } from "@tot/public-runtime";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme } from "@/themes/schema";
-import type { AdminTenantEnvelope } from "../../envelope";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
 import {
   buildCheckoutSettingsFields,
   deriveCheckoutSettings,
   type CheckoutSettingsOverrides,
   type CheckoutSettingsField,
-} from "@/lib/commerce/checkoutSettings";
+} from "@/lib/checkout/commerce/checkoutSettings";
 
 export interface CheckoutSettingsViewModel {
   targetTenant: string;

package/apps/storefront/src/lib/content/index.ts

@@ -7,7 +7,7 @@
  * trust strip. Re-exported here alongside the tier/comparison contracts already
  * defined in lib/membership/model, so a membership page and a policy page
  * import from the same place. (The <BrandGrid> `Brand` contract lives with its
- * component in components/commerce/BrandGrid.astro.)
+ * component in components/catalog/storefront/commerce/BrandGrid.astro.)
  */
 export * from "./richtext.js";
 export * from "./callout.js";

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/{apps → 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/{apps → 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/{apps → 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/{apps → integrations/apps}/registryAccess.ts

@@ -16,8 +16,8 @@
 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 { readD1, readEnv } from "../env.js";
+import { fromD1 } from "../../catalog/d1/catalog.js";
+import { readD1, readEnv } from "../../env.js";
 
 /**
  * No-store JSON response — install/rotate bodies carry a one-time client

package/apps/storefront/src/lib/{apps → 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/{integration → integrations/integration}/browserEnvironment.ts

@@ -23,7 +23,7 @@ import { isAdminPath } from "@/lib/auth/loginGate";
 import {
   resolveIntegrationRenderState,
   type IntegrationRenderState,
-} from "@/lib/integration/renderIntegrationState";
+} from "@/lib/integrations/integration/renderIntegrationState";
 
 /**
  * The non-secret render revision: the commit SHA this build was cut from (baked at

package/apps/storefront/src/lib/{integration → 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";