From 4a1bf954ce8dd8b536fd316535c6551e499ad37a Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Mon, 24 Aug 2026 13:57:56 -0700
Subject: [PATCH 1/3] fix(consent): enforce consent-aware analytics

---
 apps/sim/app/(auth)/signup/signup-form.tsx    |   5 +
 .../(landing)/components/footer/footer.tsx    |  49 +++-
 .../landing-shell/landing-shell.tsx           |   3 +-
 .../consent-preferences-link.tsx              |  17 +-
 .../cookie-policy/cookie-policy-content.tsx   |  47 ++--
 .../demo-scheduler/demo-scheduler.tsx         |  48 ++--
 .../hubspot-page-view-tracker.test.tsx        |  50 ++++
 .../(landing)/hubspot-page-view-tracker.tsx   |  27 +-
 .../(landing)/landing-consent-tracking.tsx    |  18 ++
 apps/sim/app/(landing)/layout.tsx             |  29 +-
 .../(landing)/x-page-view-tracker.test.tsx    |  46 +++
 .../sim/app/(landing)/x-page-view-tracker.tsx |  30 +-
 .../sim/app/_shell/consent/consent-banner.tsx |  10 +-
 .../consent-preferences-trigger.test.tsx      |  45 +++
 .../consent/consent-preferences-trigger.tsx   |  25 ++
 .../_shell/consent/consent-provider.test.tsx  |  69 ++---
 .../app/_shell/consent/consent-provider.tsx   |  58 ++--
 .../app/_shell/consent/consent-runtime.tsx    |  16 --
 .../consent/consent-store-provider.test.tsx   |   9 +-
 .../_shell/consent/consent-store-provider.tsx |  18 +-
 ...oogle-analytics-page-view-tracker.test.tsx |  64 +++++
 .../google-analytics-page-view-tracker.tsx    |  28 ++
 .../providers/posthog-provider.test.tsx       | 141 ++++++++++
 .../app/_shell/providers/posthog-provider.tsx | 262 ++++++++++--------
 apps/sim/app/layout.tsx                       |  75 +----
 .../components/cookie-preferences.test.tsx    |   4 -
 .../general/components/cookie-preferences.tsx |  13 +-
 apps/sim/lib/analytics/google.ts              |  26 ++
 apps/sim/lib/consent/constants.ts             |  11 -
 apps/sim/lib/consent/scripts.test.ts          |  76 +++++
 apps/sim/lib/consent/scripts.ts               |  66 +++++
 apps/sim/lib/consent/tracking-consent.tsx     |  48 ++++
 apps/sim/lib/core/security/csp.ts             |   1 -
 apps/sim/lib/posthog/client-disabled.test.ts  |  19 +-
 apps/sim/lib/posthog/client.test.ts           |  34 +--
 apps/sim/lib/posthog/client.ts                |  51 ++--
 apps/sim/lib/posthog/exception-filter.test.ts |  36 ++-
 apps/sim/lib/posthog/exception-filter.ts      |  36 +++
 apps/sim/package.json                         |   3 +-
 bun.lock                                      |  16 +-
 40 files changed, 1107 insertions(+), 522 deletions(-)
 create mode 100644 apps/sim/app/(landing)/hubspot-page-view-tracker.test.tsx
 create mode 100644 apps/sim/app/(landing)/landing-consent-tracking.tsx
 create mode 100644 apps/sim/app/(landing)/x-page-view-tracker.test.tsx
 create mode 100644 apps/sim/app/_shell/consent/consent-preferences-trigger.test.tsx
 create mode 100644 apps/sim/app/_shell/consent/consent-preferences-trigger.tsx
 delete mode 100644 apps/sim/app/_shell/consent/consent-runtime.tsx
 create mode 100644 apps/sim/app/_shell/consent/google-analytics-page-view-tracker.test.tsx
 create mode 100644 apps/sim/app/_shell/consent/google-analytics-page-view-tracker.tsx
 create mode 100644 apps/sim/app/_shell/providers/posthog-provider.test.tsx
 create mode 100644 apps/sim/lib/analytics/google.ts
 create mode 100644 apps/sim/lib/consent/scripts.test.ts
 create mode 100644 apps/sim/lib/consent/scripts.ts
 create mode 100644 apps/sim/lib/consent/tracking-consent.tsx

diff --git a/apps/sim/app/(auth)/signup/signup-form.tsx b/apps/sim/app/(auth)/signup/signup-form.tsx
index 94c4b74dfee..61ad48a8328 100644
--- a/apps/sim/app/(auth)/signup/signup-form.tsx
+++ b/apps/sim/app/(auth)/signup/signup-form.tsx
@@ -5,7 +5,9 @@ import { Turnstile, type TurnstileInstance } from '@marsidev/react-turnstile'
 import { createLogger } from '@sim/logger'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { usePostHog } from 'posthog-js/react'
+import { trackGoogleEvent } from '@/lib/analytics/google'
 import { client, useSession } from '@/lib/auth/auth-client'
+import { useTrackingConsent } from '@/lib/consent/tracking-consent'
 import { getEnv, isFalsy } from '@/lib/core/config/env'
 import { isSsoEnabled } from '@/lib/core/config/env-flags'
 import { validateCallbackUrl } from '@/lib/core/security/input-validation'
