@tokenoftrust/storefront-runner 1.3.2 → 1.3.4-rc.1

package/apps/storefront/astro.config.mjs

@@ -1,6 +1,50 @@
 // @ts-check
+import { readFileSync } from "node:fs";
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 import { defineConfig } from "astro/config";
 import cloudflare from "@astrojs/cloudflare";
+
+// The npm install spec the cockpit hands out for `npm i -g @tokenoftrust/cli`, derived
+// at BUILD time from the CLI version THIS build was cut alongside
+// (packages/cli/package.json). We PIN THE EXACT VERSION rather than a floating dist-tag:
+// this build KNOWS which CLI it expects, so the developer's terminal shouldn't get a vote.
+// A channel (@next/@latest) can silently drift behind (or ahead of) the source — e.g. a
+// stable release moves @latest ahead of a never-republished @next — and the copy-paste then
+// hands out a build that doesn't match this cockpit. Pinning makes the paste reproducible.
+// INVARIANT this introduces: the version in packages/cli/package.json MUST be published to
+// npm before/as this storefront ships, else the pasted `npm i -g @tokenoftrust/cli@<v>` 404s.
+// The CLI publish workflow (.github/workflows/publish-cli.yml) is the publisher; there is no
+// deploy-time guard yet that asserts the embedded version exists on npm — a worthwhile add.
+const cliVersion = JSON.parse(
+  readFileSync(fileURLToPath(new URL("../../packages/cli/package.json", import.meta.url)), "utf8"),
+).version;
+const cliInstallSpec = `@tokenoftrust/cli@${cliVersion}`;
+
+// The commit THIS build was cut from, baked in at BUILD time so /health can report
+// exactly which code is live (see src/lib/health.ts + src/middleware). Prefer a CI-
+// provided SHA (Workers Builds / GitHub Actions / CF Pages) so the value is right even
+// when the build runs from a shallow/detached checkout; fall back to `git rev-parse`
+// for local deploys. deploy.sh's source guard pins HEAD to origin/<deploySourceBranch>,
+// so on a clean deploy this SHA equals the pushed umbrella tip. Never throws — a build
+// with no git context reports "unknown" rather than failing.
+const gitSha = (() => {
+  const fromEnv =
+    process.env.GIT_SHA ||
+    process.env.WORKERS_CI_COMMIT_SHA ||
+    process.env.CF_PAGES_COMMIT_SHA ||
+    process.env.GITHUB_SHA;
+  if (fromEnv) return fromEnv.trim();
+  try {
+    return execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: fileURLToPath(new URL(".", import.meta.url)),
+      encoding: "utf8",
+    }).trim();
+  } catch {
+    return "unknown";
+  }
+})();
+
 import preact from "@astrojs/preact";
 import tailwindcss from "@tailwindcss/vite";
 import { tenantHotReload } from "./dev-plugins/tenant-hot-reload.mjs";
