fix(landing): remove obsolete tracking and preserve preview interactions

Author: waleedlatif1

apps/sim/app/(landing)/components/hero/components/hero-platform-loop/production-workflow-stage.tsx

@@ -295,20 +295,22 @@ function PreviewActionBar({ block, running, workflowRunning, onRunToggle }: Prev
         {inertActions.map(({ label, Icon }) => (
           <Tooltip.Root key={label} preferAbove>
             <Tooltip.Trigger asChild>
-              <Button
-                type='button'
-                variant='ghost'
-                disabled
-                aria-label={`${label} unavailable in preview`}
-                className={cn(
-                  ACTION_BUTTON_STYLES,
-                  label === 'Delete' && LAST_ACTION_STYLES,
-                  workflowRunning && !running && BYSTANDER_ACTION_STYLES,
-                  sweeping && SWEEP_SLOT_STYLES
-                )}
-              >
-                <Icon className='size-[14px]' />
-              </Button>
+              <span className='inline-flex'>
+                <Button
+                  type='button'
+                  variant='ghost'
+                  disabled
+                  aria-label={`${label} unavailable in preview`}
+                  className={cn(
+                    ACTION_BUTTON_STYLES,
+                    label === 'Delete' && LAST_ACTION_STYLES,
+                    workflowRunning && !running && BYSTANDER_ACTION_STYLES,
+                    sweeping && SWEEP_SLOT_STYLES
+                  )}
+                >
+                  <Icon className='size-[14px]' />
+                </Button>
+              </span>
             </Tooltip.Trigger>
             {!workflowRunning && <Tooltip.Content side='top'>{label}</Tooltip.Content>}
           </Tooltip.Root>

apps/sim/app/(landing)/cookie-policy/cookie-policy-content.tsx

@@ -44,7 +44,7 @@ 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: 'September 3, 2026',
+  lastUpdated: 'September 17, 2026',
   intro: [
     {
       kind: 'paragraph',
@@ -165,7 +165,7 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
           [
             '__cf_bm',
             'Cloudflare',
-            'Bot-management check on requests to providers we load, such as HubSpot and X.',
+            'Bot-management check on requests to providers we load, such as X.',
             '30 minutes',
           ],
         ]),
@@ -177,10 +177,6 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
             'Holds the session state for a specific Analytics property.',
             '13 months',
           ],
-          ['__hstc', 'HubSpot', 'Tracks visits across sessions for the main tracker.', '6 months'],
-          ['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',
@@ -269,9 +265,8 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
                 Google Analytics
               </ProseLink>
               , <ProseLink href='https://adssettings.google.com'>Google Ads</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>.
+              <ProseLink href='https://x.com/settings/privacy_and_safety'>X (Twitter)</ProseLink>,
+              and <ProseLink href='https://posthog.com/privacy'>PostHog</ProseLink>.
             </>
           ),
         },
@@ -292,7 +287,6 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
               The providers currently in use are{' '}
               <ProseLink href='https://policies.google.com/technologies/cookies'>Google</ProseLink>{' '}
               (Analytics and Ads),{' '}
-              <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/legal/privacy-policy'>Ahrefs</ProseLink>,{' '}
               <ProseLink href='https://posthog.com/privacy'>PostHog</ProseLink>, and{' '}

apps/sim/app/(landing)/hubspot-page-view-tracker.test.tsx

@@ -1,18 +1,11 @@
 '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 { X_PIXEL_SCRIPT } from '@/lib/consent/scripts'
 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 />}
-    </>
-  )
+  return xPixel.status === 'ready' ? <XPageViewTracker /> : null
 }

apps/sim/app/(landing)/hubspot-page-view-tracker.tsx

