@decocms/start 0.19.0 → 0.21.0

package/.cursor/skills/deco-cms-route-config/SKILL.md

@@ -41,72 +41,41 @@ The catch-all route handles all CMS-managed pages (PDP, PLP, institutional pages
 
 ```typescript
 // src/routes/$.tsx
-import { createFileRoute } from "@tanstack/react-router";
-import { cmsRouteConfig, loadDeferredSection } from "@decocms/start/routes";
+import { createFileRoute, notFound } from "@tanstack/react-router";
+import { cmsRouteConfig, NotFoundPage } from "@decocms/start/routes";
 import { DecoPageRenderer } from "@decocms/start/hooks";
-import type { ResolvedSection, DeferredSection } from "@decocms/start/cms";
-import type { CacheProfile } from "@decocms/start/sdk/cacheHeaders";
-import { cacheHeaders, routeCacheDefaults } from "@decocms/start/sdk/cacheHeaders";
 
-const routeConfig = cmsRouteConfig({
+const config = cmsRouteConfig({
   siteName: "My Store",
   defaultTitle: "My Store - Default Title",
   ignoreSearchParams: ["skuId"],
 });
 
-type PageData = {
-  resolvedSections: ResolvedSection[];
-  deferredSections: DeferredSection[];
-  cacheProfile: CacheProfile;
-  name: string;
-  path: string;
-  params: Record<string, string>;
-} | null;
-
 export const Route = createFileRoute("/$")({
-  ...routeCacheDefaults("listing"),
-  loaderDeps: routeConfig.loaderDeps,
-  loader: routeConfig.loader as any,
-  headers: ({ loaderData }) => {
-    const data = loaderData as PageData;
-    return cacheHeaders(data?.cacheProfile ?? "listing");
-  },
-  head: ({ loaderData }) => {
-    const data = loaderData as PageData;
-    return {
-      meta: [
-        {
-          title: data?.name
-            ? `${data.name} | My Store`
-            : "My Store - Default Title",
-        },
-      ],
-    };
+  loaderDeps: config.loaderDeps,
+  loader: async (ctx) => {
+    const page = await config.loader(ctx);
+    if (!page) throw notFound();
+    return page;
   },
   component: CmsPage,
   notFoundComponent: NotFoundPage,
+  staleTime: config.staleTime,
+  gcTime: config.gcTime,
+  headers: config.headers,
+  head: config.head,
 });
 
 function CmsPage() {
-  const data = Route.useLoaderData() as PageData;
-  const { _splat } = Route.useParams();
-  const actualPath = `/${_splat ?? ""}`;
-
-  if (!data) return <NotFoundPage />;
-
+  const page = Route.useLoaderData();
   return (
-    <DecoPageRenderer
-      sections={data.resolvedSections ?? []}
-      deferredSections={data.deferredSections ?? []}
-      pagePath={actualPath}
-      loadDeferredSectionFn={(d) => loadDeferredSection({ data: d }) as Promise<ResolvedSection | null>}
-    />
+    <div>
+      <DecoPageRenderer sections={page.resolvedSections} />
+    </div>
   );
 }
 ```
 
-**CRITICAL**: The `...routeCacheDefaults("listing")` spread is essential. Without it, every SPA navigation triggers a full server re-fetch even when the data was just loaded seconds ago. This is the most common cause of perceived slow navigation.
-
 ### `cmsRouteConfig` Options
 
 ```typescript
@@ -183,41 +152,27 @@ Hardcoded to `/` path — no params, no deps.
 ```typescript
 // src/routes/index.tsx
 import { createFileRoute } from "@tanstack/react-router";
-import { cmsHomeRouteConfig, loadDeferredSection } from "@decocms/start/routes";
+import { cmsHomeRouteConfig } from "@decocms/start/routes";
 import { DecoPageRenderer } from "@decocms/start/hooks";
-import type { ResolvedSection, DeferredSection } from "@decocms/start/cms";
 
-const homeConfig = cmsHomeRouteConfig({
+const config = cmsHomeRouteConfig({
   defaultTitle: "My Store - Homepage",
 });
 
-type HomeData = {
-  resolvedSections: ResolvedSection[];
-  deferredSections: DeferredSection[];
-} | null;
-
 export const Route = createFileRoute("/")({
-  ...homeConfig,
+  ...config,
   component: HomePage,
 });
 
 function HomePage() {
-  const data = Route.useLoaderData() as HomeData;
-  if (!data) return null;
-
-  return (
-    <DecoPageRenderer
-      sections={data.resolvedSections ?? []}
-      deferredSections={data.deferredSections ?? []}
-      pagePath="/"
-      loadDeferredSectionFn={(d) => loadDeferredSection({ data: d }) as Promise<ResolvedSection | null>}
-    />
-  );
+  const page = Route.useLoaderData();
+  if (!page) {
+    return <div>Loading...</div>;
+  }
+  return <DecoPageRenderer sections={page.resolvedSections} />;
 }
 ```
 
-`cmsHomeRouteConfig` already includes `routeCacheDefaults("static")` and `cacheHeaders("static")`, giving the homepage a 5-min client staleTime and 24h edge TTL. Do NOT add additional cache config.
-
 ### `cmsHomeRouteConfig` Options
 
 ```typescript
@@ -353,17 +308,15 @@ The root route contains site-specific elements that should NOT be in the framewo
 
 ### Production
 
-Set by `routeCacheDefaults(profile)` based on page type (from `cacheHeaders.ts`):
+Set by `routeCacheDefaults(profile)` based on page type:
 
 | Profile | staleTime | gcTime |
 |---------|-----------|--------|
 | static | 5 min | 30 min |
-| product | 1 min | 5 min |
-| listing | 1 min | 5 min |
-| search | 30s | 2 min |
-| cart | 0 | 0 |
+| product | 5 min | 30 min |
+| listing | 2 min | 10 min |
+| search | 60s | 5 min |
 | private | 0 | 0 |
-| none | 0 | 0 |
 
 ### Development
 

package/.cursor/skills/deco-edge-caching/SKILL.md

@@ -181,116 +181,6 @@ const cachedPLP = createCachedLoader("vtex/plp", vtexPLP, {
 
 This is per-isolate in-memory cache (V8 Map). Resets on cold start. Includes request deduplication (single-flight) and LRU eviction at 500 entries.
 
-## Cache Versioning with BUILD_HASH
-
-Deploy-time cache busting uses a `BUILD_HASH` environment variable (typically the git short SHA) passed to `wrangler deploy`. The worker-entry appends this to cache keys so deploying a new version automatically serves fresh content.
-
-```yaml
-# .github/workflows/deploy.yml
-- name: Deploy to Cloudflare Workers
-  run: npx wrangler deploy
-  env:
-    BUILD_HASH: ${{ github.sha }}
-```
-
-The worker-entry reads `env.BUILD_HASH` and injects it into cache keys. On new deploys, old cache entries simply expire naturally — no purge needed.
-
-## Site-Level Cache Pattern Registration
-
-For sites with known institutional/static pages that would otherwise get the conservative 2-min "listing" TTL, register explicit patterns in `setup.ts`:
-
-```ts
-// setup.ts
-import { registerCachePattern } from "@decocms/start/sdk/cacheHeaders";
-
-// Institutional pages — content changes rarely, promote to 24h edge TTL
-registerCachePattern({
-  test: (p) =>
-    p.startsWith("/institucional") ||
-    p.startsWith("/central-de-atendimento") ||
-    p.startsWith("/politica-de-") ||
-    p.startsWith("/termos-") ||
-    p === "/fale-conosco" ||
-    p === "/trabalhe-conosco" ||
-    p === "/cadastro" ||
-    p === "/televendas",
-  profile: "static",
-});
-
-// Promotional/collection pages — already listing-like, but explicit is better
-registerCachePattern({
-  test: (p) =>
-    p.startsWith("/ofertas") ||
-    p.startsWith("/b/") ||
-    p.startsWith("/festival-"),
-  profile: "listing",
-});
-```
-
-Custom patterns are evaluated before built-in ones. This is the recommended way to tune caching per-site without modifying the framework.
-
-## Client-Side Route Caching (routeCacheDefaults)
-
-Without `routeCacheDefaults`, every SPA navigation triggers a fresh server request even if the data was just loaded. This is the most common cause of "slow navigation" reports.
-
-The catch-all route `$.tsx` MUST include `routeCacheDefaults`:
-
-```ts
-export const Route = createFileRoute("/$")({
-  ...routeCacheDefaults("listing"),   // <-- client-side cache: 1min stale, 5min gc
-  loaderDeps: routeConfig.loaderDeps,
-  loader: routeConfig.loader,
-  headers: ({ loaderData }) => {
-    return cacheHeaders(loaderData?.cacheProfile ?? "listing");
-  },
-  component: CmsPage,
-});
-```
-
-The homepage should use `cmsHomeRouteConfig` which already includes `routeCacheDefaults("static")`:
-
-```ts
-export const Route = createFileRoute("/")({
-  ...cmsHomeRouteConfig({ defaultTitle: "My Store" }),
-  component: HomePage,
-});
-```
-
-## Cache Analysis & Debugging with Stats Lake
-
-Deco sites emit CDN usage data to a ClickHouse stats-lake. This enables cache performance analysis:
-
-```sql
--- Cache status breakdown for a site
-SELECT
-  JSONExtractString(extra, 'cacheStatus') AS cache_status,
-  count() AS requests,
-  round(count() * 100.0 / sum(count()) OVER (), 2) AS pct
-FROM fact_usage_daily
-WHERE site_id = <site_id>
-  AND date >= today() - 7
-GROUP BY cache_status
-ORDER BY requests DESC;
-```
-
-### Understanding "unknown" Cache Status
-
-When the Cloudflare Worker uses `caches.default.match()/put()` to serve cached responses internally, the outer CDN reports `cf-cache-status: DYNAMIC` because the Worker is the origin. The stats-lake logs this as "unknown" or empty.
-
-This means a high "unknown" percentage does NOT indicate a caching problem — it means the Worker's internal Cache API is handling the request before it reaches the origin CDN layer. This is expected and desirable behavior.
-
-To verify actual cache performance:
-1. Check `X-Cache: HIT|MISS` header (set by the worker-entry)
-2. Check `X-Cache-Profile` header (shows which profile was detected)
-3. Query stats-lake grouping by `cacheStatus` AND response status codes
-
-### Comparing Staging vs Production Cache
-
-When migrating to TanStack Workers, compare cache metrics:
-- Production (Deno/Fresh on Kubernetes) typically shows high HIT rates because traffic volume keeps caches warm
-- Staging Workers may show lower HIT rates due to lower traffic, plus "unknown" status from internal Cache API
-- The "unknown" requests on Workers are functionally equivalent to HITs — they're served from the Worker's Cache API without hitting the origin server function
-
 ## Key Constraints
 
 - **Cache API ignores `s-maxage`** — the factory uses `max-age` equal to `sMaxAge` when storing in Cache API
@@ -298,8 +188,6 @@ When migrating to TanStack Workers, compare cache metrics:
 - **Device keys add a query param** — `__cf_device=mobile|desktop` is appended to cache keys, so purging must clear both
 - **Non-200 responses are never cached** — only 200 OK goes into Cache API
 - **`/_server` paths always bypass cache** — TanStack Start RPC requests are never edge-cached
-- **UTM parameters are stripped** — `utm_*`, `gclid`, `fbclid` are removed from cache keys to improve hit rates
-- **Segment hashing** — user segments (from matchers/flags) are hashed into the cache key so different audiences get different cached responses
 
 ## Package Exports
 

package/.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
 
 permissions:
   contents: write
-  packages: write
+  id-token: write
   issues: write
   pull-requests: write
 
@@ -23,10 +23,11 @@ jobs:
           node-version: 22
           registry-url: https://registry.npmjs.org
 
+      - run: npm install -g npm@latest
+
       - run: npm install
 
       - name: Release
         run: npx semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.releaserc.json

@@ -15,7 +15,10 @@
       ]
     }],
     "@semantic-release/release-notes-generator",
-    "@semantic-release/npm",
+    ["@semantic-release/exec", {
+      "prepareCmd": "npm version ${nextRelease.version} --no-git-tag-version",
+      "publishCmd": "npm publish --access public"
+    }],
     "@semantic-release/github",
     ["@semantic-release/git", {
       "assets": ["package.json"],

package/README.md

@@ -0,0 +1,84 @@
+# @decocms/start
+
+[![npm version](https://img.shields.io/npm/v/@decocms/start.svg)](https://www.npmjs.com/package/@decocms/start)
+[![license](https://img.shields.io/npm/l/@decocms/start.svg)](https://github.com/decocms/deco-start/blob/main/LICENSE)
+
+Framework layer for [Deco](https://deco.cx) storefronts built on **TanStack Start + React 19 + Cloudflare Workers**.
+
+Provides CMS block resolution, admin protocol handlers, section rendering, schema generation, edge caching, and SDK utilities. This is **not** a storefront — it's the npm package that storefronts depend on.
+
+## Install
+
+```bash
+npm install @decocms/start
+```
+
+## Architecture
+
+```
+@decocms/start        ← Framework (this package)
+  └─ @decocms/apps    ← Commerce integrations (VTEX, Shopify)
+       └─ site repo   ← UI components, routes, styles
+```
+
+### Package Exports
+
+| Import | Purpose |
+|--------|---------|
+| `@decocms/start` | Barrel export |
+| `@decocms/start/cms` | Block loading, page resolution, section registry |
+| `@decocms/start/admin` | Admin protocol (meta, decofile, invoke, render, schema) |
+| `@decocms/start/hooks` | DecoPageRenderer, LiveControls, LazySection |
+| `@decocms/start/routes` | CMS route config, admin routes |
+| `@decocms/start/middleware` | Observability, deco state, liveness probe |
+| `@decocms/start/sdk/workerEntry` | Cloudflare Worker entry with edge caching |
+| `@decocms/start/sdk/cacheHeaders` | URL-to-profile cache detection |
+| `@decocms/start/sdk/cachedLoader` | In-flight dedup for loaders |
+| `@decocms/start/sdk/useScript` | Inline `<script>` with minification |
+| `@decocms/start/sdk/useDevice` | SSR-safe device detection |
+| `@decocms/start/sdk/analytics` | Analytics event types |
+| `@decocms/start/matchers/*` | Feature flag matchers (PostHog, built-ins) |
+| `@decocms/start/types` | Section, App, FnContext type definitions |
+| `@decocms/start/scripts/*` | Code generation (blocks, schema, invoke) |
+
+### Worker Entry Request Flow
+
+```
+Request → createDecoWorkerEntry()
+ ├─ Admin routes (/live/_meta, /.decofile, /deco/render, /deco/invoke)
+ ├─ Cache purge check
+ ├─ Static asset bypass (/assets/*, favicon)
+ ├─ Cloudflare edge cache (profile-based TTLs)
+ └─ TanStack Start server entry
+```
+
+### Edge Cache Profiles
+
+| URL Pattern | Profile | Edge TTL |
+|-------------|---------|----------|
+| `/` | static | 1 day |
+| `*/p` | product | 5 min |
+| `/s`, `?q=` | search | 60s |
+| `/cart`, `/checkout` | private | none |
+| Everything else | listing | 2 min |
+
+## Peer Dependencies
+
+- `@tanstack/react-start` >= 1.0.0
+- `@tanstack/store` >= 0.7.0
+- `react` ^19.0.0
+- `react-dom` ^19.0.0
+
+## Development
+
+```bash
+npm run typecheck   # tsc --noEmit
+npm run lint        # biome check
+npm run check       # typecheck + lint + unused exports
+```
+
+This is a library — no dev server. Consumer sites run their own `vite dev`.
+
+## License
+
+MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/start",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "type": "module",
   "description": "Deco framework for TanStack Start - CMS bridge, admin protocol, hooks, schema generation",
   "main": "./src/index.ts",
@@ -76,6 +76,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.6",
+    "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
     "@tanstack/store": "^0.9.1",
     "@types/react": "^19.0.0",

package/src/admin/schema.ts

@@ -238,6 +238,110 @@ registerMatcherSchemas([
       },
     },
   },
+  {
+    key: "website/matchers/location.ts",
+    title: "Location",
+    namespace: "website",
+    propsSchema: {
+      type: "object",
+      properties: {
+        includeLocations: {
+          type: "array",
+          title: "Include Locations",
+          items: {
+            type: "object",
+            properties: {
+              country: { type: "string", title: "Country" },
+              regionCode: { type: "string", title: "Region" },
+              city: { type: "string", title: "City" },
+            },
+          },
+        },
+        excludeLocations: {
+          type: "array",
+          title: "Exclude Locations",
+          items: {
+            type: "object",
+            properties: {
+              country: { type: "string", title: "Country" },
+              regionCode: { type: "string", title: "Region" },
+              city: { type: "string", title: "City" },
+            },
+          },
+        },
+      },
+    },
+  },
+  {
+    key: "website/matchers/userAgent.ts",
+    title: "User Agent",
+    namespace: "website",
+    propsSchema: {
+      type: "object",
+      properties: {
+        includes: { type: "string", title: "Includes (substring)" },
+        match: { type: "string", title: "Match (regex)" },
+      },
+    },
+  },
+  {
+    key: "website/matchers/environment.ts",
+    title: "Environment",
+    namespace: "website",
+    propsSchema: {
+      type: "object",
+      properties: {
+        environment: {
+          type: "string",
+          title: "Environment",
+          enum: ["production", "development"],
+        },
+      },
+    },
+  },
+  {
+    key: "website/matchers/multi.ts",
+    title: "Multi (AND/OR)",
+    namespace: "website",
+    propsSchema: {
+      type: "object",
+      properties: {
+        op: {
+          type: "string",
+          title: "Operator",
+          enum: ["and", "or"],
+          default: "and",
+        },
+        matchers: {
+          type: "array",
+          title: "Matchers",
+          items: {
+            type: "object",
+            required: ["__resolveType"],
+            properties: { __resolveType: { type: "string" } },
+            additionalProperties: true,
+          },
+        },
+      },
+    },
+  },
+  {
+    key: "website/matchers/negate.ts",
+    title: "Negate (NOT)",
+    namespace: "website",
+    propsSchema: {
+      type: "object",
+      properties: {
+        matcher: {
+          type: "object",
+          title: "Matcher",
+          required: ["__resolveType"],
+          properties: { __resolveType: { type: "string" } },
+          additionalProperties: true,
+        },
+      },
+    },
+  },
 ]);
 
 function buildLoaderDefinitions() {

package/src/cms/index.ts

@@ -35,6 +35,7 @@ export type {
 } from "./resolve";
 export {
   addSkipResolveType,
+  evaluateMatcher,
   getAsyncRenderingConfig,
   onBeforeResolve,
   registerCommerceLoader,

package/src/cms/registry.ts

@@ -132,16 +132,44 @@ export async function preloadSectionComponents(keys: string[]): Promise<void> {
   );
 }
 
+/**
+ * A sync section entry: either a plain component reference or a full module
+ * object with optional LoadingFallback and ErrorFallback.
+ * Providing the full module allows DeferredSectionWrapper to show the correct
+ * skeleton immediately (optionsReady=true on first render) without waiting for
+ * the async preloadSectionModule() call.
+ */
+export type SyncSectionEntry =
+  | ComponentType<any>
+  | {
+      default: ComponentType<any>;
+      LoadingFallback?: ComponentType<any>;
+      ErrorFallback?: ComponentType<{ error: Error }>;
+    };
+
 /**
  * Register sections with their already-imported component references.
  * These are available synchronously on both server and client — no dynamic
  * import, no React.lazy, no Suspense. Use for critical above-the-fold
  * sections that must never flash during hydration.
+ *
+ * Accepts either a plain component or a full module object (with optional
+ * LoadingFallback / ErrorFallback). Providing the module object populates
+ * sectionOptions immediately, so DeferredSectionWrapper can show the correct
+ * skeleton without an extra async preloadSectionModule() round-trip.
  */
-export function registerSectionsSync(sections: Record<string, ComponentType<any>>): void {
-  for (const [key, component] of Object.entries(sections)) {
+export function registerSectionsSync(sections: Record<string, SyncSectionEntry>): void {
+  for (const [key, entry] of Object.entries(sections)) {
+    const component = typeof entry === "function" ? entry : entry.default;
     syncComponents[key] = component;
     resolvedComponents[key] = component;
+
+    if (typeof entry !== "function") {
+      const opts: SectionOptions = { ...sectionOptions[key] };
+      if (entry.LoadingFallback) opts.loadingFallback = entry.LoadingFallback;
+      if (entry.ErrorFallback) opts.errorFallback = entry.ErrorFallback;
+      sectionOptions[key] = opts;
+    }
   }
 }
 

package/src/cms/resolve.ts

@@ -237,7 +237,7 @@ function ensureInitialized() {
 // Matcher evaluation
 // ---------------------------------------------------------------------------
 
-function evaluateMatcher(rule: Record<string, unknown> | undefined, ctx: MatcherContext): boolean {
+export function evaluateMatcher(rule: Record<string, unknown> | undefined, ctx: MatcherContext): boolean {
   if (!rule) return true;
 
   const resolveType = rule.__resolveType as string | undefined;

package/src/hooks/DecoPageRenderer.tsx

@@ -81,6 +81,40 @@ import { isDevMode } from "../sdk/env";
 
 const isDev = isDevMode();
 
+// ---------------------------------------------------------------------------
+// Deferred section data cache — persists resolved section props across SPA
+// navigations so navigating back to a page doesn't re-fetch already-loaded
+// sections. TTL is aligned with cmsRouteConfig staleTime (5 min prod / 5s dev).
+// ---------------------------------------------------------------------------
+
+const DEFERRED_CACHE_TTL = isDev ? 5_000 : 5 * 60 * 1000;
+
+interface DeferredCacheEntry {
+  section: ResolvedSection;
+  ts: number;
+}
+
+const deferredSectionCache = new Map<string, DeferredCacheEntry>();
+
+function getCachedDeferredSection(stableKey: string): ResolvedSection | null {
+  const entry = deferredSectionCache.get(stableKey);
+  if (!entry) return null;
+  if (Date.now() - entry.ts > DEFERRED_CACHE_TTL) {
+    deferredSectionCache.delete(stableKey);
+    return null;
+  }
+  return entry.section;
+}
+
+/** Fast DJB2 hash for cache key differentiation. */
+function djb2(str: string): string {
+  let hash = 5381;
+  for (let i = 0; i < str.length; i++) {
+    hash = ((hash << 5) + hash + str.charCodeAt(i)) | 0;
+  }
+  return (hash >>> 0).toString(36);
+}
+
 const DEFERRED_FADE_CSS = `@keyframes decoFadeIn{from{opacity:0}to{opacity:1}}`;
 
 function FadeInStyle() {
@@ -191,8 +225,11 @@ function DeferredSectionWrapper({
   errorFallback,
   loadFn,
 }: DeferredSectionWrapperProps) {
-  const stableKey = `${pagePath}::${deferred.component}::${deferred.index}`;
-  const [section, setSection] = useState<ResolvedSection | null>(null);
+  const propsHash = djb2(JSON.stringify(deferred.rawProps));
+  const stableKey = `${pagePath}::${deferred.component}::${deferred.index}::${propsHash}`;
+  const [section, setSection] = useState<ResolvedSection | null>(() =>
+    typeof document === "undefined" ? null : getCachedDeferredSection(stableKey),
+  );
   const [error, setError] = useState<Error | null>(null);
   const [loadedOptions, setLoadedOptions] = useState<SectionOptions | undefined>(() =>
     getSectionOptions(deferred.component),
@@ -208,7 +245,8 @@ function DeferredSectionWrapper({
   if (prevKeyRef.current !== stableKey) {
     prevKeyRef.current = stableKey;
     triggered.current = false;
-    if (section) setSection(null);
+    const cached = getCachedDeferredSection(stableKey);
+    if (section !== cached) setSection(cached);
     if (error) setError(null);
   }
 
@@ -240,12 +278,16 @@ function DeferredSectionWrapper({
 
     if (typeof IntersectionObserver === "undefined") {
       triggered.current = true;
+      const key0 = stableKey;
       loadFn({
         component: deferred.component,
         rawProps: deferred.rawProps,
         pagePath,
       })
-        .then(setSection)
+        .then((result) => {
+          if (result) deferredSectionCache.set(key0, { section: result, ts: Date.now() });
+          setSection(result);
+        })
         .catch((e) => setError(e));
       return;
     }
@@ -255,12 +297,16 @@ function DeferredSectionWrapper({
         if (entry?.isIntersecting && !triggered.current) {
           triggered.current = true;
           observer.disconnect();
+          const key1 = stableKey;
           loadFn({
             component: deferred.component,
             rawProps: deferred.rawProps,
             pagePath,
           })
-            .then(setSection)
+            .then((result) => {
+              if (result) deferredSectionCache.set(key1, { section: result, ts: Date.now() });
+              setSection(result);
+            })
             .catch((e) => setError(e));
         }
       },

package/src/matchers/builtins.ts

@@ -3,7 +3,8 @@
  *
  * These augment the matchers already handled inline in resolve.ts
  * (always, never, device, random, utm) with the additional matchers
- * that deco supported: cookie, cron, host, pathname, queryString.
+ * that deco supported: cookie, cron, host, pathname, queryString,
+ * location, userAgent, environment, multi, negate.
  *
  * Register these at startup:
  *
@@ -15,7 +16,7 @@
  */
 
 import type { MatcherContext } from "../cms/resolve";
-import { registerMatcher } from "../cms/resolve";
+import { evaluateMatcher, registerMatcher } from "../cms/resolve";
 
 // -------------------------------------------------------------------------
 // Cookie matcher
@@ -163,6 +164,175 @@ function queryStringMatcher(rule: Record<string, unknown>, ctx: MatcherContext):
   }
 }
 
+// -------------------------------------------------------------------------
+// Location matcher
+// -------------------------------------------------------------------------
+
+/**
+ * CF country codes -> CMS country name mapping.
+ * The CMS stores country as full names ("Brasil"), CF provides ISO codes ("BR").
+ */
+const COUNTRY_NAME_TO_CODE: Record<string, string> = {
+  Brasil: "BR", Brazil: "BR",
+  Argentina: "AR", Chile: "CL",
+  Colombia: "CO", Mexico: "MX", "México": "MX",
+  Peru: "PE", "Perú": "PE",
+  Uruguay: "UY", Paraguay: "PY",
+  Bolivia: "BO", Ecuador: "EC",
+  Venezuela: "VE",
+  "United States": "US", USA: "US",
+  "Estados Unidos": "US",
+  Spain: "ES", "España": "ES",
+  Portugal: "PT",
+  Canada: "CA", "Canadá": "CA",
+  Germany: "DE", Alemania: "DE", Deutschland: "DE",
+  France: "FR", Francia: "FR",
+  Italy: "IT", Italia: "IT",
+  "United Kingdom": "GB", UK: "GB",
+  Japan: "JP", "Japón": "JP",
+  China: "CN",
+  Australia: "AU",
+  "South Korea": "KR",
+  India: "IN",
+  Netherlands: "NL",
+  Switzerland: "CH",
+  Sweden: "SE",
+  Norway: "NO",
+  Denmark: "DK",
+  Finland: "FI",
+  Belgium: "BE",
+  Austria: "AT",
+  Ireland: "IE",
+  "New Zealand": "NZ",
+  "South Africa": "ZA",
+  Israel: "IL",
+  "Saudi Arabia": "SA",
+  "United Arab Emirates": "AE",
+  Turkey: "TR", "Türkiye": "TR",
+  Poland: "PL",
+  "Czech Republic": "CZ", Czechia: "CZ",
+  Romania: "RO",
+  Hungary: "HU",
+  Greece: "GR",
+  Croatia: "HR",
+  "Costa Rica": "CR",
+  Panama: "PA", "Panamá": "PA",
+  "Dominican Republic": "DO",
+  Guatemala: "GT",
+  Honduras: "HN",
+  "El Salvador": "SV",
+  Nicaragua: "NI",
+  Cuba: "CU",
+  "Puerto Rico": "PR",
+};
+
+interface LocationRule {
+  country?: string;
+  regionCode?: string;
+  city?: string;
+}
+
+function matchesLocationRule(
+  loc: LocationRule,
+  regionName: string,
+  regionCode: string,
+  country: string,
+  city: string,
+): boolean {
+  if (loc.country) {
+    const code = COUNTRY_NAME_TO_CODE[loc.country] ?? loc.country;
+    if (code.toUpperCase() !== country.toUpperCase()) return false;
+  }
+  if (loc.regionCode) {
+    // Match against both the short code ("SP") and full name ("São Paulo")
+    // so rules authored against either format continue working.
+    const ruleVal = loc.regionCode.toLowerCase();
+    if (regionCode.toLowerCase() !== ruleVal && regionName.toLowerCase() !== ruleVal) return false;
+  }
+  if (loc.city && loc.city.toLowerCase() !== city.toLowerCase()) return false;
+  return true;
+}
+
+function locationMatcher(rule: Record<string, unknown>, ctx: MatcherContext): boolean {
+  const cookies = ctx.cookies ?? {};
+  const regionName = cookies.__cf_geo_region ? decodeURIComponent(cookies.__cf_geo_region) : "";
+  const regionCode = cookies.__cf_geo_region_code ? decodeURIComponent(cookies.__cf_geo_region_code) : "";
+  const country = cookies.__cf_geo_country ? decodeURIComponent(cookies.__cf_geo_country) : "";
+  const city = cookies.__cf_geo_city ? decodeURIComponent(cookies.__cf_geo_city) : "";
+
+  const includeLocations = rule.includeLocations as LocationRule[] | undefined;
+  const excludeLocations = rule.excludeLocations as LocationRule[] | undefined;
+
+  if (excludeLocations?.some((loc) => matchesLocationRule(loc, regionName, regionCode, country, city))) {
+    return false;
+  }
+  if (includeLocations?.length) {
+    return includeLocations.some((loc) => matchesLocationRule(loc, regionName, regionCode, country, city));
+  }
+  return true;
+}
+
+// -------------------------------------------------------------------------
+// User Agent matcher
+// -------------------------------------------------------------------------
+
+function userAgentMatcher(rule: Record<string, unknown>, ctx: MatcherContext): boolean {
+  const ua = ctx.userAgent ?? "";
+  const includes = rule.includes as string | undefined;
+  const match = rule.match as string | undefined;
+
+  if (includes && !ua.includes(includes)) return false;
+  if (match) {
+    if (!isSafePattern(match)) return false;
+    try {
+      if (!new RegExp(match, "i").test(ua)) return false;
+    } catch {
+      return false;
+    }
+  }
+  return true;
+}
+
+// -------------------------------------------------------------------------
+// Environment matcher
+// -------------------------------------------------------------------------
+
+function environmentMatcher(rule: Record<string, unknown>, _ctx: MatcherContext): boolean {
+  const environment = rule.environment as string | undefined;
+  if (!environment) return true;
+
+  const isProd =
+    typeof process !== "undefined" && process.env?.NODE_ENV === "production";
+
+  if (environment === "production") return isProd;
+  if (environment === "development") return !isProd;
+  return false;
+}
+
+// -------------------------------------------------------------------------
+// Multi matcher (AND/OR combinator)
+// -------------------------------------------------------------------------
+
+function multiMatcher(rule: Record<string, unknown>, ctx: MatcherContext): boolean {
+  const op = (rule.op as string) ?? "and";
+  const matchers = rule.matchers as Array<Record<string, unknown>> | undefined;
+
+  if (!matchers?.length) return true;
+
+  const results = matchers.map((m) => evaluateMatcher(m, ctx));
+  return op === "or" ? results.some(Boolean) : results.every(Boolean);
+}
+
+// -------------------------------------------------------------------------
+// Negate matcher
+// -------------------------------------------------------------------------
+
+function negateMatcher(rule: Record<string, unknown>, ctx: MatcherContext): boolean {
+  const matcher = rule.matcher as Record<string, unknown> | undefined;
+  if (!matcher) return false;
+  return !evaluateMatcher(matcher, ctx);
+}
+
 // -------------------------------------------------------------------------
 // Registration
 // -------------------------------------------------------------------------
@@ -181,4 +351,9 @@ export function registerBuiltinMatchers(): void {
   registerMatcher("website/matchers/host.ts", hostMatcher);
   registerMatcher("website/matchers/pathname.ts", pathnameMatcher);
   registerMatcher("website/matchers/queryString.ts", queryStringMatcher);
+  registerMatcher("website/matchers/location.ts", locationMatcher);
+  registerMatcher("website/matchers/userAgent.ts", userAgentMatcher);
+  registerMatcher("website/matchers/environment.ts", environmentMatcher);
+  registerMatcher("website/matchers/multi.ts", multiMatcher);
+  registerMatcher("website/matchers/negate.ts", negateMatcher);
 }

package/src/sdk/workerEntry.ts

@@ -274,6 +274,48 @@ function buildPreviewShell(): string {
 </html>`;
 }
 
+// ---------------------------------------------------------------------------
+// Cloudflare geo cookie injection
+// ---------------------------------------------------------------------------
+
+/**
+ * Inject Cloudflare geo data as cookies so matchers (location.ts) can
+ * read them from MatcherContext.cookies without relying on request.cf.
+ *
+ * Call this on the incoming request before passing it to the worker entry.
+ * Only needed in production Cloudflare Workers where `request.cf` is populated.
+ *
+ * @example
+ * ```ts
+ * export default {
+ *   async fetch(request, env, ctx) {
+ *     return handler.fetch(injectGeoCookies(request), env, ctx);
+ *   }
+ * };
+ * ```
+ */
+export function injectGeoCookies(request: Request): Request {
+  const cf = (request as unknown as { cf?: Record<string, string> }).cf;
+  if (!cf) return request;
+
+  const parts: string[] = [];
+  if (cf.region) parts.push(`__cf_geo_region=${encodeURIComponent(cf.region)}`);
+  if (cf.country) parts.push(`__cf_geo_country=${encodeURIComponent(cf.country)}`);
+  if (cf.city) parts.push(`__cf_geo_city=${encodeURIComponent(cf.city)}`);
+  if (cf.latitude) parts.push(`__cf_geo_lat=${encodeURIComponent(cf.latitude)}`);
+  if (cf.longitude) parts.push(`__cf_geo_lng=${encodeURIComponent(cf.longitude)}`);
+  if (cf.regionCode) parts.push(`__cf_geo_region_code=${encodeURIComponent(cf.regionCode)}`);
+
+  if (!parts.length) return request;
+
+  const existing = request.headers.get("cookie") ?? "";
+  const combined = existing ? `${existing}; ${parts.join("; ")}` : parts.join("; ");
+  const headers = new Headers(request.headers);
+  headers.set("cookie", combined);
+
+  return new Request(request, { headers });
+}
+
 const MOBILE_RE = /mobile|android|iphone|ipad|ipod/i;
 const ONE_YEAR = 31536000;
 
@@ -371,6 +413,19 @@ export function createDecoWorkerEntry(
       }
     }
 
+    // Include CF geo data in cache key so location matcher results don't leak
+    // across different geos. Applies to both segment and device-based keys.
+    const cf = (request as unknown as { cf?: Record<string, string> }).cf;
+    if (cf) {
+      const geoParts: string[] = [];
+      if (cf.country) geoParts.push(cf.country);
+      if (cf.region) geoParts.push(cf.region);
+      if (cf.city) geoParts.push(cf.city);
+      if (geoParts.length) {
+        url.searchParams.set("__cf_geo", geoParts.join("|"));
+      }
+    }
+
     if (buildSegment) {
       const segment = buildSegment(request);
       url.searchParams.set("__seg", hashSegment(segment));
@@ -397,7 +452,7 @@ export function createDecoWorkerEntry(
       return new Response("Unauthorized", { status: 401 });
     }
 
-    let body: { paths?: string[] };
+    let body: { paths?: string[]; countries?: string[] };
     try {
       body = await request.json();
     } catch {
@@ -409,6 +464,12 @@ export function createDecoWorkerEntry(
       return new Response('Body must include "paths": ["/", "/page"]', { status: 400 });
     }
 
+    // Geo strings to purge location-specific cache variants.
+    // Pass ["BR", "BR|São Paulo|Curitiba", ...] to purge specific geo variants.
+    // Each string must match the __cf_geo param format: "country|region|city".
+    // When omitted, only the non-geo cache entry is purged.
+    const geoVariants = body.countries ?? [];
+
     const cache =
       typeof caches !== "undefined"
         ? ((caches as unknown as { default?: Cache }).default ?? null)
@@ -432,33 +493,44 @@ export function createDecoWorkerEntry(
         ]
       : [];
 
+    // Purge both without geo (non-geo-targeted) and with each specified geo variant
+    const geoKeys: (string | null)[] = [null, ...geoVariants];
+
     for (const p of paths) {
       if (buildSegment && segments.length > 0) {
         for (const seg of segments) {
-          const url = new URL(p, baseUrl);
-          url.searchParams.set("__seg", hashSegment(seg));
-          const key = new Request(url.toString(), { method: "GET" });
-          try {
-            if (await cache.delete(key)) {
-              purged.push(`${p} (${hashSegment(seg)})`);
+          for (const cc of geoKeys) {
+            const url = new URL(p, baseUrl);
+            url.searchParams.set("__seg", hashSegment(seg));
+            if (cc) url.searchParams.set("__cf_geo", cc);
+            const key = new Request(url.toString(), { method: "GET" });
+            try {
+              if (await cache.delete(key)) {
+                const label = cc ? `${p} (${hashSegment(seg)}, ${cc})` : `${p} (${hashSegment(seg)})`;
+                purged.push(label);
+              }
+            } catch {
+              /* ignore */
             }
-          } catch {
-            /* ignore */
           }
         }
       } else {
         const devices = deviceSpecificKeys ? (["mobile", "desktop"] as const) : ([null] as const);
 
         for (const device of devices) {
-          const url = new URL(p, baseUrl);
-          if (device) url.searchParams.set("__cf_device", device);
-          const key = new Request(url.toString(), { method: "GET" });
-          try {
-            if (await cache.delete(key)) {
-              purged.push(device ? `${p} (${device})` : p);
+          for (const cc of geoKeys) {
+            const url = new URL(p, baseUrl);
+            if (device) url.searchParams.set("__cf_device", device);
+            if (cc) url.searchParams.set("__cf_geo", cc);
+            const key = new Request(url.toString(), { method: "GET" });
+            try {
+              if (await cache.delete(key)) {
+                const parts = [device, cc].filter(Boolean).join(", ");
+                purged.push(parts ? `${p} (${parts})` : p);
+              }
+            } catch {
+              /* ignore */
             }
-          } catch {
-            /* ignore */
           }
         }
       }