@tokenoftrust/storefront-runner 2.4.87 → 2.4.88

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.

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

@@ -33,10 +33,10 @@ import {
   tenantDirRelative,
   tenantDirSegment,
 } from "@tot/public-runtime";
-import { renderRawChrome } from "../rawChrome.js";
+import { renderRawChrome } from "../shared/rawChrome.js";
 import { parseChromeConfig } from "../chrome/parseConfig.js";
 import { parseChromeAssignments } from "../chrome/model.js";
-import { stampTrackingIdsAtPublish } from "../tracking/publishSafetyNet.js";
+import { stampTrackingIdsAtPublish } from "../../measurement/tracking/publishSafetyNet.js";
 import { readWithImagePreviewRewriteOverlay } from "@tot/public-runtime/image-preview-rewrite-overlay";
 
 /** Safe, always-valid fallback when neither the tenant's own chrome.json nor
@@ -67,7 +67,7 @@ export interface ContentProvider {
   /**
    * The tenant's shared-chrome WRAPPER document (raw HTML), or null. A full
    * document containing the CHROME_BODY_MARKER where a body-only page fragment is
-   * spliced in (see lib/rawMarketingHtml.ts). Lets raw pages stop duplicating
+   * spliced in (see lib/content/shared/rawMarketingHtml.ts). Lets raw pages stop duplicating
    * chrome: chrome lives once here, pages become fragments. File:
    * `content/<tenant>/chrome.html`. Tenant-owned (no cross-tenant fallback).
    *
@@ -110,17 +110,17 @@ export interface DerivedArtifact {
 // Per-tenant local content lives under the colocated repo-root layout
 // tenants/<tenant_id>/content/. Vite globs bundle every tenant's JSON at build
 // time; a file missing for a tenant falls back to the default scope, so a
-// partially-adopted tenant still renders. Depth: from src/lib/storyblok/ the
-// repo root is five levels up (storyblok→lib→src→storefront→apps→root).
+// partially-adopted tenant still renders. Depth: from src/lib/content/storyblok/ the
+// repo root is six levels up (storyblok→content→lib→src→storefront→apps→root).
 const homeGlobs = import.meta.glob<HomeContent>([
-  "../../../../../tenants/*/content/home.json",
-  "../../../../../tenants/e2e/*/content/home.json",
+  "../../../../../../tenants/*/content/home.json",
+  "../../../../../../tenants/e2e/*/content/home.json",
 ], {
   import: "default",
 });
 const chromeGlobs = import.meta.glob<unknown>([
-  "../../../../../tenants/*/content/chrome.json",
-  "../../../../../tenants/e2e/*/content/chrome.json",
+  "../../../../../../tenants/*/content/chrome.json",
+  "../../../../../../tenants/e2e/*/content/chrome.json",
 ], {
   import: "default",
 });