@@ -107,6 +109,7 @@ function SignupFormContent({
   const searchParams = useSearchParams()
   const { refetch: refetchSession } = useSession()
   const posthog = usePostHog()
+  const { measurement } = useTrackingConsent()
   const [isLoading, setIsLoading] = useState(false)
 
   useEffect(() => {
@@ -344,6 +347,8 @@ function SignupFormContent({
         return
       }
 
+      if (measurement) trackGoogleEvent('sign_up', { method: 'email' })
+
       try {
         await refetchSession()
         logger.info('Session refreshed after successful signup')
diff --git a/apps/sim/app/(landing)/components/footer/footer.tsx b/apps/sim/app/(landing)/components/footer/footer.tsx
index 1fedf3b0226..5c74a5a7e8f 100644
--- a/apps/sim/app/(landing)/components/footer/footer.tsx
+++ b/apps/sim/app/(landing)/components/footer/footer.tsx
@@ -1,4 +1,5 @@
 import Link from 'next/link'
+import { ConsentPreferencesTrigger } from '@/app/_shell/consent/consent-preferences-trigger'
 import { ALL_COMPETITORS } from '@/app/(landing)/comparisons/utils'
 import { SimWordmark } from '@/app/(landing)/components/navbar/components/sim-wordmark'
 import { MODEL_PROVIDERS_WITH_CATALOGS } from '@/app/(landing)/models/utils'
@@ -19,14 +20,25 @@ import { MODEL_PROVIDERS_WITH_CATALOGS } from '@/app/(landing)/models/utils'
  */
 
 const LINK_CLASS =
-  'text-sm text-[var(--text-muted)] transition-colors hover:text-[var(--text-primary)]'
+  'text-left text-sm text-[var(--text-muted)] transition-colors hover:text-[var(--text-primary)]'
 
-interface FooterItem {
+interface FooterLinkItem {
   label: string
   href: string
   external?: boolean
 }
 
+interface FooterConsentItem {
+  label: string
+  consentPreferences: true
+}
+
+type FooterItem = FooterLinkItem | FooterConsentItem
+
+interface FooterProps {
+  showConsentPreferences?: boolean
+}
+
 /**
  * Platform modules link to their local landing pages (internal link equity
  * stays on the ranking pages); docs-only surfaces (MCP, API, Self Hosting)
@@ -108,27 +120,37 @@ const SOCIAL_LINKS: FooterItem[] = [
 const LEGAL_LINKS: FooterItem[] = [
   { label: 'Terms of Service', href: '/terms' },
   { label: 'Privacy Policy', href: '/privacy' },
+  { label: 'Cookie Policy', href: '/cookie-policy' },
 ]
 
+const CONSENT_PREFERENCES_LINK: FooterConsentItem = {
+  label: 'Cookie preferences',
+  consentPreferences: true,
+}
+
 function FooterColumn({ title, items }: { title: string; items: FooterItem[] }) {
   return (
     <div>
       <h3 className='mb-4 text-[var(--text-primary)] text-sm'>{title}</h3>
       <div className='flex flex-col gap-2.5'>
-        {items.map(({ label, href, external }) =>
-          external ? (
+        {items.map((item) =>
+          'consentPreferences' in item ? (
+            <ConsentPreferencesTrigger key={item.label} className={LINK_CLASS}>
+              {item.label}
+            </ConsentPreferencesTrigger>
+          ) : item.external ? (
             <a
-              key={label}
-              href={href}
+              key={item.label}
+              href={item.href}
               target='_blank'
               rel='noopener noreferrer'
               className={LINK_CLASS}
             >
-              {label}
+              {item.label}
             </a>
           ) : (
-            <Link key={label} href={href} className={LINK_CLASS}>
-              {label}
+            <Link key={item.label} href={item.href} className={LINK_CLASS}>
+              {item.label}
             </Link>
           )
         )}
@@ -137,7 +159,7 @@ function FooterColumn({ title, items }: { title: string; items: FooterItem[] })
   )
 }
 
-export function Footer() {
+export function Footer({ showConsentPreferences = false }: FooterProps) {
   return (
     <footer className='mt-[120px] w-full border-[var(--border)] border-t max-sm:mt-16 max-lg:mt-[88px]'>
       <div className='mx-auto w-full max-w-[1460px] px-20 pt-16 pb-16 max-sm:px-5 max-lg:px-8 max-lg:pt-12 max-lg:pb-12'>
@@ -161,7 +183,12 @@ export function Footer() {
           <FooterColumn title='Integrations' items={INTEGRATION_LINKS} />
           <FooterColumn title='Models' items={MODEL_LINKS} />
           <FooterColumn title='Socials' items={SOCIAL_LINKS} />
-          <FooterColumn title='Legal' items={LEGAL_LINKS} />
+          <FooterColumn
+            title='Legal'
+            items={
+              showConsentPreferences ? [...LEGAL_LINKS, CONSENT_PREFERENCES_LINK] : LEGAL_LINKS
+            }
+          />
         </nav>
 
         <p className='mt-16 text-[var(--text-muted)] text-sm'>© 2026 Sim. All rights reserved.</p>
diff --git a/apps/sim/app/(landing)/components/landing-shell/landing-shell.tsx b/apps/sim/app/(landing)/components/landing-shell/landing-shell.tsx
index 37c867d69d3..abb8746bcab 100644
--- a/apps/sim/app/(landing)/components/landing-shell/landing-shell.tsx
+++ b/apps/sim/app/(landing)/components/landing-shell/landing-shell.tsx
@@ -1,4 +1,5 @@
 import type { ReactNode } from 'react'
+import { isHosted } from '@/lib/core/config/env-flags'
 import { getGitHubStars } from '@/lib/github/stars'
 import { Footer } from '@/app/(landing)/components/footer/footer'
 import { Navbar } from '@/app/(landing)/components/navbar/navbar'
@@ -46,7 +47,7 @@ export async function LandingShell({ children }: LandingShellProps) {
       </a>
       <Navbar stars={stars} />
       {children}
-      <Footer />
+      <Footer showConsentPreferences={isHosted} />
     </div>
   )
 }
diff --git a/apps/sim/app/(landing)/cookie-policy/consent-preferences-link.tsx b/apps/sim/app/(landing)/cookie-policy/consent-preferences-link.tsx
index dac9ce50048..29aa12e783c 100644
--- a/apps/sim/app/(landing)/cookie-policy/consent-preferences-link.tsx
+++ b/apps/sim/app/(landing)/cookie-policy/consent-preferences-link.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { ReactNode } from 'react'
-import { OPEN_CONSENT_PREFERENCES_EVENT } from '@/lib/consent/constants'
+import { ConsentPreferencesTrigger } from '@/app/_shell/consent/consent-preferences-trigger'
 import { PROSE_TYPE } from '@/app/(landing)/components/prose-page/constants'
 
 interface ConsentPreferencesLinkProps {
@@ -13,19 +13,12 @@ interface ConsentPreferencesLinkProps {
  * expanded, so a recorded choice can be withdrawn or changed. Wearing the
  * prose link chrome, it reads as part of the sentence it sits in.
  *
- * Only rendered where the consent runtime is mounted — see the call site. On a
- * self-hosted deployment nothing would listen for the event, so the Cookie
- * Policy renders the phrase as plain text rather than a control that does
- * nothing when clicked.
+ * Only rendered where the consent runtime is mounted — see the call site. The
+ * Cookie Policy renders plain text on self-hosted deployments, where there is
+ * no preferences dialog to open.
  */
 export function ConsentPreferencesLink({ children }: ConsentPreferencesLinkProps) {
   return (
-    <button
-      type='button'
-      className={PROSE_TYPE.link}
-      onClick={() => window.dispatchEvent(new Event(OPEN_CONSENT_PREFERENCES_EVENT))}
-    >
-      {children}
-    </button>
+    <ConsentPreferencesTrigger className={PROSE_TYPE.link}>{children}</ConsentPreferencesTrigger>
   )
 }
diff --git a/apps/sim/app/(landing)/cookie-policy/cookie-policy-content.tsx b/apps/sim/app/(landing)/cookie-policy/cookie-policy-content.tsx
index bb8bec8c565..7667f7c7c60 100644
--- a/apps/sim/app/(landing)/cookie-policy/cookie-policy-content.tsx
+++ b/apps/sim/app/(landing)/cookie-policy/cookie-policy-content.tsx
@@ -8,10 +8,6 @@ import {
 import { PROSE_TABLE_WIDTHS } from '@/app/(landing)/components/prose-page/constants'
 import { ConsentPreferencesLink } from '@/app/(landing)/cookie-policy/consent-preferences-link'
 
-/**
- * One cookie-inventory table per consent category. The three share a header and
- * a column layout, so they are built from one shape rather than repeated.
- */
 /**
  * The withdrawal control, or the bare phrase on a self-hosted deployment. The
  * consent runtime is hosted-only, so there the button would have no listener
@@ -41,15 +37,14 @@ function cookieTable(caption: string, rows: ReactNode[][]): LegalBlock {
  *
  * The tables describe what Sim and its providers actually set, grouped by the
  * three categories the banner offers. Keep them in step with the banner's
- * categories (`lib/consent/constants`) and with the tags configured in Google
- * Tag Manager: naming a cookie the site no longer sets is as wrong as omitting
- * one it does.
+ * categories and consent-managed scripts: naming a cookie the site no longer
+ * sets is as wrong as omitting one it does.
  */
 export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
   title: 'Cookie Policy',
   description:
     'What cookies Sim sets, why, how long they last, and how to change your choice at any time.',
-  lastUpdated: 'August 18, 2026',
+  lastUpdated: 'August 24, 2026',
   intro: [
     {
       kind: 'paragraph',
@@ -120,7 +115,9 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
             <>
               <strong>Analytics</strong> — how many people use Sim, which pages and features they
               reach, and where errors happen, so we can improve the product. Measurement only; we do
-              not use these to target advertising.
+              not use these to target advertising. Google Analytics loads with analytics storage
+              denied and cannot set analytics cookies until this category is allowed; before then,
+              it may send limited cookieless consent and measurement signals.
             </>,
             <>
               <strong>Marketing</strong> — measuring which campaigns bring builders to Sim and
@@ -182,6 +179,24 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
           ['hubspotutk', 'HubSpot', 'Identifies a visitor across form submissions.', '6 months'],
           ['__hssc', 'HubSpot', 'Tracks the current session.', '30 minutes'],
           ['__hssrc', 'HubSpot', 'Detects whether the visitor restarted their browser.', 'Session'],
+          [
+            'ph_*_posthog',
+            'PostHog',
+            'Stores analytics identity and durable session state after analytics consent is granted.',
+            '1 year',
+          ],
+          [
+            '__ph_opt_in_out_*',
+            'PostHog',
+            'Records PostHog’s local capture state, synchronized from your Sim analytics choice.',
+            'Until you change your choice',
+          ],
+          [
+            'ph_*_window_id / ph_*_primary_window_exists',
+            'PostHog',
+            'Coordinates analytics state for the current browser tab.',
+            'Session',
+          ],
         ]),
         cookieTable('Marketing', [
           [
@@ -199,7 +214,6 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
           ],
           ['personalization_id', 'X (Twitter)', 'Personalizes the ads shown on X.', '13 months'],
           ['muc_ads', 'X (Twitter)', 'Measures ad conversions across X domains.', '13 months'],
-          ['_gcl_*', 'Google Ads', 'Attributes a sign-up to the ad that led to it.', '90 days'],
         ]),
       ],
     },
@@ -224,7 +238,7 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
         },
         {
           kind: 'paragraph',
-          content: `We honor Global Privacy Control (GPC). If your browser or an extension sends a GPC signal, we treat it as an instruction to opt out of analytics and marketing cookies without your having to use the banner.`,
+          content: `We honor Global Privacy Control (GPC). Where the applicable privacy policy provides an opt-out right, the consent service applies that signal to the covered optional categories without requiring you to use the banner.`,
         },
         {
           kind: 'paragraph',
@@ -234,9 +248,9 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
               <ProseLink href='https://tools.google.com/dlpage/gaoptout'>
                 Google Analytics
               </ProseLink>
-              , <ProseLink href='https://myadcenter.google.com'>Google Ads</ProseLink>,{' '}
-              <ProseLink href='https://x.com/settings/privacy_and_safety'>X (Twitter)</ProseLink>,
-              and <ProseLink href='https://legal.hubspot.com/privacy-policy'>HubSpot</ProseLink>.
+              , <ProseLink href='https://x.com/settings/privacy_and_safety'>X (Twitter)</ProseLink>,{' '}
+              <ProseLink href='https://legal.hubspot.com/privacy-policy'>HubSpot</ProseLink>, and{' '}
+              <ProseLink href='https://posthog.com/privacy'>PostHog</ProseLink>.
             </>
           ),
         },
@@ -256,10 +270,11 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
             <>
               The providers currently in use are{' '}
               <ProseLink href='https://policies.google.com/technologies/cookies'>Google</ProseLink>{' '}
-              (Analytics, Tag Manager, and Ads),{' '}
+              (Analytics),{' '}
               <ProseLink href='https://legal.hubspot.com/privacy-policy'>HubSpot</ProseLink>,{' '}
               <ProseLink href='https://x.com/en/privacy'>X (Twitter)</ProseLink>,{' '}
-              <ProseLink href='https://ahrefs.com/privacy'>Ahrefs</ProseLink>, and{' '}
+              <ProseLink href='https://ahrefs.com/privacy'>Ahrefs</ProseLink>,{' '}
+              <ProseLink href='https://posthog.com/privacy'>PostHog</ProseLink>, and{' '}
               <ProseLink href='https://www.cloudflare.com/privacypolicy/'>Cloudflare</ProseLink>.
             </>
           ),
diff --git a/apps/sim/app/(landing)/demo/components/demo-scheduler/demo-scheduler.tsx b/apps/sim/app/(landing)/demo/components/demo-scheduler/demo-scheduler.tsx
index 8bc81f1e576..c09e1a266f2 100644
--- a/apps/sim/app/(landing)/demo/components/demo-scheduler/demo-scheduler.tsx
+++ b/apps/sim/app/(landing)/demo/components/demo-scheduler/demo-scheduler.tsx
@@ -2,7 +2,9 @@
 
 import { useEffect } from 'react'
 import Cal, { getCalApi } from '@calcom/embed-react'
-import { isHosted } from '@/lib/core/config/env-flags'
+import { trackGoogleEvent } from '@/lib/analytics/google'
+import { X_DEMO_BOOKED_EVENT_ID } from '@/lib/consent/scripts'
+import { useTrackingConsent } from '@/lib/consent/tracking-consent'
 import type { DemoLead } from '@/app/(landing)/demo/components/demo-form'
 
 /** The Cal.com event the demo books - set `NEXT_PUBLIC_CAL_LINK` to override. */
@@ -15,12 +17,6 @@ const CAL_LINK = process.env.NEXT_PUBLIC_CAL_LINK ?? 'team/sim/demo'
  */
 const CAL_BRAND_COLOR = '#6f3dfa'
 
-/**
- * X (Twitter) conversion event fired when a demo is actually booked, so ad
- * delivery optimizes toward bookings rather than form submits.
- */
-const X_DEMO_BOOKED_EVENT_ID = 'tw-q5xbl-q5xbn'
-
 interface DemoSchedulerProps {
   /** The captured lead used to prefill the Cal.com booking. */
   lead: DemoLead
@@ -28,22 +24,6 @@ interface DemoSchedulerProps {
 
 let calEmbedPreloaded = false
 
-/**
- * Fires the X conversion once the Cal.com booking is confirmed. There is no
- * standalone confirmation page to drop the pixel snippet into — Cal renders the
- * "you're booked" state inside its cross-origin iframe — so the embed's
- * `bookingSuccessfulV2` event is the confirmation.
- *
- * Module-scope so the same function identity can be handed to both `on` and
- * `off`. `window.twq` is only defined where {@link LandingLayout} renders the
- * pixel base code, so the optional call is a second guard for the window
- * between mount and `uwt.js` finishing — the stub `twq` queues calls made
- * before the script loads and replays them.
- */
-function trackDemoBooked(): void {
-  window.twq?.('event', X_DEMO_BOOKED_EVENT_ID, {})
-}
-
 /**
  * Warm the Cal.com embed before the scheduler mounts. Loads `embed.js` and
  * issues the embed's `preload` instruction, which fetches the booker in a
@@ -77,8 +57,20 @@ export function preloadCalEmbed(): void {
  * card stays the same height across the form→calendar transition.
  */
 export function DemoScheduler({ lead }: DemoSchedulerProps) {
+  const { marketing, measurement } = useTrackingConsent()
+
   useEffect(() => {
     let cancelled = false
+    const trackDemoBooked = () => {
+      if (measurement) {
+        trackGoogleEvent('get_a_demo', {
+          page_path: '/demo',
+          form_name: 'sim_demo',
+          booking_status: 'scheduled',
+        })
+      }
+      if (marketing) window.twq?.('event', X_DEMO_BOOKED_EVENT_ID, {})
+    }
     const api = getCalApi({ namespace: CAL_NAMESPACE })
     api
       .then((cal) => {
@@ -87,19 +79,19 @@ export function DemoScheduler({ lead }: DemoSchedulerProps) {
           hideEventTypeDetails: true,
           styles: { branding: { brandColor: CAL_BRAND_COLOR } },
         })
-        // Matches the layout's pixel gating - a self-hosted deployment loads no
-        // base pixel, so it must not subscribe an ad-tracking callback either.
-        if (isHosted) cal('on', { action: 'bookingSuccessfulV2', callback: trackDemoBooked })
+        if (measurement || marketing) {
+          cal('on', { action: 'bookingSuccessfulV2', callback: trackDemoBooked })
+        }
       })
       .catch(() => {})
     return () => {
       cancelled = true
-      if (!isHosted) return
+      if (!measurement && !marketing) return
       api
         .then((cal) => cal('off', { action: 'bookingSuccessfulV2', callback: trackDemoBooked }))
         .catch(() => {})
     }
-  }, [])
+  }, [marketing, measurement])
 
   return (
     <div className='flex h-full min-w-0 flex-col p-6 max-sm:p-5'>
diff --git a/apps/sim/app/(landing)/hubspot-page-view-tracker.test.tsx b/apps/sim/app/(landing)/hubspot-page-view-tracker.test.tsx
new file mode 100644
index 00000000000..ad0aa6afe8d
--- /dev/null
+++ b/apps/sim/app/(landing)/hubspot-page-view-tracker.test.tsx
@@ -0,0 +1,50 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act, StrictMode } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const { navigation } = vi.hoisted(() => ({ navigation: { pathname: '/pricing' } }))
+
+vi.mock('next/navigation', () => ({ usePathname: () => navigation.pathname }))
+
+import { HubspotPageViewTracker } from '@/app/(landing)/hubspot-page-view-tracker'
+
+let root: Root | null = null
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = null
+  navigation.pathname = '/pricing'
+  window._hsq = []
+})
+
+describe('HubspotPageViewTracker', () => {
+  it('tracks later paths once without query data under Strict Mode', () => {
+    ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+    const container = document.createElement('div')
+    root = createRoot(container)
+    window._hsq = []
+
+    act(() =>
+      root?.render(
+        <StrictMode>
+          <HubspotPageViewTracker />
+        </StrictMode>
+      )
+    )
+    expect(window._hsq).toEqual([])
+
+    navigation.pathname = '/demo'
+    act(() =>
+      root?.render(
+        <StrictMode>
+          <HubspotPageViewTracker />
+        </StrictMode>
+      )
+    )
+
+    expect(window._hsq).toEqual([['setPath', '/demo'], ['trackPageView']])
+  })
+})
diff --git a/apps/sim/app/(landing)/hubspot-page-view-tracker.tsx b/apps/sim/app/(landing)/hubspot-page-view-tracker.tsx
index 2fbb35cf526..85c316cea0f 100644
--- a/apps/sim/app/(landing)/hubspot-page-view-tracker.tsx
+++ b/apps/sim/app/(landing)/hubspot-page-view-tracker.tsx
@@ -1,38 +1,31 @@
 'use client'
 
-import { useEffect } from 'react'
-import { usePathname, useSearchParams } from 'next/navigation'
+import { useEffect, useRef } from 'react'
+import { usePathname } from 'next/navigation'
 
-declare global {
-  interface Window {
-    _hsq?: unknown[][]
-  }
-}
-
-// next/script dedupes by id and never reloads on remount, so this must be
-// module-scope (not a ref) to survive LandingLayout unmounting/remounting.
 let hasTrackedInitialPageView = false
 
 /**
- * The HubSpot loader only auto-tracks the first page load; LandingLayout
- * persists across client-side navigations, so HubSpot never sees the rest.
- * Pushes a manual pageview through `_hsq` on every navigation after the first.
+ * The consent-gated HubSpot loader auto-tracks its first page. Pushes a manual
+ * pageview through `_hsq` for later client navigations.
  */
 export function HubspotPageViewTracker() {
   const pathname = usePathname()
-  const searchParams = useSearchParams()
-  const query = searchParams.toString()
+  const lastTrackedPathRef = useRef<string | null>(null)
 
   useEffect(() => {
+    if (lastTrackedPathRef.current === pathname) return
+    lastTrackedPathRef.current = pathname
+
     if (!hasTrackedInitialPageView) {
       hasTrackedInitialPageView = true
       return
     }
 
     window._hsq = window._hsq || []
-    window._hsq.push(['setPath', query ? `${pathname}?${query}` : pathname])
+    window._hsq.push(['setPath', pathname])
     window._hsq.push(['trackPageView'])
-  }, [pathname, query])
+  }, [pathname])
 
   return null
 }