@@ -481,7 +481,7 @@ export function ResourceTabs({
       if (isMultiDrag) {
         e.dataTransfer.effectAllowed = 'copy'
         e.dataTransfer.setData(SIM_RESOURCES_DRAG_TYPE, JSON.stringify(selected))
-        const dragImage = buildMultiDragImage(e.currentTarget.closest('[role="tablist"]'), selected)
+        const dragImage = buildMultiDragImage(e.currentTarget.closest('[data-tab-strip]'), selected)
         if (dragImage) {
           e.dataTransfer.setDragImage(dragImage, 16, 16)
           dragImageRef.current = dragImage

apps/sim/app/(landing)/landing-consent-tracking.tsx

@@ -7,7 +7,6 @@ import {
   GLOBAL_CONSENT_SCRIPTS,
   GOOGLE_ADS_ID,
   GOOGLE_ANALYTICS_ID,
-  HUBSPOT_SCRIPT,
   X_PIXEL_SCRIPT,
 } from '@/lib/consent/scripts'
 
@@ -27,7 +26,6 @@ const CALLBACK_INFO: ConsentScriptCallbackInfo = {
 afterEach(() => {
   window.dataLayer = []
   window.gtag = undefined
-  window._hsq = []
   window.history.replaceState({}, '', '/')
 })
 
@@ -49,8 +47,7 @@ describe('consent scripts', () => {
     ])
   })
 
-  it('keeps landing vendors in separate consent categories', () => {
-    expect(HUBSPOT_SCRIPT).toMatchObject({ id: 'hubspot', category: 'measurement' })
+  it('gates the landing conversion pixel on marketing consent', () => {
     expect(X_PIXEL_SCRIPT).toMatchObject({
       id: 'x-pixel',
       category: 'marketing',
@@ -86,13 +83,4 @@ describe('consent scripts', () => {
       `https://www.googletagmanager.com/gtag/js?id=${GOOGLE_ADS_ID}`
     )
   })
-
-  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']])
-  })
 })

apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx

@@ -23,12 +23,6 @@ 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',
@@ -70,15 +64,3 @@ export const GLOBAL_CONSENT_SCRIPTS = [
 
 /** 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

apps/sim/lib/consent/scripts.test.ts

@@ -83,12 +83,6 @@ const STATIC_SCRIPT_SRC = [
         'https://www.googleadservices.com',
         'https://googleads.g.doubleclick.net',
         'https://analytics.ahrefs.com',
-        // HubSpot tracking (landing pages) — loader plus the
-        // analytics/form-tracking/banner scripts it injects as <script> tags
-        'https://*.hs-scripts.com',
-        'https://*.hs-analytics.net',
-        'https://*.hscollectedforms.net',
-        'https://*.hs-banner.com',
         // X (Twitter) conversion pixel (landing pages) — the base code injects
         // uwt.js as a <script> tag from static.ads-twitter.com
         'https://static.ads-twitter.com',
@@ -134,10 +128,6 @@ const STATIC_CONNECT_SRC = [
         'https://*.g.doubleclick.net',
         // Google Ads conversion tag — conversion beacons
         'https://www.googleadservices.com',
-        // HubSpot tracking — form-tracking API (hscollectedforms.js).
-        // The visitor beacon itself is an image pixel (img-src, already
-        // permitted below), not a connect-src request.
-        'https://*.hscollectedforms.net',
         // X (Twitter) conversion pixel — uwt.js sends conversion beacons here
         // via fetch/sendBeacon. The t.co image-pixel fallback is already
         // covered by the `https:` wildcard in img-src.

apps/sim/lib/consent/scripts.ts

@@ -112,12 +112,74 @@ describe('TabStrip interactions', () => {
     expect(onSelect).toHaveBeenLastCalledWith('pinned', 'keyboard')
 
     act(() => {
+      tabButton('two').focus()
       tabButton('two').dispatchEvent(
         new KeyboardEvent('keydown', { key: 'Delete', bubbles: true, cancelable: true })
       )
     })
     expect(onClose).toHaveBeenCalledWith('two')
+    expect(document.activeElement).toBe(tabButton('two'))
+  })
+
+  it('restores focus to a committed survivor after an asynchronous multi-tab close', () => {
+    const onClose = vi.fn()
+    mount(renderStrip(tabs, vi.fn(), onClose))
+    act(() => {
+      tabButton('one').focus()
+      tabButton('one').dispatchEvent(new KeyboardEvent('keydown', { key: 'Delete', bubbles: true }))
+    })
     expect(document.activeElement).toBe(tabButton('one'))
+    act(() => root?.render(renderStrip(tabs, vi.fn(), onClose)))
+    expect(document.activeElement).toBe(tabButton('one'))
+
+    act(() => root?.render(renderStrip([{ ...tabs[0], active: true }], vi.fn(), onClose)))
+    expect(document.activeElement).toBe(tabButton('pinned'))
+  })
+
+  it('does not steal focus from another control when a pending close completes', () => {
+    mount(renderStrip(tabs))
+    act(() => {
+      tabButton('one').focus()
+      tabButton('one').dispatchEvent(new KeyboardEvent('keydown', { key: 'Delete', bubbles: true }))
+    })
+    const add = container?.querySelector<HTMLButtonElement>('[aria-label="New tab"]')
+    act(() => add?.focus())
+    act(() => root?.render(renderStrip([{ ...tabs[0], active: true }])))
+    expect(document.activeElement).toBe(add)
+  })
+
+  it('exposes a shared DOM ancestor for multi-tab drag images', () => {
+    const onTabDragStart = vi.fn((event) => {
+      const strip = event.currentTarget.closest('[data-tab-strip]')
+      expect(strip?.querySelectorAll('[data-tab-strip-item]')).toHaveLength(3)
+    })
+    mount(<TabStrip tabs={tabs} onSelect={vi.fn()} onTabDragStart={onTabDragStart} />)
+    act(() => stripItem('two').dispatchEvent(dragStartEvent()))
+    expect(onTabDragStart).toHaveBeenCalledOnce()
+  })
+
+  it('follows the active survivor across staggered tab removals', () => {
+    mount(renderStrip(tabs))
+    act(() => tabButton('one').focus())
+    act(() => root?.render(renderStrip([tabs[0], { ...tabs[2], active: true }])))
+    expect(document.activeElement).toBe(tabButton('two'))
+    act(() => root?.render(renderStrip([{ ...tabs[0], active: true }])))
+    expect(document.activeElement).toBe(tabButton('pinned'))
+  })
+
+  it('relinquishes focus ownership when the user leaves the strip', () => {
+    mount(renderStrip(tabs))
+    const outside = document.createElement('button')
+    document.body.append(outside)
+    try {
+      act(() => tabButton('one').focus())
+      act(() => outside.focus())
+      act(() => outside.blur())
+      act(() => root?.render(renderStrip([{ ...tabs[0], active: true }])))
+      expect(document.activeElement).toBe(document.body)
+    } finally {
+      outside.remove()
+    }
   })
 
   it('identifies pointer selection separately from keyboard navigation', () => {