Merge project enforcement parent with acquisition attribution

Author: mzxchandra

apps/sim/app/(auth)/components/social-login-buttons.tsx

@@ -5,7 +5,7 @@ import { Chip, cn } from '@sim/emcn'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { GithubIcon, GoogleIcon, MicrosoftIcon } from '@/components/icons'
-import { client } from '@/lib/auth/auth-client'
+import { type SocialSignInProvider, startSocialSignIn } from '@/lib/auth/social-sign-in'
 import { DEFAULT_POST_AUTH_ROUTE } from '@/app/(auth)/auth-redirect'
 import { AUTH_BUTTON_CLASS } from '@/app/(auth)/components/constants'
 
@@ -15,107 +15,63 @@ interface SocialLoginButtonsProps {
   githubAvailable: boolean
   googleAvailable: boolean
   microsoftAvailable: boolean
+  view: 'login' | 'signup'
   callbackURL?: string
   children?: ReactNode
 }
 
+/** Display order of the provider buttons. */
+const PROVIDERS = [
+  { provider: 'google', label: 'Google', icon: GoogleIcon },
+  { provider: 'microsoft', label: 'Microsoft', icon: MicrosoftIcon },
+  { provider: 'github', label: 'GitHub', icon: GithubIcon },
+] as const
+
 export function SocialLoginButtons({
   githubAvailable,
   googleAvailable,
   microsoftAvailable,
+  view,
   callbackURL = DEFAULT_POST_AUTH_ROUTE,
   children,
 }: SocialLoginButtonsProps) {
-  const [isGithubLoading, setIsGithubLoading] = useState(false)
-  const [isGoogleLoading, setIsGoogleLoading] = useState(false)
-  const [isMicrosoftLoading, setIsMicrosoftLoading] = useState(false)
-
-  async function signInWithGithub() {
-    if (!githubAvailable) return
+  const [loadingProvider, setLoadingProvider] = useState<SocialSignInProvider | null>(null)
 
-    setIsGithubLoading(true)
-    try {
-      await client.signIn.social({ provider: 'github', callbackURL })
-    } catch (err) {
-      logger.error('GitHub sign-in failed', { error: getErrorMessage(err) })
-    } finally {
-      setIsGithubLoading(false)
-    }
+  const available: Record<SocialSignInProvider, boolean> = {
+    github: githubAvailable,
+    google: googleAvailable,
+    microsoft: microsoftAvailable,
   }
 
-  async function signInWithGoogle() {
-    if (!googleAvailable) return
-
-    setIsGoogleLoading(true)
+  async function signIn(provider: SocialSignInProvider, label: string) {
+    setLoadingProvider(provider)
     try {
-      await client.signIn.social({ provider: 'google', callbackURL })
+      await startSocialSignIn({ provider, view, surface: 'auth_page', callbackURL })
     } catch (err) {
-      logger.error('Google sign-in failed', { error: getErrorMessage(err) })
+      logger.error(`${label} sign-in failed`, { error: getErrorMessage(err) })
     } finally {
-      setIsGoogleLoading(false)
+      setLoadingProvider(null)
     }
   }
 
-  async function signInWithMicrosoft() {
-    if (!microsoftAvailable) return
-
-    setIsMicrosoftLoading(true)
-    try {
-      await client.signIn.social({ provider: 'microsoft', callbackURL })
-    } catch (err) {
-      logger.error('Microsoft sign-in failed', { error: getErrorMessage(err) })
-    } finally {
-      setIsMicrosoftLoading(false)
-    }
-  }
-
-  const githubButton = (
-    <Chip
-      fullWidth
-      leftIcon={GithubIcon}
-      className={cn(AUTH_BUTTON_CLASS, 'border border-[var(--border-1)]')}
-      disabled={!githubAvailable || isGithubLoading}
-      onClick={signInWithGithub}
-    >
-      {isGithubLoading ? 'Connecting…' : 'GitHub'}
-    </Chip>
-  )
-
-  const googleButton = (
-    <Chip
-      fullWidth
-      leftIcon={GoogleIcon}
-      className={cn(AUTH_BUTTON_CLASS, 'border border-[var(--border-1)]')}
-      disabled={!googleAvailable || isGoogleLoading}
-      onClick={signInWithGoogle}
-    >
-      {isGoogleLoading ? 'Connecting…' : 'Google'}
-    </Chip>
-  )
-
-  const microsoftButton = (
-    <Chip
-      fullWidth
-      leftIcon={MicrosoftIcon}
-      className={cn(AUTH_BUTTON_CLASS, 'border border-[var(--border-1)]')}
-      disabled={!microsoftAvailable || isMicrosoftLoading}
-      onClick={signInWithMicrosoft}
-    >
-      {isMicrosoftLoading ? 'Connecting…' : 'Microsoft'}
-    </Chip>
-  )
-
-  const hasAnyOAuthProvider = githubAvailable || googleAvailable || microsoftAvailable
-
-  if (!hasAnyOAuthProvider && !children) {
+  if (!githubAvailable && !googleAvailable && !microsoftAvailable && !children) {
     return null
   }
 
   return (
     <div className='grid gap-3'>
-      {googleAvailable && googleButton}
-      {microsoftAvailable && microsoftButton}
-      {githubAvailable && githubButton}
+      {PROVIDERS.filter(({ provider }) => available[provider]).map(({ provider, label, icon }) => (
+        <Chip
+          key={provider}
+          fullWidth
+          leftIcon={icon}
+          className={cn(AUTH_BUTTON_CLASS, 'border border-[var(--border)]')}
+          disabled={loadingProvider !== null}
+          onClick={() => signIn(provider, label)}
+        >
+          {loadingProvider === provider ? 'Connecting…' : label}
+        </Chip>
+      ))}
       {children}
     </div>
   )

apps/sim/app/(auth)/layout.tsx

@@ -1,10 +1,16 @@
 import type { Metadata } from 'next'
+import { AttributionCapture } from '@/app/_shell/consent/attribution-capture'
 import { AuthShell } from '@/app/(auth)/components'
 
 export const metadata: Metadata = {
   robots: { index: false, follow: false },
 }
 
 export default function AuthLayout({ children }: { children: React.ReactNode }) {
-  return <AuthShell>{children}</AuthShell>
+  return (
+    <AuthShell>
+      {children}
+      <AttributionCapture />
+    </AuthShell>
+  )
 }

apps/sim/app/(auth)/login/login-form.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useRef, useState } from 'react'
+import { useRef, useState } from 'react'
 import {
   ChipModal,
   ChipModalBody,
@@ -21,7 +21,6 @@ import { isSsoEnabled } from '@/lib/core/config/env-flags'
 import { validateCallbackUrl } from '@/lib/core/security/input-validation'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
-import { captureClientEvent } from '@/lib/posthog/client'
 import { buildAuthCrossLink, DEFAULT_POST_AUTH_ROUTE } from '@/app/(auth)/auth-redirect'
 import {
   AuthDivider,
@@ -37,6 +36,7 @@ import {
   SocialLoginButtons,
   SSOLoginButton,
 } from '@/app/(auth)/components'
+import { useCaptureWhenReady } from '@/hooks/use-capture-when-ready'
 
 const logger = createLogger('LoginForm')
 
@@ -97,6 +97,7 @@ export default function LoginPage({
 }) {
   const router = useRouter()
   const searchParams = useSearchParams()
+  useCaptureWhenReady('login_page_viewed', {})
   const [isLoading, setIsLoading] = useState(false)
   const [password, setPassword] = useState('')
   const [passwordErrors, setPasswordErrors] = useState<string[]>([])
@@ -134,10 +135,6 @@ export default function LoginPage({
       : null
   )
 
-  useEffect(() => {
-    captureClientEvent('login_page_viewed', {})
-  }, [])
-
   const handleEmailChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const newEmail = e.target.value
     setEmail(newEmail)
@@ -448,6 +445,7 @@ export default function LoginPage({
 
         {showBottomSection && (
           <SocialLoginButtons
+            view='login'
             googleAvailable={googleAvailable}
             githubAvailable={githubAvailable}
             microsoftAvailable={microsoftAvailable}

apps/sim/app/(auth)/signup/signup-form.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { Suspense, useEffect, useRef, useState } from 'react'
+import { Suspense, useRef, useState } from 'react'
 import { Turnstile, type TurnstileInstance } from '@marsidev/react-turnstile'
 import { createLogger } from '@sim/logger'
 import { useRouter, useSearchParams } from 'next/navigation'
@@ -13,7 +13,7 @@ import { getEnv, isFalsy } from '@/lib/core/config/env'
 import { isSsoEnabled } from '@/lib/core/config/env-flags'
 import { validateCallbackUrl } from '@/lib/core/security/input-validation'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
-import { captureClientEvent, captureEvent } from '@/lib/posthog/client'
+import { captureEvent } from '@/lib/posthog/client'
 import {
   buildAuthCrossLink,
   DEFAULT_POST_AUTH_ROUTE,
@@ -35,6 +35,7 @@ import {
   SocialLoginButtons,
   SSOLoginButton,
 } from '@/app/(auth)/components'
+import { useCaptureWhenReady } from '@/hooks/use-capture-when-ready'
 
 const logger = createLogger('SignupForm')
 
@@ -111,11 +112,9 @@ function SignupFormContent({
   const { refetch: refetchSession } = useSession()
   const posthog = usePostHog()
   const { measurement, marketing } = useTrackingConsent()
+  useCaptureWhenReady('signup_page_viewed', {})
   const [isLoading, setIsLoading] = useState(false)
 
-  useEffect(() => {
-    captureClientEvent('signup_page_viewed', {})
-  }, [])
   const [password, setPassword] = useState('')
   const [passwordErrors, setPasswordErrors] = useState<string[]>([])
   const [showValidationError, setShowValidationError] = useState(false)
@@ -485,6 +484,7 @@ function SignupFormContent({
 
       {showBottomSection && (
         <SocialLoginButtons
+          view='signup'
           githubAvailable={githubAvailable}
           googleAvailable={googleAvailable}
           microsoftAvailable={microsoftAvailable}

apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx

@@ -18,7 +18,7 @@ import { useRouter } from 'next/navigation'
 import { GithubIcon, GoogleIcon, MicrosoftIcon } from '@/components/icons'
 import { requestJson } from '@/lib/api/client/request'
 import { type AuthProviderStatusResponse, getAuthProvidersContract } from '@/lib/api/contracts/auth'
-import { client } from '@/lib/auth/auth-client'
+import { type SocialSignInProvider, startSocialSignIn } from '@/lib/auth/social-sign-in'
 import { getEnv, isFalsy } from '@/lib/core/config/env'
 import { isSsoEnabled } from '@/lib/core/config/env-flags'
 import { APP_ENTRY_PATH } from '@/lib/navigation/paths'
@@ -79,7 +79,7 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
   const [open, setOpen] = useState(false)
   const [view, setView] = useState<AuthView>(defaultView)
   const [providerStatus, setProviderStatus] = useState<ProviderStatus | null>(null)
-  const [socialLoading, setSocialLoading] = useState<'github' | 'google' | 'microsoft' | null>(null)
+  const [socialLoading, setSocialLoading] = useState<SocialSignInProvider | null>(null)
   const brand = getBrandConfig()
 
   useEffect(() => {
@@ -141,10 +141,15 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
     })
   }
 
-  async function handleSocialLogin(provider: 'github' | 'google' | 'microsoft') {
+  async function handleSocialLogin(provider: SocialSignInProvider) {
     setSocialLoading(provider)
     try {
-      await client.signIn.social({ provider, callbackURL: APP_ENTRY_PATH })
+      await startSocialSignIn({
+        provider,
+        view: effectiveView,
+        surface: 'auth_modal',
+        callbackURL: APP_ENTRY_PATH,
+      })
     } catch (error) {
       logger.warn('Social sign-in did not complete', { provider, error })
     } finally {

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 17, 2026',
+  lastUpdated: 'October 8, 2026',
   intro: [
     {
       kind: 'paragraph',
@@ -195,6 +195,12 @@ export const COOKIE_POLICY_CONFIG: LegalPageConfig = {
             'Coordinates analytics state for the current browser tab.',
             'Session',
           ],
+          [
+            'sim_attribution_first / sim_attribution_last',
+            'Sim',
+            'Records the campaign or website that first and most recently brought you to sim.ai, so a sign-up or demo request can be credited to it. Holds campaign parameters, which ad network a click came from (never the click ID), the referring site’s domain, the landing page path, and when the visit happened. Expires with your analytics consent if that ends sooner.',
+            '90 days',
+          ],
         ]),
         cookieTable('Marketing', [
           [

apps/sim/app/(landing)/demo/components/demo-scheduler/demo-scheduler.tsx

@@ -6,6 +6,7 @@ import { useTheme } from 'next-themes'
 import { trackGoogleAdsConversion, trackGoogleEvent } from '@/lib/analytics/google'
 import { X_DEMO_BOOKED_EVENT_ID } from '@/lib/consent/scripts'
 import { useTrackingConsent } from '@/lib/consent/tracking-consent'
+import { captureClientEvent } from '@/lib/posthog/client'
 import type { DemoLead } from '@/app/(landing)/demo/components/demo-form'
 
 const CAL_NAMESPACE = 'demo'
@@ -100,6 +101,7 @@ export function DemoScheduler({ lead }: DemoSchedulerProps) {
     const trackDemoBooked = () => {
       if (cancelled) return
       if (measurement) {
+        captureClientEvent('landing_demo_booked', {})
         trackGoogleEvent('get_a_demo', {
           page_path: '/demo',
           form_name: 'sim_demo',

apps/sim/app/(landing)/landing-analytics.tsx

@@ -1,12 +1,8 @@
 'use client'
 
-import { useEffect } from 'react'
-import { captureClientEvent } from '@/lib/posthog/client'
+import { useCaptureWhenReady } from '@/hooks/use-capture-when-ready'
 
 export function LandingAnalytics() {
-  useEffect(() => {
-    captureClientEvent('landing_page_viewed', {})
-  }, [])
-
+  useCaptureWhenReady('landing_page_viewed', {})
   return null
 }

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

@@ -0,0 +1,15 @@
+'use client'
+
+import { usePathname } from 'next/navigation'
+import { useCaptureWhenReady } from '@/hooks/use-capture-when-ready'
+
+/**
+ * Sends PostHog's `$pageview` for every marketing route, including client
+ * navigations between them, so pricing, demo, and enterprise visits feed
+ * PostHog funnels and web analytics. `capture_pageview` stays off app-wide;
+ * this layout is the only place page views are wanted.
+ */
+export function LandingPageViewTracker() {
+  useCaptureWhenReady('$pageview', {}, usePathname())
+  return null
+}

apps/sim/app/(landing)/layout.tsx

@@ -2,8 +2,10 @@ import type { ReactNode } from 'react'
 import type { Metadata } from 'next'
 import { isHosted } from '@/lib/core/config/env-flags'
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { AttributionCapture } from '@/app/_shell/consent/attribution-capture'
 import { LandingShell } from '@/app/(landing)/components'
 import { LandingConsentTracking } from '@/app/(landing)/landing-consent-tracking'
+import { LandingPageViewTracker } from '@/app/(landing)/landing-page-view-tracker'
 
 /**
  * Shared layout for all public marketing routes, including platform, solutions,
@@ -19,6 +21,8 @@ export default function LandingLayout({ children }: { children: ReactNode }) {
   return (
     <LandingShell>
       {children}
+      <LandingPageViewTracker />
+      <AttributionCapture />
       {isHosted && <LandingConsentTracking />}
     </LandingShell>
   )