From 017d8e60b2558b84dba43d00fcfdc6f6c97085d8 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Wed, 1 Jul 2026 11:17:26 -0700
Subject: [PATCH 1/5] improvement(landing): react-doctor health pass across the
 landing surface

- shared JsonLd server component with HTML-safe serialization (replaces 32 inline dangerouslySetInnerHTML JSON-LD sites; structured-data output semantically identical, XSS hardened)
- state/effect fixes: derive-instead-of-sync, phase state machines, useSyncExternalStore for media query, handler-only state to refs
- structural splits for one-component-per-file and non-component export isolation
- mechanical: combined iterations, hoisted Intl formatters/static values, immutable sorts, stable keys, a11y labels, focus rings, SVG precision
- ES2023 lib for apps/sim to allow toSorted/toReversed
---
 apps/sim/app/(landing)/blog/[slug]/page.tsx   |   6 +-
 .../(landing)/blog/[slug]/share-button.tsx    |   1 +
 .../app/(landing)/blog/authors/[id]/page.tsx  |   6 +-
 apps/sim/app/(landing)/blog/page.tsx          |   6 +-
 apps/sim/app/(landing)/blog/tags/page.tsx     |   6 +-
 apps/sim/app/(landing)/careers/careers.tsx    |   6 +-
 .../careers/components/job-board/index.ts     |   3 +-
 .../components/job-board/job-board.tsx        |   6 +-
 .../components/job-board/job-groups.tsx       |  44 +---
 .../careers/components/job-board/utils.ts     |  44 ++++
 .../changelog-timeline/changelog-timeline.tsx |   8 +-
 apps/sim/app/(landing)/changelog/utils.ts     |  27 +-
 .../components/auth-modal/auth-modal.tsx      |  67 ++---
 .../components/features/features.tsx          |  22 +-
 .../(landing)/components/footer/footer.tsx    |   5 +-
 .../components/hero-visual/block-handles.tsx  |  40 +++
 .../components/hero-visual/hero-visual.tsx    |   6 +-
 .../components/hero-visual/stage-home.tsx     |   6 +-
 .../hero-visual/workflow-block-content.tsx    |  58 +++++
 .../components/hero-visual/workflow-block.tsx |  87 +------
 .../home-structured-data.tsx                  | 242 +++++++++---------
 apps/sim/app/(landing)/components/index.ts    |   2 +
 .../app/(landing)/components/json-ld/index.ts |   2 +
 .../(landing)/components/json-ld/json-ld.tsx  |  50 ++++
 .../landing-preview-chat/chat-input.tsx       |   1 +
 .../landing-preview-chat.tsx                  |  34 ++-
 .../landing-preview-files.tsx                 |   6 +-
 .../landing-preview-home.tsx                  |   2 +-
 .../landing-preview-knowledge.tsx             |   4 +-
 .../landing-preview-logs.tsx                  |   3 +-
 .../landing-preview-resource.tsx              |  14 +-
 .../landing-preview-resource/utils.tsx        |  13 +
 .../landing-preview-tables.tsx                |   9 +-
 .../preview-block-node.tsx                    |   8 +-
 .../landing-preview-workflow/workflow-data.ts |   5 +-
 .../hooks/use-landing-submit.ts               |   2 +-
 .../landing-preview/landing-preview-mount.tsx |   2 +-
 .../landing-preview/landing-preview.tsx       |  41 ++-
 .../lifecycle-icons/lifecycle-icons.tsx       |  17 +-
 .../components/iso-marks/iso-cube-grid.tsx    |   8 +-
 .../components/iso-marks/iso-cube-row.tsx     |   8 +-
 .../components/navbar-shell/navbar-shell.tsx  |   8 +-
 .../components/sim-wordmark/sim-wordmark.tsx  |   8 +-
 .../(landing)/components/og-sim-logo/index.ts |   1 +
 .../components/og-sim-logo/og-sim-logo.tsx    |  21 ++
 .../platform-card-row/platform-card-row.tsx   |   2 +-
 .../platform-structured-data.tsx              |   8 +-
 .../components/legal-block/legal-block.tsx    |  13 +-
 .../legal-block-group/legal-block-group.tsx   |   2 +-
 .../site-structured-data.tsx                  | 100 ++++----
 .../solutions-card-row/solutions-card-row.tsx |   2 +-
 .../solutions-structured-data.tsx             |   8 +-
 .../thinking-loader/thinking-loader.tsx       |   5 +-
 .../components/contact-form/contact-form.tsx  |  16 +-
 .../components/integration-cta-button.tsx     |   2 +-
 .../components/template-card-button.tsx       |   2 +-
 .../integrations/(shell)/[slug]/page.tsx      | 108 ++++----
 .../(landing)/integrations/(shell)/page.tsx   |  44 ++--
 apps/sim/app/(landing)/landing-analytics.tsx  |   9 -
 .../(shell)/[provider]/[model]/page.tsx       |  16 +-
 .../models/(shell)/[provider]/page.tsx        |  16 +-
 .../sim/app/(landing)/models/(shell)/page.tsx |  43 ++--
 .../(landing)/models/components/constants.ts  |   7 +-
 .../components/model-comparison-charts.tsx    |  21 +-
 .../models/components/model-primitives.tsx    |  79 ------
 .../model-primitives/featured-model-card.tsx  |  31 +++
 .../featured-provider-card.tsx                |  22 ++
 .../components/model-primitives/index.ts      |   3 +
 .../model-primitives/provider-icon.tsx        |  31 +++
 .../components/model-timeline-chart.tsx       |  14 +-
 apps/sim/app/(landing)/models/utils.ts        |  53 ++--
 apps/sim/app/(landing)/og-utils.tsx           |  22 +-
 apps/sim/app/(landing)/partners/page.tsx      |  13 +-
 .../pricing-plans/pricing-plans.tsx           |  31 +--
 .../pricing-structured-data.tsx               | 155 ++++++-----
 apps/sim/app/(landing)/pricing/pricing.tsx    |  27 +-
 apps/sim/app/(landing)/track-landing-cta.ts   |  10 +
 apps/sim/tsconfig.json                        |   1 +
 78 files changed, 992 insertions(+), 889 deletions(-)
 create mode 100644 apps/sim/app/(landing)/careers/components/job-board/utils.ts
 create mode 100644 apps/sim/app/(landing)/components/hero/components/hero-visual/block-handles.tsx
 create mode 100644 apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block-content.tsx
 create mode 100644 apps/sim/app/(landing)/components/json-ld/index.ts
 create mode 100644 apps/sim/app/(landing)/components/json-ld/json-ld.tsx
 create mode 100644 apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/utils.tsx
 create mode 100644 apps/sim/app/(landing)/components/og-sim-logo/index.ts
 create mode 100644 apps/sim/app/(landing)/components/og-sim-logo/og-sim-logo.tsx
 delete mode 100644 apps/sim/app/(landing)/models/components/model-primitives.tsx
 create mode 100644 apps/sim/app/(landing)/models/components/model-primitives/featured-model-card.tsx
 create mode 100644 apps/sim/app/(landing)/models/components/model-primitives/featured-provider-card.tsx
 create mode 100644 apps/sim/app/(landing)/models/components/model-primitives/index.ts
 create mode 100644 apps/sim/app/(landing)/models/components/model-primitives/provider-icon.tsx
 create mode 100644 apps/sim/app/(landing)/track-landing-cta.ts

diff --git a/apps/sim/app/(landing)/blog/[slug]/page.tsx b/apps/sim/app/(landing)/blog/[slug]/page.tsx
index d27f97e760d..42371752d9a 100644
--- a/apps/sim/app/(landing)/blog/[slug]/page.tsx
+++ b/apps/sim/app/(landing)/blog/[slug]/page.tsx
@@ -8,6 +8,7 @@ import { buildPostGraphJsonLd, buildPostMetadata } from '@/lib/blog/seo'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { ShareButton } from '@/app/(landing)/blog/[slug]/share-button'
 import { BackLink } from '@/app/(landing)/components'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 
 export const dynamicParams = false
 
