@tokenoftrust/storefront-runner 2.4.87 → 2.4.89

package/apps/storefront/src/lib/{shared → access/shared}/accessExplain.ts

@@ -17,7 +17,7 @@
  * Nothing here is ever reported as verified unless tot-mcp said so: an unconfigured seam,
  * a non-200 or a timeout is `unavailable`, which the UI shows as unverified.
  */
-import { callMcpService } from "@/lib/http/mcpServiceCall";
+import { callMcpService } from "@/lib/developer-experience/http/mcpServiceCall";
 
 const EXPLAIN_TIMEOUT_MS = 8000;
 

package/apps/storefront/src/lib/{adminTenantEnvelope.ts → access/shared/adminTenantEnvelope.ts}

@@ -21,9 +21,9 @@
  *     request asks for: the staff check gates evaluation of the request
  *     entirely, not just the picker's visibility.
  */
-import type { SessionRecord } from "@/lib/auth/session";
-import { isStaffSession } from "@/lib/dashboard/staffAdmission";
-import { membershipFor, normalizeMemberships, type TenantMembership } from "@/lib/dashboard/tenantSelection";
+import type { SessionRecord } from "@/lib/access/auth/session";
+import { isStaffSession } from "@/lib/access/dashboard/staffAdmission";
+import { membershipFor, normalizeMemberships, type TenantMembership } from "@/lib/access/dashboard/tenantSelection";
 
 export interface AdminTenantEnvelope {
   /** The tenant that actually served this request. */

package/apps/storefront/src/lib/{shared → access/shared}/developerInvites.ts

@@ -53,10 +53,10 @@
  * control-plane cluster stays self-contained (see `.dependency-cruiser.cjs`).
  */
 import { readEnv } from "@/lib/env";
-import { callMcpService } from "@/lib/http/mcpServiceCall";
-import { diagEmail } from "@/lib/diag/redact";
-import { checkStorePreviewReady, type PreflightDecision } from "@/lib/shared/invitePreflight";
-import { explainDeveloperAccess, type AccessVerification } from "@/lib/shared/accessExplain";
+import { callMcpService } from "@/lib/developer-experience/http/mcpServiceCall";
+import { diagEmail } from "@/lib/observability/diag/redact";
+import { checkStorePreviewReady, type PreflightDecision } from "@/lib/access/shared/invitePreflight";
+import { explainDeveloperAccess, type AccessVerification } from "@/lib/access/shared/accessExplain";
 
 /**
  * The header carrying the storefront-signed staff BROKER ASSERTION to tot20

package/apps/storefront/src/lib/{shared → access/shared}/invitePreflight.ts

@@ -22,7 +22,7 @@
  * mirroring recordDeveloperAppBinding's "skipped when not-configured" stance — we
  * never break invites just because the MCP is briefly unreachable.
  */
-import { callMcpService } from "@/lib/http/mcpServiceCall";
+import { callMcpService } from "@/lib/developer-experience/http/mcpServiceCall";
 
 /** How long we'll wait on the preview-status read before failing open. */
 const PREFLIGHT_TIMEOUT_MS = 4000;

package/apps/storefront/src/lib/{shared → access/shared}/principalGrants.ts

@@ -76,8 +76,8 @@
  * swaps in the Http client with no call-site change.
  */
 import { readEnv } from "@/lib/env";
-import { diagEmail } from "@/lib/diag/redact";
-import { BROKER_ASSERTION_HEADER, BROKER_PRIVATE_KEY_ENV } from "@/lib/auth/brokerAssertion";
+import { diagEmail } from "@/lib/observability/diag/redact";
+import { BROKER_ASSERTION_HEADER, BROKER_PRIVATE_KEY_ENV } from "@/lib/access/auth/brokerAssertion";
 
 /** A human grantee — the only principal type this HTTP surface accepts. */
 export interface UserPrincipal {

package/apps/storefront/src/lib/{shared → access/shared}/viewerGrant.ts

@@ -30,7 +30,7 @@
  * app-binding WRITE (`recordDeveloperAppBinding`) targets, so this READ and that
  * WRITE always agree on which subject-capability store they speak to.
  */
-import { callMcpService } from "@/lib/http/mcpServiceCall";
+import { callMcpService } from "@/lib/developer-experience/http/mcpServiceCall";
 import type { Capability } from "./capability.js";
 
 /** Minimal GET transport (mirrors `dev/previewStatus.ts` — decoupled by design). */

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

@@ -1,5 +1,5 @@
-import type { AdminTenantEnvelope } from "../../admin/envelope";
-import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
+import type { AdminTenantEnvelope } from "../../access/admin/envelope";
+import { memoizeByEnvelope } from "../../developer-experience/admin/memoizeByEnvelope";
 import type { EvidenceReference } from "../evidence/evidenceReference";
 import { getCustomersViewModel } from "../../customers/fixtures/customers";
 import { getOrdersViewModel } from "../../orders/fixtures/orders";

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

@@ -48,11 +48,11 @@ import type {
   ActivityPayload,
 } from "@tot/public-runtime";
 import type { ActionKey } from "@tot/public-runtime";
-import { readViewerSession } from "@/lib/auth/route";
-import { sessionHostCapability } from "@/lib/auth/loginGate";
-import { isStaffSession } from "@/lib/dashboard/staffAdmission";
+import { readViewerSession } from "@/lib/access/auth/route";
+import { sessionHostCapability } from "@/lib/access/auth/loginGate";
+import { isStaffSession } from "@/lib/access/dashboard/staffAdmission";
 import { readEnv } from "@/lib/env";
-import { isOwnerCapability } from "@/lib/shared/capability";
+import { isOwnerCapability } from "@/lib/access/shared/capability";
 import { hashActorId, recordActivity } from "./recordActivity";
 
 /** The minimal viewer chrome the middleware stamps on `locals.viewer`. */

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

@@ -11,7 +11,7 @@
  * baked in at BUILD time: astro.config.mjs's Vite `define` replaces the
  * `__GIT_SHA__` token with a string literal of the build's commit (CI-provided
  * `GIT_SHA`/`WORKERS_CI_COMMIT_SHA`/`GITHUB_SHA`, else local `git rev-parse`,
- * else "unknown"). This is the SAME source /health already reports (lib/health.ts)
+ * else "unknown"). This is the SAME source /health already reports (lib/observability/shared/health.ts)
  * — we read it through the identical `typeof` guard so both agree by construction,
  * and so the value is safe under vitest (where the define isn't applied → "unknown").
  *

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

@@ -2,11 +2,11 @@ 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 { getSettingsViewModel } from "../../../access/fixtures/settings";
 export { getCheckoutSettingsViewModel } from "../../../checkout/fixtures/checkoutSettings";
 export type { CheckoutSettingsViewModel } from "../../../checkout/fixtures/checkoutSettings";
 export { getSubscriptionsViewModel } from "../../../subscriptions/fixtures/subscriptions";
-export { getAiWorkflowsViewModel } from "./aiWorkflows";
+export { getAiWorkflowsViewModel } from "../../../automation/fixtures/aiWorkflows";
 export { getEvidenceViewModel } from "../../../activity/fixtures/evidence";
-export { SEEDED_TENANTS, tenantProfile } from "./tenants";
-export type { SeededTenantProfile, MockVertical } from "./tenants";
+export { SEEDED_TENANTS, tenantProfile } from "../../../access/fixtures/tenants";
+export type { SeededTenantProfile, MockVertical } from "../../../access/fixtures/tenants";

package/apps/storefront/src/lib/assets/shared/imageAttrs.ts

@@ -8,7 +8,7 @@
  *   - referenced Shopify CDN -> Shopify's native ?width= scheme
  *   - anything else usable   -> the URL as-is, no srcset
  */
-import { placeholderDataUri, isUsableImageUrl } from "../../placeholder.js";
+import { placeholderDataUri, isUsableImageUrl } from "../../content/shared/placeholder.js";
 
 const RESPONSIVE_IMAGE_WIDTHS = [320, 480, 640, 960, 1280, 1600] as const;
 

package/apps/storefront/src/lib/{admin → automation/admin}/viewmodels/aiWorkflows.ts

@@ -5,9 +5,9 @@
  * come from `lib/admin/ai`, which formalizes the approval/evidence models.
  */
 
-import type { ApprovalMode } from "../ai/approvalMode";
-import type { AiRecommendation } from "../ai/recommendation";
-import type { AuditEvent } from "../ai/audit";
+import type { ApprovalMode } from "../../ai/approvalMode";
+import type { AiRecommendation } from "../../ai/recommendation";
+import type { AuditEvent } from "../../ai/audit";
 
 export type { ApprovalMode };
 

package/apps/storefront/src/lib/{admin → automation}/ai/askEnvelope.ts

@@ -6,7 +6,7 @@
  * this is emitted for dev inspection only (see adminShell.ts's `data-admin-ask`
  * click handler), never sent over the network.
  */
-import type { AdminTenantEnvelope } from "../envelope";
+import type { AdminTenantEnvelope } from "../../access/admin/envelope";
 
 export type AdminRole = "internal_staff" | "merchant_operator";
 

package/apps/storefront/src/lib/{admin → automation}/ai/operationalRuns.ts

@@ -7,10 +7,10 @@
  * The other 5 workflows remain scaffold-only until their own units connect
  * real source data.
  */
-import type { AdminTenantEnvelope } from "../envelope";
-import { getOrdersViewModel, getProductsViewModel, getEvidenceViewModel } from "../services/mock";
-import { MOCK_ANCHOR_ISO, offsetIso, randomInt, seededRandom } from "../seed";
-import { OPERATIONAL_WORKFLOW_KEYS, type OperationalWorkflowKey } from "../viewmodels/aiWorkflows";
+import type { AdminTenantEnvelope } from "../../access/admin/envelope";
+import { getOrdersViewModel, getProductsViewModel, getEvidenceViewModel } from "../../admin/services/mock/index";
+import { MOCK_ANCHOR_ISO, offsetIso, randomInt, seededRandom } from "../../developer-experience/admin/seed";
+import { OPERATIONAL_WORKFLOW_KEYS, type OperationalWorkflowKey } from "../admin/viewmodels/aiWorkflows";
 import type { ApprovalMode } from "./approvalMode";
 import type { AuditEvent } from "./audit";
 import type { AiRecommendation } from "./recommendation";

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

@@ -1,7 +1,7 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
-import { MOCK_ANCHOR_ISO, offsetIso, pick, randomInt, seededRandom } from "../../seed";
-import { AI_WORKFLOW_NAMES, OPERATIONAL_WORKFLOW_KEYS, type AiWorkflowsViewModel, type ApprovalMode, type WorkflowRecord, type WorkflowStatus } from "../../viewmodels/aiWorkflows";
+import type { AdminTenantEnvelope } from "../../access/admin/envelope";
+import { memoizeByEnvelope } from "../../developer-experience/admin/memoizeByEnvelope";
+import { MOCK_ANCHOR_ISO, offsetIso, pick, randomInt, seededRandom } from "../../developer-experience/admin/seed";
+import { AI_WORKFLOW_NAMES, OPERATIONAL_WORKFLOW_KEYS, type AiWorkflowsViewModel, type ApprovalMode, type WorkflowRecord, type WorkflowStatus } from "../admin/viewmodels/aiWorkflows";
 
 const OWNERS = ["Ops", "Trust & Safety", "Growth", "Fulfillment"];
 const APPROVAL_MODES: ApprovalMode[] = ["draft_only", "approval_required", "guarded_automation"];

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

@@ -2,7 +2,7 @@
  * Tenant base-path helpers.
  *
  * When a request selects its tenant via a `/<domain>/` path prefix (see
- * lib/tenantRouting.ts), every same-origin link must carry that prefix or the
+ * lib/access/shared/tenantRouting.ts), every same-origin link must carry that prefix or the
  * visitor falls out of the tenant. Host-routed requests have an empty base path
  * and links are returned unchanged.
  *