@@ -129,22 +129,22 @@ const chromeGlobs = import.meta.glob<unknown>([
 // convention as chromeGlobs above.
 const chromeAssignmentGlobs = import.meta.glob<unknown>(
   [
-    "../../../../../tenants/*/content/chrome-assignments.json",
-    "../../../../../tenants/e2e/*/content/chrome-assignments.json",
+    "../../../../../../tenants/*/content/chrome-assignments.json",
+    "../../../../../../tenants/e2e/*/content/chrome-assignments.json",
   ],
   { import: "default" },
 );
 const pageGlobs = import.meta.glob<EditorialPage>([
-  "../../../../../tenants/*/content/pages/*.json",
-  "../../../../../tenants/e2e/*/content/pages/*.json",
+  "../../../../../../tenants/*/content/pages/*.json",
+  "../../../../../../tenants/e2e/*/content/pages/*.json",
 ], {
   import: "default",
 });
 // Raw self-authored home documents (marketing tenants). `?raw` bundles the file
 // as a string; a tenant with no home.html simply has no entry here.
 const homeHtmlGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/home.html",
-  "../../../../../tenants/e2e/*/content/home.html",
+  "../../../../../../tenants/*/content/home.html",
+  "../../../../../../tenants/e2e/*/content/home.html",
 ], {
   query: "?raw",
   import: "default",
@@ -152,8 +152,8 @@ const homeHtmlGlobs = import.meta.glob<string>([
 // Raw self-authored SUBPAGE documents: tenants/<tenant>/content/pages-html/<slug>.html
 // (e.g. pages-html/pricing.html -> /pricing/). `**` supports nested slugs.
 const pageHtmlGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/pages-html/**/*.html",
-  "../../../../../tenants/e2e/*/content/pages-html/**/*.html",
+  "../../../../../../tenants/*/content/pages-html/**/*.html",
+  "../../../../../../tenants/e2e/*/content/pages-html/**/*.html",
 ], {
   query: "?raw",
   import: "default",
@@ -161,15 +161,15 @@ const pageHtmlGlobs = import.meta.glob<string>([
 // Shared-chrome wrapper document (marketing tenants that author body-only page
 // fragments). One per tenant; a tenant without it keeps serving full documents.
 const chromeHtmlGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/chrome.html",
-  "../../../../../tenants/e2e/*/content/chrome.html",
+  "../../../../../../tenants/*/content/chrome.html",
+  "../../../../../../tenants/e2e/*/content/chrome.html",
 ], {
   query: "?raw",
   import: "default",
 });
 const artifactGlobs = import.meta.glob<string>([
-  "../../../../../tenants/*/content/**/*",
-  "../../../../../tenants/e2e/*/content/**/*",
+  "../../../../../../tenants/*/content/**/*",
+  "../../../../../../tenants/e2e/*/content/**/*",
 ], {
   query: "?raw",
   import: "default",
@@ -251,10 +251,10 @@ async function readRawDevFile(scope: string, relative: string): Promise<string |
       import("node:url"),
       import("node:path"),
     ]);
-    // provider.ts lives at apps/storefront/src/lib/storyblok/ — the repo root is five
-    // levels up, mirroring the import.meta.glob prefix ("../../../../../tenants/...").
+    // provider.ts lives at apps/storefront/src/lib/content/storyblok/ — the repo root is six
+    // levels up, mirroring the import.meta.glob prefix ("../../../../../../tenants/...").
     const here = dirname(fileURLToPath(import.meta.url));
-    const abs = resolve(here, "../../../../..", ...tenantDirRelative(scope).split("/"), "content", relative);
+    const abs = resolve(here, "../../../../../..", ...tenantDirRelative(scope).split("/"), "content", relative);
     return await readFile(abs, "utf8");
   } catch {
     return null;
@@ -305,7 +305,7 @@ export class LocalContentProvider implements ContentProvider {
     if (loader) return loader();
     // (2) No chrome.html: render the CANONICAL shared chrome from the
     //     tenant's chrome.json — but only when it validates whole against the
-    //     consolidated ChromeConfig schema (lib/chrome/parseConfig.ts). Tenant-
+    //     consolidated ChromeConfig schema (lib/content/chrome/parseConfig.ts). Tenant-
     //     owned only, like the raw HTML above (no cross-tenant fallback).
     const config = await this.loadChromeConfig();
     if (!config) return null;
@@ -708,7 +708,7 @@ export class PublishedContentProvider implements ContentProvider {
   }
   async getChrome(): Promise<ChromeConfig> {
     // Runs through the SAME fail-closed schema validator as getChromeHtml's
-    // chrome.json branch (lib/chrome/parseConfig.ts) — a published artifact is
+    // chrome.json branch (lib/content/chrome/parseConfig.ts) — a published artifact is
     // no longer trusted blind (was: JSON.parse + a raw cast to SiteChrome).
     const config = parseChromeConfig(await this.published<unknown>("chrome.json"));
     return config ?? ((await this.usesVersionedContent()) ? EMPTY_CHROME_CONFIG : this.base.getChrome());

package/apps/storefront/src/lib/{the-build → content/the-build}/provider.ts

@@ -1,5 +1,5 @@
 // Thin wrapper binding the generic blog engine to the "the-build" collection.
-// The engine (src/lib/blog/collection.ts) is the single implementation; this
+// The engine (src/lib/content/blog/collection.ts) is the single implementation; this
 // module only fixes the collection id so existing/downstream callers can import
 // collection-bound helpers.
 import { getIndexSettings, getPost, listPosts, resolveRedirect, type Collection } from "../blog/collection.js";

package/apps/storefront/src/lib/{the-build → content/the-build}/toc.ts

@@ -5,7 +5,7 @@
 // (`annotate`), so a render path can feed `htmlWithHeadingIds(post.contentHtml)`
 // to `set:html` and `toc(post.contentHtml)` to the aside and the anchors line up.
 import { parseFragment, serialize } from "parse5";
-import { slugifyHeading } from "../content/prose.js";
+import { slugifyHeading } from "../prose.js";
 
 /** Minimal structural view of a parse5 node (duck-typed, as scripts/dev/locate.mjs does). */
 interface P5Node {

package/apps/storefront/src/lib/d1/schema-apps.ts

@@ -151,7 +151,7 @@ export const activityEvents = sqliteTable(
 
 // --- Per-tenant raw-interaction store directory ------------------------------
 // The DIRECTORY of per-tenant D1 databases that hold raw declarative-tracking
-// interaction rows — one database per tenant (`lib/tracking/interactionSchema.ts`
+// interaction rows — one database per tenant (`lib/measurement/tracking/interactionSchema.ts`
 // is that database's schema). This table holds NO interaction data: only the
 // `tenant_id → (database_name, database_uuid)` mapping the Worker needs to
 // address a tenant's own database over the D1 REST API, since Worker bindings
@@ -177,7 +177,7 @@ export const trackingTenantDatabases = sqliteTable(
   {
     tenantId: text("tenant_id").primaryKey(),
     // The Cloudflare D1 database name, derived deterministically from the tenant
-    // id (`lib/tracking/tenantD1Registry.ts`) — recorded so an operator can find
+    // id (`lib/measurement/tracking/tenantD1Registry.ts`) — recorded so an operator can find
     // it in the dashboard without re-deriving.
     databaseName: text("database_name").notNull(),
     // The D1 UUID — what the REST data plane actually addresses.

package/apps/storefront/src/lib/email/candidateConflictEmail.ts

@@ -6,7 +6,7 @@
  * notification for that case — the author is pinged the MOMENT their change actually
  * conflicts with someone else's merge, not at their own accept attempt.
  *
- * Rendered here (our brand), transmitted by tot20 (see lib/messaging/messagesClient.ts).
+ * Rendered here (our brand), transmitted by tot20 (see lib/engagement/messaging/messagesClient.ts).
  * Email HTML rules: inline styles only, table-free simple layout, a visible fallback URL
  * under the button.
  */

package/apps/storefront/src/lib/email/magicLinkInviteEmail.ts

@@ -1,7 +1,7 @@
 /**
  * The storefront's OWN branded developer-invite email (magic-link flow). The storefront
  * owns presentation now — this is our template, our brand, rendered here and handed to
- * tot20 only for transport (see lib/messaging/messagesClient.ts). A single primary CTA
+ * tot20 only for transport (see lib/engagement/messaging/messagesClient.ts). A single primary CTA
  * links to the GET-safe /auth/magic landing carrying the one-time token.
  *
  * Email HTML rules: inline styles only (no <style>/external CSS — mail clients strip them),

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/digest.ts

@@ -1,6 +1,6 @@
 /**
  * Hand-rolled newsletter digest HTML builder — the email analogue of
- * `renderRssFeed` (src/lib/blog/rss.ts): pure string concatenation, no
+ * `renderRssFeed` (src/lib/content/blog/rss.ts): pure string concatenation, no
  * templating dependency. Fed the engine's live-visible post list, so drafts /
  * unlisted / not-yet-scheduled posts can never reach an inbox.
  *
@@ -10,7 +10,7 @@
  * ESP (see send.ts). The RFC 8058 `List-Unsubscribe` headers are set on the
  * SEND call, not in this HTML body.
  */
-import type { BlogPostSummary } from "../blog/types.js";
+import type { BlogPostSummary } from "../../content/blog/types.js";
 
 /** Replaced per-recipient with the subscriber's opaque token at send time. */
 export const UNSUBSCRIBE_TOKEN_PLACEHOLDER = "{{unsubscribe_token}}";

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/resendClient.ts

@@ -5,7 +5,7 @@
  * (`POST /emails/batch`, up to 100 messages/call); audience/consent/unsubscribe
  * state stays first-party in our D1, never in a vendor list.
  */
-import { readEnv } from "../env.js";
+import { readEnv } from "../../env.js";
 
 /** Resend's batch limit: at most 100 messages per `/emails/batch` call. */
 export const RESEND_BATCH_LIMIT = 100;

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/send.ts

@@ -18,8 +18,8 @@
  * per-subscriber diff. "New since last send" is computed once from the previous
  * ledger row's `sent_at`, not per-subscriber.
  */
-import type { Queryable } from "../catalog/d1/catalog.js";
-import type { BlogPostSummary } from "../blog/types.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
+import type { BlogPostSummary } from "../../content/blog/types.js";
 import {
   sendBatch as realSendBatch,
   RESEND_BATCH_LIMIT,

package/apps/storefront/src/lib/{newsletter → engagement/newsletter}/subscribers.ts

@@ -9,7 +9,7 @@
  * caller is responsible for resolving `tenantId` from the request host/session
  * (NEVER a client body) — that is the multi-tenant isolation boundary.
  */
-import type { Queryable } from "../catalog/d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 
 export type SubscriberStatus = "pending" | "confirmed" | "unsubscribed" | "bounced";
 

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 "../catalog/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("../catalog/d1/catalog.js"),
+    import("../../catalog/d1/catalog.js"),
     readD1("STOREFRONT_APPS_DB"),
     readEnv("SOCIAL_TOKEN_KEK"),
   ]);

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 "../catalog/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 "../catalog/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 "../catalog/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 "../catalog/d1/catalog.js";
+import { readEnv } from "../../env.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 import {
   ensureDatabase,
   fromD1Rest,

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/middleware/controlPlane.ts

@@ -9,7 +9,7 @@
 import type { APIContext, MiddlewareNext } from "astro";
 import { readEnv, readD1, readKv } from "@/lib/env";
 import { fromD1, type D1Like } from "@/lib/catalog/d1/catalog";
-import { readCurrentTenantConsentConfig } from "@/lib/apps/consentConfigRead";
+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/renderChain.ts

@@ -16,7 +16,7 @@ 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";

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/admin/interaction-insights.ts

@@ -31,9 +31,9 @@ import type { APIContext } from "astro";
 import { requireAdminApiEntry } from "@/lib/auth/adminApiGuard";
 import { readD1 } from "@/lib/env";
 import { fromD1 } from "@/lib/catalog/d1/catalog";
-import { resolveTenantStore, trackingNamePrefix } from "@/lib/tracking/tenantD1Registry";
-import { readD1Control } from "@/lib/tracking/d1Control";
-import { readTenantInteractionInsights } from "@/lib/tracking/tenantReadAccess";
+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/blog/[collection]/[slug]/react.ts

@@ -18,7 +18,7 @@ import {
   isReaction,
   recordReaction,
   type Reaction,
-} from "@/lib/blog/reactions";
+} from "@/lib/content/blog/reactions";
 import { checkRateLimit } from "@/lib/rate/kvWindow";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/newsletter/[collection]/subscribe.ts

@@ -18,9 +18,9 @@ import type { APIRoute } from "astro";
 import { readD1, readKv, readEnv } from "@/lib/env";
 import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { checkRateLimit } from "@/lib/rate/kvWindow";
-import { NewsletterSubscribersStore } from "@/lib/newsletter/subscribers";
-import { randomToken, hashConsentIp } from "@/lib/newsletter/consent";
-import { sendConfirmationEmail } from "@/lib/newsletter/confirmationEmail";
+import { NewsletterSubscribersStore } from "@/lib/engagement/newsletter/subscribers";
+import { randomToken, hashConsentIp } from "@/lib/engagement/newsletter/consent";
+import { sendConfirmationEmail } from "@/lib/engagement/newsletter/confirmationEmail";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/newsletter/confirm.ts

@@ -12,7 +12,7 @@
 import type { APIRoute } from "astro";
 import { readD1 } from "@/lib/env";
 import { fromD1 } from "@/lib/catalog/d1/catalog";
-import { NewsletterSubscribersStore } from "@/lib/newsletter/subscribers";
+import { NewsletterSubscribersStore } from "@/lib/engagement/newsletter/subscribers";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/newsletter/unsubscribe.ts

@@ -21,7 +21,7 @@
 import type { APIContext } from "astro";
 import { readD1 } from "@/lib/env";
 import { fromD1 } from "@/lib/catalog/d1/catalog";
-import { unsubscribeByToken } from "@/lib/newsletter/subscribers";
+import { unsubscribeByToken } from "@/lib/engagement/newsletter/subscribers";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/rum/vitals.ts

@@ -15,7 +15,7 @@
 import type { APIRoute } from "astro";
 import { rateMetric, type WebVitalName, type WebVitalsSample } from "@/lib/analytics/webVitals";
 import { readKv, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
-import { recordBlogView } from "@/lib/blog/viewCounts";
+import { recordBlogView } from "@/lib/content/blog/viewCounts";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/tracking/interaction.ts

@@ -2,7 +2,7 @@
  * POST /api/tracking/interaction (dt-collector-v1) — the beacon sink for
  * declarative interaction tracking.
  *
- * The browser collector (`@/lib/tracking/interactionCollector`) batches
+ * The browser collector (`@/lib/measurement/tracking/interactionCollector`) batches
  * `TotInteraction`s captured off `installInteractionTracking` /
  * `onInteraction` (`@tot/public-runtime`) — via `dt-consent-environment-gate`'s
  * consent/environment wrapper in front of it — and POSTs them here with
@@ -39,10 +39,10 @@
 import type { APIContext } from "astro";
 import { readD1, readAnalytics, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
 import { fromD1 } from "@/lib/catalog/d1/catalog";
-import { ingestInteractions, type StampedInteractionEvent } from "@/lib/tracking/collectorIngest";
-import { readD1Control } from "@/lib/tracking/d1Control";
-import { resolveTenantStore, trackingNamePrefix } from "@/lib/tracking/tenantD1Registry";
-import { persistInteractions } from "@/lib/tracking/interactionStore";
+import { ingestInteractions, type StampedInteractionEvent } from "@/lib/measurement/tracking/collectorIngest";
+import { readD1Control } from "@/lib/measurement/tracking/d1Control";
+import { resolveTenantStore, trackingNamePrefix } from "@/lib/measurement/tracking/tenantD1Registry";
+import { persistInteractions } from "@/lib/measurement/tracking/interactionStore";
 import type { AnalyticsEngineLike } from "@/lib/activity/store";
 
 export const prerender = false;