@@ -37,10 +38,7 @@ export default async function Page({ params }: { params: Promise<{ slug: string
 
   return (
     <article className='w-full bg-[var(--bg)]' itemScope itemType='https://schema.org/TechArticle'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(graphJsonLd) }}
-      />
+      <JsonLd data={graphJsonLd} />
       <header className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
         <div className='mb-6'>
           <BackLink href='/blog' label='Back to Blog' />
diff --git a/apps/sim/app/(landing)/blog/[slug]/share-button.tsx b/apps/sim/app/(landing)/blog/[slug]/share-button.tsx
index 5f88b24eddb..57c5ad98357 100644
--- a/apps/sim/app/(landing)/blog/[slug]/share-button.tsx
+++ b/apps/sim/app/(landing)/blog/[slug]/share-button.tsx
@@ -38,6 +38,7 @@ export function ShareButton({ url, title }: ShareButtonProps) {
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <button
+          type='button'
           className='flex items-center gap-1.5 text-[var(--text-muted)] text-sm hover:text-[var(--text-primary)]'
           aria-label='Share this post'
         >
diff --git a/apps/sim/app/(landing)/blog/authors/[id]/page.tsx b/apps/sim/app/(landing)/blog/authors/[id]/page.tsx
index 9b49b1f367d..7055eee586c 100644
--- a/apps/sim/app/(landing)/blog/authors/[id]/page.tsx
+++ b/apps/sim/app/(landing)/blog/authors/[id]/page.tsx
@@ -3,6 +3,7 @@ import Image from 'next/image'
 import Link from 'next/link'
 import { getAllPostMeta } from '@/lib/blog/registry'
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 
 export const revalidate = 3600
 
@@ -82,10 +83,7 @@ export default async function AuthorPage({ params }: { params: Promise<{ id: str
   }
   return (
     <main className='mx-auto max-w-[900px] px-6 py-10 sm:px-8 md:px-12'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(graphJsonLd) }}
-      />
+      <JsonLd data={graphJsonLd} />
       <div className='mb-6 flex items-center gap-3'>
         {author.avatarUrl ? (
           <Image
diff --git a/apps/sim/app/(landing)/blog/page.tsx b/apps/sim/app/(landing)/blog/page.tsx
index f6e1033a540..64c290dfb2c 100644
--- a/apps/sim/app/(landing)/blog/page.tsx
+++ b/apps/sim/app/(landing)/blog/page.tsx
@@ -5,6 +5,7 @@ import Link from 'next/link'
 import { getAllPostMeta } from '@/lib/blog/registry'
 import { buildCollectionPageJsonLd } from '@/lib/blog/seo'
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 
 export async function generateMetadata({
   searchParams,
@@ -91,10 +92,7 @@ export default async function BlogIndex({
 
   return (
     <section className='bg-[var(--bg)]'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(collectionJsonLd) }}
-      />
+      <JsonLd data={collectionJsonLd} />
 
       {/* Section header */}
       <div className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
diff --git a/apps/sim/app/(landing)/blog/tags/page.tsx b/apps/sim/app/(landing)/blog/tags/page.tsx
index f31e7125988..9f04edac3ca 100644
--- a/apps/sim/app/(landing)/blog/tags/page.tsx
+++ b/apps/sim/app/(landing)/blog/tags/page.tsx
@@ -2,6 +2,7 @@ import { ChipLink } from '@sim/emcn'
 import type { Metadata } from 'next'
 import { getAllTags } from '@/lib/blog/registry'
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 
 export const metadata: Metadata = {
   title: 'Tags',
@@ -37,10 +38,7 @@ export default async function TagsIndex() {
   const tags = await getAllTags()
   return (
     <section className='mx-auto max-w-[900px] px-6 py-10 sm:px-8 md:px-12'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
+      <JsonLd data={breadcrumbJsonLd} />
       <h1 className='mb-6 text-[32px] text-[var(--text-primary)] leading-tight'>Browse by tag</h1>
       <div className='flex flex-wrap gap-3'>
         <ChipLink href='/blog' className='border border-[var(--border-1)]'>
diff --git a/apps/sim/app/(landing)/careers/careers.tsx b/apps/sim/app/(landing)/careers/careers.tsx
index 8cd927f390f..d1c53b5f4e6 100644
--- a/apps/sim/app/(landing)/careers/careers.tsx
+++ b/apps/sim/app/(landing)/careers/careers.tsx
@@ -35,8 +35,10 @@ interface CareersProps {
  * never flashes unfiltered before the client board hydrates.
  */
 export default async function Careers({ searchParams }: CareersProps) {
-  const { team, location } = await careersSearchParamsCache.parse(searchParams)
-  const postings = await getAshbyJobs()
+  const [{ team, location }, postings] = await Promise.all([
+    careersSearchParamsCache.parse(searchParams),
+    getAshbyJobs(),
+  ])
   const fallbackGroups = groupByDepartment(filterPostings(postings, team, location))
 
   return (
diff --git a/apps/sim/app/(landing)/careers/components/job-board/index.ts b/apps/sim/app/(landing)/careers/components/job-board/index.ts
index df3091dfa1d..5a04e26f96d 100644
--- a/apps/sim/app/(landing)/careers/components/job-board/index.ts
+++ b/apps/sim/app/(landing)/careers/components/job-board/index.ts
@@ -1,2 +1,3 @@
 export { JobBoard } from './job-board'
-export { filterPostings, groupByDepartment, hasActiveFilters, JobGroups } from './job-groups'
+export { JobGroups } from './job-groups'
+export { filterPostings, groupByDepartment, hasActiveFilters } from './utils'
diff --git a/apps/sim/app/(landing)/careers/components/job-board/job-board.tsx b/apps/sim/app/(landing)/careers/components/job-board/job-board.tsx
index 70e3478cc18..39cf6de83c2 100644
--- a/apps/sim/app/(landing)/careers/components/job-board/job-board.tsx
+++ b/apps/sim/app/(landing)/careers/components/job-board/job-board.tsx
@@ -3,12 +3,12 @@
 import { ChipSelect, type ChipSelectOption } from '@sim/emcn'
 import { useQueryStates } from 'nuqs'
 import type { CareerPosting } from '@/lib/ashby/jobs'
+import { JobGroups } from '@/app/(landing)/careers/components/job-board/job-groups'
 import {
   filterPostings,
   groupByDepartment,
   hasActiveFilters,
-  JobGroups,
-} from '@/app/(landing)/careers/components/job-board/job-groups'
+} from '@/app/(landing)/careers/components/job-board/utils'
 import {
   ALL_FILTER_VALUE,
   careersParsers,
@@ -46,7 +46,7 @@ export function JobBoard({ postings }: JobBoardProps) {
 
   const teamOptions = toFilterOptions(uniqueSorted(postings.map((p) => p.department)), 'All teams')
   const locationOptions = toFilterOptions(
-    uniqueSorted(postings.map((p) => p.location).filter(Boolean)),
+    uniqueSorted(postings.flatMap((p) => (p.location ? [p.location] : []))),
     'All locations'
   )
   const groups = groupByDepartment(filterPostings(postings, team, location))
diff --git a/apps/sim/app/(landing)/careers/components/job-board/job-groups.tsx b/apps/sim/app/(landing)/careers/components/job-board/job-groups.tsx
index 885f4ae487f..5f0be48b263 100644
--- a/apps/sim/app/(landing)/careers/components/job-board/job-groups.tsx
+++ b/apps/sim/app/(landing)/careers/components/job-board/job-groups.tsx
@@ -1,55 +1,13 @@
 import { cn } from '@sim/emcn'
 import { ArrowRight } from '@sim/emcn/icons'
 import type { CareerPosting } from '@/lib/ashby/jobs'
-import { ALL_FILTER_VALUE } from '@/app/(landing)/careers/search-params'
-
-export interface DepartmentGroup {
-  department: string
-  postings: CareerPosting[]
-}
-
-/**
- * Narrows postings to a selected Team and Location, treating {@link ALL_FILTER_VALUE}
- * as "any". Shared by the server-rendered fallback and the client board so a
- * deep-linked filter resolves to the exact same set on both sides.
- */
-export function filterPostings(
-  postings: CareerPosting[],
-  team: string,
-  location: string
-): CareerPosting[] {
-  return postings.filter(
-    (posting) =>
-      (team === ALL_FILTER_VALUE || posting.department === team) &&
-      (location === ALL_FILTER_VALUE || posting.location === location)
-  )
-}
-
-/** Whether either the Team or Location filter is narrowing the board. */
-export function hasActiveFilters(team: string, location: string): boolean {
-  return team !== ALL_FILTER_VALUE || location !== ALL_FILTER_VALUE
-}
+import type { DepartmentGroup } from '@/app/(landing)/careers/components/job-board/utils'
 
 /** Empty-state copy: distinguishes a truly empty board from a filtered-to-zero view. */
 const NO_OPEN_ROLES_MESSAGE = 'No open roles right now — check back soon.'
 const NO_MATCHING_ROLES_MESSAGE =
   'No roles match these filters right now. Try clearing them, or check back soon.'
 
-/**
- * Buckets postings by department, preserving their incoming order (the fetcher
- * pre-sorts by department then title). Shared by the interactive board and its
- * static Suspense fallback so the two can never render a different grouping.
- */
-export function groupByDepartment(postings: CareerPosting[]): DepartmentGroup[] {
-  const byDepartment = new Map<string, CareerPosting[]>()
-  for (const posting of postings) {
-    const bucket = byDepartment.get(posting.department)
-    if (bucket) bucket.push(posting)
-    else byDepartment.set(posting.department, [posting])
-  }
-  return Array.from(byDepartment, ([department, items]) => ({ department, postings: items }))
-}
-
 interface JobGroupsProps {
   groups: DepartmentGroup[]
   /**
diff --git a/apps/sim/app/(landing)/careers/components/job-board/utils.ts b/apps/sim/app/(landing)/careers/components/job-board/utils.ts
new file mode 100644
index 00000000000..7bc13d6f2c2
--- /dev/null
+++ b/apps/sim/app/(landing)/careers/components/job-board/utils.ts
@@ -0,0 +1,44 @@
+import type { CareerPosting } from '@/lib/ashby/jobs'
+import { ALL_FILTER_VALUE } from '@/app/(landing)/careers/search-params'
+
+export interface DepartmentGroup {
+  department: string
+  postings: CareerPosting[]
+}
+
+/**
+ * Narrows postings to a selected Team and Location, treating {@link ALL_FILTER_VALUE}
+ * as "any". Shared by the server-rendered fallback and the client board so a
+ * deep-linked filter resolves to the exact same set on both sides.
+ */
+export function filterPostings(
+  postings: CareerPosting[],
+  team: string,
+  location: string
+): CareerPosting[] {
+  return postings.filter(
+    (posting) =>
+      (team === ALL_FILTER_VALUE || posting.department === team) &&
+      (location === ALL_FILTER_VALUE || posting.location === location)
+  )
+}
+
+/** Whether either the Team or Location filter is narrowing the board. */
+export function hasActiveFilters(team: string, location: string): boolean {
+  return team !== ALL_FILTER_VALUE || location !== ALL_FILTER_VALUE
+}
+
+/**
+ * Buckets postings by department, preserving their incoming order (the fetcher
+ * pre-sorts by department then title). Shared by the interactive board and its
+ * static Suspense fallback so the two can never render a different grouping.
+ */
+export function groupByDepartment(postings: CareerPosting[]): DepartmentGroup[] {
+  const byDepartment = new Map<string, CareerPosting[]>()
+  for (const posting of postings) {
+    const bucket = byDepartment.get(posting.department)
+    if (bucket) bucket.push(posting)
+    else byDepartment.set(posting.department, [posting])
+  }
+  return Array.from(byDepartment, ([department, items]) => ({ department, postings: items }))
+}
diff --git a/apps/sim/app/(landing)/changelog/components/changelog-timeline/changelog-timeline.tsx b/apps/sim/app/(landing)/changelog/components/changelog-timeline/changelog-timeline.tsx
index 69e0c1e1e87..195512cd149 100644
--- a/apps/sim/app/(landing)/changelog/components/changelog-timeline/changelog-timeline.tsx
+++ b/apps/sim/app/(landing)/changelog/components/changelog-timeline/changelog-timeline.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { type ReactNode, useState } from 'react'
+import { type ReactNode, useRef, useState } from 'react'
 import { Streamdown } from 'streamdown'
 import 'streamdown/styles.css'
 import { Avatar, AvatarFallback, AvatarImage, Chip, cn } from '@sim/emcn'
@@ -63,15 +63,15 @@ function formatDate(value: string): string {
 
 export function ChangelogTimeline({ initialEntries }: ChangelogTimelineProps) {
   const [entries, setEntries] = useState<ChangelogEntry[]>(initialEntries)
-  const [page, setPage] = useState<number>(1)
   const [loading, setLoading] = useState<boolean>(false)
   const [done, setDone] = useState<boolean>(false)
+  const pageRef = useRef(1)
 
   const loadMore = async () => {
     if (loading || done) return
     setLoading(true)
     try {
-      const nextPage = page + 1
+      const nextPage = pageRef.current + 1
       // boundary-raw-fetch: external GitHub Releases API (cross-origin), not a same-origin contract
       const res = await fetch(releasesEndpoint(nextPage), {
         headers: { Accept: 'application/vnd.github+json' },
@@ -83,7 +83,7 @@ export function ChangelogTimeline({ initialEntries }: ChangelogTimelineProps) {
         setDone(true)
       } else {
         setEntries((prev) => [...prev, ...mapped])
-        setPage(nextPage)
+        pageRef.current = nextPage
       }
     } catch {
       setDone(true)
diff --git a/apps/sim/app/(landing)/changelog/utils.ts b/apps/sim/app/(landing)/changelog/utils.ts
index 1b2e30869e9..4abdc06a042 100644
--- a/apps/sim/app/(landing)/changelog/utils.ts
+++ b/apps/sim/app/(landing)/changelog/utils.ts
@@ -27,17 +27,20 @@ export function extractMentions(body: string): string[] {
 
 /** Maps non-prerelease GitHub releases to normalized {@link ChangelogEntry} items. */
 export function mapReleases(releases: GitHubRelease[]): ChangelogEntry[] {
-  return releases
-    .filter((release) => !release.prerelease)
-    .map((release) => {
-      const body = String(release.body ?? '')
-      return {
-        tag: release.tag_name,
-        title: release.name || release.tag_name,
-        content: sanitizeContent(body),
-        date: release.published_at,
-        url: release.html_url,
-        contributors: extractMentions(body),
-      }
+  return releases.reduce<ChangelogEntry[]>((acc, release) => {
+    if (release.prerelease) {
+      return acc
+    }
+
+    const body = String(release.body ?? '')
+    acc.push({
+      tag: release.tag_name,
+      title: release.name || release.tag_name,
+      content: sanitizeContent(body),
+      date: release.published_at,
+      url: release.html_url,
+      contributors: extractMentions(body),
     })
+    return acc
+  }, [])
 }
diff --git a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
index 48b0c197bb1..f36b2e9a391 100644
--- a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
+++ b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
@@ -75,38 +75,45 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
     fetchProviderStatus().then(setProviderStatus)
   }, [])
 
-  const hasSocial =
-    providerStatus?.githubAvailable ||
-    providerStatus?.googleAvailable ||
-    providerStatus?.microsoftAvailable
   const ssoEnabled = isTruthy(getEnv('NEXT_PUBLIC_SSO_ENABLED'))
   const emailEnabled = !isFalsy(getEnv('NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED'))
-  const hasModalContent = hasSocial || ssoEnabled
 
-  useEffect(() => {
-    if (!open || !providerStatus) return
+  /**
+   * Signup is unavailable when registration is disabled, so the shown view is
+   * clamped to login rather than mirrored into state through an effect.
+   */
+  const effectiveView: AuthView =
+    view === 'signup' && providerStatus?.registrationDisabled ? 'login' : view
+
+  const redirectTarget = defaultView === 'login' ? '/login' : '/signup'
+
+  function openWithStatus(status: ProviderStatus) {
+    const hasModalContent =
+      status.githubAvailable || status.googleAvailable || status.microsoftAvailable || ssoEnabled
     if (!hasModalContent) {
-      setOpen(false)
-      router.push(defaultView === 'login' ? '/login' : '/signup')
+      router.push(redirectTarget)
       return
     }
-    if (providerStatus.registrationDisabled && view === 'signup') {
-      setView('login')
-    }
-  }, [open, providerStatus, hasModalContent, defaultView, router, view])
+    const initialView: AuthView =
+      defaultView === 'signup' && status.registrationDisabled ? 'login' : defaultView
+    setOpen(true)
+    setView(initialView)
+    captureClientEvent('auth_modal_opened', { view: initialView, source })
+  }
 
   function handleOpenChange(nextOpen: boolean) {
-    if (nextOpen && providerStatus && !hasModalContent) {
-      router.push(defaultView === 'login' ? '/login' : '/signup')
+    if (!nextOpen) {
+      setOpen(false)
       return
     }
-    setOpen(nextOpen)
-    if (nextOpen) {
-      const initialView =
-        defaultView === 'signup' && providerStatus?.registrationDisabled ? 'login' : defaultView
-      setView(initialView)
-      captureClientEvent('auth_modal_opened', { view: initialView, source })
+    if (providerStatus) {
+      openWithStatus(providerStatus)
+      return
     }
+    fetchProviderStatus().then((status) => {
+      setProviderStatus(status)
+      openWithStatus(status)
+    })
   }
 
   async function handleSocialLogin(provider: 'github' | 'google' | 'microsoft') {
@@ -127,7 +134,7 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
 
   function handleEmailContinue() {
     setOpen(false)
-    router.push(view === 'login' ? '/login' : '/signup')
+    router.push(effectiveView === 'login' ? '/login' : '/signup')
   }
 
   return (
@@ -135,10 +142,10 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
       <ModalTrigger asChild>{children}</ModalTrigger>
       <ModalContent size='sm' className='dark bg-[var(--bg)] text-[var(--text-primary)]'>
         <ModalTitle className='sr-only'>
-          {view === 'login' ? 'Log in' : 'Create account'}
+          {effectiveView === 'login' ? 'Log in' : 'Create account'}
         </ModalTitle>
         <ModalDescription className='sr-only'>
-          {view === 'login' ? 'Sign in to your account' : 'Create a new account'}
+          {effectiveView === 'login' ? 'Sign in to your account' : 'Create a new account'}
         </ModalDescription>
 
         <div className='relative px-6 pt-6 pb-6'>
@@ -167,7 +174,7 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
                     Start building.
                   </p>
                   <h2 className='text-[22px] text-[var(--text-primary)] leading-[110%] tracking-[-0.02em]'>
-                    {view === 'login' ? 'Log in to continue' : 'Create free account'}
+                    {effectiveView === 'login' ? 'Log in to continue' : 'Create free account'}
                   </h2>
                 </div>
               </div>
@@ -242,17 +249,19 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
 
               <div className='mt-4 text-center text-[13.5px]'>
                 <span className='text-[var(--text-muted)]'>
-                  {view === 'login' ? "Don't have an account? " : 'Already have an account? '}
+                  {effectiveView === 'login'
+                    ? "Don't have an account? "
+                    : 'Already have an account? '}
                 </span>
-                {view === 'login' && providerStatus.registrationDisabled ? (
+                {effectiveView === 'login' && providerStatus.registrationDisabled ? (
                   <span className='text-[var(--text-muted)]'>Registration is disabled</span>
                 ) : (
                   <button
                     type='button'
-                    onClick={() => setView(view === 'login' ? 'signup' : 'login')}
+                    onClick={() => setView(effectiveView === 'login' ? 'signup' : 'login')}
                     className='text-[var(--text-primary)] underline-offset-4 transition hover:text-[var(--text-primary)] hover:underline'
                   >
-                    {view === 'login' ? 'Sign up' : 'Sign in'}
+                    {effectiveView === 'login' ? 'Sign up' : 'Sign in'}
                   </button>
                 )}
               </div>
diff --git a/apps/sim/app/(landing)/components/features/features.tsx b/apps/sim/app/(landing)/components/features/features.tsx
index 8c6888eb707..5175913d308 100644
--- a/apps/sim/app/(landing)/components/features/features.tsx
+++ b/apps/sim/app/(landing)/components/features/features.tsx
@@ -7,6 +7,16 @@ import { IntegrationsCallout } from '@/app/(landing)/components/features/compone
 import { KnowledgeCallout } from '@/app/(landing)/components/features/components/knowledge-callout/knowledge-callout'
 import { LogsTablePreview } from '@/app/(landing)/components/features/components/logs-table-preview'
 
+/** Static callouts are hoisted so each keeps a stable element identity. */
+const INTEGRATIONS_CALLOUT = <IntegrationsCallout />
+const KNOWLEDGE_CALLOUT = <KnowledgeCallout />
+const FORMATION_CALLOUT = <FormationGraph />
+const MONITOR_CALLOUT = (
+  <CalloutFrame className='w-[480px]' bodyClassName='h-[300px]' fade>
+    <LogsTablePreview />
+  </CalloutFrame>
+)
+
 /**
  * Landing features - how Sim works, as a platform lifecycle. Four beats, in the
  * order you actually use Sim: bring your tools in (Integrate), give it data to
@@ -55,7 +65,7 @@ export function Features() {
           description='Plug in 1,000+ integrations like Slack, HubSpot, Salesforce, and Notion, so Sim agents act across the stack you already use.'
           view='workflow'
           workflowId='wf-self-healing-crm'
-          callout={<IntegrationsCallout />}
+          callout={INTEGRATIONS_CALLOUT}
         />
 
         {/* Context: store data semantically. */}
@@ -64,7 +74,7 @@ export function Features() {
           title='Give Sim data it can reason over.'
           description='Sim stores your data semantically in tables, files, and knowledge bases your agents read from to ground every answer in your own data.'
           view='tables'
-          callout={<KnowledgeCallout />}
+          callout={KNOWLEDGE_CALLOUT}
         />
 
         {/* Build: wire agent logic in the visual builder. */}
@@ -74,7 +84,7 @@ export function Features() {
           description='Wire blocks, models, and integrations into agent logic on a visual builder, from one agent to many working in parallel.'
           view='workflow'
           workflowId='wf-customer-support'
-          callout={<FormationGraph />}
+          callout={FORMATION_CALLOUT}
         />
 
         {/* Monitor: watch every run. */}
@@ -84,11 +94,7 @@ export function Features() {
           description='Trace each run block by block, with full logs and the real cost, so you always know what ran and why.'
           view='workflow'
           workflowId='wf-it-service'
-          callout={
-            <CalloutFrame className='w-[480px]' bodyClassName='h-[300px]' fade>
-              <LogsTablePreview />
-            </CalloutFrame>
-          }
+          callout={MONITOR_CALLOUT}
         />
       </div>
     </section>
diff --git a/apps/sim/app/(landing)/components/footer/footer.tsx b/apps/sim/app/(landing)/components/footer/footer.tsx
index 7be79223df4..3ef08fb8bf6 100644
--- a/apps/sim/app/(landing)/components/footer/footer.tsx
+++ b/apps/sim/app/(landing)/components/footer/footer.tsx
@@ -130,10 +130,7 @@ function FooterColumn({ title, items }: { title: string; items: FooterItem[] })
 
 export function Footer() {
   return (
-    <footer
-      role='contentinfo'
-      className='mt-[120px] w-full border-[var(--border)] border-t max-sm:mt-16 max-lg:mt-[88px]'
-    >
+    <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-[1446px] px-12 pt-16 pb-16 max-sm:px-5 max-lg:px-8 max-lg:pt-12 max-lg:pb-12'>
         <nav
           aria-label='Footer navigation'
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-visual/block-handles.tsx b/apps/sim/app/(landing)/components/hero/components/hero-visual/block-handles.tsx
new file mode 100644
index 00000000000..5b27138b4d1
--- /dev/null
+++ b/apps/sim/app/(landing)/components/hero/components/hero-visual/block-handles.tsx
@@ -0,0 +1,40 @@
+import { cn } from '@sim/emcn'
+import type { BlockDef } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
+
+interface BlockHandlesProps {
+  block: BlockDef
+  handlesVisible?: boolean
+}
+
+/**
+ * The decorative edge-handle nubs for a block - an inbound nub on the left
+ * unless the block is a trigger, an outbound nub on the right unless it's
+ * terminal. Absolutely positioned, so the caller must be a `relative` (or
+ * otherwise positioned) box of the block's width. Shared so the morphed chat
+ * card (GitHub, rendered as content-only) can carry the same handles as the
+ * real {@link WorkflowBlock} satellites.
+ */
+export function BlockHandles({ block, handlesVisible = true }: BlockHandlesProps) {
+  return (
+    <>
+      {!block.isTrigger && (
+        <span
+          aria-hidden
+          className={cn(
+            '-translate-y-1/2 absolute top-5 left-[-7px] h-5 w-[7px] rounded-l-[2px] bg-[var(--workflow-edge)] transition-opacity duration-[360ms] ease-[cubic-bezier(0.22,1,0.36,1)]',
+            handlesVisible ? 'opacity-100' : 'opacity-0'
+          )}
+        />
+      )}
+      {!block.isTerminal && (
+        <span
+          aria-hidden
+          className={cn(
+            '-translate-y-1/2 absolute top-5 right-[-7px] h-5 w-[7px] rounded-r-[2px] bg-[var(--workflow-edge)] transition-opacity duration-[360ms] ease-[cubic-bezier(0.22,1,0.36,1)]',
+            handlesVisible ? 'opacity-100' : 'opacity-0'
+          )}
+        />
+      )}
+    </>
+  )
+}
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-visual/hero-visual.tsx b/apps/sim/app/(landing)/components/hero/components/hero-visual/hero-visual.tsx
index fb3ccaff2ca..dde1aadba94 100644
--- a/apps/sim/app/(landing)/components/hero/components/hero-visual/hero-visual.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/hero-visual/hero-visual.tsx
@@ -9,6 +9,7 @@ import {
   useState,
 } from 'react'
 import { cn } from '@sim/emcn'
+import { BlockHandles } from '@/app/(landing)/components/hero/components/hero-visual/block-handles'
 import {
   type HomeMode,
   StageHome,
@@ -17,10 +18,7 @@ import {
   type KbStage,
   KnowledgeBasePanel,
 } from '@/app/(landing)/components/hero/components/hero-visual/stage-kb'
-import {
-  BlockHandles,
-  WorkflowBlock,
-} from '@/app/(landing)/components/hero/components/hero-visual/workflow-block'
+import { WorkflowBlock } from '@/app/(landing)/components/hero/components/hero-visual/workflow-block'
 import {
   ANSWER_MS_PER_CHAR,
   ANSWER_TEXT,
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-visual/stage-home.tsx b/apps/sim/app/(landing)/components/hero/components/hero-visual/stage-home.tsx
index 299660d8555..f43dd49f1cd 100644
--- a/apps/sim/app/(landing)/components/hero/components/hero-visual/stage-home.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/hero-visual/stage-home.tsx
@@ -9,7 +9,7 @@ import {
   useState,
 } from 'react'
 import { cn } from '@sim/emcn'
-import { WorkflowBlockContent } from '@/app/(landing)/components/hero/components/hero-visual/workflow-block'
+import { WorkflowBlockContent } from '@/app/(landing)/components/hero/components/hero-visual/workflow-block-content'
 import {
   ANSWER_TEXT,
   BLOCK_WIDTH,
@@ -115,9 +115,9 @@ function PromptAtoms({ atoms }: { atoms: PromptAtom[] }) {
     <>
       {atoms.map((atom, i) =>
         atom.kind === 'char' ? (
-          <span key={i}>{atom.char}</span>
+          <span key={`${i}-${atom.char}`}>{atom.char}</span>
         ) : (
-          <span key={i}>
+          <span key={`${i}-${atom.label}`}>
             <span className='relative'>
               <span className='invisible'>@</span>
               <atom.icon className='absolute inset-0 m-auto size-[12px] translate-y-[1.25px] text-[var(--text-icon)]' />
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block-content.tsx b/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block-content.tsx
new file mode 100644
index 00000000000..3a637cc60f5
--- /dev/null
+++ b/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block-content.tsx
@@ -0,0 +1,58 @@
+import { cn } from '@sim/emcn'
+import type { BlockDef } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
+
+interface WorkflowBlockContentProps {
+  block: BlockDef
+}
+
+/**
+ * The inner content of a workflow block - the icon-tile header and optional
+ * label → value rows - WITHOUT the card chrome or handle nubs. Split out so the
+ * chat card can host the exact same content while morphing into the first block
+ * (the card keeps its own continuous shell; only this content crossfades in).
+ */
+export function WorkflowBlockContent({ block }: WorkflowBlockContentProps) {
+  return (
+    <>
+      <div
+        className={cn(
+          'flex items-center gap-2.5 p-2',
+          block.rows.length > 0 && 'border-[var(--border-1)] border-b'
+        )}
+      >
+        <div
+          className={cn(
+            'flex size-[24px] flex-shrink-0 items-center justify-center rounded-md',
+            block.tileBorder && 'border border-[var(--border-1)]'
+          )}
+          style={{ background: block.bgColor }}
+        >
+          {block.tileBorder ? (
+            <block.icon className='size-[16px]' />
+          ) : (
+            <block.icon className='size-[16px] text-white' />
+          )}
+        </div>
+        <span className='truncate font-medium text-[16px] text-[var(--text-body)]'>
+          {block.name}
+        </span>
+      </div>
+
+      {block.rows.length > 0 && (
+        <div className='flex flex-col gap-2 p-2'>
+          {block.rows.map((row) => (
+            <div key={row.title} className='flex items-center gap-2'>
+              <span className='flex-shrink-0 text-[14px] text-[var(--text-muted)]'>
+                {row.title}
+              </span>
+              <span className='flex min-w-0 flex-1 items-center justify-end gap-1.5 text-[14px] text-[var(--text-body)]'>
+                {row.valueIcon && <row.valueIcon className='size-[14px] flex-shrink-0' />}
+                <span className='truncate'>{row.value}</span>
+              </span>
+            </div>
+          ))}
+        </div>
+      )}
+    </>
+  )
+}
diff --git a/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block.tsx b/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block.tsx
index dd187600ede..37da41a33b4 100644
--- a/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/hero-visual/workflow-block.tsx
@@ -1,4 +1,6 @@
 import { cn } from '@sim/emcn'
+import { BlockHandles } from '@/app/(landing)/components/hero/components/hero-visual/block-handles'
+import { WorkflowBlockContent } from '@/app/(landing)/components/hero/components/hero-visual/workflow-block-content'
 import type { BlockDef } from '@/app/(landing)/components/hero/components/hero-visual/workflow-data'
 
 interface WorkflowBlockProps {
@@ -7,91 +9,6 @@ interface WorkflowBlockProps {
   handlesVisible?: boolean
 }
 
-/**
- * The inner content of a workflow block - the icon-tile header and optional
- * label → value rows - WITHOUT the card chrome or handle nubs. Split out so the
- * chat card can host the exact same content while morphing into the first block
- * (the card keeps its own continuous shell; only this content crossfades in).
- */
-export function WorkflowBlockContent({ block }: WorkflowBlockProps) {
-  return (
-    <>
-      <div
-        className={cn(
-          'flex items-center gap-2.5 p-2',
-          block.rows.length > 0 && 'border-[var(--border-1)] border-b'
-        )}
-      >
-        <div
-          className={cn(
-            'flex size-[24px] flex-shrink-0 items-center justify-center rounded-md',
-            block.tileBorder && 'border border-[var(--border-1)]'
-          )}
-          style={{ background: block.bgColor }}
-        >
-          {block.tileBorder ? (
-            <block.icon className='size-[16px]' />
-          ) : (
-            <block.icon className='size-[16px] text-white' />
-          )}
-        </div>
-        <span className='truncate font-medium text-[16px] text-[var(--text-body)]'>
-          {block.name}
-        </span>
-      </div>
-
-      {block.rows.length > 0 && (
-        <div className='flex flex-col gap-2 p-2'>
-          {block.rows.map((row) => (
-            <div key={row.title} className='flex items-center gap-2'>
-              <span className='flex-shrink-0 text-[14px] text-[var(--text-muted)]'>
-                {row.title}
-              </span>
-              <span className='flex min-w-0 flex-1 items-center justify-end gap-1.5 text-[14px] text-[var(--text-body)]'>
-                {row.valueIcon && <row.valueIcon className='size-[14px] flex-shrink-0' />}
-                <span className='truncate'>{row.value}</span>
-              </span>
-            </div>
-          ))}
-        </div>
-      )}
-    </>
-  )
-}
-
-/**
- * The decorative edge-handle nubs for a block - an inbound nub on the left
- * unless the block is a trigger, an outbound nub on the right unless it's
- * terminal. Absolutely positioned, so the caller must be a `relative` (or
- * otherwise positioned) box of the block's width. Shared so the morphed chat
- * card (GitHub, rendered as content-only) can carry the same handles as the
- * real {@link WorkflowBlock} satellites.
- */
-export function BlockHandles({ block, handlesVisible = true }: WorkflowBlockProps) {
-  return (
-    <>
-      {!block.isTrigger && (
-        <span
-          aria-hidden
-          className={cn(
-            '-translate-y-1/2 absolute top-5 left-[-7px] h-5 w-[7px] rounded-l-[2px] bg-[var(--workflow-edge)] transition-opacity duration-[360ms] ease-[cubic-bezier(0.22,1,0.36,1)]',
-            handlesVisible ? 'opacity-100' : 'opacity-0'
-          )}
-        />
-      )}
-      {!block.isTerminal && (
-        <span
-          aria-hidden
-          className={cn(
-            '-translate-y-1/2 absolute top-5 right-[-7px] h-5 w-[7px] rounded-r-[2px] bg-[var(--workflow-edge)] transition-opacity duration-[360ms] ease-[cubic-bezier(0.22,1,0.36,1)]',
-            handlesVisible ? 'opacity-100' : 'opacity-0'
-          )}
-        />
-      )}
-    </>
-  )
-}
-
 /**
  * A pure presentational workflow block card, faithful to the real WorkflowBlock:
  * a fixed-width card with an icon-tile header and optional label → value rows,
diff --git a/apps/sim/app/(landing)/components/home-structured-data/home-structured-data.tsx b/apps/sim/app/(landing)/components/home-structured-data/home-structured-data.tsx
index 09125498a63..4b3a36bbf1d 100644
--- a/apps/sim/app/(landing)/components/home-structured-data/home-structured-data.tsx
+++ b/apps/sim/app/(landing)/components/home-structured-data/home-structured-data.tsx
@@ -1,4 +1,5 @@
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 
 /**
  * Home-page JSON-LD - the entities specific to `/`: the `WebPage`, its
@@ -15,135 +16,130 @@ import { SITE_URL } from '@/lib/core/utils/urls'
  * - All claims must also appear as visible text on the page.
  * - Do not add `aggregateRating` without real, verifiable review data.
  */
-export function HomeStructuredData() {
-  const graph = {
-    '@context': 'https://schema.org',
-    '@graph': [
-      {
-        '@type': 'WebPage',
-        '@id': `${SITE_URL}#webpage`,
-        url: SITE_URL,
-        name: 'Sim, The AI Workspace | Build, Deploy & Manage AI Agents',
-        isPartOf: { '@id': `${SITE_URL}#website` },
-        about: { '@id': `${SITE_URL}#software` },
-        datePublished: '2024-01-01T00:00:00+00:00',
-        description:
-          'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work.',
-        breadcrumb: { '@id': `${SITE_URL}#breadcrumb` },
-        inLanguage: 'en-US',
-        speakable: {
-          '@type': 'SpeakableSpecification',
-          cssSelector: ['#hero-heading', '[id="hero"] p'],
-        },
-        potentialAction: [{ '@type': 'ReadAction', target: [SITE_URL] }],
-      },
-      {
-        '@type': 'BreadcrumbList',
-        '@id': `${SITE_URL}#breadcrumb`,
-        itemListElement: [{ '@type': 'ListItem', position: 1, name: 'Home', item: SITE_URL }],
+const HOME_JSON_LD = {
+  '@context': 'https://schema.org',
+  '@graph': [
+    {
+      '@type': 'WebPage',
+      '@id': `${SITE_URL}#webpage`,
+      url: SITE_URL,
+      name: 'Sim, The AI Workspace | Build, Deploy & Manage AI Agents',
+      isPartOf: { '@id': `${SITE_URL}#website` },
+      about: { '@id': `${SITE_URL}#software` },
+      datePublished: '2024-01-01T00:00:00+00:00',
+      description:
+        'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work.',
+      breadcrumb: { '@id': `${SITE_URL}#breadcrumb` },
+      inLanguage: 'en-US',
+      speakable: {
+        '@type': 'SpeakableSpecification',
+        cssSelector: ['#hero-heading', '[id="hero"] p'],
       },
-      {
-        '@type': 'WebApplication',
-        '@id': `${SITE_URL}#software`,
-        url: SITE_URL,
-        name: 'Sim, The AI Workspace',
-        description:
-          'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work, visually, conversationally, or with code. Trusted by over 100,000 builders. SOC2 compliant.',
-        applicationCategory: 'BusinessApplication',
-        applicationSubCategory: 'AI Workspace',
-        operatingSystem: 'Web',
-        browserRequirements: 'Requires a modern browser with JavaScript enabled',
-        installUrl: `${SITE_URL}/signup`,
-        offers: [
-          {
-            '@type': 'Offer',
-            name: 'Community Plan: 1,000 credits included',
-            price: '0',
-            priceCurrency: 'USD',
-            availability: 'https://schema.org/InStock',
-          },
-          {
-            '@type': 'Offer',
-            name: 'Pro Plan: 6,000 credits/month',
+      potentialAction: [{ '@type': 'ReadAction', target: [SITE_URL] }],
+    },
+    {
+      '@type': 'BreadcrumbList',
+      '@id': `${SITE_URL}#breadcrumb`,
+      itemListElement: [{ '@type': 'ListItem', position: 1, name: 'Home', item: SITE_URL }],
+    },
+    {
+      '@type': 'WebApplication',
+      '@id': `${SITE_URL}#software`,
+      url: SITE_URL,
+      name: 'Sim, The AI Workspace',
+      description:
+        'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work, visually, conversationally, or with code. Trusted by over 100,000 builders. SOC2 compliant.',
+      applicationCategory: 'BusinessApplication',
+      applicationSubCategory: 'AI Workspace',
+      operatingSystem: 'Web',
+      browserRequirements: 'Requires a modern browser with JavaScript enabled',
+      installUrl: `${SITE_URL}/signup`,
+      offers: [
+        {
+          '@type': 'Offer',
+          name: 'Community Plan: 1,000 credits included',
+          price: '0',
+          priceCurrency: 'USD',
+          availability: 'https://schema.org/InStock',
+        },
+        {
+          '@type': 'Offer',
+          name: 'Pro Plan: 6,000 credits/month',
+          price: '25',
+          priceCurrency: 'USD',
+          priceSpecification: {
+            '@type': 'UnitPriceSpecification',
             price: '25',
             priceCurrency: 'USD',
-            priceSpecification: {
-              '@type': 'UnitPriceSpecification',
-              price: '25',
-              priceCurrency: 'USD',
-              unitText: 'MONTH',
-              billingIncrement: 1,
-            },
-            availability: 'https://schema.org/InStock',
+            unitText: 'MONTH',
+            billingIncrement: 1,
           },
-          {
-            '@type': 'Offer',
-            name: 'Max Plan: 25,000 credits/month',
+          availability: 'https://schema.org/InStock',
+        },
+        {
+          '@type': 'Offer',
+          name: 'Max Plan: 25,000 credits/month',
+          price: '100',
+          priceCurrency: 'USD',
+          priceSpecification: {
+            '@type': 'UnitPriceSpecification',
             price: '100',
             priceCurrency: 'USD',
-            priceSpecification: {
-              '@type': 'UnitPriceSpecification',
-              price: '100',
-              priceCurrency: 'USD',
-              unitText: 'MONTH',
-              billingIncrement: 1,
-            },
-            availability: 'https://schema.org/InStock',
-          },
-        ],
-        featureList: [
-          'AI workspace for teams',
-          'Mothership: natural language agent creation',
-          'Visual workflow builder',
-          '1,000+ integrations',
-          'LLM orchestration (OpenAI, Anthropic, Google, xAI, Mistral, Perplexity)',
-          'Knowledge base creation',
-          'Table creation',
-          'Document creation',
-          'API access',
-          'Custom functions',
-          'Scheduled workflows',
-          'Event triggers',
-        ],
-        review: [
-          {
-            '@type': 'Review',
-            author: { '@type': 'Person', name: 'Hasan Toor' },
-            reviewBody:
-              'This startup just dropped the fastest way to build AI agents. This Figma-like canvas to build agents will blow your mind.',
-            url: 'https://x.com/hasantoxr/status/1912909502036525271',
-          },
-          {
-            '@type': 'Review',
-            author: { '@type': 'Person', name: 'nizzy' },
-            reviewBody:
-              'This is the zapier of agent building. I always believed that building agents and using AI should not be limited to technical people. I think this solves just that.',
-            url: 'https://x.com/nizzyabi/status/1907864421227180368',
+            unitText: 'MONTH',
+            billingIncrement: 1,
           },
-          {
-            '@type': 'Review',
-            author: { '@type': 'Organization', name: 'xyflow' },
-            reviewBody: 'A very good looking agent workflow builder and open source!',
-            url: 'https://x.com/xyflowdev/status/1909501499719438670',
-          },
-        ],
-      },
-      {
-        '@type': 'SoftwareSourceCode',
-        '@id': `${SITE_URL}#source`,
-        codeRepository: 'https://github.com/simstudioai/sim',
-        programmingLanguage: ['TypeScript', 'Python'],
-        runtimePlatform: 'Node.js',
-        license: 'https://opensource.org/licenses/Apache-2.0',
-        isPartOf: { '@id': `${SITE_URL}#software` },
-      },
-    ],
-  }
+          availability: 'https://schema.org/InStock',
+        },
+      ],
+      featureList: [
+        'AI workspace for teams',
+        'Mothership: natural language agent creation',
+        'Visual workflow builder',
+        '1,000+ integrations',
+        'LLM orchestration (OpenAI, Anthropic, Google, xAI, Mistral, Perplexity)',
+        'Knowledge base creation',
+        'Table creation',
+        'Document creation',
+        'API access',
+        'Custom functions',
+        'Scheduled workflows',
+        'Event triggers',
+      ],
+      review: [
+        {
+          '@type': 'Review',
+          author: { '@type': 'Person', name: 'Hasan Toor' },
+          reviewBody:
+            'This startup just dropped the fastest way to build AI agents. This Figma-like canvas to build agents will blow your mind.',
+          url: 'https://x.com/hasantoxr/status/1912909502036525271',
+        },
+        {
+          '@type': 'Review',
+          author: { '@type': 'Person', name: 'nizzy' },
+          reviewBody:
+            'This is the zapier of agent building. I always believed that building agents and using AI should not be limited to technical people. I think this solves just that.',
+          url: 'https://x.com/nizzyabi/status/1907864421227180368',
+        },
+        {
+          '@type': 'Review',
+          author: { '@type': 'Organization', name: 'xyflow' },
+          reviewBody: 'A very good looking agent workflow builder and open source!',
+          url: 'https://x.com/xyflowdev/status/1909501499719438670',
+        },
+      ],
+    },
+    {
+      '@type': 'SoftwareSourceCode',
+      '@id': `${SITE_URL}#source`,
+      codeRepository: 'https://github.com/simstudioai/sim',
+      programmingLanguage: ['TypeScript', 'Python'],
+      runtimePlatform: 'Node.js',
+      license: 'https://opensource.org/licenses/Apache-2.0',
+      isPartOf: { '@id': `${SITE_URL}#software` },
+    },
+  ],
+}
 
-  return (
-    <script
-      type='application/ld+json'
-      dangerouslySetInnerHTML={{ __html: JSON.stringify(graph) }}
-    />
-  )
+export function HomeStructuredData() {
+  return <JsonLd data={HOME_JSON_LD} />
 }
diff --git a/apps/sim/app/(landing)/components/index.ts b/apps/sim/app/(landing)/components/index.ts
index 313b2c92c9b..806703b34af 100644
--- a/apps/sim/app/(landing)/components/index.ts
+++ b/apps/sim/app/(landing)/components/index.ts
@@ -5,6 +5,8 @@ export { Features } from './features'
 export { Footer } from './footer'
 export { Hero } from './hero'
 export { HomeStructuredData } from './home-structured-data'
+export type { JsonLdData } from './json-ld'
+export { JsonLd } from './json-ld'
 export { LandingShell } from './landing-shell'
 export { Lifecycle } from './lifecycle'
 export { LogoShell } from './logo-shell'
diff --git a/apps/sim/app/(landing)/components/json-ld/index.ts b/apps/sim/app/(landing)/components/json-ld/index.ts
new file mode 100644
index 00000000000..e53458ba3a0
--- /dev/null
+++ b/apps/sim/app/(landing)/components/json-ld/index.ts
@@ -0,0 +1,2 @@
+export type { JsonLdData } from './json-ld'
+export { JsonLd } from './json-ld'
diff --git a/apps/sim/app/(landing)/components/json-ld/json-ld.tsx b/apps/sim/app/(landing)/components/json-ld/json-ld.tsx
new file mode 100644
index 00000000000..d01599a3d60
--- /dev/null
+++ b/apps/sim/app/(landing)/components/json-ld/json-ld.tsx
@@ -0,0 +1,50 @@
+import type { ReactElement } from 'react'
+
+/**
+ * Characters that break out of an inline HTML `<script>` context, mapped to
+ * their unicode escapes. `<` is the dangerous one (`</script>`); `>` and `&` are
+ * escaped for completeness, and the JS line/paragraph separators (U+2028/U+2029)
+ * keep the payload valid inside inline scripts.
+ */
+const HTML_ESCAPES: Record<string, string> = {
+  '<': '\\u003c',
+  '>': '\\u003e',
+  '&': '\\u0026',
+  [String.fromCharCode(0x2028)]: '\\u2028',
+  [String.fromCharCode(0x2029)]: '\\u2029',
+}
+
+const UNSAFE_HTML_CHARS = new RegExp(`[<>&${String.fromCharCode(0x2028, 0x2029)}]`, 'g')
+
+/**
+ * Serialize structured data for an inline `application/ld+json` script. Plain
+ * `JSON.stringify` does not HTML-escape, so a `</script>` (or stray `<`) in the
+ * data would break out of the script tag and become an XSS sink. Escaping these
+ * characters as unicode escapes keeps the JSON valid and semantically identical,
+ * so crawlers read the exact same graph — SEO output is unchanged.
+ */
+function serializeJsonLd(data: JsonLdData): string {
+  return JSON.stringify(data).replace(UNSAFE_HTML_CHARS, (char) => HTML_ESCAPES[char])
+}
+
+export type JsonLdData = Record<string, unknown>
+
+interface JsonLdProps {
+  data: JsonLdData
+}
+
+/**
+ * Server-rendered JSON-LD `<script>`. The single source of truth for emitting
+ * structured data across the landing surface — every page/section passes its
+ * schema graph as `data` and this owns the safe serialization. Render it in a
+ * Server Component before visible content so crawlers and AI answer engines read
+ * the graph first.
+ */
+export function JsonLd({ data }: JsonLdProps): ReactElement {
+  return (
+    <script
+      type='application/ld+json'
+      dangerouslySetInnerHTML={{ __html: serializeJsonLd(data) }}
+    />
+  )
+}
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/chat-input.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/chat-input.tsx
index a4650141e5e..9d1fb6a09d0 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/chat-input.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/chat-input.tsx
@@ -60,6 +60,7 @@ export function LandingPreviewChatInput({
           }
         }}
         placeholder={placeholder}
+        aria-label={placeholder}
         rows={1}
         readOnly={readOnly}
         className='m-0 block max-h-[200px] min-h-[24px] w-full resize-none overflow-y-auto border-0 bg-transparent px-1 py-1 font-body text-[15px] text-[var(--text-primary)] leading-[24px] tracking-[-0.015em] outline-none placeholder:font-[380] placeholder:text-[var(--text-muted)] focus-visible:ring-0'
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
index 890c2adab3a..45b8c2a9bb9 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { cn } from '@sim/emcn'
 import { LandingPreviewChatInput } from '@/app/(landing)/components/landing-preview/components/landing-preview-chat/chat-input'
 import { LandingPreviewChatTitleBar } from '@/app/(landing)/components/landing-preview/components/landing-preview-chat/chat-title-bar'
@@ -21,6 +21,9 @@ interface LandingPreviewChatProps {
 const THINKING_AT = 480
 const ASSISTANT_AT = 1280
 
+/** Ordered stages of the scripted reveal (user request -> think -> reply). */
+type RevealPhase = 'hidden' | 'user' | 'thinking' | 'assistant'
+
 /**
  * The Mothership chat pane - the persistent left column of the "chat everywhere"
  * layout. Its title bar carries the chat-switcher breadcrumb (a chat-bubble
@@ -39,22 +42,21 @@ const ASSISTANT_AT = 1280
 export function LandingPreviewChat({ chat, chatName, animationKey }: LandingPreviewChatProps) {
   const submit = useLandingSubmit()
   const [value, setValue] = useState('')
-  const [showUser, setShowUser] = useState(false)
-  const [showThinking, setShowThinking] = useState(false)
-  const [showAssistant, setShowAssistant] = useState(false)
+  const [phase, setPhase] = useState<RevealPhase>('hidden')
+  const revealRef = useRef<{ key: number; chat: PreviewChat | null }>({ key: animationKey, chat })
+
+  // Restart the reveal synchronously when the timeline (or staged chat) changes,
+  // so the pane never flashes the previous step's reply before the effect reruns.
+  if (revealRef.current.key !== animationKey || revealRef.current.chat !== chat) {
+    revealRef.current = { key: animationKey, chat }
+    setPhase('hidden')
+  }
 
   useEffect(() => {
-    setShowUser(false)
-    setShowThinking(false)
-    setShowAssistant(false)
     if (!chat) return
-
-    const raf = requestAnimationFrame(() => setShowUser(true))
-    const t1 = setTimeout(() => setShowThinking(true), THINKING_AT)
-    const t2 = setTimeout(() => {
-      setShowThinking(false)
-      setShowAssistant(true)
-    }, ASSISTANT_AT)
+    const raf = requestAnimationFrame(() => setPhase('user'))
+    const t1 = setTimeout(() => setPhase('thinking'), THINKING_AT)
+    const t2 = setTimeout(() => setPhase('assistant'), ASSISTANT_AT)
     return () => {
       cancelAnimationFrame(raf)
       clearTimeout(t1)
@@ -62,6 +64,10 @@ export function LandingPreviewChat({ chat, chatName, animationKey }: LandingPrev
     }
   }, [animationKey, chat])
 
+  const showUser = phase !== 'hidden'
+  const showThinking = phase === 'thinking'
+  const showAssistant = phase === 'assistant'
+
   const isEmpty = value.trim().length === 0
   const handleSubmit = () => {
     if (isEmpty) return
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files.tsx
index e481772ac5f..f7fb7d1baa3 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files.tsx
@@ -4,10 +4,8 @@ import type {
   PreviewColumn,
   PreviewRow,
 } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
-import {
-  LandingPreviewResource,
-  ownerCell,
-} from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+import { LandingPreviewResource } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+import { ownerCell } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/utils'
 
 /** Generic audio/zip icon using basic SVG since no dedicated component exists */
 function AudioIcon({ className }: { className?: string }) {
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
index b915c7d4fb9..12d9bb4693f 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
@@ -422,7 +422,7 @@ function MiniTablePanel() {
           <tbody>
             {MINI_TABLE_ROWS.map((row, i) => (
               <m.tr
-                key={i}
+                key={row.name}
                 initial={{ opacity: 0 }}
                 animate={{ opacity: 1 }}
                 transition={{ duration: 0.2, delay: i * 0.04, ease: EASE_OUT }}
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
index 64d18fdfb71..1085d57e920 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
@@ -22,8 +22,8 @@ function connectorIcons(icons: React.ComponentType<{ className?: string }>[]) {
   return {
     content: (
       <div className='flex items-center gap-1'>
-        {icons.map((Icon, i) => (
-          <Icon key={i} className='size-3.5 flex-shrink-0' />
+        {icons.map((Icon) => (
+          <Icon key={Icon.displayName ?? Icon.name} className='size-3.5 flex-shrink-0' />
         ))}
       </div>
     ),
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-logs/landing-preview-logs.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-logs/landing-preview-logs.tsx
index c9b37d6f296..75aa9026653 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-logs/landing-preview-logs.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-logs/landing-preview-logs.tsx
@@ -141,7 +141,7 @@ export function LandingPreviewLogs() {
       : MOCK_LOGS
 
     if (!sortKey) return filtered
-    return [...filtered].sort((a, b) => {
+    return filtered.toSorted((a, b) => {
       const av = sortKey === 'cost' ? a.cost.replace(/\D/g, '') : a[sortKey]
       const bv = sortKey === 'cost' ? b.cost.replace(/\D/g, '') : b[sortKey]
       const cmp = av.localeCompare(bv, undefined, { numeric: true, sensitivity: 'base' })
@@ -201,6 +201,7 @@ export function LandingPreviewLogs() {
               value={search}
               onChange={(e) => setSearch(e.target.value)}
               placeholder='Search logs...'
+              aria-label='Search logs'
               className='flex-1 bg-transparent text-[var(--text-body)] text-caption outline-none placeholder:text-[var(--text-subtle)]'
             />
           </div>
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource.tsx
index 19b4c485fc5..8971296b002 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource.tsx
@@ -31,17 +31,6 @@ interface LandingPreviewResourceProps {
   onRowClick?: (id: string) => void
 }
 
-export function ownerCell(initial: string, name: string): PreviewCell {
-  return {
-    icon: (
-      <span className='flex size-[14px] flex-shrink-0 items-center justify-center rounded-full border border-[var(--border)] bg-[var(--surface-3)] font-medium text-[8px] text-[var(--text-secondary)]'>
-        {initial}
-      </span>
-    ),
-    label: name,
-  }
-}
-
 export function LandingPreviewResource({
   icon: Icon,
   title,
@@ -73,7 +62,7 @@ export function LandingPreviewResource({
       : rows
 
     if (!sortColId) return filtered
-    return [...filtered].sort((a, b) => {
+    return filtered.toSorted((a, b) => {
       const av = a.cells[sortColId]?.label ?? ''
       const bv = b.cells[sortColId]?.label ?? ''
       const cmp = av.localeCompare(bv, undefined, { numeric: true, sensitivity: 'base' })
@@ -107,6 +96,7 @@ export function LandingPreviewResource({
               value={search}
               onChange={(e) => setSearch(e.target.value)}
               placeholder={searchPlaceholder}
+              aria-label={searchPlaceholder}
               className='flex-1 bg-transparent text-[var(--text-body)] text-caption outline-none placeholder:text-[var(--text-subtle)]'
             />
           </div>
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/utils.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/utils.tsx
new file mode 100644
index 00000000000..a165af62304
--- /dev/null
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/utils.tsx
@@ -0,0 +1,13 @@
+import type { PreviewCell } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+
+/** Builds a preview owner cell: a small circular initial badge next to a name. */
+export function ownerCell(initial: string, name: string): PreviewCell {
+  return {
+    icon: (
+      <span className='flex size-[14px] flex-shrink-0 items-center justify-center rounded-full border border-[var(--border)] bg-[var(--surface-3)] font-medium text-[8px] text-[var(--text-secondary)]'>
+        {initial}
+      </span>
+    ),
+    label: name,
+  }
+}
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-tables/landing-preview-tables.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-tables/landing-preview-tables.tsx
index 9155f2cabdc..783cded98fc 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-tables/landing-preview-tables.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-tables/landing-preview-tables.tsx
@@ -16,10 +16,8 @@ import type {
   PreviewColumn,
   PreviewRow,
 } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
-import {
-  LandingPreviewResource,
-  ownerCell,
-} from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+import { LandingPreviewResource } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+import { ownerCell } from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/utils'
 import { EASE_OUT } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
 
 const CELL = 'border-[var(--border)] border-r border-b px-2 py-[7px] align-middle select-none'
@@ -462,7 +460,7 @@ function SpreadsheetView({ tableId, tableName, onBack }: SpreadsheetViewProps) {
           </colgroup>
           <thead className='sticky top-0 z-10'>
             <tr>
-              <th className={CELL_HEADER_CHECKBOX} />
+              <th className={CELL_HEADER_CHECKBOX} aria-label='Row number' />
               {data.columns.map((col) => {
                 const Icon = COLUMN_TYPE_ICONS[col.type] ?? TypeText
                 return (
@@ -507,6 +505,7 @@ function SpreadsheetView({ tableId, tableName, onBack }: SpreadsheetViewProps) {
                             <Checkbox
                               size='sm'
                               checked={cellValue === 'true'}
+                              aria-label={col.label}
                               className='pointer-events-none'
                             />
                           </div>
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/preview-block-node.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/preview-block-node.tsx
index 60955b52c41..7f1d33beba9 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/preview-block-node.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/preview-block-node.tsx
@@ -293,16 +293,16 @@ function NoteMarkdown({ content }: { content: string }) {
     <div className='flex flex-col gap-1'>
       {lines.map((line, i) => {
         const trimmed = line.trim()
-        if (!trimmed) return <div key={i} className='h-[4px]' />
+        if (!trimmed) return <div key={`${line}-${i}`} className='h-[4px]' />
 
         if (trimmed === '---') {
-          return <hr key={i} className='my-1 border-[var(--border)] border-t' />
+          return <hr key={`${line}-${i}`} className='my-1 border-[var(--border)] border-t' />
         }
 
         if (trimmed.startsWith('### ')) {
           return (
             <p
-              key={i}
+              key={`${line}-${i}`}
               className='font-semibold text-[16px] text-[var(--text-primary)] leading-[1.3]'
             >
               {trimmed.slice(4)}
@@ -312,7 +312,7 @@ function NoteMarkdown({ content }: { content: string }) {
 
         return (
           <p
-            key={i}
+            key={`${line}-${i}`}
             className='font-medium text-[13px] text-[var(--text-primary)] leading-[1.5]'
             dangerouslySetInnerHTML={{
               __html: trimmed
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
index cc20dca1d64..649ff1aaa07 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
@@ -342,9 +342,10 @@ export interface EditorPromptData {
 export function getEditorPrompt(workflow: PreviewWorkflow): EditorPromptData | null {
   for (const block of workflow.blocks) {
     if (!AGENT_BLOCK_TYPES.has(block.type)) continue
-    const promptRow = block.rows.find((r) => r.title === 'Prompt' || r.title === 'System Prompt')
+    const rowsByTitle = new Map(block.rows.map((row) => [row.title, row]))
+    const promptRow = rowsByTitle.get('Prompt') ?? rowsByTitle.get('System Prompt')
     if (promptRow) {
-      const modelRow = block.rows.find((r) => r.title === 'Model')
+      const modelRow = rowsByTitle.get('Model')
       return {
         blockId: block.id,
         blockName: block.name,
diff --git a/apps/sim/app/(landing)/components/landing-preview/hooks/use-landing-submit.ts b/apps/sim/app/(landing)/components/landing-preview/hooks/use-landing-submit.ts
index 2b051057108..fc2f3498509 100644
--- a/apps/sim/app/(landing)/components/landing-preview/hooks/use-landing-submit.ts
+++ b/apps/sim/app/(landing)/components/landing-preview/hooks/use-landing-submit.ts
@@ -3,7 +3,7 @@
 import { useCallback } from 'react'
 import { useRouter } from 'next/navigation'
 import { LandingPromptStorage } from '@/lib/core/utils/browser-storage'
-import { trackLandingCta } from '@/app/(landing)/landing-analytics'
+import { trackLandingCta } from '@/app/(landing)/track-landing-cta'
 
 /**
  * Stores the typed prompt in browser storage and routes to `/signup`, so a
diff --git a/apps/sim/app/(landing)/components/landing-preview/landing-preview-mount.tsx b/apps/sim/app/(landing)/components/landing-preview/landing-preview-mount.tsx
index 58d82704c2a..17031b8799e 100644
--- a/apps/sim/app/(landing)/components/landing-preview/landing-preview-mount.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/landing-preview-mount.tsx
@@ -73,7 +73,7 @@ export function LandingPreviewMount({ autoplay, view, workflowId }: LandingPrevi
   return (
     <div ref={ref}>
       {inView ? (
-        <LandingPreview autoplay={autoplay} view={view} workflowId={workflowId} />
+        <LandingPreview autoplay={autoplay} initialView={view} initialWorkflowId={workflowId} />
       ) : (
         <div className={PLACEHOLDER_CLASS} />
       )}
diff --git a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
index 027e29e6ddf..b7ecc1e9966 100644
--- a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from 'react'
 import { AnimatePresence, domAnimation, LazyMotion, m, type Variants } from 'framer-motion'
 import { LandingPreviewChat } from '@/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat'
 import { LandingPreviewFiles } from '@/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files'
@@ -66,6 +66,17 @@ const WORKFLOW_MAP = new Map(PREVIEW_WORKFLOWS.map((w) => [w.id, w]))
 const HOME_STEP_MS = 12000
 const LOGS_STEP_MS = 5000
 
+const DESKTOP_QUERY = '(min-width: 1024px)'
+
+/** SSR-safe desktop media-query subscription for {@link useSyncExternalStore}. */
+function subscribeDesktop(onChange: () => void) {
+  const mql = window.matchMedia(DESKTOP_QUERY)
+  mql.addEventListener('change', onChange)
+  return () => mql.removeEventListener('change', onChange)
+}
+const getDesktopSnapshot = () => window.matchMedia(DESKTOP_QUERY).matches
+const getDesktopServerSnapshot = () => true
+
 /** Full desktop sequence: CRM -> home -> logs -> ITSM -> support -> repeat */
 const DESKTOP_STEPS: DemoStep[] = [
   {
@@ -99,9 +110,9 @@ interface LandingPreviewProps {
    * to `'workflow'`. Lets each feature stage show the platform surface that
    * matches its callout (e.g. `'logs'`, `'scheduled-tasks'`).
    */
-  view?: SidebarView
+  initialView?: SidebarView
   /** Initial workflow for the static snapshot. Defaults to the first preview workflow. */
-  workflowId?: string
+  initialWorkflowId?: string
 }
 
 /**
@@ -116,14 +127,18 @@ interface LandingPreviewProps {
  */
 export function LandingPreview({
   autoplay = true,
-  view = 'workflow',
-  workflowId = PREVIEW_WORKFLOWS[0].id,
+  initialView = 'workflow',
+  initialWorkflowId = PREVIEW_WORKFLOWS[0].id,
 }: LandingPreviewProps) {
-  const [activeView, setActiveView] = useState<SidebarView>(view)
-  const [activeWorkflowId, setActiveWorkflowId] = useState(workflowId)
+  const [activeView, setActiveView] = useState<SidebarView>(initialView)
+  const [activeWorkflowId, setActiveWorkflowId] = useState(initialWorkflowId)
   const [animationKey, setAnimationKey] = useState(0)
   const [autoTypeHome, setAutoTypeHome] = useState(false)
-  const [isDesktop, setIsDesktop] = useState(true)
+  const isDesktop = useSyncExternalStore(
+    subscribeDesktop,
+    getDesktopSnapshot,
+    getDesktopServerSnapshot
+  )
 
   const demoIndexRef = useRef(0)
   const demoTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
@@ -164,14 +179,14 @@ export function LandingPreview({
   }, [applyDemoStep])
 
   useEffect(() => {
-    const desktop = window.matchMedia('(min-width: 1024px)').matches
-    setIsDesktop(desktop)
-    if (!desktop) return
-    if (!autoplay) return
+    // `isDesktop` is now reactive (viewport crossing 1024px re-runs this), so gate
+    // the auto-demo on the cycle still being active - a resize after the visitor
+    // has interacted must not restart the sequence from the first step.
+    if (!isDesktop || !autoplay || !autoCycleActiveRef.current) return
     applyDemoStep(DESKTOP_STEPS[0])
     scheduleNextStep()
     return clearDemoTimer
-  }, [applyDemoStep, scheduleNextStep, clearDemoTimer, autoplay])
+  }, [isDesktop, autoplay, applyDemoStep, scheduleNextStep, clearDemoTimer])
 
   const stopAutoCycle = useCallback(() => {
     autoCycleActiveRef.current = false
diff --git a/apps/sim/app/(landing)/components/lifecycle/components/lifecycle-icons/lifecycle-icons.tsx b/apps/sim/app/(landing)/components/lifecycle/components/lifecycle-icons/lifecycle-icons.tsx
index d8589235a66..e1cda3de72e 100644
--- a/apps/sim/app/(landing)/components/lifecycle/components/lifecycle-icons/lifecycle-icons.tsx
+++ b/apps/sim/app/(landing)/components/lifecycle/components/lifecycle-icons/lifecycle-icons.tsx
@@ -108,19 +108,20 @@ export function DeployIcon(props: IconProps) {
   )
 }
 
+const MONITOR_BARS = [
+  { x: 44, ground: 86, h: 18 },
+  { x: 55, ground: 80.5, h: 30 },
+  { x: 66, ground: 75, h: 22 },
+  { x: 77, ground: 69.5, h: 38 },
+  { x: 88, ground: 64, h: 28 },
+] as const
+
 /** Monitor - a run of metric bars receding into the distance, like a live chart. */
 export function MonitorIcon(props: IconProps) {
-  const bars = [
-    { x: 44, ground: 86, h: 18 },
-    { x: 55, ground: 80.5, h: 30 },
-    { x: 66, ground: 75, h: 22 },
-    { x: 77, ground: 69.5, h: 38 },
-    { x: 88, ground: 64, h: 28 },
-  ]
   return (
     <IconFrame {...props}>
       {/* Far → near so nearer bars occlude the ones behind them. */}
-      {[...bars].reverse().map((bar) => (
+      {MONITOR_BARS.toReversed().map((bar) => (
         <IsoBox key={bar.x} cx={bar.x} topY={bar.ground - bar.h} w={5} h={bar.h} />
       ))}
     </IconFrame>
diff --git a/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-grid.tsx b/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-grid.tsx
index 87d315eae1f..b15e732ac9d 100644
--- a/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-grid.tsx
+++ b/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-grid.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { cn } from '@sim/emcn'
 import { GooDefs } from '@/app/(landing)/components/mothership/components/iso-marks/goo-defs'
 import {
   type Edge,
@@ -130,8 +131,11 @@ export function IsoCubeGrid({ size = 110, className, forceHover = false }: IsoCu
       height={size}
       role='img'
       aria-label='Cube grid'
-      className={className}
-      style={{ display: 'block', outline: 'none' }}
+      className={cn(
+        'focus-visible:outline-none focus-visible:ring-[1.5px] focus-visible:ring-[var(--brand-agent)]',
+        className
+      )}
+      style={{ display: 'block' }}
       {...bind}
     >
       <GooDefs gradId={gradId} gooId={gooId} gooFusion={GOO_FUSION} from={from} to={to} />
diff --git a/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-row.tsx b/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-row.tsx
index cb0155a494b..d077f28afc2 100644
--- a/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-row.tsx
+++ b/apps/sim/app/(landing)/components/mothership/components/iso-marks/iso-cube-row.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { cn } from '@sim/emcn'
 import { GooDefs } from '@/app/(landing)/components/mothership/components/iso-marks/goo-defs'
 import {
   type Edge,
@@ -123,8 +124,11 @@ export function IsoCubeRow({ size = 110, className, forceHover = false }: IsoCub
       height={size}
       role='img'
       aria-label='Cube row'
-      className={className}
-      style={{ display: 'block', outline: 'none' }}
+      className={cn(
+        'focus-visible:outline-none focus-visible:ring-[1.5px] focus-visible:ring-[var(--brand-agent)]',
+        className
+      )}
+      style={{ display: 'block' }}
       {...bind}
     >
       <GooDefs gradId={gradId} gooId={gooId} gooFusion={GOO_FUSION} from={from} to={to} />
diff --git a/apps/sim/app/(landing)/components/navbar/components/navbar-shell/navbar-shell.tsx b/apps/sim/app/(landing)/components/navbar/components/navbar-shell/navbar-shell.tsx
index 8aacab130d8..852fd78d9f6 100644
--- a/apps/sim/app/(landing)/components/navbar/components/navbar-shell/navbar-shell.tsx
+++ b/apps/sim/app/(landing)/components/navbar/components/navbar-shell/navbar-shell.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { ReactNode } from 'react'
-import { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react'
+import { createContext, use, useEffect, useMemo, useRef, useState } from 'react'
 import { cn } from '@sim/emcn'
 
 /**
@@ -26,7 +26,7 @@ const NavbarFrostContext = createContext<NavbarFrostContextValue | null>(null)
 
 /** Lets the mobile nav report its open state up to the shell so the bar can frost in sync. */
 export function useNavbarFrost(): NavbarFrostContextValue | null {
-  return useContext(NavbarFrostContext)
+  return use(NavbarFrostContext)
 }
 
 interface NavbarShellProps {
@@ -86,7 +86,7 @@ export function NavbarShell({ children }: NavbarShellProps) {
   const frost = useMemo<NavbarFrostContextValue>(() => ({ setMenuOpen }), [])
 
   return (
-    <NavbarFrostContext.Provider value={frost}>
+    <NavbarFrostContext value={frost}>
       <div ref={sentinelRef} aria-hidden='true' className='-mb-px h-px' />
       <header className='sticky top-0 z-50'>
         <div
@@ -98,6 +98,6 @@ export function NavbarShell({ children }: NavbarShellProps) {
         />
         {children}
       </header>
-    </NavbarFrostContext.Provider>
+    </NavbarFrostContext>
   )
 }
diff --git a/apps/sim/app/(landing)/components/navbar/components/sim-wordmark/sim-wordmark.tsx b/apps/sim/app/(landing)/components/navbar/components/sim-wordmark/sim-wordmark.tsx
index 44b764f945c..0043641a3e0 100644
--- a/apps/sim/app/(landing)/components/navbar/components/sim-wordmark/sim-wordmark.tsx
+++ b/apps/sim/app/(landing)/components/navbar/components/sim-wordmark/sim-wordmark.tsx
@@ -22,10 +22,10 @@ export function SimWordmark() {
       className='-translate-y-[1.5px] h-[18px] w-auto'
     >
       <g fill='var(--text-body)'>
-        <path d='M0 160.896H29.5132C29.5132 169.082 32.4645 175.608 38.3671 180.475C44.2698 185.121 52.2493 187.444 62.3058 187.444C73.2363 187.444 81.6534 185.342 87.5559 181.139C93.4585 176.714 96.41 170.852 96.41 163.551C96.41 158.242 94.7701 153.817 91.4909 150.277C88.4306 146.738 82.7462 143.862 74.4386 141.65L46.2373 135.013C32.0273 131.473 21.4244 126.053 14.4287 118.753C7.65155 111.452 4.26302 101.829 4.26302 89.8823C4.26302 79.9274 6.77708 71.2997 11.8053 63.9993C17.0521 56.6983 24.1571 51.0573 33.1204 47.0752C42.3022 43.0931 52.7958 41.102 64.601 41.102C76.4066 41.102 86.5719 43.2037 95.0983 47.407C103.842 51.6103 110.62 57.4729 115.429 64.9947C120.458 72.516 123.081 81.4761 123.299 91.8738H93.7861C93.5679 83.4669 90.8351 76.9405 85.5884 72.2952C80.3417 67.6492 73.0181 65.3265 63.6175 65.3265C53.9982 65.3265 46.5652 67.4278 41.3185 71.6315C36.0717 75.8347 33.4483 81.5865 33.4483 88.8869C33.4483 99.7274 41.3185 107.138 57.0591 111.121L85.2602 118.089C98.8146 121.186 108.98 126.275 115.758 133.354C122.534 140.212 125.923 149.614 125.923 161.56C125.923 171.736 123.19 180.696 117.725 188.439C112.26 195.961 104.717 201.824 95.0983 206.027C85.6978 210.009 74.548 212 61.65 212C42.8488 212 27.8736 207.354 16.7241 198.063C5.57469 188.771 0 176.382 0 160.896Z' />
-        <path d='M232.8 212H202.125L202.125 49.7551H229.537V77.3879C232.8 68.3361 239.109 60.6617 247.811 54.7009C256.731 48.5194 267.5 45.4286 280.118 45.4286C294.259 45.4286 306.007 49.292 315.362 57.0188C324.717 64.746 330.809 75.0115 333.637 87.8165H328.089C330.265 75.0115 336.247 64.746 346.037 57.0188C355.827 49.292 367.902 45.4286 382.26 45.4286C400.535 45.4286 414.893 50.8374 425.336 61.6551C435.779 72.4727 441 87.2644 441 106.03V212H410.977V113.647C410.977 100.842 407.714 91.0175 401.188 84.174C394.879 77.1091 386.285 73.5768 375.407 73.5768C367.793 73.5768 361.048 75.3432 355.174 78.8754C349.518 82.1867 345.058 87.044 341.795 93.4462C338.532 99.8484 336.9 107.355 336.9 115.965V212H306.551V113.316C306.551 100.511 303.396 90.7966 297.088 84.174C290.778 77.33 282.185 73.908 271.307 73.908C263.693 73.908 256.949 75.6743 251.075 79.2066C245.419 82.5178 240.958 87.3751 237.695 93.7773C234.432 99.9591 232.8 107.355 232.8 115.965V212Z' />
-        <path d='M184.831 20.551C184.831 31.901 175.636 41.102 164.294 41.102C152.952 41.102 143.757 31.901 143.757 20.551C143.757 9.20101 152.952 0 164.294 0C175.636 0 184.831 9.20101 184.831 20.551Z' />
-        <path d='M179.426 212H149.162V49.7551C153.756 51.9119 158.884 53.1178 164.294 53.1178C169.704 53.1178 174.833 51.9119 179.426 49.7551V212Z' />
+        <path d='M0 160.9H29.51C29.51 169.08 32.46 175.61 38.37 180.48C44.27 185.12 52.25 187.44 62.31 187.44C73.24 187.44 81.65 185.34 87.56 181.14C93.46 176.71 96.41 170.85 96.41 163.55C96.41 158.24 94.77 153.82 91.49 150.28C88.43 146.74 82.75 143.86 74.44 141.65L46.24 135.01C32.03 131.47 21.42 126.05 14.43 118.75C7.65 111.45 4.26 101.83 4.26 89.88C4.26 79.93 6.78 71.3 11.81 64C17.05 56.7 24.16 51.06 33.12 47.08C42.3 43.09 52.8 41.1 64.6 41.1C76.41 41.1 86.57 43.2 95.1 47.41C103.84 51.61 110.62 57.47 115.43 64.99C120.46 72.52 123.08 81.48 123.3 91.87H93.79C93.57 83.47 90.84 76.94 85.59 72.3C80.34 67.65 73.02 65.33 63.62 65.33C54 65.33 46.57 67.43 41.32 71.63C36.07 75.83 33.45 81.59 33.45 88.89C33.45 99.73 41.32 107.14 57.06 111.12L85.26 118.09C98.81 121.19 108.98 126.28 115.76 133.35C122.53 140.21 125.92 149.61 125.92 161.56C125.92 171.74 123.19 180.7 117.73 188.44C112.26 195.96 104.72 201.82 95.1 206.03C85.7 210.01 74.55 212 61.65 212C42.85 212 27.87 207.35 16.72 198.06C5.57 188.77 0 176.38 0 160.9Z' />
+        <path d='M232.8 212H202.13L202.13 49.76H229.54V77.39C232.8 68.34 239.11 60.66 247.81 54.7C256.73 48.52 267.5 45.43 280.12 45.43C294.26 45.43 306.01 49.29 315.36 57.02C324.72 64.75 330.81 75.01 333.64 87.82H328.09C330.27 75.01 336.25 64.75 346.04 57.02C355.83 49.29 367.9 45.43 382.26 45.43C400.54 45.43 414.89 50.84 425.34 61.66C435.78 72.47 441 87.26 441 106.03V212H410.98V113.65C410.98 100.84 407.71 91.02 401.19 84.17C394.88 77.11 386.29 73.58 375.41 73.58C367.79 73.58 361.05 75.34 355.17 78.88C349.52 82.19 345.06 87.04 341.8 93.45C338.53 99.85 336.9 107.36 336.9 115.97V212H306.55V113.32C306.55 100.51 303.4 90.8 297.09 84.17C290.78 77.33 282.19 73.91 271.31 73.91C263.69 73.91 256.95 75.67 251.08 79.21C245.42 82.52 240.96 87.38 237.7 93.78C234.43 99.96 232.8 107.36 232.8 115.97V212Z' />
+        <path d='M184.83 20.55C184.83 31.9 175.64 41.1 164.29 41.1C152.95 41.1 143.76 31.9 143.76 20.55C143.76 9.2 152.95 0 164.29 0C175.64 0 184.83 9.2 184.83 20.55Z' />
+        <path d='M179.43 212H149.16V49.76C153.76 51.91 158.88 53.12 164.29 53.12C169.7 53.12 174.83 51.91 179.43 49.76V212Z' />
       </g>
     </svg>
   )
diff --git a/apps/sim/app/(landing)/components/og-sim-logo/index.ts b/apps/sim/app/(landing)/components/og-sim-logo/index.ts
new file mode 100644
index 00000000000..1e285835b6b
--- /dev/null
+++ b/apps/sim/app/(landing)/components/og-sim-logo/index.ts
@@ -0,0 +1 @@
+export { SimLogoFull } from './og-sim-logo'
diff --git a/apps/sim/app/(landing)/components/og-sim-logo/og-sim-logo.tsx b/apps/sim/app/(landing)/components/og-sim-logo/og-sim-logo.tsx
new file mode 100644
index 00000000000..21402f8c534
--- /dev/null
+++ b/apps/sim/app/(landing)/components/og-sim-logo/og-sim-logo.tsx
@@ -0,0 +1,21 @@
+/** The full Sim wordmark, rendered as inline SVG for use inside satori OG images. */
+export function SimLogoFull() {
+  return (
+    <svg height='28' viewBox='720 440 1020 320' fill='none'>
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M875.791 577.171C875.791 581.922 873.911 586.483 870.576 589.842L870.098 590.323C866.764 593.692 862.234 595.575 857.517 595.575H750.806C740.978 595.575 733 603.6 733 613.498V728.902C733 738.799 740.978 746.826 750.806 746.826H865.382C875.209 746.826 883.177 738.799 883.177 728.902V620.853C883.177 616.448 884.912 612.222 888.008 609.104C891.093 605.997 895.29 604.249 899.664 604.249H1008.16C1017.99 604.249 1025.96 596.224 1025.96 586.327V470.923C1025.96 461.025 1017.99 453 1008.16 453H893.586C883.759 453 875.791 461.025 875.791 470.923V577.171ZM910.562 477.566H991.178C996.922 477.566 1001.57 482.254 1001.57 488.029V569.22C1001.57 574.995 996.922 579.683 991.178 579.683H910.562C904.828 579.683 900.173 574.995 900.173 569.22V488.029C900.173 482.254 904.828 477.566 910.562 477.566Z'
+        fill='#33C482'
+      />
+      <path
+        d='M1008.3 624.59H923.113C912.786 624.59 904.414 633.022 904.414 643.423V728.171C904.414 738.572 912.786 747.004 923.113 747.004H1008.3C1018.63 747.004 1027 738.572 1027 728.171V643.423C1027 633.022 1018.63 624.59 1008.3 624.59Z'
+        fill='#33C482'
+      />
+      <path
+        d='M1210.54 515.657C1226.65 515.657 1240.59 518.51 1252.31 524.257H1252.31C1264.3 529.995 1273.63 538.014 1280.26 548.319H1280.26C1287.19 558.635 1290.78 570.899 1291.08 585.068L1291.1 586.089H1249.11L1249.09 585.115C1248.8 574.003 1245.18 565.493 1238.32 559.451C1231.45 553.399 1221.79 550.308 1209.21 550.308C1196.3 550.308 1186.48 553.113 1179.61 558.588C1172.76 564.046 1169.33 571.499 1169.33 581.063C1169.33 588.092 1171.88 593.978 1177.01 598.783C1182.17 603.618 1189.99 607.399 1200.56 610.061H1200.56L1238.77 619.451C1257.24 623.65 1271.21 630.571 1280.57 640.293L1281.01 640.739C1290.13 650.171 1294.64 662.97 1294.64 679.016C1294.64 692.923 1290.88 705.205 1283.34 715.822L1283.33 715.834C1275.81 726.134 1265.44 734.14 1252.26 739.866L1252.25 739.871C1239.36 745.302 1224.12 748 1206.54 748C1180.9 748 1160.36 741.696 1145.02 728.984C1129.67 716.258 1122 699.269 1122 678.121V677.121H1163.99V678.121C1163.99 688.869 1167.87 697.367 1175.61 703.722L1176.34 704.284C1184.04 709.997 1194.37 712.902 1207.43 712.902C1222.13 712.902 1233.3 710.087 1241.07 704.588C1248.8 698.812 1252.64 691.21 1252.64 681.699C1252.64 674.769 1250.5 669.057 1246.25 664.49L1246.23 664.478L1246.22 664.464C1242.28 659.929 1234.83 656.119 1223.64 653.152L1185.43 644.208L1185.42 644.204C1166.05 639.407 1151.49 632.035 1141.83 622.012L1141.83 622.006L1141.82 622C1132.43 611.94 1127.78 598.707 1127.78 582.405C1127.78 568.81 1131.23 556.976 1138.17 546.949L1138.18 546.941L1138.19 546.933C1145.41 536.936 1155.18 529.225 1167.48 523.793L1167.48 523.79C1180.07 518.36 1194.43 515.657 1210.54 515.657ZM1323.39 521.979C1331.68 525.008 1337.55 526.482 1343.51 526.482C1349.48 526.482 1355.64 525.005 1364.49 521.973L1365.82 521.52V742.633H1322.05V521.489L1323.39 521.979ZM1642.01 515.657C1667.11 515.657 1686.94 523.031 1701.39 537.876C1715.83 552.716 1723 572.968 1723 598.507V742.633H1680.12V608.794C1680.12 591.666 1675.72 578.681 1667.07 569.681L1667.06 569.669L1667.04 569.656C1658.67 560.359 1647.26 555.675 1632.68 555.675C1622.47 555.675 1613.47 558.022 1605.64 562.69L1605.63 562.696C1598.11 567.064 1592.17 573.475 1587.8 581.968C1583.44 590.448 1581.25 600.424 1581.25 611.925V742.633H1537.92V608.347C1537.92 591.208 1533.67 578.376 1525.31 569.68L1525.31 569.674L1525.3 569.668C1516.93 560.664 1505.52 556.122 1490.93 556.122C1480.72 556.122 1471.72 558.469 1463.89 563.138L1463.88 563.144C1456.36 567.511 1450.41 573.922 1446.05 582.415L1446.05 582.422L1446.04 582.428C1441.69 590.602 1439.5 600.423 1439.5 611.925V742.633H1395.72V521.919H1435.05V554.803C1439.92 544.379 1447.91 535.465 1458.37 528.356C1470.71 519.875 1485.58 515.657 1502.93 515.657C1522.37 515.657 1538.61 520.931 1551.55 531.538C1560.38 538.771 1567.1 547.628 1571.72 558.091C1576.05 547.619 1582.83 538.757 1592.07 531.524C1605.61 520.93 1622.28 515.657 1642.01 515.657ZM1343.49 452C1351.45 452 1358.23 454.786 1363.75 460.346C1369.27 465.905 1372.04 472.721 1372.04 480.73C1372.04 488.452 1369.27 495.254 1363.77 501.096L1363.76 501.105L1363.75 501.115C1358.23 506.675 1351.45 509.461 1343.49 509.461C1335.81 509.461 1329.05 506.669 1323.25 501.134L1323.23 501.115L1323.21 501.096C1317.71 495.254 1314.94 488.452 1314.94 480.73C1314.94 472.721 1317.7 465.905 1323.23 460.346L1323.24 460.337L1323.25 460.327C1329.05 454.792 1335.81 452 1343.49 452Z'
+        fill='#fafafa'
+      />
+    </svg>
+  )
+}
diff --git a/apps/sim/app/(landing)/components/platform-page/components/platform-card-row/platform-card-row.tsx b/apps/sim/app/(landing)/components/platform-page/components/platform-card-row/platform-card-row.tsx
index 804a8adf33b..373a19f6780 100644
--- a/apps/sim/app/(landing)/components/platform-page/components/platform-card-row/platform-card-row.tsx
+++ b/apps/sim/app/(landing)/components/platform-page/components/platform-card-row/platform-card-row.tsx
@@ -61,7 +61,7 @@ export function PlatformCardRow({ row }: PlatformCardRowProps) {
       >
         {row.cards.map((card, index) => (
           <PlatformCard
-            key={`${row.id}-${index}`}
+            key={`${row.id}-${card.title}`}
             card={card}
             headingId={`platform-row-${row.id}-card-${index}-heading`}
           />
diff --git a/apps/sim/app/(landing)/components/platform-page/components/platform-structured-data/platform-structured-data.tsx b/apps/sim/app/(landing)/components/platform-page/components/platform-structured-data/platform-structured-data.tsx
index 40d79a487ac..c74139762c2 100644
--- a/apps/sim/app/(landing)/components/platform-page/components/platform-structured-data/platform-structured-data.tsx
+++ b/apps/sim/app/(landing)/components/platform-page/components/platform-structured-data/platform-structured-data.tsx
@@ -1,4 +1,5 @@
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import type { PlatformPageConfig } from '@/app/(landing)/components/platform-page/types'
 
 /**
@@ -63,10 +64,5 @@ export function PlatformStructuredData({ config }: PlatformStructuredDataProps)
     ],
   }
 
-  return (
-    <script
-      type='application/ld+json'
-      dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-    />
-  )
+  return <JsonLd data={jsonLd} />
 }
diff --git a/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/components/legal-block/legal-block.tsx b/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/components/legal-block/legal-block.tsx
index 7a9dcf2f139..8cbee9c18ad 100644
--- a/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/components/legal-block/legal-block.tsx
+++ b/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/components/legal-block/legal-block.tsx
@@ -23,11 +23,14 @@ export function LegalBlockView({ block }: LegalBlockViewProps) {
     case 'list':
       return (
         <ul className={cn('list-disc', PROSE_SPACING.listIndent, PROSE_SPACING.listStack)}>
-          {block.items.map((item, index) => (
-            <li key={index} className={PROSE_TYPE.list}>
-              {item}
-            </li>
-          ))}
+          {block.items.map((item, index) => {
+            const itemKey = `item-${index}`
+            return (
+              <li key={itemKey} className={PROSE_TYPE.list}>
+                {item}
+              </li>
+            )
+          })}
         </ul>
       )
     case 'callout':
diff --git a/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/legal-block-group.tsx b/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/legal-block-group.tsx
index 10e8379c160..bc4d16e7e1a 100644
--- a/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/legal-block-group.tsx
+++ b/apps/sim/app/(landing)/components/prose-page/components/legal-block-group/legal-block-group.tsx
@@ -19,7 +19,7 @@ export function LegalBlockGroup({ blocks }: LegalBlockGroupProps) {
   return (
     <div className={cn('flex flex-col', PROSE_SPACING.blockStack)}>
       {blocks.map((block, index) => (
-        <LegalBlockView key={index} block={block} />
+        <LegalBlockView key={`${block.kind}-${index}`} block={block} />
       ))}
     </div>
   )
diff --git a/apps/sim/app/(landing)/components/site-structured-data/site-structured-data.tsx b/apps/sim/app/(landing)/components/site-structured-data/site-structured-data.tsx
index 1859149df6b..1ef9c5a1a6f 100644
--- a/apps/sim/app/(landing)/components/site-structured-data/site-structured-data.tsx
+++ b/apps/sim/app/(landing)/components/site-structured-data/site-structured-data.tsx
@@ -1,4 +1,51 @@
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
+
+const SITE_JSON_LD = {
+  '@context': 'https://schema.org',
+  '@graph': [
+    {
+      '@type': 'Organization',
+      '@id': `${SITE_URL}#organization`,
+      name: 'Sim',
+      alternateName: 'Sim Studio',
+      description:
+        'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work.',
+      url: SITE_URL,
+      logo: {
+        '@type': 'ImageObject',
+        '@id': `${SITE_URL}#logo`,
+        url: `${SITE_URL}/logo/b%26w/text/b%26w.svg`,
+        contentUrl: `${SITE_URL}/logo/b%26w/text/b%26w.svg`,
+        width: 49.78314,
+        height: 24.276,
+        caption: 'Sim Logo',
+      },
+      image: { '@id': `${SITE_URL}#logo` },
+      sameAs: [
+        'https://x.com/simdotai',
+        'https://github.com/simstudioai/sim',
+        'https://www.linkedin.com/company/simstudioai/',
+        'https://discord.gg/Hr4UWYEcTT',
+      ],
+      contactPoint: {
+        '@type': 'ContactPoint',
+        contactType: 'customer support',
+        availableLanguage: ['en'],
+      },
+    },
+    {
+      '@type': 'WebSite',
+      '@id': `${SITE_URL}#website`,
+      url: SITE_URL,
+      name: 'Sim, The AI Workspace | Build, Deploy & Manage AI Agents',
+      description:
+        'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM. Join 100,000+ builders.',
+      publisher: { '@id': `${SITE_URL}#organization` },
+      inLanguage: 'en-US',
+    },
+  ],
+}
 
 /**
  * Site-wide JSON-LD - the `Organization` and `WebSite` entities that are true on
@@ -15,56 +62,5 @@ import { SITE_URL } from '@/lib/core/utils/urls'
  * Maintenance: `sameAs` must match the Footer social links.
  */
 export function SiteStructuredData() {
-  const graph = {
-    '@context': 'https://schema.org',
-    '@graph': [
-      {
-        '@type': 'Organization',
-        '@id': `${SITE_URL}#organization`,
-        name: 'Sim',
-        alternateName: 'Sim Studio',
-        description:
-          'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM to create agents that automate real work.',
-        url: SITE_URL,
-        logo: {
-          '@type': 'ImageObject',
-          '@id': `${SITE_URL}#logo`,
-          url: `${SITE_URL}/logo/b%26w/text/b%26w.svg`,
-          contentUrl: `${SITE_URL}/logo/b%26w/text/b%26w.svg`,
-          width: 49.78314,
-          height: 24.276,
-          caption: 'Sim Logo',
-        },
-        image: { '@id': `${SITE_URL}#logo` },
-        sameAs: [
-          'https://x.com/simdotai',
-          'https://github.com/simstudioai/sim',
-          'https://www.linkedin.com/company/simstudioai/',
-          'https://discord.gg/Hr4UWYEcTT',
-        ],
-        contactPoint: {
-          '@type': 'ContactPoint',
-          contactType: 'customer support',
-          availableLanguage: ['en'],
-        },
-      },
-      {
-        '@type': 'WebSite',
-        '@id': `${SITE_URL}#website`,
-        url: SITE_URL,
-        name: 'Sim, The AI Workspace | Build, Deploy & Manage AI Agents',
-        description:
-          'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Connect 1,000+ integrations and every major LLM. Join 100,000+ builders.',
-        publisher: { '@id': `${SITE_URL}#organization` },
-        inLanguage: 'en-US',
-      },
-    ],
-  }
-
-  return (
-    <script
-      type='application/ld+json'
-      dangerouslySetInnerHTML={{ __html: JSON.stringify(graph) }}
-    />
-  )
+  return <JsonLd data={SITE_JSON_LD} />
 }
diff --git a/apps/sim/app/(landing)/components/solutions-page/components/solutions-card-row/solutions-card-row.tsx b/apps/sim/app/(landing)/components/solutions-page/components/solutions-card-row/solutions-card-row.tsx
index 0fb90647049..33b4b616b14 100644
--- a/apps/sim/app/(landing)/components/solutions-page/components/solutions-card-row/solutions-card-row.tsx
+++ b/apps/sim/app/(landing)/components/solutions-page/components/solutions-card-row/solutions-card-row.tsx
@@ -61,7 +61,7 @@ export function SolutionsCardRow({ row }: SolutionsCardRowProps) {
       >
         {row.cards.map((card, index) => (
           <SolutionsCard
-            key={`${row.id}-${index}`}
+            key={`${row.id}-${card.title}`}
             card={card}
             headingId={`solutions-row-${row.id}-card-${index}-heading`}
           />
diff --git a/apps/sim/app/(landing)/components/solutions-page/components/solutions-structured-data/solutions-structured-data.tsx b/apps/sim/app/(landing)/components/solutions-page/components/solutions-structured-data/solutions-structured-data.tsx
index 0c22cba6a0e..fb314970350 100644
--- a/apps/sim/app/(landing)/components/solutions-page/components/solutions-structured-data/solutions-structured-data.tsx
+++ b/apps/sim/app/(landing)/components/solutions-page/components/solutions-structured-data/solutions-structured-data.tsx
@@ -1,4 +1,5 @@
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import type { SolutionsPageConfig } from '@/app/(landing)/components/solutions-page/types'
 
 /**
@@ -63,10 +64,5 @@ export function SolutionsStructuredData({ config }: SolutionsStructuredDataProps
     ],
   }
 
-  return (
-    <script
-      type='application/ld+json'
-      dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-    />
-  )
+  return <JsonLd data={jsonLd} />
 }
diff --git a/apps/sim/app/(landing)/components/thinking-loader/thinking-loader.tsx b/apps/sim/app/(landing)/components/thinking-loader/thinking-loader.tsx
index 8ab750928fc..8db25b29402 100644
--- a/apps/sim/app/(landing)/components/thinking-loader/thinking-loader.tsx
+++ b/apps/sim/app/(landing)/components/thinking-loader/thinking-loader.tsx
@@ -423,8 +423,7 @@ export function ThinkingLoader({
   if (!displayLabel) return loader
 
   return (
-    <span
-      role='status'
+    <output
       className={cn(styles.labelRow, className)}
       style={
         {
@@ -444,6 +443,6 @@ export function ThinkingLoader({
           <span className={shimmer ? styles.label : styles.labelStatic}>{shownLabel}</span>
         </span>
       </span>
-    </span>
+    </output>
   )
 }
diff --git a/apps/sim/app/(landing)/contact/components/contact-form/contact-form.tsx b/apps/sim/app/(landing)/contact/components/contact-form/contact-form.tsx
index 70a2c3a9e5c..8a18a8094c9 100644
--- a/apps/sim/app/(landing)/contact/components/contact-form/contact-form.tsx
+++ b/apps/sim/app/(landing)/contact/components/contact-form/contact-form.tsx
@@ -108,7 +108,7 @@ export function ContactForm() {
   const [errors, setErrors] = useState<ContactErrors>({})
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [website, setWebsite] = useState('')
-  const [widgetLoaded, setWidgetLoaded] = useState(false)
+  const widgetLoadedRef = useRef(false)
 
   function updateField<TField extends keyof ContactFormState>(
     field: TField,
@@ -147,7 +147,7 @@ export function ContactForm() {
     let captchaToken: string | undefined
     const widget = turnstileRef.current
 
-    if (TURNSTILE_SITE_KEY && widgetLoaded && widget) {
+    if (TURNSTILE_SITE_KEY && widgetLoadedRef.current && widget) {
       try {
         widget.reset()
         widget.execute()
@@ -313,9 +313,15 @@ export function ContactForm() {
             ref={turnstileRef}
             siteKey={TURNSTILE_SITE_KEY}
             options={{ execution: 'execute', appearance: 'execute', size: 'invisible' }}
-            onWidgetLoad={() => setWidgetLoaded(true)}
-            onError={() => setWidgetLoaded(false)}
-            onUnsupported={() => setWidgetLoaded(false)}
+            onWidgetLoad={() => {
+              widgetLoadedRef.current = true
+            }}
+            onError={() => {
+              widgetLoadedRef.current = false
+            }}
+            onUnsupported={() => {
+              widgetLoadedRef.current = false
+            }}
           />
         ) : null}
 
diff --git a/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/integration-cta-button.tsx b/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/integration-cta-button.tsx
index eec6d78483c..73346db078f 100644
--- a/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/integration-cta-button.tsx
+++ b/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/integration-cta-button.tsx
@@ -2,7 +2,7 @@
 
 import { Chip } from '@sim/emcn'
 import { AuthModal } from '@/app/(landing)/components/auth-modal/auth-modal'
-import { trackLandingCta } from '@/app/(landing)/landing-analytics'
+import { trackLandingCta } from '@/app/(landing)/track-landing-cta'
 
 interface IntegrationCtaButtonProps {
   children: React.ReactNode
diff --git a/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/template-card-button.tsx b/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/template-card-button.tsx
index ee562d80d4b..3771aa062b5 100644
--- a/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/template-card-button.tsx
+++ b/apps/sim/app/(landing)/integrations/(shell)/[slug]/components/template-card-button.tsx
@@ -3,7 +3,7 @@
 import { cn } from '@sim/emcn'
 import { useRouter } from 'next/navigation'
 import { LandingPromptStorage } from '@/lib/core/utils/browser-storage'
-import { trackLandingCta } from '@/app/(landing)/landing-analytics'
+import { trackLandingCta } from '@/app/(landing)/track-landing-cta'
 
 interface TemplateCardButtonProps {
   /**
diff --git a/apps/sim/app/(landing)/integrations/(shell)/[slug]/page.tsx b/apps/sim/app/(landing)/integrations/(shell)/[slug]/page.tsx
index 996a8c0cd8e..ee1438e4c25 100644
--- a/apps/sim/app/(landing)/integrations/(shell)/[slug]/page.tsx
+++ b/apps/sim/app/(landing)/integrations/(shell)/[slug]/page.tsx
@@ -15,6 +15,7 @@ import {
   type Integration,
 } from '@/lib/integrations'
 import { BackLink } from '@/app/(landing)/components'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import { LandingFAQ } from '@/app/(landing)/components/landing-faq'
 import { IntegrationCtaButton } from '@/app/(landing)/integrations/(shell)/[slug]/components/integration-cta-button'
 import { TemplateCardButton } from '@/app/(landing)/integrations/(shell)/[slug]/components/template-card-button'
@@ -62,8 +63,8 @@ function getRelatedSlugs(
   )
 
   return allIntegrations
-    .filter((i) => i.slug !== slug)
-    .map((i) => {
+    .reduce<Array<{ slug: string; score: number }>>((scored, i) => {
+      if (i.slug === slug) return scored
       const sharedNames = i.operations.filter((o) =>
         currentOpNames.has(o.name.toLowerCase())
       ).length
@@ -75,8 +76,12 @@ function getRelatedSlugs(
       ).length
       const sameCategory = i.integrationType === integrationType ? 2 : 0
       const sameAuth = i.authType === authType ? 1 : 0
-      return { slug: i.slug, score: sharedNames * 3 + sharedWords * 2 + sameCategory + sameAuth }
-    })
+      scored.push({
+        slug: i.slug,
+        score: sharedNames * 3 + sharedWords * 2 + sameCategory + sameAuth,
+      })
+      return scored
+    }, [])
     .sort((a, b) => b.score - a.score || a.slug.localeCompare(b.slug))
     .slice(0, limit)
     .map(({ slug: s }) => s)
@@ -124,7 +129,7 @@ function escapeRegex(value: string): string {
  * names.
  */
 function mentionifyPromptForNames(prompt: string, names: readonly string[]): string {
-  const unique = [...new Set(names.filter((n) => n.trim().length >= 2))].sort(
+  const unique = Array.from(new Set(names.filter((n) => n.trim().length >= 2))).toSorted(
     (a, b) => b.length - a.length
   )
   if (unique.length === 0) return prompt
@@ -140,6 +145,48 @@ function lowercaseFirst(value: string): string {
   return value.charAt(0).toLowerCase() + value.slice(1)
 }
 
+/**
+ * The ordered integration-icon chain for a template card - one tile per block
+ * type in flow order, separated by arrows. Resolves each type through its
+ * versioned aliases so v2/v3 blocks reuse the base icon and name.
+ */
+function TemplateIconRow({ allTypes }: { allTypes: string[] }) {
+  return (
+    <>
+      {allTypes.map((bt, idx) => {
+        const resolvedBt = byType.get(bt)
+          ? bt
+          : byType.get(`${bt}_v2`)
+            ? `${bt}_v2`
+            : byType.get(`${bt}_v3`)
+              ? `${bt}_v3`
+              : bt
+        const int = byType.get(resolvedBt)
+        const ToolIcon = blockTypeToIconMap[resolvedBt]
+        return (
+          <span key={bt} className='inline-flex items-center gap-1.5'>
+            {idx > 0 && (
+              <span className='text-[11px] text-[var(--text-subtle)]' aria-hidden='true'>
+                →
+              </span>
+            )}
+            <IntegrationIcon
+              bgColor={int?.bgColor ?? 'var(--surface-active)'}
+              name={int?.name ?? bt}
+              Icon={ToolIcon}
+              as='span'
+              className='size-6 rounded-[4px]'
+              iconClassName='size-3.5'
+              fallbackClassName='text-[10px]'
+              aria-hidden='true'
+            />
+          </span>
+        )
+      })}
+    </>
+  )
+}
+
 /** Joins items into readable prose: "a", "a and b", or "a, b, and c". */
 function toProseList(items: string[]): string {
   if (items.length <= 1) return items[0] ?? ''
@@ -377,18 +424,9 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
 
   return (
     <section className='bg-[var(--bg)]'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(softwareAppJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(faqJsonLd) }}
-      />
+      <JsonLd data={breadcrumbJsonLd} />
+      <JsonLd data={softwareAppJsonLd} />
+      <JsonLd data={faqJsonLd} />
 
       {/* Hero */}
       <div className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
@@ -721,38 +759,6 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
                     .filter((n): n is string => n !== null)
                 )
 
-              const renderIcons = (allTypes: string[]) =>
-                allTypes.map((bt, idx) => {
-                  const resolvedBt = byType.get(bt)
-                    ? bt
-                    : byType.get(`${bt}_v2`)
-                      ? `${bt}_v2`
-                      : byType.get(`${bt}_v3`)
-                        ? `${bt}_v3`
-                        : bt
-                  const int = byType.get(resolvedBt)
-                  const ToolIcon = blockTypeToIconMap[resolvedBt]
-                  return (
-                    <span key={bt} className='inline-flex items-center gap-1.5'>
-                      {idx > 0 && (
-                        <span className='text-[11px] text-[var(--text-subtle)]' aria-hidden='true'>
-                          →
-                        </span>
-                      )}
-                      <IntegrationIcon
-                        bgColor={int?.bgColor ?? 'var(--surface-active)'}
-                        name={int?.name ?? bt}
-                        Icon={ToolIcon}
-                        as='span'
-                        className='size-6 rounded-[4px]'
-                        iconClassName='size-3.5'
-                        fallbackClassName='text-[10px]'
-                        aria-hidden='true'
-                      />
-                    </span>
-                  )
-                })
-
               return (
                 <>
                   {/* Paired rows of 2 */}
@@ -771,7 +777,7 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
                               className='group flex flex-1 flex-col gap-4 border-[var(--border)] border-t p-6 transition-colors first:border-t-0 hover:bg-[var(--surface-hover)] sm:border-t-0 sm:border-l sm:first:border-l-0'
                             >
                               <div className='flex items-center gap-1.5'>
-                                {renderIcons(resolveTypes(template))}
+                                <TemplateIconRow allTypes={resolveTypes(template)} />
                               </div>
                               <div className='flex flex-col gap-2'>
                                 <h3 className='text-[14px] text-[var(--text-primary)] leading-snug tracking-[-0.02em]'>
@@ -797,7 +803,7 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
                         className='group/link flex items-center gap-4 px-6 py-4 transition-colors hover:bg-[var(--surface-hover)]'
                       >
                         <div className='flex items-center gap-1.5'>
-                          {renderIcons(resolveTypes(lastTemplate))}
+                          <TemplateIconRow allTypes={resolveTypes(lastTemplate)} />
                         </div>
                         <div className='flex min-w-0 flex-1 flex-col gap-0.5'>
                           <h3 className='text-[14px] text-[var(--text-primary)] leading-snug tracking-[-0.02em]'>
diff --git a/apps/sim/app/(landing)/integrations/(shell)/page.tsx b/apps/sim/app/(landing)/integrations/(shell)/page.tsx
index b116122d52a..d8b787f174e 100644
--- a/apps/sim/app/(landing)/integrations/(shell)/page.tsx
+++ b/apps/sim/app/(landing)/integrations/(shell)/page.tsx
@@ -8,6 +8,7 @@ import {
   type Integration,
   POPULAR_WORKFLOWS,
 } from '@/lib/integrations'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import { LandingFAQ } from '@/app/(landing)/components/landing-faq'
 import { IntegrationCard } from '@/app/(landing)/integrations/components/integration-card'
 import { IntegrationGrid } from '@/app/(landing)/integrations/components/integration-grid'
@@ -55,6 +56,20 @@ const TOP_NAMES = [...new Set(POPULAR_WORKFLOWS.flatMap((p) => [p.from, p.to]))]
 
 const baseUrl = SITE_URL
 
+const INTEGRATIONS_BREADCRUMB_JSON_LD = {
+  '@context': 'https://schema.org',
+  '@type': 'BreadcrumbList',
+  itemListElement: [
+    { '@type': 'ListItem', position: 1, name: 'Home', item: baseUrl },
+    {
+      '@type': 'ListItem',
+      position: 2,
+      name: 'Integrations',
+      item: `${baseUrl}/integrations`,
+    },
+  ],
+}
+
 /** Curated featured integrations - high-recognition services shown as cards. */
 const FEATURED_SLUGS = ['slack', 'notion', 'github', 'gmail'] as const
 
@@ -96,20 +111,6 @@ export default async function IntegrationsPage({
 }) {
   await integrationsSearchParamsCache.parse(searchParams)
 
-  const breadcrumbJsonLd = {
-    '@context': 'https://schema.org',
-    '@type': 'BreadcrumbList',
-    itemListElement: [
-      { '@type': 'ListItem', position: 1, name: 'Home', item: baseUrl },
-      {
-        '@type': 'ListItem',
-        position: 2,
-        name: 'Integrations',
-        item: `${baseUrl}/integrations`,
-      },
-    ],
-  }
-
   const itemListJsonLd = {
     '@context': 'https://schema.org',
     '@type': 'ItemList',
@@ -143,18 +144,9 @@ export default async function IntegrationsPage({
 
   return (
     <section className='bg-[var(--bg)]'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(itemListJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(faqJsonLd) }}
-      />
+      <JsonLd data={INTEGRATIONS_BREADCRUMB_JSON_LD} />
+      <JsonLd data={itemListJsonLd} />
+      <JsonLd data={faqJsonLd} />
 
       {/* Hero */}
       <div className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
diff --git a/apps/sim/app/(landing)/landing-analytics.tsx b/apps/sim/app/(landing)/landing-analytics.tsx
index 5a747b1306e..cdbb59e853e 100644
--- a/apps/sim/app/(landing)/landing-analytics.tsx
+++ b/apps/sim/app/(landing)/landing-analytics.tsx
@@ -2,7 +2,6 @@
 
 import { useEffect } from 'react'
 import { captureClientEvent } from '@/lib/posthog/client'
-import type { PostHogEventMap } from '@/lib/posthog/events'
 
 export function LandingAnalytics() {
   useEffect(() => {
@@ -11,11 +10,3 @@ export function LandingAnalytics() {
 
   return null
 }
-
-/**
- * Fire-and-forget tracker for landing page CTA clicks.
- * Uses the non-hook client so it works in any click handler without requiring a PostHog provider ref.
- */
-export function trackLandingCta(props: PostHogEventMap['landing_cta_clicked']): void {
-  captureClientEvent('landing_cta_clicked', props)
-}
diff --git a/apps/sim/app/(landing)/models/(shell)/[provider]/[model]/page.tsx b/apps/sim/app/(landing)/models/(shell)/[provider]/[model]/page.tsx
index 73bf5156aa1..4a2596b5148 100644
--- a/apps/sim/app/(landing)/models/(shell)/[provider]/[model]/page.tsx
+++ b/apps/sim/app/(landing)/models/(shell)/[provider]/[model]/page.tsx
@@ -3,6 +3,7 @@ import type { Metadata } from 'next'
 import { notFound } from 'next/navigation'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import { BackLink } from '@/app/(landing)/components'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import { LandingFAQ } from '@/app/(landing)/components/landing-faq'
 import { FeaturedModelCard, ProviderIcon } from '@/app/(landing)/models/components/model-primitives'
 import {
@@ -139,18 +140,9 @@ export default async function ModelPage({
 
   return (
     <>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(productJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(faqJsonLd) }}
-      />
+      <JsonLd data={breadcrumbJsonLd} />
+      <JsonLd data={productJsonLd} />
+      <JsonLd data={faqJsonLd} />
 
       <section className='bg-[var(--bg)]'>
         <div className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
diff --git a/apps/sim/app/(landing)/models/(shell)/[provider]/page.tsx b/apps/sim/app/(landing)/models/(shell)/[provider]/page.tsx
index 870b7158af8..a4b24f22c27 100644
--- a/apps/sim/app/(landing)/models/(shell)/[provider]/page.tsx
+++ b/apps/sim/app/(landing)/models/(shell)/[provider]/page.tsx
@@ -3,6 +3,7 @@ import Link from 'next/link'
 import { notFound } from 'next/navigation'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import { BackLink, ChevronArrow } from '@/app/(landing)/components'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import { LandingFAQ } from '@/app/(landing)/components/landing-faq'
 import {
   FeaturedModelCard,
@@ -130,18 +131,9 @@ export default async function ProviderModelsPage({
 
   return (
     <>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(itemListJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(faqJsonLd) }}
-      />
+      <JsonLd data={breadcrumbJsonLd} />
+      <JsonLd data={itemListJsonLd} />
+      <JsonLd data={faqJsonLd} />
 
       <section className='bg-[var(--bg)]'>
         <div className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
diff --git a/apps/sim/app/(landing)/models/(shell)/page.tsx b/apps/sim/app/(landing)/models/(shell)/page.tsx
index 5346baa94d7..a933ff3f5f9 100644
--- a/apps/sim/app/(landing)/models/(shell)/page.tsx
+++ b/apps/sim/app/(landing)/models/(shell)/page.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from 'next'
 import type { SearchParams } from 'nuqs/server'
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import { LandingFAQ } from '@/app/(landing)/components/landing-faq'
 import { ModelComparisonCharts } from '@/app/(landing)/models/components/model-comparison-charts'
 import { ModelDirectory } from '@/app/(landing)/models/components/model-directory'
@@ -20,6 +21,17 @@ import {
 
 const baseUrl = SITE_URL
 
+const FEATURED_PROVIDER_ORDER = ['anthropic', 'openai', 'google']
+
+const MODELS_BREADCRUMB_JSON_LD = {
+  '@context': 'https://schema.org',
+  '@type': 'BreadcrumbList',
+  itemListElement: [
+    { '@type': 'ListItem', position: 1, name: 'Home', item: baseUrl },
+    { '@type': 'ListItem', position: 2, name: 'Models', item: `${baseUrl}/models` },
+  ],
+}
+
 const faqItems = [
   {
     question: 'Which AI models are best for building agents and automated workflows?',
@@ -92,25 +104,15 @@ export default async function ModelsPage({
   const flatModels = MODEL_PROVIDERS_WITH_CATALOGS.flatMap((provider) =>
     provider.models.map((model) => ({ provider, model }))
   )
-  const featuredProviderOrder = ['anthropic', 'openai', 'google']
-  const featuredProviders = featuredProviderOrder
-    .map((id) => MODEL_PROVIDERS_WITH_CATALOGS.find((p) => p.id === id))
-    .filter((p): p is (typeof MODEL_PROVIDERS_WITH_CATALOGS)[number] => p !== undefined)
+  const featuredProviders = FEATURED_PROVIDER_ORDER.map((id) =>
+    MODEL_PROVIDERS_WITH_CATALOGS.find((p) => p.id === id)
+  ).filter((p): p is (typeof MODEL_PROVIDERS_WITH_CATALOGS)[number] => p !== undefined)
   const featuredModels = featuredProviders
     .map((provider) =>
       provider.featuredModels[0] ? { provider, model: provider.featuredModels[0] } : null
     )
     .filter((entry): entry is NonNullable<typeof entry> => entry !== null)
 
-  const breadcrumbJsonLd = {
-    '@context': 'https://schema.org',
-    '@type': 'BreadcrumbList',
-    itemListElement: [
-      { '@type': 'ListItem', position: 1, name: 'Home', item: baseUrl },
-      { '@type': 'ListItem', position: 2, name: 'Models', item: `${baseUrl}/models` },
-    ],
-  }
-
   const itemListJsonLd = {
     '@context': 'https://schema.org',
     '@type': 'ItemList',
@@ -156,18 +158,9 @@ export default async function ModelsPage({
 
   return (
     <>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(itemListJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(faqJsonLd) }}
-      />
+      <JsonLd data={MODELS_BREADCRUMB_JSON_LD} />
+      <JsonLd data={itemListJsonLd} />
+      <JsonLd data={faqJsonLd} />
 
       <section className='bg-[var(--bg)]'>
         <div className='mx-auto w-full max-w-[1446px] px-12 pt-[112px] max-sm:px-5 max-sm:pt-20 max-lg:px-8'>
diff --git a/apps/sim/app/(landing)/models/components/constants.ts b/apps/sim/app/(landing)/models/components/constants.ts
index 54f6cd1bf06..e7e210cd56a 100644
--- a/apps/sim/app/(landing)/models/components/constants.ts
+++ b/apps/sim/app/(landing)/models/components/constants.ts
@@ -42,10 +42,9 @@ function clampToReadable(hex: string): string {
 }
 
 const colorMap = new Map(
-  MODEL_CATALOG_PROVIDERS.filter((p) => p.color).map((p) => [
-    p.id,
-    clampToReadable(p.color as string),
-  ])
+  MODEL_CATALOG_PROVIDERS.flatMap(
+    (p): Array<[string, string]> => (p.color ? [[p.id, clampToReadable(p.color)]] : [])
+  )
 )
 
 /** Provider brand color, darkened when too light to read on the light background. */
diff --git a/apps/sim/app/(landing)/models/components/model-comparison-charts.tsx b/apps/sim/app/(landing)/models/components/model-comparison-charts.tsx
index 4a675c61c2f..b2e7d4d519a 100644
--- a/apps/sim/app/(landing)/models/components/model-comparison-charts.tsx
+++ b/apps/sim/app/(landing)/models/components/model-comparison-charts.tsx
@@ -10,7 +10,7 @@ import {
 
 /** Providers that host other providers' models - deprioritized to avoid duplicates. */
 const RESELLER_PROVIDERS = new Set(
-  MODEL_CATALOG_PROVIDERS.filter((p) => p.isReseller).map((p) => p.id)
+  MODEL_CATALOG_PROVIDERS.flatMap((p) => (p.isReseller ? [p.id] : []))
 )
 
 const PROVIDER_ICON_MAP: Record<string, ComponentType<{ className?: string }>> = (() => {
@@ -27,7 +27,7 @@ function selectComparisonModels(models: CatalogModel[]): CatalogModel[] {
   const seen = new Set<string>()
   const result: CatalogModel[] = []
 
-  const sorted = [...models].sort((a, b) => {
+  const sorted = models.toSorted((a, b) => {
     const score = (m: CatalogModel) => {
       const reseller = RESELLER_PROVIDERS.has(m.providerId) ? -50 : 0
       const reasoning = m.capabilities.reasoningEffort || m.capabilities.thinking ? 10 : 0
@@ -71,13 +71,16 @@ interface ChartProps {
 
 function StackedCostChart({ models }: ChartProps) {
   const entries = models
-    .map((model) => ({
-      model,
-      input: model.pricing.input,
-      output: model.pricing.output,
-      total: model.pricing.input + model.pricing.output,
-    }))
-    .filter((e) => e.total > 0)
+    .reduce<Array<{ model: CatalogModel; input: number; output: number; total: number }>>(
+      (acc, model) => {
+        const total = model.pricing.input + model.pricing.output
+        if (total > 0) {
+          acc.push({ model, input: model.pricing.input, output: model.pricing.output, total })
+        }
+        return acc
+      },
+      []
+    )
     .sort((a, b) => a.total - b.total)
 
   const maxTotal = entries.length > 0 ? Math.max(...entries.map((e) => e.total)) : 0
diff --git a/apps/sim/app/(landing)/models/components/model-primitives.tsx b/apps/sim/app/(landing)/models/components/model-primitives.tsx
deleted file mode 100644
index 9e496540d23..00000000000
--- a/apps/sim/app/(landing)/models/components/model-primitives.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { cn } from '@sim/emcn'
-import Link from 'next/link'
-import type { CatalogModel, CatalogProvider } from '@/app/(landing)/models/utils'
-
-export function ProviderIcon({
-  provider,
-  className = 'size-12 rounded-xl',
-  iconClassName = 'size-6',
-}: {
-  provider: Pick<CatalogProvider, 'icon' | 'name'>
-  className?: string
-  iconClassName?: string
-}) {
-  const Icon = provider.icon
-
-  return (
-    <span
-      className={cn(
-        'flex items-center justify-center border border-[var(--border-1)] bg-[var(--bg)]',
-        className
-      )}
-    >
-      {Icon ? (
-        <Icon className={iconClassName} />
-      ) : (
-        <span className='text-[14px] text-[var(--text-primary)]'>
-          {provider.name.slice(0, 2).toUpperCase()}
-        </span>
-      )}
-    </span>
-  )
-}
-
-export function FeaturedProviderCard({ provider }: { provider: CatalogProvider }) {
-  return (
-    <Link
-      href={provider.href}
-      className='group flex flex-1 flex-col gap-4 border-[var(--border)] border-t p-6 transition-colors first:border-t-0 hover:bg-[var(--surface-hover)] sm:border-t-0 sm:border-l sm:first:border-l-0'
-    >
-      <ProviderIcon provider={provider} className='size-10 rounded-xl' iconClassName='size-5' />
-      <div className='flex flex-col gap-2'>
-        <h3 className='text-[var(--text-primary)] text-lg leading-tight tracking-[-0.01em]'>
-          {provider.name}
-        </h3>
-        <p className='line-clamp-2 text-[var(--text-muted)] text-sm leading-[150%]'>
-          {provider.description}
-        </p>
-      </div>
-    </Link>
-  )
-}
-
-export function FeaturedModelCard({
-  provider,
-  model,
-}: {
-  provider: CatalogProvider
-  model: CatalogModel
-}) {
-  return (
-    <Link
-      href={model.href}
-      className='group flex flex-1 flex-col gap-4 border-[var(--border)] border-t p-6 transition-colors first:border-t-0 hover:bg-[var(--surface-hover)] sm:border-t-0 sm:border-l sm:first:border-l-0'
-    >
-      <ProviderIcon provider={provider} className='size-10 rounded-xl' iconClassName='size-5' />
-      <div className='flex flex-col gap-2'>
-        <span className='text-[var(--text-muted)] text-xs uppercase tracking-[0.1em]'>
-          {provider.name}
-        </span>
-        <h3 className='text-[var(--text-primary)] text-lg leading-tight tracking-[-0.01em]'>
-          {model.displayName}
-        </h3>
-        <p className='line-clamp-2 text-[var(--text-muted)] text-sm leading-[150%]'>
-          {model.summary}
-        </p>
-      </div>
-    </Link>
-  )
-}
diff --git a/apps/sim/app/(landing)/models/components/model-primitives/featured-model-card.tsx b/apps/sim/app/(landing)/models/components/model-primitives/featured-model-card.tsx
new file mode 100644
index 00000000000..55f90eb1bf4
--- /dev/null
+++ b/apps/sim/app/(landing)/models/components/model-primitives/featured-model-card.tsx
@@ -0,0 +1,31 @@
+import Link from 'next/link'
+import { ProviderIcon } from '@/app/(landing)/models/components/model-primitives/provider-icon'
+import type { CatalogModel, CatalogProvider } from '@/app/(landing)/models/utils'
+
+export function FeaturedModelCard({
+  provider,
+  model,
+}: {
+  provider: CatalogProvider
+  model: CatalogModel
+}) {
+  return (
+    <Link
+      href={model.href}
+      className='group flex flex-1 flex-col gap-4 border-[var(--border)] border-t p-6 transition-colors first:border-t-0 hover:bg-[var(--surface-hover)] sm:border-t-0 sm:border-l sm:first:border-l-0'
+    >
+      <ProviderIcon provider={provider} className='size-10 rounded-xl' iconClassName='size-5' />
+      <div className='flex flex-col gap-2'>
+        <span className='text-[var(--text-muted)] text-xs uppercase tracking-[0.1em]'>
+          {provider.name}
+        </span>
+        <h3 className='text-[var(--text-primary)] text-lg leading-tight tracking-[-0.01em]'>
+          {model.displayName}
+        </h3>
+        <p className='line-clamp-2 text-[var(--text-muted)] text-sm leading-[150%]'>
+          {model.summary}
+        </p>
+      </div>
+    </Link>
+  )
+}
diff --git a/apps/sim/app/(landing)/models/components/model-primitives/featured-provider-card.tsx b/apps/sim/app/(landing)/models/components/model-primitives/featured-provider-card.tsx
new file mode 100644
index 00000000000..f96c31762b0
--- /dev/null
+++ b/apps/sim/app/(landing)/models/components/model-primitives/featured-provider-card.tsx
@@ -0,0 +1,22 @@
+import Link from 'next/link'
+import { ProviderIcon } from '@/app/(landing)/models/components/model-primitives/provider-icon'
+import type { CatalogProvider } from '@/app/(landing)/models/utils'
+
+export function FeaturedProviderCard({ provider }: { provider: CatalogProvider }) {
+  return (
+    <Link
+      href={provider.href}
+      className='group flex flex-1 flex-col gap-4 border-[var(--border)] border-t p-6 transition-colors first:border-t-0 hover:bg-[var(--surface-hover)] sm:border-t-0 sm:border-l sm:first:border-l-0'
+    >
+      <ProviderIcon provider={provider} className='size-10 rounded-xl' iconClassName='size-5' />
+      <div className='flex flex-col gap-2'>
+        <h3 className='text-[var(--text-primary)] text-lg leading-tight tracking-[-0.01em]'>
+          {provider.name}
+        </h3>
+        <p className='line-clamp-2 text-[var(--text-muted)] text-sm leading-[150%]'>
+          {provider.description}
+        </p>
+      </div>
+    </Link>
+  )
+}
diff --git a/apps/sim/app/(landing)/models/components/model-primitives/index.ts b/apps/sim/app/(landing)/models/components/model-primitives/index.ts
new file mode 100644
index 00000000000..b5f2386f626
--- /dev/null
+++ b/apps/sim/app/(landing)/models/components/model-primitives/index.ts
@@ -0,0 +1,3 @@
+export { FeaturedModelCard } from './featured-model-card'
+export { FeaturedProviderCard } from './featured-provider-card'
+export { ProviderIcon } from './provider-icon'
diff --git a/apps/sim/app/(landing)/models/components/model-primitives/provider-icon.tsx b/apps/sim/app/(landing)/models/components/model-primitives/provider-icon.tsx
new file mode 100644
index 00000000000..f11ae7387e9
--- /dev/null
+++ b/apps/sim/app/(landing)/models/components/model-primitives/provider-icon.tsx
@@ -0,0 +1,31 @@
+import { cn } from '@sim/emcn'
+import type { CatalogProvider } from '@/app/(landing)/models/utils'
+
+export function ProviderIcon({
+  provider,
+  className = 'size-12 rounded-xl',
+  iconClassName = 'size-6',
+}: {
+  provider: Pick<CatalogProvider, 'icon' | 'name'>
+  className?: string
+  iconClassName?: string
+}) {
+  const Icon = provider.icon
+
+  return (
+    <span
+      className={cn(
+        'flex items-center justify-center border border-[var(--border-1)] bg-[var(--bg)]',
+        className
+      )}
+    >
+      {Icon ? (
+        <Icon className={iconClassName} />
+      ) : (
+        <span className='text-[14px] text-[var(--text-primary)]'>
+          {provider.name.slice(0, 2).toUpperCase()}
+        </span>
+      )}
+    </span>
+  )
+}
diff --git a/apps/sim/app/(landing)/models/components/model-timeline-chart.tsx b/apps/sim/app/(landing)/models/components/model-timeline-chart.tsx
index 730cdec7674..6e7705ba439 100644
--- a/apps/sim/app/(landing)/models/components/model-timeline-chart.tsx
+++ b/apps/sim/app/(landing)/models/components/model-timeline-chart.tsx
@@ -2,14 +2,16 @@ import Link from 'next/link'
 import { getProviderColor } from '@/app/(landing)/models/components/constants'
 import type { CatalogModel } from '@/app/(landing)/models/utils'
 
+const SHORT_DATE_FORMAT = new Intl.DateTimeFormat('en-US', {
+  month: 'short',
+  day: 'numeric',
+  year: 'numeric',
+  timeZone: 'UTC',
+})
+
 function formatShortDate(date: string): string {
   try {
-    return new Intl.DateTimeFormat('en-US', {
-      month: 'short',
-      day: 'numeric',
-      year: 'numeric',
-      timeZone: 'UTC',
-    }).format(new Date(date))
+    return SHORT_DATE_FORMAT.format(new Date(date))
   } catch {
     return date
   }
diff --git a/apps/sim/app/(landing)/models/utils.ts b/apps/sim/app/(landing)/models/utils.ts
index bf9dc4f8933..736b16bd8ab 100644
--- a/apps/sim/app/(landing)/models/utils.ts
+++ b/apps/sim/app/(landing)/models/utils.ts
@@ -78,6 +78,22 @@ const TOKEN_REPLACEMENTS: Record<string, string> = {
   router: 'Router',
 }
 
+const PRICE_NUMBER_FORMAT_3 = new Intl.NumberFormat('en-US', {
+  minimumFractionDigits: 0,
+  maximumFractionDigits: 3,
+})
+
+const PRICE_NUMBER_FORMAT_4 = new Intl.NumberFormat('en-US', {
+  minimumFractionDigits: 0,
+  maximumFractionDigits: 4,
+})
+
+const UPDATED_AT_DATE_FORMAT = new Intl.DateTimeFormat('en-US', {
+  month: 'short',
+  day: 'numeric',
+  year: 'numeric',
+})
+
 export interface PricingInfo {
   input: number
   cachedInput?: number
@@ -169,23 +185,14 @@ export function formatPrice(price?: number | null): string {
     return 'N/A'
   }
 
-  const maximumFractionDigits = price > 0 && price < 0.001 ? 4 : 3
+  const formatter = price > 0 && price < 0.001 ? PRICE_NUMBER_FORMAT_4 : PRICE_NUMBER_FORMAT_3
 
-  return `$${trimTrailingZeros(
-    new Intl.NumberFormat('en-US', {
-      minimumFractionDigits: 0,
-      maximumFractionDigits,
-    }).format(price)
-  )}`
+  return `$${trimTrailingZeros(formatter.format(price))}`
 }
 
 export function formatUpdatedAt(date: string): string {
   try {
-    return new Intl.DateTimeFormat('en-US', {
-      month: 'short',
-      day: 'numeric',
-      year: 'numeric',
-    }).format(new Date(date))
+    return UPDATED_AT_DATE_FORMAT.format(new Date(date))
   } catch {
     return date
   }
@@ -506,7 +513,7 @@ const rawProviders = Object.values(PROVIDER_DEFINITIONS).map((provider) => {
     models.find((model) => model.id === provider.defaultModel)?.displayName ||
     (provider.defaultModel ? formatModelDisplayName(provider.id, provider.defaultModel) : 'Dynamic')
 
-  const featuredModels = [...models].sort(compareModelsByRelevance).slice(0, 6)
+  const featuredModels = models.toSorted(compareModelsByRelevance).slice(0, 6)
 
   return {
     id: provider.id,
@@ -621,20 +628,28 @@ export function getRelatedModels(targetModel: CatalogModel, limit = 6): CatalogM
 
   const targetTokens = new Set(tokenizeModelName(stripTechnicalSuffixes(targetModel.shortId)))
 
-  return provider.models
-    .filter((model) => model.id !== targetModel.id)
-    .map((model) => {
+  const scored = provider.models.reduce<Array<{ model: CatalogModel; score: number }>>(
+    (acc, model) => {
+      if (model.id === targetModel.id) {
+        return acc
+      }
+
       const modelTokens = tokenizeModelName(stripTechnicalSuffixes(model.shortId))
       const sharedTokenCount = modelTokens.filter((token) => targetTokens.has(token)).length
       const sharedCapabilityCount = model.capabilityTags.filter((tag) =>
         targetModel.capabilityTags.includes(tag)
       ).length
 
-      return {
+      acc.push({
         model,
         score: sharedTokenCount * 2 + sharedCapabilityCount + (model.contextWindow ?? 0) / 1000000,
-      }
-    })
+      })
+      return acc
+    },
+    []
+  )
+
+  return scored
     .sort((a, b) => b.score - a.score)
     .slice(0, limit)
     .map(({ model }) => model)
diff --git a/apps/sim/app/(landing)/og-utils.tsx b/apps/sim/app/(landing)/og-utils.tsx
index 28cc707c463..9eaf8beb1a8 100644
--- a/apps/sim/app/(landing)/og-utils.tsx
+++ b/apps/sim/app/(landing)/og-utils.tsx
@@ -1,4 +1,5 @@
 import { ImageResponse } from 'next/og'
+import { SimLogoFull } from '@/app/(landing)/components/og-sim-logo'
 
 const size = {
   width: 1200,
@@ -40,27 +41,6 @@ async function loadGoogleFont(
   return null
 }
 
-function SimLogoFull() {
-  return (
-    <svg height='28' viewBox='720 440 1020 320' fill='none'>
-      <path
-        fillRule='evenodd'
-        clipRule='evenodd'
-        d='M875.791 577.171C875.791 581.922 873.911 586.483 870.576 589.842L870.098 590.323C866.764 593.692 862.234 595.575 857.517 595.575H750.806C740.978 595.575 733 603.6 733 613.498V728.902C733 738.799 740.978 746.826 750.806 746.826H865.382C875.209 746.826 883.177 738.799 883.177 728.902V620.853C883.177 616.448 884.912 612.222 888.008 609.104C891.093 605.997 895.29 604.249 899.664 604.249H1008.16C1017.99 604.249 1025.96 596.224 1025.96 586.327V470.923C1025.96 461.025 1017.99 453 1008.16 453H893.586C883.759 453 875.791 461.025 875.791 470.923V577.171ZM910.562 477.566H991.178C996.922 477.566 1001.57 482.254 1001.57 488.029V569.22C1001.57 574.995 996.922 579.683 991.178 579.683H910.562C904.828 579.683 900.173 574.995 900.173 569.22V488.029C900.173 482.254 904.828 477.566 910.562 477.566Z'
-        fill='#33C482'
-      />
-      <path
-        d='M1008.3 624.59H923.113C912.786 624.59 904.414 633.022 904.414 643.423V728.171C904.414 738.572 912.786 747.004 923.113 747.004H1008.3C1018.63 747.004 1027 738.572 1027 728.171V643.423C1027 633.022 1018.63 624.59 1008.3 624.59Z'
-        fill='#33C482'
-      />
-      <path
-        d='M1210.54 515.657C1226.65 515.657 1240.59 518.51 1252.31 524.257H1252.31C1264.3 529.995 1273.63 538.014 1280.26 548.319H1280.26C1287.19 558.635 1290.78 570.899 1291.08 585.068L1291.1 586.089H1249.11L1249.09 585.115C1248.8 574.003 1245.18 565.493 1238.32 559.451C1231.45 553.399 1221.79 550.308 1209.21 550.308C1196.3 550.308 1186.48 553.113 1179.61 558.588C1172.76 564.046 1169.33 571.499 1169.33 581.063C1169.33 588.092 1171.88 593.978 1177.01 598.783C1182.17 603.618 1189.99 607.399 1200.56 610.061H1200.56L1238.77 619.451C1257.24 623.65 1271.21 630.571 1280.57 640.293L1281.01 640.739C1290.13 650.171 1294.64 662.97 1294.64 679.016C1294.64 692.923 1290.88 705.205 1283.34 715.822L1283.33 715.834C1275.81 726.134 1265.44 734.14 1252.26 739.866L1252.25 739.871C1239.36 745.302 1224.12 748 1206.54 748C1180.9 748 1160.36 741.696 1145.02 728.984C1129.67 716.258 1122 699.269 1122 678.121V677.121H1163.99V678.121C1163.99 688.869 1167.87 697.367 1175.61 703.722L1176.34 704.284C1184.04 709.997 1194.37 712.902 1207.43 712.902C1222.13 712.902 1233.3 710.087 1241.07 704.588C1248.8 698.812 1252.64 691.21 1252.64 681.699C1252.64 674.769 1250.5 669.057 1246.25 664.49L1246.23 664.478L1246.22 664.464C1242.28 659.929 1234.83 656.119 1223.64 653.152L1185.43 644.208L1185.42 644.204C1166.05 639.407 1151.49 632.035 1141.83 622.012L1141.83 622.006L1141.82 622C1132.43 611.94 1127.78 598.707 1127.78 582.405C1127.78 568.81 1131.23 556.976 1138.17 546.949L1138.18 546.941L1138.19 546.933C1145.41 536.936 1155.18 529.225 1167.48 523.793L1167.48 523.79C1180.07 518.36 1194.43 515.657 1210.54 515.657ZM1323.39 521.979C1331.68 525.008 1337.55 526.482 1343.51 526.482C1349.48 526.482 1355.64 525.005 1364.49 521.973L1365.82 521.52V742.633H1322.05V521.489L1323.39 521.979ZM1642.01 515.657C1667.11 515.657 1686.94 523.031 1701.39 537.876C1715.83 552.716 1723 572.968 1723 598.507V742.633H1680.12V608.794C1680.12 591.666 1675.72 578.681 1667.07 569.681L1667.06 569.669L1667.04 569.656C1658.67 560.359 1647.26 555.675 1632.68 555.675C1622.47 555.675 1613.47 558.022 1605.64 562.69L1605.63 562.696C1598.11 567.064 1592.17 573.475 1587.8 581.968C1583.44 590.448 1581.25 600.424 1581.25 611.925V742.633H1537.92V608.347C1537.92 591.208 1533.67 578.376 1525.31 569.68L1525.31 569.674L1525.3 569.668C1516.93 560.664 1505.52 556.122 1490.93 556.122C1480.72 556.122 1471.72 558.469 1463.89 563.138L1463.88 563.144C1456.36 567.511 1450.41 573.922 1446.05 582.415L1446.05 582.422L1446.04 582.428C1441.69 590.602 1439.5 600.423 1439.5 611.925V742.633H1395.72V521.919H1435.05V554.803C1439.92 544.379 1447.91 535.465 1458.37 528.356C1470.71 519.875 1485.58 515.657 1502.93 515.657C1522.37 515.657 1538.61 520.931 1551.55 531.538C1560.38 538.771 1567.1 547.628 1571.72 558.091C1576.05 547.619 1582.83 538.757 1592.07 531.524C1605.61 520.93 1622.28 515.657 1642.01 515.657ZM1343.49 452C1351.45 452 1358.23 454.786 1363.75 460.346C1369.27 465.905 1372.04 472.721 1372.04 480.73C1372.04 488.452 1369.27 495.254 1363.77 501.096L1363.76 501.105L1363.75 501.115C1358.23 506.675 1351.45 509.461 1343.49 509.461C1335.81 509.461 1329.05 506.669 1323.25 501.134L1323.23 501.115L1323.21 501.096C1317.71 495.254 1314.94 488.452 1314.94 480.73C1314.94 472.721 1317.7 465.905 1323.23 460.346L1323.24 460.337L1323.25 460.327C1329.05 454.792 1335.81 452 1343.49 452Z'
-        fill='#fafafa'
-      />
-    </svg>
-  )
-}
-
 interface LandingOgImageProps {
   eyebrow: string
   title: string
diff --git a/apps/sim/app/(landing)/partners/page.tsx b/apps/sim/app/(landing)/partners/page.tsx
index 05c25ed87f8..e87dc927489 100644
--- a/apps/sim/app/(landing)/partners/page.tsx
+++ b/apps/sim/app/(landing)/partners/page.tsx
@@ -1,6 +1,7 @@
 import { ChipLink } from '@sim/emcn'
 import { SITE_URL } from '@/lib/core/utils/urls'
 import { buildLandingMetadata } from '@/lib/landing/seo'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 
 const PAGE_URL = `${SITE_URL}/partners`
 const TITLE = 'Partner Program | Sim'
@@ -140,14 +141,8 @@ const BENEFITS = [
 export default function PartnersPage() {
   return (
     <main id='main-content'>
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(partnersJsonLd) }}
-      />
-      <script
-        type='application/ld+json'
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(breadcrumbJsonLd) }}
-      />
+      <JsonLd data={partnersJsonLd} />
+      <JsonLd data={breadcrumbJsonLd} />
 
       {/* Hero */}
       <section
@@ -180,7 +175,7 @@ export default function PartnersPage() {
               href='#how-it-works'
               className='inline-flex h-[44px] items-center rounded-[5px] border border-[var(--border-1)] px-6 text-[15px] text-[var(--text-primary)] transition-colors hover:border-[var(--border-1)]'
             >
-              Learn more
+              See how the partner program works
             </a>
           </div>
         </div>
diff --git a/apps/sim/app/(landing)/pricing/components/pricing-plans/pricing-plans.tsx b/apps/sim/app/(landing)/pricing/components/pricing-plans/pricing-plans.tsx
index 0d18aaef3fa..efaf271b15e 100644
--- a/apps/sim/app/(landing)/pricing/components/pricing-plans/pricing-plans.tsx
+++ b/apps/sim/app/(landing)/pricing/components/pricing-plans/pricing-plans.tsx
@@ -52,6 +52,21 @@ function sectionsForColumn(col: number): PricingCardSection[] {
   }))
 }
 
+/**
+ * Resolve a card's canonical label and variant from the free-tier matrix; the
+ * CTA always funnels logged-out visitors to sign-up.
+ */
+function resolveCta(card: UpgradeCardId): PricingCardCta {
+  const cta = getUpgradeCardCta(VISITOR_TIER, card)
+  return { label: cta.label, variant: cta.variant, href: SIGNUP_HREF }
+}
+
+const FREE_CTA: PricingCardCta = {
+  label: 'Get started',
+  variant: 'border-shadow',
+  href: SIGNUP_HREF,
+}
+
 /**
  * The single interactive island of the public pricing page. It owns the lone
  * piece of state - `isAnnual`, defaulting to monthly - which the billing-period
@@ -82,20 +97,6 @@ export function PricingPlans({ heading }: PricingPlansProps) {
     : 'per user/month, billed monthly'
   const discountLabel = isAnnual ? `${discountPct}% off` : undefined
 
-  /**
-   * Resolve a card's canonical label and variant from the free-tier matrix; the
-   * CTA always funnels logged-out visitors to sign-up.
-   */
-  const resolveCta = (card: UpgradeCardId): PricingCardCta => {
-    const cta = getUpgradeCardCta(VISITOR_TIER, card)
-    return { label: cta.label, variant: cta.variant, href: SIGNUP_HREF }
-  }
-
-  const freeCta: PricingCardCta = {
-    label: 'Get started',
-    variant: 'border-shadow',
-    href: SIGNUP_HREF,
-  }
   const proCta = resolveCta('pro')
   const maxCta = resolveCta('max')
   const enterpriseCta = resolveCta('enterprise')
@@ -112,7 +113,7 @@ export function PricingPlans({ heading }: PricingPlansProps) {
           name='Free'
           price='$0'
           priceSubtext='Free forever'
-          cta={freeCta}
+          cta={FREE_CTA}
           sections={sectionsForColumn(0)}
         />
         <PricingCard
diff --git a/apps/sim/app/(landing)/pricing/components/pricing-structured-data/pricing-structured-data.tsx b/apps/sim/app/(landing)/pricing/components/pricing-structured-data/pricing-structured-data.tsx
index ee18612d749..7c4ff0014ac 100644
--- a/apps/sim/app/(landing)/pricing/components/pricing-structured-data/pricing-structured-data.tsx
+++ b/apps/sim/app/(landing)/pricing/components/pricing-structured-data/pricing-structured-data.tsx
@@ -1,7 +1,81 @@
 import { CREDIT_TIERS } from '@/lib/billing/constants'
 import { SITE_URL } from '@/lib/core/utils/urls'
+import { JsonLd } from '@/app/(landing)/components/json-ld'
 import { COMPARISON_SECTIONS } from '@/app/workspace/[workspaceId]/upgrade/components/comparison-table/comparison-data'
 
+const PAGE_URL = `${SITE_URL}/pricing`
+
+/** Feature list derived from the comparison data the cards render, so it can't drift. */
+const FEATURE_LIST = Array.from(
+  new Set(COMPARISON_SECTIONS.flatMap((section) => section.rows.map((row) => row.label)))
+)
+
+const PRICING_JSON_LD = {
+  '@context': 'https://schema.org',
+  '@graph': [
+    {
+      '@type': 'WebPage',
+      '@id': `${PAGE_URL}#webpage`,
+      url: PAGE_URL,
+      name: 'Pricing | Sim, the AI Workspace',
+      description:
+        'Pricing for Sim, the open-source AI workspace where teams build, deploy, and manage AI agents. Compare the Free, Pro, Max, and Enterprise plans.',
+      isPartOf: { '@id': `${SITE_URL}#website` },
+      about: { '@id': `${PAGE_URL}#application` },
+      breadcrumb: { '@id': `${PAGE_URL}#breadcrumb` },
+      inLanguage: 'en-US',
+    },
+    {
+      '@type': 'BreadcrumbList',
+      '@id': `${PAGE_URL}#breadcrumb`,
+      itemListElement: [
+        { '@type': 'ListItem', position: 1, name: 'Home', item: SITE_URL },
+        { '@type': 'ListItem', position: 2, name: 'Pricing', item: PAGE_URL },
+      ],
+    },
+    {
+      '@type': 'WebApplication',
+      '@id': `${PAGE_URL}#application`,
+      name: 'Sim',
+      description:
+        'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents, connecting 1,000+ integrations and every major LLM.',
+      applicationCategory: 'BusinessApplication',
+      operatingSystem: 'Web',
+      url: SITE_URL,
+      featureList: FEATURE_LIST,
+      offers: [
+        {
+          '@type': 'Offer',
+          name: 'Free',
+          price: '0',
+          priceCurrency: 'USD',
+          description: 'Start building AI agents for free.',
+        },
+        {
+          '@type': 'Offer',
+          name: 'Pro',
+          price: String(CREDIT_TIERS[0].dollars),
+          priceCurrency: 'USD',
+          description: 'For growing teams. Billed per user/month.',
+        },
+        {
+          '@type': 'Offer',
+          name: 'Max',
+          price: String(CREDIT_TIERS[1].dollars),
+          priceCurrency: 'USD',
+          description: 'For scaling businesses. Billed per user/month.',
+        },
+        {
+          '@type': 'Offer',
+          name: 'Enterprise',
+          priceCurrency: 'USD',
+          description: 'Custom limits and infrastructure for large organizations.',
+        },
+      ],
+    },
+  ],
+}
+
 /**
  * JSON-LD for the public pricing page - a `WebPage` (about a `WebApplication`),
  * a `BreadcrumbList`, and the `WebApplication` (Sim) carrying one `Offer` per
@@ -16,85 +90,6 @@ import { COMPARISON_SECTIONS } from '@/app/workspace/[workspaceId]/upgrade/compo
  *
  * Server Component; no client cost.
  */
-
-const PAGE_URL = `${SITE_URL}/pricing`
-
-/** Feature list derived from the comparison data the cards render, so it can't drift. */
-const FEATURE_LIST = Array.from(
-  new Set(COMPARISON_SECTIONS.flatMap((section) => section.rows.map((row) => row.label)))
-)
-
 export function PricingStructuredData() {
-  const jsonLd = {
-    '@context': 'https://schema.org',
-    '@graph': [
-      {
-        '@type': 'WebPage',
-        '@id': `${PAGE_URL}#webpage`,
-        url: PAGE_URL,
-        name: 'Pricing | Sim, the AI Workspace',
-        description:
-          'Pricing for Sim, the open-source AI workspace where teams build, deploy, and manage AI agents. Compare the Free, Pro, Max, and Enterprise plans.',
-        isPartOf: { '@id': `${SITE_URL}#website` },
-        about: { '@id': `${PAGE_URL}#application` },
-        breadcrumb: { '@id': `${PAGE_URL}#breadcrumb` },
-        inLanguage: 'en-US',
-      },
-      {
-        '@type': 'BreadcrumbList',
-        '@id': `${PAGE_URL}#breadcrumb`,
-        itemListElement: [
-          { '@type': 'ListItem', position: 1, name: 'Home', item: SITE_URL },
-          { '@type': 'ListItem', position: 2, name: 'Pricing', item: PAGE_URL },
-        ],
-      },
-      {
-        '@type': 'WebApplication',
-        '@id': `${PAGE_URL}#application`,
-        name: 'Sim',
-        description:
-          'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents, connecting 1,000+ integrations and every major LLM.',
-        applicationCategory: 'BusinessApplication',
-        operatingSystem: 'Web',
-        url: SITE_URL,
-        featureList: FEATURE_LIST,
-        offers: [
-          {
-            '@type': 'Offer',
-            name: 'Free',
-            price: '0',
-            priceCurrency: 'USD',
-            description: 'Start building AI agents for free.',
-          },
-          {
-            '@type': 'Offer',
-            name: 'Pro',
-            price: String(CREDIT_TIERS[0].dollars),
-            priceCurrency: 'USD',
-            description: 'For growing teams. Billed per user/month.',
-          },
-          {
-            '@type': 'Offer',
-            name: 'Max',
-            price: String(CREDIT_TIERS[1].dollars),
-            priceCurrency: 'USD',
-            description: 'For scaling businesses. Billed per user/month.',
-          },
-          {
-            '@type': 'Offer',
-            name: 'Enterprise',
-            priceCurrency: 'USD',
-            description: 'Custom limits and infrastructure for large organizations.',
-          },
-        ],
-      },
-    ],
-  }
-
-  return (
-    <script
-      type='application/ld+json'
-      dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-    />
-  )
+  return <JsonLd data={PRICING_JSON_LD} />
 }
diff --git a/apps/sim/app/(landing)/pricing/pricing.tsx b/apps/sim/app/(landing)/pricing/pricing.tsx
index c3de4db4128..388fa91a913 100644
--- a/apps/sim/app/(landing)/pricing/pricing.tsx
+++ b/apps/sim/app/(landing)/pricing/pricing.tsx
@@ -8,6 +8,19 @@ import { PricingStructuredData } from '@/app/(landing)/pricing/components/pricin
 const GEO_SUMMARY =
   'Sim is the open-source AI workspace where teams build, deploy, and manage AI agents. Pricing scales across four plans: Free to start, Pro for growing teams, Max for scaling businesses, and Enterprise for large organizations, each connecting 1,000+ integrations and every major LLM.'
 
+/** Server-rendered heading slot handed to the {@link PricingPlans} client island. */
+const PRICING_HEADING = (
+  <>
+    <h1
+      id='pricing-heading'
+      className='text-balance text-center text-[30px] text-[var(--text-primary)]'
+    >
+      Plans that scale with you
+    </h1>
+    <p className='sr-only'>{GEO_SUMMARY}</p>
+  </>
+)
+
 /**
  * Public `/pricing` page - the same four plans as the in-app Upgrade page,
  * rendered flat on the landing background for logged-out visitors (no workspace
@@ -40,19 +53,7 @@ export default function Pricing() {
         aria-labelledby='pricing-heading'
         className='mx-auto flex w-full max-w-[1446px] flex-col gap-7 px-12 pt-8 max-sm:px-5 max-lg:px-8'
       >
-        <PricingPlans
-          heading={
-            <>
-              <h1
-                id='pricing-heading'
-                className='text-balance text-center text-[30px] text-[var(--text-primary)]'
-              >
-                Plans that scale with you
-              </h1>
-              <p className='sr-only'>{GEO_SUMMARY}</p>
-            </>
-          }
-        />
+        <PricingPlans heading={PRICING_HEADING} />
       </section>
     </main>
   )
diff --git a/apps/sim/app/(landing)/track-landing-cta.ts b/apps/sim/app/(landing)/track-landing-cta.ts
new file mode 100644
index 00000000000..75129013d52
--- /dev/null
+++ b/apps/sim/app/(landing)/track-landing-cta.ts
@@ -0,0 +1,10 @@
+import { captureClientEvent } from '@/lib/posthog/client'
+import type { PostHogEventMap } from '@/lib/posthog/events'
+
+/**
+ * Fire-and-forget tracker for landing page CTA clicks.
+ * Uses the non-hook client so it works in any click handler without requiring a PostHog provider ref.
+ */
+export function trackLandingCta(props: PostHogEventMap['landing_cta_clicked']): void {
+  captureClientEvent('landing_cta_clicked', props)
+}
diff --git a/apps/sim/tsconfig.json b/apps/sim/tsconfig.json
index adb44824922..b4b877366b7 100644
--- a/apps/sim/tsconfig.json
+++ b/apps/sim/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "@sim/tsconfig/nextjs.json",
   "compilerOptions": {
     "baseUrl": ".",
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "paths": {
       "@/*": ["./*"],
       "@/components/*": ["components/*"],

From 13162f379cdd380c9393e3a8b23877a66f4ec1d0 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Wed, 1 Jul 2026 11:26:46 -0700
Subject: [PATCH 2/5] fix(landing): harden auth-modal async open (dismiss race
 + disabled-signup redirect)

- guard the pending provider-status fetch with openRequestedRef so a late resolve can't reopen the modal or re-fire the opened event after dismiss
- open synchronously (loader) when status is still loading so the click stays responsive
- route to /login instead of /signup when registration is disabled and no modal providers are available
---
 .../components/auth-modal/auth-modal.tsx      | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
index f36b2e9a391..62326900c19 100644
--- a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
+++ b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import {
   Loader,
   Modal,
@@ -85,13 +85,21 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
   const effectiveView: AuthView =
     view === 'signup' && providerStatus?.registrationDisabled ? 'login' : view
 
-  const redirectTarget = defaultView === 'login' ? '/login' : '/signup'
+  /**
+   * Tracks whether the visitor still wants the modal open. Cleared on dismiss so a
+   * provider-status fetch that resolves afterwards can't reopen it or re-fire the
+   * opened event.
+   */
+  const openRequestedRef = useRef(false)
 
   function openWithStatus(status: ProviderStatus) {
     const hasModalContent =
       status.githubAvailable || status.googleAvailable || status.microsoftAvailable || ssoEnabled
     if (!hasModalContent) {
-      router.push(redirectTarget)
+      // Close the loading state (no-op if never opened) and route out. Registration
+      // being disabled sends signup requests to login, since signup is unavailable.
+      setOpen(false)
+      router.push(status.registrationDisabled || defaultView === 'login' ? '/login' : '/signup')
       return
     }
     const initialView: AuthView =
@@ -103,6 +111,7 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
 
   function handleOpenChange(nextOpen: boolean) {
     if (!nextOpen) {
+      openRequestedRef.current = false
       setOpen(false)
       return
     }
@@ -110,8 +119,13 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
       openWithStatus(providerStatus)
       return
     }
+    // Status not loaded yet: open immediately (the loader shows) so the click feels
+    // responsive, then resolve - unless the visitor has since dismissed the modal.
+    openRequestedRef.current = true
+    setOpen(true)
     fetchProviderStatus().then((status) => {
       setProviderStatus(status)
+      if (!openRequestedRef.current) return
       openWithStatus(status)
     })
   }

From 1f3fcb91c29b35a13b9073c7f47730bdfb2abfc6 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Wed, 1 Jul 2026 11:37:18 -0700
Subject: [PATCH 3/5] fix(landing): reset demo step index when the preview
 auto-cycle restarts

- reactive isDesktop can re-run the demo effect on a 1024px resize; reset demoIndexRef to 0 so applyDemoStep(step 0) and scheduleNextStep read the same step, instead of replaying from a stale index and skipping beats
- clarify why the chat reveal's previous-value ref is safe here (timer-driven, no concurrent-interruption boundary)
---
 .../landing-preview-chat/landing-preview-chat.tsx          | 7 +++++--
 .../components/landing-preview/landing-preview.tsx         | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
index 45b8c2a9bb9..1ab1723fe50 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
@@ -45,8 +45,11 @@ export function LandingPreviewChat({ chat, chatName, animationKey }: LandingPrev
   const [phase, setPhase] = useState<RevealPhase>('hidden')
   const revealRef = useRef<{ key: number; chat: PreviewChat | null }>({ key: animationKey, chat })
 
-  // Restart the reveal synchronously when the timeline (or staged chat) changes,
-  // so the pane never flashes the previous step's reply before the effect reruns.
+  // Restart the reveal synchronously when the timeline (or staged chat) changes, so
+  // the pane never flashes the previous step's reply before the effect reruns. The
+  // previous key/chat are tracked in a ref: these updates come from the parent's
+  // timer-driven state (never a transition/Suspense boundary), so the render can't be
+  // discarded between the ref write and commit - keeping the ref safe here.
   if (revealRef.current.key !== animationKey || revealRef.current.chat !== chat) {
     revealRef.current = { key: animationKey, chat }
     setPhase('hidden')
diff --git a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
index b7ecc1e9966..fe7e5a4bcd3 100644
--- a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
@@ -183,6 +183,9 @@ export function LandingPreview({
     // the auto-demo on the cycle still being active - a resize after the visitor
     // has interacted must not restart the sequence from the first step.
     if (!isDesktop || !autoplay || !autoCycleActiveRef.current) return
+    // Reset the step index so the restart shows step 0 AND `scheduleNextStep` reads
+    // step 0's delay - otherwise a resize would replay from a stale index and skip beats.
+    demoIndexRef.current = 0
     applyDemoStep(DESKTOP_STEPS[0])
     scheduleNextStep()
     return clearDemoTimer

From ecca2a15342c5ea46ec2a911599056a69c5d8f9d Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Wed, 1 Jul 2026 12:02:01 -0700
Subject: [PATCH 4/5] fix(landing): single-shot auth open, stable connector
 keys, exact prompt-row lookup

- auth-modal: consume openRequestedRef on resolve so a queued double-click (or the shared mount prefetch) can't run openWithStatus twice (no duplicate auth_modal_opened / redundant setView)
- landing-preview-knowledge: key connector icons by a stable slug instead of a component name that can be mangled/emptied under minification
- workflow-data getEditorPrompt: single ordered pass preserves the original find() first-match-in-order semantics (Map lookup had preferred 'Prompt' over an earlier 'System Prompt')
---
 .../components/auth-modal/auth-modal.tsx      |  4 +++
 .../landing-preview-knowledge.tsx             | 33 ++++++++++++++-----
 .../landing-preview-workflow/workflow-data.ts | 11 +++++--
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
index 62326900c19..2a40420a0ac 100644
--- a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
+++ b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
@@ -126,6 +126,10 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
     fetchProviderStatus().then((status) => {
       setProviderStatus(status)
       if (!openRequestedRef.current) return
+      // Consume the request so a queued double-click (or the mount prefetch resolving
+      // on the same promise) can't run openWithStatus twice - no duplicate
+      // `auth_modal_opened`, no redundant setView.
+      openRequestedRef.current = false
       openWithStatus(status)
     })
   }
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
index 1085d57e920..747b0f61572 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
@@ -18,13 +18,28 @@ import { LandingPreviewResource } from '@/app/(landing)/components/landing-previ
 
 const DB_ICON = <Database className='size-[14px]' />
 
-function connectorIcons(icons: React.ComponentType<{ className?: string }>[]) {
+/** Connector icons keyed by a stable slug so list keys never depend on array index
+ * or a component name that could be mangled/emptied under minification. */
+const CONNECTOR_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
+  airtable: AirtableIcon,
+  asana: AsanaIcon,
+  confluence: ConfluenceIcon,
+  'google-docs': GoogleDocsIcon,
+  'google-drive': GoogleDriveIcon,
+  jira: JiraIcon,
+  salesforce: SalesforceIcon,
+  slack: SlackIcon,
+  zendesk: ZendeskIcon,
+}
+
+function connectorIcons(slugs: string[]) {
   return {
     content: (
       <div className='flex items-center gap-1'>
-        {icons.map((Icon) => (
-          <Icon key={Icon.displayName ?? Icon.name} className='size-3.5 flex-shrink-0' />
-        ))}
+        {slugs.map((slug) => {
+          const Icon = CONNECTOR_ICONS[slug]
+          return <Icon key={slug} className='size-3.5 flex-shrink-0' />
+        })}
       </div>
     ),
   }
@@ -45,7 +60,7 @@ const ROWS: PreviewRow[] = [
       name: { icon: DB_ICON, label: 'Product Documentation' },
       documents: { label: '847' },
       tokens: { label: '1,284,392' },
-      connectors: connectorIcons([AsanaIcon, GoogleDocsIcon]),
+      connectors: connectorIcons(['asana', 'google-docs']),
       created: { label: '2 days ago' },
     },
   },
@@ -55,7 +70,7 @@ const ROWS: PreviewRow[] = [
       name: { icon: DB_ICON, label: 'Customer Support KB' },
       documents: { label: '234' },
       tokens: { label: '892,104' },
-      connectors: connectorIcons([ZendeskIcon, SlackIcon]),
+      connectors: connectorIcons(['zendesk', 'slack']),
       created: { label: '1 week ago' },
     },
   },
@@ -65,7 +80,7 @@ const ROWS: PreviewRow[] = [
       name: { icon: DB_ICON, label: 'Engineering Wiki' },
       documents: { label: '1,203' },
       tokens: { label: '2,847,293' },
-      connectors: connectorIcons([ConfluenceIcon, JiraIcon]),
+      connectors: connectorIcons(['confluence', 'jira']),
       created: { label: 'March 12th, 2026' },
     },
   },
@@ -75,7 +90,7 @@ const ROWS: PreviewRow[] = [
       name: { icon: DB_ICON, label: 'Marketing Assets' },
       documents: { label: '189' },
       tokens: { label: '634,821' },
-      connectors: connectorIcons([GoogleDriveIcon, AirtableIcon]),
+      connectors: connectorIcons(['google-drive', 'airtable']),
       created: { label: 'March 5th, 2026' },
     },
   },
@@ -85,7 +100,7 @@ const ROWS: PreviewRow[] = [
       name: { icon: DB_ICON, label: 'Sales Playbook' },
       documents: { label: '92' },
       tokens: { label: '418,570' },
-      connectors: connectorIcons([SalesforceIcon]),
+      connectors: connectorIcons(['salesforce']),
       created: { label: 'February 28th, 2026' },
     },
   },
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
index 649ff1aaa07..b88c40b2b21 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
@@ -342,10 +342,15 @@ export interface EditorPromptData {
 export function getEditorPrompt(workflow: PreviewWorkflow): EditorPromptData | null {
   for (const block of workflow.blocks) {
     if (!AGENT_BLOCK_TYPES.has(block.type)) continue
-    const rowsByTitle = new Map(block.rows.map((row) => [row.title, row]))
-    const promptRow = rowsByTitle.get('Prompt') ?? rowsByTitle.get('System Prompt')
+    // Single ordered pass: the first row matching either prompt title (in row order)
+    // and the first Model row - preserving the original find() first-match semantics.
+    let promptRow: (typeof block.rows)[number] | undefined
+    let modelRow: (typeof block.rows)[number] | undefined
+    for (const row of block.rows) {
+      if (!promptRow && (row.title === 'Prompt' || row.title === 'System Prompt')) promptRow = row
+      if (!modelRow && row.title === 'Model') modelRow = row
+    }
     if (promptRow) {
-      const modelRow = rowsByTitle.get('Model')
       return {
         blockId: block.id,
         blockName: block.name,

From 5f55b8b4ff936df6cfb9d413d37d313a5806dd75 Mon Sep 17 00:00:00 2001
From: waleed <walif6@gmail.com>
Date: Wed, 1 Jul 2026 12:05:01 -0700
Subject: [PATCH 5/5] style(landing): convert added inline comments to
 TSDoc-style

---
 .../(landing)/components/auth-modal/auth-modal.tsx   | 10 +++-------
 .../landing-preview-chat/landing-preview-chat.tsx    | 12 +++++++-----
 .../landing-preview-workflow/workflow-data.ts        |  3 +--
 .../components/landing-preview/landing-preview.tsx   |  7 ++-----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
index 2a40420a0ac..5252032a921 100644
--- a/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
+++ b/apps/sim/app/(landing)/components/auth-modal/auth-modal.tsx
@@ -96,8 +96,7 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
     const hasModalContent =
       status.githubAvailable || status.googleAvailable || status.microsoftAvailable || ssoEnabled
     if (!hasModalContent) {
-      // Close the loading state (no-op if never opened) and route out. Registration
-      // being disabled sends signup requests to login, since signup is unavailable.
+      /** Close the loader (no-op if never opened) and route out; disabled registration sends signup to login. */
       setOpen(false)
       router.push(status.registrationDisabled || defaultView === 'login' ? '/login' : '/signup')
       return
@@ -119,16 +118,13 @@ export function AuthModal({ children, defaultView = 'login', source }: AuthModal
       openWithStatus(providerStatus)
       return
     }
-    // Status not loaded yet: open immediately (the loader shows) so the click feels
-    // responsive, then resolve - unless the visitor has since dismissed the modal.
+    /** Status not loaded yet: open the loader immediately for responsiveness, then resolve. */
     openRequestedRef.current = true
     setOpen(true)
     fetchProviderStatus().then((status) => {
       setProviderStatus(status)
       if (!openRequestedRef.current) return
-      // Consume the request so a queued double-click (or the mount prefetch resolving
-      // on the same promise) can't run openWithStatus twice - no duplicate
-      // `auth_modal_opened`, no redundant setView.
+      /** Consume the request so a queued double-click can't open twice (no duplicate event). */
       openRequestedRef.current = false
       openWithStatus(status)
     })
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
index 1ab1723fe50..77d7ceb3a77 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-chat/landing-preview-chat.tsx
@@ -45,11 +45,13 @@ export function LandingPreviewChat({ chat, chatName, animationKey }: LandingPrev
   const [phase, setPhase] = useState<RevealPhase>('hidden')
   const revealRef = useRef<{ key: number; chat: PreviewChat | null }>({ key: animationKey, chat })
 
-  // Restart the reveal synchronously when the timeline (or staged chat) changes, so
-  // the pane never flashes the previous step's reply before the effect reruns. The
-  // previous key/chat are tracked in a ref: these updates come from the parent's
-  // timer-driven state (never a transition/Suspense boundary), so the render can't be
-  // discarded between the ref write and commit - keeping the ref safe here.
+  /**
+   * Restart the reveal synchronously when the timeline or staged chat changes, so the
+   * pane never flashes the previous reply before the effect reruns. The previous
+   * key/chat live in a ref: updates come from the parent's timer-driven state (never a
+   * transition/Suspense boundary), so the render can't be discarded between the ref
+   * write and commit.
+   */
   if (revealRef.current.key !== animationKey || revealRef.current.chat !== chat) {
     revealRef.current = { key: animationKey, chat }
     setPhase('hidden')
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
index b88c40b2b21..0309c6dadb1 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
@@ -342,8 +342,7 @@ export interface EditorPromptData {
 export function getEditorPrompt(workflow: PreviewWorkflow): EditorPromptData | null {
   for (const block of workflow.blocks) {
     if (!AGENT_BLOCK_TYPES.has(block.type)) continue
-    // Single ordered pass: the first row matching either prompt title (in row order)
-    // and the first Model row - preserving the original find() first-match semantics.
+    /** Single ordered pass: first row matching either prompt title, and the first Model row. */
     let promptRow: (typeof block.rows)[number] | undefined
     let modelRow: (typeof block.rows)[number] | undefined
     for (const row of block.rows) {
diff --git a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
index fe7e5a4bcd3..1fe20a74aca 100644
--- a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
@@ -179,12 +179,9 @@ export function LandingPreview({
   }, [applyDemoStep])
 
   useEffect(() => {
-    // `isDesktop` is now reactive (viewport crossing 1024px re-runs this), so gate
-    // the auto-demo on the cycle still being active - a resize after the visitor
-    // has interacted must not restart the sequence from the first step.
+    /** `isDesktop` is reactive, so gate on the cycle still being active - a resize after interaction must not restart. */
     if (!isDesktop || !autoplay || !autoCycleActiveRef.current) return
-    // Reset the step index so the restart shows step 0 AND `scheduleNextStep` reads
-    // step 0's delay - otherwise a resize would replay from a stale index and skip beats.
+    /** Reset the index so a restart replays from step 0 (index, applied step, and delay stay consistent). */
     demoIndexRef.current = 0
     applyDemoStep(DESKTOP_STEPS[0])
     scheduleNextStep()