@@ -22,6 +66,12 @@ export default defineConfig({
   }),
   integrations: [preact({ compat: true })],
   vite: {
+    // Build-time constants: the CLI install spec the cockpit hands out (next vs latest),
+    // and this build's commit SHA reported by /health.
+    define: {
+      __CLI_INSTALL_SPEC__: JSON.stringify(cliInstallSpec),
+      __GIT_SHA__: JSON.stringify(gitSha),
+    },
     plugins: [tailwindcss(), tenantHotReload()],
     optimizeDeps: {
       // Vite's SSR optimizer can try to prebundle the Cloudflare adapter's

package/apps/storefront/env.d.ts

@@ -5,7 +5,7 @@ import type {
   TenantConfig,
   CustomizationEnv,
   TenantFeatures,
-  ResolvedFoxyCommerce,
+  ResolvedManagedCheckout,
   CapabilityConfig,
 } from "@tot/public-runtime";
 import type { ToTClient } from "@/lib/tot/ToTClient";
@@ -52,10 +52,12 @@ interface CloudflareEnv {
   /** HMAC secret for signing/verifying customization preview tokens (D4). */
   CUSTOMIZATION_PREVIEW_SECRET?: string;
   /**
-   * FoxyCart (Track A). `FOXY_STORE_SUBDOMAIN` overrides the tenant's default
+   * Managed checkout (Track A). `FOXY_STORE_SUBDOMAIN` overrides the tenant's default
    * demo store subdomain (swap the demo store with zero code change).
    * `FOXY_CART_SECRET` is the store's cart-validation secret for signed mode —
    * absent in the unsigned demo (validation OFF), present on preview/live.
+   * These binding names intentionally stay provider-specific for existing
+   * internal developer secrets and provider-side setup.
    */
   FOXY_STORE_SUBDOMAIN?: string;
   /** Branded custom checkout domain override (e.g. checkout.preview.tokenoftrust.com). */
@@ -63,9 +65,8 @@ interface CloudflareEnv {
   FOXY_CART_SECRET?: string;
   /**
    * Order READ API bearer (U2) — the tenant's ToT `partnerApi.apiKey`, sent as
-   * `Authorization: Bearer` to tot-foxycart `GET /commerce/orders`. Server-side
-   * only (never shipped to the browser). Absent → the Orders route reports
-   * `not_provisioned` (503).
+   * `Authorization: Bearer` to the checkout order API. Server-side only (never
+   * shipped to the browser). Absent -> the Orders route reports `not_provisioned`.
    */
   FOXY_ORDER_API_KEY?: string;
 }
@@ -75,6 +76,21 @@ declare global {
   type KVNamespace = KVNamespaceLike;
   type R2Bucket = R2BucketLike;
 
+  /**
+   * Build-time constant (astro.config.mjs Vite `define`): the npm install spec the
+   * cockpit hands out — the EXACT version this build was cut alongside, pinned as
+   * `@tokenoftrust/cli@<version>` (never a floating @latest/@next dist-tag), so the
+   * pasted command installs precisely the CLI this cockpit expects.
+   */
+  const __CLI_INSTALL_SPEC__: string;
+
+  /**
+   * Build-time constant (astro.config.mjs Vite `define`): the commit SHA this build
+   * was cut from, surfaced by GET /health so a probe reveals exactly which code is
+   * live. "unknown" when the build had no git context.
+   */
+  const __GIT_SHA__: string;
+
   namespace App {
     interface Locals {
       /** Tenant resolved from the request Host by src/middleware. */
@@ -116,11 +132,11 @@ declare global {
        */
       cspNonce: string;
       /**
-       * Resolved FoxyCart cart/checkout facts for this request (loader src, cart
-       * URL, mode). Present only for commerce tenants with a FoxyCart store;
+       * Resolved cart/checkout facts for this request (loader src, cart URL,
+       * mode). Present only for commerce tenants with a checkout store;
        * undefined for marketing tenants or when no store is configured.
        */
-      commerce?: ResolvedFoxyCommerce;
+      commerce?: ResolvedManagedCheckout;
       /**
        * Effective, per-environment capability switches (cart/checkout, age
        * verification, excise tax) for this request. Resolved from the tenant's

package/apps/storefront/src/components/admin/{AdminFoxyCartSettingsPanel.astro → AdminCheckoutSettingsPanel.astro}

@@ -1,58 +1,58 @@
 ---
 /**
- * <AdminFoxyCartSettingsPanel> — the "Cart & Checkout appearance (FoxyCart)"
- * settings section. Mirrors the tot-foxycart settings surface (brand colors,
- * per-template-type URLs, store/feature config); each visual field is
+ * <AdminCheckoutSettingsPanel> — the "Cart & Checkout appearance" settings
+ * section. Mirrors the managed checkout settings surface (brand colors,
+ * per-template URLs, store/feature config); each visual field is
  * prepopulated from the tenant's theme (the style-guide) and can be overridden
  * or reset back to that theme default.
  *
  * Presentational at the current admin altitude: the resolve/override/reset MODEL
- * is real (lib/commerce/foxyCartSettings), but SAVE is the tot-foxycart
- * `/theme/foxy` PUT/refresh + Foxy color PATCH seam — surfaced, not faked.
+ * is real (lib/commerce/checkoutSettings), but SAVE is the commerce-service
+ * theme PUT/refresh seam — surfaced, not faked.
  */
-import { getFoxyCartSettingsViewModel } from "@/lib/admin/services/mock";
+import { getCheckoutSettingsViewModel } from "@/lib/admin/services/mock";
 import { resolveAdminTargetTenant } from "@/config/adminTargetTenant";
-import type { FoxyFieldGroup, FoxySettingsField } from "@/lib/commerce/foxyCartSettings";
+import type { CheckoutFieldGroup, CheckoutSettingsField } from "@/lib/commerce/checkoutSettings";
 
 const { envelope } = Astro.props;
 // Resolve the TARGET tenant's config through the resolver seam (config layer),
 // then build the view model from it — lib never reaches into the static map.
 const targetTenant = await resolveAdminTargetTenant(envelope.targetTenant);
-const vm = getFoxyCartSettingsViewModel(envelope, targetTenant);
+const vm = getCheckoutSettingsViewModel(envelope, targetTenant);
 
-const GROUP_META: Record<FoxyFieldGroup, { title: string; blurb: string }> = {
+const GROUP_META: Record<CheckoutFieldGroup, { title: string; blurb: string }> = {
   colors: {
     title: "Brand colors",
-    blurb: "Foxy template colors, prepopulated from this tenant's theme tokens.",
+    blurb: "Hosted checkout colors, prepopulated from this tenant's theme tokens.",
   },
   templates: {
     title: "Templates",
-    blurb: "Per-surface hosted template URLs (checkout, cart, sidecart, receipt, email).",
+    blurb: "Per-surface hosted template URLs (checkout, cart, cart drawer, receipt, email).",
   },
   store: {
     title: "Store & features",
     blurb: "Store identity and checkout feature toggles. No theme default.",
   },
 };
-const GROUP_ORDER: FoxyFieldGroup[] = ["colors", "templates", "store"];
-const byGroup = (g: FoxyFieldGroup) => vm.fields.filter((f) => f.group === g);
+const GROUP_ORDER: CheckoutFieldGroup[] = ["colors", "templates", "store"];
+const byGroup = (g: CheckoutFieldGroup) => vm.fields.filter((f) => f.group === g);
 
-const isColor = (f: FoxySettingsField) => f.kind === "color";
+const isColor = (f: CheckoutSettingsField) => f.kind === "color";
 ---
 
 <div class="panel" id="settings-cart-appearance">
   <div class="panel-head settings-panel-head">
     <h3><svg><use href="#i-gear"></use></svg>Cart &amp; Checkout Appearance</h3>
-    <span class="chip blue">FoxyCart</span>
+    <span class="chip blue">Managed checkout</span>
   </div>
 
   {!vm.hasStore ? (
     <div class="panel-body">
-      <p class="note">This tenant has no FoxyCart store configured, so there is nothing to theme here.</p>
+      <p class="note">This tenant has no hosted checkout store configured, so there is nothing to theme here.</p>
     </div>
   ) : (
     <div class="panel-body grid">
-      <div class="fx-head">
+      <div class="checkout-head">
         <p class="note">
           Values are <b>prepopulated from the theme</b> (the style guide). Override any field, or
           reset it back to the theme default. {vm.overrideCount > 0 ? `${vm.overrideCount} field(s) currently overridden.` : "No overrides yet."}
@@ -63,24 +63,24 @@ const isColor = (f: FoxySettingsField) => f.kind === "color";
       </div>
 
       {GROUP_ORDER.map((g) => (
-        <section class="fx-group">
-          <div class="fx-group-head">
+        <section class="checkout-group">
+          <div class="checkout-group-head">
             <h4>{GROUP_META[g].title}</h4>
             <p>{GROUP_META[g].blurb}</p>
           </div>
-          <div class="fx-fields">
+          <div class="checkout-fields">
             {byGroup(g).map((f) => (
-              <div class="fx-field">
-                <div class="fx-field-label">
+              <div class="checkout-field">
+                <div class="checkout-field-label">
                   <label>{f.label}</label>
                   <span class:list={["chip", f.source === "override" ? "amber" : "green"]}>
                     {f.source === "override" ? "Overridden" : "Theme default"}
                   </span>
                 </div>
 
-                <div class="fx-field-control">
+                <div class="checkout-field-control">
                   {isColor(f) ? (
-                    <span class="fx-swatch" style={`background:${f.value}`} aria-hidden="true"></span>
+                    <span class="checkout-swatch" style={`background:${f.value}`} aria-hidden="true"></span>
                   ) : null}
 
                   {f.kind === "boolean" ? (
@@ -96,98 +96,97 @@ const isColor = (f: FoxySettingsField) => f.kind === "color";
                       type="text"
                       value={String(f.value)}
                       readonly
-                      class:list={["fx-input", { url: f.kind === "url" }]}
+                      class:list={["checkout-input", { url: f.kind === "url" }]}
                     />
                   )}
 
                   {f.resettable && f.source === "override" ? (
-                    <button class="btn ghost fx-reset" type="button" title={`Reset to theme default: ${f.default}`}>
+                    <button class="btn ghost checkout-reset" type="button" title={`Reset to theme default: ${f.default}`}>
                       Reset
                     </button>
                   ) : f.resettable ? (
-                    <span class="fx-default-hint">= theme</span>
+                    <span class="checkout-default-hint">= theme</span>
                   ) : (
-                    <span class="fx-default-hint">no theme default</span>
+                    <span class="checkout-default-hint">no theme default</span>
                   )}
                 </div>
 
-                {f.help ? <p class="fx-help">{f.help}</p> : null}
+                {f.help ? <p class="checkout-help">{f.help}</p> : null}
               </div>
             ))}
           </div>
         </section>
       ))}
 
-      <p class="note fx-seam">
+      <p class="note checkout-seam">
         <svg><use href="#i-alert"></use></svg>
-        Saving writes to tot-foxycart: colors via Foxy <code>template_config.colors</code>, template
-        URLs via <code>PUT /theme/foxy</code> then <code>POST /theme/foxy/refresh</code>. That API hop
-        is not wired in this build.
+        Saving updates the managed checkout theme through the commerce service. That API hop is
+        not wired in this build.
       </p>
     </div>
   )}
 </div>
 
 <style>
-  .fx-head {
+  .checkout-head {
     display: flex;
     gap: 12px;
     align-items: center;
     justify-content: space-between;
     flex-wrap: wrap;
   }
-  .fx-group {
+  .checkout-group {
     border-top: 1px solid var(--admin-line);
     padding-top: 14px;
     margin-top: 4px;
   }
-  .fx-group-head h4 {
+  .checkout-group-head h4 {
     margin: 0;
     font-size: 13px;
   }
-  .fx-group-head p {
+  .checkout-group-head p {
     margin: 2px 0 12px;
     color: var(--admin-muted);
     font-size: 12px;
   }
-  .fx-fields {
+  .checkout-fields {
     display: grid;
     gap: 14px;
   }
-  .fx-field {
+  .checkout-field {
     display: grid;
     gap: 6px;
     padding-bottom: 12px;
     border-bottom: 1px solid var(--admin-line);
   }
-  .fx-field:last-child {
+  .checkout-field:last-child {
     border-bottom: 0;
     padding-bottom: 0;
   }
-  .fx-field-label {
+  .checkout-field-label {
     display: flex;
     align-items: center;
     gap: 10px;
   }
-  .fx-field-label label {
+  .checkout-field-label label {
     font-size: 13px;
     font-weight: 640;
     color: var(--admin-ink);
   }
-  .fx-field-control {
+  .checkout-field-control {
     display: flex;
     align-items: center;
     gap: 8px;
     flex-wrap: wrap;
   }
-  .fx-swatch {
+  .checkout-swatch {
     width: 26px;
     height: 26px;
     border-radius: var(--admin-radius-sm);
     border: 1px solid var(--admin-line-strong);
     flex: none;
   }
-  .fx-input {
+  .checkout-input {
     min-height: 34px;
     padding: 0 10px;
     border: 1px solid var(--admin-line-strong);
@@ -196,31 +195,31 @@ const isColor = (f: FoxySettingsField) => f.kind === "color";
     color: var(--admin-ink);
     min-width: 220px;
   }
-  .fx-input.url {
+  .checkout-input.url {
     min-width: 340px;
     font-family: ui-monospace, Menlo, monospace;
     font-size: 12px;
   }
-  .fx-reset {
+  .checkout-reset {
     font-size: 12px;
   }
-  .fx-default-hint {
+  .checkout-default-hint {
     color: var(--admin-muted);
     font-size: 11px;
   }
-  .fx-help {
+  .checkout-help {
     margin: 0;
     color: var(--admin-muted);
     font-size: 12px;
   }
-  .fx-seam {
+  .checkout-seam {
     display: flex;
     gap: 8px;
     align-items: flex-start;
     border-top: 1px solid var(--admin-line);
     padding-top: 12px;
   }
-  .fx-seam code {
+  .checkout-seam code {
     font-family: ui-monospace, Menlo, monospace;
     font-size: 11px;
   }

package/apps/storefront/src/components/admin/AdminSettingsTab.astro

@@ -1,6 +1,6 @@
 ---
 import { getSettingsViewModel } from "@/lib/admin/services/mock";
-import AdminFoxyCartSettingsPanel from "@/components/admin/AdminFoxyCartSettingsPanel.astro";
+import AdminCheckoutSettingsPanel from "@/components/admin/AdminCheckoutSettingsPanel.astro";
 import { withBase } from "@/lib/basePath";
 
 const { envelope } = Astro.props;
@@ -261,7 +261,7 @@ function formatChangeSummary(change: string): string {
         </div>
       </div>
 
-      <AdminFoxyCartSettingsPanel envelope={envelope} />
+      <AdminCheckoutSettingsPanel envelope={envelope} />
 
       <div class="grid cols-2">
         <div class="panel">