diff --git a/apps/sim/app/(landing)/landing-consent-tracking.tsx b/apps/sim/app/(landing)/landing-consent-tracking.tsx
new file mode 100644
index 00000000000..08997063938
--- /dev/null
+++ b/apps/sim/app/(landing)/landing-consent-tracking.tsx
@@ -0,0 +1,18 @@
+'use client'
+
+import { useConsentScript } from '@c15t/nextjs/headless'
+import { HUBSPOT_SCRIPT, X_PIXEL_SCRIPT } from '@/lib/consent/scripts'
+import { HubspotPageViewTracker } from '@/app/(landing)/hubspot-page-view-tracker'
+import { XPageViewTracker } from '@/app/(landing)/x-page-view-tracker'
+
+export function LandingConsentTracking() {
+  const hubspot = useConsentScript({ script: HUBSPOT_SCRIPT, unmountBehavior: 'keep' })
+  const xPixel = useConsentScript({ script: X_PIXEL_SCRIPT, unmountBehavior: 'keep' })
+
+  return (
+    <>
+      {hubspot.status === 'ready' && <HubspotPageViewTracker />}
+      {xPixel.status === 'ready' && <XPageViewTracker />}
+    </>
+  )
+}
diff --git a/apps/sim/app/(landing)/layout.tsx b/apps/sim/app/(landing)/layout.tsx
index 9fef6524507..608b350f322 100644
--- a/apps/sim/app/(landing)/layout.tsx
+++ b/apps/sim/app/(landing)/layout.tsx
@@ -1,22 +1,9 @@
 import type { ReactNode } from 'react'
-import { Suspense } from 'react'
 import type { Metadata } from 'next'
-import Script from 'next/script'
 import { isHosted } from '@/lib/core/config/env-flags'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import { LandingShell } from '@/app/(landing)/components'
-import { HubspotPageViewTracker } from '@/app/(landing)/hubspot-page-view-tracker'
-import { XPageViewTracker } from '@/app/(landing)/x-page-view-tracker'
-
-const HUBSPOT_SCRIPT_SRC = 'https://js-na2.hs-scripts.com/246720681.js' as const
-
-const X_PIXEL_ID = 'q5xbl' as const
-
-/** X (Twitter) conversion tracking base code — loads uwt.js and fires the initial PageView. */
-const X_PIXEL_BASE_CODE = `!function(e,t,n,s,u,a){e.twq||(s=e.twq=function(){s.exe?s.exe.apply(s,arguments):s.queue.push(arguments);
-},s.version='1.1',s.queue=[],u=t.createElement(n),u.async=!0,u.src='https://static.ads-twitter.com/uwt.js',
-a=t.getElementsByTagName(n)[0],a.parentNode.insertBefore(u,a))}(window,document,'script');
-twq('config','${X_PIXEL_ID}');`
+import { LandingConsentTracking } from '@/app/(landing)/landing-consent-tracking'
 
 /**
  * Route-group layout for the entire landing family - the home page, platform and
@@ -42,19 +29,7 @@ export default function LandingLayout({ children }: { children: ReactNode }) {
   return (
     <LandingShell>
       {children}
-      {/* HubSpot + X pixel tracking — hosted only */}
-      {isHosted && (
-        <>
-          <Script id='hs-script-loader' src={HUBSPOT_SCRIPT_SRC} strategy='afterInteractive' />
-          <Script id='x-pixel-base' strategy='afterInteractive'>
-            {X_PIXEL_BASE_CODE}
-          </Script>
-          <Suspense fallback={null}>
-            <HubspotPageViewTracker />
-            <XPageViewTracker />
-          </Suspense>
-        </>
-      )}
+      {isHosted && <LandingConsentTracking />}
     </LandingShell>
   )
 }
diff --git a/apps/sim/app/(landing)/x-page-view-tracker.test.tsx b/apps/sim/app/(landing)/x-page-view-tracker.test.tsx
new file mode 100644
index 00000000000..6d1d5f94860
--- /dev/null
+++ b/apps/sim/app/(landing)/x-page-view-tracker.test.tsx
@@ -0,0 +1,46 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const { navigation, mockTwq } = vi.hoisted(() => ({
+  navigation: { pathname: '/pricing' },
+  mockTwq: vi.fn(),
+}))
+
+vi.mock('next/navigation', () => ({ usePathname: () => navigation.pathname }))
+
+import { XPageViewTracker } from '@/app/(landing)/x-page-view-tracker'
+
+let root: Root | null = null
+
+function render(): void {
+  ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+  if (!root) root = createRoot(document.createElement('div'))
+  act(() => root?.render(<XPageViewTracker />))
+}
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = null
+  navigation.pathname = '/pricing'
+  window.twq = undefined
+  vi.clearAllMocks()
+})
+
+describe('XPageViewTracker', () => {
+  it('skips the pixel automatic first view and tracks later path changes once', () => {
+    window.twq = mockTwq
+    render()
+    expect(mockTwq).not.toHaveBeenCalled()
+
+    navigation.pathname = '/demo'
+    render()
+    render()
+
+    expect(mockTwq).toHaveBeenCalledOnce()
+    expect(mockTwq).toHaveBeenCalledWith('config', 'q5xbl')
+  })
+})
diff --git a/apps/sim/app/(landing)/x-page-view-tracker.tsx b/apps/sim/app/(landing)/x-page-view-tracker.tsx
index 5db1e0439fd..f216359eb47 100644
--- a/apps/sim/app/(landing)/x-page-view-tracker.tsx
+++ b/apps/sim/app/(landing)/x-page-view-tracker.tsx
@@ -1,38 +1,22 @@
 'use client'
 
 import { useEffect, useRef } from 'react'
-import { usePathname, useSearchParams } from 'next/navigation'
+import { usePathname } from 'next/navigation'
 
-declare global {
-  interface Window {
-    twq?: (...args: unknown[]) => void
-  }
-}
-
-// next/script dedupes by id and never reloads on remount, so this must be
-// module-scope (not a ref) to survive LandingLayout unmounting/remounting.
 let hasTrackedInitialPageView = false
 
 /**
- * The X pixel base code only auto-tracks the first page load; LandingLayout
- * persists across client-side navigations, so the pixel never sees the rest.
- * Re-fires the pixel's PageView via `twq('config', ...)` on every navigation
- * after the first.
+ * The consent-gated X pixel tracks its first page when it loads. Re-fires the
+ * PageView for later client navigations.
  */
 export function XPageViewTracker() {
   const pathname = usePathname()
-  const searchParams = useSearchParams()
-  const query = searchParams.toString()
 
-  // Instance-scoped (not module-scoped) so a Strict Mode replay of this
-  // mount's effect is skipped, while a fresh mount — returning to the landing
-  // layout from the app — starts empty and tracks the view again.
-  const lastTrackedUrlRef = useRef<string | null>(null)
+  const lastTrackedPathRef = useRef<string | null>(null)
 
   useEffect(() => {
-    const url = query ? `${pathname}?${query}` : pathname
-    if (lastTrackedUrlRef.current === url) return
-    lastTrackedUrlRef.current = url
+    if (lastTrackedPathRef.current === pathname) return
+    lastTrackedPathRef.current = pathname
 
     if (!hasTrackedInitialPageView) {
       hasTrackedInitialPageView = true
@@ -40,7 +24,7 @@ export function XPageViewTracker() {
     }
 
     window.twq?.('config', 'q5xbl')
-  }, [pathname, query])
+  }, [pathname])
 
   return null
 }
diff --git a/apps/sim/app/_shell/consent/consent-banner.tsx b/apps/sim/app/_shell/consent/consent-banner.tsx
index 3fbeab7f772..bd9d4bfdb7b 100644
--- a/apps/sim/app/_shell/consent/consent-banner.tsx
+++ b/apps/sim/app/_shell/consent/consent-banner.tsx
@@ -1,11 +1,9 @@
 'use client'
 
-import { useEffect } from 'react'
 import { useHeadlessConsentUI } from '@c15t/nextjs/headless'
 import { Chip } from '@sim/emcn'
 import { AnimatePresence, motion, useReducedMotion } from 'framer-motion'
 import Link from 'next/link'
-import { OPEN_CONSENT_PREFERENCES_EVENT } from '@/lib/consent/constants'
 import { CONSENT_LINK_CLASS, ConsentPreferences } from '@/app/_shell/consent/consent-preferences'
 
 /** Shared expo-out easing and timings, matching the toast stack's motion. */
@@ -30,19 +28,13 @@ const CATEGORIES_OPEN = { height: 'auto', opacity: 1 } as const
  * It follows the visitor's theme. Every surface it can appear on either pins
  * the light layer on `<html>` through `ThemeProvider`'s forced theme, or is a
  * themed app page where inheriting is what should happen — the card no longer