@@ -34,7 +34,7 @@
  * covers that one, so the two cannot drift apart unnoticed.
  *
  * Consumers: {@link withBase} (and through it {@link bindBasePathAnchors}) and
- * `prefixTenantLinks` (lib/rawMarketingHtml.ts).
+ * `prefixTenantLinks` (lib/content/shared/rawMarketingHtml.ts).
  */
 export const ROOT_SERVED_HREF_NAMESPACES = [
   "_a",

package/apps/storefront/src/lib/catalog/fixtures/products.ts

@@ -1,5 +1,5 @@
-import type { AdminTenantEnvelope } from "../../admin/envelope";
-import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../admin/seed";
+import type { AdminTenantEnvelope } from "../../access/admin/envelope";
+import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../developer-experience/admin/seed";
 import type {
   ExciseCheckKey,
   ExciseReadinessCheck,
@@ -8,8 +8,8 @@ import type {
   ProductsViewModel,
   ProductVariant,
 } from "../admin/viewmodels/products";
-import { tenantProfile } from "../../admin/services/mock/tenants";
-import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
+import { tenantProfile } from "../../access/fixtures/tenants";
+import { memoizeByEnvelope } from "../../developer-experience/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/catalog/shared/featuredProductsPresentation.ts

@@ -1,4 +1,4 @@
-import type { FeaturedProductsBlock } from "@/lib/storyblok/content-model";
+import type { FeaturedProductsBlock } from "@/lib/content/storyblok/content-model";
 
 export function featuredProductsPresentationView(presentation: FeaturedProductsBlock["presentation"]) {
   return presentation === "carousel" ? "carousel" : "grid";

package/apps/storefront/src/lib/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 "../../content/storyblok/provider.js";
 
 export type CatalogArtifactSource = Pick<
   ContentProvider,

package/apps/storefront/src/lib/checkout/admin/checkoutStyleTarget.ts

@@ -20,8 +20,8 @@
  * Pure (no I/O, no Astro) — the caller supplies the already-read viewer session —
  * so it is unit-testable in isolation.
  */
-import { resolveAdminTenantMode } from "@/lib/adminTenantEnvelope";
-import type { SessionRecord } from "@/lib/auth/session";
+import { resolveAdminTenantMode } from "@/lib/access/shared/adminTenantEnvelope";
+import type { SessionRecord } from "@/lib/access/auth/session";
 
 export type WriteTargetResult =
   | { ok: true; targetTenant: string }

package/apps/storefront/src/lib/checkout/fixtures/checkoutSettings.ts

@@ -18,7 +18,7 @@ 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 "../../admin/envelope";
+import type { AdminTenantEnvelope } from "../../access/admin/envelope";
 import {
   buildCheckoutSettingsFields,
   deriveCheckoutSettings,

package/apps/storefront/src/lib/compliance/browser/checkoutVerificationFlow.ts

@@ -175,7 +175,7 @@ export interface PollDeps {
 
 /**
  * True when the login gate, not the preflight route, answered: the store is not
- * public and this viewer holds no session (see `lib/auth/gatePage.ts`). Still fail
+ * public and this viewer holds no session (see `lib/access/auth/gatePage.ts`). Still fail
  * closed — the caller only names the reason instead of reporting an outage.
  */
 export function isStoreNotPublicRefusal(res: Pick<Response, "status" | "headers">): boolean {

package/apps/storefront/src/lib/compliance/verification/totVerificationClient.ts

@@ -40,7 +40,7 @@ import {
   type HttpGetTransport,
   type HttpResponseLike,
   type HttpTransport,
-} from "@/lib/http/fetchTransport";
+} from "@/lib/developer-experience/http/fetchTransport";
 
 // --- Gate normalization -----------------------------------------------------
 

package/apps/storefront/src/lib/{blog → content/blog}/access.ts

@@ -1,4 +1,4 @@
-import type { SessionRecord } from "@/lib/auth/session.js";
+import type { SessionRecord } from "@/lib/access/auth/session.js";
 import type { BlogAccess } from "./types.js";
 
 /**

package/apps/storefront/src/lib/{blog → content/blog}/collection.ts

@@ -6,7 +6,7 @@ import {
 } from "@tot/public-runtime";
 import type { AuthorBio, BlogPost, BlogPostSummary, BlogSettings, PostStatus } from "./types.js";
 import type { ContentProvider } from "../storyblok/provider.js";
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 type ArtifactSource = Pick<ContentProvider, "readArtifact" | "listArtifactPaths">;
 function canReadArtifacts(value: ArtifactSource | undefined): value is ArtifactSource {
@@ -29,29 +29,29 @@ export interface Collection {
 // is the set of `posts/*.json` files — there is no hand-maintained index.json.
 const postGlobs = import.meta.glob<BlogPost>(
   [
-    "../../../../../tenants/*/content/*/posts/*.json",
-    "../../../../../tenants/e2e/*/content/*/posts/*.json",
+    "../../../../../../tenants/*/content/*/posts/*.json",
+    "../../../../../../tenants/e2e/*/content/*/posts/*.json",
   ],
   { import: "default" },
 );
 const redirectGlobs = import.meta.glob<Record<string, string>>(
   [
-    "../../../../../tenants/*/content/*/redirects.json",
-    "../../../../../tenants/e2e/*/content/*/redirects.json",
+    "../../../../../../tenants/*/content/*/redirects.json",
+    "../../../../../../tenants/e2e/*/content/*/redirects.json",
   ],
   { import: "default" },
 );
 const authorsGlobs = import.meta.glob<Record<string, AuthorBio>>(
   [
-    "../../../../../tenants/*/content/*/authors.json",
-    "../../../../../tenants/e2e/*/content/*/authors.json",
+    "../../../../../../tenants/*/content/*/authors.json",
+    "../../../../../../tenants/e2e/*/content/*/authors.json",
   ],
   { import: "default" },
 );
 const settingsGlobs = import.meta.glob<BlogSettings>(
   [
-    "../../../../../tenants/*/content/*/settings.json",
-    "../../../../../tenants/e2e/*/content/*/settings.json",
+    "../../../../../../tenants/*/content/*/settings.json",
+    "../../../../../../tenants/e2e/*/content/*/settings.json",
   ],
   { import: "default" },
 );

package/apps/storefront/src/lib/{blog → content/blog}/postView.ts

@@ -15,15 +15,15 @@ import {
   type BlogPresentation,
   type ShareLink,
 } from "./presentation.js";
-import { homeCrumbLabel, siteTrail, type Crumb } from "@/lib/breadcrumbs.js";
+import { homeCrumbLabel, siteTrail, type Crumb } from "@/lib/content/shared/breadcrumbs.js";
 import { viewerHasBlogAccess } from "./access.js";
 import { articleBodyHtml } from "./teaser.js";
-import { readViewerSession, safeNext } from "@/lib/auth/route.js";
-import { buildAlternates, type Alternate } from "@/lib/seo/alternates.js";
-import { breadcrumbLd, blogPostingLd } from "@/lib/jsonld.js";
+import { readViewerSession, safeNext } from "@/lib/access/auth/route.js";
+import { buildAlternates, type Alternate } from "@/lib/content/seo/alternates.js";
+import { breadcrumbLd, blogPostingLd } from "@/lib/content/shared/jsonld.js";
 import { collectionPathsV1, blogPathOptsV1 } from "./collectionPaths.js";
 import type { BlogPost } from "./types.js";
-import type { SessionRecord } from "@/lib/auth/session.js";
+import type { SessionRecord } from "@/lib/access/auth/session.js";
 
 export interface BlogPostViewPropsV1 {
   post: BlogPost;

package/apps/storefront/src/lib/{blog → content/blog}/provider.ts

@@ -13,7 +13,7 @@ import {
 import { getIndexSettings, listPosts } from "./collection.js";
 import type { BlogPost, BlogPostSummary, BlogSettings } from "./types.js";
 import type { ContentProvider } from "../storyblok/provider.js";
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 /** The collection id `/blog` reads — the derived fallback's second argument. */
 const BLOG_COLLECTION = "blog";
@@ -34,22 +34,22 @@ async function visibilityTimestamp(explicit?: string | null): Promise<string | n
 // tenant's keys back up.
 const indexGlobs = import.meta.glob<BlogPostSummary[]>(
   [
-    "../../../../../tenants/*/content/blog/index.json",
-    "../../../../../tenants/e2e/*/content/blog/index.json",
+    "../../../../../../tenants/*/content/blog/index.json",
+    "../../../../../../tenants/e2e/*/content/blog/index.json",
   ],
   { import: "default" },
 );
 const postGlobs = import.meta.glob<BlogPost>(
   [
-    "../../../../../tenants/*/content/blog/posts/*.json",
-    "../../../../../tenants/e2e/*/content/blog/posts/*.json",
+    "../../../../../../tenants/*/content/blog/posts/*.json",
+    "../../../../../../tenants/e2e/*/content/blog/posts/*.json",
   ],
   { import: "default" },
 );
 const redirectGlobs = import.meta.glob<Record<string, string>>(
   [
-    "../../../../../tenants/*/content/blog/redirects.json",
-    "../../../../../tenants/e2e/*/content/blog/redirects.json",
+    "../../../../../../tenants/*/content/blog/redirects.json",
+    "../../../../../../tenants/e2e/*/content/blog/redirects.json",
   ],
   { import: "default" },
 );

package/apps/storefront/src/lib/{chrome → content/chrome}/footerLegal.ts

@@ -1,7 +1,7 @@
 /**
  * The footer's Legal split — ONE source of truth for both renderers (the
- * raw-string footer in lib/rawChrome.ts and the component footer in
- * components/chrome/SiteFooter.astro), so a tenant's `Legal` column can never
+ * raw-string footer in lib/content/shared/rawChrome.ts and the component footer in
+ * components/content/storefront/chrome/SiteFooter.astro), so a tenant's `Legal` column can never
  * land in the grid on one surface and in the bottom bar on the other.
  *
  * Contract, title-based (no extra schema field): a footer column titled

package/apps/storefront/src/lib/{chrome → content/chrome}/trackingPlacements.ts

@@ -26,7 +26,7 @@ export const CHROME_PLACEMENT = {
   /**
    * Footer bottom legal/policy link row, on either surface — the links of a
    * `Legal`-titled footer column, which both renderers move out of the grid and
-   * into the bottom bar (lib/chrome/footerLegal.ts). `ChromeFooter.bottom`
+   * into the bottom bar (lib/content/chrome/footerLegal.ts). `ChromeFooter.bottom`
    * itself carries text only.
    */
   footerBottom: "footer-bottom",

package/apps/storefront/src/lib/{seo → content/seo}/faqItems.ts

@@ -1,6 +1,6 @@
 /**
  * The question/answer pairs a page visibly carries, for a declared FAQPage node
- * (lib/seo/structuredData.ts). Derived from the rendered content itself, so the markup can never
+ * (lib/content/seo/structuredData.ts). Derived from the rendered content itself, so the markup can never
  * claim an answer the page does not show: a heading phrased as a question, answered by the text
  * up to the next heading. Fewer than two pairs is not an FAQ.
  */

package/apps/storefront/src/lib/{seo → content/seo}/structuredData.ts

@@ -16,7 +16,7 @@ import type {
   StructuredDataPageType,
   TenantConfig,
 } from "@tot/public-runtime";
-import { productLd } from "../jsonld.js";
+import { productLd } from "../shared/jsonld.js";
 import { pageUrlForm } from "./urlForm.js";
 
 type Node = Record<string, unknown>;

package/apps/storefront/src/lib/{breadcrumbs.ts → content/shared/breadcrumbs.ts}

@@ -1,4 +1,4 @@
-import type { ChromeConfig } from "./chrome/model.js";
+import type { ChromeConfig } from "../chrome/model.js";
 
 /**
  * One breadcrumb trail per page. A page builds it ONCE with `siteTrail` and hands the same array

package/apps/storefront/src/lib/{heroSlideshow.ts → content/shared/heroSlideshow.ts}

@@ -1,4 +1,4 @@
-import type { HeroBlock } from "@/lib/storyblok/content-model";
+import type { HeroBlock } from "@/lib/content/storyblok/content-model";
 import { withBase } from "@/lib/basePath";
 
 export function heroAutoplayAllowed(input: {

package/apps/storefront/src/lib/{homeVisualParity.ts → content/shared/homeVisualParity.ts}

@@ -12,7 +12,7 @@ import type {
   MembershipBandBlock,
   NewsletterBlock,
   PromoTilesBlock,
-} from "@/lib/storyblok/content-model";
+} from "@/lib/content/storyblok/content-model";
 
 export type CommerceStaticResolved =
   | { kind: "promo_tiles"; block: PromoTilesBlock }

package/apps/storefront/src/lib/{jsonld.ts → content/shared/jsonld.ts}

@@ -3,7 +3,7 @@
  * BreadcrumbList, Organization. Kept pure so pages compose them and pass to <Seo>.
  */
 import type { CatalogProduct, Review, TenantConfig } from "@tot/public-runtime";
-import { isAvailable } from "./catalog/tot/query.js";
+import { isAvailable } from "../../catalog/tot/query.js";
 
 export function organizationLd(tenant: TenantConfig, base: string) {
   // Logo sourced from the migrated brand assets (og image / logo), so the

package/apps/storefront/src/lib/{rawChrome.ts → content/shared/rawChrome.ts}

@@ -2,12 +2,12 @@
  * Canonical RAW chrome renderer.
  *
  * ONE platform-shipped chrome wrapper, driven entirely by a tenant's `chrome.json`
- * (typed `ChromeConfig`, lib/chrome/model.ts) — CONTENT ONLY. It replaces the three
+ * (typed `ChromeConfig`, lib/content/chrome/model.ts) — CONTENT ONLY. It replaces the three
  * divergent, hand-authored `content/<tenant>/chrome.html` documents with a single
  * generator, so chrome lives in ONE place and a tenant supplies only data. The
  * output is a full wrapper document carrying the splice markers the rawMarketingHtml
  * pipeline understands (`<!--PAGE_HEAD-->` / `<!--PAGE_BODY-->`), so body-only page
- * fragments get wrapped exactly as before (see lib/rawMarketingHtml.ts,
+ * fragments get wrapped exactly as before (see lib/content/shared/rawMarketingHtml.ts,
  * wrapFragmentInChrome). Two governing constraints:
  *   - Single stylesheet: the wrapper LINKS the platform stylesheet
  *     (/shared/commerce-chrome.css) and emits NO inline chrome CSS — every
@@ -25,11 +25,11 @@
  * defense-in-depth, not a sanitizer for untrusted input.
  */
 import { CHROME_BODY_MARKER, CHROME_HEAD_MARKER } from "./rawMarketingHtml.js";
-import { isCurrentNavHref } from "./chrome/navCurrent.js";
-import { ctaIdentityAttr } from "./chrome/ctaIdentity.js";
-import { CHROME_PLACEMENT } from "./chrome/trackingPlacements.js";
-import { LEGAL_NAV_LABEL, splitFooterLegal } from "./chrome/footerLegal.js";
-import { resolveNewsletterAgeAttestation } from "./chrome/newsletterAgeAttestation.js";
+import { isCurrentNavHref } from "../chrome/navCurrent.js";
+import { ctaIdentityAttr } from "../chrome/ctaIdentity.js";
+import { CHROME_PLACEMENT } from "../chrome/trackingPlacements.js";
+import { LEGAL_NAV_LABEL, splitFooterLegal } from "../chrome/footerLegal.js";
+import { resolveNewsletterAgeAttestation } from "../chrome/newsletterAgeAttestation.js";
 import { trackingAttributesHtml } from "@tot/public-runtime";
 import type {
   ChromeAgeGate,
@@ -46,9 +46,9 @@ import type {
   ChromeUtilityNav,
   HeaderVariant,
   SocialLink,
-} from "./chrome/model.js";
-import { isSafeAgeGateHref, resolveAgeGateCopy, resolveChromeAssignment } from "./chrome/model.js";
-import { resolveHeaderVariant } from "./chrome/variant.js";
+} from "../chrome/model.js";
+import { isSafeAgeGateHref, resolveAgeGateCopy, resolveChromeAssignment } from "../chrome/model.js";
+import { resolveHeaderVariant } from "../chrome/variant.js";
 
 /** HTML-escape text/attribute content. Covers the five significant characters. */
 function esc(value: string): string {
@@ -295,7 +295,7 @@ function renderSearchForm(search: ChromeSearch, inMenu = false): string {
 
 /**
  * Labelled header action links, in authored order. A `kind: "cart"` link carries
- * the `cart` class, so bindManagedCartAnchors (lib/chrome/managedCart.ts) binds it
+ * the `cart` class, so bindManagedCartAnchors (lib/content/chrome/managedCart.ts) binds it
  * to the managed checkout exactly like the icon cart.
  */
 function renderActionLinks(links: ChromeHeaderActionLink[]): string {
@@ -526,7 +526,7 @@ function renderFooter(footer: ChromeFooter): string {
           return `      <div class="footer-brand">${logo}${text}${news}</div>\n`;
         })()
       : "";
-  // A `Legal`-titled column moves to the bottom bar (lib/chrome/footerLegal.ts)
+  // A `Legal`-titled column moves to the bottom bar (lib/content/chrome/footerLegal.ts)
   // — scope indices count RENDERED grid columns, so they describe where a link
   // actually is rather than where it sat in the authored array.
   const { gridColumns, legalLinks } = splitFooterLegal(footer.columns);

package/apps/storefront/src/lib/{rawMarketingHtml.ts → content/shared/rawMarketingHtml.ts}

@@ -22,9 +22,9 @@ import {
   type EffectivePlan,
   type ConsentSnapshot,
 } from "@tot/public-runtime";
-import { reportTrackingChainHealth } from "./tracking/interactionHealth.js";
+import { reportTrackingChainHealth } from "../../measurement/tracking/interactionHealth.js";
 import { ASYNC_CSS_SWAP_JS } from "./asyncCss.js";
-import { ROOT_SERVED_HREF_NAMESPACES } from "./basePath.js";
+import { ROOT_SERVED_HREF_NAMESPACES } from "../../basePath.js";
 
 export { rawHtmlPolicy } from "@tot/public-runtime";
 
@@ -139,7 +139,7 @@ export function interactionTrackingScript(nonce: string): string {
 /**
  * Swaps every `data-async-css`-tagged `<link rel="preload">` to
  * `rel="stylesheet"` once fetched — the raw-mount half of the
- * `<AsyncStylesheet>` primitive (lib/asyncCss.ts; Layout.astro is the other,
+ * `<AsyncStylesheet>` primitive (lib/content/shared/asyncCss.ts; Layout.astro is the other,
  * same one-engine-two-mounts discipline as {@link interactionTrackingScript}).
  * A raw-HTML tenant hand-authors the plain `<link rel="preload" as="style"
  * data-async-css>` + `<noscript>` markup directly (no Astro component

package/apps/storefront/src/lib/{styleGuideThemes.ts → content/shared/styleGuideThemes.ts}

@@ -1,5 +1,5 @@
 import { tenantDirSegment } from "@tot/public-runtime";
-import type { ContentProvider } from "@/lib/storyblok/provider";
+import type { ContentProvider } from "@/lib/content/storyblok/provider";
 
 export type StyleGuideTheme = Record<string, unknown> & {
   id: string;
@@ -11,8 +11,8 @@ export type StyleGuideTheme = Record<string, unknown> & {
 
 const localThemeModules = import.meta.glob<Record<string, unknown>>(
   [
-    "../../../../tenants/*/content/themes/*.json",
-    "../../../../tenants/e2e/*/content/themes/*.json",
+    "../../../../../../tenants/*/content/themes/*.json",
+    "../../../../../../tenants/e2e/*/content/themes/*.json",
   ],
   { eager: true, import: "default" },
 );

package/apps/storefront/src/lib/{storyblok → content/storyblok}/content-model.ts

@@ -354,6 +354,6 @@ export interface EditorialPage {
 }
 
 // Site chrome (header/footer) is the ONE consolidated schema in
-// lib/chrome/model.ts (`ChromeConfig`) — see that file's header comment for
+// lib/content/chrome/model.ts (`ChromeConfig`) — see that file's header comment for
 // why the old `SiteChrome`/`SiteNavItem` pair that used to live here was
 // retired.