create-kywi-app 0.6.0 → 0.6.1

package/lib/templates.mjs

@@ -828,6 +828,10 @@ import {
   setAccessCookie,
   clearSessionCookies,
 } from '@kywi-software/core/host'
+// Edge-safe leaf helper: builds the kywi_utm cookie value core's collectUtm reads
+// back. Its own dependency-free entry (never the DB-backed audiences barrel), so
+// it is importable from this edge middleware.
+import { UTM_COOKIE, utmCookieValue } from '@kywi-software/core/audiences/utm-persistence'
 
 /**
  * Server-side auth enforcement + transparent session refresh for /admin and the
@@ -874,17 +878,30 @@ const VISITOR_MAX_AGE = 60 * 60 * 24 * 365 * 2 // 2 years
  * Public (non-admin, non-API) request: never auth-gated. Ensure a stable
  * \`kywi_visitor\` id — mint one on first visit — and forward it to the render as
  * \`x-kywi-visitor\` so the page sees it on this very request (the freshly set
- * cookie is not yet readable via cookies()). Everything else passes through.
+ * cookie is not yet readable via cookies()). Also forward the full request URL
+ * as \`x-kywi-url\` (query string included) so the server render can read UTM
+ * params off the very first request — without it, campaign personalization
+ * would never fire on the landing page. Everything else passes through.
  */
 function handlePublicRequest(req: NextRequest): NextResponse {
   const existing = req.cookies.get(VISITOR_COOKIE)?.value
   const visitorId = existing ?? crypto.randomUUID()
   const headers = new Headers(req.headers)
   headers.set('x-kywi-visitor', visitorId)
+  headers.set('x-kywi-url', req.nextUrl.href)
   const res = NextResponse.next({ request: { headers } })
   if (!existing) {
     res.cookies.set(VISITOR_COOKIE, visitorId, { path: '/', maxAge: VISITOR_MAX_AGE, sameSite: 'lax' })
   }
+  // Persist campaign UTM params so audience matching survives internal
+  // navigation: core's collectUtm reads this cookie when the URL has no utm_*
+  // query string. Only written when the request carries utm_* params, so an
+  // ordinary page view never clobbers a persisted campaign (utmCookieValue
+  // returns null → the existing cookie is left in place).
+  const utmValue = utmCookieValue(req.nextUrl.href)
+  if (utmValue) {
+    res.cookies.set(UTM_COOKIE, utmValue, { path: '/', maxAge: 60 * 60 * 24 * 30, sameSite: 'lax' })
+  }
   return res
 }
 
@@ -1594,7 +1611,7 @@ export function PersonalizationRuntime({ audiences, serverSignals, selfIdWidget
           currentPath,
           serverSignals,
           ...(selfIdWidget
-            ? { selfIdWidget: { ...selfIdWidget, audiences: audiences.map((a) => a.id), currentPath } }
+            ? { selfIdWidget: { ...selfIdWidget, audiences, currentPath } }
             : {}),
         })
         .catch(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kywi-app",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Scaffold a new Kywi CMS project — npx create-kywi-app my-site",
   "type": "module",
   "homepage": "https://github.com/Kywi-Software/kywi-cms#readme",