- * decides for itself. Inside the workspace it never renders at all; consent is
- * managed from Settings → Privacy there.
+ * decides for itself.
  */
 export function ConsentBanner() {
   const { banner, dialog, openDialog, performAction, saveCustomPreferences } =
     useHeadlessConsentUI()
   const prefersReducedMotion = useReducedMotion()
 
-  useEffect(() => {
-    window.addEventListener(OPEN_CONSENT_PREFERENCES_EVENT, openDialog)
-    return () => window.removeEventListener(OPEN_CONSENT_PREFERENCES_EVENT, openDialog)
-  }, [openDialog])
-
   const isExpanded = dialog.isVisible
   const surfaceName = isExpanded ? 'dialog' : 'banner'
   const { allowedActions } = isExpanded ? dialog : banner
diff --git a/apps/sim/app/_shell/consent/consent-preferences-trigger.test.tsx b/apps/sim/app/_shell/consent/consent-preferences-trigger.test.tsx
new file mode 100644
index 00000000000..d72e22be78c
--- /dev/null
+++ b/apps/sim/app/_shell/consent/consent-preferences-trigger.test.tsx
@@ -0,0 +1,45 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const { mockOpenDialog } = vi.hoisted(() => ({ mockOpenDialog: vi.fn() }))
+
+vi.mock('@c15t/nextjs/headless', () => ({
+  useHeadlessConsentUI: () => ({ openDialog: mockOpenDialog }),
+}))
+vi.mock('@sim/emcn', () => ({
+  Button: ({ children, ...props }: React.ButtonHTMLAttributes<HTMLButtonElement>) => (
+    <button {...props}>{children}</button>
+  ),
+  cn: (...classes: Array<string | undefined>) => classes.filter(Boolean).join(' '),
+}))
+
+import { ConsentPreferencesTrigger } from '@/app/_shell/consent/consent-preferences-trigger'
+
+let root: Root | null = null
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = null
+  vi.clearAllMocks()
+})
+
+describe('ConsentPreferencesTrigger', () => {
+  it('opens c15t preferences from an accessible button', () => {
+    ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+    const container = document.createElement('div')
+    document.body.appendChild(container)
+    root = createRoot(container)
+
+    act(() => root?.render(<ConsentPreferencesTrigger>Cookie settings</ConsentPreferencesTrigger>))
+    const button = container.querySelector('button')
+    act(() => button?.click())
+
+    expect(button?.type).toBe('button')
+    expect(button?.textContent).toBe('Cookie settings')
+    expect(mockOpenDialog).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/apps/sim/app/_shell/consent/consent-preferences-trigger.tsx b/apps/sim/app/_shell/consent/consent-preferences-trigger.tsx
new file mode 100644
index 00000000000..b7cfdba6e9c
--- /dev/null
+++ b/apps/sim/app/_shell/consent/consent-preferences-trigger.tsx
@@ -0,0 +1,25 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { useHeadlessConsentUI } from '@c15t/nextjs/headless'
+import { Button, cn } from '@sim/emcn'
+
+interface ConsentPreferencesTriggerProps {
+  children: ReactNode
+  className?: string
+}
+
+export function ConsentPreferencesTrigger({ children, className }: ConsentPreferencesTriggerProps) {
+  const { openDialog } = useHeadlessConsentUI()
+
+  return (
+    <Button
+      type='button'
+      variant='ghost-secondary'
+      className={cn('h-auto justify-start p-0 text-[length:inherit]', className)}
+      onClick={openDialog}
+    >
+      {children}
+    </Button>
+  )
+}
diff --git a/apps/sim/app/_shell/consent/consent-provider.test.tsx b/apps/sim/app/_shell/consent/consent-provider.test.tsx
index b4ad6f0f87b..60045a81071 100644
--- a/apps/sim/app/_shell/consent/consent-provider.test.tsx
+++ b/apps/sim/app/_shell/consent/consent-provider.test.tsx
@@ -1,42 +1,42 @@
 /**
  * @vitest-environment jsdom
  */
+import type { ReactNode } from 'react'
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
-const { mockPathname, mockDynamicImport } = vi.hoisted(() => ({
-  mockPathname: vi.fn(),
-  mockDynamicImport: vi.fn(),
+vi.mock('@/app/_shell/consent/consent-store-provider', () => ({
+  ConsentStoreProvider: ({ children }: { children: ReactNode }) => (
+    <div data-testid='store'>{children}</div>
+  ),
 }))
-
-vi.mock('next/navigation', () => ({ usePathname: mockPathname }))
-
-/**
- * Stands in for the lazily-loaded runtime and records whether the chunk was
- * asked for at all — that, not just the absence of a banner, is what the
- * workspace gate is for.
- */
-vi.mock('next/dynamic', () => ({
-  default: (loader: () => Promise<unknown>) => {
-    return function LazyRuntime() {
-      mockDynamicImport(loader)
-      return <span data-testid='runtime' />
-    }
-  },
+vi.mock('@/lib/consent/tracking-consent', () => ({
+  TrackingConsentProvider: ({ children }: { children: ReactNode }) => children,
+}))
+vi.mock('@/app/_shell/consent/consent-banner', () => ({
+  ConsentBanner: () => <span data-testid='banner' />,
+}))
+vi.mock('@/app/_shell/consent/google-analytics-page-view-tracker', () => ({
+  GoogleAnalyticsPageViewTracker: () => <span data-testid='analytics' />,
 }))
 
 import { ConsentProvider } from '@/app/_shell/consent/consent-provider'
 
 let root: Root | null = null
 
-function renderAt(pathname: string): HTMLDivElement {
-  mockPathname.mockReturnValue(pathname)
+function render(): HTMLDivElement {
   ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
   const container = document.createElement('div')
   document.body.appendChild(container)
   root = createRoot(container)
-  act(() => root?.render(<ConsentProvider />))
+  act(() =>
+    root?.render(
+      <ConsentProvider>
+        <span data-testid='application' />
+      </ConsentProvider>
+    )
+  )
   return container
 }
 
@@ -47,23 +47,12 @@ afterEach(() => {
 })
 
 describe('ConsentProvider', () => {
-  it.each(['/', '/pricing', '/login', '/cookie-policy', '/upgrade', '/workspaces'])(
-    'mounts the consent runtime on %s',
-    (pathname) => {
-      const container = renderAt(pathname)
-
-      expect(container.querySelector('[data-testid="runtime"]')).not.toBeNull()
-      expect(mockDynamicImport).toHaveBeenCalled()
-    }
-  )
-
-  it.each(['/workspace', '/workspace/abc', '/workspace/abc/logs'])(
-    'mounts nothing on %s',
-    (pathname) => {
-      const container = renderAt(pathname)
-
-      expect(container.querySelector('[data-testid="runtime"]')).toBeNull()
-      expect(mockDynamicImport).not.toHaveBeenCalled()
-    }
-  )
+  it('wraps the application and presents the policy-controlled consent surface', () => {
+    const container = render()
+
+    expect(container.querySelector('[data-testid="store"]')).not.toBeNull()
+    expect(container.querySelector('[data-testid="application"]')).not.toBeNull()
+    expect(container.querySelector('[data-testid="analytics"]')).not.toBeNull()
+    expect(container.querySelector('[data-testid="banner"]')).not.toBeNull()
+  })
 })
diff --git a/apps/sim/app/_shell/consent/consent-provider.tsx b/apps/sim/app/_shell/consent/consent-provider.tsx
index 97e544005c1..a30745054b2 100644
--- a/apps/sim/app/_shell/consent/consent-provider.tsx
+++ b/apps/sim/app/_shell/consent/consent-provider.tsx
@@ -1,43 +1,29 @@
 'use client'
 
-import dynamic from 'next/dynamic'
-import { usePathname } from 'next/navigation'
+import type { ReactNode } from 'react'
+import { TrackingConsentProvider } from '@/lib/consent/tracking-consent'
+import { ConsentBanner } from '@/app/_shell/consent/consent-banner'
+import { ConsentStoreProvider } from '@/app/_shell/consent/consent-store-provider'
+import { GoogleAnalyticsPageViewTracker } from '@/app/_shell/consent/google-analytics-page-view-tracker'
 
-/**
- * The cookie-consent runtime, loaded on the client only and only once this
- * component renders it — the root layout renders it behind `isHosted`, so a
- * self-hosted deployment never fetches the chunk, never reaches Sim's consent
- * backend, and never sees the banner. Deferring it also keeps the third-party
- * store out of the server render and off the landing page's hydration path; the
- * banner cannot paint before its geo lookup resolves anyway.
- */
-const ConsentRuntime = dynamic(
-  () => import('@/app/_shell/consent/consent-runtime').then((m) => m.ConsentRuntime),
-  { ssr: false }
-)
-
-const WORKSPACE_SEGMENT = 'workspace'
+interface ConsentProviderProps {
+  children: ReactNode
+}
 
 /**
- * Mounts the consent runtime everywhere except the workspace.
- *
- * Inside the product a floating consent card is the wrong surface — a signed-in
- * user manages this from Settings → Privacy, which mounts the same store. The
- * check sits above the `dynamic()` rather than inside the loaded module so the
- * workspace pays neither the chunk nor the consent init request: gating within
- * the module would still have downloaded it, on the surface with the most hard
- * loads.
- *
- * The gap this leaves — a visitor who reaches the workspace with no consent
- * record is not prompted — closes when the analytics scripts move behind
- * consent, since nothing non-essential loads without a record at all.
+ * Owns hosted Sim's consent lifecycle across every route. The banner stays off
+ * until the resolved jurisdiction policy requires it and then appears on every
+ * entry route, including a direct workspace visit. Privacy settings remain the
+ * durable control after the initial decision.
  */
-export function ConsentProvider() {
-  const pathname = usePathname()
-
-  if (pathname.split('/')[1] === WORKSPACE_SEGMENT) {
-    return null
-  }
-
-  return <ConsentRuntime />
+export function ConsentProvider({ children }: ConsentProviderProps) {
+  return (
+    <ConsentStoreProvider>
+      <TrackingConsentProvider>
+        {children}
+        <GoogleAnalyticsPageViewTracker />
+        <ConsentBanner />
+      </TrackingConsentProvider>
+    </ConsentStoreProvider>
+  )
 }
diff --git a/apps/sim/app/_shell/consent/consent-runtime.tsx b/apps/sim/app/_shell/consent/consent-runtime.tsx
deleted file mode 100644
index 243c1ed6b66..00000000000
--- a/apps/sim/app/_shell/consent/consent-runtime.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-'use client'
-
-import { ConsentBanner } from '@/app/_shell/consent/consent-banner'
-import { ConsentStoreProvider } from '@/app/_shell/consent/consent-store-provider'
-
-/**
- * The consent banner and the store it reads. Loaded lazily and client-only by
- * {@link ConsentProvider}, which also decides where it may mount.
- */
-export function ConsentRuntime() {
-  return (
-    <ConsentStoreProvider>
-      <ConsentBanner />
-    </ConsentStoreProvider>
-  )
-}
diff --git a/apps/sim/app/_shell/consent/consent-store-provider.test.tsx b/apps/sim/app/_shell/consent/consent-store-provider.test.tsx
index 69837317939..1c80f3b63d5 100644
--- a/apps/sim/app/_shell/consent/consent-store-provider.test.tsx
+++ b/apps/sim/app/_shell/consent/consent-store-provider.test.tsx
@@ -47,7 +47,14 @@ describe('ConsentStoreProvider', () => {
       mode: 'hosted',
       backendURL: 'https://sim-sim.inth.app',
       consentCategories: ['necessary', 'measurement', 'marketing'],
-      store: { iframeBlockerConfig: { disableAutomaticBlocking: true } },
+      scripts: [
+        expect.objectContaining({ id: 'gtag', category: 'measurement', alwaysLoad: true }),
+        expect.objectContaining({ id: 'ahrefs-analytics', category: 'measurement' }),
+      ],
+      store: {
+        reloadOnConsentRevoked: true,
+        iframeBlockerConfig: { disableAutomaticBlocking: true },
+      },
     })
   })
 })
diff --git a/apps/sim/app/_shell/consent/consent-store-provider.tsx b/apps/sim/app/_shell/consent/consent-store-provider.tsx
index 09791fd56f4..a8c3a407d11 100644
--- a/apps/sim/app/_shell/consent/consent-store-provider.tsx
+++ b/apps/sim/app/_shell/consent/consent-store-provider.tsx
@@ -7,6 +7,7 @@ import {
   CONSENT_CATEGORIES,
   DEV_CONSENT_COUNTRY,
 } from '@/lib/consent/constants'
+import { GLOBAL_CONSENT_SCRIPTS } from '@/lib/consent/scripts'
 
 /**
  * Imported from `@c15t/nextjs/headless`, not the package root: the headless
@@ -26,19 +27,18 @@ const CONSENT_OPTIONS = {
   mode: 'hosted',
   backendURL: CONSENT_BACKEND_URL,
   consentCategories: [...CONSENT_CATEGORIES],
-  store: { iframeBlockerConfig: { disableAutomaticBlocking: true } },
+  scripts: GLOBAL_CONSENT_SCRIPTS,
+  store: {
+    reloadOnConsentRevoked: true,
+    iframeBlockerConfig: { disableAutomaticBlocking: true },
+  },
   ...(DEV_CONSENT_COUNTRY ? { overrides: { country: DEV_CONSENT_COUNTRY } } : {}),
 } satisfies ConsentManagerOptions
 
 /**
- * The consent store, for the two surfaces that read it: the banner on public
- * pages and the Privacy settings page inside the workspace.
- *
- * They mount separately — the banner sits behind an `ssr: false` boundary that
- * cannot wrap the app, so nothing reaches it through React context — yet share
- * one store, because `getOrCreateConsentRuntime` caches manager and store by
- * the option values. Keeping the options private to this component is what
- * makes that structural: two call sites cannot drift into two stores.
+ * The single consent store for hosted Sim. It wraps the entire application so
+ * script loading, the public banner, and workspace privacy settings cannot
+ * observe different consent state.
  */
 export function ConsentStoreProvider({ children }: { children: ReactNode }) {
   return <ConsentManagerProvider options={CONSENT_OPTIONS}>{children}</ConsentManagerProvider>
diff --git a/apps/sim/app/_shell/consent/google-analytics-page-view-tracker.test.tsx b/apps/sim/app/_shell/consent/google-analytics-page-view-tracker.test.tsx
new file mode 100644
index 00000000000..a16cd8e717d
--- /dev/null
+++ b/apps/sim/app/_shell/consent/google-analytics-page-view-tracker.test.tsx
@@ -0,0 +1,64 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const { consent, navigation, mockTrackGooglePageView } = vi.hoisted(() => ({
+  consent: { hasFetchedBanner: false, measurement: false, gtagLoaded: false },
+  navigation: { pathname: '/pricing' },
+  mockTrackGooglePageView: vi.fn(),
+}))
+
+vi.mock('next/navigation', () => ({ usePathname: () => navigation.pathname }))
+vi.mock('@c15t/nextjs/headless', () => ({
+  useConsentManager: () => ({
+    has: (category: string) => category === 'measurement' && consent.measurement,
+    hasFetchedBanner: consent.hasFetchedBanner,
+    loadedScripts: { gtag: consent.gtagLoaded },
+  }),
+}))
+vi.mock('@/lib/analytics/google', () => ({
+  trackGooglePageView: mockTrackGooglePageView,
+}))
+
+import { GoogleAnalyticsPageViewTracker } from '@/app/_shell/consent/google-analytics-page-view-tracker'
+
+let root: Root | null = null
+
+function render(): void {
+  ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+  if (!root) root = createRoot(document.createElement('div'))
+  act(() => root?.render(<GoogleAnalyticsPageViewTracker />))
+}
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = null
+  consent.hasFetchedBanner = false
+  consent.measurement = false
+  consent.gtagLoaded = false
+  navigation.pathname = '/pricing'
+  vi.clearAllMocks()
+})
+
+describe('GoogleAnalyticsPageViewTracker', () => {
+  it('tracks only later path changes after consent and the automatic first view', () => {
+    render()
+    expect(mockTrackGooglePageView).not.toHaveBeenCalled()
+
+    consent.hasFetchedBanner = true
+    consent.measurement = true
+    consent.gtagLoaded = true
+    render()
+    expect(mockTrackGooglePageView).not.toHaveBeenCalled()
+
+    navigation.pathname = '/demo'
+    render()
+    render()
+
+    expect(mockTrackGooglePageView).toHaveBeenCalledOnce()
+    expect(mockTrackGooglePageView).toHaveBeenCalledWith('/demo')
+  })
+})
diff --git a/apps/sim/app/_shell/consent/google-analytics-page-view-tracker.tsx b/apps/sim/app/_shell/consent/google-analytics-page-view-tracker.tsx
new file mode 100644
index 00000000000..6e39fe972a5
--- /dev/null
+++ b/apps/sim/app/_shell/consent/google-analytics-page-view-tracker.tsx
@@ -0,0 +1,28 @@
+'use client'
+
+import { useEffect, useRef } from 'react'
+import { useConsentManager } from '@c15t/nextjs/headless'
+import { usePathname } from 'next/navigation'
+import { trackGooglePageView } from '@/lib/analytics/google'
+
+/** Tracks Next.js client navigations after c15t has loaded the consent-aware tag. */
+export function GoogleAnalyticsPageViewTracker() {
+  const pathname = usePathname()
+  const { has, hasFetchedBanner, loadedScripts } = useConsentManager()
+  const lastTrackedPathRef = useRef<string | null>(null)
+
+  useEffect(() => {
+    if (!hasFetchedBanner || !has('measurement') || !loadedScripts.gtag) return
+
+    if (lastTrackedPathRef.current === null) {
+      lastTrackedPathRef.current = pathname
+      return
+    }
+    if (lastTrackedPathRef.current === pathname) return
+
+    lastTrackedPathRef.current = pathname
+    trackGooglePageView(pathname)
+  }, [has, hasFetchedBanner, loadedScripts.gtag, pathname])
+
+  return null
+}
diff --git a/apps/sim/app/_shell/providers/posthog-provider.test.tsx b/apps/sim/app/_shell/providers/posthog-provider.test.tsx
new file mode 100644
index 00000000000..229fb5b1c7b
--- /dev/null
+++ b/apps/sim/app/_shell/providers/posthog-provider.test.tsx
@@ -0,0 +1,141 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+
+const { consent, mockCapture, mockInit, mockOptIn, mockOptOut, mockPostHog, mockSetPostHogClient } =
+  vi.hoisted(() => {
+    const posthog = {
+      __loaded: false,
+      capture: vi.fn(),
+      init: vi.fn(),
+      opt_in_capturing: vi.fn(),
+      opt_out_capturing: vi.fn(),
+    }
+    posthog.init.mockImplementation(() => {
+      posthog.__loaded = true
+    })
+    return {
+      consent: { isResolved: false, measurement: false, marketing: false },
+      mockCapture: posthog.capture,
+      mockInit: posthog.init,
+      mockOptIn: posthog.opt_in_capturing,
+      mockOptOut: posthog.opt_out_capturing,
+      mockPostHog: posthog,
+      mockSetPostHogClient: vi.fn(),
+    }
+  })
+
+vi.mock('@/lib/consent/tracking-consent', () => ({ useTrackingConsent: () => consent }))
+vi.mock('@/lib/core/config/env', () => ({
+  getEnv: (name: string) =>
+    name === 'NEXT_PUBLIC_POSTHOG_ENABLED' ? 'true' : 'phc_test_project_key',
+  isTruthy: (value: string) => value === 'true',
+  publicEnvMissingAtModuleInit: false,
+}))
+vi.mock('@/lib/posthog/client', () => ({ setPostHogClient: mockSetPostHogClient }))
+vi.mock('@/lib/posthog/exception-filter', () => ({ preparePostHogEvent: vi.fn() }))
+vi.mock('posthog-js', () => ({
+  default: mockPostHog,
+}))
+vi.mock('posthog-js/react', () => ({
+  PostHogProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid='posthog-provider'>{children}</div>
+  ),
+}))
+
+import { PostHogProvider } from '@/app/_shell/providers/posthog-provider'
+
+let root: Root | null = null
+let container: HTMLDivElement | null = null
+
+function render(): HTMLDivElement {
+  ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
+  container ??= document.createElement('div')
+  document.body.appendChild(container)
+  root ??= createRoot(container)
+  act(() =>
+    root?.render(
+      <PostHogProvider consentRequired>
+        <span data-testid='application' />
+      </PostHogProvider>
+    )
+  )
+  return container
+}
+
+afterEach(() => {
+  act(() => root?.unmount())
+  root = null
+  container = null
+  consent.isResolved = false
+  consent.measurement = false
+  mockPostHog.__loaded = false
+  localStorage.clear()
+  sessionStorage.clear()
+  vi.clearAllMocks()
+})
+
+describe('PostHogProvider consent gating', () => {
+  it('initializes and publishes PostHog only while measurement consent is granted', async () => {
+    localStorage.setItem('ph_phc_test_project_key_posthog', 'identity')
+    localStorage.setItem('ph_other_project_posthog', 'other-identity')
+    localStorage.setItem('application_preference', 'keep')
+    const container = render()
+    const application = container.querySelector('[data-testid="application"]')
+
+    expect(mockInit).not.toHaveBeenCalled()
+    expect(localStorage.getItem('ph_phc_test_project_key_posthog')).toBe('identity')
+    expect(application).not.toBeNull()
+    expect(container.querySelector('[data-testid="posthog-provider"]')).not.toBeNull()
+
+    consent.isResolved = true
+    consent.measurement = true
+    render()
+
+    await vi.waitFor(() => expect(mockInit).toHaveBeenCalledTimes(1))
+    expect(mockInit).toHaveBeenCalledWith(
+      'phc_test_project_key',
+      expect.objectContaining({
+        opt_out_capturing_by_default: true,
+        opt_out_persistence_by_default: true,
+      })
+    )
+    expect(mockOptIn).toHaveBeenCalledWith({ captureEventName: false })
+    expect(mockSetPostHogClient).toHaveBeenLastCalledWith(
+      expect.objectContaining({ capture: mockCapture })
+    )
+    expect(container.querySelector('[data-testid="posthog-provider"]')).not.toBeNull()
+    expect(container.querySelector('[data-testid="application"]')).toBe(application)
+
+    consent.measurement = false
+    render()
+
+    expect(mockOptOut).toHaveBeenCalledTimes(1)
+    expect(mockSetPostHogClient).toHaveBeenLastCalledWith(null)
+    expect(container.querySelector('[data-testid="posthog-provider"]')).not.toBeNull()
+    expect(container.querySelector('[data-testid="application"]')).toBe(application)
+    expect(localStorage.getItem('ph_phc_test_project_key_posthog')).toBeNull()
+    expect(localStorage.getItem('ph_other_project_posthog')).toBe('other-identity')
+    expect(localStorage.getItem('application_preference')).toBe('keep')
+  })
+
+  it('clears only this project persistence after an initial denial', () => {
+    localStorage.setItem('ph_phc_test_project_key_posthog', 'identity')
+    localStorage.setItem('__ph_opt_in_out_phc_test_project_key', '1')
+    sessionStorage.setItem('ph_phc_test_project_key_window_id', 'window-id')
+    localStorage.setItem('ph_other_project_posthog', 'other-identity')
+
+    render()
+    consent.isResolved = true
+    render()
+
+    expect(mockInit).not.toHaveBeenCalled()
+    expect(localStorage.getItem('ph_phc_test_project_key_posthog')).toBeNull()
+    expect(localStorage.getItem('__ph_opt_in_out_phc_test_project_key')).toBeNull()
+    expect(sessionStorage.getItem('ph_phc_test_project_key_window_id')).toBeNull()
+    expect(localStorage.getItem('ph_other_project_posthog')).toBe('other-identity')
+  })
+})
diff --git a/apps/sim/app/_shell/providers/posthog-provider.tsx b/apps/sim/app/_shell/providers/posthog-provider.tsx
index 095646f29de..f6a42361367 100644
--- a/apps/sim/app/_shell/providers/posthog-provider.tsx
+++ b/apps/sim/app/_shell/providers/posthog-provider.tsx
@@ -1,127 +1,173 @@
 'use client'
 
-import { useEffect, useRef, useState } from 'react'
+import { useEffect } from 'react'
 import { createLogger } from '@sim/logger'
-import type { PostHog } from 'posthog-js'
+import posthog from 'posthog-js'
+import { PostHogProvider as PHProvider } from 'posthog-js/react'
+import { useTrackingConsent } from '@/lib/consent/tracking-consent'
 import { getEnv, isTruthy, publicEnvMissingAtModuleInit } from '@/lib/core/config/env'
-import { settlePostHogClient } from '@/lib/posthog/client'
-import { dropUnactionableExceptions } from '@/lib/posthog/exception-filter'
+import { setPostHogClient } from '@/lib/posthog/client'
+import { preparePostHogEvent } from '@/lib/posthog/exception-filter'
 
 const logger = createLogger('PostHogProvider')
 
-export function PostHogProvider({ children }: { children: React.ReactNode }) {
-  const [Provider, setProvider] = useState<React.ComponentType<{
-    client: PostHog
-    children: React.ReactNode
-  }> | null>(null)
-  const clientRef = useRef<PostHog | null>(null)
+/** Removes this PostHog project's browser state after a settled analytics denial. */
+function clearPostHogBrowserState(posthogKey: string): void {
+  const persistenceKey = `ph_${posthogKey
+    .replace(/\+/g, 'PL')
+    .replace(/\//g, 'SL')
+    .replace(/=/g, 'EQ')}_posthog`
+  const storageKeys = [
+    persistenceKey,
+    `ph_${posthogKey}_window_id`,
+    `ph_${posthogKey}_primary_window_exists`,
+    `__ph_opt_in_out_${posthogKey}`,
+  ]
+
+  try {
+    for (const storage of [window.localStorage, window.sessionStorage]) {
+      for (const key of storageKeys) storage.removeItem(key)
+    }
+  } catch {}
+
+  try {
+    const simDomain =
+      window.location.hostname === 'sim.ai' || window.location.hostname.endsWith('.sim.ai')
+        ? '; Domain=.sim.ai'
+        : ''
+
+    for (const key of storageKeys) {
+      document.cookie = `${key}=; Max-Age=0; Path=/; SameSite=Lax`
+      if (simDomain) document.cookie = `${key}=; Max-Age=0; Path=/; SameSite=Lax${simDomain}`
+    }
+  } catch {}
+}
+
+interface PostHogProviderProps {
+  children: React.ReactNode
+  consentRequired?: boolean
+}
+
+export function PostHogProvider({ children, consentRequired = false }: PostHogProviderProps) {
+  const { isResolved, measurement } = useTrackingConsent()
+  const canInitialize = !consentRequired || (isResolved && measurement)
 
   useEffect(() => {
-    const posthogEnabled = getEnv('NEXT_PUBLIC_POSTHOG_ENABLED')
     const posthogKey = getEnv('NEXT_PUBLIC_POSTHOG_KEY')
 
+    if (!canInitialize) {
+      setPostHogClient(null)
+      if (posthog.__loaded) posthog.opt_out_capturing()
+      if (consentRequired && isResolved && !measurement && posthogKey) {
+        clearPostHogBrowserState(posthogKey)
+      }
+      return () => setPostHogClient(null)
+    }
+
+    const posthogEnabled = getEnv('NEXT_PUBLIC_POSTHOG_ENABLED')
+
     if (!isTruthy(posthogEnabled) || !posthogKey) {
-      settlePostHogClient(null)
-      return
+      setPostHogClient(null)
+      if (posthog.__loaded) posthog.opt_out_capturing()
+      return () => setPostHogClient(null)
     }
 
-    Promise.all([import('posthog-js'), import('posthog-js/react')])
-      .then(([posthogModule, { PostHogProvider: PHProvider }]) => {
-        const posthog = posthogModule.default
-        if (!posthog.__loaded) {
-          posthog.init(posthogKey, {
-            api_host: '/ingest',
-            ui_host: 'https://us.posthog.com',
-            defaults: '2025-05-24',
-            person_profiles: 'identified_only',
-            autocapture: false,
-            capture_pageview: false,
-            capture_pageleave: false,
-            capture_performance: false,
-            capture_dead_clicks: false,
-            enable_heatmaps: false,
-            /**
-             * PostHog's own error tracking, wired to `window.onerror` and
-             * `unhandledrejection`. This is the app-wide net: React error
-             * boundaries only see errors thrown inside the tree they wrap, and
-             * a failed chunk load, a rejected promise, or anything thrown from
-             * an event handler or socket callback reaches none of them.
-             *
-             * `capture_console_errors` stays off. It is not error reporting —
-             * it captures every `console.error`, which here means React's
-             * hydration and dev warnings (the ones `HydrationErrorHandler`
-             * already filters out as noise) drowning the real exceptions.
-             */
-            capture_exceptions: {
-              capture_unhandled_errors: true,
-              capture_unhandled_rejections: true,
-              capture_console_errors: false,
+    try {
+      if (!posthog.__loaded) {
+        posthog.init(posthogKey, {
+          api_host: '/ingest',
+          ui_host: 'https://us.posthog.com',
+          defaults: '2025-05-24',
+          person_profiles: 'identified_only',
+          autocapture: false,
+          capture_pageview: false,
+          capture_pageleave: false,
+          capture_performance: false,
+          capture_dead_clicks: false,
+          enable_heatmaps: false,
+          /**
+           * PostHog's own error tracking, wired to `window.onerror` and
+           * `unhandledrejection`. This is the app-wide net: React error
+           * boundaries only see errors thrown inside the tree they wrap, and
+           * a failed chunk load, a rejected promise, or anything thrown from
+           * an event handler or socket callback reaches none of them.
+           *
+           * `capture_console_errors` stays off. It is not error reporting —
+           * it captures every `console.error`, which here means React's
+           * hydration and dev warnings (the ones `HydrationErrorHandler`
+           * already filters out as noise) drowning the real exceptions.
+           */
+          capture_exceptions: {
+            capture_unhandled_errors: true,
+            capture_unhandled_rejections: true,
+            capture_console_errors: false,
+          },
+          /**
+           * Drops the browser artifacts that autocapture cannot help but
+           * see — resize-loop notices, opaque cross-origin failures, and
+           * cancelled requests. Filtering here rather than with a PostHog
+           * suppression rule keeps the list reviewable in the diff and stops
+           * the events before they leave the browser.
+           */
+          before_send: preparePostHogEvent,
+          opt_out_capturing_by_default: true,
+          opt_out_persistence_by_default: true,
+          disable_session_recording: true,
+          session_recording: {
+            maskAllInputs: false,
+            maskInputOptions: {
+              password: true,
+              email: false,
             },
             /**
-             * Drops the browser artifacts that autocapture cannot help but
-             * see — resize-loop notices, opaque cross-origin failures, and
-             * cancelled requests. Filtering here rather than with a PostHog
-             * suppression rule keeps the list reviewable in the diff and stops
-             * the events before they leave the browser.
+             * None of these nodes are painted, so replay fidelity is
+             * unchanged, while each full snapshot serializes fewer nodes on
+             * the main thread and ships a smaller payload.
+             *
+             * Enumerated rather than `true`/`'all'` on purpose — those
+             * presets also enable `headTitleMutations`, which would drop
+             * `document.title` changes and lose the page identity a replay
+             * viewer reads while scrubbing.
              */
-            before_send: dropUnactionableExceptions,
-            disable_session_recording: true,
-            session_recording: {
-              maskAllInputs: false,
-              maskInputOptions: {
-                password: true,
-                email: false,
-              },
-              /**
-               * None of these nodes are painted, so replay fidelity is
-               * unchanged, while each full snapshot serializes fewer nodes on
-               * the main thread and ships a smaller payload.
-               *
-               * Enumerated rather than `true`/`'all'` on purpose — those
-               * presets also enable `headTitleMutations`, which would drop
-               * `document.title` changes and lose the page identity a replay
-               * viewer reads while scrubbing.
-               */
-              slimDOMOptions: {
-                script: true,
-                comment: true,
-                headFavicon: true,
-                headWhitespace: true,
-                headMetaDescKeywords: true,
-                headMetaSocial: true,
-                headMetaRobots: true,
-                headMetaHttpEquiv: true,
-                headMetaAuthorship: true,
-                headMetaVerification: true,
-              },
-              recordCrossOriginIframes: false,
-              recordHeaders: false,
-              recordBody: false,
+            slimDOMOptions: {
+              script: true,
+              comment: true,
+              headFavicon: true,
+              headWhitespace: true,
+              headMetaDescKeywords: true,
+              headMetaSocial: true,
+              headMetaRobots: true,
+              headMetaHttpEquiv: true,
+              headMetaAuthorship: true,
+              headMetaVerification: true,
             },
-            persistence: 'localStorage+cookie',
-          })
-        }
-        /**
-         * Releases anything captured while the imports above were in flight.
-         * Must run after `init`, since `capture` is a silent no-op until then.
-         */
-        settlePostHogClient(posthog)
-
-        if (publicEnvMissingAtModuleInit) {
-          posthog.capture('runtime_env_missing_at_module_init')
-        }
-        clientRef.current = posthog
-        setProvider(() => PHProvider)
-      })
-      .catch((err) => {
-        settlePostHogClient(null)
-        logger.error('Failed to load PostHog', { error: err })
-      })
-  }, [])
-
-  if (Provider && clientRef.current) {
-    return <Provider client={clientRef.current}>{children}</Provider>
-  }
-
-  return <>{children}</>
+            recordCrossOriginIframes: false,
+            recordHeaders: false,
+            recordBody: false,
+          },
+          persistence: 'localStorage+cookie',
+        })
+      }
+      /**
+       * A prior withdrawal persists PostHog's opt-out marker. c15t is the
+       * source of truth, so a settled grant must explicitly clear that marker
+       * without emitting PostHog's synthetic opt-in event.
+       */
+      posthog.opt_in_capturing({ captureEventName: false })
+      setPostHogClient(posthog)
+
+      if (publicEnvMissingAtModuleInit) {
+        posthog.capture('runtime_env_missing_at_module_init')
+      }
+    } catch (err) {
+      setPostHogClient(null)
+      logger.error('Failed to load PostHog', { error: err })
+    }
+
+    return () => {
+      setPostHogClient(null)
+    }
+  }, [canInitialize, consentRequired, isResolved, measurement])
+
+  return <PHProvider client={posthog}>{children}</PHProvider>
 }
diff --git a/apps/sim/app/layout.tsx b/apps/sim/app/layout.tsx
index 6a338b43a47..81aed9feb9b 100644
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -33,11 +33,21 @@ export const viewport: Viewport = {
 
 export const metadata: Metadata = generateBrandedMetadata()
 
-const GTM_ID = 'GTM-T7PHSRX5' as const
-const GA_ID = 'G-DR7YBE70VS' as const
-
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   const themeCSS = generateThemeCSS()
+  const application = (
+    <PostHogProvider consentRequired={isHosted}>
+      <ThemeProvider>
+        <QueryProvider>
+          <SessionProvider>
+            <TooltipProvider>
+              <BrandedLayout>{children}</BrandedLayout>
+            </TooltipProvider>
+          </SessionProvider>
+        </QueryProvider>
+      </ThemeProvider>
+    </PostHogProvider>
+  )
 
   return (
     <html lang='en' suppressHydrationWarning {...publicEnvHtmlAttributes()}>
@@ -226,70 +236,13 @@ export default function RootLayout({ children }: { children: React.ReactNode })
         <meta name='format-detection' content='telephone=no' />
         <meta httpEquiv='x-ua-compatible' content='ie=edge' />
 
-        {/* Google Tag Manager — hosted only */}
-        {isHosted && (
-          <Script
-            id='gtm'
-            strategy='afterInteractive'
-            dangerouslySetInnerHTML={{
-              __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','${GTM_ID}');`,
-            }}
-          />
-        )}
-
-        {/* Google Analytics (gtag.js) — hosted only */}
-        {isHosted && (
-          <>
-            <Script
-              id='gtag-src'
-              src={`https://www.googletagmanager.com/gtag/js?id=${GA_ID}`}
-              strategy='afterInteractive'
-            />
-            <Script
-              id='gtag-init'
-              strategy='afterInteractive'
-              dangerouslySetInnerHTML={{
-                __html: `window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments);}gtag('js',new Date());gtag('config','${GA_ID}');`,
-              }}
-            />
-          </>
-        )}
-
         {isHosted ? <PublicEnvScript /> : <RuntimePublicEnvScript disableNextScript />}
       </head>
       <body className={`${season.variable} font-season`} suppressHydrationWarning>
-        {/* Google Tag Manager (noscript) — hosted only */}
-        {isHosted && (
-          <noscript>
-            <iframe
-              src={`https://www.googletagmanager.com/ns.html?id=${GTM_ID}`}
-              title='Google Tag Manager'
-              height='0'
-              width='0'
-              className='invisible hidden'
-            />
-          </noscript>
-        )}
         <HydrationErrorHandler />
         <DesktopUpdateGate />
         <NuqsAdapter>
-          <PostHogProvider>
-            <ThemeProvider>
-              <QueryProvider>
-                <SessionProvider>
-                  <TooltipProvider>
-                    <BrandedLayout>{children}</BrandedLayout>
-                    {/* Cookie consent — hosted only */}
-                    {isHosted && <ConsentProvider />}
-                  </TooltipProvider>
-                </SessionProvider>
-              </QueryProvider>
-            </ThemeProvider>
-          </PostHogProvider>
+          {isHosted ? <ConsentProvider>{application}</ConsentProvider> : application}
         </NuqsAdapter>
       </body>
     </html>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
index c45862f166e..0066141d523 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.test.tsx
@@ -1,7 +1,6 @@
 /**
  * @vitest-environment jsdom
  */
-import type { ReactNode } from 'react'
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -17,9 +16,6 @@ const { mockUseConsentManager, mockSaveConsents, mockToastError, mockRevert, las
 
 vi.mock('@sim/emcn', () => ({ toast: { success: vi.fn(), error: mockToastError } }))
 vi.mock('@c15t/nextjs/headless', () => ({ useConsentManager: mockUseConsentManager }))
-vi.mock('@/app/_shell/consent/consent-store-provider', () => ({
-  ConsentStoreProvider: ({ children }: { children: ReactNode }) => children,
-}))
 vi.mock('@/app/_shell/consent/consent-preferences', () => ({
   CONSENT_LINK_CLASS: 'link',
   ConsentPreferences: (props: {
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
index db83b86bc30..f2f38594449 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/cookie-preferences.tsx
@@ -6,13 +6,8 @@ import { toast } from '@sim/emcn'
 import { getErrorMessage } from '@sim/utils/errors'
 import Link from 'next/link'
 import { CONSENT_LINK_CLASS, ConsentPreferences } from '@/app/_shell/consent/consent-preferences'
-import { ConsentStoreProvider } from '@/app/_shell/consent/consent-store-provider'
 import { SettingsSection } from '@/app/workspace/[workspaceId]/settings/components/settings-section/settings-section'
 
-/**
- * Body of the cookies section, split out because it reads the consent store,
- * which only exists below the provider.
- */
 function CookiePreferencesBody() {
   const { saveConsents } = useConsentManager()
   const [saving, setSaving] = useState(false)
@@ -61,11 +56,7 @@ function CookiePreferencesBody() {
   )
 }
 
-/** The cookies section, with the store it reads. */
+/** The cookies section, backed by the root hosted consent store. */
 export function CookiePreferences() {
-  return (
-    <ConsentStoreProvider>
-      <CookiePreferencesBody />
-    </ConsentStoreProvider>
-  )
+  return <CookiePreferencesBody />
 }
diff --git a/apps/sim/lib/analytics/google.ts b/apps/sim/lib/analytics/google.ts
new file mode 100644
index 00000000000..a696f0bd6f7
--- /dev/null
+++ b/apps/sim/lib/analytics/google.ts
@@ -0,0 +1,26 @@
+import { GOOGLE_ANALYTICS_ID } from '@/lib/consent/scripts'
+
+interface GoogleAnalyticsEventMap {
+  sign_up: { method: string }
+  get_a_demo: {
+    page_path: '/demo'
+    form_name: 'sim_demo'
+    booking_status: 'scheduled'
+  }
+}
+
+/** Sends an event only after the caller has verified measurement consent. */
+export function trackGoogleEvent<E extends keyof GoogleAnalyticsEventMap>(
+  name: E,
+  parameters: GoogleAnalyticsEventMap[E]
+): void {
+  window.gtag?.('event', name, parameters)
+}
+
+export function trackGooglePageView(path: string): void {
+  window.gtag?.('event', 'page_view', {
+    page_path: path,
+    page_location: `${window.location.origin}${path}`,
+    send_to: GOOGLE_ANALYTICS_ID,
+  })
+}
diff --git a/apps/sim/lib/consent/constants.ts b/apps/sim/lib/consent/constants.ts
index 593a684a824..b8a168f8a77 100644
--- a/apps/sim/lib/consent/constants.ts
+++ b/apps/sim/lib/consent/constants.ts
@@ -35,14 +35,3 @@ export type ConsentCategory = (typeof CONSENT_CATEGORIES)[number]
  */
 export const DEV_CONSENT_COUNTRY =
   process.env.NODE_ENV === 'production' ? undefined : process.env.NEXT_PUBLIC_CONSENT_COUNTRY
-
-/**
- * Reopens the consent banner in its expanded state.
- *
- * The consent runtime mounts beside the app rather than wrapping it, so a
- * surface that wants to reopen the banner — the Cookie Policy's "Change your
- * cookie choices" control — cannot reach the store through a React context. A
- * window event keeps that isolation intact and stays a one-shot command rather
- * than state anything has to hold.
- */
-export const OPEN_CONSENT_PREFERENCES_EVENT = 'sim:open-consent-preferences'
diff --git a/apps/sim/lib/consent/scripts.test.ts b/apps/sim/lib/consent/scripts.test.ts
new file mode 100644
index 00000000000..aab1a8aad6a
--- /dev/null
+++ b/apps/sim/lib/consent/scripts.test.ts
@@ -0,0 +1,76 @@
+/**
+ * @vitest-environment jsdom
+ */
+import type { ScriptCallbackInfo } from 'c15t'
+import { afterEach, describe, expect, it } from 'vitest'
+import { GLOBAL_CONSENT_SCRIPTS, HUBSPOT_SCRIPT, X_PIXEL_SCRIPT } from '@/lib/consent/scripts'
+
+const CALLBACK_INFO: ScriptCallbackInfo = {
+  id: 'test-script',
+  elementId: 'test-script',
+  hasConsent: false,
+  consents: {
+    necessary: true,
+    functionality: false,
+    experience: false,
+    measurement: false,
+    marketing: false,
+  },
+}
+
+afterEach(() => {
+  window.dataLayer = []
+  window.gtag = undefined
+  window._hsq = []
+  window.history.replaceState({}, '', '/')
+})
+
+describe('consent scripts', () => {
+  it('loads global analytics through c15t with the intended categories', () => {
+    expect(GLOBAL_CONSENT_SCRIPTS).toEqual([
+      expect.objectContaining({
+        id: 'gtag',
+        category: 'measurement',
+        alwaysLoad: true,
+        persistAfterConsentRevoked: true,
+        src: 'https://www.googletagmanager.com/gtag/js?id=G-DR7YBE70VS',
+      }),
+      expect.objectContaining({
+        id: 'ahrefs-analytics',
+        category: 'measurement',
+        src: 'https://analytics.ahrefs.com/analytics.js',
+      }),
+    ])
+  })
+
+  it('keeps landing vendors in separate consent categories', () => {
+    expect(HUBSPOT_SCRIPT).toMatchObject({ id: 'hubspot', category: 'measurement' })
+    expect(X_PIXEL_SCRIPT).toMatchObject({
+      id: 'x-pixel',
+      category: 'marketing',
+      src: 'https://static.ads-twitter.com/uwt.js',
+    })
+  })
+
+  it('removes query parameters and fragments from the initial Google page context', () => {
+    window.history.replaceState({}, '', '/signup?email=private@example.com#account')
+    window.dataLayer = []
+    window.gtag = undefined
+
+    GLOBAL_CONSENT_SCRIPTS[0].onBeforeLoad?.(CALLBACK_INFO)
+
+    expect(window.dataLayer[0]).toEqual([
+      'set',
+      { page_location: `${window.location.origin}/signup` },
+    ])
+  })
+
+  it('gives HubSpot a query-free path before its automatic first page view', () => {
+    window.history.replaceState({}, '', '/demo?email=private@example.com#booking')
+    window._hsq = []
+
+    HUBSPOT_SCRIPT.onBeforeLoad()
+
+    expect(window._hsq).toEqual([['setPath', '/demo']])
+  })
+})
diff --git a/apps/sim/lib/consent/scripts.ts b/apps/sim/lib/consent/scripts.ts
new file mode 100644
index 00000000000..dae6591b73f
--- /dev/null
+++ b/apps/sim/lib/consent/scripts.ts
@@ -0,0 +1,66 @@
+import { ahrefsAnalytics } from '@c15t/scripts/ahrefs-analytics'
+import { gtag } from '@c15t/scripts/google-tag'
+import { xPixel } from '@c15t/scripts/x-pixel'
+import type { ScriptCallbackInfo } from 'c15t'
+
+export const GOOGLE_ANALYTICS_ID = 'G-DR7YBE70VS' as const
+export const X_PIXEL_ID = 'q5xbl' as const
+export const X_DEMO_BOOKED_EVENT_ID = 'tw-q5xbl-q5xbn' as const
+
+const AHREFS_ANALYTICS_KEY = 'WJ9yWTBAiQKZAE/2TyU/yA' as const
+
+declare global {
+  interface Window {
+    _hsq?: unknown[][]
+  }
+}
+
+const GOOGLE_ANALYTICS_SCRIPT = gtag({
+  id: GOOGLE_ANALYTICS_ID,
+  category: 'measurement',
+})
+const initializeGoogleAnalytics = GOOGLE_ANALYTICS_SCRIPT.onBeforeLoad
+
+function withoutQueryOrHash(value: string): string | undefined {
+  try {
+    const url = new URL(value)
+    return `${url.origin}${url.pathname}`
+  } catch {
+    return undefined
+  }
+}
+
+/** Consent-aware analytics that applies to both public and product routes. */
+export const GLOBAL_CONSENT_SCRIPTS = [
+  {
+    ...GOOGLE_ANALYTICS_SCRIPT,
+    onBeforeLoad: (info: ScriptCallbackInfo) => {
+      window.dataLayer ||= []
+      window.gtag ||= (...args: unknown[]) => {
+        window.dataLayer.push(args)
+      }
+      const referrer = document.referrer ? withoutQueryOrHash(document.referrer) : undefined
+      window.gtag('set', {
+        page_location: `${window.location.origin}${window.location.pathname}`,
+        ...(referrer ? { page_referrer: referrer } : {}),
+      })
+      initializeGoogleAnalytics?.(info)
+    },
+  },
+  ahrefsAnalytics({ key: AHREFS_ANALYTICS_KEY }),
+]
+
+/** Marketing-page integrations that should not load on a direct workspace visit. */
+export const X_PIXEL_SCRIPT = xPixel({ pixelId: X_PIXEL_ID })
+
+/** HubSpot has no first-party c15t helper, so it uses the generic script contract. */
+export const HUBSPOT_SCRIPT = {
+  id: 'hubspot',
+  src: 'https://js-na2.hs-scripts.com/246720681.js',
+  category: 'measurement',
+  async: true,
+  onBeforeLoad: () => {
+    window._hsq ||= []
+    window._hsq.push(['setPath', window.location.pathname])
+  },
+} as const
diff --git a/apps/sim/lib/consent/tracking-consent.tsx b/apps/sim/lib/consent/tracking-consent.tsx
new file mode 100644
index 00000000000..af8649535ae
--- /dev/null
+++ b/apps/sim/lib/consent/tracking-consent.tsx
@@ -0,0 +1,48 @@
+'use client'
+
+import { createContext, type ReactNode, useContext } from 'react'
+import { useConsentManager } from '@c15t/nextjs/headless'
+
+interface TrackingConsent {
+  isResolved: boolean
+  measurement: boolean
+  marketing: boolean
+}
+
+interface TrackingConsentProviderProps {
+  children: ReactNode
+}
+
+const DEFAULT_TRACKING_CONSENT: TrackingConsent = {
+  isResolved: false,
+  measurement: false,
+  marketing: false,
+}
+
+const TrackingConsentContext = createContext<TrackingConsent>(DEFAULT_TRACKING_CONSENT)
+
+/**
+ * Projects c15t's wider store into the small, safe contract used by analytics
+ * consumers. The default denies every optional category, so components remain
+ * safe when rendered by a self-hosted deployment without the c15t provider.
+ */
+export function TrackingConsentProvider({ children }: TrackingConsentProviderProps) {
+  const { has, hasFetchedBanner } = useConsentManager()
+
+  return (
+    <TrackingConsentContext.Provider
+      value={{
+        isResolved: hasFetchedBanner,
+        measurement: hasFetchedBanner && has('measurement'),
+        marketing: hasFetchedBanner && has('marketing'),
+      }}
+    >
+      {children}
+    </TrackingConsentContext.Provider>
+  )
+}
+
+/** Returns the settled tracking permissions, defaulting to deny outside hosted Sim. */
+export function useTrackingConsent(): TrackingConsent {
+  return useContext(TrackingConsentContext)
+}
diff --git a/apps/sim/lib/core/security/csp.ts b/apps/sim/lib/core/security/csp.ts
index ec03a394445..3cc7cb0d8d8 100644
--- a/apps/sim/lib/core/security/csp.ts
+++ b/apps/sim/lib/core/security/csp.ts
@@ -171,7 +171,6 @@ const STATIC_FRAME_SRC = [
   'https://www.mixcloud.com',
   'https://tenor.com',
   'https://giphy.com',
-  ...(isHosted ? ['https://www.googletagmanager.com'] : []),
 ] as const
 
 // Build-time CSP directives (for next.config.ts)
diff --git a/apps/sim/lib/posthog/client-disabled.test.ts b/apps/sim/lib/posthog/client-disabled.test.ts
index 7e79fa43220..9c7b49eddd3 100644
--- a/apps/sim/lib/posthog/client-disabled.test.ts
+++ b/apps/sim/lib/posthog/client-disabled.test.ts
@@ -2,26 +2,13 @@
  * @vitest-environment node
  */
 import { describe, expect, it } from 'vitest'
-import {
-  captureClientEvent,
-  captureClientException,
-  settlePostHogClient,
-} from '@/lib/posthog/client'
+import { captureClientEvent, captureClientException, setPostHogClient } from '@/lib/posthog/client'
 
-/**
- * Lives in its own file because readiness is module-level and settles once.
- * Vitest isolates the module registry per file, so this gets an unsettled gate
- * to settle with `null` without `vi.resetModules()` and a dynamic import.
- */
 describe('client capture when analytics is disabled', () => {
-  it('drops events instead of sending them, without throwing', async () => {
-    settlePostHogClient(null)
+  it('drops events instead of sending them, without throwing', () => {
+    setPostHogClient(null)
 
     expect(() => captureClientEvent('login_page_viewed', {})).not.toThrow()
     expect(() => captureClientException(new Error('boom'))).not.toThrow()
-
-    // Lets the gate's continuations run; a missing catch would surface here as
-    // an unhandled rejection and fail the test.
-    await Promise.resolve()
   })
 })
diff --git a/apps/sim/lib/posthog/client.test.ts b/apps/sim/lib/posthog/client.test.ts
index 6658defa49f..9b13f6a4c56 100644
--- a/apps/sim/lib/posthog/client.test.ts
+++ b/apps/sim/lib/posthog/client.test.ts
@@ -3,11 +3,7 @@
  */
 import type { PostHog } from 'posthog-js'
 import { describe, expect, it, vi } from 'vitest'
-import {
-  captureClientEvent,
-  captureClientException,
-  settlePostHogClient,
-} from '@/lib/posthog/client'
+import { captureClientEvent, captureClientException, setPostHogClient } from '@/lib/posthog/client'
 
 /**
  * Stands in for the initialized singleton. `capture` exists on the real
@@ -22,32 +18,24 @@ function createFakePostHog() {
 }
 
 describe('client capture', () => {
-  /**
-   * Readiness is module-level and settles exactly once, so the whole lifecycle
-   * runs as a single case. Split across separate cases, each one after the
-   * first would silently depend on an earlier case having settled the gate, and
-   * would fail when run in isolation or reordered.
-   */
-  it('holds events until PostHog initializes, then sends them and everything after', async () => {
+  it('drops pre-consent events and captures only while a client is published', () => {
     const posthog = createFakePostHog()
 
     captureClientEvent('login_page_viewed', {})
-    await Promise.resolve()
-
     expect(posthog.capture).not.toHaveBeenCalled()
 
-    settlePostHogClient(posthog)
-    await vi.waitFor(() => expect(posthog.capture).toHaveBeenCalledWith('login_page_viewed', {}))
-
+    setPostHogClient(posthog)
     captureClientEvent('signup_page_viewed', {})
-    await vi.waitFor(() => expect(posthog.capture).toHaveBeenCalledWith('signup_page_viewed', {}))
+    expect(posthog.capture).toHaveBeenCalledWith('signup_page_viewed', {})
 
     const error = new Error('canvas exploded')
     captureClientException(error, { error_boundary: 'workflow_canvas' })
-    await vi.waitFor(() =>
-      expect(posthog.captureException).toHaveBeenCalledWith(error, {
-        error_boundary: 'workflow_canvas',
-      })
-    )
+    expect(posthog.captureException).toHaveBeenCalledWith(error, {
+      error_boundary: 'workflow_canvas',
+    })
+
+    setPostHogClient(null)
+    captureClientEvent('login_page_viewed', {})
+    expect(posthog.capture).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/apps/sim/lib/posthog/client.ts b/apps/sim/lib/posthog/client.ts
index d4ad2e67486..b6eb1062c26 100644
--- a/apps/sim/lib/posthog/client.ts
+++ b/apps/sim/lib/posthog/client.ts
@@ -2,53 +2,38 @@ import type { PostHog } from 'posthog-js'
 import type { PostHogEventMap, PostHogEventName } from '@/lib/posthog/events'
 
 /**
- * Resolves with the initialized PostHog instance, or `null` when analytics is
- * disabled or the library failed to load. Settled exactly once by
- * {@link settlePostHogClient}, which `PostHogProvider` calls on every branch.
- *
- * This gate exists because `posthog.capture` is a hard no-op until
- * `posthog.init()` has run: its entire body sits behind `if (this.__loaded)`,
- * with no buffer and no warning, so a call made before init is discarded
- * silently. `PostHogProvider` reaches init through two dynamic imports
- * (`posthog-js` and `posthog-js/react`), while a caller only needs `posthog-js`
- * — so anything captured on mount resolves first and lands in that dead window.
- * Mount-time events (`login_page_viewed`, `landing_page_viewed`) and, worst of
- * all, a crash report from an error boundary that fired during first paint were
- * the events most reliably lost.
+ * The currently consented, initialized PostHog client. Events raised before
+ * initialization or after consent withdrawal are intentionally dropped rather
+ * than buffered and replayed after the user's privacy decision changes.
  */
-let settlePostHog!: (instance: PostHog | null) => void
-const postHogReady = new Promise<PostHog | null>((resolve) => {
-  settlePostHog = resolve
-})
+let postHogClient: PostHog | null = null
 
 /**
- * Publishes the outcome of PostHog initialization to the capture helpers.
- * Called only by `PostHogProvider`. Repeat calls are no-ops.
+ * Publishes or clears the consented PostHog client used by non-React callers.
+ * Called only by `PostHogProvider`.
  *
  * @param instance - The initialized instance, or `null` when analytics is off.
  */
-export function settlePostHogClient(instance: PostHog | null): void {
-  settlePostHog(instance)
+export function setPostHogClient(instance: PostHog | null): void {
+  postHogClient = instance
 }
 
 /**
- * Runs `send` once PostHog is ready, swallowing everything. Analytics must
- * never surface as an unhandled rejection — these helpers are called from
- * error-reporting paths, where a throw would be captured as its own exception.
+ * Runs a capture against the currently consented client, swallowing everything.
+ * Analytics is fire-and-forget and must never fail an application path.
  */
-function whenReady(send: (posthog: PostHog) => void): void {
-  postHogReady
-    .then((posthog) => {
-      if (posthog) send(posthog)
-    })
-    .catch(() => {})
+function captureIfReady(send: (posthog: PostHog) => void): void {
+  if (!postHogClient) return
+  try {
+    send(postHogClient)
+  } catch {}
 }
 
 /**
  * Capture a client-side PostHog event from a non-React context (e.g. Zustand stores).
  *
  * Fully fire-and-forget — never throws, never blocks. Events captured before
- * PostHog finishes initializing are held until it does rather than dropped.
+ * consent and initialization are dropped.
  *
  * React components should use {@link captureEvent} with the `posthog` instance from `usePostHog()`.
  *
@@ -59,7 +44,7 @@ export function captureClientEvent<E extends PostHogEventName>(
   event: E,
   properties: PostHogEventMap[E]
 ): void {
-  whenReady((posthog) => {
+  captureIfReady((posthog) => {
     posthog.capture(event, properties as Record<string, unknown>)
   })
 }
@@ -78,7 +63,7 @@ export function captureClientEvent<E extends PostHogEventName>(
  * @param properties - Extra context merged onto the `$exception` event.
  */
 export function captureClientException(error: unknown, properties?: Record<string, unknown>): void {
-  whenReady((posthog) => {
+  captureIfReady((posthog) => {
     posthog.captureException(error, properties)
   })
 }
diff --git a/apps/sim/lib/posthog/exception-filter.test.ts b/apps/sim/lib/posthog/exception-filter.test.ts
index f2a941310c2..8345e629682 100644
--- a/apps/sim/lib/posthog/exception-filter.test.ts
+++ b/apps/sim/lib/posthog/exception-filter.test.ts
@@ -3,7 +3,7 @@
  */
 import type { CaptureResult } from 'posthog-js'
 import { describe, expect, it } from 'vitest'
-import { dropUnactionableExceptions } from '@/lib/posthog/exception-filter'
+import { dropUnactionableExceptions, preparePostHogEvent } from '@/lib/posthog/exception-filter'
 
 interface TestException {
   type?: string
@@ -142,3 +142,37 @@ describe('dropUnactionableExceptions', () => {
     expect(dropUnactionableExceptions(event)).toBe(event)
   })
 })
+
+describe('preparePostHogEvent', () => {
+  it('strips query strings and fragments from automatically captured URL properties', () => {
+    const event = {
+      uuid: 'test-uuid',
+      event: 'signup_page_viewed',
+      properties: {
+        $current_url: 'https://sim.ai/signup?email=private%40example.com#form',
+        $referrer: 'https://sim.ai/invite?token=secret',
+        $pathname: '/signup',
+      },
+    } as CaptureResult
+
+    expect(preparePostHogEvent(event)).toEqual({
+      ...event,
+      properties: {
+        $current_url: 'https://sim.ai/signup',
+        $referrer: 'https://sim.ai/invite',
+        $pathname: '/signup',
+      },
+    })
+    expect(event.properties?.$current_url).toContain('?email=')
+  })
+
+  it('still drops an unactionable exception after URL sanitization', () => {
+    const event = browserRaised({
+      type: 'DOMException',
+      value: 'AbortError: signal is aborted without reason',
+    })
+    event.properties.$current_url = 'https://sim.ai/workspace/id?token=secret'
+
+    expect(preparePostHogEvent(event)).toBeNull()
+  })
+})
diff --git a/apps/sim/lib/posthog/exception-filter.ts b/apps/sim/lib/posthog/exception-filter.ts
index 59db5f9fffa..4aaaf6a8a1d 100644
--- a/apps/sim/lib/posthog/exception-filter.ts
+++ b/apps/sim/lib/posthog/exception-filter.ts
@@ -1,5 +1,12 @@
 import type { CaptureResult } from 'posthog-js'
 
+const URL_PROPERTIES = [
+  '$current_url',
+  '$referrer',
+  '$initial_current_url',
+  '$initial_referrer',
+] as const
+
 /**
  * Exception types that only ever mean "something was cancelled".
  *
@@ -123,3 +130,32 @@ export function dropUnactionableExceptions(event: CaptureResult | null): Capture
 
   return entries.every(isNoise) ? null : event
 }
+
+function stripUrlQuery(value: unknown): unknown {
+  if (typeof value !== 'string') return value
+
+  try {
+    const url = new URL(value)
+    return `${url.origin}${url.pathname}`
+  } catch {
+    const queryIndex = value.search(/[?#]/)
+    return queryIndex === -1 ? value : value.slice(0, queryIndex)
+  }
+}
+
+/** Removes URL secrets before applying the browser-exception noise filter. */
+export function preparePostHogEvent(event: CaptureResult | null): CaptureResult | null {
+  if (!event?.properties) return dropUnactionableExceptions(event)
+
+  let sanitizedProperties: CaptureResult['properties'] | null = null
+  for (const property of URL_PROPERTIES) {
+    const value = event.properties[property]
+    const sanitizedValue = stripUrlQuery(value)
+    if (sanitizedValue === value) continue
+    sanitizedProperties ??= { ...event.properties }
+    sanitizedProperties[property] = sanitizedValue
+  }
+
+  const sanitizedEvent = sanitizedProperties ? { ...event, properties: sanitizedProperties } : event
+  return dropUnactionableExceptions(sanitizedEvent)
+}
diff --git a/apps/sim/package.json b/apps/sim/package.json
index 58b1f86bd51..1387daea0f5 100644
--- a/apps/sim/package.json
+++ b/apps/sim/package.json
@@ -65,7 +65,8 @@
     "@better-auth/sso": "1.6.23",
     "@better-auth/stripe": "1.6.23",
     "@browserbasehq/stagehand": "^3.2.1",
-    "@c15t/nextjs": "2.2.0",
+    "@c15t/nextjs": "2.2.1",
+    "@c15t/scripts": "2.2.0",
     "@calcom/embed-react": "1.5.3",
     "@cerebras/cerebras_cloud_sdk": "^1.23.0",
     "@daytona/sdk": "0.200.0",
diff --git a/bun.lock b/bun.lock
index 80ba0853f61..cad0eff8a88 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "simstudio",
@@ -168,7 +169,8 @@
         "@better-auth/sso": "1.6.23",
         "@better-auth/stripe": "1.6.23",
         "@browserbasehq/stagehand": "^3.2.1",
-        "@c15t/nextjs": "2.2.0",
+        "@c15t/nextjs": "2.2.1",
+        "@c15t/scripts": "2.2.0",
         "@calcom/embed-react": "1.5.3",
         "@cerebras/cerebras_cloud_sdk": "^1.23.0",
         "@daytona/sdk": "0.200.0",
@@ -1089,15 +1091,17 @@
 
     "@bugsnag/cuid": ["@bugsnag/cuid@3.2.2", "", {}, "sha512-7onuYLTMqMmHE9BBPG0YER4nFsU1rB+me1/YIeMusqcLbVbKKuG9u9+BDVDpje5e0llkkrVNOKYwmzM9DRIo7A=="],
 
-    "@c15t/nextjs": ["@c15t/nextjs@2.2.0", "", { "dependencies": { "@c15t/react": "2.2.0", "@c15t/translations": "2.2.0", "c15t": "2.2.0" }, "peerDependencies": { "next": "^16.0.0 || ^15.0.0 || ^14.0.0 || ^13.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-q9RbM/uf6sM+u2BPhL2CbwUekTnJGKy2w0LRNpVX7gSWBnoo9fIs25+hHjJqx3AnWG2A3QhhAPCOQL4LpM9GaA=="],
+    "@c15t/nextjs": ["@c15t/nextjs@2.2.1", "", { "dependencies": { "@c15t/react": "2.2.1", "@c15t/translations": "2.2.1", "c15t": "2.2.1" }, "peerDependencies": { "next": "^16.0.0 || ^15.0.0 || ^14.0.0 || ^13.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-rQx1PbeI0Yh+dUp8h5LdhjWtDFllsSnYzQU6QDtR3MDen2D2y/oxz4px9h2HTk8RLC7WkLIRN0qy5mHoqmLx9g=="],
 
-    "@c15t/react": ["@c15t/react@2.2.0", "", { "dependencies": { "@c15t/ui": "2.2.0", "@types/google.maps": "3.65.3", "c15t": "2.2.0" }, "peerDependencies": { "react": "^19.0.0 || ^19.0.0-rc || ^18.0.0 || ^17.0.0 || ^16.8.0", "react-dom": "^19.0.0 || ^19.0.0-rc || ^18.0.0 || ^17.0.0 || ^16.8.0" } }, "sha512-2TX1mnlDCO/v4eUDUFpdcektHoWOx3JxjJfYFU+nXyV0yf6NR4dlO6KLxkKv1VDvkqWgV3ruUnn8azkQ5wjvkw=="],
+    "@c15t/react": ["@c15t/react@2.2.1", "", { "dependencies": { "@c15t/ui": "2.2.1", "@types/google.maps": "3.65.3", "c15t": "2.2.1" }, "peerDependencies": { "react": "^19.0.0 || ^19.0.0-rc || ^18.0.0 || ^17.0.0 || ^16.8.0", "react-dom": "^19.0.0 || ^19.0.0-rc || ^18.0.0 || ^17.0.0 || ^16.8.0" } }, "sha512-Xl/KPHGBDekRwH+k09fAyNXUI2GirDAWz/R87Yr+htsp+b66A51yMN2hzJCcH1gxm4MLjOzDqHP1nAE/fRJ09Q=="],
 
     "@c15t/schema": ["@c15t/schema@2.2.0", "", { "dependencies": { "valibot": "1.4.2" } }, "sha512-rj6H1AlbbSnioNaw9Cvoc3vCchVAV/55Jd/6wrzhzW+2z2ByUyf+pDvZXQnAm0KMfsuQ8oDgqNqmPdqD1aJNFw=="],
 
-    "@c15t/translations": ["@c15t/translations@2.2.0", "", {}, "sha512-dW5hIgkDobwzNr2xhTMII0HK+QGetoUscWs2uv/OZWNF2B7E8VhOIbRYyqp7wvBopBDQ4+iszHqGerp+P51rvg=="],
+    "@c15t/scripts": ["@c15t/scripts@2.2.0", "", {}, "sha512-FgmnIW0JL5nalY6QKG5+gzukzALMqq6LpXzn5+iwRA8OVukjoXBdgakdO/eytwSrv/QtxgLyFaiM0nBIZZbk0A=="],
 
-    "@c15t/ui": ["@c15t/ui@2.2.0", "", { "dependencies": { "@c15t/translations": "2.2.0", "c15t": "2.2.0" } }, "sha512-1u8Sd2o/vacqSkxvQoQB0cx3blqEWZIZD1CN3BEWdgfG+5MyP8iqRRNq7V/URbhF0nO9aX+7kF4CMKbT/e21SQ=="],
+    "@c15t/translations": ["@c15t/translations@2.2.1", "", {}, "sha512-JgYXn+bTyys/7e7SMfu19zVBlW1cED6/CqJ5mbOmmfMr9MSkaAq0/UK/6/29FhcfCJKmHq+kQqKa0igX86mJeA=="],
+
+    "@c15t/ui": ["@c15t/ui@2.2.1", "", { "dependencies": { "@c15t/translations": "2.2.1", "c15t": "2.2.1" } }, "sha512-OlmEhScePX3xF+sPNWemLZaiJv80KuxsuxTf+Ip0ImREGeXdaOIG7Hp6IBU+8IOeJ723Q4LlD74gyV2NgTbXIQ=="],
 
     "@calcom/embed-core": ["@calcom/embed-core@1.5.3", "", {}, "sha512-GeId9gaByJ5EWiPmuvelZOvFWPOTWkcWZr5vGTCbIUTX125oE5yn0n8lDF1MJk5Xj1WO+/dk9jKIE08Ad9ytiQ=="],
 
@@ -2533,7 +2537,7 @@
 
     "c12": ["c12@3.1.0", "", { "dependencies": { "chokidar": "^4.0.3", "confbox": "^0.2.2", "defu": "^6.1.4", "dotenv": "^16.6.1", "exsolve": "^1.0.7", "giget": "^2.0.0", "jiti": "^2.4.2", "ohash": "^2.0.11", "pathe": "^2.0.3", "perfect-debounce": "^1.0.0", "pkg-types": "^2.2.0", "rc9": "^2.1.2" }, "peerDependencies": { "magicast": "^0.3.5" }, "optionalPeers": ["magicast"] }, "sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw=="],
 
-    "c15t": ["c15t@2.2.0", "", { "dependencies": { "@c15t/schema": "2.2.0", "@c15t/translations": "2.2.0", "zustand": "5.0.14" } }, "sha512-1OOjr371PfDN44c7LhaHF2Ap1EaqLNpzC0j7ratXAzr14WXWNmVsNjikJaKaBU4+5GyjWY7p2vi+0noMZxsrbA=="],
+    "c15t": ["c15t@2.2.1", "", { "dependencies": { "@c15t/schema": "2.2.0", "@c15t/translations": "2.2.1", "zustand": "5.0.14" } }, "sha512-6/yePflfCveo6Q1qMsX3DaKyE2OEuy41PBIl61Z7wScvJkIos3fky2RvBe8p+cScIGM0AbGoXvSEkOxbBda75g=="],
 
     "cacheable-lookup": ["cacheable-lookup@5.0.4", "", {}, "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="],
 

From 8a473fe603953795f6c412454f41e16e122021e4 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Mon, 24 Aug 2026 14:03:37 -0700
Subject: [PATCH 2/3] fix(consent): preserve script config literals

---
 apps/sim/lib/consent/scripts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/lib/consent/scripts.ts b/apps/sim/lib/consent/scripts.ts
index dae6591b73f..969e3269d96 100644
--- a/apps/sim/lib/consent/scripts.ts
+++ b/apps/sim/lib/consent/scripts.ts
@@ -48,7 +48,7 @@ export const GLOBAL_CONSENT_SCRIPTS = [
     },
   },
   ahrefsAnalytics({ key: AHREFS_ANALYTICS_KEY }),
-]
+] as const
 
 /** Marketing-page integrations that should not load on a direct workspace visit. */
 export const X_PIXEL_SCRIPT = xPixel({ pixelId: X_PIXEL_ID })

From 5cfb42be9ff78062cd562356be6ec7475a7a9a0e Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Mon, 24 Aug 2026 14:10:28 -0700
Subject: [PATCH 3/3] fix(consent): adapt readonly scripts for provider

---
 apps/sim/app/_shell/consent/consent-store-provider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/app/_shell/consent/consent-store-provider.tsx b/apps/sim/app/_shell/consent/consent-store-provider.tsx
index a8c3a407d11..79403e3022e 100644
--- a/apps/sim/app/_shell/consent/consent-store-provider.tsx
+++ b/apps/sim/app/_shell/consent/consent-store-provider.tsx
@@ -27,7 +27,7 @@ const CONSENT_OPTIONS = {
   mode: 'hosted',
   backendURL: CONSENT_BACKEND_URL,
   consentCategories: [...CONSENT_CATEGORIES],
-  scripts: GLOBAL_CONSENT_SCRIPTS,
+  scripts: [...GLOBAL_CONSENT_SCRIPTS],
   store: {
     reloadOnConsentRevoked: true,
     iframeBlockerConfig: { disableAutomaticBlocking: true },