diff --git a/.claude/rules/global.md b/.claude/rules/global.md
index e749b67b286..b80c3695ce3 100644
--- a/.claude/rules/global.md
+++ b/.claude/rules/global.md
@@ -9,5 +9,26 @@ Use TSDoc for documentation. No `====` separators. No non-TSDoc comments.
 ## Styling
 Never update global styles. Keep all styling local to components.
 
+## ID Generation
+Never use `crypto.randomUUID()`, `nanoid`, or the `uuid` package directly. Use the utilities from `@/lib/core/utils/uuid`:
+
+- `generateId()` — UUID v4, use by default
+- `generateShortId(size?)` — short URL-safe ID (default 21 chars), for compact identifiers
+
+Both use `crypto.getRandomValues()` under the hood and work in all contexts including non-secure (HTTP) browsers.
+
+```typescript
+// ✗ Bad
+import { nanoid } from 'nanoid'
+import { v4 as uuidv4 } from 'uuid'
+const id = crypto.randomUUID()
+
+// ✓ Good
+import { generateId, generateShortId } from '@/lib/core/utils/uuid'
+const uuid = generateId()
+const shortId = generateShortId()
+const tiny = generateShortId(8)
+```
+
 ## Package Manager
 Use `bun` and `bunx`, not `npm` and `npx`.
diff --git a/.cursor/rules/global.mdc b/.cursor/rules/global.mdc
index b21c1577b61..af32f057955 100644
--- a/.cursor/rules/global.mdc
+++ b/.cursor/rules/global.mdc
@@ -16,5 +16,26 @@ Use TSDoc for documentation. No `====` separators. No non-TSDoc comments.
 ## Styling
 Never update global styles. Keep all styling local to components.
 
+## ID Generation
+Never use `crypto.randomUUID()`, `nanoid`, or the `uuid` package directly. Use the utilities from `@/lib/core/utils/uuid`:
+
+- `generateId()` — UUID v4, use by default
+- `generateShortId(size?)` — short URL-safe ID (default 21 chars), for compact identifiers
+
+Both use `crypto.getRandomValues()` under the hood and work in all contexts including non-secure (HTTP) browsers.
+
+```typescript
+// ✗ Bad
+import { nanoid } from 'nanoid'
+import { v4 as uuidv4 } from 'uuid'
+const id = crypto.randomUUID()
+
+// ✓ Good
+import { generateId, generateShortId } from '@/lib/core/utils/uuid'
+const uuid = generateId()
+const shortId = generateShortId()
+const tiny = generateShortId(8)
+```
+
 ## Package Manager
 Use `bun` and `bunx`, not `npm` and `npx`.
diff --git a/AGENTS.md b/AGENTS.md
index 004252ac6a4..bc54c6f912c 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -7,6 +7,7 @@ You are a professional software engineer. All code must follow best practices: a
 - **Logging**: Import `createLogger` from `@sim/logger`. Use `logger.info`, `logger.warn`, `logger.error` instead of `console.log`
 - **Comments**: Use TSDoc for documentation. No `====` separators. No non-TSDoc comments
 - **Styling**: Never update global styles. Keep all styling local to components
+- **ID Generation**: Never use `crypto.randomUUID()`, `nanoid`, or `uuid` package. Use `generateId()` (UUID v4) or `generateShortId()` (compact) from `@/lib/core/utils/uuid`
 - **Package Manager**: Use `bun` and `bunx`, not `npm` and `npx`
 
 ## Architecture
diff --git a/CLAUDE.md b/CLAUDE.md
index 004252ac6a4..bc54c6f912c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,6 +7,7 @@ You are a professional software engineer. All code must follow best practices: a
 - **Logging**: Import `createLogger` from `@sim/logger`. Use `logger.info`, `logger.warn`, `logger.error` instead of `console.log`
 - **Comments**: Use TSDoc for documentation. No `====` separators. No non-TSDoc comments
 - **Styling**: Never update global styles. Keep all styling local to components
+- **ID Generation**: Never use `crypto.randomUUID()`, `nanoid`, or `uuid` package. Use `generateId()` (UUID v4) or `generateShortId()` (compact) from `@/lib/core/utils/uuid`
 - **Package Manager**: Use `bun` and `bunx`, not `npm` and `npx`
 
 ## Architecture
diff --git a/apps/docs/content/docs/en/blocks/response.mdx b/apps/docs/content/docs/en/blocks/response.mdx
index 327bbaa6eb0..6ec1872fe14 100644
--- a/apps/docs/content/docs/en/blocks/response.mdx
+++ b/apps/docs/content/docs/en/blocks/response.mdx
@@ -20,7 +20,7 @@ The Response block formats and sends structured HTTP responses back to API calle
 </div>
 
 <Callout type="info">
-  Response blocks are terminal blocks - they end workflow execution and cannot connect to other blocks.
+  Response blocks are exit points — when a Response block executes, it ends the workflow and sends the HTTP response immediately. Multiple Response blocks can be placed on different branches (e.g. after a Router or Condition), but only the first one to execute determines the API response.
 </Callout>
 
 ## Configuration Options
@@ -77,7 +77,11 @@ Condition (Error Detected) → Router → Response (400/500, Error Details)
 
 ## Outputs
 
-Response blocks are terminal — no downstream blocks execute after them. However, the block does define outputs (`data`, `status`, `headers`) which are used to construct the HTTP response sent back to the API caller.
+Response blocks are exit points — when one executes, no further blocks run. The block defines outputs (`data`, `status`, `headers`) which are used to construct the HTTP response sent back to the API caller.
+
+<Callout type="warning">
+  If a Response block is placed on a parallel branch, there are no guarantees about whether other parallel blocks will run or not. Execution order across parallel branches is non-deterministic, so a parallel block may execute before or after the Response block on any given run. Avoid placing Response blocks in parallel with blocks that have important side effects.
+</Callout>
 
 ## Variable References
 
@@ -110,10 +114,10 @@ Use the `<variable.name>` syntax to dynamically insert workflow variables into y
 - **Validate variable references**: Ensure all referenced variables exist and contain the expected data types before the Response block executes
 
 <FAQ items={[
-  { question: "Can I have multiple Response blocks in a workflow?", answer: "No. The Response block is a single-instance block — only one is allowed per workflow. If you need different responses for different conditions, use a Condition or Router block upstream to determine what data reaches the single Response block." },
+  { question: "Can I have multiple Response blocks in a workflow?", answer: "Yes. You can place multiple Response blocks on different branches (e.g. after a Router or Condition block). The first Response block to execute determines the API response and ends the workflow. This is useful for returning different responses based on conditions — for example, a 200 on the success branch and a 500 on the error branch." },
   { question: "What triggers require a Response block?", answer: "The Response block is designed for use with the API Trigger. When your workflow is invoked via the API, the Response block sends the structured HTTP response back to the caller. Other trigger types (like webhooks or schedules) do not require a Response block." },
   { question: "What is the difference between Builder and Editor mode?", answer: "Builder mode provides a visual interface for constructing your response structure with fields and types. Editor mode gives you a raw JSON code editor where you can write the response body directly. Builder mode is recommended for most use cases." },
   { question: "What is the default status code?", answer: "If you do not specify a status code, the Response block defaults to 200 (OK). You can set any valid HTTP status code including error codes like 400, 404, or 500." },
-  { question: "Can the Response block connect to downstream blocks?", answer: "No. Response blocks are terminal — they end workflow execution and send the HTTP response. No further blocks can be connected after a Response block." },
+  { question: "Can the Response block connect to downstream blocks?", answer: "No. Response blocks are exit points — they end workflow execution and send the HTTP response. No further blocks can execute after a Response block." },
 ]} />
 
diff --git a/apps/docs/content/docs/en/execution/basics.mdx b/apps/docs/content/docs/en/execution/basics.mdx
index 1541831e770..1777b7fdcfb 100644
--- a/apps/docs/content/docs/en/execution/basics.mdx
+++ b/apps/docs/content/docs/en/execution/basics.mdx
@@ -96,8 +96,9 @@ Understanding these core principles will help you build better workflows:
 2. **Automatic Parallelization**: Independent blocks run concurrently without configuration
 3. **Smart Data Flow**: Outputs flow automatically to connected blocks
 4. **Error Handling**: Failed blocks stop their execution path but don't affect independent paths
-5. **State Persistence**: All block outputs and execution details are preserved for debugging
-6. **Cycle Protection**: Workflows that call other workflows (via Workflow blocks, MCP tools, or API blocks) are tracked with a call chain. If the chain exceeds 25 hops, execution is stopped to prevent infinite loops
+5. **Response Blocks as Exit Points**: When a Response block executes, the entire workflow stops and the API response is sent immediately. Multiple Response blocks can exist on different branches — the first one to execute wins
+6. **State Persistence**: All block outputs and execution details are preserved for debugging
+7. **Cycle Protection**: Workflows that call other workflows (via Workflow blocks, MCP tools, or API blocks) are tracked with a call chain. If the chain exceeds 25 hops, execution is stopped to prevent infinite loops
 
 ## Next Steps
 
diff --git a/apps/docs/content/docs/en/tools/cursor.mdx b/apps/docs/content/docs/en/tools/cursor.mdx
index 09bcd4644f4..4e6f165c014 100644
--- a/apps/docs/content/docs/en/tools/cursor.mdx
+++ b/apps/docs/content/docs/en/tools/cursor.mdx
@@ -45,6 +45,7 @@ List all cloud agents for the authenticated user with optional pagination. Retur
 | `apiKey` | string | Yes | Cursor API key |
 | `limit` | number | No | Number of agents to return \(default: 20, max: 100\) |
 | `cursor` | string | No | Pagination cursor from previous response |
+| `prUrl` | string | No | Filter agents by pull request URL |
 
 #### Output
 
@@ -173,4 +174,41 @@ Permanently delete a cloud agent. Returns API-aligned fields only.
 | --------- | ---- | ----------- |
 | `id` | string | Agent ID |
 
+### `cursor_list_artifacts`
+
+List generated artifact files for a cloud agent. Returns API-aligned fields only.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Cursor API key |
+| `agentId` | string | Yes | Unique identifier for the cloud agent \(e.g., bc_abc123\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `artifacts` | array | List of artifact files |
+|   ↳ `path` | string | Artifact file path |
+|   ↳ `size` | number | File size in bytes |
+
+### `cursor_download_artifact`
+
+Download a generated artifact file from a cloud agent. Returns the file for execution storage.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Cursor API key |
+| `agentId` | string | Yes | Unique identifier for the cloud agent \(e.g., bc_abc123\) |
+| `path` | string | Yes | Absolute path of the artifact to download \(e.g., /src/index.ts\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `file` | file | Downloaded artifact file stored in execution files |
+
 
diff --git a/apps/sim/app/(auth)/auth-layout-client.tsx b/apps/sim/app/(auth)/auth-layout-client.tsx
index 3aee420922f..89aeb3a89e7 100644
--- a/apps/sim/app/(auth)/auth-layout-client.tsx
+++ b/apps/sim/app/(auth)/auth-layout-client.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect } from 'react'
 import AuthBackground from '@/app/(auth)/components/auth-background'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export default function AuthLayoutClient({ children }: { children: React.ReactNode }) {
   useEffect(() => {
diff --git a/apps/sim/app/(auth)/components/social-login-buttons.tsx b/apps/sim/app/(auth)/components/social-login-buttons.tsx
index 3545840681e..bf1d112c504 100644
--- a/apps/sim/app/(auth)/components/social-login-buttons.tsx
+++ b/apps/sim/app/(auth)/components/social-login-buttons.tsx
@@ -81,7 +81,7 @@ export function SocialLoginButtons({
   const githubButton = (
     <Button
       variant='outline'
-      className='w-full rounded-[10px]'
+      className='w-full rounded-sm border-[var(--landing-border-strong)] py-1.5 text-sm'
       disabled={!githubAvailable || isGithubLoading}
       onClick={signInWithGithub}
     >
@@ -93,7 +93,7 @@ export function SocialLoginButtons({
   const googleButton = (
     <Button
       variant='outline'
-      className='w-full rounded-[10px]'
+      className='w-full rounded-sm border-[var(--landing-border-strong)] py-1.5 text-sm'
       disabled={!googleAvailable || isGoogleLoading}
       onClick={signInWithGoogle}
     >
diff --git a/apps/sim/app/(auth)/components/sso-login-button.tsx b/apps/sim/app/(auth)/components/sso-login-button.tsx
index 2800c90ef5d..d3f50852e91 100644
--- a/apps/sim/app/(auth)/components/sso-login-button.tsx
+++ b/apps/sim/app/(auth)/components/sso-login-button.tsx
@@ -28,7 +28,9 @@ export function SSOLoginButton({
     router.push(ssoUrl)
   }
 
-  const outlineBtnClasses = cn('w-full rounded-[10px]')
+  const outlineBtnClasses = cn(
+    'w-full rounded-sm border-[var(--landing-border-strong)] py-1.5 text-sm'
+  )
 
   return (
     <Button
diff --git a/apps/sim/app/(auth)/components/status-page-layout.tsx b/apps/sim/app/(auth)/components/status-page-layout.tsx
index 417c5a582da..b26def8d71a 100644
--- a/apps/sim/app/(auth)/components/status-page-layout.tsx
+++ b/apps/sim/app/(auth)/components/status-page-layout.tsx
@@ -1,6 +1,6 @@
 import type { ReactNode } from 'react'
 import AuthBackground from '@/app/(auth)/components/auth-background'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 import { SupportFooter } from './support-footer'
 
 export interface StatusPageLayoutProps {
diff --git a/apps/sim/app/(home)/components/hero/components/animated-blocks.tsx b/apps/sim/app/(home)/components/hero/components/animated-blocks.tsx
deleted file mode 100644
index f85a6304251..00000000000
--- a/apps/sim/app/(home)/components/hero/components/animated-blocks.tsx
+++ /dev/null
@@ -1,584 +0,0 @@
-'use client'
-
-import { useEffect, useState } from 'react'
-import { motion, type Variants } from 'framer-motion'
-
-/** Stagger between each block appearing (seconds). */
-const ENTER_STAGGER = 0.06
-
-/** Duration of each block's fade-in (seconds). */
-const ENTER_DURATION = 0.3
-
-/** Stagger between each block disappearing (seconds). */
-const EXIT_STAGGER = 0.12
-
-/** Duration of each block's fade-out (seconds). */
-const EXIT_DURATION = 0.5
-
-/** Shared corner radius for all decorative rects. */
-const RX = '2.59574'
-
-/** Hold time after the initial enter animation before cycling starts (ms). */
-const INITIAL_HOLD_MS = 2500
-
-/** Pause between an exit completing and the next enter starting (ms). */
-const TRANSITION_PAUSE_MS = 400
-
-/** Hold time between successive transitions (ms). */
-const HOLD_BETWEEN_MS = 2500
-
-/** Animation state for a block group. */
-export type BlockAnimState = 'entering' | 'visible' | 'exiting' | 'hidden'
-
-/** Positions around the hero where block groups can appear. */
-export type BlockPosition = 'topRight' | 'left' | 'rightEdge' | 'rightSide' | 'topLeft'
-
-/** Attributes for a single animated SVG rect. */
-interface BlockRect {
-  opacity: number
-  width: string
-  height: string
-  fill: string
-  x?: string
-  y?: string
-  transform?: string
-}
-
-const containerVariants: Variants = {
-  hidden: {},
-  visible: { transition: { staggerChildren: ENTER_STAGGER } },
-  exit: { transition: { staggerChildren: EXIT_STAGGER } },
-}
-
-const blockVariants: Variants = {
-  hidden: { opacity: 0, transition: { duration: 0 } },
-  visible: (targetOpacity: number) => ({
-    opacity: targetOpacity,
-    transition: { duration: ENTER_DURATION },
-  }),
-  exit: {
-    opacity: 0,
-    transition: { duration: EXIT_DURATION },
-  },
-}
-
-/** Maps a BlockAnimState to the framer-motion animate value. */
-function toAnimateValue(state: BlockAnimState): string {
-  if (state === 'entering' || state === 'visible') return 'visible'
-  if (state === 'exiting') return 'exit'
-  return 'hidden'
-}
-
-/** Shared SVG wrapper that staggers child rects in and out. */
-function AnimatedBlocksSvg({
-  width,
-  height,
-  viewBox,
-  rects,
-  animState = 'entering',
-}: {
-  width: number
-  height: number
-  viewBox: string
-  rects: readonly BlockRect[]
-  animState?: BlockAnimState
-}) {
-  return (
-    <motion.svg
-      width={width}
-      height={height}
-      viewBox={viewBox}
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-      className='h-auto w-full'
-      initial='hidden'
-      animate={toAnimateValue(animState)}
-      variants={containerVariants}
-    >
-      {rects.map((r, i) => (
-        <motion.rect
-          key={i}
-          variants={blockVariants}
-          custom={r.opacity}
-          x={r.x}
-          y={r.y}
-          width={r.width}
-          height={r.height}
-          rx={RX}
-          fill={r.fill}
-          transform={r.transform}
-        />
-      ))}
-    </motion.svg>
-  )
-}
-
-/**
- * Rect data for the top-right position.
- * Two-row horizontal strip, ordered left-to-right.
- */
-const TOP_RIGHT_RECTS: readonly BlockRect[] = [
-  { opacity: 1, x: '0', y: '0', width: '16.8626', height: '33.7252', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '0', y: '0', width: '85.3433', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 1, x: '0', y: '0', width: '16.8626', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '34.2403', y: '0', width: '34.2403', height: '33.7252', fill: '#2ABBF8' },
-  { opacity: 1, x: '34.2403', y: '0', width: '16.8626', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 1, x: '51.6188', y: '16.8626', width: '16.8626', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 1, x: '68.4812', y: '0', width: '54.6502', height: '16.8626', fill: '#00F701' },
-  { opacity: 0.6, x: '106.268', y: '0', width: '34.2403', height: '33.7252', fill: '#00F701' },
-  { opacity: 0.6, x: '106.268', y: '0', width: '51.103', height: '16.8626', fill: '#00F701' },
-  { opacity: 1, x: '123.6484', y: '16.8626', width: '16.8626', height: '16.8626', fill: '#00F701' },
-  { opacity: 0.6, x: '157.371', y: '0', width: '34.2403', height: '16.8626', fill: '#FFCC02' },
-  { opacity: 1, x: '157.371', y: '0', width: '16.8626', height: '16.8626', fill: '#FFCC02' },
-  { opacity: 0.6, x: '208.993', y: '0', width: '68.4805', height: '16.8626', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '209.137', y: '0', width: '16.8626', height: '33.7252', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '243.233', y: '0', width: '34.2403', height: '33.7252', fill: '#FA4EDF' },
-  { opacity: 1, x: '243.233', y: '0', width: '16.8626', height: '16.8626', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '260.096', y: '0', width: '34.04', height: '16.8626', fill: '#FA4EDF' },
-  { opacity: 1, x: '260.611', y: '16.8626', width: '16.8626', height: '16.8626', fill: '#FA4EDF' },
-]
-
-/**
- * Rect data for the top-left position.
- * Same two-row structure as top-right with rotated colour palette:
- * blue→green, green→yellow, yellow→pink, pink→blue.
- */
-const TOP_LEFT_RECTS: readonly BlockRect[] = [
-  { opacity: 1, x: '0', y: '0', width: '16.8626', height: '33.7252', fill: '#00F701' },
-  { opacity: 0.6, x: '0', y: '0', width: '85.3433', height: '16.8626', fill: '#00F701' },
-  { opacity: 1, x: '0', y: '0', width: '16.8626', height: '16.8626', fill: '#00F701' },
-  { opacity: 0.6, x: '34.2403', y: '0', width: '34.2403', height: '33.7252', fill: '#00F701' },
-  { opacity: 1, x: '34.2403', y: '0', width: '16.8626', height: '16.8626', fill: '#00F701' },
-  { opacity: 1, x: '51.6188', y: '16.8626', width: '16.8626', height: '16.8626', fill: '#00F701' },
-  { opacity: 1, x: '68.4812', y: '0', width: '54.6502', height: '16.8626', fill: '#FFCC02' },
-  { opacity: 0.6, x: '106.268', y: '0', width: '34.2403', height: '33.7252', fill: '#FFCC02' },
-  { opacity: 0.6, x: '106.268', y: '0', width: '51.103', height: '16.8626', fill: '#FFCC02' },
-  { opacity: 1, x: '123.6484', y: '16.8626', width: '16.8626', height: '16.8626', fill: '#FFCC02' },
-  { opacity: 0.6, x: '157.371', y: '0', width: '34.2403', height: '16.8626', fill: '#FA4EDF' },
-  { opacity: 1, x: '157.371', y: '0', width: '16.8626', height: '16.8626', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '208.993', y: '0', width: '68.4805', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '209.137', y: '0', width: '16.8626', height: '33.7252', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '243.233', y: '0', width: '34.2403', height: '33.7252', fill: '#2ABBF8' },
-  { opacity: 1, x: '243.233', y: '0', width: '16.8626', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '260.096', y: '0', width: '34.04', height: '16.8626', fill: '#2ABBF8' },
-  { opacity: 1, x: '260.611', y: '16.8626', width: '16.8626', height: '16.8626', fill: '#2ABBF8' },
-]
-
-/**
- * Rect data for the left position.
- * Two-column vertical strip, ordered top-to-bottom.
- */
-const LEFT_RECTS: readonly BlockRect[] = [
-  {
-    opacity: 0.6,
-    width: '34.240',
-    height: '33.725',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0 0)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '68.480',
-    fill: '#FA4EDF',
-    transform: 'matrix(-1 0 0 1 33.727 0)',
-  },
-  {
-    opacity: 1,
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#FA4EDF',
-    transform: 'matrix(-1 0 0 1 33.727 17.378)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '33.986',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0 51.616)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '140.507',
-    fill: '#00F701',
-    transform: 'matrix(-1 0 0 1 33.986 85.335)',
-  },
-  {
-    opacity: 0.4,
-    x: '17.119',
-    y: '136.962',
-    width: '34.240',
-    height: '16.8626',
-    fill: '#FFCC02',
-    transform: 'rotate(-90 17.119 136.962)',
-  },
-  {
-    opacity: 1,
-    x: '17.119',
-    y: '136.962',
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#FFCC02',
-    transform: 'rotate(-90 17.119 136.962)',
-  },
-  {
-    opacity: 0.5,
-    width: '34.240',
-    height: '33.725',
-    fill: '#00F701',
-    transform: 'matrix(0 1 1 0 0.257 153.825)',
-  },
-  {
-    opacity: 1,
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#00F701',
-    transform: 'matrix(0 1 1 0 0.257 153.825)',
-  },
-]
-
-/**
- * Rect data for the right-side position (right edge of screenshot).
- * Same two-column structure as left with rotated colours:
- * pink→blue, green→pink, yellow→green.
- */
-const RIGHT_SIDE_RECTS: readonly BlockRect[] = [
-  {
-    opacity: 0.6,
-    width: '34.240',
-    height: '33.725',
-    fill: '#2ABBF8',
-    transform: 'matrix(0 1 1 0 0 0)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '68.480',
-    fill: '#2ABBF8',
-    transform: 'matrix(-1 0 0 1 33.727 0)',
-  },
-  {
-    opacity: 1,
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#2ABBF8',
-    transform: 'matrix(-1 0 0 1 33.727 17.378)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '33.986',
-    fill: '#2ABBF8',
-    transform: 'matrix(0 1 1 0 0 51.616)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '140.507',
-    fill: '#FA4EDF',
-    transform: 'matrix(-1 0 0 1 33.986 85.335)',
-  },
-  {
-    opacity: 0.4,
-    x: '17.119',
-    y: '136.962',
-    width: '34.240',
-    height: '16.8626',
-    fill: '#00F701',
-    transform: 'rotate(-90 17.119 136.962)',
-  },
-  {
-    opacity: 1,
-    x: '17.119',
-    y: '136.962',
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#00F701',
-    transform: 'rotate(-90 17.119 136.962)',
-  },
-  {
-    opacity: 0.5,
-    width: '34.240',
-    height: '33.725',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0.257 153.825)',
-  },
-  {
-    opacity: 1,
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0.257 153.825)',
-  },
-]
-
-/**
- * Rect data for the right-edge position (far right of screen).
- * Two-column vertical strip, ordered top-to-bottom.
- */
-const RIGHT_RECTS: readonly BlockRect[] = [
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '33.726',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0 0)',
-  },
-  {
-    opacity: 0.6,
-    width: '34.241',
-    height: '16.8626',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 16.891 0)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '68.482',
-    fill: '#FA4EDF',
-    transform: 'matrix(-1 0 0 1 33.739 16.888)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '33.726',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0 33.776)',
-  },
-  {
-    opacity: 1,
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#FA4EDF',
-    transform: 'matrix(-1 0 0 1 33.739 34.272)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '33.726',
-    fill: '#FA4EDF',
-    transform: 'matrix(0 1 1 0 0.012 68.510)',
-  },
-  {
-    opacity: 0.6,
-    width: '16.8626',
-    height: '102.384',
-    fill: '#2ABBF8',
-    transform: 'matrix(-1 0 0 1 33.787 102.384)',
-  },
-  {
-    opacity: 0.4,
-    x: '17.131',
-    y: '153.859',
-    width: '34.241',
-    height: '16.8626',
-    fill: '#00F701',
-    transform: 'rotate(-90 17.131 153.859)',
-  },
-  {
-    opacity: 1,
-    x: '17.131',
-    y: '153.859',
-    width: '16.8626',
-    height: '16.8626',
-    fill: '#00F701',
-    transform: 'rotate(-90 17.131 153.859)',
-  },
-]
-
-/** Number of rects per position, used to compute animation durations. */
-const RECT_COUNTS: Record<BlockPosition, number> = {
-  topRight: TOP_RIGHT_RECTS.length,
-  topLeft: TOP_LEFT_RECTS.length,
-  left: LEFT_RECTS.length,
-  rightSide: RIGHT_SIDE_RECTS.length,
-  rightEdge: RIGHT_RECTS.length,
-}
-
-/** Total enter animation time for a position (seconds). */
-function enterTime(pos: BlockPosition): number {
-  return (RECT_COUNTS[pos] - 1) * ENTER_STAGGER + ENTER_DURATION
-}
-
-/** Total exit animation time for a position (seconds). */
-function exitTime(pos: BlockPosition): number {
-  return (RECT_COUNTS[pos] - 1) * EXIT_STAGGER + EXIT_DURATION
-}
-
-/** A single step in the repeating animation cycle. */
-type CycleStep =
-  | { action: 'exit'; position: BlockPosition }
-  | { action: 'enter'; position: BlockPosition }
-  | { action: 'hold'; ms: number }
-
-/**
- * The repeating cycle sequence. After all steps, the layout returns to its
- * initial state (topRight + left + rightEdge) so the loop is seamless.
- *
- * Order: exit top → exit right-edge → enter right-side-of-preview →
- * exit left → enter top-left → exit right-side → enter left →
- * exit top-left → enter top-right → enter right-edge → back to initial.
- */
-const CYCLE_STEPS: readonly CycleStep[] = [
-  { action: 'exit', position: 'topRight' },
-  { action: 'exit', position: 'rightEdge' },
-  { action: 'enter', position: 'rightSide' },
-  { action: 'hold', ms: HOLD_BETWEEN_MS },
-  { action: 'exit', position: 'left' },
-  { action: 'enter', position: 'topLeft' },
-  { action: 'hold', ms: HOLD_BETWEEN_MS },
-  { action: 'exit', position: 'rightSide' },
-  { action: 'enter', position: 'left' },
-  { action: 'hold', ms: HOLD_BETWEEN_MS },
-  { action: 'exit', position: 'topLeft' },
-  { action: 'enter', position: 'topRight' },
-  { action: 'hold', ms: HOLD_BETWEEN_MS },
-  { action: 'enter', position: 'rightEdge' },
-  { action: 'hold', ms: HOLD_BETWEEN_MS },
-]
-
-/**
- * Drives the block-cycling animation loop. Returns the current animation
- * state for every position so each component can be driven declaratively.
- *
- * Lifecycle:
- * 1. All three initial groups (topRight, left, rightEdge) enter together.
- * 2. After a hold period the cycle begins, processing each step in order.
- * 3. Repeats indefinitely, returning to the initial layout every cycle.
- */
-export function useBlockCycle(): Record<BlockPosition, BlockAnimState> {
-  const [states, setStates] = useState<Record<BlockPosition, BlockAnimState>>({
-    topRight: 'entering',
-    left: 'entering',
-    rightEdge: 'entering',
-    rightSide: 'hidden',
-    topLeft: 'hidden',
-  })
-
-  useEffect(() => {
-    const cancelled = { current: false }
-    const delay = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms))
-
-    const run = async () => {
-      const longestEnter = Math.max(
-        enterTime('topRight'),
-        enterTime('left'),
-        enterTime('rightEdge')
-      )
-      await delay(longestEnter * 1000)
-      if (cancelled.current) return
-
-      setStates({
-        topRight: 'visible',
-        left: 'visible',
-        rightEdge: 'visible',
-        rightSide: 'hidden',
-        topLeft: 'hidden',
-      })
-
-      await delay(INITIAL_HOLD_MS)
-      if (cancelled.current) return
-
-      while (!cancelled.current) {
-        for (const step of CYCLE_STEPS) {
-          if (cancelled.current) return
-
-          if (step.action === 'exit') {
-            setStates((prev) => ({ ...prev, [step.position]: 'exiting' }))
-            await delay(exitTime(step.position) * 1000)
-            if (cancelled.current) return
-            setStates((prev) => ({ ...prev, [step.position]: 'hidden' }))
-            await delay(TRANSITION_PAUSE_MS)
-          } else if (step.action === 'enter') {
-            setStates((prev) => ({ ...prev, [step.position]: 'entering' }))
-            await delay(enterTime(step.position) * 1000)
-            if (cancelled.current) return
-            setStates((prev) => ({ ...prev, [step.position]: 'visible' }))
-            await delay(TRANSITION_PAUSE_MS)
-          } else {
-            await delay(step.ms)
-          }
-
-          if (cancelled.current) return
-        }
-      }
-    }
-
-    run()
-    return () => {
-      cancelled.current = true
-    }
-  }, [])
-
-  return states
-}
-
-interface AnimatedBlockProps {
-  animState?: BlockAnimState
-}
-
-/** Two-row horizontal strip at the top-right of the hero. */
-export function BlocksTopRightAnimated({ animState = 'entering' }: AnimatedBlockProps) {
-  return (
-    <AnimatedBlocksSvg
-      width={295}
-      height={34}
-      viewBox='0 0 295 34'
-      rects={TOP_RIGHT_RECTS}
-      animState={animState}
-    />
-  )
-}
-
-/** Two-row horizontal strip at the top-left of the hero. */
-export function BlocksTopLeftAnimated({ animState = 'entering' }: AnimatedBlockProps) {
-  return (
-    <AnimatedBlocksSvg
-      width={295}
-      height={34}
-      viewBox='0 0 295 34'
-      rects={TOP_LEFT_RECTS}
-      animState={animState}
-    />
-  )
-}
-
-/** Two-column vertical strip on the left edge of the screenshot. */
-export function BlocksLeftAnimated({ animState = 'entering' }: AnimatedBlockProps) {
-  return (
-    <AnimatedBlocksSvg
-      width={34}
-      height={226}
-      viewBox='0 0 34 226.021'
-      rects={LEFT_RECTS}
-      animState={animState}
-    />
-  )
-}
-
-/** Two-column vertical strip on the right edge of the screenshot. */
-export function BlocksRightSideAnimated({ animState = 'entering' }: AnimatedBlockProps) {
-  return (
-    <AnimatedBlocksSvg
-      width={34}
-      height={226}
-      viewBox='0 0 34 226.021'
-      rects={RIGHT_SIDE_RECTS}
-      animState={animState}
-    />
-  )
-}
-
-/** Two-column vertical strip at the far-right edge of the screen. */
-export function BlocksRightAnimated({ animState = 'entering' }: AnimatedBlockProps) {
-  return (
-    <AnimatedBlocksSvg
-      width={34}
-      height={205}
-      viewBox='0 0 34 204.769'
-      rects={RIGHT_RECTS}
-      animState={animState}
-    />
-  )
-}
diff --git a/apps/sim/app/(home)/components/hero/hero.tsx b/apps/sim/app/(home)/components/hero/hero.tsx
deleted file mode 100644
index a257e2c1155..00000000000
--- a/apps/sim/app/(home)/components/hero/hero.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-'use client'
-
-import dynamic from 'next/dynamic'
-import Image from 'next/image'
-import Link from 'next/link'
-import { DemoRequestModal } from '@/app/(home)/components/demo-request/demo-request-modal'
-import {
-  BlocksLeftAnimated,
-  BlocksRightAnimated,
-  BlocksRightSideAnimated,
-  BlocksTopLeftAnimated,
-  BlocksTopRightAnimated,
-  useBlockCycle,
-} from '@/app/(home)/components/hero/components/animated-blocks'
-
-const LandingPreview = dynamic(
-  () =>
-    import('@/app/(home)/components/landing-preview/landing-preview').then(
-      (mod) => mod.LandingPreview
-    ),
-  {
-    ssr: false,
-    loading: () => <div className='aspect-[1116/549] w-full rounded bg-[var(--landing-bg)]' />,
-  }
-)
-
-/** Shared base classes for CTA link buttons — matches Deploy/Run button styling in the preview panel. */
-const CTA_BASE =
-  'inline-flex items-center h-[32px] rounded-[5px] border px-2.5 font-[430] font-season text-sm'
-
-export default function Hero() {
-  const blockStates = useBlockCycle()
-
-  return (
-    <section
-      id='hero'
-      aria-labelledby='hero-heading'
-      className='relative flex flex-col items-center overflow-hidden bg-[var(--landing-bg)] pt-[60px] pb-3 lg:pt-[100px]'
-    >
-      <p className='sr-only'>
-        Sim is the open-source platform to build AI agents and run your agentic workforce. Connect
-        1,000+ integrations and LLMs — including OpenAI, Claude, Gemini, Mistral, and xAI — to
-        deploy and orchestrate agentic workflows. Create agents, workflows, knowledge bases, tables,
-        and docs. Trusted by over 100,000 builders at startups and Fortune 500 companies. SOC2 and
-        SOC2 compliant.
-      </p>
-
-      <div
-        aria-hidden='true'
-        className='pointer-events-none absolute top-[-0.7vw] left-[-2.8vw] z-0 aspect-[344/328] w-[23.9vw]'
-      >
-        <Image src='/landing/card-left.svg' alt='' fill className='object-contain' />
-      </div>
-
-      <div
-        aria-hidden='true'
-        className='pointer-events-none absolute top-[-2.8vw] right-[-4vw] z-0 aspect-[471/470] w-[32.7vw]'
-      >
-        <Image src='/landing/card-right.svg' alt='' fill className='object-contain' />
-      </div>
-
-      <div className='relative z-10 flex flex-col items-center gap-3'>
-        <h1
-          id='hero-heading'
-          className='text-balance font-[430] font-season text-[36px] text-white leading-[100%] tracking-[-0.02em] sm:text-[48px] lg:text-[72px]'
-        >
-          Build AI Agents
-        </h1>
-        <p className='font-[430] font-season text-[color-mix(in_srgb,var(--landing-text-subtle)_60%,transparent)] text-base leading-[125%] tracking-[0.02em] lg:text-lg'>
-          Sim is the AI Workspace for Agent Builders.
-        </p>
-
-        <div className='mt-3 flex items-center gap-2'>
-          <DemoRequestModal>
-            <button
-              type='button'
-              className={`${CTA_BASE} border-[var(--landing-border-strong)] bg-transparent text-[var(--landing-text)] transition-colors hover:bg-[var(--landing-bg-elevated)]`}
-              aria-label='Get a demo'
-            >
-              Get a demo
-            </button>
-          </DemoRequestModal>
-          <Link
-            href='/signup'
-            className={`${CTA_BASE} gap-2 border-white bg-white text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]`}
-            aria-label='Get started with Sim'
-          >
-            Get started
-          </Link>
-        </div>
-      </div>
-
-      <div
-        aria-hidden='true'
-        className='pointer-events-none absolute top-0 right-[13.1vw] z-20 w-[calc(140px_+_10.76vw)] max-w-[295px]'
-      >
-        <BlocksTopRightAnimated animState={blockStates.topRight} />
-      </div>
-
-      <div
-        aria-hidden='true'
-        className='pointer-events-none absolute top-0 left-[16vw] z-20 w-[calc(140px_+_10.76vw)] max-w-[295px]'
-      >
-        <BlocksTopLeftAnimated animState={blockStates.topLeft} />
-      </div>
-
-      <div className='relative z-10 mx-auto mt-[3.2vw] w-[78.9vw] px-[1.4vw]'>
-        <div
-          aria-hidden='true'
-          className='-translate-y-1/2 pointer-events-none absolute top-[50%] right-[calc(100%-1.41vw)] z-20 w-[calc(16px_+_1.25vw)] max-w-[34px]'
-        >
-          <BlocksLeftAnimated animState={blockStates.left} />
-        </div>
-
-        <div
-          aria-hidden='true'
-          className='-translate-y-1/2 pointer-events-none absolute top-[50%] left-[calc(100%-1.41vw)] z-20 w-[calc(16px_+_1.25vw)] max-w-[34px] scale-x-[-1]'
-        >
-          <BlocksRightSideAnimated animState={blockStates.rightSide} />
-        </div>
-
-        <div className='relative z-10 overflow-hidden rounded border border-[var(--landing-bg-elevated)]'>
-          <LandingPreview />
-        </div>
-      </div>
-
-      <div
-        aria-hidden='true'
-        className='-translate-y-1/2 pointer-events-none absolute top-[50%] right-0 z-20 w-[calc(16px_+_1.25vw)] max-w-[34px]'
-      >
-        <BlocksRightAnimated animState={blockStates.rightEdge} />
-      </div>
-    </section>
-  )
-}
diff --git a/apps/sim/app/(home)/components/index.ts b/apps/sim/app/(home)/components/index.ts
deleted file mode 100644
index b05b10953e2..00000000000
--- a/apps/sim/app/(home)/components/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import Collaboration from '@/app/(home)/components/collaboration/collaboration'
-import Enterprise from '@/app/(home)/components/enterprise/enterprise'
-import Features from '@/app/(home)/components/features/features'
-import Footer from '@/app/(home)/components/footer/footer'
-import Hero from '@/app/(home)/components/hero/hero'
-import Navbar from '@/app/(home)/components/navbar/navbar'
-import Pricing from '@/app/(home)/components/pricing/pricing'
-import StructuredData from '@/app/(home)/components/structured-data'
-import Templates from '@/app/(home)/components/templates/templates'
-import Testimonials from '@/app/(home)/components/testimonials/testimonials'
-
-export {
-  Collaboration,
-  Enterprise,
-  Features,
-  Footer,
-  Hero,
-  Navbar,
-  Pricing,
-  StructuredData,
-  Templates,
-  Testimonials,
-}
diff --git a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx b/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
deleted file mode 100644
index 3a7b88d2ff6..00000000000
--- a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-'use client'
-
-import { memo, useCallback, useRef, useState } from 'react'
-import { ArrowUp } from 'lucide-react'
-import { useLandingSubmit } from '@/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
-import { useAnimatedPlaceholder } from '@/hooks/use-animated-placeholder'
-
-const C = {
-  SURFACE: '#292929',
-  BORDER: '#3d3d3d',
-  TEXT_PRIMARY: '#e6e6e6',
-} as const
-
-/**
- * Landing preview replica of the workspace Home initial view.
- * Shows a greeting heading and a minimal chat input (no + or mic).
- * On submit, stores the prompt and redirects to /signup.
- */
-export const LandingPreviewHome = memo(function LandingPreviewHome() {
-  const landingSubmit = useLandingSubmit()
-  const [inputValue, setInputValue] = useState('')
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const animatedPlaceholder = useAnimatedPlaceholder()
-
-  const isEmpty = inputValue.trim().length === 0
-
-  const handleSubmit = useCallback(() => {
-    if (isEmpty) return
-    landingSubmit(inputValue)
-  }, [isEmpty, inputValue, landingSubmit])
-
-  const MAX_HEIGHT = 200
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      if (e.key === 'Enter' && !e.shiftKey) {
-        e.preventDefault()
-        handleSubmit()
-      }
-    },
-    [handleSubmit]
-  )
-
-  const handleInput = useCallback((e: React.FormEvent<HTMLTextAreaElement>) => {
-    const target = e.target as HTMLTextAreaElement
-    target.style.height = 'auto'
-    target.style.height = `${Math.min(target.scrollHeight, MAX_HEIGHT)}px`
-  }, [])
-
-  return (
-    <div className='flex min-w-0 flex-1 flex-col items-center justify-center px-6 pb-[2vh]'>
-      <p
-        role='presentation'
-        className='mb-6 max-w-[42rem] font-[430] font-season text-[32px] tracking-[-0.02em]'
-        style={{ color: C.TEXT_PRIMARY }}
-      >
-        What should we get done?
-      </p>
-
-      <div className='w-full max-w-[32rem]'>
-        <div
-          className='cursor-text rounded-[20px] border px-2.5 py-2'
-          style={{ borderColor: C.BORDER, backgroundColor: C.SURFACE }}
-          onClick={() => textareaRef.current?.focus()}
-        >
-          <textarea
-            ref={textareaRef}
-            value={inputValue}
-            onChange={(e) => setInputValue(e.target.value)}
-            onKeyDown={handleKeyDown}
-            onInput={handleInput}
-            placeholder={animatedPlaceholder}
-            rows={1}
-            className='m-0 box-border min-h-[24px] w-full resize-none overflow-y-auto border-0 bg-transparent px-1 py-1 font-body text-[15px] leading-[24px] tracking-[-0.015em] outline-none placeholder:font-[380] placeholder:text-[#787878] focus-visible:ring-0'
-            style={{
-              color: C.TEXT_PRIMARY,
-              caretColor: C.TEXT_PRIMARY,
-              maxHeight: `${MAX_HEIGHT}px`,
-            }}
-          />
-          <div className='flex items-center justify-end'>
-            <button
-              type='button'
-              onClick={handleSubmit}
-              disabled={isEmpty}
-              className='flex h-[28px] w-[28px] items-center justify-center rounded-full border-0 p-0 transition-colors'
-              style={{
-                background: isEmpty ? '#808080' : '#e0e0e0',
-                cursor: isEmpty ? 'not-allowed' : 'pointer',
-              }}
-            >
-              <ArrowUp size={16} strokeWidth={2.25} color='#1b1b1b' />
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-})
diff --git a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx b/apps/sim/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
deleted file mode 100644
index 83f4b097f30..00000000000
--- a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-'use client'
-
-import { memo, useCallback, useRef, useState } from 'react'
-import { ArrowUp } from 'lucide-react'
-import Link from 'next/link'
-import { useRouter } from 'next/navigation'
-import { createPortal } from 'react-dom'
-import { BubbleChatPreview, ChevronDown, MoreHorizontal, Play } from '@/components/emcn'
-import { LandingPromptStorage } from '@/lib/core/utils/browser-storage'
-
-/**
- * Stores the prompt in browser storage and redirects to /signup.
- * Shared by both the copilot panel and the landing home view.
- */
-export function useLandingSubmit() {
-  const router = useRouter()
-  return useCallback(
-    (text: string) => {
-      const trimmed = text.trim()
-      if (!trimmed) return
-      LandingPromptStorage.store(trimmed)
-      router.push('/signup')
-    },
-    [router]
-  )
-}
-
-/**
- * Lightweight static panel replicating the real workspace panel styling.
- * The copilot tab is active with a functional user input.
- * When submitted, stores the prompt and redirects to /signup (same as landing hero).
- *
- * Structure mirrors the real Panel component:
- *   aside > div.border-l.pt-[14px] > Header(px-8) > Tabs(px-8,pt-14) > Content(pt-12)
- *     inside Content > Copilot > header-bar(mx-[-1px]) > UserInput(p-8)
- */
-export const LandingPreviewPanel = memo(function LandingPreviewPanel() {
-  const landingSubmit = useLandingSubmit()
-  const [inputValue, setInputValue] = useState('')
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const [cursorPos, setCursorPos] = useState<{ x: number; y: number } | null>(null)
-
-  const isEmpty = inputValue.trim().length === 0
-
-  const handleSubmit = useCallback(() => {
-    if (isEmpty) return
-    landingSubmit(inputValue)
-  }, [isEmpty, inputValue, landingSubmit])
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      if (e.key === 'Enter' && !e.shiftKey) {
-        e.preventDefault()
-        handleSubmit()
-      }
-    },
-    [handleSubmit]
-  )
-
-  return (
-    <div className='flex h-full w-[280px] flex-shrink-0 flex-col bg-[#1e1e1e]'>
-      <div className='flex h-full flex-col border-[#2c2c2c] border-l pt-3.5'>
-        {/* Header — More + Chat | Deploy + Run */}
-        <div className='flex flex-shrink-0 items-center justify-between px-2'>
-          <div className='pointer-events-none flex gap-1.5'>
-            <div className='flex h-[30px] w-[30px] items-center justify-center rounded-[5px] border border-[#3d3d3d] bg-[#363636]'>
-              <MoreHorizontal className='h-[14px] w-[14px] text-[#e6e6e6]' />
-            </div>
-            <div className='flex h-[30px] w-[30px] items-center justify-center rounded-[5px] border border-[#3d3d3d] bg-[#363636]'>
-              <BubbleChatPreview className='h-[14px] w-[14px] text-[#e6e6e6]' />
-            </div>
-          </div>
-          <Link
-            href='/signup'
-            className='flex gap-1.5'
-            onMouseMove={(e) => setCursorPos({ x: e.clientX, y: e.clientY })}
-            onMouseLeave={() => setCursorPos(null)}
-          >
-            <div className='flex h-[30px] items-center rounded-[5px] bg-[#33C482] px-2.5 transition-colors hover:bg-[#2DAC72]'>
-              <span className='font-medium text-[#1b1b1b] text-[12px]'>Deploy</span>
-            </div>
-            <div className='flex h-[30px] items-center gap-2 rounded-[5px] bg-[#33C482] px-2.5 transition-colors hover:bg-[#2DAC72]'>
-              <Play className='h-[11.5px] w-[11.5px] text-[#1b1b1b]' />
-              <span className='font-medium text-[#1b1b1b] text-[12px]'>Run</span>
-            </div>
-          </Link>
-          {cursorPos &&
-            createPortal(
-              <div
-                className='pointer-events-none fixed z-[9999]'
-                style={{ left: cursorPos.x + 14, top: cursorPos.y + 14 }}
-              >
-                {/* Decorative color bars — mirrors hero top-right block sequence */}
-                <div className='flex h-[4px]'>
-                  <div className='h-full w-[8px] bg-[#2ABBF8]' />
-                  <div className='h-full w-[14px] bg-[#2ABBF8] opacity-60' />
-                  <div className='h-full w-[8px] bg-[#00F701]' />
-                  <div className='h-full w-[16px] bg-[#00F701] opacity-60' />
-                  <div className='h-full w-[8px] bg-[#FFCC02]' />
-                  <div className='h-full w-[10px] bg-[#FFCC02] opacity-60' />
-                  <div className='h-full w-[8px] bg-[#FA4EDF]' />
-                  <div className='h-full w-[14px] bg-[#FA4EDF] opacity-60' />
-                </div>
-                <div className='flex items-center gap-[5px] bg-white px-1.5 py-1 font-medium text-[#1C1C1C] text-[11px]'>
-                  Get started
-                  <ChevronDown className='-rotate-90 h-[7px] w-[7px] text-[#1C1C1C]' />
-                </div>
-              </div>,
-              document.body
-            )}
-        </div>
-
-        {/* Tabs */}
-        <div className='flex flex-shrink-0 items-center px-2 pt-3.5'>
-          <div className='pointer-events-none flex gap-1'>
-            <div className='flex h-[28px] items-center rounded-[6px] border border-[#3d3d3d] bg-[#363636] px-2 py-[5px]'>
-              <span className='font-medium text-[#e6e6e6] text-[12.5px]'>Copilot</span>
-            </div>
-            <div className='flex h-[28px] items-center rounded-[6px] border border-transparent px-2 py-[5px]'>
-              <span className='font-medium text-[#787878] text-[12.5px]'>Toolbar</span>
-            </div>
-            <div className='flex h-[28px] items-center rounded-[6px] border border-transparent px-2 py-[5px]'>
-              <span className='font-medium text-[#787878] text-[12.5px]'>Editor</span>
-            </div>
-          </div>
-        </div>
-
-        {/* Tab content — copilot */}
-        <div className='flex flex-1 flex-col overflow-hidden pt-3'>
-          <div className='flex h-full flex-col'>
-            {/* Copilot header bar — matches mx-[-1px] in real copilot */}
-            <div className='pointer-events-none mx-[-1px] flex flex-shrink-0 items-center rounded-[4px] border border-[#2c2c2c] bg-[#292929] px-3 py-1.5'>
-              <span className='truncate font-medium text-[#e6e6e6] text-[14px]'>New Chat</span>
-            </div>
-
-            {/* User input — matches real UserInput at p-[8px] inside copilot welcome state */}
-            <div className='px-2 pt-3 pb-2'>
-              <div className='rounded-[4px] border border-[#3d3d3d] bg-[#292929] px-1.5 py-1.5'>
-                <textarea
-                  ref={textareaRef}
-                  value={inputValue}
-                  onChange={(e) => setInputValue(e.target.value)}
-                  onKeyDown={handleKeyDown}
-                  placeholder='Build an AI agent...'
-                  rows={2}
-                  className='mb-1.5 min-h-[48px] w-full cursor-text resize-none border-0 bg-transparent px-0.5 py-1 font-base text-[#e6e6e6] text-sm leading-[1.25rem] placeholder-[#787878] caret-[#e6e6e6] outline-none'
-                />
-                <div className='flex items-center justify-end'>
-                  <button
-                    type='button'
-                    onClick={handleSubmit}
-                    disabled={isEmpty}
-                    className='flex h-[22px] w-[22px] items-center justify-center rounded-full border-0 p-0 transition-colors'
-                    style={{
-                      background: isEmpty ? '#808080' : '#e0e0e0',
-                      cursor: isEmpty ? 'not-allowed' : 'pointer',
-                    }}
-                  >
-                    <ArrowUp size={14} strokeWidth={2.25} color='#1b1b1b' />
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-})
diff --git a/apps/sim/app/(home)/components/landing-preview/landing-preview.tsx b/apps/sim/app/(home)/components/landing-preview/landing-preview.tsx
deleted file mode 100644
index bdce9f565ae..00000000000
--- a/apps/sim/app/(home)/components/landing-preview/landing-preview.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { motion, type Variants } from 'framer-motion'
-import { LandingPreviewFiles } from '@/app/(home)/components/landing-preview/components/landing-preview-files/landing-preview-files'
-import { LandingPreviewHome } from '@/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home'
-import { LandingPreviewKnowledge } from '@/app/(home)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge'
-import { LandingPreviewLogs } from '@/app/(home)/components/landing-preview/components/landing-preview-logs/landing-preview-logs'
-import { LandingPreviewPanel } from '@/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
-import { LandingPreviewScheduledTasks } from '@/app/(home)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks'
-import type { SidebarView } from '@/app/(home)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar'
-import { LandingPreviewSidebar } from '@/app/(home)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar'
-import { LandingPreviewTables } from '@/app/(home)/components/landing-preview/components/landing-preview-tables/landing-preview-tables'
-import { LandingPreviewWorkflow } from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow'
-import {
-  EASE_OUT,
-  PREVIEW_WORKFLOWS,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/workflow-data'
-
-const containerVariants: Variants = {
-  hidden: {},
-  visible: {
-    transition: { staggerChildren: 0.15 },
-  },
-}
-
-const sidebarVariants: Variants = {
-  hidden: { opacity: 0, x: -12 },
-  visible: {
-    opacity: 1,
-    x: 0,
-    transition: {
-      x: { duration: 0.25, ease: EASE_OUT },
-      opacity: { duration: 0.25, ease: EASE_OUT },
-    },
-  },
-}
-
-const panelVariants: Variants = {
-  hidden: { opacity: 0, x: 12 },
-  visible: {
-    opacity: 1,
-    x: 0,
-    transition: {
-      x: { duration: 0.25, ease: EASE_OUT },
-      opacity: { duration: 0.25, ease: EASE_OUT },
-    },
-  },
-}
-
-/**
- * Interactive workspace preview for the hero section.
- *
- * Renders a lightweight replica of the Sim workspace with:
- * - A sidebar with selectable workflows and workspace nav items
- * - A ReactFlow canvas showing the active workflow's blocks and edges
- * - Static previews of Tables, Files, Knowledge Base, Logs, and Scheduled Tasks
- * - A panel with a functional copilot input (stores prompt + redirects to /signup)
- *
- * Only workflow items, the home button, workspace nav items, and the copilot input
- * are interactive. Animations only fire on initial load.
- */
-export function LandingPreview() {
-  const [activeView, setActiveView] = useState<SidebarView>('workflow')
-  const [activeWorkflowId, setActiveWorkflowId] = useState(PREVIEW_WORKFLOWS[0].id)
-  const isInitialMount = useRef(true)
-
-  useEffect(() => {
-    isInitialMount.current = false
-  }, [])
-
-  const handleSelectWorkflow = useCallback((id: string) => {
-    setActiveWorkflowId(id)
-    setActiveView('workflow')
-  }, [])
-
-  const handleSelectHome = useCallback(() => {
-    setActiveView('home')
-  }, [])
-
-  const handleSelectNav = useCallback((id: SidebarView) => {
-    setActiveView(id)
-  }, [])
-
-  const activeWorkflow =
-    PREVIEW_WORKFLOWS.find((w) => w.id === activeWorkflowId) ?? PREVIEW_WORKFLOWS[0]
-
-  const isWorkflowView = activeView === 'workflow'
-
-  function renderContent() {
-    switch (activeView) {
-      case 'workflow':
-        return <LandingPreviewWorkflow workflow={activeWorkflow} animate={isInitialMount.current} />
-      case 'home':
-        return <LandingPreviewHome />
-      case 'tables':
-        return <LandingPreviewTables />
-      case 'files':
-        return <LandingPreviewFiles />
-      case 'knowledge':
-        return <LandingPreviewKnowledge />
-      case 'logs':
-        return <LandingPreviewLogs />
-      case 'scheduled-tasks':
-        return <LandingPreviewScheduledTasks />
-    }
-  }
-
-  return (
-    <motion.div
-      className='dark flex aspect-[1116/549] w-full overflow-hidden rounded bg-[var(--landing-bg-surface)] antialiased'
-      initial='hidden'
-      animate='visible'
-      variants={containerVariants}
-    >
-      <motion.div className='hidden lg:flex' variants={sidebarVariants}>
-        <LandingPreviewSidebar
-          workflows={PREVIEW_WORKFLOWS}
-          activeWorkflowId={activeWorkflowId}
-          activeView={activeView}
-          onSelectWorkflow={handleSelectWorkflow}
-          onSelectHome={handleSelectHome}
-          onSelectNav={handleSelectNav}
-        />
-      </motion.div>
-      <div className='flex min-w-0 flex-1 flex-col py-2 pr-2 pl-2 lg:pl-0'>
-        <div className='flex flex-1 overflow-hidden rounded-[8px] border border-[#2c2c2c] bg-[var(--landing-bg)]'>
-          <div
-            className={
-              isWorkflowView
-                ? 'relative min-w-0 flex-1 overflow-hidden'
-                : 'relative flex min-w-0 flex-1 flex-col overflow-hidden'
-            }
-          >
-            {renderContent()}
-          </div>
-          <motion.div
-            className={isWorkflowView ? 'hidden lg:flex' : 'hidden'}
-            variants={panelVariants}
-          >
-            <LandingPreviewPanel />
-          </motion.div>
-        </div>
-      </div>
-    </motion.div>
-  )
-}
diff --git a/apps/sim/app/(home)/layout.tsx b/apps/sim/app/(home)/layout.tsx
deleted file mode 100644
index e4155273863..00000000000
--- a/apps/sim/app/(home)/layout.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
-import { season } from '@/app/_styles/fonts/season/season'
-
-/**
- * Landing page route-group layout.
- *
- * Applies landing-specific font CSS variables to the subtree:
- * - `--font-season` (Season Sans): Headings and display text
- * - `--font-martian-mono` (Martian Mono): Code snippets and technical accents
- *
- * Available to child components via Tailwind (`font-season`, `font-martian-mono`).
- *
- * SEO metadata for the `/` route is exported from `app/page.tsx` — not here.
- * This layout only applies when a `page.tsx` exists inside the `(home)/` route group.
- */
-export default function HomeLayout({ children }: { children: React.ReactNode }) {
-  return <div className={`${season.variable} ${martianMono.variable}`}>{children}</div>
-}
diff --git a/apps/sim/app/(home)/actions/github.ts b/apps/sim/app/(landing)/actions/github.ts
similarity index 100%
rename from apps/sim/app/(home)/actions/github.ts
rename to apps/sim/app/(landing)/actions/github.ts
diff --git a/apps/sim/app/(landing)/blog/layout.tsx b/apps/sim/app/(landing)/blog/layout.tsx
index b200ed5eada..9e6da7d5e85 100644
--- a/apps/sim/app/(landing)/blog/layout.tsx
+++ b/apps/sim/app/(landing)/blog/layout.tsx
@@ -1,6 +1,6 @@
 import { getNavBlogPosts } from '@/lib/blog/registry'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export default async function StudioLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
diff --git a/apps/sim/app/(landing)/blog/loading.tsx b/apps/sim/app/(landing)/blog/loading.tsx
index adedd43b08d..72e8a55f6ee 100644
--- a/apps/sim/app/(landing)/blog/loading.tsx
+++ b/apps/sim/app/(landing)/blog/loading.tsx
@@ -1,32 +1,55 @@
 import { Skeleton } from '@/components/emcn'
 
-const SKELETON_CARD_COUNT = 6
-
 export default function BlogLoading() {
   return (
-    <main className='mx-auto max-w-[1200px] px-6 py-12 sm:px-8 md:px-12'>
-      <Skeleton className='h-[48px] w-[100px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
-      <Skeleton className='mt-3 h-[18px] w-[420px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
-      <div className='mt-10 grid grid-cols-1 gap-4 md:grid-cols-2 md:gap-6 lg:grid-cols-3'>
-        {Array.from({ length: SKELETON_CARD_COUNT }).map((_, i) => (
-          <div
-            key={i}
-            className='flex flex-col overflow-hidden rounded-xl border border-[var(--landing-border)]'
-          >
-            <Skeleton className='aspect-video w-full rounded-none bg-[var(--landing-bg-elevated)]' />
-            <div className='flex flex-1 flex-col p-4'>
-              <Skeleton className='mb-2 h-[12px] w-[80px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
-              <Skeleton className='mb-1 h-[20px] w-[85%] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
-              <Skeleton className='mb-3 h-[14px] w-full rounded-[4px] bg-[var(--landing-bg-elevated)]' />
-              <Skeleton className='h-[14px] w-[70%] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
-              <div className='mt-3 flex items-center gap-2'>
-                <Skeleton className='h-[16px] w-[16px] rounded-full bg-[var(--landing-bg-elevated)]' />
-                <Skeleton className='h-[12px] w-[80px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+    <section className='bg-[var(--landing-bg)]'>
+      {/* Header skeleton */}
+      <div className='px-5 pt-[60px] lg:px-16 lg:pt-[100px]'>
+        <Skeleton className='mb-5 h-[20px] w-[60px] rounded-md bg-[var(--landing-bg-elevated)]' />
+        <div className='flex flex-col gap-4 md:flex-row md:items-end md:justify-between'>
+          <Skeleton className='h-[40px] w-[240px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+          <Skeleton className='h-[18px] w-[320px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+        </div>
+      </div>
+
+      {/* Content area with vertical border rails */}
+      <div className='mx-5 mt-8 border-[var(--landing-bg-elevated)] border-x lg:mx-16'>
+        <div className='h-px w-full bg-[var(--landing-bg-elevated)]' />
+
+        {/* Featured skeleton */}
+        <div className='flex'>
+          {Array.from({ length: 3 }).map((_, i) => (
+            <div
+              key={i}
+              className='flex flex-1 flex-col gap-4 border-[var(--landing-bg-elevated)] p-6 md:border-l md:first:border-l-0'
+            >
+              <Skeleton className='aspect-video w-full rounded-[5px] bg-[var(--landing-bg-elevated)]' />
+              <div className='flex flex-col gap-2'>
+                <Skeleton className='h-[12px] w-[60px] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+                <Skeleton className='h-[20px] w-[80%] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+                <Skeleton className='h-[14px] w-full rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <div className='h-px w-full bg-[var(--landing-bg-elevated)]' />
+
+        {/* List skeleton */}
+        {Array.from({ length: 5 }).map((_, i) => (
+          <div key={i}>
+            <div className='flex items-center gap-6 px-6 py-6'>
+              <Skeleton className='hidden h-[14px] w-[120px] rounded-[4px] bg-[var(--landing-bg-elevated)] md:block' />
+              <div className='flex min-w-0 flex-1 flex-col gap-1'>
+                <Skeleton className='h-[18px] w-[70%] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
+                <Skeleton className='h-[14px] w-[90%] rounded-[4px] bg-[var(--landing-bg-elevated)]' />
               </div>
+              <Skeleton className='hidden h-[80px] w-[140px] rounded-[5px] bg-[var(--landing-bg-elevated)] sm:block' />
             </div>
+            <div className='h-px w-full bg-[var(--landing-bg-elevated)]' />
           </div>
         ))}
       </div>
-    </main>
+    </section>
   )
 }
diff --git a/apps/sim/app/(landing)/blog/page.tsx b/apps/sim/app/(landing)/blog/page.tsx
index b385bbbf9f4..d938d014f97 100644
--- a/apps/sim/app/(landing)/blog/page.tsx
+++ b/apps/sim/app/(landing)/blog/page.tsx
@@ -1,7 +1,7 @@
 import type { Metadata } from 'next'
 import Link from 'next/link'
+import { Badge } from '@/components/emcn'
 import { getAllPostMeta } from '@/lib/blog/registry'
-import { PostGrid } from '@/app/(landing)/blog/post-grid'
 
 export const metadata: Metadata = {
   title: 'Blog',
@@ -34,8 +34,9 @@ export default async function BlogIndex({
   const totalPages = Math.max(1, Math.ceil(sorted.length / perPage))
   const start = (pageNum - 1) * perPage
   const posts = sorted.slice(start, start + perPage)
-  // Tag filter chips are intentionally disabled for now.
-  // const tags = await getAllTags()
+  const featured = pageNum === 1 ? posts.slice(0, 3) : []
+  const remaining = pageNum === 1 ? posts.slice(3) : posts
+
   const blogJsonLd = {
     '@context': 'https://schema.org',
     '@type': 'Blog',
@@ -45,54 +46,154 @@ export default async function BlogIndex({
   }
 
   return (
-    <main className='mx-auto max-w-[1200px] px-6 py-12 sm:px-8 md:px-12'>
+    <section className='bg-[var(--landing-bg)]'>
       <script
         type='application/ld+json'
         dangerouslySetInnerHTML={{ __html: JSON.stringify(blogJsonLd) }}
       />
-      <h1 className='mb-3 text-balance font-[500] text-[40px] text-[var(--landing-text)] leading-tight sm:text-[56px]'>
-        Blog
-      </h1>
-      <p className='mb-10 text-[var(--landing-text-muted)] text-lg'>
-        Announcements, insights, and guides for building AI agent workflows.
-      </p>
-
-      {/* Tag filter chips hidden until we have more posts */}
-      {/* <div className='mb-10 flex flex-wrap gap-3'>
-        <Link href='/blog' className={`rounded-full border px-3 py-1 text-sm ${!tag ? 'border-black bg-black text-white' : 'border-gray-300'}`}>All</Link>
-        {tags.map((t) => (
-          <Link key={t.tag} href={`/blog?tag=${encodeURIComponent(t.tag)}`} className={`rounded-full border px-3 py-1 text-sm ${tag === t.tag ? 'border-black bg-black text-white' : 'border-gray-300'}`}>
-            {t.tag} ({t.count})
-          </Link>
-        ))}
-      </div> */}
 
-      {/* Grid layout for consistent rows */}
-      <PostGrid posts={posts} />
+      {/* Section header */}
+      <div className='px-5 pt-[60px] lg:px-16 lg:pt-[100px]'>
+        <Badge
+          variant='blue'
+          size='md'
+          dot
+          className='mb-5 bg-white/10 font-season text-white uppercase tracking-[0.02em]'
+        >
+          Blog
+        </Badge>
 
-      {totalPages > 1 && (
-        <div className='mt-10 flex items-center justify-center gap-3'>
-          {pageNum > 1 && (
-            <Link
-              href={`/blog?page=${pageNum - 1}${tag ? `&tag=${encodeURIComponent(tag)}` : ''}`}
-              className='rounded-[5px] border border-[var(--landing-border-strong)] px-3 py-1 text-[var(--landing-text)] text-sm transition-colors hover:bg-[var(--landing-bg-elevated)]'
-            >
-              Previous
-            </Link>
-          )}
-          <span className='text-[var(--landing-text-muted)] text-sm'>
-            Page {pageNum} of {totalPages}
-          </span>
-          {pageNum < totalPages && (
+        <div className='flex flex-col gap-4 md:flex-row md:items-end md:justify-between'>
+          <h1 className='text-balance font-[430] font-season text-[28px] text-white leading-[100%] tracking-[-0.02em] lg:text-[40px]'>
+            Latest from Sim
+          </h1>
+          <p className='max-w-[360px] font-[430] font-season text-[#F6F6F0]/50 text-sm leading-[150%] tracking-[0.02em] lg:text-base'>
+            Announcements, insights, and guides for building AI agent workflows.
+          </p>
+        </div>
+      </div>
+
+      {/* Full-width top line */}
+      <div className='mt-8 h-px w-full bg-[var(--landing-bg-elevated)]' />
+
+      {/* Content area with vertical border rails */}
+      <div className='mx-5 border-[var(--landing-bg-elevated)] border-x lg:mx-16'>
+        {/* Featured posts */}
+        {featured.length > 0 && (
+          <>
+            <div className='flex'>
+              {featured.map((p, index) => (
+                <Link
+                  key={p.slug}
+                  href={`/blog/${p.slug}`}
+                  className='group flex flex-1 flex-col gap-4 border-[var(--landing-bg-elevated)] p-6 transition-colors hover:bg-[var(--landing-bg-elevated)] md:border-l md:first:border-l-0'
+                >
+                  <div className='relative aspect-video w-full overflow-hidden rounded-[5px]'>
+                    <img
+                      src={p.ogImage}
+                      alt={p.title}
+                      className='h-full w-full object-cover'
+                      loading={index < 3 ? 'eager' : 'lazy'}
+                    />
+                  </div>
+                  <div className='flex flex-col gap-2'>
+                    <span className='font-martian-mono text-[var(--landing-text-subtle)] text-xs uppercase tracking-[0.1em]'>
+                      {new Date(p.date).toLocaleDateString('en-US', {
+                        month: 'short',
+                        year: '2-digit',
+                      })}
+                    </span>
+                    <h3 className='font-[430] font-season text-lg text-white leading-tight tracking-[-0.01em]'>
+                      {p.title}
+                    </h3>
+                    <p className='line-clamp-2 text-[#F6F6F0]/50 text-sm leading-[150%]'>
+                      {p.description}
+                    </p>
+                  </div>
+                </Link>
+              ))}
+            </div>
+
+            <div className='h-px w-full bg-[var(--landing-bg-elevated)]' />
+          </>
+        )}
+
+        {remaining.map((p) => (
+          <div key={p.slug}>
             <Link
-              href={`/blog?page=${pageNum + 1}${tag ? `&tag=${encodeURIComponent(tag)}` : ''}`}
-              className='rounded-[5px] border border-[var(--landing-border-strong)] px-3 py-1 text-[var(--landing-text)] text-sm transition-colors hover:bg-[var(--landing-bg-elevated)]'
+              href={`/blog/${p.slug}`}
+              className='group flex items-start gap-6 px-6 py-6 transition-colors hover:bg-[var(--landing-bg-elevated)] md:items-center'
             >
-              Next
+              {/* Date */}
+              <span className='hidden w-[120px] shrink-0 pt-1 font-martian-mono text-[var(--landing-text-subtle)] text-xs uppercase tracking-[0.1em] md:block'>
+                {new Date(p.date).toLocaleDateString('en-US', {
+                  month: 'short',
+                  day: 'numeric',
+                  year: 'numeric',
+                })}
+              </span>
+
+              {/* Title + description */}
+              <div className='flex min-w-0 flex-1 flex-col gap-1'>
+                <span className='font-martian-mono text-[var(--landing-text-subtle)] text-xs uppercase tracking-[0.1em] md:hidden'>
+                  {new Date(p.date).toLocaleDateString('en-US', {
+                    month: 'short',
+                    day: 'numeric',
+                    year: 'numeric',
+                  })}
+                </span>
+                <h3 className='font-[430] font-season text-base text-white leading-tight tracking-[-0.01em] lg:text-lg'>
+                  {p.title}
+                </h3>
+                <p className='line-clamp-2 text-[#F6F6F0]/40 text-sm leading-[150%]'>
+                  {p.description}
+                </p>
+              </div>
+
+              {/* Image */}
+              <div className='hidden h-[80px] w-[140px] shrink-0 overflow-hidden rounded-[5px] sm:block'>
+                <img
+                  src={p.ogImage}
+                  alt={p.title}
+                  className='h-full w-full object-cover'
+                  loading='lazy'
+                />
+              </div>
             </Link>
-          )}
-        </div>
-      )}
-    </main>
+            <div className='h-px w-full bg-[var(--landing-bg-elevated)]' />
+          </div>
+        ))}
+
+        {/* Pagination */}
+        {totalPages > 1 && (
+          <div className='px-6 py-8'>
+            <div className='flex items-center justify-center gap-3'>
+              {pageNum > 1 && (
+                <Link
+                  href={`/blog?page=${pageNum - 1}${tag ? `&tag=${encodeURIComponent(tag)}` : ''}`}
+                  className='rounded-[5px] border border-[var(--landing-border-strong)] px-3 py-1 text-[var(--landing-text)] text-sm transition-colors hover:bg-[var(--landing-bg-elevated)]'
+                >
+                  Previous
+                </Link>
+              )}
+              <span className='text-[var(--landing-text-muted)] text-sm'>
+                Page {pageNum} of {totalPages}
+              </span>
+              {pageNum < totalPages && (
+                <Link
+                  href={`/blog?page=${pageNum + 1}${tag ? `&tag=${encodeURIComponent(tag)}` : ''}`}
+                  className='rounded-[5px] border border-[var(--landing-border-strong)] px-3 py-1 text-[var(--landing-text)] text-sm transition-colors hover:bg-[var(--landing-bg-elevated)]'
+                >
+                  Next
+                </Link>
+              )}
+            </div>
+          </div>
+        )}
+      </div>
+
+      {/* Full-width bottom line — overlaps last inner divider to avoid double border */}
+      <div className='-mt-px h-px w-full bg-[var(--landing-bg-elevated)]' />
+    </section>
   )
 }
diff --git a/apps/sim/app/(landing)/blog/post-grid.tsx b/apps/sim/app/(landing)/blog/post-grid.tsx
deleted file mode 100644
index 0ba8492c773..00000000000
--- a/apps/sim/app/(landing)/blog/post-grid.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import Image from 'next/image'
-import Link from 'next/link'
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/emcn'
-
-interface Author {
-  id: string
-  name: string
-  avatarUrl?: string
-  url?: string
-}
-
-interface Post {
-  slug: string
-  title: string
-  description: string
-  date: string
-  ogImage: string
-  author: Author
-  authors?: Author[]
-  featured?: boolean
-}
-
-export function PostGrid({ posts }: { posts: Post[] }) {
-  return (
-    <div className='grid grid-cols-1 gap-4 md:grid-cols-2 md:gap-6 lg:grid-cols-3'>
-      {posts.map((p, index) => (
-        <Link key={p.slug} href={`/blog/${p.slug}`} className='group flex flex-col'>
-          <div className='flex h-full flex-col overflow-hidden rounded-xl border border-[var(--landing-bg-elevated)] transition-colors duration-300 hover:border-[var(--landing-border-strong)]'>
-            {/* Image container with fixed aspect ratio to prevent layout shift */}
-            <div className='relative aspect-video w-full overflow-hidden'>
-              <Image
-                src={p.ogImage}
-                alt={p.title}
-                sizes='(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 33vw'
-                unoptimized
-                priority={index < 6}
-                loading={index < 6 ? undefined : 'lazy'}
-                fill
-                style={{ objectFit: 'cover' }}
-              />
-            </div>
-            <div className='flex flex-1 flex-col p-4'>
-              <div className='mb-2 text-[var(--landing-text-muted)] text-xs'>
-                {new Date(p.date).toLocaleDateString('en-US', {
-                  month: 'short',
-                  day: 'numeric',
-                  year: 'numeric',
-                })}
-              </div>
-              <h3 className='mb-1 font-[500] text-[var(--landing-text)] text-lg leading-tight'>
-                {p.title}
-              </h3>
-              <p className='mb-3 line-clamp-3 flex-1 text-[var(--landing-text-muted)] text-sm'>
-                {p.description}
-              </p>
-              <div className='flex items-center gap-2'>
-                <div className='-space-x-1.5 flex'>
-                  {(p.authors && p.authors.length > 0 ? p.authors : [p.author])
-                    .slice(0, 3)
-                    .map((author, idx) => (
-                      <Avatar key={idx} className='size-4 border border-[var(--landing-text)]'>
-                        <AvatarImage src={author?.avatarUrl} alt={author?.name} />
-                        <AvatarFallback className='border border-[var(--landing-text)] bg-[var(--landing-bg-elevated)] text-[var(--landing-text-muted)] text-micro'>
-                          {author?.name.slice(0, 2)}
-                        </AvatarFallback>
-                      </Avatar>
-                    ))}
-                </div>
-                <span className='text-[var(--landing-text-muted)] text-xs'>
-                  {(p.authors && p.authors.length > 0 ? p.authors : [p.author])
-                    .slice(0, 2)
-                    .map((a) => a?.name)
-                    .join(', ')}
-                  {(p.authors && p.authors.length > 0 ? p.authors : [p.author]).length > 2 && (
-                    <>
-                      {' '}
-                      and {(p.authors && p.authors.length > 0 ? p.authors : [p.author]).length - 2}{' '}
-                      other
-                      {(p.authors && p.authors.length > 0 ? p.authors : [p.author]).length - 2 > 1
-                        ? 's'
-                        : ''}
-                    </>
-                  )}
-                </span>
-              </div>
-            </div>
-          </div>
-        </Link>
-      ))}
-    </div>
-  )
-}
diff --git a/apps/sim/app/(home)/components/collaboration/collaboration.tsx b/apps/sim/app/(landing)/components/collaboration/collaboration.tsx
similarity index 87%
rename from apps/sim/app/(home)/components/collaboration/collaboration.tsx
rename to apps/sim/app/(landing)/components/collaboration/collaboration.tsx
index 02bee46ab15..5db2aad66c0 100644
--- a/apps/sim/app/(home)/components/collaboration/collaboration.tsx
+++ b/apps/sim/app/(landing)/components/collaboration/collaboration.tsx
@@ -3,7 +3,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import Image from 'next/image'
 import Link from 'next/link'
-import { Badge, ChevronDown } from '@/components/emcn'
+import { Badge } from '@/components/emcn'
 
 interface DotGridProps {
   className?: string
@@ -230,7 +230,7 @@ export default function Collaboration() {
 
       <div className='relative overflow-hidden'>
         <div className='grid grid-cols-1 md:grid-cols-[auto_1fr]'>
-          <div className='flex flex-col items-start gap-3 px-4 pt-[60px] pb-8 sm:gap-4 sm:px-8 md:gap-5 md:px-20 md:pt-[100px]'>
+          <div className='flex flex-col items-start gap-3 px-4 pt-[60px] pb-8 sm:gap-4 sm:px-8 md:gap-5 md:px-16 md:pt-[100px]'>
             <Badge
               variant='blue'
               size='md'
@@ -249,6 +249,13 @@ export default function Collaboration() {
               collaboration
             </h2>
 
+            <p className='sr-only'>
+              Sim supports real-time multiplayer collaboration. Teams can build AI agents together
+              in a shared workspace with live cursors, presence indicators, and concurrent editing.
+              Features include role-based access control, shared workflows, and team workspace
+              management.
+            </p>
+
             <p className='font-[430] font-season text-[#F6F6F0]/50 text-base leading-[150%] tracking-[0.02em] md:text-lg'>
               Grab your team. Build agents together <br className='hidden md:block' />
               in real-time inside your workspace.
@@ -259,24 +266,32 @@ export default function Collaboration() {
               className='group/cta mt-3 inline-flex h-[32px] cursor-none items-center gap-1.5 rounded-[5px] border border-white bg-white px-2.5 font-[430] font-season text-black text-sm transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
             >
               Build together
-              <span className='relative h-[10px] w-[10px] shrink-0'>
-                <ChevronDown className='-rotate-90 absolute inset-0 h-[10px] w-[10px] transition-opacity duration-150 group-hover/cta:opacity-0' />
-                <svg
-                  className='absolute inset-0 h-[10px] w-[10px] opacity-0 transition-opacity duration-150 group-hover/cta:opacity-100'
-                  viewBox='0 0 10 10'
+              <svg
+                className='h-[10px] w-[10px] shrink-0'
+                viewBox='0 0 10 10'
+                fill='none'
+                xmlns='http://www.w3.org/2000/svg'
+              >
+                <line
+                  x1='0'
+                  y1='5'
+                  x2='9'
+                  y2='5'
+                  stroke='currentColor'
+                  strokeWidth='1.33'
+                  strokeLinecap='square'
+                  className='origin-left scale-x-0 transition-transform duration-200 ease-out [transform-box:fill-box] group-hover/cta:scale-x-100'
+                />
+                <path
+                  d='M3.5 2L6.5 5L3.5 8'
+                  stroke='currentColor'
+                  strokeWidth='1.33'
+                  strokeLinecap='square'
+                  strokeLinejoin='miter'
                   fill='none'
-                  xmlns='http://www.w3.org/2000/svg'
-                >
-                  <path
-                    d='M1 5H8M5.5 2L8.5 5L5.5 8'
-                    stroke='currentColor'
-                    strokeWidth='1.33'
-                    strokeLinecap='square'
-                    strokeLinejoin='miter'
-                    fill='none'
-                  />
-                </svg>
-              </span>
+                  className='transition-transform duration-200 ease-out group-hover/cta:translate-x-[30%]'
+                />
+              </svg>
             </Link>
           </div>
 
@@ -305,7 +320,7 @@ export default function Collaboration() {
           href='/blog/multiplayer'
           target='_blank'
           rel='noopener noreferrer'
-          className='relative mx-4 mb-6 flex cursor-none items-center gap-3.5 rounded-[5px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg)] px-3 py-2.5 transition-colors hover:border-[var(--landing-border-strong)] hover:bg-[var(--landing-bg-card)] sm:mx-8 md:absolute md:bottom-10 md:left-20 md:z-20 md:mx-0 md:mb-0'
+          className='relative mx-4 mb-6 flex cursor-none items-center gap-3.5 rounded-[5px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg)] px-3 py-2.5 transition-colors hover:border-[var(--landing-border-strong)] hover:bg-[var(--landing-bg-card)] sm:mx-8 md:absolute md:bottom-10 md:left-16 md:z-20 md:mx-0 md:mb-0'
         >
           <div className='relative h-7 w-11 shrink-0'>
             <Image src='/landing/multiplayer-cursors.svg' alt='' fill className='object-contain' />
diff --git a/apps/sim/app/(home)/components/demo-request/consts.ts b/apps/sim/app/(landing)/components/demo-request/consts.ts
similarity index 73%
rename from apps/sim/app/(home)/components/demo-request/consts.ts
rename to apps/sim/app/(landing)/components/demo-request/consts.ts
index 25532056230..5272a0efd3d 100644
--- a/apps/sim/app/(home)/components/demo-request/consts.ts
+++ b/apps/sim/app/(landing)/components/demo-request/consts.ts
@@ -5,15 +5,6 @@ import { quickValidateEmail } from '@/lib/messaging/email/validation'
 
 const FREE_EMAIL_DOMAINS = new Set(freeEmailDomains)
 
-export const DEMO_REQUEST_REGION_VALUES = [
-  'north_america',
-  'europe',
-  'asia_pacific',
-  'latin_america',
-  'middle_east_africa',
-  'other',
-] as const
-
 export const DEMO_REQUEST_COMPANY_SIZE_VALUES = [
   '1_10',
   '11_50',
@@ -24,15 +15,6 @@ export const DEMO_REQUEST_COMPANY_SIZE_VALUES = [
   '10000_plus',
 ] as const
 
-export const DEMO_REQUEST_REGION_OPTIONS = [
-  { value: 'north_america', label: 'North America' },
-  { value: 'europe', label: 'Europe' },
-  { value: 'asia_pacific', label: 'Asia Pacific' },
-  { value: 'latin_america', label: 'Latin America' },
-  { value: 'middle_east_africa', label: 'Middle East & Africa' },
-  { value: 'other', label: 'Other' },
-] as const
-
 export const DEMO_REQUEST_COMPANY_SIZE_OPTIONS = [
   { value: '1_10', label: '1–10' },
   { value: '11_50', label: '11–50' },
@@ -73,9 +55,6 @@ export const demoRequestSchema = z.object({
     .max(50, 'Phone number must be 50 characters or less')
     .optional()
     .transform((value) => (value && value.length > 0 ? value : undefined)),
-  region: z.enum(DEMO_REQUEST_REGION_VALUES, {
-    errorMap: () => ({ message: 'Please select a region' }),
-  }),
   companySize: z.enum(DEMO_REQUEST_COMPANY_SIZE_VALUES, {
     errorMap: () => ({ message: 'Please select company size' }),
   }),
@@ -84,10 +63,6 @@ export const demoRequestSchema = z.object({
 
 export type DemoRequestPayload = z.infer<typeof demoRequestSchema>
 
-export function getDemoRequestRegionLabel(value: DemoRequestPayload['region']): string {
-  return DEMO_REQUEST_REGION_OPTIONS.find((option) => option.value === value)?.label ?? value
-}
-
 export function getDemoRequestCompanySizeLabel(value: DemoRequestPayload['companySize']): string {
   return DEMO_REQUEST_COMPANY_SIZE_OPTIONS.find((option) => option.value === value)?.label ?? value
 }
diff --git a/apps/sim/app/(home)/components/demo-request/demo-request-modal.tsx b/apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx
similarity index 65%
rename from apps/sim/app/(home)/components/demo-request/demo-request-modal.tsx
rename to apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx
index 5a6ea1dc817..01067670a1d 100644
--- a/apps/sim/app/(home)/components/demo-request/demo-request-modal.tsx
+++ b/apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx
@@ -2,9 +2,7 @@
 
 import { useCallback, useState } from 'react'
 import {
-  Button,
   Combobox,
-  FormField,
   Input,
   Modal,
   ModalBody,
@@ -17,10 +15,9 @@ import {
 import { Check } from '@/components/emcn/icons'
 import {
   DEMO_REQUEST_COMPANY_SIZE_OPTIONS,
-  DEMO_REQUEST_REGION_OPTIONS,
   type DemoRequestPayload,
   demoRequestSchema,
-} from '@/app/(home)/components/demo-request/consts'
+} from '@/app/(landing)/components/demo-request/consts'
 
 interface DemoRequestModalProps {
   children: React.ReactNode
@@ -35,13 +32,11 @@ interface DemoRequestFormState {
   lastName: string
   companyEmail: string
   phoneNumber: string
-  region: DemoRequestPayload['region'] | ''
   companySize: DemoRequestPayload['companySize'] | ''
   details: string
 }
 
 const SUBMIT_SUCCESS_MESSAGE = "We'll be in touch soon!"
-const COMBOBOX_REGIONS = [...DEMO_REQUEST_REGION_OPTIONS]
 const COMBOBOX_COMPANY_SIZES = [...DEMO_REQUEST_COMPANY_SIZE_OPTIONS]
 
 const INITIAL_FORM_STATE: DemoRequestFormState = {
@@ -49,11 +44,37 @@ const INITIAL_FORM_STATE: DemoRequestFormState = {
   lastName: '',
   companyEmail: '',
   phoneNumber: '',
-  region: '',
   companySize: '',
   details: '',
 }
 
+interface LandingFieldProps {
+  label: string
+  htmlFor: string
+  optional?: boolean
+  error?: string
+  children: React.ReactNode
+}
+
+function LandingField({ label, htmlFor, optional, error, children }: LandingFieldProps) {
+  return (
+    <div className='flex flex-col gap-1.5'>
+      <label
+        htmlFor={htmlFor}
+        className='font-[430] font-season text-[13px] text-[var(--text-secondary)] tracking-[0.02em]'
+      >
+        {label}
+        {optional ? <span className='ml-1 text-[var(--text-muted)]'>(optional)</span> : null}
+      </label>
+      {children}
+      {error ? <p className='text-[12px] text-[var(--text-error)]'>{error}</p> : null}
+    </div>
+  )
+}
+
+const LANDING_INPUT =
+  'h-[32px] rounded-[5px] border border-[var(--border-1)] bg-[var(--surface-5)] px-2.5 font-[430] font-season text-[13.5px] text-[var(--text-primary)] transition-colors placeholder:text-[var(--text-muted)] outline-none'
+
 export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalProps) {
   const [open, setOpen] = useState(false)
   const [form, setForm] = useState<DemoRequestFormState>(INITIAL_FORM_STATE)
@@ -117,7 +138,6 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
           lastName: fieldErrors.lastName?.[0],
           companyEmail: fieldErrors.companyEmail?.[0],
           phoneNumber: fieldErrors.phoneNumber?.[0],
-          region: fieldErrors.region?.[0],
           companySize: fieldErrors.companySize?.[0],
           details: fieldErrors.details?.[0],
         })
@@ -162,7 +182,9 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
       <ModalContent size='lg' className={theme === 'dark' ? 'dark' : undefined}>
         <ModalHeader>
           <span className={submitSuccess ? 'sr-only' : undefined}>
-            {submitSuccess ? 'Demo request submitted' : 'Nearly there!'}
+            <span className='font-[430] font-season text-[15px] tracking-[-0.02em]'>
+              {submitSuccess ? 'Demo request submitted' : 'Talk to sales'}
+            </span>
           </span>
         </ModalHeader>
         <div className='relative flex-1'>
@@ -176,37 +198,44 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
             }
           >
             <ModalBody>
-              <div className='space-y-4'>
-                <div className='grid gap-4 sm:grid-cols-2'>
-                  <FormField htmlFor='firstName' label='First name' error={errors.firstName}>
+              <div className='space-y-3'>
+                <div className='grid gap-3 sm:grid-cols-2'>
+                  <LandingField htmlFor='firstName' label='First name' error={errors.firstName}>
                     <Input
                       id='firstName'
                       value={form.firstName}
                       onChange={(event) => updateField('firstName', event.target.value)}
                       placeholder='First'
+                      className={LANDING_INPUT}
                     />
-                  </FormField>
-                  <FormField htmlFor='lastName' label='Last name' error={errors.lastName}>
+                  </LandingField>
+                  <LandingField htmlFor='lastName' label='Last name' error={errors.lastName}>
                     <Input
                       id='lastName'
                       value={form.lastName}
                       onChange={(event) => updateField('lastName', event.target.value)}
                       placeholder='Last'
+                      className={LANDING_INPUT}
                     />
-                  </FormField>
+                  </LandingField>
                 </div>
 
-                <FormField htmlFor='companyEmail' label='Company email' error={errors.companyEmail}>
+                <LandingField
+                  htmlFor='companyEmail'
+                  label='Company email'
+                  error={errors.companyEmail}
+                >
                   <Input
                     id='companyEmail'
                     type='email'
                     value={form.companyEmail}
                     onChange={(event) => updateField('companyEmail', event.target.value)}
                     placeholder='Your work email'
+                    className={LANDING_INPUT}
                   />
-                </FormField>
+                </LandingField>
 
-                <FormField
+                <LandingField
                   htmlFor='phoneNumber'
                   label='Phone number'
                   optional
@@ -218,54 +247,48 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
                     value={form.phoneNumber}
                     onChange={(event) => updateField('phoneNumber', event.target.value)}
                     placeholder='Your phone number'
+                    className={LANDING_INPUT}
                   />
-                </FormField>
+                </LandingField>
 
-                <div className='grid gap-4 sm:grid-cols-2'>
-                  <FormField htmlFor='region' label='Region' error={errors.region}>
-                    <Combobox
-                      options={COMBOBOX_REGIONS}
-                      value={form.region}
-                      selectedValue={form.region}
-                      onChange={(value) =>
-                        updateField('region', value as DemoRequestPayload['region'])
-                      }
-                      placeholder='Select'
-                      editable={false}
-                      filterOptions={false}
-                    />
-                  </FormField>
-                  <FormField htmlFor='companySize' label='Company size' error={errors.companySize}>
-                    <Combobox
-                      options={COMBOBOX_COMPANY_SIZES}
-                      value={form.companySize}
-                      selectedValue={form.companySize}
-                      onChange={(value) =>
-                        updateField('companySize', value as DemoRequestPayload['companySize'])
-                      }
-                      placeholder='Select'
-                      editable={false}
-                      filterOptions={false}
-                    />
-                  </FormField>
-                </div>
+                <LandingField htmlFor='companySize' label='Company size' error={errors.companySize}>
+                  <Combobox
+                    options={COMBOBOX_COMPANY_SIZES}
+                    value={form.companySize}
+                    selectedValue={form.companySize}
+                    onChange={(value) =>
+                      updateField('companySize', value as DemoRequestPayload['companySize'])
+                    }
+                    placeholder='Select'
+                    editable={false}
+                    filterOptions={false}
+                    className='h-[32px] rounded-[5px] px-2.5 font-[430] font-season text-[13.5px]'
+                  />
+                </LandingField>
 
-                <FormField htmlFor='details' label='Details' error={errors.details}>
+                <LandingField htmlFor='details' label='Details' error={errors.details}>
                   <Textarea
                     id='details'
                     value={form.details}
                     onChange={(event) => updateField('details', event.target.value)}
                     placeholder='Tell us about your needs and questions'
+                    className='min-h-[80px] rounded-[5px] border border-[var(--border-1)] bg-[var(--surface-5)] px-2.5 py-2 font-[430] font-season text-[13.5px] text-[var(--text-primary)] outline-none transition-colors placeholder:text-[var(--text-muted)]'
                   />
-                </FormField>
+                </LandingField>
               </div>
             </ModalBody>
 
-            <ModalFooter className='flex-col items-stretch gap-3'>
-              {submitError && <p className='text-[13px] text-[var(--text-error)]'>{submitError}</p>}
-              <Button type='submit' variant='primary' disabled={isSubmitting}>
+            <ModalFooter className='flex-col items-stretch gap-3 border-t-0 bg-transparent pt-0'>
+              {submitError && (
+                <p className='font-season text-[13px] text-[var(--text-error)]'>{submitError}</p>
+              )}
+              <button
+                type='submit'
+                disabled={isSubmitting}
+                className='flex h-[32px] w-full items-center justify-center rounded-[5px] bg-[var(--text-primary)] font-[430] font-season text-[13.5px] text-[var(--bg)] transition-colors hover:opacity-90 disabled:cursor-not-allowed disabled:opacity-50'
+              >
                 {isSubmitting ? 'Submitting...' : 'Submit'}
-              </Button>
+              </button>
             </ModalFooter>
           </form>
 
@@ -275,10 +298,10 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
                 <div className='flex h-20 w-20 items-center justify-center rounded-full border border-[var(--border)] bg-[var(--bg-subtle)] text-[var(--text-primary)]'>
                   <Check className='h-10 w-10' />
                 </div>
-                <h2 className='mt-8 font-medium text-[34px] text-[var(--text-primary)] leading-[1.1] tracking-[-0.03em]'>
+                <h2 className='mt-8 font-[430] font-season text-[34px] text-[var(--text-primary)] leading-[1.1] tracking-[-0.03em]'>
                   {SUBMIT_SUCCESS_MESSAGE}
                 </h2>
-                <p className='mt-4 text-[17px] text-[var(--text-secondary)] leading-7'>
+                <p className='mt-4 font-season text-[15px] text-[var(--text-secondary)] leading-7'>
                   Our team will be in touch soon. If you have any questions, please email us at{' '}
                   <a
                     href='mailto:enterprise@sim.ai'
diff --git a/apps/sim/app/(home)/components/enterprise/components/access-control-panel.tsx b/apps/sim/app/(landing)/components/enterprise/components/access-control-panel.tsx
similarity index 100%
rename from apps/sim/app/(home)/components/enterprise/components/access-control-panel.tsx
rename to apps/sim/app/(landing)/components/enterprise/components/access-control-panel.tsx
diff --git a/apps/sim/app/(home)/components/enterprise/components/audit-log-preview.tsx b/apps/sim/app/(landing)/components/enterprise/components/audit-log-preview.tsx
similarity index 100%
rename from apps/sim/app/(home)/components/enterprise/components/audit-log-preview.tsx
rename to apps/sim/app/(landing)/components/enterprise/components/audit-log-preview.tsx
diff --git a/apps/sim/app/(home)/components/enterprise/enterprise.tsx b/apps/sim/app/(landing)/components/enterprise/enterprise.tsx
similarity index 87%
rename from apps/sim/app/(home)/components/enterprise/enterprise.tsx
rename to apps/sim/app/(landing)/components/enterprise/enterprise.tsx
index 798ac88eff8..8fe833a0cc6 100644
--- a/apps/sim/app/(home)/components/enterprise/enterprise.tsx
+++ b/apps/sim/app/(landing)/components/enterprise/enterprise.tsx
@@ -15,12 +15,12 @@
 
 import Image from 'next/image'
 import Link from 'next/link'
-import { Badge, ChevronDown } from '@/components/emcn'
+import { Badge } from '@/components/emcn'
 import { Lock } from '@/components/emcn/icons'
 import { GithubIcon } from '@/components/icons'
-import { DemoRequestModal } from '@/app/(home)/components/demo-request/demo-request-modal'
-import { AccessControlPanel } from '@/app/(home)/components/enterprise/components/access-control-panel'
-import { AuditLogPreview } from '@/app/(home)/components/enterprise/components/audit-log-preview'
+import { DemoRequestModal } from '@/app/(landing)/components/demo-request/demo-request-modal'
+import { AccessControlPanel } from '@/app/(landing)/components/enterprise/components/access-control-panel'
+import { AuditLogPreview } from '@/app/(landing)/components/enterprise/components/audit-log-preview'
 
 const ENTERPRISE_FEATURE_MARQUEE_STYLES = `
   @keyframes enterprise-feature-marquee {
@@ -136,7 +136,7 @@ export default function Enterprise() {
       aria-labelledby='enterprise-heading'
       className='bg-[var(--landing-bg-section)]'
     >
-      <div className='px-4 pt-[60px] pb-10 sm:px-8 sm:pt-20 sm:pb-0 md:px-20 md:pt-[100px]'>
+      <div className='px-4 pt-[60px] pb-10 sm:px-8 sm:pt-20 sm:pb-0 md:px-16 md:pt-[100px]'>
         <div className='flex flex-col items-start gap-3 sm:gap-4 md:gap-5'>
           <Badge
             variant='blue'
@@ -230,23 +230,32 @@ export default function Enterprise() {
                 className='group/cta inline-flex h-[32px] cursor-pointer items-center gap-1.5 rounded-[5px] border border-white bg-white px-2.5 font-[430] font-season text-[14px] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
               >
                 Book a demo
-                <span className='relative h-[10px] w-[10px] shrink-0'>
-                  <ChevronDown className='-rotate-90 absolute inset-0 h-[10px] w-[10px] transition-opacity duration-150 group-hover/cta:opacity-0' />
-                  <svg
-                    className='absolute inset-0 h-[10px] w-[10px] opacity-0 transition-opacity duration-150 group-hover/cta:opacity-100'
-                    viewBox='0 0 10 10'
+                <svg
+                  className='h-[10px] w-[10px] shrink-0'
+                  viewBox='0 0 10 10'
+                  fill='none'
+                  xmlns='http://www.w3.org/2000/svg'
+                >
+                  <line
+                    x1='0'
+                    y1='5'
+                    x2='9'
+                    y2='5'
+                    stroke='currentColor'
+                    strokeWidth='1.33'
+                    strokeLinecap='square'
+                    className='origin-left scale-x-0 transition-transform duration-200 ease-out [transform-box:fill-box] group-hover/cta:scale-x-100'
+                  />
+                  <path
+                    d='M3.5 2L6.5 5L3.5 8'
+                    stroke='currentColor'
+                    strokeWidth='1.33'
+                    strokeLinecap='square'
+                    strokeLinejoin='miter'
                     fill='none'
-                  >
-                    <path
-                      d='M1 5H8M5.5 2L8.5 5L5.5 8'
-                      stroke='currentColor'
-                      strokeWidth='1.33'
-                      strokeLinecap='square'
-                      strokeLinejoin='miter'
-                      fill='none'
-                    />
-                  </svg>
-                </span>
+                    className='transition-transform duration-200 ease-out group-hover/cta:translate-x-[30%]'
+                  />
+                </svg>
               </button>
             </DemoRequestModal>
           </div>
diff --git a/apps/sim/app/(home)/components/features/components/features-preview.tsx b/apps/sim/app/(landing)/components/features/components/features-preview.tsx
similarity index 86%
rename from apps/sim/app/(home)/components/features/components/features-preview.tsx
rename to apps/sim/app/(landing)/components/features/components/features-preview.tsx
index a6dd9d43fee..e9a69ae8f9f 100644
--- a/apps/sim/app/(home)/components/features/components/features-preview.tsx
+++ b/apps/sim/app/(landing)/components/features/components/features-preview.tsx
@@ -17,7 +17,6 @@ import {
   SlackIcon,
   xAIIcon,
 } from '@/components/icons'
-import { CsvIcon, JsonIcon, MarkdownIcon, PdfIcon } from '@/components/icons/document-icons'
 import { cn } from '@/lib/core/utils/cn'
 
 interface FeaturesPreviewProps {
@@ -25,7 +24,7 @@ interface FeaturesPreviewProps {
 }
 
 export function FeaturesPreview({ activeTab }: FeaturesPreviewProps) {
-  const isWorkspaceTab = activeTab <= 4
+  const isWorkspaceTab = activeTab <= 3
 
   return (
     <div className='relative h-[350px] w-full md:h-[560px]'>
@@ -66,7 +65,7 @@ const CARD_GAP = 8
 const GRID_STEP = CARD_SIZE + CARD_GAP
 const GRID_PAD = 8
 
-type CardVariant = 'prompt' | 'table' | 'workflow' | 'knowledge' | 'logs' | 'file'
+type CardVariant = 'prompt' | 'table' | 'workflow' | 'logs' | 'file'
 
 interface CardDef {
   row: number
@@ -80,19 +79,19 @@ const MOTHERSHIP_CARDS: CardDef[] = [
   { row: 0, col: 0, variant: 'prompt', label: 'prompt.md' },
   { row: 1, col: 0, variant: 'table', label: 'Leads' },
   { row: 0, col: 1, variant: 'workflow', label: 'Email Bot', color: '#7C3AED' },
-  { row: 1, col: 1, variant: 'knowledge', label: 'Company KB' },
+  { row: 1, col: 1, variant: 'file', label: 'handbook.md' },
   { row: 2, col: 0, variant: 'logs', label: 'Run Logs' },
   { row: 0, col: 2, variant: 'file', label: 'notes.md' },
   { row: 2, col: 1, variant: 'workflow', label: 'Onboarding', color: '#2563EB' },
   { row: 1, col: 2, variant: 'table', label: 'Contacts' },
   { row: 2, col: 2, variant: 'file', label: 'report.pdf' },
   { row: 3, col: 0, variant: 'table', label: 'Tickets' },
-  { row: 0, col: 3, variant: 'knowledge', label: 'Product Wiki' },
+  { row: 0, col: 3, variant: 'file', label: 'wiki.md' },
   { row: 3, col: 1, variant: 'logs', label: 'Audit Trail' },
   { row: 1, col: 3, variant: 'workflow', label: 'Support', color: '#059669' },
   { row: 2, col: 3, variant: 'file', label: 'data.csv' },
   { row: 3, col: 2, variant: 'table', label: 'Users' },
-  { row: 3, col: 3, variant: 'knowledge', label: 'HR Docs' },
+  { row: 3, col: 3, variant: 'file', label: 'policies.pdf' },
   { row: 0, col: 4, variant: 'workflow', label: 'Pipeline', color: '#DC2626' },
   { row: 1, col: 4, variant: 'logs', label: 'API Logs' },
   { row: 2, col: 4, variant: 'table', label: 'Orders' },
@@ -100,7 +99,7 @@ const MOTHERSHIP_CARDS: CardDef[] = [
   { row: 0, col: 5, variant: 'logs', label: 'Deploys' },
   { row: 1, col: 5, variant: 'table', label: 'Campaigns' },
   { row: 2, col: 5, variant: 'workflow', label: 'Intake', color: '#D97706' },
-  { row: 3, col: 5, variant: 'knowledge', label: 'Research' },
+  { row: 3, col: 5, variant: 'file', label: 'research.pdf' },
   { row: 4, col: 0, variant: 'file', label: 'readme.md' },
   { row: 4, col: 1, variant: 'table', label: 'Revenue' },
   { row: 4, col: 2, variant: 'workflow', label: 'Sync', color: '#0891B2' },
@@ -110,27 +109,25 @@ const MOTHERSHIP_CARDS: CardDef[] = [
   { row: 0, col: 6, variant: 'table', label: 'Analytics' },
   { row: 1, col: 6, variant: 'workflow', label: 'Digest', color: '#6366F1' },
   { row: 0, col: 7, variant: 'file', label: 'brief.md' },
-  { row: 2, col: 6, variant: 'knowledge', label: 'Playbooks' },
+  { row: 2, col: 6, variant: 'file', label: 'playbook.md' },
   { row: 1, col: 7, variant: 'logs', label: 'Webhooks' },
   { row: 3, col: 6, variant: 'file', label: 'export.csv' },
   { row: 2, col: 7, variant: 'workflow', label: 'Alerts', color: '#E11D48' },
   { row: 4, col: 6, variant: 'logs', label: 'Metrics' },
   { row: 3, col: 7, variant: 'table', label: 'Feedback' },
-  { row: 4, col: 7, variant: 'knowledge', label: 'Runbooks' },
+  { row: 4, col: 7, variant: 'file', label: 'runbook.md' },
 ]
 
 const EXPAND_TARGETS: Record<number, { row: number; col: number }> = {
   1: { row: 1, col: 0 },
   2: { row: 0, col: 2 },
-  3: { row: 1, col: 1 },
-  4: { row: 2, col: 0 },
+  3: { row: 2, col: 0 },
 }
 
 const EXPAND_ROW_COUNTS: Record<number, number> = {
   1: 8,
   2: 10,
-  3: 10,
-  4: 7,
+  3: 7,
 }
 
 function WorkspacePreview({ activeTab, isActive }: { activeTab: number; isActive: boolean }) {
@@ -146,7 +143,7 @@ function WorkspacePreview({ activeTab, isActive }: { activeTab: number; isActive
   const [revealedRows, setRevealedRows] = useState(0)
 
   const isMothership = activeTab === 0 && isActive
-  const isExpandTab = activeTab >= 1 && activeTab <= 4 && isActive
+  const isExpandTab = activeTab >= 1 && activeTab <= 3 && isActive
   const expandTarget = EXPAND_TARGETS[activeTab] ?? null
 
   useEffect(() => {
@@ -292,8 +289,7 @@ function WorkspacePreview({ activeTab, isActive }: { activeTab: number; isActive
         >
           {expandedTab === 1 && <MockFullTable revealedRows={revealedRows} />}
           {expandedTab === 2 && <MockFullFiles />}
-          {expandedTab === 3 && <MockFullKnowledgeBase revealedRows={revealedRows} />}
-          {expandedTab === 4 && <MockFullLogs revealedRows={revealedRows} />}
+          {expandedTab === 3 && <MockFullLogs revealedRows={revealedRows} />}
         </motion.div>
       )}
     </div>
@@ -393,8 +389,6 @@ function MiniCardIcon({ variant, color }: { variant: CardVariant; color?: string
         />
       )
     }
-    case 'knowledge':
-      return <Database className={cls} />
     case 'logs':
       return <Library className={cls} />
   }
@@ -410,8 +404,6 @@ function MiniCardBody({ variant, color }: { variant: CardVariant; color?: string
       return <TableCardBody />
     case 'workflow':
       return <WorkflowCardBody color={color ?? '#7C3AED'} />
-    case 'knowledge':
-      return <KnowledgeCardBody />
     case 'logs':
       return <LogsCardBody />
   }
@@ -498,21 +490,6 @@ function WorkflowCardBody({ color }: { color: string }) {
   )
 }
 
-const KB_WIDTHS = [70, 85, 55, 80, 48] as const
-
-function KnowledgeCardBody() {
-  return (
-    <div className='flex flex-col gap-[5px] px-2 py-1.5'>
-      {KB_WIDTHS.map((w, i) => (
-        <div key={i} className='flex items-center gap-1'>
-          <div className='h-[3px] w-[3px] flex-shrink-0 rounded-full bg-[#D4D4D4]' />
-          <div className='h-[1.5px] rounded-full bg-[#E8E8E8]' style={{ width: `${w}%` }} />
-        </div>
-      ))}
-    </div>
-  )
-}
-
 const LOG_ENTRIES = [
   { color: '#22C55E', width: 65 },
   { color: '#22C55E', width: 78 },
@@ -579,33 +556,6 @@ The team agreed to prioritize the new onboarding flow. Key decisions:
 
 Follow up with engineering on the timeline for the API v2 migration. Draft the proposal for the board meeting next week.`
 
-const MOCK_KB_COLUMNS = ['Name', 'Size', 'Tokens', 'Chunks', 'Status'] as const
-
-const KB_FILE_ICONS: Record<string, React.ComponentType<SVGProps<SVGSVGElement>>> = {
-  pdf: PdfIcon,
-  md: MarkdownIcon,
-  csv: CsvIcon,
-  json: JsonIcon,
-}
-
-function getKBFileIcon(filename: string) {
-  const ext = filename.split('.').pop()?.toLowerCase() ?? ''
-  return KB_FILE_ICONS[ext] ?? File
-}
-
-const MOCK_KB_DATA = [
-  ['product-specs.pdf', '4.2 MB', '12.4k', '86', 'enabled'],
-  ['eng-handbook.md', '1.8 MB', '8.2k', '54', 'enabled'],
-  ['api-reference.json', '920 KB', '4.1k', '32', 'enabled'],
-  ['release-notes.md', '340 KB', '2.8k', '18', 'enabled'],
-  ['onboarding-guide.pdf', '2.1 MB', '6.5k', '42', 'processing'],
-  ['data-export.csv', '560 KB', '3.4k', '24', 'enabled'],
-  ['runbook.md', '280 KB', '1.9k', '14', 'enabled'],
-  ['compliance.pdf', '180 KB', '1.2k', '8', 'disabled'],
-  ['style-guide.md', '410 KB', '2.6k', '20', 'enabled'],
-  ['metrics.csv', '1.4 MB', '5.8k', '38', 'enabled'],
-] as const
-
 const MD_COMPONENTS: Components = {
   h1: ({ children }) => (
     <p
@@ -677,106 +627,6 @@ function MockFullFiles() {
   )
 }
 
-const KB_STATUS_STYLES: Record<string, { bg: string; text: string; label: string }> = {
-  enabled: { bg: '#DCFCE7', text: '#166534', label: 'Enabled' },
-  disabled: { bg: '#F3F4F6', text: '#6B7280', label: 'Disabled' },
-  processing: { bg: '#F3E8FF', text: '#7C3AED', label: 'Processing' },
-}
-
-function MockFullKnowledgeBase({ revealedRows }: { revealedRows: number }) {
-  return (
-    <div className='flex h-full flex-col'>
-      <div className='flex h-[44px] shrink-0 items-center border-[#E5E5E5] border-b px-6'>
-        <div className='flex items-center gap-1.5'>
-          <Database className='h-[14px] w-[14px] text-[#999]' />
-          <span className='text-[#999] text-[13px]'>Knowledge Base</span>
-          <span className='text-[#D4D4D4] text-[13px]'>/</span>
-          <span className='font-medium text-[#1C1C1C] text-[13px]'>Company KB</span>
-        </div>
-      </div>
-
-      <div className='flex h-[36px] shrink-0 items-center border-[#E5E5E5] border-b px-6'>
-        <div className='flex items-center gap-1.5'>
-          <div className='flex h-[24px] items-center gap-1 rounded-[6px] border border-[#E5E5E5] px-2 text-[#999] text-[12px]'>
-            Sort
-          </div>
-          <div className='flex h-[24px] items-center gap-1 rounded-[6px] border border-[#E5E5E5] px-2 text-[#999] text-[12px]'>
-            Filter
-          </div>
-        </div>
-      </div>
-
-      <div className='flex-1 overflow-hidden'>
-        <table className='w-full table-fixed border-separate border-spacing-0 text-[13px]'>
-          <colgroup>
-            <col style={{ width: 40 }} />
-            {MOCK_KB_COLUMNS.map((col) => (
-              <col key={col} />
-            ))}
-          </colgroup>
-          <thead>
-            <tr>
-              <th className='border-[#E5E5E5] border-r border-b bg-[#FAFAFA] px-1 py-[7px] text-center align-middle'>
-                <div className='flex items-center justify-center'>
-                  <div className='h-[13px] w-[13px] rounded-[2px] border border-[#D4D4D4]' />
-                </div>
-              </th>
-              {MOCK_KB_COLUMNS.map((col) => (
-                <th
-                  key={col}
-                  className='border-[#E5E5E5] border-r border-b bg-[#FAFAFA] px-2 py-[7px] text-left align-middle'
-                >
-                  <span className='font-base text-[#999] text-[13px]'>{col}</span>
-                </th>
-              ))}
-            </tr>
-          </thead>
-          <tbody>
-            {MOCK_KB_DATA.slice(0, revealedRows).map((row, i) => {
-              const status = KB_STATUS_STYLES[row[4]] ?? KB_STATUS_STYLES.enabled
-              const DocIcon = getKBFileIcon(row[0])
-              return (
-                <motion.tr
-                  key={i}
-                  initial={{ opacity: 0, y: 4 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.2, ease: 'easeOut' }}
-                >
-                  <td className='border-[#E5E5E5] border-r border-b px-1 py-[7px] text-center align-middle'>
-                    <span className='text-[#999] text-[11px] tabular-nums'>{i + 1}</span>
-                  </td>
-                  <td className='border-[#E5E5E5] border-r border-b px-2 py-[7px] align-middle'>
-                    <span className='flex items-center gap-2 text-[#1C1C1C] text-[13px]'>
-                      <DocIcon className='h-[14px] w-[14px] shrink-0' />
-                      <span className='truncate'>{row[0]}</span>
-                    </span>
-                  </td>
-                  {row.slice(1, 4).map((cell, j) => (
-                    <td
-                      key={j}
-                      className='border-[#E5E5E5] border-r border-b px-2 py-[7px] align-middle'
-                    >
-                      <span className='text-[#999] text-[13px]'>{cell}</span>
-                    </td>
-                  ))}
-                  <td className='border-[#E5E5E5] border-r border-b px-2 py-[7px] align-middle'>
-                    <span
-                      className='inline-flex items-center rounded-full px-2 py-0.5 font-medium text-[11px]'
-                      style={{ backgroundColor: status.bg, color: status.text }}
-                    >
-                      {status.label}
-                    </span>
-                  </td>
-                </motion.tr>
-              )
-            })}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  )
-}
-
 const MOCK_LOG_COLORS = [
   '#7C3AED',
   '#2563EB',
diff --git a/apps/sim/app/(home)/components/features/features.tsx b/apps/sim/app/(landing)/components/features/features.tsx
similarity index 62%
rename from apps/sim/app/(home)/components/features/features.tsx
rename to apps/sim/app/(landing)/components/features/features.tsx
index 1b5d9b8c9a8..9f3a6751b9e 100644
--- a/apps/sim/app/(home)/components/features/features.tsx
+++ b/apps/sim/app/(landing)/components/features/features.tsx
@@ -4,8 +4,8 @@ import { useRef, useState } from 'react'
 import { type MotionValue, motion, useScroll, useTransform } from 'framer-motion'
 import Image from 'next/image'
 import Link from 'next/link'
-import { Badge, ChevronDown } from '@/components/emcn'
-import { FeaturesPreview } from '@/app/(home)/components/features/components/features-preview'
+import { Badge } from '@/components/emcn'
+import { FeaturesPreview } from '@/app/(landing)/components/features/components/features-preview'
 
 function hexToRgba(hex: string, alpha: number): string {
   const r = Number.parseInt(hex.slice(1, 3), 16)
@@ -14,7 +14,19 @@ function hexToRgba(hex: string, alpha: number): string {
   return `rgba(${r},${g},${b},${alpha})`
 }
 
-const FEATURE_TABS = [
+interface FeatureTab {
+  label: string
+  mobileLabel?: string
+  color: string
+  badgeColor?: string
+  title: string
+  description: string
+  cta: string
+  segments: number[][]
+  hideOnMobile?: boolean
+}
+
+const FEATURE_TABS: FeatureTab[] = [
   {
     label: 'Mothership',
     color: '#FA4EDF',
@@ -75,27 +87,6 @@ const FEATURE_TABS = [
       [1, 10],
     ],
   },
-  {
-    label: 'Knowledge Base',
-    mobileLabel: 'Knowledge',
-    color: '#8B5CF6',
-    title: 'Your context engine',
-    description:
-      'Sync institutional knowledge from 30+ live connectors — Notion, Drive, Slack, Confluence, and more — so every agent draws from the same truth across your entire organization.',
-    cta: 'Explore knowledge base',
-    segments: [
-      [0.3, 10],
-      [0.25, 8],
-      [0.4, 10],
-      [0.5, 10],
-      [0.65, 10],
-      [0.8, 10],
-      [0.9, 12],
-      [1, 10],
-      [0.95, 10],
-      [1, 10],
-    ],
-  },
   {
     label: 'Logs',
     hideOnMobile: true,
@@ -138,36 +129,6 @@ function ScrollLetter({ scrollYProgress, charIndex, children }: ScrollLetterProp
   return <motion.span style={{ opacity }}>{children}</motion.span>
 }
 
-function DotGrid({
-  cols,
-  rows,
-  width,
-  borderLeft,
-}: {
-  cols: number
-  rows: number
-  width?: number
-  borderLeft?: boolean
-}) {
-  return (
-    <div
-      aria-hidden='true'
-      className={`h-full shrink-0 bg-[var(--landing-bg-section)] p-1.5 ${borderLeft ? 'border-[var(--divider)] border-l' : ''}`}
-      style={{
-        width: width ? `${width}px` : undefined,
-        display: 'grid',
-        gridTemplateColumns: `repeat(${cols}, 1fr)`,
-        gap: 4,
-        placeItems: 'center',
-      }}
-    >
-      {Array.from({ length: cols * rows }, (_, i) => (
-        <div key={i} className='h-[1.5px] w-[1.5px] rounded-full bg-[#DEDEDE]' />
-      ))}
-    </div>
-  )
-}
-
 export default function Features() {
   const sectionRef = useRef<HTMLDivElement>(null)
   const [activeTab, setActiveTab] = useState(0)
@@ -183,7 +144,7 @@ export default function Features() {
       aria-labelledby='features-heading'
       className='relative overflow-hidden bg-[var(--landing-bg-section)]'
     >
-      <div aria-hidden='true' className='absolute top-0 left-0 w-full'>
+      <div aria-hidden='true' className='absolute top-0 left-0 hidden w-full lg:block'>
         <Image
           src='/landing/features-transition.svg'
           alt=''
@@ -194,7 +155,7 @@ export default function Features() {
       </div>
 
       <div className='relative z-10 pt-[60px] lg:pt-[100px]'>
-        <div ref={sectionRef} className='flex flex-col items-start gap-5 px-6 lg:px-20'>
+        <div ref={sectionRef} className='flex flex-col items-start gap-5 px-6 lg:px-16'>
           <Badge
             variant='blue'
             size='md'
@@ -210,9 +171,17 @@ export default function Features() {
           >
             Workspace
           </Badge>
+          <p className='sr-only'>
+            Sim's workspace includes four core features: Mothership, an AI command center for
+            natural-language control of your entire workspace; Tables, a built-in database for
+            filtering, sorting, and wiring data directly into workflows; Files, a shared document
+            store for uploading, creating, and sharing documents, spreadsheets, and media across
+            teams and agents; and Logs, full execution tracing with inputs, outputs, cost, and
+            duration for every run.
+          </p>
           <h2
             id='features-heading'
-            className='max-w-[900px] text-balance font-[430] font-season text-[28px] text-[var(--landing-text-dark)] leading-[110%] tracking-[-0.02em] md:text-[40px]'
+            className='max-w-[900px] text-balance font-[430] font-season text-[24px] text-[var(--landing-text-dark)] leading-[110%] tracking-[-0.02em] md:text-[36px]'
           >
             {HEADING_LETTERS.map((char, i) => (
               <ScrollLetter key={i} scrollYProgress={scrollYProgress} charIndex={i}>
@@ -226,45 +195,36 @@ export default function Features() {
           </h2>
         </div>
 
-        <div className='relative mt-10 pb-10 lg:mt-[73px] lg:pb-20'>
+        <div className='relative mt-10 pb-[60px] lg:mt-[73px] lg:pb-[100px]'>
           <div
             aria-hidden='true'
-            className='absolute top-0 bottom-0 left-[80px] z-20 hidden w-px bg-[var(--divider)] lg:block'
+            className='absolute top-0 bottom-0 left-16 z-20 hidden w-px bg-[var(--divider)] lg:block'
           />
           <div
             aria-hidden='true'
-            className='absolute top-0 right-[80px] bottom-0 z-20 hidden w-px bg-[var(--divider)] lg:block'
+            className='absolute top-0 right-16 bottom-0 z-20 hidden w-px bg-[var(--divider)] lg:block'
           />
 
           <div className='flex h-[68px] border border-[var(--divider)] lg:overflow-hidden'>
-            <div className='h-full shrink-0'>
-              <div className='h-full lg:hidden'>
-                <DotGrid cols={3} rows={8} width={24} />
-              </div>
-              <div className='hidden h-full lg:block'>
-                <DotGrid cols={10} rows={8} width={80} />
-              </div>
-            </div>
+            <div
+              aria-hidden='true'
+              className='h-full w-[24px] shrink-0 bg-[var(--landing-bg-section)] lg:w-16'
+            />
 
             <div role='tablist' aria-label='Feature categories' className='flex flex-1'>
               {FEATURE_TABS.map((tab, index) => (
                 <button
                   key={tab.label}
+                  id={`feature-tab-${index}`}
                   type='button'
                   role='tab'
                   aria-selected={index === activeTab}
+                  aria-controls='features-panel'
                   onClick={() => setActiveTab(index)}
-                  className={`relative h-full flex-1 items-center justify-center whitespace-nowrap px-3 font-medium font-season text-[var(--landing-text-dark)] text-caption uppercase lg:px-0 lg:text-sm${tab.hideOnMobile ? ' hidden lg:flex' : ' flex'}${index > 0 ? ' border-[var(--divider)] border-l' : ''}`}
+                  className={`relative h-full min-w-0 flex-1 items-center justify-center px-2 font-medium font-season text-[var(--landing-text-dark)] text-caption uppercase lg:px-0 lg:text-sm${tab.hideOnMobile ? ' hidden lg:flex' : ' flex'}${index > 0 ? ' border-[var(--divider)] border-l' : ''}`}
                   style={{ backgroundColor: index === activeTab ? '#FDFDFD' : '#F6F6F6' }}
                 >
-                  {tab.mobileLabel ? (
-                    <>
-                      <span className='lg:hidden'>{tab.mobileLabel}</span>
-                      <span className='hidden lg:inline'>{tab.label}</span>
-                    </>
-                  ) : (
-                    tab.label
-                  )}
+                  <span className='truncate'>{tab.label}</span>
                   {index === activeTab && (
                     <div className='absolute right-0 bottom-0 left-0 flex h-[6px]'>
                       {tab.segments.map(([opacity, width], i) => (
@@ -284,17 +244,18 @@ export default function Features() {
               ))}
             </div>
 
-            <div className='h-full shrink-0'>
-              <div className='h-full lg:hidden'>
-                <DotGrid cols={3} rows={8} width={24} />
-              </div>
-              <div className='hidden h-full lg:block'>
-                <DotGrid cols={10} rows={8} width={80} />
-              </div>
-            </div>
+            <div
+              aria-hidden='true'
+              className='h-full w-[24px] shrink-0 border-[var(--divider)] border-l bg-[var(--landing-bg-section)] lg:w-16'
+            />
           </div>
 
-          <div className='mt-8 flex flex-col gap-6 px-6 lg:mt-[60px] lg:grid lg:grid-cols-[1fr_2.8fr] lg:gap-[60px] lg:px-[120px]'>
+          <div
+            id='features-panel'
+            role='tabpanel'
+            aria-labelledby={`feature-tab-${activeTab}`}
+            className='mt-8 flex flex-col gap-6 px-6 lg:mt-[60px] lg:grid lg:grid-cols-[1fr_2.8fr] lg:gap-[60px] lg:px-[104px]'
+          >
             <div className='flex flex-col items-start justify-between gap-6 pt-5 lg:h-[560px] lg:gap-0'>
               <div className='flex flex-col items-start gap-4'>
                 <h3 className='font-[430] font-season text-[24px] text-[var(--landing-text-dark)] leading-[120%] tracking-[-0.02em] lg:text-[28px]'>
@@ -306,26 +267,9 @@ export default function Features() {
               </div>
               <Link
                 href='/signup'
-                className='group/cta inline-flex h-[32px] items-center gap-1.5 rounded-[5px] border border-[#1D1D1D] bg-[#1D1D1D] px-2.5 font-[430] font-season text-sm text-white transition-colors hover:border-[var(--landing-bg-elevated)] hover:bg-[var(--landing-bg-elevated)]'
+                className='inline-flex h-[32px] items-center rounded-[5px] border border-[#1D1D1D] bg-[#1D1D1D] px-2.5 font-[430] font-season text-sm text-white transition-colors hover:border-[var(--landing-bg-elevated)] hover:bg-[var(--landing-bg-elevated)]'
               >
                 {FEATURE_TABS[activeTab].cta}
-                <span className='relative h-[10px] w-[10px] shrink-0'>
-                  <ChevronDown className='-rotate-90 absolute inset-0 h-[10px] w-[10px] transition-opacity duration-150 group-hover/cta:opacity-0' />
-                  <svg
-                    className='absolute inset-0 h-[10px] w-[10px] opacity-0 transition-opacity duration-150 group-hover/cta:opacity-100'
-                    viewBox='0 0 10 10'
-                    fill='none'
-                  >
-                    <path
-                      d='M1 5H8M5.5 2L8.5 5L5.5 8'
-                      stroke='currentColor'
-                      strokeWidth='1.33'
-                      strokeLinecap='square'
-                      strokeLinejoin='miter'
-                      fill='none'
-                    />
-                  </svg>
-                </span>
               </Link>
             </div>
 
diff --git a/apps/sim/app/(home)/components/footer/footer-cta.tsx b/apps/sim/app/(landing)/components/footer/footer-cta.tsx
similarity index 68%
rename from apps/sim/app/(home)/components/footer/footer-cta.tsx
rename to apps/sim/app/(landing)/components/footer/footer-cta.tsx
index 984252f270a..c1c95a638da 100644
--- a/apps/sim/app/(home)/components/footer/footer-cta.tsx
+++ b/apps/sim/app/(landing)/components/footer/footer-cta.tsx
@@ -3,7 +3,7 @@
 import { useCallback, useRef, useState } from 'react'
 import { ArrowUp } from 'lucide-react'
 import Link from 'next/link'
-import { useLandingSubmit } from '@/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
+import { useLandingSubmit } from '@/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
 import { useAnimatedPlaceholder } from '@/hooks/use-animated-placeholder'
 
 const MAX_HEIGHT = 120
@@ -41,14 +41,21 @@ export function FooterCTA() {
   }, [])
 
   return (
-    <div className='flex flex-col items-center px-4 pt-[120px] pb-[100px] sm:px-8 md:px-20'>
-      <h2 className='text-balance text-center font-[430] font-season text-[28px] text-[var(--landing-text-dark)] leading-[100%] tracking-[-0.02em] sm:text-[32px] md:text-[36px]'>
+    <section
+      id='cta'
+      aria-labelledby='cta-heading'
+      className='flex flex-col items-center px-4 pt-[90px] pb-[90px] sm:px-8 sm:pt-[120px] sm:pb-[120px] md:px-16 md:pt-[150px] md:pb-[150px]'
+    >
+      <h2
+        id='cta-heading'
+        className='text-balance text-center font-[430] font-season text-[28px] text-white leading-[100%] tracking-[-0.02em] sm:text-[32px] md:text-[36px]'
+      >
         What should we get done?
       </h2>
 
       <div className='mt-8 w-full max-w-[42rem]'>
         <div
-          className='cursor-text rounded-[20px] border border-[var(--landing-bg-skeleton)] bg-white px-2.5 py-2 shadow-sm'
+          className='cursor-text rounded-[20px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg-surface)] px-2.5 py-2'
           onClick={() => textareaRef.current?.focus()}
         >
           <textarea
@@ -57,10 +64,11 @@ export function FooterCTA() {
             onChange={(e) => setInputValue(e.target.value)}
             onKeyDown={handleKeyDown}
             onInput={handleInput}
+            aria-label='Describe what you want to build'
             placeholder={animatedPlaceholder}
             rows={2}
-            className='m-0 box-border min-h-[48px] w-full resize-none border-0 bg-transparent px-1 py-1 font-body text-[var(--landing-text-dark)] text-base leading-[24px] tracking-[-0.015em] outline-none placeholder:font-[380] placeholder:text-[var(--landing-text-muted)] focus-visible:ring-0'
-            style={{ caretColor: '#1C1C1C', maxHeight: `${MAX_HEIGHT}px` }}
+            className='m-0 box-border min-h-[48px] w-full resize-none border-0 bg-transparent px-1 py-1 font-body text-[var(--landing-text)] text-base leading-[24px] tracking-[-0.015em] outline-none placeholder:font-[380] placeholder:text-[var(--landing-text-muted)] focus-visible:ring-0'
+            style={{ caretColor: '#FFFFFF', maxHeight: `${MAX_HEIGHT}px` }}
           />
           <div className='flex items-center justify-end'>
             <button
@@ -70,11 +78,11 @@ export function FooterCTA() {
               aria-label='Submit message'
               className='flex h-[28px] w-[28px] items-center justify-center rounded-full border-0 p-0 transition-colors'
               style={{
-                background: isEmpty ? '#C0C0C0' : '#1C1C1C',
+                background: isEmpty ? '#555555' : '#FFFFFF',
                 cursor: isEmpty ? 'not-allowed' : 'pointer',
               }}
             >
-              <ArrowUp size={16} strokeWidth={2.25} color='#FFFFFF' />
+              <ArrowUp size={16} strokeWidth={2.25} color={isEmpty ? '#888888' : '#1C1C1C'} />
             </button>
           </div>
         </div>
@@ -85,17 +93,17 @@ export function FooterCTA() {
           href='https://docs.sim.ai'
           target='_blank'
           rel='noopener noreferrer'
-          className={`${CTA_BUTTON} border-[var(--landing-border-subtle)] text-[var(--landing-text-dark)] transition-colors hover:bg-[var(--landing-bg-skeleton)]`}
+          className={`${CTA_BUTTON} border-[var(--landing-border-strong)] text-[var(--landing-text)] transition-colors hover:bg-[var(--landing-bg-elevated)]`}
         >
           Docs
         </a>
         <Link
           href='/signup'
-          className={`${CTA_BUTTON} gap-2 border-[var(--landing-bg)] bg-[var(--landing-bg)] text-white transition-colors hover:border-[var(--landing-bg-elevated)] hover:bg-[var(--landing-bg-elevated)]`}
+          className={`${CTA_BUTTON} gap-2 border-white bg-white text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]`}
         >
           Get started
         </Link>
       </div>
-    </div>
+    </section>
   )
 }
diff --git a/apps/sim/app/(home)/components/footer/footer.tsx b/apps/sim/app/(landing)/components/footer/footer.tsx
similarity index 66%
rename from apps/sim/app/(home)/components/footer/footer.tsx
rename to apps/sim/app/(landing)/components/footer/footer.tsx
index 33ef8dcf9b0..4cc34914e88 100644
--- a/apps/sim/app/(home)/components/footer/footer.tsx
+++ b/apps/sim/app/(landing)/components/footer/footer.tsx
@@ -1,6 +1,6 @@
 import Image from 'next/image'
 import Link from 'next/link'
-import { FooterCTA } from '@/app/(home)/components/footer/footer-cta'
+import { FooterCTA } from '@/app/(landing)/components/footer/footer-cta'
 
 const LINK_CLASS =
   'text-sm text-[var(--landing-text-muted)] transition-colors hover:text-[var(--landing-text)]'
@@ -9,17 +9,17 @@ interface FooterItem {
   label: string
   href: string
   external?: boolean
+  arrow?: boolean
+  externalArrow?: boolean
 }
 
 const PRODUCT_LINKS: FooterItem[] = [
-  { label: 'Pricing', href: '/#pricing' },
-  { label: 'Enterprise', href: 'https://form.typeform.com/to/jqCO12pF', external: true },
   { label: 'Self Hosting', href: 'https://docs.sim.ai/self-hosting', external: true },
   { label: 'MCP', href: 'https://docs.sim.ai/mcp', external: true },
   { label: 'Knowledge Base', href: 'https://docs.sim.ai/knowledgebase', external: true },
   { label: 'Tables', href: 'https://docs.sim.ai/tables', external: true },
   { label: 'API', href: 'https://docs.sim.ai/api-reference/getting-started', external: true },
-  { label: 'Status', href: 'https://status.sim.ai', external: true },
+  { label: 'Status', href: 'https://status.sim.ai', external: true, externalArrow: true },
 ]
 
 const RESOURCES_LINKS: FooterItem[] = [
@@ -29,7 +29,7 @@ const RESOURCES_LINKS: FooterItem[] = [
   { label: 'Models', href: '/models' },
   // { label: 'Academy', href: '/academy' },
   { label: 'Partners', href: '/partners' },
-  { label: 'Careers', href: 'https://jobs.ashbyhq.com/sim', external: true },
+  { label: 'Careers', href: 'https://jobs.ashbyhq.com/sim', external: true, externalArrow: true },
   { label: 'Changelog', href: '/changelog' },
 ]
 
@@ -47,7 +47,7 @@ const BLOCK_LINKS: FooterItem[] = [
 ]
 
 const INTEGRATION_LINKS: FooterItem[] = [
-  { label: 'All Integrations →', href: '/integrations' },
+  { label: 'All Integrations', href: '/integrations', arrow: true },
   { label: 'Confluence', href: 'https://docs.sim.ai/tools/confluence', external: true },
   { label: 'Slack', href: 'https://docs.sim.ai/tools/slack', external: true },
   { label: 'GitHub', href: 'https://docs.sim.ai/tools/github', external: true },
@@ -71,10 +71,20 @@ const INTEGRATION_LINKS: FooterItem[] = [
 ]
 
 const SOCIAL_LINKS: FooterItem[] = [
-  { label: 'X (Twitter)', href: 'https://x.com/simdotai', external: true },
-  { label: 'LinkedIn', href: 'https://www.linkedin.com/company/simstudioai/', external: true },
-  { label: 'Discord', href: 'https://discord.gg/Hr4UWYEcTT', external: true },
-  { label: 'GitHub', href: 'https://github.com/simstudioai/sim', external: true },
+  { label: 'X (Twitter)', href: 'https://x.com/simdotai', external: true, externalArrow: true },
+  {
+    label: 'LinkedIn',
+    href: 'https://www.linkedin.com/company/simstudioai/',
+    external: true,
+    externalArrow: true,
+  },
+  { label: 'Discord', href: 'https://discord.gg/Hr4UWYEcTT', external: true, externalArrow: true },
+  {
+    label: 'GitHub',
+    href: 'https://github.com/simstudioai/sim',
+    external: true,
+    externalArrow: true,
+  },
 ]
 
 const LEGAL_LINKS: FooterItem[] = [
@@ -82,25 +92,62 @@ const LEGAL_LINKS: FooterItem[] = [
   { label: 'Privacy Policy', href: '/privacy' },
 ]
 
+function ChevronArrow({ external }: { external?: boolean }) {
+  return (
+    <svg
+      className={`h-3 w-3 shrink-0${external ? ' -rotate-45' : ''}`}
+      viewBox='0 0 10 10'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
+    >
+      <line
+        x1='0'
+        y1='5'
+        x2='9'
+        y2='5'
+        stroke='currentColor'
+        strokeWidth='1.33'
+        strokeLinecap='square'
+        className='origin-left scale-x-0 transition-transform duration-200 ease-out [transform-box:fill-box] group-hover/link:scale-x-100'
+      />
+      <path
+        d='M3.5 2L6.5 5L3.5 8'
+        stroke='currentColor'
+        strokeWidth='1.33'
+        strokeLinecap='square'
+        strokeLinejoin='miter'
+        fill='none'
+        className='transition-transform duration-200 ease-out group-hover/link:translate-x-[30%]'
+      />
+    </svg>
+  )
+}
+
 function FooterColumn({ title, items }: { title: string; items: FooterItem[] }) {
   return (
     <div>
       <h3 className='mb-4 font-medium text-[var(--landing-text)] text-sm'>{title}</h3>
       <div className='flex flex-col gap-2.5'>
-        {items.map(({ label, href, external }) =>
+        {items.map(({ label, href, external, arrow, externalArrow }) =>
           external ? (
             <a
               key={label}
               href={href}
               target='_blank'
               rel='noopener noreferrer'
-              className={LINK_CLASS}
+              className={`${LINK_CLASS}${externalArrow ? ' group/link inline-flex items-center gap-1' : ''}`}
             >
               {label}
+              {externalArrow && <ChevronArrow external />}
             </a>
           ) : (
-            <Link key={label} href={href} className={LINK_CLASS}>
+            <Link
+              key={label}
+              href={href}
+              className={`${LINK_CLASS}${arrow ? ' group/link inline-flex items-center gap-1.5' : ''}`}
+            >
               {label}
+              {arrow && <ChevronArrow />}
             </Link>
           )
         )}
@@ -117,13 +164,31 @@ export default function Footer({ hideCTA }: FooterProps) {
   return (
     <footer
       role='contentinfo'
-      className={`bg-[var(--landing-bg-section)] pb-10 font-[430] font-season text-sm${hideCTA ? ' pt-10' : ''}`}
+      className={`bg-[var(--landing-bg)] pb-10 font-[430] font-season text-sm${hideCTA ? ' pt-10' : ''}`}
     >
       {!hideCTA && <FooterCTA />}
-      <div className='px-4 sm:px-8 md:px-20'>
-        <div className='relative overflow-hidden rounded-lg bg-[var(--landing-bg)] px-6 pt-10 pb-8 sm:px-10 sm:pt-12 sm:pb-10'>
+      <div className='relative px-[1.6vw] sm:px-8 lg:px-16'>
+        <div
+          aria-hidden='true'
+          className='absolute top-0 left-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div
+          aria-hidden='true'
+          className='absolute top-0 right-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div
+          aria-hidden='true'
+          className='absolute bottom-0 left-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div
+          aria-hidden='true'
+          className='absolute right-0 bottom-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div className='relative z-10 border border-[var(--landing-bg-elevated)] px-6 pt-10 pb-8 sm:px-10 sm:pt-12 sm:pb-10'>
           <nav
             aria-label='Footer navigation'
+            itemScope
+            itemType='https://schema.org/SiteNavigationElement'
             className='relative z-[1] grid grid-cols-2 gap-x-8 gap-y-10 sm:grid-cols-3 lg:grid-cols-7'
           >
             <div className='col-span-2 flex flex-col gap-6 sm:col-span-1'>
@@ -145,29 +210,6 @@ export default function Footer({ hideCTA }: FooterProps) {
             <FooterColumn title='Socials' items={SOCIAL_LINKS} />
             <FooterColumn title='Legal' items={LEGAL_LINKS} />
           </nav>
-
-          {/* <svg
-            aria-hidden='true'
-            className='pointer-events-none absolute bottom-0 left-[-60px] hidden w-[85%] sm:block'
-            viewBox='0 0 1800 316'
-            fill='none'
-            xmlns='http://www.w3.org/2000/svg'
-          >
-            <path
-              d='M18.3562 305V48.95A30.594 30.594 0 0 1 48.95 18.356H917.05A30.594 30.594 0 0 1 947.644 48.95V273H1768C1777.11 273 1784.5 280.387 1784.5 289.5C1784.5 298.613 1777.11 306 1768 306H96.8603C78.635 306 63.8604 310 63.8604 305H18.3562'
-              stroke='#2A2A2A'
-              strokeWidth='2'
-            />
-            <rect
-              x='58'
-              y='58'
-              width='849.288'
-              height='199.288'
-              rx='14'
-              stroke='#2A2A2A'
-              strokeWidth='2'
-            />
-          </svg> */}
         </div>
       </div>
     </footer>
diff --git a/apps/sim/app/(landing)/components/hero/hero.tsx b/apps/sim/app/(landing)/components/hero/hero.tsx
new file mode 100644
index 00000000000..775f241c337
--- /dev/null
+++ b/apps/sim/app/(landing)/components/hero/hero.tsx
@@ -0,0 +1,97 @@
+'use client'
+
+import dynamic from 'next/dynamic'
+import Link from 'next/link'
+import { DemoRequestModal } from '@/app/(landing)/components/demo-request/demo-request-modal'
+
+const LandingPreview = dynamic(
+  () =>
+    import('@/app/(landing)/components/landing-preview/landing-preview').then(
+      (mod) => mod.LandingPreview
+    ),
+  {
+    ssr: false,
+    loading: () => <div className='aspect-[1116/615] w-full rounded bg-[var(--landing-bg)]' />,
+  }
+)
+
+/** Shared base classes for CTA link buttons — matches Deploy/Run button styling in the preview panel. */
+const CTA_BASE =
+  'inline-flex items-center h-[32px] rounded-[5px] border px-2.5 font-[430] font-season text-sm'
+
+export default function Hero() {
+  return (
+    <section
+      id='hero'
+      aria-labelledby='hero-heading'
+      itemScope
+      itemType='https://schema.org/WebApplication'
+      className='relative flex flex-col items-center overflow-hidden bg-[var(--landing-bg)] pt-[60px] lg:pt-[100px]'
+    >
+      <p className='sr-only'>
+        Sim is an open-source AI agent platform. Sim lets teams build AI agents and run an agentic
+        workforce by connecting 1,000+ integrations and LLMs — including OpenAI, Anthropic Claude,
+        Google Gemini, Mistral, and xAI Grok — to deploy and orchestrate agentic workflows. Users
+        create agents, workflows, knowledge bases, tables, and docs. Sim is trusted by over 100,000
+        builders at startups and Fortune 500 companies. Sim is SOC2 compliant.
+      </p>
+
+      <div className='relative z-10 flex flex-col items-center gap-3'>
+        <h1
+          id='hero-heading'
+          itemProp='name'
+          className='text-balance font-[430] font-season text-[36px] text-white leading-[100%] tracking-[-0.02em] sm:text-[48px] lg:text-[72px]'
+        >
+          Build AI Agents
+        </h1>
+        <p
+          itemProp='description'
+          className='whitespace-nowrap text-center font-[430] font-season text-[4.4vw] text-[color-mix(in_srgb,var(--landing-text-subtle)_60%,transparent)] leading-[125%] tracking-[0.02em] sm:whitespace-normal sm:text-lg lg:text-xl'
+        >
+          Sim is the AI Workspace for Agent Builders
+        </p>
+
+        <div className='mt-3 flex items-center gap-2'>
+          <DemoRequestModal theme='light'>
+            <button
+              type='button'
+              className={`${CTA_BASE} border-[var(--landing-border-strong)] bg-transparent text-[var(--landing-text)] transition-colors hover:bg-[var(--landing-bg-elevated)]`}
+              aria-label='Get a demo'
+            >
+              Get a demo
+            </button>
+          </DemoRequestModal>
+          <Link
+            href='/signup'
+            className={`${CTA_BASE} gap-2 border-white bg-white text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]`}
+            aria-label='Get started with Sim'
+          >
+            Get started
+          </Link>
+        </div>
+      </div>
+
+      <div className='relative z-10 mx-auto mt-6 w-[92vw] px-[1.6vw] lg:mt-[3.2vw] lg:w-full lg:px-16'>
+        <div
+          aria-hidden='true'
+          className='absolute top-0 left-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div
+          aria-hidden='true'
+          className='absolute top-0 right-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div
+          aria-hidden='true'
+          className='absolute bottom-0 left-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div
+          aria-hidden='true'
+          className='absolute right-0 bottom-0 z-20 hidden h-px w-[calc(4rem+4px)] bg-[var(--landing-bg-elevated)] lg:block'
+        />
+        <div className='relative z-10 overflow-hidden rounded border border-[var(--landing-bg-elevated)]'>
+          <LandingPreview />
+        </div>
+      </div>
+    </section>
+  )
+}
diff --git a/apps/sim/app/(landing)/components/index.ts b/apps/sim/app/(landing)/components/index.ts
index ea11fd29b76..24c7c2d3435 100644
--- a/apps/sim/app/(landing)/components/index.ts
+++ b/apps/sim/app/(landing)/components/index.ts
@@ -1,4 +1,27 @@
+import Collaboration from '@/app/(landing)/components/collaboration/collaboration'
+import Enterprise from '@/app/(landing)/components/enterprise/enterprise'
 import ExternalRedirect from '@/app/(landing)/components/external-redirect'
+import Features from '@/app/(landing)/components/features/features'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Hero from '@/app/(landing)/components/hero/hero'
 import LegalLayout from '@/app/(landing)/components/legal-layout'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
+import Pricing from '@/app/(landing)/components/pricing/pricing'
+import StructuredData from '@/app/(landing)/components/structured-data'
+import Templates from '@/app/(landing)/components/templates/templates'
+import Testimonials from '@/app/(landing)/components/testimonials/testimonials'
 
-export { LegalLayout, ExternalRedirect }
+export {
+  Collaboration,
+  Enterprise,
+  ExternalRedirect,
+  Features,
+  Footer,
+  Hero,
+  LegalLayout,
+  Navbar,
+  Pricing,
+  StructuredData,
+  Templates,
+  Testimonials,
+}
diff --git a/apps/sim/app/(home)/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
similarity index 94%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-files/landing-preview-files.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files.tsx
index eaea9b0f66c..b9ca9f6c196 100644
--- a/apps/sim/app/(home)/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
@@ -3,11 +3,11 @@ import { DocxIcon, PdfIcon } from '@/components/icons/document-icons'
 import type {
   PreviewColumn,
   PreviewRow,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
 import {
   LandingPreviewResource,
   ownerCell,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
 
 /** 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
new file mode 100644
index 00000000000..35cb85c1654
--- /dev/null
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
@@ -0,0 +1,479 @@
+'use client'
+
+import { memo, useCallback, useEffect, useRef, useState } from 'react'
+import { AnimatePresence, motion } from 'framer-motion'
+import { ArrowUp, Table } from 'lucide-react'
+import { Blimp, Checkbox, ChevronDown } from '@/components/emcn'
+import { TypeBoolean, TypeNumber, TypeText } from '@/components/emcn/icons'
+import { useLandingSubmit } from '@/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
+import { EASE_OUT } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+import { useAnimatedPlaceholder } from '@/hooks/use-animated-placeholder'
+
+const C = {
+  SURFACE: '#292929',
+  BORDER: '#3d3d3d',
+  TEXT_PRIMARY: '#e6e6e6',
+  TEXT_BODY: '#cdcdcd',
+  TEXT_SECONDARY: '#b3b3b3',
+  TEXT_TERTIARY: '#939393',
+  TEXT_ICON: '#939393',
+} as const
+
+const AUTO_PROMPT = 'Analyze our customer leads and identify the top prospects'
+
+const MOCK_RESPONSE =
+  'I analyzed your **Customer Leads** table and found **3 top prospects** with the highest lead scores:\n\n1. **Carol Davis** (StartupCo) — Score: 94\n2. **Frank Lee** (Ventures) — Score: 88\n3. **Alice Johnson** (Acme Corp) — Score: 87\n\nAll three are qualified leads. Want me to draft outreach emails?'
+
+const HOME_TYPE_MS = 40
+const HOME_TYPE_START_MS = 600
+const TOOL_CALL_DELAY_MS = 500
+const RESPONSE_DELAY_MS = 800
+const RESOURCE_PANEL_DELAY_MS = 600
+
+const MINI_TABLE_COLUMNS = [
+  { id: 'name', label: 'Name', type: 'text' as const, width: '32%' },
+  { id: 'company', label: 'Company', type: 'text' as const, width: '30%' },
+  { id: 'score', label: 'Score', type: 'number' as const, width: '18%' },
+  { id: 'qualified', label: 'Qualified', type: 'boolean' as const, width: '20%' },
+]
+
+const MINI_TABLE_ROWS = [
+  { name: 'Alice Johnson', company: 'Acme Corp', score: '87', qualified: 'true' },
+  { name: 'Bob Williams', company: 'TechCo', score: '62', qualified: 'false' },
+  { name: 'Carol Davis', company: 'StartupCo', score: '94', qualified: 'true' },
+  { name: 'Dan Miller', company: 'BigCorp', score: '71', qualified: 'true' },
+  { name: 'Eva Chen', company: 'Design IO', score: '45', qualified: 'false' },
+  { name: 'Frank Lee', company: 'Ventures', score: '88', qualified: 'true' },
+]
+
+const COLUMN_TYPE_ICONS = {
+  text: TypeText,
+  number: TypeNumber,
+  boolean: TypeBoolean,
+} as const
+
+interface LandingPreviewHomeProps {
+  autoType?: boolean
+}
+
+type ChatPhase = 'input' | 'sent' | 'tool-call' | 'responding' | 'done'
+
+/**
+ * Landing preview replica of the workspace Home view.
+ *
+ * When `autoType` is true, automatically types a prompt, sends it,
+ * shows a mothership agent group with tool calls, types a response,
+ * and opens a resource panel — matching the real workspace chat UI.
+ */
+export const LandingPreviewHome = memo(function LandingPreviewHome({
+  autoType = false,
+}: LandingPreviewHomeProps) {
+  const landingSubmit = useLandingSubmit()
+  const [inputValue, setInputValue] = useState('')
+  const textareaRef = useRef<HTMLTextAreaElement>(null)
+  const animatedPlaceholder = useAnimatedPlaceholder()
+
+  const [chatPhase, setChatPhase] = useState<ChatPhase>('input')
+  const [responseTypedLength, setResponseTypedLength] = useState(0)
+  const [showResourcePanel, setShowResourcePanel] = useState(false)
+  const [toolsExpanded, setToolsExpanded] = useState(true)
+
+  const typeIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null)
+  const responseIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null)
+  const timersRef = useRef<ReturnType<typeof setTimeout>[]>([])
+
+  const clearAllTimers = useCallback(() => {
+    for (const t of timersRef.current) clearTimeout(t)
+    timersRef.current = []
+    if (typeIntervalRef.current) clearInterval(typeIntervalRef.current)
+    if (responseIntervalRef.current) clearInterval(responseIntervalRef.current)
+    typeIntervalRef.current = null
+    responseIntervalRef.current = null
+  }, [])
+
+  useEffect(() => {
+    if (!autoType) return
+
+    setChatPhase('input')
+    setResponseTypedLength(0)
+    setShowResourcePanel(false)
+    setToolsExpanded(true)
+    setInputValue('')
+
+    const t1 = setTimeout(() => {
+      let idx = 0
+      typeIntervalRef.current = setInterval(() => {
+        idx++
+        setInputValue(AUTO_PROMPT.slice(0, idx))
+        if (idx >= AUTO_PROMPT.length) {
+          if (typeIntervalRef.current) clearInterval(typeIntervalRef.current)
+          typeIntervalRef.current = null
+
+          const t2 = setTimeout(() => {
+            setChatPhase('sent')
+
+            const t3 = setTimeout(() => {
+              setChatPhase('tool-call')
+
+              const t4 = setTimeout(() => {
+                setShowResourcePanel(true)
+              }, RESOURCE_PANEL_DELAY_MS)
+              timersRef.current.push(t4)
+
+              const t5 = setTimeout(() => {
+                setToolsExpanded(false)
+                setChatPhase('responding')
+                let rIdx = 0
+                responseIntervalRef.current = setInterval(() => {
+                  rIdx++
+                  setResponseTypedLength(rIdx)
+                  if (rIdx >= MOCK_RESPONSE.length) {
+                    if (responseIntervalRef.current) clearInterval(responseIntervalRef.current)
+                    responseIntervalRef.current = null
+                    setChatPhase('done')
+                  }
+                }, 8)
+              }, TOOL_CALL_DELAY_MS + RESPONSE_DELAY_MS)
+              timersRef.current.push(t5)
+            }, TOOL_CALL_DELAY_MS)
+            timersRef.current.push(t3)
+          }, 400)
+          timersRef.current.push(t2)
+        }
+      }, HOME_TYPE_MS)
+    }, HOME_TYPE_START_MS)
+    timersRef.current.push(t1)
+
+    return clearAllTimers
+  }, [autoType, clearAllTimers])
+
+  const isEmpty = inputValue.trim().length === 0
+
+  const handleSubmit = useCallback(() => {
+    if (isEmpty) return
+    landingSubmit(inputValue)
+  }, [isEmpty, inputValue, landingSubmit])
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+      if (e.key === 'Enter' && !e.shiftKey) {
+        e.preventDefault()
+        handleSubmit()
+      }
+    },
+    [handleSubmit]
+  )
+
+  const handleInput = useCallback((e: React.FormEvent<HTMLTextAreaElement>) => {
+    const target = e.target as HTMLTextAreaElement
+    target.style.height = 'auto'
+    target.style.height = `${Math.min(target.scrollHeight, 200)}px`
+  }, [])
+
+  if (chatPhase !== 'input') {
+    const isResponding = chatPhase === 'responding' || chatPhase === 'done'
+    const showToolCall = chatPhase === 'tool-call' || isResponding
+
+    return (
+      <div className='flex min-w-0 flex-1 overflow-hidden'>
+        {/* Chat area — matches mothership-view layout */}
+        <div className='min-h-0 flex-1 overflow-y-auto overflow-x-hidden px-6 pt-4 pb-8'>
+          <div className='mx-auto max-w-[42rem] space-y-6'>
+            {/* User message — rounded bubble, right-aligned */}
+            <motion.div
+              className='flex flex-col items-end gap-[6px] pt-3'
+              initial={{ opacity: 0, y: 12 }}
+              animate={{ opacity: 1, y: 0 }}
+              transition={{ duration: 0.3, ease: EASE_OUT }}
+            >
+              <div className='max-w-[70%] overflow-hidden rounded-[16px] bg-[#363636] px-3.5 py-2'>
+                <p
+                  className='font-body text-[14px] leading-[1.5]'
+                  style={{ color: C.TEXT_PRIMARY }}
+                >
+                  {AUTO_PROMPT}
+                </p>
+              </div>
+            </motion.div>
+
+            {/* Assistant — no bubble, full-width prose */}
+            <AnimatePresence>
+              {showToolCall && (
+                <motion.div
+                  className='space-y-2.5'
+                  initial={{ opacity: 0, y: 8 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ duration: 0.3, ease: EASE_OUT }}
+                >
+                  {/* Agent group header — icon + label + chevron */}
+                  <button
+                    type='button'
+                    onClick={() => setToolsExpanded((p) => !p)}
+                    className='flex cursor-pointer items-center gap-2'
+                  >
+                    <div className='flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center'>
+                      <Blimp className='h-[16px] w-[16px]' style={{ color: C.TEXT_ICON }} />
+                    </div>
+                    <span className='font-base text-sm' style={{ color: C.TEXT_BODY }}>
+                      Mothership
+                    </span>
+                    <ChevronDown
+                      className='h-[7px] w-[9px] transition-transform duration-150'
+                      style={{
+                        color: C.TEXT_ICON,
+                        transform: toolsExpanded ? 'rotate(0deg)' : 'rotate(-90deg)',
+                      }}
+                    />
+                  </button>
+
+                  {/* Tool call items — collapsible */}
+                  <div
+                    className='grid transition-[grid-template-rows] duration-200 ease-out'
+                    style={{
+                      gridTemplateRows: toolsExpanded ? '1fr' : '0fr',
+                    }}
+                  >
+                    <div className='overflow-hidden'>
+                      <div className='flex flex-col gap-1.5 pt-0.5'>
+                        <ToolCallRow
+                          icon={
+                            <Table
+                              className='h-[15px] w-[15px]'
+                              style={{ color: C.TEXT_TERTIARY }}
+                            />
+                          }
+                          title='Read Customer Leads'
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+                  {/* Response prose — full width, no card */}
+                  {isResponding && (
+                    <motion.div
+                      initial={{ opacity: 0 }}
+                      animate={{ opacity: 1 }}
+                      transition={{ duration: 0.2, ease: EASE_OUT }}
+                    >
+                      <ChatMarkdown
+                        content={MOCK_RESPONSE}
+                        visibleLength={responseTypedLength}
+                        isTyping={chatPhase === 'responding'}
+                      />
+                    </motion.div>
+                  )}
+                </motion.div>
+              )}
+            </AnimatePresence>
+          </div>
+        </div>
+
+        {/* Resource panel — slides in from right */}
+        <AnimatePresence>
+          {showResourcePanel && (
+            <motion.div
+              className='hidden h-full flex-shrink-0 overflow-hidden border-[#2c2c2c] border-l lg:flex'
+              initial={{ width: 0, opacity: 0 }}
+              animate={{ width: '55%', opacity: 1 }}
+              transition={{ duration: 0.35, ease: EASE_OUT }}
+            >
+              <MiniTablePanel />
+            </motion.div>
+          )}
+        </AnimatePresence>
+      </div>
+    )
+  }
+
+  return (
+    <div className='flex min-w-0 flex-1 flex-col items-center justify-center px-6 pb-[2vh]'>
+      <motion.p
+        role='presentation'
+        className='mb-6 max-w-[42rem] font-[430] font-season text-[32px] tracking-[-0.02em]'
+        style={{ color: C.TEXT_PRIMARY }}
+        initial={{ opacity: 0, y: 8 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{ duration: 0.4, ease: EASE_OUT }}
+      >
+        What should we get done?
+      </motion.p>
+
+      <motion.div
+        className='w-full max-w-[32rem]'
+        initial={{ opacity: 0, y: 12 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{ duration: 0.4, delay: 0.1, ease: EASE_OUT }}
+      >
+        <div
+          className='cursor-text rounded-[20px] border px-2.5 py-2'
+          style={{ borderColor: C.BORDER, backgroundColor: C.SURFACE }}
+          onClick={() => textareaRef.current?.focus()}
+        >
+          <textarea
+            ref={textareaRef}
+            value={inputValue}
+            onChange={(e) => {
+              if (!autoType) setInputValue(e.target.value)
+            }}
+            onKeyDown={handleKeyDown}
+            onInput={handleInput}
+            placeholder={animatedPlaceholder}
+            rows={1}
+            readOnly={autoType}
+            className='m-0 box-border min-h-[24px] w-full resize-none overflow-y-auto border-0 bg-transparent px-1 py-1 font-body text-[15px] leading-[24px] tracking-[-0.015em] outline-none placeholder:font-[380] placeholder:text-[#787878] focus-visible:ring-0'
+            style={{
+              color: C.TEXT_PRIMARY,
+              caretColor: autoType ? 'transparent' : C.TEXT_PRIMARY,
+              maxHeight: '200px',
+            }}
+          />
+          <div className='flex items-center justify-end'>
+            <button
+              type='button'
+              onClick={handleSubmit}
+              disabled={isEmpty}
+              className='flex h-[28px] w-[28px] items-center justify-center rounded-full border-0 p-0 transition-colors'
+              style={{
+                background: isEmpty ? '#808080' : '#e0e0e0',
+                cursor: isEmpty ? 'not-allowed' : 'pointer',
+              }}
+            >
+              <ArrowUp size={16} strokeWidth={2.25} color='#1b1b1b' />
+            </button>
+          </div>
+        </div>
+      </motion.div>
+    </div>
+  )
+})
+
+/**
+ * Single tool call row matching the real `ToolCallItem` layout:
+ * indented icon + display title.
+ */
+function ToolCallRow({ icon, title }: { icon: React.ReactNode; title: string }) {
+  return (
+    <div className='flex items-center gap-[8px] pl-[24px]'>
+      <div className='flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center'>{icon}</div>
+      <span className='font-base text-[13px]' style={{ color: C.TEXT_SECONDARY }}>
+        {title}
+      </span>
+    </div>
+  )
+}
+
+/**
+ * Renders chat response as full-width prose with bold markdown
+ * and progressive reveal for the typing effect.
+ */
+function ChatMarkdown({
+  content,
+  visibleLength,
+  isTyping,
+}: {
+  content: string
+  visibleLength: number
+  isTyping: boolean
+}) {
+  const visible = content.slice(0, visibleLength)
+  const rendered = visible.replace(/\*\*(.+?)\*\*/g, '<strong>$1</strong>').replace(/\n/g, '<br />')
+
+  return (
+    <div className='font-body text-[14px] leading-[1.6]' style={{ color: C.TEXT_PRIMARY }}>
+      <span dangerouslySetInnerHTML={{ __html: rendered }} />
+      {isTyping && (
+        <motion.span
+          className='inline-block h-[14px] w-[1.5px] translate-y-[2px] bg-[#e6e6e6]'
+          animate={{ opacity: [1, 0] }}
+          transition={{
+            duration: 0.6,
+            repeat: Number.POSITIVE_INFINITY,
+            repeatType: 'reverse',
+          }}
+        />
+      )}
+    </div>
+  )
+}
+
+/**
+ * Mini Customer Leads table panel matching the resource panel pattern.
+ */
+function MiniTablePanel() {
+  return (
+    <div className='flex h-full w-full flex-col bg-[var(--landing-bg)]'>
+      <div className='flex items-center gap-2 border-[#2c2c2c] border-b px-3 py-2'>
+        <Table className='h-[14px] w-[14px]' style={{ color: C.TEXT_ICON }} />
+        <span className='font-medium text-sm' style={{ color: C.TEXT_PRIMARY }}>
+          Customer Leads
+        </span>
+      </div>
+      <div className='min-h-0 flex-1 overflow-auto'>
+        <table className='w-full table-fixed border-separate border-spacing-0 text-[12px]'>
+          <colgroup>
+            {MINI_TABLE_COLUMNS.map((col) => (
+              <col key={col.id} style={{ width: col.width }} />
+            ))}
+          </colgroup>
+          <thead className='sticky top-0 z-10'>
+            <tr>
+              {MINI_TABLE_COLUMNS.map((col) => {
+                const Icon = COLUMN_TYPE_ICONS[col.type]
+                return (
+                  <th
+                    key={col.id}
+                    className='border-[#2c2c2c] border-r border-b bg-[#1e1e1e] p-0 text-left'
+                  >
+                    <div className='flex items-center gap-1 px-2 py-1.5'>
+                      <Icon className='h-3 w-3 shrink-0' style={{ color: C.TEXT_ICON }} />
+                      <span className='font-medium text-[11px]' style={{ color: C.TEXT_PRIMARY }}>
+                        {col.label}
+                      </span>
+                      <ChevronDown
+                        className='ml-auto h-[6px] w-[8px]'
+                        style={{ color: '#636363' }}
+                      />
+                    </div>
+                  </th>
+                )
+              })}
+            </tr>
+          </thead>
+          <tbody>
+            {MINI_TABLE_ROWS.map((row, i) => (
+              <motion.tr
+                key={i}
+                initial={{ opacity: 0 }}
+                animate={{ opacity: 1 }}
+                transition={{ duration: 0.2, delay: i * 0.04, ease: EASE_OUT }}
+              >
+                {MINI_TABLE_COLUMNS.map((col) => {
+                  const val = row[col.id as keyof typeof row]
+                  return (
+                    <td
+                      key={col.id}
+                      className='border-[#2c2c2c] border-r border-b px-2 py-1.5'
+                      style={{ color: C.TEXT_BODY }}
+                    >
+                      {col.type === 'boolean' ? (
+                        <div className='flex items-center justify-center'>
+                          <Checkbox
+                            size='sm'
+                            checked={val === 'true'}
+                            className='pointer-events-none'
+                          />
+                        </div>
+                      ) : (
+                        <span className='block truncate'>{val}</span>
+                      )}
+                    </td>
+                  )
+                })}
+              </motion.tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/(home)/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
similarity index 90%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge.tsx
index f56f87ce7e9..aa216e5d574 100644
--- a/apps/sim/app/(home)/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
@@ -13,8 +13,8 @@ import {
 import type {
   PreviewColumn,
   PreviewRow,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
-import { LandingPreviewResource } from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+} 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'
 
 const DB_ICON = <Database className='h-[14px] w-[14px]' />
 
diff --git a/apps/sim/app/(home)/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
similarity index 98%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-logs/landing-preview-logs.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-logs/landing-preview-logs.tsx
index f1406bb81dc..2070fab6468 100644
--- a/apps/sim/app/(home)/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
@@ -59,7 +59,7 @@ const MOCK_LOGS: LogRow[] = [
     workflowColor: '#33C482',
     date: 'Apr 1  09:15 AM',
     status: 'error',
-    cost: '318 credits',
+    cost: '1 credit',
     trigger: 'api',
     triggerLabel: 'API',
     duration: '2.7s',
@@ -70,7 +70,7 @@ const MOCK_LOGS: LogRow[] = [
     workflowColor: '#a855f7',
     date: 'Apr 1  08:30 AM',
     status: 'completed',
-    cost: '89 credits',
+    cost: '2 credits',
     trigger: 'schedule',
     triggerLabel: 'Schedule',
     duration: '0.8s',
@@ -81,7 +81,7 @@ const MOCK_LOGS: LogRow[] = [
     workflowColor: '#f97316',
     date: 'Mar 31  10:14 PM',
     status: 'completed',
-    cost: '241 credits',
+    cost: '7 credits',
     trigger: 'webhook',
     triggerLabel: 'Webhook',
     duration: '4.1s',
@@ -92,7 +92,7 @@ const MOCK_LOGS: LogRow[] = [
     workflowColor: '#ec4899',
     date: 'Mar 31  08:45 PM',
     status: 'completed',
-    cost: '112 credits',
+    cost: '2 credits',
     trigger: 'manual',
     triggerLabel: 'Manual',
     duration: '0.9s',
@@ -103,7 +103,7 @@ const MOCK_LOGS: LogRow[] = [
     workflowColor: '#0ea5e9',
     date: 'Mar 31  07:22 PM',
     status: 'completed',
-    cost: '197 credits',
+    cost: '3 credits',
     trigger: 'api',
     triggerLabel: 'API',
     duration: '1.6s',
@@ -114,7 +114,7 @@ const MOCK_LOGS: LogRow[] = [
     workflowColor: '#f59e0b',
     date: 'Mar 31  06:11 PM',
     status: 'error',
-    cost: '284 credits',
+    cost: '1 credit',
     trigger: 'schedule',
     triggerLabel: 'Schedule',
     duration: '3.2s',
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
new file mode 100644
index 00000000000..4ca06238463
--- /dev/null
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
@@ -0,0 +1,474 @@
+'use client'
+
+import { memo, useCallback, useEffect, useRef, useState } from 'react'
+import { AnimatePresence, motion } from 'framer-motion'
+import { ArrowUp } from 'lucide-react'
+import Link from 'next/link'
+import { useRouter } from 'next/navigation'
+import { createPortal } from 'react-dom'
+import { Blimp, BubbleChatPreview, ChevronDown, MoreHorizontal, Play } from '@/components/emcn'
+import { AgentIcon, HubspotIcon, OpenAIIcon, SalesforceIcon } from '@/components/icons'
+import { LandingPromptStorage } from '@/lib/core/utils/browser-storage'
+import {
+  EASE_OUT,
+  type EditorPromptData,
+  getEditorPrompt,
+  getWorkflowAnimationTiming,
+  type PreviewWorkflow,
+  TYPE_INTERVAL_MS,
+  TYPE_START_BUFFER_MS,
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+
+type PanelTab = 'copilot' | 'editor'
+
+const EDITOR_BLOCK_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
+  agent: AgentIcon,
+  mothership: Blimp,
+}
+
+const TABS_WITH_TOOLBAR: { id: PanelTab | 'toolbar'; label: string; disabled?: boolean }[] = [
+  { id: 'copilot', label: 'Copilot' },
+  { id: 'toolbar', label: 'Toolbar', disabled: true },
+  { id: 'editor', label: 'Editor' },
+]
+
+/**
+ * Stores the prompt in browser storage and redirects to /signup.
+ * Shared by both the copilot panel and the landing home view.
+ */
+export function useLandingSubmit() {
+  const router = useRouter()
+  return useCallback(
+    (text: string) => {
+      const trimmed = text.trim()
+      if (!trimmed) return
+      LandingPromptStorage.store(trimmed)
+      router.push('/signup')
+    },
+    [router]
+  )
+}
+
+interface LandingPreviewPanelProps {
+  activeWorkflow?: PreviewWorkflow
+  animationKey?: number
+  onHighlightBlock?: (blockId: string | null) => void
+}
+
+/**
+ * Workspace panel replica with switchable Copilot / Editor tabs.
+ *
+ * On every workflow switch (`animationKey` change):
+ *  1. Resets to Copilot tab.
+ *  2. Waits for blocks + edges to finish animating.
+ *  3. Slides the tab indicator to Editor and types the agent's prompt.
+ *  4. Highlights the agent block with the blue ring on the canvas.
+ */
+export const LandingPreviewPanel = memo(function LandingPreviewPanel({
+  activeWorkflow,
+  animationKey = 0,
+  onHighlightBlock,
+}: LandingPreviewPanelProps) {
+  const landingSubmit = useLandingSubmit()
+  const [inputValue, setInputValue] = useState('')
+  const textareaRef = useRef<HTMLTextAreaElement>(null)
+  const [cursorPos, setCursorPos] = useState<{ x: number; y: number } | null>(null)
+
+  const [activeTab, setActiveTab] = useState<PanelTab>('copilot')
+  const [typedLength, setTypedLength] = useState(0)
+
+  const workflowRef = useRef(activeWorkflow)
+  workflowRef.current = activeWorkflow
+  const typeIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null)
+
+  const editorPrompt = activeWorkflow ? getEditorPrompt(activeWorkflow) : null
+
+  const userSwitchedTabRef = useRef(false)
+
+  const handleTabSwitch = useCallback(
+    (tab: PanelTab) => {
+      userSwitchedTabRef.current = true
+      setActiveTab(tab)
+      if (tab === 'editor' && editorPrompt) {
+        onHighlightBlock?.(editorPrompt.blockId)
+      } else {
+        onHighlightBlock?.(null)
+      }
+    },
+    [editorPrompt, onHighlightBlock]
+  )
+
+  useEffect(() => {
+    if (userSwitchedTabRef.current) return
+
+    setActiveTab('copilot')
+    setTypedLength(0)
+    onHighlightBlock?.(null)
+    if (typeIntervalRef.current) clearInterval(typeIntervalRef.current)
+
+    const workflow = workflowRef.current
+    if (!workflow) return
+
+    const prompt = workflow ? getEditorPrompt(workflow) : null
+    if (!prompt) return
+
+    const { editorDelay } = getWorkflowAnimationTiming(workflow)
+
+    const switchTimer = setTimeout(() => {
+      if (userSwitchedTabRef.current) return
+      setActiveTab('editor')
+      onHighlightBlock?.(prompt.blockId)
+    }, editorDelay)
+
+    const typeTimer = setTimeout(() => {
+      if (userSwitchedTabRef.current) return
+      let charIndex = 0
+      typeIntervalRef.current = setInterval(() => {
+        charIndex++
+        setTypedLength(charIndex)
+        if (charIndex >= prompt.prompt.length) {
+          if (typeIntervalRef.current) clearInterval(typeIntervalRef.current)
+          typeIntervalRef.current = null
+        }
+      }, TYPE_INTERVAL_MS)
+    }, editorDelay + TYPE_START_BUFFER_MS)
+
+    return () => {
+      clearTimeout(switchTimer)
+      clearTimeout(typeTimer)
+      if (typeIntervalRef.current) {
+        clearInterval(typeIntervalRef.current)
+        typeIntervalRef.current = null
+      }
+    }
+  }, [animationKey, onHighlightBlock])
+
+  const isEmpty = inputValue.trim().length === 0
+
+  const handleSubmit = useCallback(() => {
+    if (isEmpty) return
+    landingSubmit(inputValue)
+  }, [isEmpty, inputValue, landingSubmit])
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+      if (e.key === 'Enter' && !e.shiftKey) {
+        e.preventDefault()
+        handleSubmit()
+      }
+    },
+    [handleSubmit]
+  )
+
+  return (
+    <div className='flex h-full w-[280px] flex-shrink-0 flex-col bg-[#1e1e1e]'>
+      <div className='flex h-full flex-col border-[#2c2c2c] border-l pt-3.5'>
+        {/* Header */}
+        <div className='flex flex-shrink-0 items-center justify-between px-2'>
+          <div className='pointer-events-none flex gap-1.5'>
+            <div className='flex h-[30px] w-[30px] items-center justify-center rounded-[5px] border border-[#3d3d3d] bg-[#363636]'>
+              <MoreHorizontal className='h-[14px] w-[14px] text-[#e6e6e6]' />
+            </div>
+            <div className='flex h-[30px] w-[30px] items-center justify-center rounded-[5px] border border-[#3d3d3d] bg-[#363636]'>
+              <BubbleChatPreview className='h-[14px] w-[14px] text-[#e6e6e6]' />
+            </div>
+          </div>
+          <Link
+            href='/signup'
+            className='flex gap-1.5'
+            onMouseMove={(e) => setCursorPos({ x: e.clientX, y: e.clientY })}
+            onMouseLeave={() => setCursorPos(null)}
+          >
+            <div className='flex h-[30px] items-center rounded-[5px] bg-[#33C482] px-2.5 transition-colors hover:bg-[#2DAC72]'>
+              <span className='font-medium text-[#1b1b1b] text-[12px]'>Deploy</span>
+            </div>
+            <div className='flex h-[30px] items-center gap-2 rounded-[5px] bg-[#33C482] px-2.5 transition-colors hover:bg-[#2DAC72]'>
+              <Play className='h-[11.5px] w-[11.5px] text-[#1b1b1b]' />
+              <span className='font-medium text-[#1b1b1b] text-[12px]'>Run</span>
+            </div>
+          </Link>
+          {cursorPos &&
+            createPortal(
+              <div
+                className='pointer-events-none fixed z-[9999]'
+                style={{ left: cursorPos.x + 14, top: cursorPos.y + 14 }}
+              >
+                <div className='flex h-[4px]'>
+                  <div className='h-full w-[8px] bg-[#2ABBF8]' />
+                  <div className='h-full w-[14px] bg-[#2ABBF8] opacity-60' />
+                  <div className='h-full w-[8px] bg-[#00F701]' />
+                  <div className='h-full w-[16px] bg-[#00F701] opacity-60' />
+                  <div className='h-full w-[8px] bg-[#FFCC02]' />
+                  <div className='h-full w-[10px] bg-[#FFCC02] opacity-60' />
+                  <div className='h-full w-[8px] bg-[#FA4EDF]' />
+                  <div className='h-full w-[14px] bg-[#FA4EDF] opacity-60' />
+                </div>
+                <div className='flex items-center gap-[5px] bg-white px-1.5 py-1 font-medium text-[#1C1C1C] text-[11px]'>
+                  Get started
+                  <ChevronDown className='-rotate-90 h-[7px] w-[7px] text-[#1C1C1C]' />
+                </div>
+              </div>,
+              document.body
+            )}
+        </div>
+
+        {/* Tabs with sliding active indicator */}
+        <div className='flex flex-shrink-0 items-center px-2 pt-3.5'>
+          <div className='flex gap-1'>
+            {TABS_WITH_TOOLBAR.map((tab) => {
+              if (tab.disabled) {
+                return (
+                  <div
+                    key={tab.id}
+                    className='pointer-events-none flex h-[28px] items-center rounded-md border border-transparent px-2 py-[5px]'
+                  >
+                    <span className='font-medium text-[#787878] text-[12.5px]'>{tab.label}</span>
+                  </div>
+                )
+              }
+              const isActive = activeTab === tab.id
+              return (
+                <button
+                  key={tab.id}
+                  type='button'
+                  onClick={() => handleTabSwitch(tab.id as PanelTab)}
+                  className='relative flex h-[28px] items-center rounded-md border border-transparent px-2 py-[5px] font-medium text-[12.5px] transition-colors hover:border-[#3d3d3d] hover:bg-[#363636] hover:text-[#e6e6e6]'
+                  style={{ color: isActive ? '#e6e6e6' : '#787878' }}
+                >
+                  {isActive && (
+                    <motion.div
+                      layoutId='panel-tab-indicator'
+                      className='absolute inset-0 rounded-md border border-[#3d3d3d] bg-[#363636]'
+                      transition={{ type: 'spring', stiffness: 400, damping: 30 }}
+                    />
+                  )}
+                  <span className='relative z-10'>{tab.label}</span>
+                </button>
+              )
+            })}
+          </div>
+        </div>
+
+        {/* Tab content with cross-fade */}
+        <div className='flex flex-1 flex-col overflow-hidden pt-3'>
+          <AnimatePresence mode='wait'>
+            {activeTab === 'copilot' && (
+              <motion.div
+                key='copilot'
+                className='flex h-full flex-col'
+                initial={{ opacity: 0 }}
+                animate={{ opacity: 1 }}
+                exit={{ opacity: 0 }}
+                transition={{ duration: 0.15, ease: EASE_OUT }}
+              >
+                <div className='pointer-events-none mx-[-1px] flex flex-shrink-0 items-center justify-between gap-2 border border-[#2c2c2c] bg-[#292929] px-3 py-1.5'>
+                  <span className='min-w-0 flex-1 truncate font-medium text-[#e6e6e6] text-[14px]'>
+                    New Chat
+                  </span>
+                </div>
+                <div className='px-2 pt-3 pb-2'>
+                  <div className='rounded-[4px] border border-[#3d3d3d] bg-[#292929] px-1.5 py-1.5'>
+                    <textarea
+                      ref={textareaRef}
+                      value={inputValue}
+                      onChange={(e) => setInputValue(e.target.value)}
+                      onKeyDown={handleKeyDown}
+                      placeholder='Build an AI agent...'
+                      rows={2}
+                      className='mb-1.5 min-h-[48px] w-full cursor-text resize-none border-0 bg-transparent px-0.5 py-1 font-base text-[#e6e6e6] text-sm leading-[1.25rem] placeholder-[#787878] caret-[#e6e6e6] outline-none'
+                    />
+                    <div className='flex items-center justify-end'>
+                      <button
+                        type='button'
+                        onClick={handleSubmit}
+                        disabled={isEmpty}
+                        className='flex h-[22px] w-[22px] items-center justify-center rounded-full border-0 p-0 transition-colors'
+                        style={{
+                          background: isEmpty ? '#808080' : '#e0e0e0',
+                          cursor: isEmpty ? 'not-allowed' : 'pointer',
+                        }}
+                      >
+                        <ArrowUp size={14} strokeWidth={2.25} color='#1b1b1b' />
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </motion.div>
+            )}
+
+            {activeTab === 'editor' && (
+              <motion.div
+                key='editor'
+                className='flex h-full flex-col'
+                initial={{ opacity: 0 }}
+                animate={{ opacity: 1 }}
+                exit={{ opacity: 0 }}
+                transition={{ duration: 0.15, ease: EASE_OUT }}
+              >
+                <EditorTabContent editorPrompt={editorPrompt} typedLength={typedLength} />
+              </motion.div>
+            )}
+          </AnimatePresence>
+        </div>
+      </div>
+    </div>
+  )
+})
+
+const TOOL_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
+  hubspot: HubspotIcon,
+  salesforce: SalesforceIcon,
+}
+
+const MODEL_ICON_MAP: Record<string, React.ComponentType<{ className?: string }>> = {
+  'gpt-': OpenAIIcon,
+}
+
+function getModelIcon(model: string) {
+  const lower = model.toLowerCase()
+  for (const [prefix, icon] of Object.entries(MODEL_ICON_MAP)) {
+    if (lower.startsWith(prefix)) return icon
+  }
+  return null
+}
+
+interface EditorTabContentProps {
+  editorPrompt: EditorPromptData | null
+  typedLength: number
+}
+
+/**
+ * Editor tab replicating the real agent editor layout:
+ * header bar, then scrollable sub-block fields.
+ */
+function EditorTabContent({ editorPrompt, typedLength }: EditorTabContentProps) {
+  if (!editorPrompt) {
+    return (
+      <div className='flex flex-1 items-center justify-center'>
+        <span className='font-medium text-[#787878] text-[13px]'>Select a block to edit</span>
+      </div>
+    )
+  }
+
+  const { blockName, blockType, bgColor, prompt, model, tools } = editorPrompt
+  const visibleText = prompt.slice(0, typedLength)
+  const isTyping = typedLength < prompt.length
+  const BlockIcon = EDITOR_BLOCK_ICONS[blockType]
+  const ModelIcon = model ? getModelIcon(model) : null
+
+  return (
+    <div className='flex h-full flex-col'>
+      {/* Editor header */}
+      <div className='mx-[-1px] flex flex-shrink-0 items-center gap-2 border border-[#2c2c2c] bg-[#292929] px-3 py-1.5'>
+        {BlockIcon && (
+          <div
+            className='flex h-[18px] w-[18px] flex-shrink-0 items-center justify-center rounded-sm'
+            style={{ background: bgColor }}
+          >
+            <BlockIcon className='h-[12px] w-[12px] text-white' />
+          </div>
+        )}
+        <span className='min-w-0 flex-1 truncate font-medium text-[#e6e6e6] text-sm'>
+          {blockName}
+        </span>
+      </div>
+
+      {/* Sub-block fields */}
+      <div className='flex-1 overflow-y-auto overflow-x-hidden px-2 pt-3 pb-2'>
+        <div className='flex flex-col gap-4'>
+          {/* System Prompt */}
+          <div className='flex flex-col gap-2.5'>
+            <div className='flex items-center pl-0.5'>
+              <span className='font-medium text-[#e6e6e6] text-small'>System Prompt</span>
+            </div>
+            <div className='rounded-[4px] border border-[#3d3d3d] bg-[#292929] px-2 py-2'>
+              <p className='min-h-[48px] whitespace-pre-wrap break-words font-medium font-sans text-[#e6e6e6] text-sm leading-[1.5]'>
+                {visibleText}
+                {isTyping && (
+                  <motion.span
+                    className='inline-block h-[14px] w-[1.5px] translate-y-[2px] bg-[#e6e6e6]'
+                    animate={{ opacity: [1, 0] }}
+                    transition={{
+                      duration: 0.6,
+                      repeat: Number.POSITIVE_INFINITY,
+                      repeatType: 'reverse',
+                    }}
+                  />
+                )}
+              </p>
+            </div>
+          </div>
+
+          {/* Model */}
+          {model && (
+            <div className='flex flex-col gap-2.5'>
+              <div className='flex items-center pl-0.5'>
+                <span className='font-medium text-[#e6e6e6] text-small'>Model</span>
+              </div>
+              <div className='flex h-[32px] items-center gap-2 rounded-[4px] border border-[#3d3d3d] bg-[#292929] px-2'>
+                {ModelIcon && <ModelIcon className='h-[14px] w-[14px] text-[#e6e6e6]' />}
+                <span className='flex-1 truncate font-medium text-[#e6e6e6] text-sm'>{model}</span>
+                <ChevronDown className='h-[7px] w-[9px] text-[#636363]' />
+              </div>
+            </div>
+          )}
+
+          {/* Tools */}
+          {tools.length > 0 && (
+            <div className='flex flex-col gap-2.5'>
+              <div className='flex items-center pl-0.5'>
+                <span className='font-medium text-[#e6e6e6] text-small'>Tools</span>
+              </div>
+              <div className='flex flex-wrap gap-[5px]'>
+                {tools.map((tool) => {
+                  const ToolIcon = TOOL_ICONS[tool.type]
+                  return (
+                    <div
+                      key={tool.type}
+                      className='flex items-center gap-[5px] rounded-[5px] border border-[#3d3d3d] bg-[#2a2a2a] px-[6px] py-[3px]'
+                    >
+                      {ToolIcon && (
+                        <div
+                          className='flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center rounded-[4px]'
+                          style={{ background: tool.bgColor }}
+                        >
+                          <ToolIcon className='h-[10px] w-[10px] text-white' />
+                        </div>
+                      )}
+                      <span className='font-normal text-[#e6e6e6] text-[12px]'>{tool.name}</span>
+                    </div>
+                  )
+                })}
+              </div>
+            </div>
+          )}
+
+          {/* Temperature */}
+          <div className='flex flex-col gap-2.5'>
+            <div className='flex items-center justify-between pl-0.5'>
+              <span className='font-medium text-[#e6e6e6] text-small'>Temperature</span>
+              <span className='font-medium text-[#787878] text-small'>0.7</span>
+            </div>
+            <div className='relative h-[6px] rounded-full bg-[#3d3d3d]'>
+              <div className='h-full w-[70%] rounded-full bg-[#e6e6e6]' />
+              <div
+                className='-translate-y-1/2 absolute top-1/2 h-[14px] w-[14px] rounded-full border-[#e6e6e6] border-[2px] bg-[#292929]'
+                style={{ left: 'calc(70% - 7px)' }}
+              />
+            </div>
+          </div>
+
+          {/* Response Format */}
+          <div className='flex flex-col gap-2.5'>
+            <div className='flex items-center pl-0.5'>
+              <span className='font-medium text-[#e6e6e6] text-small'>Response Format</span>
+            </div>
+            <div className='rounded-[4px] border border-[#3d3d3d] bg-[#292929] px-2 py-2'>
+              <span className='font-mono text-[#787878] text-[12px]'>plain text</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/(home)/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
similarity index 100%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource.tsx
diff --git a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks.tsx
similarity index 89%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks.tsx
index 0750f4536ce..42c63e01046 100644
--- a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks.tsx
@@ -2,8 +2,8 @@ import { Calendar } from '@/components/emcn/icons'
 import type {
   PreviewColumn,
   PreviewRow,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
-import { LandingPreviewResource } from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+} 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'
 
 const CAL_ICON = <Calendar className='h-[14px] w-[14px]' />
 
diff --git a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar.tsx
similarity index 98%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar.tsx
index de104c6286c..1b754f65f36 100644
--- a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar.tsx
@@ -11,7 +11,7 @@ import {
   Table,
 } from '@/components/emcn/icons'
 import { cn } from '@/lib/core/utils/cn'
-import type { PreviewWorkflow } from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+import type { PreviewWorkflow } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
 
 export type SidebarView =
   | 'home'
diff --git a/apps/sim/app/(home)/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
similarity index 89%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-tables/landing-preview-tables.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-tables/landing-preview-tables.tsx
index 42539519a59..0bc1b2299cd 100644
--- a/apps/sim/app/(home)/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
@@ -1,6 +1,7 @@
 'use client'
 
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
+import { AnimatePresence, motion } from 'framer-motion'
 import { Checkbox } from '@/components/emcn'
 import {
   ChevronDown,
@@ -15,11 +16,11 @@ import { cn } from '@/lib/core/utils/cn'
 import type {
   PreviewColumn,
   PreviewRow,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
 import {
   LandingPreviewResource,
   ownerCell,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-resource/landing-preview-resource'
 
 const CELL = 'border-[var(--border)] border-r border-b px-2 py-[7px] align-middle select-none'
 const CELL_CHECKBOX =
@@ -525,28 +526,59 @@ function SpreadsheetView({ tableId, tableName, onBack }: SpreadsheetViewProps) {
   )
 }
 
-export function LandingPreviewTables() {
+interface LandingPreviewTablesProps {
+  autoOpenTableId?: string | null
+}
+
+const tableViewTransition = {
+  initial: { opacity: 0, x: 20 },
+  animate: { opacity: 1, x: 0 },
+  exit: { opacity: 0, x: -20 },
+  transition: { duration: 0.25, ease: [0.16, 1, 0.3, 1] as const },
+} as const
+
+export function LandingPreviewTables({ autoOpenTableId }: LandingPreviewTablesProps = {}) {
   const [openTableId, setOpenTableId] = useState<string | null>(null)
 
-  if (openTableId !== null) {
-    return (
-      <SpreadsheetView
-        tableId={openTableId}
-        tableName={TABLE_METAS[openTableId] ?? 'Table'}
-        onBack={() => setOpenTableId(null)}
-      />
-    )
-  }
+  useEffect(() => {
+    if (!autoOpenTableId) return
+    const timer = setTimeout(() => {
+      setOpenTableId(autoOpenTableId)
+    }, 800)
+    return () => clearTimeout(timer)
+  }, [autoOpenTableId])
 
   return (
-    <LandingPreviewResource
-      icon={Table}
-      title='Tables'
-      createLabel='New table'
-      searchPlaceholder='Search tables...'
-      columns={LIST_COLUMNS}
-      rows={LIST_ROWS}
-      onRowClick={(id) => setOpenTableId(id)}
-    />
+    <AnimatePresence mode='wait'>
+      {openTableId !== null ? (
+        <motion.div
+          key={`spreadsheet-${openTableId}`}
+          className='flex h-full flex-1 flex-col'
+          {...tableViewTransition}
+        >
+          <SpreadsheetView
+            tableId={openTableId}
+            tableName={TABLE_METAS[openTableId] ?? 'Table'}
+            onBack={() => setOpenTableId(null)}
+          />
+        </motion.div>
+      ) : (
+        <motion.div
+          key='table-list'
+          className='flex h-full flex-1 flex-col'
+          {...tableViewTransition}
+        >
+          <LandingPreviewResource
+            icon={Table}
+            title='Tables'
+            createLabel='New table'
+            searchPlaceholder='Search tables...'
+            columns={LIST_COLUMNS}
+            rows={LIST_ROWS}
+            onRowClick={(id) => setOpenTableId(id)}
+          />
+        </motion.div>
+      )}
+    </AnimatePresence>
   )
 }
diff --git a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow.tsx
similarity index 75%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow.tsx
index 7cc0079a8ff..fcbf20cf662 100644
--- a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { motion } from 'framer-motion'
 import ReactFlow, {
   applyEdgeChanges,
@@ -16,22 +16,24 @@ import ReactFlow, {
   ReactFlowProvider,
 } from 'reactflow'
 import 'reactflow/dist/style.css'
-import { PreviewBlockNode } from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/preview-block-node'
+import { PreviewBlockNode } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/preview-block-node'
 import {
   EASE_OUT,
   type PreviewWorkflow,
   toReactFlowElements,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
 
 interface FitViewOptions {
   padding?: number
   maxZoom?: number
+  minZoom?: number
 }
 
 interface LandingPreviewWorkflowProps {
   workflow: PreviewWorkflow
   animate?: boolean
   fitViewOptions?: FitViewOptions
+  highlightedBlockId?: string | null
 }
 
 /**
@@ -88,21 +90,35 @@ function PreviewEdge({
 const NODE_TYPES: NodeTypes = { previewBlock: PreviewBlockNode }
 const EDGE_TYPES: EdgeTypes = { previewEdge: PreviewEdge }
 const PRO_OPTIONS = { hideAttribution: true }
-const DEFAULT_FIT_VIEW_OPTIONS = { padding: 0.3, maxZoom: 1 } as const
+const DEFAULT_FIT_VIEW_OPTIONS = { padding: 0.5, maxZoom: 1 } as const
 
 /**
  * Inner flow component. Keyed on workflow ID by the parent so it remounts
  * cleanly on workflow switch — fitView fires on mount with zero delay.
  */
-function PreviewFlow({ workflow, animate = false, fitViewOptions }: LandingPreviewWorkflowProps) {
+function PreviewFlow({
+  workflow,
+  animate = false,
+  fitViewOptions,
+  highlightedBlockId,
+}: LandingPreviewWorkflowProps) {
   const { nodes: initialNodes, edges: initialEdges } = useMemo(
-    () => toReactFlowElements(workflow, animate),
-    [workflow, animate]
+    () => toReactFlowElements(workflow, animate, highlightedBlockId),
+    [workflow, animate, highlightedBlockId]
   )
 
   const [nodes, setNodes] = useState<Node[]>(initialNodes)
   const [edges, setEdges] = useState<Edge[]>(initialEdges)
 
+  useEffect(() => {
+    setNodes((prev) =>
+      prev.map((node) => ({
+        ...node,
+        data: { ...node.data, isHighlighted: highlightedBlockId === node.id },
+      }))
+    )
+  }, [highlightedBlockId])
+
   const onNodesChange: OnNodesChange = useCallback(
     (changes) => setNodes((nds) => applyNodeChanges(changes, nds)),
     []
@@ -114,6 +130,7 @@ function PreviewFlow({ workflow, animate = false, fitViewOptions }: LandingPrevi
   )
 
   const resolvedFitViewOptions = fitViewOptions ?? DEFAULT_FIT_VIEW_OPTIONS
+  const minZoom = fitViewOptions?.minZoom ?? 0.5
 
   return (
     <ReactFlow
@@ -135,6 +152,7 @@ function PreviewFlow({ workflow, animate = false, fitViewOptions }: LandingPrevi
       preventScrolling={false}
       autoPanOnNodeDrag={false}
       proOptions={PRO_OPTIONS}
+      minZoom={minZoom}
       fitView
       fitViewOptions={resolvedFitViewOptions}
       className='h-full w-full bg-[var(--landing-bg)]'
@@ -151,11 +169,17 @@ export function LandingPreviewWorkflow({
   workflow,
   animate = false,
   fitViewOptions,
+  highlightedBlockId,
 }: LandingPreviewWorkflowProps) {
   return (
     <div className='h-full w-full'>
       <ReactFlowProvider key={workflow.id}>
-        <PreviewFlow workflow={workflow} animate={animate} fitViewOptions={fitViewOptions} />
+        <PreviewFlow
+          workflow={workflow}
+          animate={animate}
+          fitViewOptions={fitViewOptions}
+          highlightedBlockId={highlightedBlockId}
+        />
       </ReactFlowProvider>
     </div>
   )
diff --git a/apps/sim/app/(home)/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
similarity index 96%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-workflow/preview-block-node.tsx
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/preview-block-node.tsx
index 262b677e131..2c49f1106ee 100644
--- a/apps/sim/app/(home)/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
@@ -39,7 +39,7 @@ import {
   BLOCK_STAGGER,
   EASE_OUT,
   type PreviewTool,
-} from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
 
 /** Map block type strings to their icon components. */
 const BLOCK_ICONS: Record<string, React.ComponentType<{ className?: string }>> = {
@@ -105,6 +105,7 @@ interface PreviewBlockData {
   hideSourceHandle?: boolean
   index?: number
   animate?: boolean
+  isHighlighted?: boolean
 }
 
 /**
@@ -137,6 +138,7 @@ export const PreviewBlockNode = memo(function PreviewBlockNode({
     hideSourceHandle,
     index = 0,
     animate = false,
+    isHighlighted = false,
   } = data
   const Icon = BLOCK_ICONS[blockType]
   const delay = animate ? index * BLOCK_STAGGER : 0
@@ -264,6 +266,10 @@ export const PreviewBlockNode = memo(function PreviewBlockNode({
             isConnectableEnd={false}
           />
         )}
+
+        {isHighlighted && (
+          <div className='pointer-events-none absolute inset-0 z-40 rounded-lg ring-[#33b4ff] ring-[1.75px]' />
+        )}
       </div>
     </motion.div>
   )
diff --git a/apps/sim/app/(home)/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
similarity index 65%
rename from apps/sim/app/(home)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
rename to apps/sim/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data.ts
index 2fb6c2b567f..dceeb71829f 100644
--- a/apps/sim/app/(home)/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
@@ -66,7 +66,11 @@ const IT_SERVICE_WORKFLOW: PreviewWorkflow = {
       bgColor: '#701ffc',
       rows: [
         { title: 'Model', value: 'claude-sonnet-4.6' },
-        { title: 'System Prompt', value: 'Triage incoming IT...' },
+        {
+          title: 'System Prompt',
+          value:
+            'Triage incoming IT support requests from Slack, categorize by severity, and create Jira tickets for the appropriate team.',
+        },
       ],
       tools: [{ name: 'Knowledge Base', type: 'knowledge_base', bgColor: '#10B981' }],
       position: { x: 420, y: 40 },
@@ -91,7 +95,7 @@ const IT_SERVICE_WORKFLOW: PreviewWorkflow = {
 }
 
 /**
- * Self-healing CRM workflow — Schedule -> Mothership
+ * Self-healing CRM workflow — Schedule -> Agent
  */
 const SELF_HEALING_CRM_WORKFLOW: PreviewWorkflow = {
   id: 'wf-self-healing-crm',
@@ -111,20 +115,27 @@ const SELF_HEALING_CRM_WORKFLOW: PreviewWorkflow = {
       hideTargetHandle: true,
     },
     {
-      id: 'mothership-1',
+      id: 'agent-crm',
       name: 'CRM Agent',
-      type: 'mothership',
-      bgColor: '#33C482',
-      rows: [{ title: 'Prompt', value: 'Audit CRM records, fix...' }],
+      type: 'agent',
+      bgColor: '#701ffc',
+      rows: [
+        { title: 'Model', value: 'gpt-5.4' },
+        {
+          title: 'System Prompt',
+          value:
+            'Audit CRM records, identify data inconsistencies, and fix duplicate contacts, missing fields, and stale pipeline entries across HubSpot and Salesforce.',
+        },
+      ],
       tools: [
         { name: 'HubSpot', type: 'hubspot', bgColor: '#FF7A59' },
         { name: 'Salesforce', type: 'salesforce', bgColor: '#E0E0E0' },
       ],
-      position: { x: 420, y: 180 },
+      position: { x: 420, y: 140 },
       hideSourceHandle: true,
     },
   ],
-  edges: [{ id: 'e-3', source: 'schedule-1', target: 'mothership-1' }],
+  edges: [{ id: 'e-3', source: 'schedule-1', target: 'agent-crm' }],
 }
 
 /**
@@ -154,7 +165,11 @@ const CUSTOMER_SUPPORT_WORKFLOW: PreviewWorkflow = {
       bgColor: '#701ffc',
       rows: [
         { title: 'Model', value: 'gpt-5.4' },
-        { title: 'System Prompt', value: 'Resolve customer issues...' },
+        {
+          title: 'System Prompt',
+          value:
+            'Resolve customer support issues using the knowledge base, draft a response, and notify the team in Slack.',
+        },
       ],
       tools: [
         { name: 'Knowledge', type: 'knowledge_base', bgColor: '#10B981' },
@@ -228,7 +243,8 @@ const EDGE_STYLE = { stroke: '#454545', strokeWidth: 1.5 } as const
  */
 export function toReactFlowElements(
   workflow: PreviewWorkflow,
-  animate = false
+  animate = false,
+  highlightedBlockId?: string | null
 ): {
   nodes: Node[]
   edges: Edge[]
@@ -250,6 +266,7 @@ export function toReactFlowElements(
       hideSourceHandle: block.hideSourceHandle,
       index,
       animate,
+      isHighlighted: highlightedBlockId === block.id,
     },
     draggable: true,
     selectable: false,
@@ -278,3 +295,74 @@ export function toReactFlowElements(
 
   return { nodes, edges }
 }
+
+/** Block types that carry an editable prompt suitable for the Editor tab. */
+const AGENT_BLOCK_TYPES = new Set(['agent', 'mothership'])
+
+export interface EditorPromptData {
+  blockId: string
+  blockName: string
+  blockType: string
+  bgColor: string
+  prompt: string
+  model: string | null
+  tools: PreviewTool[]
+}
+
+/**
+ * Extracts the editor-facing prompt from the first agent/mothership block.
+ *
+ * @returns Block metadata + prompt + model + tools, or `null` when the workflow has no agent.
+ */
+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')
+    if (promptRow) {
+      const modelRow = block.rows.find((r) => r.title === 'Model')
+      return {
+        blockId: block.id,
+        blockName: block.name,
+        blockType: block.type,
+        bgColor: block.bgColor,
+        prompt: promptRow.value,
+        model: modelRow?.value ?? null,
+        tools: block.tools ?? [],
+      }
+    }
+  }
+  return null
+}
+
+/**
+ * Computes the delay (ms) before the Editor tab should activate.
+ * Accounts for all block staggers + edge draw durations + a small buffer.
+ */
+export function getWorkflowAnimationTiming(workflow: PreviewWorkflow): { editorDelay: number } {
+  const maxBlockIndex = Math.max(0, workflow.blocks.length - 1)
+  const hasEdges = workflow.edges.length > 0
+  const edgeDuration = hasEdges ? 0.4 : 0
+  const buffer = 0.15
+  const total = maxBlockIndex * BLOCK_STAGGER + BLOCK_STAGGER + edgeDuration + buffer
+  return { editorDelay: Math.round(total * 1000) }
+}
+
+/** Milliseconds between each character typed in the Editor prompt animation. */
+export const TYPE_INTERVAL_MS = 30
+
+/** Extra pause (ms) after switching to the Editor tab before typing begins. */
+export const TYPE_START_BUFFER_MS = 150
+
+/** How long to dwell on a completed step before advancing (ms). */
+export const STEP_DWELL_MS = 2500
+
+/**
+ * Computes the total time (ms) a workflow step occupies, including
+ * canvas animation, editor typing, and a dwell period.
+ */
+export function getWorkflowStepDuration(workflow: PreviewWorkflow): number {
+  const { editorDelay } = getWorkflowAnimationTiming(workflow)
+  const prompt = getEditorPrompt(workflow)
+  const typingTime = prompt ? prompt.prompt.length * TYPE_INTERVAL_MS : 0
+  return editorDelay + TYPE_START_BUFFER_MS + typingTime + STEP_DWELL_MS
+}
diff --git a/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
new file mode 100644
index 00000000000..f990c259f07
--- /dev/null
+++ b/apps/sim/app/(landing)/components/landing-preview/landing-preview.tsx
@@ -0,0 +1,322 @@
+'use client'
+
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { AnimatePresence, motion, type Variants } from 'framer-motion'
+import { LandingPreviewFiles } from '@/app/(landing)/components/landing-preview/components/landing-preview-files/landing-preview-files'
+import { LandingPreviewHome } from '@/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home'
+import { LandingPreviewKnowledge } from '@/app/(landing)/components/landing-preview/components/landing-preview-knowledge/landing-preview-knowledge'
+import { LandingPreviewLogs } from '@/app/(landing)/components/landing-preview/components/landing-preview-logs/landing-preview-logs'
+import { LandingPreviewPanel } from '@/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
+import { LandingPreviewScheduledTasks } from '@/app/(landing)/components/landing-preview/components/landing-preview-scheduled-tasks/landing-preview-scheduled-tasks'
+import type { SidebarView } from '@/app/(landing)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar'
+import { LandingPreviewSidebar } from '@/app/(landing)/components/landing-preview/components/landing-preview-sidebar/landing-preview-sidebar'
+import { LandingPreviewTables } from '@/app/(landing)/components/landing-preview/components/landing-preview-tables/landing-preview-tables'
+import { LandingPreviewWorkflow } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow'
+import {
+  EASE_OUT,
+  getWorkflowStepDuration,
+  PREVIEW_WORKFLOWS,
+} from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+
+const containerVariants: Variants = {
+  hidden: {},
+  visible: {
+    transition: { staggerChildren: 0.15 },
+  },
+}
+
+const sidebarVariants: Variants = {
+  hidden: { opacity: 0, x: -12 },
+  visible: {
+    opacity: 1,
+    x: 0,
+    transition: {
+      x: { duration: 0.25, ease: EASE_OUT },
+      opacity: { duration: 0.25, ease: EASE_OUT },
+    },
+  },
+}
+
+const panelVariants: Variants = {
+  hidden: { opacity: 0, x: 12 },
+  visible: {
+    opacity: 1,
+    x: 0,
+    transition: {
+      x: { duration: 0.25, ease: EASE_OUT },
+      opacity: { duration: 0.25, ease: EASE_OUT },
+    },
+  },
+}
+
+const viewTransition = {
+  initial: { opacity: 0 },
+  animate: { opacity: 1 },
+  exit: { opacity: 0 },
+  transition: { duration: 0.2, ease: EASE_OUT },
+} as const
+
+interface DemoStep {
+  type: 'workflow' | 'tables' | 'home' | 'logs'
+  workflowId?: string
+  tableId?: string
+  duration: number
+}
+
+const WORKFLOW_MAP = new Map(PREVIEW_WORKFLOWS.map((w) => [w.id, w]))
+
+const HOME_STEP_MS = 12000
+const LOGS_STEP_MS = 5000
+
+/** Full desktop sequence: CRM -> home -> logs -> ITSM -> support -> repeat */
+const DESKTOP_STEPS: DemoStep[] = [
+  {
+    type: 'workflow',
+    workflowId: 'wf-self-healing-crm',
+    duration: getWorkflowStepDuration(WORKFLOW_MAP.get('wf-self-healing-crm')!),
+  },
+  { type: 'home', duration: HOME_STEP_MS },
+  { type: 'logs', duration: LOGS_STEP_MS },
+  {
+    type: 'workflow',
+    workflowId: 'wf-it-service',
+    duration: getWorkflowStepDuration(WORKFLOW_MAP.get('wf-it-service')!),
+  },
+  {
+    type: 'workflow',
+    workflowId: 'wf-customer-support',
+    duration: getWorkflowStepDuration(WORKFLOW_MAP.get('wf-customer-support')!),
+  },
+]
+
+/**
+ * Interactive workspace preview for the hero section.
+ *
+ * Desktop: auto-cycles CRM -> home -> logs -> ITSM -> support -> repeat.
+ * Mobile: static workflow canvas (no animation, no cycling).
+ * User interaction permanently stops the auto-cycle.
+ */
+export function LandingPreview() {
+  const [activeView, setActiveView] = useState<SidebarView>('workflow')
+  const [activeWorkflowId, setActiveWorkflowId] = useState(PREVIEW_WORKFLOWS[0].id)
+  const animationKeyRef = useRef(0)
+  const [animationKey, setAnimationKey] = useState(0)
+  const [highlightedBlockId, setHighlightedBlockId] = useState<string | null>(null)
+  const [autoTableId, setAutoTableId] = useState<string | null>(null)
+  const [autoTypeHome, setAutoTypeHome] = useState(false)
+  const [isDesktop, setIsDesktop] = useState(true)
+
+  const demoIndexRef = useRef(0)
+  const demoTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const autoCycleActiveRef = useRef(true)
+  const isDesktopRef = useRef(true)
+
+  const clearDemoTimer = useCallback(() => {
+    if (demoTimerRef.current) {
+      clearTimeout(demoTimerRef.current)
+      demoTimerRef.current = null
+    }
+  }, [])
+
+  const applyDemoStep = useCallback((step: DemoStep) => {
+    setAutoTableId(null)
+    setAutoTypeHome(false)
+
+    if (step.type === 'workflow' && step.workflowId) {
+      setActiveWorkflowId(step.workflowId)
+      setActiveView('workflow')
+      animationKeyRef.current += 1
+      setAnimationKey(animationKeyRef.current)
+    } else if (step.type === 'tables') {
+      setActiveView('tables')
+      setAutoTableId(step.tableId ?? null)
+    } else if (step.type === 'home') {
+      setActiveView('home')
+      setAutoTypeHome(true)
+    } else if (step.type === 'logs') {
+      setActiveView('logs')
+    }
+  }, [])
+
+  const scheduleNextStep = useCallback(() => {
+    if (!autoCycleActiveRef.current) return
+    const steps = DESKTOP_STEPS
+    const currentStep = steps[demoIndexRef.current]
+    demoTimerRef.current = setTimeout(() => {
+      if (!autoCycleActiveRef.current) return
+      demoIndexRef.current = (demoIndexRef.current + 1) % steps.length
+      applyDemoStep(steps[demoIndexRef.current])
+      scheduleNextStep()
+    }, currentStep.duration)
+  }, [applyDemoStep])
+
+  useEffect(() => {
+    const desktop = window.matchMedia('(min-width: 1024px)').matches
+    isDesktopRef.current = desktop
+    setIsDesktop(desktop)
+    if (!desktop) return
+    applyDemoStep(DESKTOP_STEPS[0])
+    scheduleNextStep()
+    return clearDemoTimer
+  }, [applyDemoStep, scheduleNextStep, clearDemoTimer])
+
+  const stopAutoCycle = useCallback(() => {
+    autoCycleActiveRef.current = false
+    clearDemoTimer()
+  }, [clearDemoTimer])
+
+  const handleSelectWorkflow = useCallback(
+    (id: string) => {
+      stopAutoCycle()
+      setAutoTableId(null)
+      setAutoTypeHome(false)
+      setHighlightedBlockId(null)
+      setActiveWorkflowId(id)
+      setActiveView('workflow')
+      animationKeyRef.current += 1
+      setAnimationKey(animationKeyRef.current)
+    },
+    [stopAutoCycle]
+  )
+
+  const handleSelectHome = useCallback(() => {
+    stopAutoCycle()
+    setAutoTableId(null)
+    setAutoTypeHome(false)
+    setHighlightedBlockId(null)
+    setActiveView('home')
+  }, [stopAutoCycle])
+
+  const handleSelectNav = useCallback(
+    (id: SidebarView) => {
+      stopAutoCycle()
+      setAutoTableId(null)
+      setAutoTypeHome(false)
+      setHighlightedBlockId(null)
+      setActiveView(id)
+    },
+    [stopAutoCycle]
+  )
+
+  const handleHighlightBlock = useCallback((blockId: string | null) => {
+    setHighlightedBlockId(blockId)
+  }, [])
+
+  const activeWorkflow =
+    PREVIEW_WORKFLOWS.find((w) => w.id === activeWorkflowId) ?? PREVIEW_WORKFLOWS[0]
+
+  const isWorkflowView = activeView === 'workflow'
+
+  return (
+    <motion.div
+      className='dark flex aspect-[1116/615] w-full overflow-hidden rounded bg-[var(--landing-bg-surface)] antialiased'
+      initial={isDesktop ? 'hidden' : false}
+      animate='visible'
+      variants={containerVariants}
+    >
+      <motion.div className='hidden lg:flex' variants={sidebarVariants}>
+        <LandingPreviewSidebar
+          workflows={PREVIEW_WORKFLOWS}
+          activeWorkflowId={activeWorkflowId}
+          activeView={activeView}
+          onSelectWorkflow={handleSelectWorkflow}
+          onSelectHome={handleSelectHome}
+          onSelectNav={handleSelectNav}
+        />
+      </motion.div>
+      <div className='flex min-w-0 flex-1 flex-col py-2 pr-2 pl-2 lg:pl-0'>
+        <div className='flex flex-1 overflow-hidden rounded-[5px] border border-[#2c2c2c] bg-[var(--landing-bg)]'>
+          <div
+            className={
+              isWorkflowView
+                ? 'relative min-w-0 flex-1 overflow-hidden'
+                : 'relative flex min-w-0 flex-1 flex-col overflow-hidden'
+            }
+          >
+            {isDesktop ? (
+              <AnimatePresence mode='wait'>
+                {activeView === 'workflow' && (
+                  <motion.div
+                    key={`wf-${activeWorkflow.id}-${animationKey}`}
+                    className='h-full w-full'
+                    {...viewTransition}
+                  >
+                    <LandingPreviewWorkflow
+                      workflow={activeWorkflow}
+                      animate
+                      highlightedBlockId={highlightedBlockId}
+                    />
+                  </motion.div>
+                )}
+                {activeView === 'home' && (
+                  <motion.div
+                    key={`home-${animationKey}`}
+                    className='flex h-full w-full flex-col'
+                    {...viewTransition}
+                  >
+                    <LandingPreviewHome autoType={autoTypeHome} />
+                  </motion.div>
+                )}
+                {activeView === 'tables' && (
+                  <motion.div
+                    key={`tables-${animationKey}`}
+                    className='flex h-full w-full flex-col'
+                    {...viewTransition}
+                  >
+                    <LandingPreviewTables autoOpenTableId={autoTableId} />
+                  </motion.div>
+                )}
+                {activeView === 'files' && (
+                  <motion.div
+                    key='files'
+                    className='flex h-full w-full flex-col'
+                    {...viewTransition}
+                  >
+                    <LandingPreviewFiles />
+                  </motion.div>
+                )}
+                {activeView === 'knowledge' && (
+                  <motion.div
+                    key='knowledge'
+                    className='flex h-full w-full flex-col'
+                    {...viewTransition}
+                  >
+                    <LandingPreviewKnowledge />
+                  </motion.div>
+                )}
+                {activeView === 'logs' && (
+                  <motion.div key='logs' className='flex h-full w-full flex-col' initial={false}>
+                    <LandingPreviewLogs />
+                  </motion.div>
+                )}
+                {activeView === 'scheduled-tasks' && (
+                  <motion.div
+                    key='scheduled-tasks'
+                    className='flex h-full w-full flex-col'
+                    {...viewTransition}
+                  >
+                    <LandingPreviewScheduledTasks />
+                  </motion.div>
+                )}
+              </AnimatePresence>
+            ) : (
+              <div className='h-full w-full'>
+                <LandingPreviewWorkflow workflow={activeWorkflow} />
+              </div>
+            )}
+          </div>
+          <motion.div
+            className={isWorkflowView ? 'hidden lg:flex' : 'hidden'}
+            variants={panelVariants}
+          >
+            <LandingPreviewPanel
+              activeWorkflow={activeWorkflow}
+              animationKey={animationKey}
+              onHighlightBlock={handleHighlightBlock}
+            />
+          </motion.div>
+        </div>
+      </div>
+    </motion.div>
+  )
+}
diff --git a/apps/sim/app/(landing)/components/legal-layout.tsx b/apps/sim/app/(landing)/components/legal-layout.tsx
index a829a67b47f..3f5ebdee8de 100644
--- a/apps/sim/app/(landing)/components/legal-layout.tsx
+++ b/apps/sim/app/(landing)/components/legal-layout.tsx
@@ -1,7 +1,7 @@
 import { getNavBlogPosts } from '@/lib/blog/registry'
 import { isHosted } from '@/lib/core/config/feature-flags'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 interface LegalLayoutProps {
   title: string
diff --git a/apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx b/apps/sim/app/(landing)/components/navbar/components/blog-dropdown.tsx
similarity index 90%
rename from apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx
rename to apps/sim/app/(landing)/components/navbar/components/blog-dropdown.tsx
index 81db744ab67..dca4a4c131f 100644
--- a/apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx
+++ b/apps/sim/app/(landing)/components/navbar/components/blog-dropdown.tsx
@@ -44,9 +44,9 @@ function BlogCard({
           unoptimized
         />
       </div>
-      <div className='flex-shrink-0 px-2.5 py-1.5'>
+      <div className='flex-shrink-0 px-2.5 py-2'>
         <span
-          className='font-[430] font-season text-[var(--landing-text-body)] leading-[140%]'
+          className='block truncate font-[430] font-season text-[var(--landing-text-body)] leading-[140%]'
           style={{ fontSize: titleSize }}
         >
           {title}
@@ -66,7 +66,7 @@ export function BlogDropdown({ posts }: BlogDropdownProps) {
   if (!featured) return null
 
   return (
-    <div className='w-[560px] rounded-[5px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg)] p-4 shadow-overlay'>
+    <div className='w-[560px] rounded-[5px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg)] p-2 shadow-overlay'>
       <div className='grid grid-cols-3 gap-2'>
         <BlogCard
           slug={featured.slug}
diff --git a/apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx b/apps/sim/app/(landing)/components/navbar/components/docs-dropdown.tsx
similarity index 96%
rename from apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx
rename to apps/sim/app/(landing)/components/navbar/components/docs-dropdown.tsx
index 0054491bf5e..1a68aad1726 100644
--- a/apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx
+++ b/apps/sim/app/(landing)/components/navbar/components/docs-dropdown.tsx
@@ -37,8 +37,8 @@ const RESOURCE_CARDS = [
 
 export function DocsDropdown() {
   return (
-    <div className='w-[480px] rounded-[5px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg)] p-4 shadow-overlay'>
-      <div className='grid grid-cols-2 gap-2.5'>
+    <div className='w-[480px] rounded-[5px] border border-[var(--landing-bg-elevated)] bg-[var(--landing-bg)] p-2 shadow-overlay'>
+      <div className='grid grid-cols-2 gap-2'>
         {PREVIEW_CARDS.map((card) => (
           <a
             key={card.title}
diff --git a/apps/sim/app/(home)/components/navbar/components/github-stars.tsx b/apps/sim/app/(landing)/components/navbar/components/github-stars.tsx
similarity index 81%
rename from apps/sim/app/(home)/components/navbar/components/github-stars.tsx
rename to apps/sim/app/(landing)/components/navbar/components/github-stars.tsx
index 7fd496d8181..67b0c9d96c2 100644
--- a/apps/sim/app/(home)/components/navbar/components/github-stars.tsx
+++ b/apps/sim/app/(landing)/components/navbar/components/github-stars.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { GithubOutlineIcon } from '@/components/icons'
-import { getFormattedGitHubStars } from '@/app/(home)/actions/github'
+import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
 
 const logger = createLogger('github-stars')
 
@@ -31,7 +31,7 @@ export function GitHubStars() {
       href='https://github.com/simstudioai/sim'
       target='_blank'
       rel='noopener noreferrer'
-      className='flex items-center gap-2 px-3'
+      className='flex h-[30px] items-center gap-2 self-center rounded-[5px] px-3 transition-colors duration-200 group-hover:bg-[var(--landing-bg-elevated)]'
       aria-label={`GitHub repository — ${stars} stars`}
     >
       <GithubOutlineIcon className='h-[14px] w-[14px]' />
diff --git a/apps/sim/app/(home)/components/navbar/navbar.tsx b/apps/sim/app/(landing)/components/navbar/navbar.tsx
similarity index 83%
rename from apps/sim/app/(home)/components/navbar/navbar.tsx
rename to apps/sim/app/(landing)/components/navbar/navbar.tsx
index b04972f2ff2..0cc2a8c306a 100644
--- a/apps/sim/app/(home)/components/navbar/navbar.tsx
+++ b/apps/sim/app/(landing)/components/navbar/navbar.tsx
@@ -10,9 +10,9 @@ import { cn } from '@/lib/core/utils/cn'
 import {
   BlogDropdown,
   type NavBlogPost,
-} from '@/app/(home)/components/navbar/components/blog-dropdown'
-import { DocsDropdown } from '@/app/(home)/components/navbar/components/docs-dropdown'
-import { GitHubStars } from '@/app/(home)/components/navbar/components/github-stars'
+} from '@/app/(landing)/components/navbar/components/blog-dropdown'
+import { DocsDropdown } from '@/app/(landing)/components/navbar/components/docs-dropdown'
+import { GitHubStars } from '@/app/(landing)/components/navbar/components/github-stars'
 import { getBrandConfig } from '@/ee/whitelabeling'
 
 type DropdownId = 'docs' | 'blog' | null
@@ -29,10 +29,9 @@ const NAV_LINKS: NavLink[] = [
   { label: 'Docs', href: 'https://docs.sim.ai', external: true, icon: 'chevron', dropdown: 'docs' },
   { label: 'Blog', href: '/blog', icon: 'chevron', dropdown: 'blog' },
   { label: 'Pricing', href: '/#pricing' },
-  { label: 'Enterprise', href: 'https://form.typeform.com/to/jqCO12pF', external: true },
 ]
 
-const LOGO_CELL = 'flex items-center pl-5 lg:pl-20 pr-5'
+const LOGO_CELL = 'flex items-center pl-5 lg:pl-16 pr-5'
 const LINK_CELL = 'flex items-center px-3.5'
 
 interface NavbarProps {
@@ -49,7 +48,6 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
   const useHomeLinks = isAuthenticated || isBrowsingHome
   const logoHref = useHomeLinks ? '/?home' : '/'
   const [activeDropdown, setActiveDropdown] = useState<DropdownId>(null)
-  const [hoveredLink, setHoveredLink] = useState<string | null>(null)
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false)
   const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
@@ -91,12 +89,10 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
     return () => mq.removeEventListener('change', handler)
   }, [])
 
-  const anyHighlighted = activeDropdown !== null || hoveredLink !== null
-
   return (
     <nav
       aria-label='Primary navigation'
-      className='relative flex h-[52px] border-[var(--landing-bg-elevated)] border-b-[1px] bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)] text-sm'
+      className='relative flex h-[58px] border-[var(--landing-bg-elevated)] border-b-[1px] bg-[var(--landing-bg)] font-[430] font-season text-[var(--landing-text)] text-sm'
       itemScope
       itemType='https://schema.org/SiteNavigationElement'
     >
@@ -134,13 +130,9 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                 useHomeLinks && rawHref.startsWith('/#') ? `/?home${rawHref.slice(1)}` : rawHref
               const hasDropdown = !!dropdown
               const isActive = hasDropdown && activeDropdown === dropdown
-              const isThisHovered = hoveredLink === label
-              const isHighlighted = isActive || isThisHovered
-              const isDimmed = anyHighlighted && !isHighlighted
               const linkClass = cn(
                 icon ? `${LINK_CELL} gap-2` : LINK_CELL,
-                'transition-colors duration-200',
-                isDimmed && 'text-[color-mix(in_srgb,var(--landing-text-subtle)_60%,transparent)]'
+                'h-[30px] self-center rounded-[5px] transition-colors duration-200 group-hover:bg-[var(--landing-bg-elevated)]'
               )
               const chevron = icon === 'chevron' && <NavChevron open={isActive} />
 
@@ -148,7 +140,7 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                 return (
                   <li
                     key={label}
-                    className='relative flex'
+                    className='group relative flex'
                     onMouseEnter={() => openDropdown(dropdown)}
                     onMouseLeave={scheduleClose}
                   >
@@ -157,51 +149,44 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                         href={href}
                         target='_blank'
                         rel='noopener noreferrer'
-                        className={cn(linkClass, 'h-full cursor-pointer')}
+                        itemProp='url'
+                        className={cn(linkClass, 'cursor-pointer')}
                       >
                         {label}
                         {chevron}
                       </a>
                     ) : (
-                      <Link href={href} className={cn(linkClass, 'h-full cursor-pointer')}>
+                      <Link href={href} itemProp='url' className={cn(linkClass, 'cursor-pointer')}>
                         {label}
                         {chevron}
                       </Link>
                     )}
 
-                    <div
-                      className={cn(
-                        '-mt-0.5 absolute top-full left-0 z-50',
-                        isActive
-                          ? 'pointer-events-auto opacity-100'
-                          : 'pointer-events-none opacity-0'
-                      )}
-                      style={{
-                        transform: isActive ? 'translateY(0)' : 'translateY(-6px)',
-                        transition: 'opacity 200ms ease, transform 200ms ease',
-                      }}
-                    >
-                      {dropdown === 'docs' && <DocsDropdown />}
-                      {dropdown === 'blog' && <BlogDropdown posts={blogPosts} />}
-                    </div>
+                    {isActive && (
+                      <div className='-mt-0.5 pointer-events-auto absolute top-full left-0 z-50'>
+                        {dropdown === 'docs' && <DocsDropdown />}
+                        {dropdown === 'blog' && <BlogDropdown posts={blogPosts} />}
+                      </div>
+                    )}
                   </li>
                 )
               }
 
               return (
-                <li
-                  key={label}
-                  className='flex'
-                  onMouseEnter={() => setHoveredLink(label)}
-                  onMouseLeave={() => setHoveredLink(null)}
-                >
+                <li key={label} className='group flex'>
                   {external ? (
-                    <a href={href} target='_blank' rel='noopener noreferrer' className={linkClass}>
+                    <a
+                      href={href}
+                      target='_blank'
+                      rel='noopener noreferrer'
+                      itemProp='url'
+                      className={linkClass}
+                    >
                       {label}
                       {chevron}
                     </a>
                   ) : (
-                    <Link href={href} className={linkClass} aria-label={label}>
+                    <Link href={href} itemProp='url' className={linkClass} aria-label={label}>
                       {label}
                       {chevron}
                     </Link>
@@ -209,14 +194,7 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                 </li>
               )
             })}
-            <li
-              className={cn(
-                'flex transition-opacity duration-200',
-                anyHighlighted && hoveredLink !== 'github' && 'opacity-60'
-              )}
-              onMouseEnter={() => setHoveredLink('github')}
-              onMouseLeave={() => setHoveredLink(null)}
-            >
+            <li className='group flex'>
               <GitHubStars />
             </li>
           </ul>
@@ -225,7 +203,7 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
 
           <div
             className={cn(
-              'hidden items-center gap-2 pr-20 pl-5 lg:flex',
+              'hidden items-center gap-2 pr-16 pl-5 lg:flex',
               isSessionPending && 'invisible'
             )}
           >
@@ -271,7 +249,7 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
 
           <div
             className={cn(
-              'fixed inset-x-0 top-[52px] bottom-0 z-50 flex flex-col overflow-y-auto bg-[var(--landing-bg)] font-[430] font-season text-sm transition-all duration-200 lg:hidden',
+              'fixed inset-x-0 top-[58px] bottom-0 z-50 flex flex-col overflow-y-auto bg-[var(--landing-bg)] font-[430] font-season text-sm transition-all duration-200 lg:hidden',
               mobileMenuOpen ? 'visible opacity-100' : 'invisible opacity-0'
             )}
           >
diff --git a/apps/sim/app/(home)/components/pricing/pricing.tsx b/apps/sim/app/(landing)/components/pricing/pricing.tsx
similarity index 85%
rename from apps/sim/app/(home)/components/pricing/pricing.tsx
rename to apps/sim/app/(landing)/components/pricing/pricing.tsx
index c36a0ab2bf7..455aea124c8 100644
--- a/apps/sim/app/(home)/components/pricing/pricing.tsx
+++ b/apps/sim/app/(landing)/components/pricing/pricing.tsx
@@ -1,6 +1,8 @@
+'use client'
+
 import Link from 'next/link'
 import { Badge } from '@/components/emcn'
-import { DemoRequestModal } from '@/app/(home)/components/demo-request/demo-request-modal'
+import { DemoRequestModal } from '@/app/(landing)/components/demo-request/demo-request-modal'
 
 interface PricingTier {
   id: string
@@ -83,7 +85,7 @@ const PRICING_TIERS: PricingTier[] = [
       'SSO & SCIM · SOC2',
       'Self hosting · Dedicated support',
     ],
-    cta: { label: 'Book a demo', action: 'demo-request' },
+    cta: { label: 'Get a demo', action: 'demo-request' },
   },
 ]
 
@@ -110,7 +112,21 @@ function PricingCard({ tier }: PricingCardProps) {
   const isPro = tier.id === 'pro'
 
   return (
-    <article className='flex flex-1 flex-col' aria-labelledby={`${tier.id}-heading`}>
+    <article
+      className='flex flex-1 flex-col'
+      aria-labelledby={`${tier.id}-heading`}
+      itemScope
+      itemType='https://schema.org/Offer'
+    >
+      <meta itemProp='name' content={`${tier.name} Plan`} />
+      <meta
+        itemProp='price'
+        content={
+          tier.price === 'Free' ? '0' : tier.price === 'Custom' ? '' : tier.price.replace('$', '')
+        }
+      />
+      <meta itemProp='priceCurrency' content='USD' />
+      <meta itemProp='availability' content='https://schema.org/InStock' />
       <div className='flex flex-1 flex-col gap-6 rounded-t-lg border border-[var(--landing-border-light)] border-b-0 bg-white p-5'>
         <div className='flex flex-col'>
           <h3
@@ -196,7 +212,7 @@ export default function Pricing() {
       aria-labelledby='pricing-heading'
       className='bg-[var(--landing-bg-section)]'
     >
-      <div className='px-4 pt-[60px] pb-10 sm:px-8 sm:pt-20 sm:pb-0 md:px-20 md:pt-[100px]'>
+      <div className='px-4 pt-[60px] pb-[60px] sm:px-8 sm:pt-20 sm:pb-20 md:px-16 md:pt-[100px] md:pb-[100px]'>
         <div className='flex flex-col items-start gap-3 sm:gap-4 md:gap-5'>
           <Badge
             variant='blue'
@@ -213,6 +229,12 @@ export default function Pricing() {
           >
             Pricing
           </h2>
+          <p className='sr-only'>
+            Sim pricing: Community plan is free with 1,000 credits and 5GB storage. Pro plan is $25
+            per month with 6,000 credits and 50GB storage. Max plan is $100 per month with 25,000
+            credits and 500GB storage. Enterprise pricing is custom with SSO, SCIM, SOC2 compliance,
+            self-hosting, and dedicated support. All plans include CLI, SDK, and MCP access.
+          </p>
         </div>
 
         <div className='mt-8 grid grid-cols-1 gap-4 sm:mt-10 sm:grid-cols-2 md:mt-12 lg:grid-cols-4'>
diff --git a/apps/sim/app/(home)/components/structured-data.tsx b/apps/sim/app/(landing)/components/structured-data.tsx
similarity index 84%
rename from apps/sim/app/(home)/components/structured-data.tsx
rename to apps/sim/app/(landing)/components/structured-data.tsx
index a16f0ef8464..1fc0122650a 100644
--- a/apps/sim/app/(home)/components/structured-data.tsx
+++ b/apps/sim/app/(landing)/components/structured-data.tsx
@@ -4,7 +4,7 @@
  * Renders a `<script type="application/ld+json">` with Schema.org markup.
  * Single source of truth for machine-readable page metadata.
  *
- * Schemas: Organization, WebSite, WebPage, BreadcrumbList, WebApplication, FAQPage.
+ * Schemas: Organization, WebSite, WebPage, BreadcrumbList, WebApplication, SoftwareSourceCode, FAQPage.
  *
  * AI crawler behavior (2025-2026):
  * - Google AI Overviews / Bing Copilot parse JSON-LD from their search indexes.
@@ -170,6 +170,15 @@ export default function StructuredData() {
           },
         ],
       },
+      {
+        '@type': 'SoftwareSourceCode',
+        '@id': 'https://sim.ai/#source',
+        codeRepository: 'https://github.com/simstudioai/sim',
+        programmingLanguage: ['TypeScript', 'Python'],
+        runtimePlatform: 'Node.js',
+        license: 'https://opensource.org/licenses/AGPL-3.0',
+        isPartOf: { '@id': 'https://sim.ai/#software' },
+      },
       {
         '@type': 'FAQPage',
         '@id': 'https://sim.ai/#faq',
@@ -214,6 +223,30 @@ export default function StructuredData() {
               text: 'Sim offers SOC2 compliance, SSO/SAML authentication, role-based access control, audit logs, dedicated support, custom SLAs, and on-premise deployment options for enterprise customers.',
             },
           },
+          {
+            '@type': 'Question',
+            name: 'Is Sim open source?',
+            acceptedAnswer: {
+              '@type': 'Answer',
+              text: 'Yes. Sim is fully open source under the AGPL-3.0 license. The source code is available on GitHub at github.com/simstudioai/sim. You can self-host Sim or use the hosted version at sim.ai.',
+            },
+          },
+          {
+            '@type': 'Question',
+            name: 'What integrations does Sim support?',
+            acceptedAnswer: {
+              '@type': 'Answer',
+              text: 'Sim supports 1,000+ integrations including Slack, Gmail, GitHub, Notion, Airtable, Supabase, HubSpot, Salesforce, Jira, Linear, Google Drive, Google Sheets, Confluence, Discord, Microsoft Teams, Outlook, Telegram, Stripe, Pinecone, and Firecrawl. New integrations are added regularly.',
+            },
+          },
+          {
+            '@type': 'Question',
+            name: 'Can I self-host Sim?',
+            acceptedAnswer: {
+              '@type': 'Answer',
+              text: 'Yes. Sim can be self-hosted using Docker. Documentation is available at docs.sim.ai/self-hosting. Enterprise customers can also get dedicated infrastructure and on-premise deployment.',
+            },
+          },
         ],
       },
     ],
diff --git a/apps/sim/app/(home)/components/templates/template-workflows.ts b/apps/sim/app/(landing)/components/templates/template-workflows.ts
similarity index 99%
rename from apps/sim/app/(home)/components/templates/template-workflows.ts
rename to apps/sim/app/(landing)/components/templates/template-workflows.ts
index 8d23b947211..6e0cf6e270d 100644
--- a/apps/sim/app/(home)/components/templates/template-workflows.ts
+++ b/apps/sim/app/(landing)/components/templates/template-workflows.ts
@@ -1,4 +1,4 @@
-import type { PreviewWorkflow } from '@/app/(home)/components/landing-preview/components/landing-preview-workflow/workflow-data'
+import type { PreviewWorkflow } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
 
 /**
  * OCR Invoice to DB — Start → Agent (Textract) → Supabase
diff --git a/apps/sim/app/(home)/components/templates/templates.tsx b/apps/sim/app/(landing)/components/templates/templates.tsx
similarity index 66%
rename from apps/sim/app/(home)/components/templates/templates.tsx
rename to apps/sim/app/(landing)/components/templates/templates.tsx
index c9aa7461a41..ecb9ae7fd37 100644
--- a/apps/sim/app/(home)/components/templates/templates.tsx
+++ b/apps/sim/app/(landing)/components/templates/templates.tsx
@@ -1,21 +1,21 @@
 'use client'
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { AnimatePresence, type MotionValue, motion, useScroll, useTransform } from 'framer-motion'
+import { AnimatePresence, motion } from 'framer-motion'
 import dynamic from 'next/dynamic'
 import { useRouter } from 'next/navigation'
 import { Badge, ChevronDown } from '@/components/emcn'
 import { LandingWorkflowSeedStorage } from '@/lib/core/utils/browser-storage'
 import { cn } from '@/lib/core/utils/cn'
-import { TEMPLATE_WORKFLOWS } from '@/app/(home)/components/templates/template-workflows'
+import { TEMPLATE_WORKFLOWS } from '@/app/(landing)/components/templates/template-workflows'
 
 const logger = createLogger('LandingTemplates')
 
 const LandingPreviewWorkflow = dynamic(
   () =>
     import(
-      '@/app/(home)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow'
+      '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/landing-preview-workflow'
     ).then((mod) => mod.LandingPreviewWorkflow),
   {
     ssr: false,
@@ -236,73 +236,6 @@ const DEPTH_CONFIGS: Record<string, DepthConfig> = {
   },
 }
 
-const SCROLL_BLOCK_RX = '2.59574'
-
-/**
- * Two-row horizontal block strip for the scroll-driven reveal in the templates section.
- * Same structural pattern as the hero's top-right blocks with matching colours:
- * blue (left) → pink (middle) → green (right).
- */
-const SCROLL_BLOCK_RECTS = [
-  { opacity: 0.6, x: '-34.24', y: '0', width: '34.24', height: '16.86', fill: '#2ABBF8' },
-  { opacity: 1, x: '-17.38', y: '0', width: '16.86', height: '16.86', fill: '#2ABBF8' },
-  { opacity: 1, x: '0', y: '0', width: '16.86', height: '33.73', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '0', y: '0', width: '85.34', height: '16.86', fill: '#2ABBF8' },
-  { opacity: 1, x: '0', y: '0', width: '16.86', height: '16.86', fill: '#2ABBF8' },
-  { opacity: 0.6, x: '34.24', y: '0', width: '34.24', height: '33.73', fill: '#2ABBF8' },
-  { opacity: 1, x: '34.24', y: '0', width: '16.86', height: '16.86', fill: '#2ABBF8' },
-  { opacity: 1, x: '51.62', y: '16.86', width: '16.86', height: '16.86', fill: '#2ABBF8' },
-  { opacity: 1, x: '68.48', y: '0', width: '54.65', height: '16.86', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '106.27', y: '0', width: '34.24', height: '33.73', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '106.27', y: '0', width: '51.10', height: '16.86', fill: '#FA4EDF' },
-  { opacity: 1, x: '123.65', y: '16.86', width: '16.86', height: '16.86', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '157.37', y: '0', width: '34.24', height: '16.86', fill: '#FA4EDF' },
-  { opacity: 1, x: '157.37', y: '0', width: '16.86', height: '16.86', fill: '#FA4EDF' },
-  { opacity: 0.6, x: '209.0', y: '0', width: '68.48', height: '16.86', fill: '#00F701' },
-  { opacity: 0.6, x: '209.14', y: '0', width: '16.86', height: '33.73', fill: '#00F701' },
-  { opacity: 0.6, x: '243.23', y: '0', width: '34.24', height: '33.73', fill: '#00F701' },
-  { opacity: 1, x: '243.23', y: '0', width: '16.86', height: '16.86', fill: '#00F701' },
-  { opacity: 0.6, x: '260.10', y: '0', width: '34.04', height: '16.86', fill: '#00F701' },
-  { opacity: 1, x: '260.61', y: '16.86', width: '16.86', height: '16.86', fill: '#00F701' },
-] as const
-
-const SCROLL_BLOCK_MAX_X = Math.max(...SCROLL_BLOCK_RECTS.map((r) => Number.parseFloat(r.x)))
-const SCROLL_REVEAL_START = 0.05
-const SCROLL_REVEAL_SPAN = 0.7
-const SCROLL_FADE_IN = 0.03
-
-function getScrollBlockThreshold(x: string): number {
-  const normalized = Number.parseFloat(x) / SCROLL_BLOCK_MAX_X
-  return SCROLL_REVEAL_START + (1 - normalized) * SCROLL_REVEAL_SPAN
-}
-
-interface ScrollBlockRectProps {
-  scrollYProgress: MotionValue<number>
-  rect: (typeof SCROLL_BLOCK_RECTS)[number]
-}
-
-/** Renders a single SVG rect whose opacity is driven by scroll progress. */
-function ScrollBlockRect({ scrollYProgress, rect }: ScrollBlockRectProps) {
-  const threshold = getScrollBlockThreshold(rect.x)
-  const opacity = useTransform(
-    scrollYProgress,
-    [threshold, threshold + SCROLL_FADE_IN],
-    [0, rect.opacity]
-  )
-
-  return (
-    <motion.rect
-      x={rect.x}
-      y={rect.y}
-      width={rect.width}
-      height={rect.height}
-      rx={SCROLL_BLOCK_RX}
-      fill={rect.fill}
-      style={{ opacity }}
-    />
-  )
-}
-
 function buildBottomWallStyle(config: DepthConfig) {
   let pos = 0
   const stops: string[] = []
@@ -317,36 +250,9 @@ function buildBottomWallStyle(config: DepthConfig) {
   }
 }
 
-interface DotGridProps {
-  className?: string
-  cols: number
-  rows: number
-  gap?: number
-}
-
-function DotGrid({ className, cols, rows, gap = 0 }: DotGridProps) {
-  return (
-    <div
-      aria-hidden='true'
-      className={className}
-      style={{
-        display: 'grid',
-        gridTemplateColumns: `repeat(${cols}, 1fr)`,
-        gap,
-        placeItems: 'center',
-      }}
-    >
-      {Array.from({ length: cols * rows }, (_, i) => (
-        <div key={i} className='h-[1.5px] w-[1.5px] rounded-full bg-[var(--landing-bg-elevated)]' />
-      ))}
-    </div>
-  )
-}
-
 const TEMPLATES_PANEL_ID = 'templates-panel'
 
 export default function Templates() {
-  const sectionRef = useRef<HTMLDivElement>(null)
   const [activeIndex, setActiveIndex] = useState(0)
   const [isPreparingTemplate, setIsPreparingTemplate] = useState(false)
   const [isMobile, setIsMobile] = useState(false)
@@ -360,11 +266,6 @@ export default function Templates() {
     return () => mq.removeEventListener('change', handler)
   }, [])
 
-  const { scrollYProgress } = useScroll({
-    target: sectionRef,
-    offset: ['start 0.9', 'start 0.2'],
-  })
-
   const activeWorkflow = TEMPLATE_WORKFLOWS[activeIndex]
   const activeDepth = DEPTH_CONFIGS[activeWorkflow.id]
 
@@ -408,12 +309,7 @@ export default function Templates() {
   ])
 
   return (
-    <section
-      ref={sectionRef}
-      id='templates'
-      aria-labelledby='templates-heading'
-      className='mt-10 mb-20'
-    >
+    <section id='templates' aria-labelledby='templates-heading' className='pt-[60px] lg:pt-[100px]'>
       <p className='sr-only'>
         Sim includes {TEMPLATE_WORKFLOWS.length} pre-built workflow templates covering OCR
         processing, release management, meeting follow-ups, resume scanning, email triage,
@@ -421,35 +317,15 @@ export default function Templates() {
         and knowledge base Q&amp;A. Each template connects real integrations and LLMs — pick one,
         customise it, and deploy in minutes.
       </p>
+      <ul className='sr-only'>
+        {TEMPLATE_WORKFLOWS.map((workflow) => (
+          <li key={workflow.id}>{workflow.name}</li>
+        ))}
+      </ul>
 
       <div className='bg-[var(--landing-bg)]'>
-        <DotGrid
-          className='overflow-hidden border-[var(--landing-bg-elevated)] border-y bg-[var(--landing-bg)] p-1.5'
-          cols={160}
-          rows={1}
-          gap={6}
-        />
-
         <div className='relative overflow-hidden'>
-          <div
-            aria-hidden='true'
-            className='pointer-events-none absolute top-0 right-0 z-20 hidden lg:block'
-          >
-            <svg
-              width={329}
-              height={34}
-              viewBox='-34 0 329 34'
-              fill='none'
-              xmlns='http://www.w3.org/2000/svg'
-              className='h-auto w-full'
-            >
-              {SCROLL_BLOCK_RECTS.map((r, i) => (
-                <ScrollBlockRect key={i} scrollYProgress={scrollYProgress} rect={r} />
-              ))}
-            </svg>
-          </div>
-
-          <div className='px-5 pt-[60px] lg:px-20 lg:pt-[100px]'>
+          <div className='px-5 lg:px-16'>
             <div className='flex flex-col items-start gap-5'>
               <Badge
                 variant='blue'
@@ -480,24 +356,10 @@ export default function Templates() {
           </div>
 
           <div className='mt-10 flex border-[var(--landing-bg-elevated)] border-y lg:mt-[73px]'>
-            <div className='shrink-0'>
-              <div className='h-full lg:hidden'>
-                <DotGrid
-                  className='h-full w-[24px] overflow-hidden border-[var(--landing-bg-elevated)] border-r p-1'
-                  cols={2}
-                  rows={55}
-                  gap={4}
-                />
-              </div>
-              <div className='hidden h-full lg:block'>
-                <DotGrid
-                  className='h-full w-[80px] overflow-hidden border-[var(--landing-bg-elevated)] border-r p-1.5'
-                  cols={8}
-                  rows={55}
-                  gap={6}
-                />
-              </div>
-            </div>
+            <div
+              aria-hidden='true'
+              className='w-[24px] shrink-0 border-[var(--landing-bg-elevated)] border-r lg:w-16'
+            />
 
             <div className='flex min-w-0 flex-1 flex-col lg:flex-row'>
               <div
@@ -575,7 +437,7 @@ export default function Templates() {
                               <LandingPreviewWorkflow
                                 workflow={workflow}
                                 animate
-                                fitViewOptions={{ padding: 0.15, maxZoom: 1.3 }}
+                                fitViewOptions={{ padding: 0.15, minZoom: 0.1, maxZoom: 0.8 }}
                               />
                             </div>
                             <div className='p-3'>
@@ -617,46 +479,55 @@ export default function Templates() {
                   className='group/cta absolute top-4 right-[16px] z-10 inline-flex h-[32px] cursor-pointer items-center gap-1.5 rounded-[5px] border border-white bg-white px-2.5 font-[430] font-season text-black text-sm transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
                 >
                   {isPreparingTemplate ? 'Preparing...' : 'Use template'}
-                  <span className='relative h-[10px] w-[10px] shrink-0'>
-                    <ChevronDown className='-rotate-90 absolute inset-0 h-[10px] w-[10px] transition-opacity duration-150 group-hover/cta:opacity-0' />
-                    <svg
-                      className='absolute inset-0 h-[10px] w-[10px] opacity-0 transition-opacity duration-150 group-hover/cta:opacity-100'
-                      viewBox='0 0 10 10'
+                  <svg
+                    className='h-[10px] w-[10px] shrink-0'
+                    viewBox='0 0 10 10'
+                    fill='none'
+                    xmlns='http://www.w3.org/2000/svg'
+                  >
+                    <line
+                      x1='0'
+                      y1='5'
+                      x2='9'
+                      y2='5'
+                      stroke='currentColor'
+                      strokeWidth='1.33'
+                      strokeLinecap='square'
+                      className='origin-left scale-x-0 transition-transform duration-200 ease-out [transform-box:fill-box] group-hover/cta:scale-x-100'
+                    />
+                    <path
+                      d='M3.5 2L6.5 5L3.5 8'
+                      stroke='currentColor'
+                      strokeWidth='1.33'
+                      strokeLinecap='square'
+                      strokeLinejoin='miter'
                       fill='none'
-                      xmlns='http://www.w3.org/2000/svg'
-                    >
-                      <path
-                        d='M1 5H8M5.5 2L8.5 5L5.5 8'
-                        stroke='currentColor'
-                        strokeWidth='1.33'
-                        strokeLinecap='square'
-                        strokeLinejoin='miter'
-                        fill='none'
-                      />
-                    </svg>
-                  </span>
+                      className='transition-transform duration-200 ease-out group-hover/cta:translate-x-[30%]'
+                    />
+                  </svg>
                 </button>
               </div>
             </div>
 
-            <div className='shrink-0'>
-              <div className='h-full lg:hidden'>
-                <DotGrid
-                  className='h-full w-[24px] overflow-hidden border-[var(--landing-bg-elevated)] border-l p-1'
-                  cols={2}
-                  rows={55}
-                  gap={4}
-                />
-              </div>
-              <div className='hidden h-full lg:block'>
-                <DotGrid
-                  className='h-full w-[80px] overflow-hidden border-[var(--landing-bg-elevated)] border-l p-1.5'
-                  cols={8}
-                  rows={55}
-                  gap={6}
-                />
-              </div>
-            </div>
+            <div
+              aria-hidden='true'
+              className='w-[24px] shrink-0 border-[var(--landing-bg-elevated)] border-l lg:w-16'
+            />
+          </div>
+
+          <div className='relative pb-[60px] lg:pb-[100px]'>
+            <div
+              aria-hidden='true'
+              className='absolute top-0 bottom-0 left-[calc(4rem-1px)] hidden w-px bg-[var(--landing-bg-elevated)] lg:block'
+            />
+            <div
+              aria-hidden='true'
+              className='absolute top-0 right-[calc(4rem-1px)] bottom-0 hidden w-px bg-[var(--landing-bg-elevated)] lg:block'
+            />
+            <div
+              aria-hidden='true'
+              className='absolute right-16 bottom-0 left-16 hidden h-px bg-[var(--landing-bg-elevated)] lg:block'
+            />
           </div>
         </div>
       </div>
diff --git a/apps/sim/app/(home)/components/testimonials/testimonials.tsx b/apps/sim/app/(landing)/components/testimonials/testimonials.tsx
similarity index 100%
rename from apps/sim/app/(home)/components/testimonials/testimonials.tsx
rename to apps/sim/app/(landing)/components/testimonials/testimonials.tsx
diff --git a/apps/sim/app/(landing)/integrations/data/integrations.json b/apps/sim/app/(landing)/integrations/data/integrations.json
index 32881c28d13..9db82b6d349 100644
--- a/apps/sim/app/(landing)/integrations/data/integrations.json
+++ b/apps/sim/app/(landing)/integrations/data/integrations.json
@@ -2327,9 +2327,17 @@
       {
         "name": "Delete Agent",
         "description": "Permanently delete a cloud agent. This action cannot be undone."
+      },
+      {
+        "name": "List Artifacts",
+        "description": "List generated artifact files for a cloud agent."
+      },
+      {
+        "name": "Download Artifact",
+        "description": "Download a generated artifact file from a cloud agent."
       }
     ],
-    "operationCount": 7,
+    "operationCount": 9,
     "triggers": [],
     "triggerCount": 0,
     "authType": "api-key",
diff --git a/apps/sim/app/(landing)/integrations/layout.tsx b/apps/sim/app/(landing)/integrations/layout.tsx
index b6cbbb8ca4a..23614abe122 100644
--- a/apps/sim/app/(landing)/integrations/layout.tsx
+++ b/apps/sim/app/(landing)/integrations/layout.tsx
@@ -1,7 +1,7 @@
 import { getNavBlogPosts } from '@/lib/blog/registry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export default async function IntegrationsLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
diff --git a/apps/sim/app/(home)/landing-analytics.tsx b/apps/sim/app/(landing)/landing-analytics.tsx
similarity index 100%
rename from apps/sim/app/(home)/landing-analytics.tsx
rename to apps/sim/app/(landing)/landing-analytics.tsx
diff --git a/apps/sim/app/(home)/landing.tsx b/apps/sim/app/(landing)/landing.tsx
similarity index 74%
rename from apps/sim/app/(home)/landing.tsx
rename to apps/sim/app/(landing)/landing.tsx
index 31e17a118d7..fd4b8eafc77 100644
--- a/apps/sim/app/(home)/landing.tsx
+++ b/apps/sim/app/(landing)/landing.tsx
@@ -3,7 +3,7 @@ import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
 import { season } from '@/app/_styles/fonts/season/season'
 import {
   Collaboration,
-  Enterprise,
+  // Enterprise,
   Features,
   Footer,
   Hero,
@@ -12,8 +12,8 @@ import {
   StructuredData,
   Templates,
   Testimonials,
-} from '@/app/(home)/components'
-import { LandingAnalytics } from '@/app/(home)/landing-analytics'
+} from '@/app/(landing)/components'
+import { LandingAnalytics } from '@/app/(landing)/landing-analytics'
 
 /**
  * Landing page root component.
@@ -52,13 +52,20 @@ export default async function Landing() {
         <Navbar blogPosts={blogPosts} />
       </header>
       <main id='main-content'>
-        <Hero />
-        <Templates />
-        <Features />
-        <Collaboration />
-        <Enterprise />
-        <Pricing />
-        <Testimonials />
+        <article itemScope itemType='https://schema.org/WebPage'>
+          <meta itemProp='name' content='Sim — Build AI Agents & Run Your Agentic Workforce' />
+          <meta
+            itemProp='description'
+            content='Sim is the open-source platform to build AI agents and run your agentic workforce.'
+          />
+          <Hero />
+          <Templates />
+          <Features />
+          <Collaboration />
+          {/* <Enterprise /> */}
+          <Pricing />
+          <Testimonials />
+        </article>
       </main>
       <Footer />
     </div>
diff --git a/apps/sim/app/(landing)/layout.tsx b/apps/sim/app/(landing)/layout.tsx
index 10e07b462fc..bb6ee982754 100644
--- a/apps/sim/app/(landing)/layout.tsx
+++ b/apps/sim/app/(landing)/layout.tsx
@@ -1,4 +1,6 @@
 import type { Metadata } from 'next'
+import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
+import { season } from '@/app/_styles/fonts/season/season'
 
 export const metadata: Metadata = {
   metadataBase: new URL('https://sim.ai'),
@@ -13,6 +15,15 @@ export const metadata: Metadata = {
   },
 }
 
+/**
+ * Landing page route-group layout.
+ *
+ * Applies landing-specific font CSS variables to the subtree:
+ * - `--font-season` (Season Sans): Headings and display text
+ * - `--font-martian-mono` (Martian Mono): Code snippets and technical accents
+ *
+ * Available to child components via Tailwind (`font-season`, `font-martian-mono`).
+ */
 export default function LandingLayout({ children }: { children: React.ReactNode }) {
-  return children
+  return <div className={`${season.variable} ${martianMono.variable}`}>{children}</div>
 }
diff --git a/apps/sim/app/(landing)/models/layout.tsx b/apps/sim/app/(landing)/models/layout.tsx
index ba600725d71..f211da54610 100644
--- a/apps/sim/app/(landing)/models/layout.tsx
+++ b/apps/sim/app/(landing)/models/layout.tsx
@@ -1,7 +1,7 @@
 import { getNavBlogPosts } from '@/lib/blog/registry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export default async function ModelsLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
diff --git a/apps/sim/app/(landing)/partners/page.tsx b/apps/sim/app/(landing)/partners/page.tsx
index c480a76d5a7..851d9486556 100644
--- a/apps/sim/app/(landing)/partners/page.tsx
+++ b/apps/sim/app/(landing)/partners/page.tsx
@@ -2,8 +2,8 @@ import type { Metadata } from 'next'
 import { getNavBlogPosts } from '@/lib/blog/registry'
 import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
 import { season } from '@/app/_styles/fonts/season/season'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export const metadata: Metadata = {
   title: 'Partner Program',
diff --git a/apps/sim/app/academy/(catalog)/layout.tsx b/apps/sim/app/academy/(catalog)/layout.tsx
index fb400ef2834..d6fd858b821 100644
--- a/apps/sim/app/academy/(catalog)/layout.tsx
+++ b/apps/sim/app/academy/(catalog)/layout.tsx
@@ -1,7 +1,7 @@
 import type React from 'react'
 import { getNavBlogPosts } from '@/lib/blog/registry'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export default async function AcademyCatalogLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
diff --git a/apps/sim/app/api/a2a/agents/route.ts b/apps/sim/app/api/a2a/agents/route.ts
index dee8bb59979..e1f82e81047 100644
--- a/apps/sim/app/api/a2a/agents/route.ts
+++ b/apps/sim/app/api/a2a/agents/route.ts
@@ -9,11 +9,11 @@ import { a2aAgent, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { generateSkillsFromWorkflow } from '@/lib/a2a/agent-card'
 import { A2A_DEFAULT_CAPABILITIES } from '@/lib/a2a/constants'
 import { sanitizeAgentName } from '@/lib/a2a/utils'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { hasValidStartBlockInState } from '@/lib/workflows/triggers/trigger-utils'
@@ -173,7 +173,7 @@ export async function POST(request: NextRequest) {
       skillTags
     )
 
-    const agentId = uuidv4()
+    const agentId = generateId()
     const agentName = name || sanitizeAgentName(wf.name)
 
     const [agent] = await db
diff --git a/apps/sim/app/api/a2a/serve/[agentId]/route.ts b/apps/sim/app/api/a2a/serve/[agentId]/route.ts
index e944de26ed7..1186ec4909d 100644
--- a/apps/sim/app/api/a2a/serve/[agentId]/route.ts
+++ b/apps/sim/app/api/a2a/serve/[agentId]/route.ts
@@ -4,7 +4,6 @@ import { a2aAgent, a2aPushNotificationConfig, a2aTask, workflow } from '@sim/db/
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { A2A_DEFAULT_TIMEOUT, A2A_MAX_HISTORY_LENGTH } from '@/lib/a2a/constants'
 import { notifyTaskStateChange } from '@/lib/a2a/push-notifications'
 import {
@@ -18,6 +17,7 @@ import { acquireLock, getRedisClient, releaseLock } from '@/lib/core/config/redi
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { markExecutionCancelled } from '@/lib/execution/cancellation'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
@@ -400,11 +400,11 @@ async function handleMessageSend(
 
   const message = params.message
   const taskId = message.taskId || generateTaskId()
-  const contextId = message.contextId || uuidv4()
+  const contextId = message.contextId || generateId()
 
   // Distributed lock to prevent concurrent task processing
   const lockKey = `a2a:task:${taskId}:lock`
-  const lockValue = uuidv4()
+  const lockValue = generateId()
   const acquired = await acquireLock(lockKey, lockValue, 60)
 
   if (!acquired) {
@@ -628,12 +628,12 @@ async function handleMessageStream(
   }
 
   const message = params.message
-  const contextId = message.contextId || uuidv4()
+  const contextId = message.contextId || generateId()
   const taskId = message.taskId || generateTaskId()
 
   // Distributed lock to prevent concurrent task processing
   const lockKey = `a2a:task:${taskId}:lock`
-  const lockValue = uuidv4()
+  const lockValue = generateId()
   const acquired = await acquireLock(lockKey, lockValue, 300)
 
   if (!acquired) {
@@ -1427,7 +1427,7 @@ async function handlePushNotificationSet(
       .where(eq(a2aPushNotificationConfig.id, existingConfig.id))
   } else {
     await db.insert(a2aPushNotificationConfig).values({
-      id: uuidv4(),
+      id: generateId(),
       taskId: params.id,
       url: config.url,
       token: config.token || null,
diff --git a/apps/sim/app/api/a2a/serve/[agentId]/utils.ts b/apps/sim/app/api/a2a/serve/[agentId]/utils.ts
index f46013343e2..e3fdd88f5ca 100644
--- a/apps/sim/app/api/a2a/serve/[agentId]/utils.ts
+++ b/apps/sim/app/api/a2a/serve/[agentId]/utils.ts
@@ -1,7 +1,7 @@
 import type { Artifact, Message, PushNotificationConfig, Task, TaskState } from '@a2a-js/sdk'
-import { v4 as uuidv4 } from 'uuid'
 import { generateInternalToken } from '@/lib/auth/internal'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 
 /** A2A v0.3 JSON-RPC method names */
 export const A2A_METHODS = {
@@ -85,7 +85,7 @@ export function isJSONRPCRequest(obj: unknown): obj is JSONRPCRequest {
 }
 
 export function generateTaskId(): string {
-  return uuidv4()
+  return generateId()
 }
 
 export function createTaskStatus(state: TaskState): { state: TaskState; timestamp: string } {
diff --git a/apps/sim/app/api/academy/certificates/route.ts b/apps/sim/app/api/academy/certificates/route.ts
index b511e8b32b7..0164e1424e3 100644
--- a/apps/sim/app/api/academy/certificates/route.ts
+++ b/apps/sim/app/api/academy/certificates/route.ts
@@ -2,7 +2,6 @@ import { db } from '@sim/db'
 import { academyCertificate, user } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getCourseById } from '@/lib/academy/content'
@@ -10,6 +9,7 @@ import type { CertificateMetadata } from '@/lib/academy/types'
 import { getSession } from '@/lib/auth'
 import type { TokenBucketConfig } from '@/lib/core/rate-limiter'
 import { RateLimiter } from '@/lib/core/rate-limiter'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('AcademyCertificatesAPI')
 
@@ -106,7 +106,7 @@ export async function POST(req: NextRequest) {
     const [certificate] = await db
       .insert(academyCertificate)
       .values({
-        id: nanoid(),
+        id: generateShortId(),
         userId: session.user.id,
         courseId,
         status: 'active',
@@ -211,5 +211,5 @@ export async function GET(req: NextRequest) {
 /** Generates a human-readable certificate number, e.g. SIM-2026-A3K9XZ2P */
 function generateCertificateNumber(): string {
   const year = new Date().getFullYear()
-  return `SIM-${year}-${nanoid(8).toUpperCase()}`
+  return `SIM-${year}-${generateShortId(8).toUpperCase()}`
 }
diff --git a/apps/sim/app/api/auth/shopify/authorize/route.ts b/apps/sim/app/api/auth/shopify/authorize/route.ts
index daa6dfecf06..0607f7c8cfb 100644
--- a/apps/sim/app/api/auth/shopify/authorize/route.ts
+++ b/apps/sim/app/api/auth/shopify/authorize/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { env } from '@/lib/core/config/env'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('ShopifyAuthorize')
 
@@ -161,7 +162,7 @@ export async function GET(request: NextRequest) {
     const baseUrl = getBaseUrl()
     const redirectUri = `${baseUrl}/api/auth/oauth2/callback/shopify`
 
-    const state = crypto.randomUUID()
+    const state = generateId()
 
     const oauthUrl =
       `https://${cleanShop}/admin/oauth/authorize?` +
diff --git a/apps/sim/app/api/chat/[identifier]/otp/route.ts b/apps/sim/app/api/chat/[identifier]/otp/route.ts
index 4d2358fcf5b..2c0ccde08ee 100644
--- a/apps/sim/app/api/chat/[identifier]/otp/route.ts
+++ b/apps/sim/app/api/chat/[identifier]/otp/route.ts
@@ -1,4 +1,4 @@
-import { randomInt, randomUUID } from 'crypto'
+import { randomInt } from 'crypto'
 import { db } from '@sim/db'
 import { chat, verification } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -10,6 +10,7 @@ import { getRedisClient } from '@/lib/core/config/redis'
 import { addCorsHeaders, isEmailAllowed } from '@/lib/core/security/deployment'
 import { getStorageMethod } from '@/lib/core/storage'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { setChatAuthCookie } from '@/app/api/chat/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
@@ -61,7 +62,7 @@ async function storeOTP(email: string, chatId: string, otp: string): Promise<voi
     await db.transaction(async (tx) => {
       await tx.delete(verification).where(eq(verification.identifier, identifier))
       await tx.insert(verification).values({
-        id: randomUUID(),
+        id: generateId(),
         identifier,
         value,
         expiresAt,
diff --git a/apps/sim/app/api/chat/[identifier]/route.ts b/apps/sim/app/api/chat/[identifier]/route.ts
index 024f5ff7e38..3f6e14a41f7 100644
--- a/apps/sim/app/api/chat/[identifier]/route.ts
+++ b/apps/sim/app/api/chat/[identifier]/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { chat, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -7,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { addCorsHeaders, validateAuthToken } from '@/lib/core/security/deployment'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { ChatFiles } from '@/lib/uploads'
@@ -103,7 +103,7 @@ export async function POST(
         )
       }
 
-      const executionId = randomUUID()
+      const executionId = generateId()
       const loggingSession = new LoggingSession(
         deployment.workflowId,
         executionId,
@@ -150,7 +150,7 @@ export async function POST(
       return addCorsHeaders(createErrorResponse('No input provided', 400), request)
     }
 
-    const executionId = randomUUID()
+    const executionId = generateId()
 
     const loggingSession = new LoggingSession(deployment.workflowId, executionId, 'chat', requestId)
 
diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts
index 647f0058528..bc9f736f52b 100644
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -27,6 +27,7 @@ import {
   createRequestTracker,
   createUnauthorizedResponse,
 } from '@/lib/copilot/request-helpers'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import {
   authorizeWorkflowByWorkspacePermission,
@@ -205,7 +206,7 @@ export async function POST(req: NextRequest) {
       }
     )
 
-    const userMessageIdToUse = userMessageId || crypto.randomUUID()
+    const userMessageIdToUse = userMessageId || generateId()
     const reqLogger = logger.withMetadata({
       requestId: tracker.requestId,
       messageId: userMessageIdToUse,
@@ -406,8 +407,8 @@ export async function POST(req: NextRequest) {
     }
 
     if (stream) {
-      const executionId = crypto.randomUUID()
-      const runId = crypto.randomUUID()
+      const executionId = generateId()
+      const runId = generateId()
       const sseStream = createSSEStream({
         requestPayload,
         userId: authenticatedUserId,
@@ -437,7 +438,7 @@ export async function POST(req: NextRequest) {
             if (!result.success) return
 
             const assistantMessage: Record<string, unknown> = {
-              id: crypto.randomUUID(),
+              id: generateId(),
               role: 'assistant' as const,
               content: result.content,
               timestamp: new Date().toISOString(),
@@ -515,8 +516,8 @@ export async function POST(req: NextRequest) {
       return new Response(sseStream, { headers: SSE_RESPONSE_HEADERS })
     }
 
-    const nsExecutionId = crypto.randomUUID()
-    const nsRunId = crypto.randomUUID()
+    const nsExecutionId = generateId()
+    const nsRunId = generateId()
 
     if (actualChatId) {
       await createRunSegment({
@@ -576,7 +577,7 @@ export async function POST(req: NextRequest) {
       }
 
       const assistantMessage = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         role: 'assistant',
         content: responseData.content,
         timestamp: new Date().toISOString(),
diff --git a/apps/sim/app/api/creators/route.ts b/apps/sim/app/api/creators/route.ts
index 843c0aea494..6dedd133af1 100644
--- a/apps/sim/app/api/creators/route.ts
+++ b/apps/sim/app/api/creators/route.ts
@@ -3,10 +3,10 @@ import { member, templateCreators } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 
 const logger = createLogger('CreatorProfilesAPI')
@@ -147,7 +147,7 @@ export async function POST(request: NextRequest) {
     }
 
     // Create the profile
-    const profileId = uuidv4()
+    const profileId = generateId()
     const now = new Date()
 
     const details: CreatorProfileDetails = {}
diff --git a/apps/sim/app/api/credential-sets/[id]/invite/route.ts b/apps/sim/app/api/credential-sets/[id]/invite/route.ts
index 9fcf13d2127..cd5ebb53015 100644
--- a/apps/sim/app/api/credential-sets/[id]/invite/route.ts
+++ b/apps/sim/app/api/credential-sets/[id]/invite/route.ts
@@ -9,6 +9,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { hasCredentialSetsAccess } from '@/lib/billing'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 
 const logger = createLogger('CredentialSetInvite')
@@ -105,12 +106,12 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
     const body = await req.json()
     const { email } = createInviteSchema.parse(body)
 
-    const token = crypto.randomUUID()
+    const token = generateId()
     const expiresAt = new Date()
     expiresAt.setDate(expiresAt.getDate() + 7)
 
     const invitation = {
-      id: crypto.randomUUID(),
+      id: generateId(),
       credentialSetId: id,
       email: email || null,
       token,
diff --git a/apps/sim/app/api/credential-sets/[id]/members/route.ts b/apps/sim/app/api/credential-sets/[id]/members/route.ts
index 2799feb784b..e6ffbaa6262 100644
--- a/apps/sim/app/api/credential-sets/[id]/members/route.ts
+++ b/apps/sim/app/api/credential-sets/[id]/members/route.ts
@@ -6,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { hasCredentialSetsAccess } from '@/lib/billing'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncAllWebhooksForCredentialSet } from '@/lib/webhooks/utils.server'
 
 const logger = createLogger('CredentialSetMembers')
@@ -167,7 +168,7 @@ export async function DELETE(req: NextRequest, { params }: { params: Promise<{ i
       return NextResponse.json({ error: 'Member not found' }, { status: 404 })
     }
 
-    const requestId = crypto.randomUUID().slice(0, 8)
+    const requestId = generateId().slice(0, 8)
 
     // Use transaction to ensure member deletion + webhook sync are atomic
     await db.transaction(async (tx) => {
diff --git a/apps/sim/app/api/credential-sets/invite/[token]/route.ts b/apps/sim/app/api/credential-sets/invite/[token]/route.ts
index b85c65fed5a..656d39fdde1 100644
--- a/apps/sim/app/api/credential-sets/invite/[token]/route.ts
+++ b/apps/sim/app/api/credential-sets/invite/[token]/route.ts
@@ -10,6 +10,7 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncAllWebhooksForCredentialSet } from '@/lib/webhooks/utils.server'
 
 const logger = createLogger('CredentialSetInviteToken')
@@ -125,11 +126,11 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ tok
     }
 
     const now = new Date()
-    const requestId = crypto.randomUUID().slice(0, 8)
+    const requestId = generateId().slice(0, 8)
 
     await db.transaction(async (tx) => {
       await tx.insert(credentialSetMember).values({
-        id: crypto.randomUUID(),
+        id: generateId(),
         credentialSetId: invitation.credentialSetId,
         userId: session.user.id,
         status: 'active',
diff --git a/apps/sim/app/api/credential-sets/memberships/route.ts b/apps/sim/app/api/credential-sets/memberships/route.ts
index 045d68ad1ba..aef704f7b9c 100644
--- a/apps/sim/app/api/credential-sets/memberships/route.ts
+++ b/apps/sim/app/api/credential-sets/memberships/route.ts
@@ -5,6 +5,7 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncAllWebhooksForCredentialSet } from '@/lib/webhooks/utils.server'
 
 const logger = createLogger('CredentialSetMemberships')
@@ -60,7 +61,7 @@ export async function DELETE(req: NextRequest) {
   }
 
   try {
-    const requestId = crypto.randomUUID().slice(0, 8)
+    const requestId = generateId().slice(0, 8)
 
     // Use transaction to ensure revocation + webhook sync are atomic
     await db.transaction(async (tx) => {
diff --git a/apps/sim/app/api/credential-sets/route.ts b/apps/sim/app/api/credential-sets/route.ts
index 1cfa30acf0a..b5166630af9 100644
--- a/apps/sim/app/api/credential-sets/route.ts
+++ b/apps/sim/app/api/credential-sets/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { hasCredentialSetsAccess } from '@/lib/billing'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('CredentialSets')
 
@@ -150,7 +151,7 @@ export async function POST(req: Request) {
 
     const now = new Date()
     const newCredentialSet = {
-      id: crypto.randomUUID(),
+      id: generateId(),
       organizationId,
       name,
       description: description || null,
diff --git a/apps/sim/app/api/credentials/[id]/members/route.ts b/apps/sim/app/api/credentials/[id]/members/route.ts
index 11cee7f7177..c89657fe89f 100644
--- a/apps/sim/app/api/credentials/[id]/members/route.ts
+++ b/apps/sim/app/api/credentials/[id]/members/route.ts
@@ -5,6 +5,7 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('CredentialMembersAPI')
@@ -133,7 +134,7 @@ export async function POST(request: NextRequest, context: RouteContext) {
     }
 
     await db.insert(credentialMember).values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       credentialId,
       userId,
       role,
diff --git a/apps/sim/app/api/credentials/[id]/route.ts b/apps/sim/app/api/credentials/[id]/route.ts
index b86031bf2f3..14f2e73142b 100644
--- a/apps/sim/app/api/credentials/[id]/route.ts
+++ b/apps/sim/app/api/credentials/[id]/route.ts
@@ -6,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { encryptSecret } from '@/lib/core/security/encryption'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getCredentialActorContext } from '@/lib/credentials/access'
 import {
   syncPersonalEnvCredentialsForUser,
@@ -273,7 +274,7 @@ export async function DELETE(
       await db
         .insert(workspaceEnvironment)
         .values({
-          id: workspaceRow?.id || crypto.randomUUID(),
+          id: workspaceRow?.id || generateId(),
           workspaceId: access.credential.workspaceId,
           variables: current,
           createdAt: workspaceRow?.createdAt || new Date(),
diff --git a/apps/sim/app/api/credentials/draft/route.ts b/apps/sim/app/api/credentials/draft/route.ts
index ac700f088ed..e00be23b0d0 100644
--- a/apps/sim/app/api/credentials/draft/route.ts
+++ b/apps/sim/app/api/credentials/draft/route.ts
@@ -5,6 +5,7 @@ import { and, eq, lt } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('CredentialDraftAPI')
@@ -75,7 +76,7 @@ export async function POST(request: Request) {
     await db
       .insert(pendingCredentialDraft)
       .values({
-        id: crypto.randomUUID(),
+        id: generateId(),
         userId,
         workspaceId,
         providerId,
diff --git a/apps/sim/app/api/credentials/route.ts b/apps/sim/app/api/credentials/route.ts
index 9242a620fa2..7d30b63d7b4 100644
--- a/apps/sim/app/api/credentials/route.ts
+++ b/apps/sim/app/api/credentials/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getWorkspaceMemberUserIds } from '@/lib/credentials/environment'
 import { syncWorkspaceOAuthCredentialsForUser } from '@/lib/credentials/oauth'
 import { getServiceConfigByProviderId } from '@/lib/oauth'
@@ -536,7 +537,7 @@ export async function POST(request: NextRequest) {
     }
 
     const now = new Date()
-    const credentialId = crypto.randomUUID()
+    const credentialId = generateId()
     const [workspaceRow] = await db
       .select({ ownerId: workspace.ownerId })
       .from(workspace)
@@ -565,7 +566,7 @@ export async function POST(request: NextRequest) {
         if (workspaceUserIds.length > 0) {
           for (const memberUserId of workspaceUserIds) {
             await tx.insert(credentialMember).values({
-              id: crypto.randomUUID(),
+              id: generateId(),
               credentialId,
               userId: memberUserId,
               role:
@@ -582,7 +583,7 @@ export async function POST(request: NextRequest) {
         }
       } else {
         await tx.insert(credentialMember).values({
-          id: crypto.randomUUID(),
+          id: generateId(),
           credentialId,
           userId: session.user.id,
           role: 'admin',
diff --git a/apps/sim/app/api/demo-requests/route.ts b/apps/sim/app/api/demo-requests/route.ts
index f53d0359f87..16b6e24217d 100644
--- a/apps/sim/app/api/demo-requests/route.ts
+++ b/apps/sim/app/api/demo-requests/route.ts
@@ -10,8 +10,7 @@ import { getFromEmailAddress } from '@/lib/messaging/email/utils'
 import {
   demoRequestSchema,
   getDemoRequestCompanySizeLabel,
-  getDemoRequestRegionLabel,
-} from '@/app/(home)/components/demo-request/consts'
+} from '@/app/(landing)/components/demo-request/consts'
 
 const logger = createLogger('DemoRequestAPI')
 const rateLimiter = new RateLimiter()
@@ -58,12 +57,11 @@ export async function POST(req: NextRequest) {
       )
     }
 
-    const { firstName, lastName, companyEmail, phoneNumber, region, companySize, details } =
+    const { firstName, lastName, companyEmail, phoneNumber, companySize, details } =
       validationResult.data
 
     logger.info(`[${requestId}] Processing demo request`, {
       email: `${companyEmail.substring(0, 3)}***`,
-      region,
       companySize,
     })
 
@@ -72,7 +70,6 @@ Submitted: ${new Date().toISOString()}
 Name: ${firstName} ${lastName}
 Email: ${companyEmail}
 Phone: ${phoneNumber ?? 'Not provided'}
-Region: ${getDemoRequestRegionLabel(region)}
 Company size: ${getDemoRequestCompanySizeLabel(companySize)}
 
 Details:
diff --git a/apps/sim/app/api/environment/route.ts b/apps/sim/app/api/environment/route.ts
index 39c91668f61..34195a055dd 100644
--- a/apps/sim/app/api/environment/route.ts
+++ b/apps/sim/app/api/environment/route.ts
@@ -8,6 +8,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncPersonalEnvCredentialsForUser } from '@/lib/credentials/environment'
 import type { EnvironmentVariable } from '@/stores/settings/environment'
 
@@ -42,7 +43,7 @@ export async function POST(req: NextRequest) {
       await db
         .insert(environment)
         .values({
-          id: crypto.randomUUID(),
+          id: generateId(),
           userId: session.user.id,
           variables: encryptedVariables,
           updatedAt: new Date(),
diff --git a/apps/sim/app/api/files/delete/route.test.ts b/apps/sim/app/api/files/delete/route.test.ts
index 77582be7df0..85ea1913565 100644
--- a/apps/sim/app/api/files/delete/route.test.ts
+++ b/apps/sim/app/api/files/delete/route.test.ts
@@ -82,8 +82,12 @@ vi.mock('drizzle-orm', () => ({
   sql: vi.fn((strings: unknown, ...values: unknown[]) => ({ type: 'sql', sql: strings, values })),
 }))
 
-vi.mock('uuid', () => ({
-  v4: vi.fn().mockReturnValue('test-uuid'),
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: vi.fn(() => 'test-uuid'),
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 vi.mock('@/lib/auth', () => ({
diff --git a/apps/sim/app/api/files/upload/route.test.ts b/apps/sim/app/api/files/upload/route.test.ts
index 75c387b6a52..5f3d9064c9f 100644
--- a/apps/sim/app/api/files/upload/route.test.ts
+++ b/apps/sim/app/api/files/upload/route.test.ts
@@ -91,8 +91,12 @@ vi.mock('drizzle-orm', () => ({
   sql: vi.fn((strings: unknown, ...values: unknown[]) => ({ type: 'sql', sql: strings, values })),
 }))
 
-vi.mock('uuid', () => ({
-  v4: vi.fn().mockReturnValue('test-uuid'),
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: vi.fn(() => 'test-uuid'),
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 vi.mock('@/lib/auth', () => ({
@@ -458,10 +462,10 @@ describe('File Upload Security Tests', () => {
       expect(response.status).toBe(200)
     })
 
-    it('should reject JavaScript files', async () => {
+    it('should reject unsupported file types', async () => {
       const formData = new FormData()
-      const maliciousJs = 'alert("XSS")'
-      const file = new File([maliciousJs], 'malicious.js', { type: 'application/javascript' })
+      const content = 'binary data'
+      const file = new File([content], 'archive.exe', { type: 'application/octet-stream' })
       formData.append('file', file)
       formData.append('context', 'workspace')
       formData.append('workspaceId', 'test-workspace-id')
@@ -475,7 +479,7 @@ describe('File Upload Security Tests', () => {
 
       expect(response.status).toBe(400)
       const data = await response.json()
-      expect(data.message).toContain("File type 'js' is not allowed")
+      expect(data.message).toContain("File type 'exe' is not allowed")
     })
 
     it('should reject files without extensions', async () => {
diff --git a/apps/sim/app/api/files/upload/route.ts b/apps/sim/app/api/files/upload/route.ts
index 387a2ccee82..b6791a3841b 100644
--- a/apps/sim/app/api/files/upload/route.ts
+++ b/apps/sim/app/api/files/upload/route.ts
@@ -8,6 +8,7 @@ import { generateWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/works
 import { isImageFileType } from '@/lib/uploads/utils/file-utils'
 import {
   SUPPORTED_AUDIO_EXTENSIONS,
+  SUPPORTED_CODE_EXTENSIONS,
   SUPPORTED_DOCUMENT_EXTENSIONS,
   SUPPORTED_VIDEO_EXTENSIONS,
   validateFileType,
@@ -23,6 +24,7 @@ const IMAGE_EXTENSIONS = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg'] as const
 
 const ALLOWED_EXTENSIONS = new Set<string>([
   ...SUPPORTED_DOCUMENT_EXTENSIONS,
+  ...SUPPORTED_CODE_EXTENSIONS,
   ...IMAGE_EXTENSIONS,
   ...SUPPORTED_AUDIO_EXTENSIONS,
   ...SUPPORTED_VIDEO_EXTENSIONS,
diff --git a/apps/sim/app/api/folders/[id]/duplicate/route.ts b/apps/sim/app/api/folders/[id]/duplicate/route.ts
index e59cc943d15..be6cea9d429 100644
--- a/apps/sim/app/api/folders/[id]/duplicate/route.ts
+++ b/apps/sim/app/api/folders/[id]/duplicate/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { duplicateWorkflow } from '@/lib/workflows/persistence/duplicate'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
@@ -67,7 +68,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
     const targetWorkspaceId = workspaceId || sourceFolder.workspaceId
 
     const { newFolderId, folderMapping } = await db.transaction(async (tx) => {
-      const newFolderId = clientNewId || crypto.randomUUID()
+      const newFolderId = clientNewId || generateId()
       const now = new Date()
       const targetParentId = parentId ?? sourceFolder.parentId
 
@@ -227,7 +228,7 @@ async function duplicateFolderStructure(
     )
 
   for (const childFolder of childFolders) {
-    const newChildFolderId = crypto.randomUUID()
+    const newChildFolderId = generateId()
     folderMapping.set(childFolder.id, newChildFolderId)
 
     await tx.insert(workflowFolder).values({
diff --git a/apps/sim/app/api/folders/route.ts b/apps/sim/app/api/folders/route.ts
index a8106463d06..bd33a93caf6 100644
--- a/apps/sim/app/api/folders/route.ts
+++ b/apps/sim/app/api/folders/route.ts
@@ -6,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
@@ -92,7 +93,7 @@ export async function POST(request: NextRequest) {
       )
     }
 
-    const id = clientId || crypto.randomUUID()
+    const id = clientId || generateId()
 
     const newFolder = await db.transaction(async (tx) => {
       let sortOrder: number
diff --git a/apps/sim/app/api/form/[identifier]/route.ts b/apps/sim/app/api/form/[identifier]/route.ts
index 986a77610d8..f69ab9e1886 100644
--- a/apps/sim/app/api/form/[identifier]/route.ts
+++ b/apps/sim/app/api/form/[identifier]/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { form, workflow, workflowBlocks } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -7,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { addCorsHeaders, validateAuthToken } from '@/lib/core/security/deployment'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
@@ -119,7 +119,7 @@ export async function POST(
         )
       }
 
-      const executionId = randomUUID()
+      const executionId = generateId()
       const loggingSession = new LoggingSession(
         deployment.workflowId,
         executionId,
@@ -165,7 +165,7 @@ export async function POST(
       return addCorsHeaders(createErrorResponse('No form data provided', 400), request)
     }
 
-    const executionId = randomUUID()
+    const executionId = generateId()
     const loggingSession = new LoggingSession(deployment.workflowId, executionId, 'form', requestId)
 
     const preprocessResult = await preprocessExecution({
diff --git a/apps/sim/app/api/form/route.ts b/apps/sim/app/api/form/route.ts
index 3becf417a44..6512ba95808 100644
--- a/apps/sim/app/api/form/route.ts
+++ b/apps/sim/app/api/form/route.ts
@@ -3,13 +3,13 @@ import { form } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { isDev } from '@/lib/core/config/feature-flags'
 import { encryptSecret } from '@/lib/core/security/encryption'
 import { getEmailDomain } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { deployWorkflow } from '@/lib/workflows/persistence/utils'
 import {
   checkWorkflowAccessForFormCreation,
@@ -158,7 +158,7 @@ export async function POST(request: NextRequest) {
         encryptedPassword = encrypted
       }
 
-      const id = uuidv4()
+      const id = generateId()
 
       logger.info('Creating form deployment with values:', {
         workflowId,
diff --git a/apps/sim/app/api/knowledge/[id]/connectors/route.ts b/apps/sim/app/api/knowledge/[id]/connectors/route.ts
index 92bd8013ee9..b5e2cb86f46 100644
--- a/apps/sim/app/api/knowledge/[id]/connectors/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/connectors/route.ts
@@ -9,6 +9,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { hasLiveSyncAccess } from '@/lib/billing/core/subscription'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { dispatchSync } from '@/lib/knowledge/connectors/sync-engine'
 import { allocateTagSlots } from '@/lib/knowledge/constants'
 import { createTagDefinition } from '@/lib/knowledge/tags/service'
@@ -211,7 +212,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     }
 
     const now = new Date()
-    const connectorId = crypto.randomUUID()
+    const connectorId = generateId()
     const nextSyncAt =
       syncIntervalMinutes > 0 ? new Date(now.getTime() + syncIntervalMinutes * 60 * 1000) : null
 
diff --git a/apps/sim/app/api/knowledge/[id]/documents/[documentId]/chunks/[chunkId]/route.ts b/apps/sim/app/api/knowledge/[id]/documents/[documentId]/chunks/[chunkId]/route.ts
index aae50974041..b992ca4b4fe 100644
--- a/apps/sim/app/api/knowledge/[id]/documents/[documentId]/chunks/[chunkId]/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/documents/[documentId]/chunks/[chunkId]/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { deleteChunk, updateChunk } from '@/lib/knowledge/chunks/service'
 import { checkChunkAccess } from '@/app/api/knowledge/utils'
 
@@ -17,7 +17,7 @@ export async function GET(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; documentId: string; chunkId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, documentId, chunkId } = await params
 
   try {
@@ -65,7 +65,7 @@ export async function PUT(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; documentId: string; chunkId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, documentId, chunkId } = await params
 
   try {
@@ -147,7 +147,7 @@ export async function DELETE(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; documentId: string; chunkId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, documentId, chunkId } = await params
 
   try {
diff --git a/apps/sim/app/api/knowledge/[id]/documents/[documentId]/tag-definitions/route.ts b/apps/sim/app/api/knowledge/[id]/documents/[documentId]/tag-definitions/route.ts
index e228255cd90..b60638907b4 100644
--- a/apps/sim/app/api/knowledge/[id]/documents/[documentId]/tag-definitions/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/documents/[documentId]/tag-definitions/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/constants'
 import {
   cleanupUnusedTagDefinitions,
@@ -34,7 +34,7 @@ export async function GET(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; documentId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, documentId } = await params
 
   try {
@@ -79,7 +79,7 @@ export async function POST(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; documentId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, documentId } = await params
 
   try {
@@ -160,7 +160,7 @@ export async function DELETE(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; documentId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, documentId } = await params
   const { searchParams } = new URL(req.url)
   const action = searchParams.get('action') // 'cleanup' or 'all'
diff --git a/apps/sim/app/api/knowledge/[id]/documents/route.ts b/apps/sim/app/api/knowledge/[id]/documents/route.ts
index 183ac757125..83056e8f486 100644
--- a/apps/sim/app/api/knowledge/[id]/documents/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/documents/route.ts
@@ -1,10 +1,10 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   bulkDocumentOperation,
   bulkDocumentOperationByFilter,
@@ -66,7 +66,7 @@ const BulkUpdateDocumentsSchema = z
   })
 
 export async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
@@ -164,7 +164,7 @@ export async function GET(req: NextRequest, { params }: { params: Promise<{ id:
 }
 
 export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
@@ -398,7 +398,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
 }
 
 export async function PATCH(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
diff --git a/apps/sim/app/api/knowledge/[id]/documents/upsert/route.ts b/apps/sim/app/api/knowledge/[id]/documents/upsert/route.ts
index 1b44c7a81fe..59be57cd610 100644
--- a/apps/sim/app/api/knowledge/[id]/documents/upsert/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/documents/upsert/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { document } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -7,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createDocumentRecords,
   deleteDocument,
@@ -35,7 +35,7 @@ const UpsertDocumentSchema = z.object({
 })
 
 export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
diff --git a/apps/sim/app/api/knowledge/[id]/next-available-slot/route.ts b/apps/sim/app/api/knowledge/[id]/next-available-slot/route.ts
index 54318d6f600..a2e5572f8bc 100644
--- a/apps/sim/app/api/knowledge/[id]/next-available-slot/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/next-available-slot/route.ts
@@ -1,7 +1,7 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getNextAvailableSlot, getTagDefinitions } from '@/lib/knowledge/tags/service'
 import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'
 
@@ -9,7 +9,7 @@ const logger = createLogger('NextAvailableSlotAPI')
 
 // GET /api/knowledge/[id]/next-available-slot - Get the next available tag slot for a knowledge base and field type
 export async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
   const { searchParams } = new URL(req.url)
   const fieldType = searchParams.get('fieldType')
diff --git a/apps/sim/app/api/knowledge/[id]/tag-definitions/[tagId]/route.ts b/apps/sim/app/api/knowledge/[id]/tag-definitions/[tagId]/route.ts
index 08b56be3e24..bb6f8d9b46e 100644
--- a/apps/sim/app/api/knowledge/[id]/tag-definitions/[tagId]/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/tag-definitions/[tagId]/route.ts
@@ -1,7 +1,7 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { deleteTagDefinition } from '@/lib/knowledge/tags/service'
 import { checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 
@@ -14,7 +14,7 @@ export async function DELETE(
   req: NextRequest,
   { params }: { params: Promise<{ id: string; tagId: string }> }
 ) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId, tagId } = await params
 
   try {
diff --git a/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts b/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
index f4e75b0f13c..57ad6c9fb2f 100644
--- a/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuthType, checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/constants'
 import { createTagDefinition, getTagDefinitions } from '@/lib/knowledge/tags/service'
 import { checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
@@ -13,7 +13,7 @@ const logger = createLogger('KnowledgeBaseTagDefinitionsAPI')
 
 // GET /api/knowledge/[id]/tag-definitions - Get all tag definitions for a knowledge base
 export async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
@@ -53,7 +53,7 @@ export async function GET(req: NextRequest, { params }: { params: Promise<{ id:
 
 // POST /api/knowledge/[id]/tag-definitions - Create a new tag definition
 export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
diff --git a/apps/sim/app/api/knowledge/[id]/tag-usage/route.ts b/apps/sim/app/api/knowledge/[id]/tag-usage/route.ts
index 8b311143ffb..3ba49402445 100644
--- a/apps/sim/app/api/knowledge/[id]/tag-usage/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/tag-usage/route.ts
@@ -1,7 +1,7 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getTagUsage } from '@/lib/knowledge/tags/service'
 import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'
 
@@ -11,7 +11,7 @@ const logger = createLogger('TagUsageAPI')
 
 // GET /api/knowledge/[id]/tag-usage - Get usage statistics for all tag definitions
 export async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const { id: knowledgeBaseId } = await params
 
   try {
diff --git a/apps/sim/app/api/mcp/copilot/route.ts b/apps/sim/app/api/mcp/copilot/route.ts
index b61dbc39806..f1377d5ad13 100644
--- a/apps/sim/app/api/mcp/copilot/route.ts
+++ b/apps/sim/app/api/mcp/copilot/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'
 import {
@@ -30,6 +29,7 @@ import { DIRECT_TOOL_DEFS, SUBAGENT_TOOL_DEFS } from '@/lib/copilot/tools/mcp/de
 import { env } from '@/lib/core/config/env'
 import { RateLimiter } from '@/lib/core/rate-limiter'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   authorizeWorkflowByWorkspacePermission,
   resolveWorkflowIdForUser,
@@ -638,7 +638,7 @@ async function handleDirectToolCall(
     )
 
     const toolCall = {
-      id: randomUUID(),
+      id: generateId(),
       name: toolDef.toolId,
       status: 'pending' as const,
       params: args as Record<string, any>,
@@ -715,7 +715,7 @@ async function handleBuildToolCall(
       }
     }
 
-    const chatId = randomUUID()
+    const chatId = generateId()
 
     const requestPayload = {
       message: requestText,
@@ -724,12 +724,12 @@ async function handleBuildToolCall(
       model: DEFAULT_COPILOT_MODEL,
       mode: 'agent',
       commands: ['fast'],
-      messageId: randomUUID(),
+      messageId: generateId(),
       chatId,
     }
 
-    const executionId = crypto.randomUUID()
-    const runId = crypto.randomUUID()
+    const executionId = generateId()
+    const runId = generateId()
     const messageId = requestPayload.messageId as string
 
     await createRunSegment({
diff --git a/apps/sim/app/api/mcp/servers/route.ts b/apps/sim/app/api/mcp/servers/route.ts
index 73c6f43fd56..054c7a3a2ca 100644
--- a/apps/sim/app/api/mcp/servers/route.ts
+++ b/apps/sim/app/api/mcp/servers/route.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   McpDnsResolutionError,
   McpDomainNotAllowedError,
@@ -102,7 +103,7 @@ export const POST = withMcpAuth('write')(
         throw e
       }
 
-      const serverId = body.url ? generateMcpServerId(workspaceId, body.url) : crypto.randomUUID()
+      const serverId = body.url ? generateMcpServerId(workspaceId, body.url) : generateId()
 
       const [existingServer] = await db
         .select({ id: mcpServers.id, deletedAt: mcpServers.deletedAt })
diff --git a/apps/sim/app/api/mcp/workflow-servers/[id]/tools/route.ts b/apps/sim/app/api/mcp/workflow-servers/[id]/tools/route.ts
index b0887aef1f8..1a4687b44fc 100644
--- a/apps/sim/app/api/mcp/workflow-servers/[id]/tools/route.ts
+++ b/apps/sim/app/api/mcp/workflow-servers/[id]/tools/route.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getParsedBody, withMcpAuth } from '@/lib/mcp/middleware'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
 import { createMcpErrorResponse, createMcpSuccessResponse } from '@/lib/mcp/utils'
@@ -193,7 +194,7 @@ export const POST = withMcpAuth<RouteParams>('write')(
           ? body.parameterSchema
           : await generateParameterSchemaForWorkflow(body.workflowId)
 
-      const toolId = crypto.randomUUID()
+      const toolId = generateId()
       const [tool] = await db
         .insert(workflowMcpTool)
         .values({
diff --git a/apps/sim/app/api/mcp/workflow-servers/route.ts b/apps/sim/app/api/mcp/workflow-servers/route.ts
index 185c551b271..84d431fa423 100644
--- a/apps/sim/app/api/mcp/workflow-servers/route.ts
+++ b/apps/sim/app/api/mcp/workflow-servers/route.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq, inArray, isNull, sql } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getParsedBody, withMcpAuth } from '@/lib/mcp/middleware'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
 import { createMcpErrorResponse, createMcpSuccessResponse } from '@/lib/mcp/utils'
@@ -112,7 +113,7 @@ export const POST = withMcpAuth('write')(
         )
       }
 
-      const serverId = crypto.randomUUID()
+      const serverId = generateId()
 
       const [server] = await db
         .insert(workflowMcpServer)
@@ -168,7 +169,7 @@ export const POST = withMcpAuth('write')(
 
           const parameterSchema = await generateParameterSchemaForWorkflow(workflowRecord.id)
 
-          const toolId = crypto.randomUUID()
+          const toolId = generateId()
           await db.insert(workflowMcpTool).values({
             id: toolId,
             serverId,
diff --git a/apps/sim/app/api/memory/route.ts b/apps/sim/app/api/memory/route.ts
index c5a4638d7c4..82ffffe6963 100644
--- a/apps/sim/app/api/memory/route.ts
+++ b/apps/sim/app/api/memory/route.ts
@@ -5,6 +5,7 @@ import { and, eq, isNull, like } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('MemoryAPI')
@@ -163,7 +164,7 @@ export async function POST(request: NextRequest) {
 
     const initialData = Array.isArray(data) ? data : [data]
     const now = new Date()
-    const id = `mem_${crypto.randomUUID().replace(/-/g, '')}`
+    const id = `mem_${generateId().replace(/-/g, '')}`
 
     const { sql } = await import('drizzle-orm')
 
diff --git a/apps/sim/app/api/mothership/chat/route.ts b/apps/sim/app/api/mothership/chat/route.ts
index 6accb899a1a..9f567244fb3 100644
--- a/apps/sim/app/api/mothership/chat/route.ts
+++ b/apps/sim/app/api/mothership/chat/route.ts
@@ -17,6 +17,7 @@ import { processContextsServer, resolveActiveResourceContext } from '@/lib/copil
 import { createRequestTracker, createUnauthorizedResponse } from '@/lib/copilot/request-helpers'
 import { taskPubSub } from '@/lib/copilot/task-events'
 import { generateWorkspaceContext } from '@/lib/copilot/workspace-context'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   assertActiveWorkspaceAccess,
   getUserEntityPermissions,
@@ -109,7 +110,7 @@ export async function POST(req: NextRequest) {
       userTimezone,
     } = MothershipMessageSchema.parse(body)
 
-    const userMessageId = providedMessageId || crypto.randomUUID()
+    const userMessageId = providedMessageId || generateId()
     userMessageIdForLogs = userMessageId
     const reqLogger = logger.withMetadata({
       requestId: tracker.requestId,
@@ -280,8 +281,8 @@ export async function POST(req: NextRequest) {
       }
     }
 
-    const executionId = crypto.randomUUID()
-    const runId = crypto.randomUUID()
+    const executionId = generateId()
+    const runId = generateId()
     const stream = createSSEStream({
       requestPayload,
       userId: authenticatedUserId,
@@ -310,7 +311,7 @@ export async function POST(req: NextRequest) {
           if (!result.success) return
 
           const assistantMessage: Record<string, unknown> = {
-            id: crypto.randomUUID(),
+            id: generateId(),
             role: 'assistant' as const,
             content: result.content,
             timestamp: new Date().toISOString(),
diff --git a/apps/sim/app/api/mothership/chat/stop/route.ts b/apps/sim/app/api/mothership/chat/stop/route.ts
index 8eb5185ff1e..70dc1df7c87 100644
--- a/apps/sim/app/api/mothership/chat/stop/route.ts
+++ b/apps/sim/app/api/mothership/chat/stop/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { releasePendingChatStream } from '@/lib/copilot/chat-streaming'
 import { taskPubSub } from '@/lib/copilot/task-events'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('MothershipChatStopAPI')
 
@@ -71,7 +72,7 @@ export async function POST(req: NextRequest) {
 
     if (hasContent || hasBlocks) {
       const assistantMessage: Record<string, unknown> = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         role: 'assistant' as const,
         content,
         timestamp: new Date().toISOString(),
diff --git a/apps/sim/app/api/mothership/execute/route.ts b/apps/sim/app/api/mothership/execute/route.ts
index 0570a808e45..619e0135726 100644
--- a/apps/sim/app/api/mothership/execute/route.ts
+++ b/apps/sim/app/api/mothership/execute/route.ts
@@ -6,6 +6,7 @@ import { createRunSegment } from '@/lib/copilot/async-runs/repository'
 import { buildIntegrationToolSchemas } from '@/lib/copilot/chat-payload'
 import { orchestrateCopilotStream } from '@/lib/copilot/orchestrator'
 import { generateWorkspaceContext } from '@/lib/copilot/workspace-context'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   assertActiveWorkspaceAccess,
   getUserEntityPermissions,
@@ -50,8 +51,8 @@ export async function POST(req: NextRequest) {
 
     await assertActiveWorkspaceAccess(workspaceId, userId)
 
-    const effectiveChatId = chatId || crypto.randomUUID()
-    messageId = crypto.randomUUID()
+    const effectiveChatId = chatId || generateId()
+    messageId = generateId()
     const reqLogger = logger.withMetadata({ messageId })
     const [workspaceContext, integrationTools, userPermission] = await Promise.all([
       generateWorkspaceContext(workspaceId, userId),
@@ -72,8 +73,8 @@ export async function POST(req: NextRequest) {
       ...(userPermission ? { userPermission } : {}),
     }
 
-    const executionId = crypto.randomUUID()
-    const runId = crypto.randomUUID()
+    const executionId = generateId()
+    const runId = generateId()
 
     await createRunSegment({
       id: runId,
diff --git a/apps/sim/app/api/notifications/poll/route.ts b/apps/sim/app/api/notifications/poll/route.ts
index cbc0246096a..010f9ccffcc 100644
--- a/apps/sim/app/api/notifications/poll/route.ts
+++ b/apps/sim/app/api/notifications/poll/route.ts
@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { pollInactivityAlerts } from '@/lib/notifications/inactivity-polling'
 
 const logger = createLogger('InactivityAlertPoll')
@@ -13,7 +13,7 @@ const LOCK_KEY = 'inactivity-alert-polling-lock'
 const LOCK_TTL_SECONDS = 120
 
 export async function GET(request: NextRequest) {
-  const requestId = nanoid()
+  const requestId = generateShortId()
   logger.info(`Inactivity alert polling triggered (${requestId})`)
 
   let lockAcquired = false
diff --git a/apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts b/apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts
index e929765380e..f54e72b2701 100644
--- a/apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts
+++ b/apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import {
   invitation,
@@ -27,6 +26,7 @@ import { isOrgPlan, sqlIsPro } from '@/lib/billing/plan-helpers'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 
@@ -321,7 +321,7 @@ export async function PUT(
 
       if (status === 'accepted') {
         await tx.insert(member).values({
-          id: randomUUID(),
+          id: generateId(),
           userId: session.user.id,
           organizationId,
           role: orgInvitation.role,
@@ -423,7 +423,7 @@ export async function PUT(
 
             if (autoAddGroup) {
               await tx.insert(permissionGroupMember).values({
-                id: randomUUID(),
+                id: generateId(),
                 permissionGroupId: autoAddGroup.id,
                 userId: session.user.id,
                 assignedBy: null,
@@ -497,7 +497,7 @@ export async function PUT(
             }
           } else {
             await tx.insert(permissions).values({
-              id: randomUUID(),
+              id: generateId(),
               entityType: 'workspace',
               entityId: wsInvitation.workspaceId,
               userId: session.user.id,
diff --git a/apps/sim/app/api/organizations/[id]/invitations/route.ts b/apps/sim/app/api/organizations/[id]/invitations/route.ts
index 9b4b690711d..001184d98e7 100644
--- a/apps/sim/app/api/organizations/[id]/invitations/route.ts
+++ b/apps/sim/app/api/organizations/[id]/invitations/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import {
   invitation,
@@ -24,6 +23,7 @@ import {
   validateSeatAvailability,
 } from '@/lib/billing/validation/seat-management'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { hasWorkspaceAdminAccess } from '@/lib/workspaces/permissions/utils'
@@ -293,7 +293,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000) // 7 days
     const invitationsToCreate = emailsToInvite.map((email: string) => ({
-      id: randomUUID(),
+      id: generateId(),
       email,
       inviterId: session.user.id,
       organizationId,
@@ -310,8 +310,8 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       for (const email of emailsToInvite) {
         const orgInviteForEmail = invitationsToCreate.find((inv) => inv.email === email)
         for (const wsInvitation of validWorkspaceInvitations) {
-          const wsInvitationId = randomUUID()
-          const token = randomUUID()
+          const wsInvitationId = generateId()
+          const token = generateId()
 
           await db.insert(workspaceInvitation).values({
             id: wsInvitationId,
diff --git a/apps/sim/app/api/organizations/[id]/members/route.ts b/apps/sim/app/api/organizations/[id]/members/route.ts
index 6be21be8a06..3b15d34848e 100644
--- a/apps/sim/app/api/organizations/[id]/members/route.ts
+++ b/apps/sim/app/api/organizations/[id]/members/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { invitation, member, organization, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -10,6 +9,7 @@ import { getSession } from '@/lib/auth'
 import { getUserUsageData } from '@/lib/billing/core/usage'
 import { validateSeatAvailability } from '@/lib/billing/validation/seat-management'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 
@@ -231,7 +231,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     }
 
     // Create invitation
-    const invitationId = randomUUID()
+    const invitationId = generateId()
     const expiresAt = new Date()
     expiresAt.setDate(expiresAt.getDate() + 7) // 7 days expiry
 
diff --git a/apps/sim/app/api/permission-groups/[id]/members/bulk/route.ts b/apps/sim/app/api/permission-groups/[id]/members/bulk/route.ts
index c6e3faa2d28..f0be70d26b3 100644
--- a/apps/sim/app/api/permission-groups/[id]/members/bulk/route.ts
+++ b/apps/sim/app/api/permission-groups/[id]/members/bulk/route.ts
@@ -6,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { hasAccessControlAccess } from '@/lib/billing'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('PermissionGroupBulkMembers')
 
@@ -129,7 +130,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
       }
 
       const newMembers = usersToAdd.map((userId) => ({
-        id: crypto.randomUUID(),
+        id: generateId(),
         permissionGroupId: id,
         userId,
         assignedBy: session.user.id,
diff --git a/apps/sim/app/api/permission-groups/[id]/members/route.ts b/apps/sim/app/api/permission-groups/[id]/members/route.ts
index ec57c3689c6..5b5fdc65df7 100644
--- a/apps/sim/app/api/permission-groups/[id]/members/route.ts
+++ b/apps/sim/app/api/permission-groups/[id]/members/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { hasAccessControlAccess } from '@/lib/billing'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('PermissionGroupMembers')
 
@@ -137,7 +138,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
       }
 
       const memberData = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         permissionGroupId: id,
         userId,
         assignedBy: session.user.id,
diff --git a/apps/sim/app/api/permission-groups/route.ts b/apps/sim/app/api/permission-groups/route.ts
index a1b6c25476a..b79f01ebc5f 100644
--- a/apps/sim/app/api/permission-groups/route.ts
+++ b/apps/sim/app/api/permission-groups/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { hasAccessControlAccess } from '@/lib/billing'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   DEFAULT_PERMISSION_GROUP_CONFIG,
   type PermissionGroupConfig,
@@ -181,7 +182,7 @@ export async function POST(req: Request) {
 
     const now = new Date()
     const newGroup = {
-      id: crypto.randomUUID(),
+      id: generateId(),
       organizationId,
       name,
       description: description || null,
diff --git a/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts b/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
index f4247e7515d..194d9dfcdd0 100644
--- a/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
+++ b/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { AuthType } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
@@ -60,7 +60,7 @@ export async function POST(
     userId = billedAccountUserId
   }
 
-  const resumeExecutionId = randomUUID()
+  const resumeExecutionId = generateId()
   const requestId = generateRequestId()
 
   logger.info(`[${requestId}] Preprocessing resume execution`, {
diff --git a/apps/sim/app/api/schedules/execute/route.test.ts b/apps/sim/app/api/schedules/execute/route.test.ts
index 80c59e537d1..12dd33097e1 100644
--- a/apps/sim/app/api/schedules/execute/route.test.ts
+++ b/apps/sim/app/api/schedules/execute/route.test.ts
@@ -132,8 +132,12 @@ vi.mock('@sim/db', () => ({
   },
 }))
 
-vi.mock('uuid', () => ({
-  v4: vi.fn().mockReturnValue('schedule-execution-1'),
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: vi.fn(() => 'schedule-execution-1'),
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 import { GET } from './route'
diff --git a/apps/sim/app/api/schedules/execute/route.ts b/apps/sim/app/api/schedules/execute/route.ts
index 2a4d4f89872..0d1e41a9e1f 100644
--- a/apps/sim/app/api/schedules/execute/route.ts
+++ b/apps/sim/app/api/schedules/execute/route.ts
@@ -2,11 +2,11 @@ import { db, workflowDeploymentVersion, workflowSchedule } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, lt, lte, ne, not, or, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs'
 import { createBullMQJobData, isBullMQEnabled } from '@/lib/core/bullmq'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { enqueueWorkspaceDispatch } from '@/lib/core/workspace-dispatch'
 import {
   executeJobInline,
@@ -89,7 +89,7 @@ export async function GET(request: NextRequest) {
 
     const schedulePromises = dueSchedules.map(async (schedule) => {
       const queueTime = schedule.lastQueuedAt ?? queuedAt
-      const executionId = uuidv4()
+      const executionId = generateId()
       const correlation = {
         executionId,
         requestId,
diff --git a/apps/sim/app/api/schedules/route.ts b/apps/sim/app/api/schedules/route.ts
index 19fd78bb18f..da291cdcccc 100644
--- a/apps/sim/app/api/schedules/route.ts
+++ b/apps/sim/app/api/schedules/route.ts
@@ -5,6 +5,7 @@ import { and, eq, isNull, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { validateCronExpression } from '@/lib/workflows/schedules/utils'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
@@ -249,7 +250,7 @@ export async function POST(req: NextRequest) {
     }
 
     const now = new Date()
-    const id = crypto.randomUUID()
+    const id = generateId()
 
     await db.insert(workflowSchedule).values({
       id,
diff --git a/apps/sim/app/api/superuser/import-workflow/route.ts b/apps/sim/app/api/superuser/import-workflow/route.ts
index e9e4f5bbe5e..960723d31ed 100644
--- a/apps/sim/app/api/superuser/import-workflow/route.ts
+++ b/apps/sim/app/api/superuser/import-workflow/route.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { verifyEffectiveSuperUser } from '@/lib/templates/permissions'
 import { parseWorkflowJson } from '@/lib/workflows/operations/import-export'
 import {
@@ -118,7 +119,7 @@ export async function POST(request: NextRequest) {
     }
 
     // Create new workflow record
-    const newWorkflowId = crypto.randomUUID()
+    const newWorkflowId = generateId()
     const now = new Date()
     const dedupedName = await deduplicateWorkflowName(
       `[Debug Import] ${sourceWorkflow.name}`,
diff --git a/apps/sim/app/api/table/import-csv/route.ts b/apps/sim/app/api/table/import-csv/route.ts
index 414ea752a6f..f10074180c2 100644
--- a/apps/sim/app/api/table/import-csv/route.ts
+++ b/apps/sim/app/api/table/import-csv/route.ts
@@ -2,6 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   batchInsertRows,
   createTable,
@@ -225,7 +226,7 @@ export async function POST(request: NextRequest) {
       let inserted = 0
       for (let i = 0; i < coerced.length; i += MAX_BATCH_SIZE) {
         const batch = coerced.slice(i, i + MAX_BATCH_SIZE)
-        const batchRequestId = crypto.randomUUID().slice(0, 8)
+        const batchRequestId = generateId().slice(0, 8)
         const result = await batchInsertRows(
           { tableId: table.id, rows: batch, workspaceId, userId: authResult.userId },
           table,
diff --git a/apps/sim/app/api/templates/[id]/star/route.ts b/apps/sim/app/api/templates/[id]/star/route.ts
index bd8b2db0820..c57ba28eaf9 100644
--- a/apps/sim/app/api/templates/[id]/star/route.ts
+++ b/apps/sim/app/api/templates/[id]/star/route.ts
@@ -3,9 +3,9 @@ import { templateStars, templates } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('TemplateStarAPI')
 
@@ -86,7 +86,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     await db.transaction(async (tx) => {
       // Add the star record
       await tx.insert(templateStars).values({
-        id: uuidv4(),
+        id: generateId(),
         userId: session.user.id,
         templateId: id,
         starredAt: new Date(),
diff --git a/apps/sim/app/api/templates/[id]/use/route.ts b/apps/sim/app/api/templates/[id]/use/route.ts
index ecbbb850dd3..a4c797381c1 100644
--- a/apps/sim/app/api/templates/[id]/use/route.ts
+++ b/apps/sim/app/api/templates/[id]/use/route.ts
@@ -3,10 +3,10 @@ import { templates, workflow, workflowDeploymentVersion } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { canAccessTemplate, verifyTemplateOwnership } from '@/lib/templates/permissions'
 import {
   type RegenerateStateInput,
@@ -93,7 +93,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     const templateData = template[0]
 
     // Create a new workflow ID
-    const newWorkflowId = uuidv4()
+    const newWorkflowId = generateId()
     const now = new Date()
 
     // Extract variables from the template state and remap to the new workflow
@@ -104,7 +104,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       if (!templateVariables || typeof templateVariables !== 'object') return {}
       const mapped: Record<string, any> = {}
       for (const [, variable] of Object.entries(templateVariables)) {
-        const newVarId = uuidv4()
+        const newVarId = generateId()
         mapped[newVarId] = { ...variable, id: newVarId, workflowId: newWorkflowId }
       }
       return mapped
@@ -178,7 +178,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
         // Create a deployment version for the new workflow
         if (templateData.state) {
-          const newDeploymentVersionId = uuidv4()
+          const newDeploymentVersionId = generateId()
           await tx.insert(workflowDeploymentVersion).values({
             id: newDeploymentVersionId,
             workflowId: newWorkflowId,
diff --git a/apps/sim/app/api/templates/route.ts b/apps/sim/app/api/templates/route.ts
index e12cc47ad9a..c6424865c82 100644
--- a/apps/sim/app/api/templates/route.ts
+++ b/apps/sim/app/api/templates/route.ts
@@ -9,11 +9,11 @@ import {
 import { createLogger } from '@sim/logger'
 import { and, desc, eq, ilike, or, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { canAccessTemplate, verifyEffectiveSuperUser } from '@/lib/templates/permissions'
 import {
   extractRequiredCredentials,
@@ -267,7 +267,7 @@ export async function POST(request: NextRequest) {
       return NextResponse.json({ error: permissionError || 'Access denied' }, { status: 403 })
     }
 
-    const templateId = uuidv4()
+    const templateId = generateId()
     const now = new Date()
 
     // Get the active deployment version for the workflow to copy its state
diff --git a/apps/sim/app/api/tools/a2a/send-message/route.ts b/apps/sim/app/api/tools/a2a/send-message/route.ts
index f389abec948..c15d1921a31 100644
--- a/apps/sim/app/api/tools/a2a/send-message/route.ts
+++ b/apps/sim/app/api/tools/a2a/send-message/route.ts
@@ -6,6 +6,7 @@ import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 
 export const dynamic = 'force-dynamic'
 
@@ -142,7 +143,7 @@ export async function POST(request: NextRequest) {
 
     const message: Message = {
       kind: 'message',
-      messageId: crypto.randomUUID(),
+      messageId: generateId(),
       role: 'user',
       parts,
       ...(validatedData.taskId && { taskId: validatedData.taskId }),
diff --git a/apps/sim/app/api/tools/cursor/download-artifact/route.ts b/apps/sim/app/api/tools/cursor/download-artifact/route.ts
new file mode 100644
index 00000000000..bc185d1d86a
--- /dev/null
+++ b/apps/sim/app/api/tools/cursor/download-artifact/route.ts
@@ -0,0 +1,146 @@
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { checkInternalAuth } from '@/lib/auth/hybrid'
+import {
+  secureFetchWithPinnedIP,
+  validateUrlWithDNS,
+} from '@/lib/core/security/input-validation.server'
+import { generateRequestId } from '@/lib/core/utils/request'
+
+export const dynamic = 'force-dynamic'
+
+const logger = createLogger('CursorDownloadArtifactAPI')
+
+const DownloadArtifactSchema = z.object({
+  apiKey: z.string().min(1, 'API key is required'),
+  agentId: z.string().min(1, 'Agent ID is required'),
+  path: z.string().min(1, 'Artifact path is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = generateRequestId()
+
+  try {
+    const authResult = await checkInternalAuth(request, { requireWorkflowId: false })
+
+    if (!authResult.success) {
+      logger.warn(
+        `[${requestId}] Unauthorized Cursor download artifact attempt: ${authResult.error}`
+      )
+      return NextResponse.json(
+        { success: false, error: authResult.error || 'Authentication required' },
+        { status: 401 }
+      )
+    }
+
+    logger.info(
+      `[${requestId}] Authenticated Cursor download artifact request via ${authResult.authType}`,
+      {
+        userId: authResult.userId,
+      }
+    )
+
+    const body = await request.json()
+    const { apiKey, agentId, path } = DownloadArtifactSchema.parse(body)
+
+    const authHeader = `Basic ${Buffer.from(`${apiKey}:`).toString('base64')}`
+
+    logger.info(`[${requestId}] Requesting presigned URL for artifact`, { agentId, path })
+
+    const artifactResponse = await fetch(
+      `https://api.cursor.com/v0/agents/${encodeURIComponent(agentId)}/artifacts/download?path=${encodeURIComponent(path)}`,
+      {
+        method: 'GET',
+        headers: {
+          Authorization: authHeader,
+        },
+      }
+    )
+
+    if (!artifactResponse.ok) {
+      const errorText = await artifactResponse.text().catch(() => '')
+      logger.error(`[${requestId}] Failed to get artifact presigned URL`, {
+        status: artifactResponse.status,
+        error: errorText,
+      })
+      return NextResponse.json(
+        {
+          success: false,
+          error: errorText || `Failed to get artifact URL (${artifactResponse.status})`,
+        },
+        { status: artifactResponse.status }
+      )
+    }
+
+    const artifactData = await artifactResponse.json()
+    const downloadUrl = artifactData.url || artifactData.downloadUrl || artifactData.presignedUrl
+
+    if (!downloadUrl) {
+      logger.error(`[${requestId}] No download URL in artifact response`, { artifactData })
+      return NextResponse.json(
+        { success: false, error: 'No download URL returned for artifact' },
+        { status: 400 }
+      )
+    }
+
+    const urlValidation = await validateUrlWithDNS(downloadUrl, 'downloadUrl')
+    if (!urlValidation.isValid) {
+      return NextResponse.json({ success: false, error: urlValidation.error }, { status: 400 })
+    }
+
+    logger.info(`[${requestId}] Downloading artifact from presigned URL`, { agentId, path })
+
+    const downloadResponse = await secureFetchWithPinnedIP(
+      downloadUrl,
+      urlValidation.resolvedIP!,
+      {}
+    )
+
+    if (!downloadResponse.ok) {
+      logger.error(`[${requestId}] Failed to download artifact content`, {
+        status: downloadResponse.status,
+        statusText: downloadResponse.statusText,
+      })
+      return NextResponse.json(
+        {
+          success: false,
+          error: `Failed to download artifact content (${downloadResponse.status}: ${downloadResponse.statusText})`,
+        },
+        { status: downloadResponse.status }
+      )
+    }
+
+    const contentType = downloadResponse.headers.get('content-type') || 'application/octet-stream'
+    const arrayBuffer = await downloadResponse.arrayBuffer()
+    const fileBuffer = Buffer.from(arrayBuffer)
+
+    const fileName = path.split('/').pop() || 'artifact'
+
+    logger.info(`[${requestId}] Artifact downloaded successfully`, {
+      agentId,
+      path,
+      name: fileName,
+      size: fileBuffer.length,
+      mimeType: contentType,
+    })
+
+    return NextResponse.json({
+      success: true,
+      output: {
+        file: {
+          name: fileName,
+          mimeType: contentType,
+          data: fileBuffer.toString('base64'),
+          size: fileBuffer.length,
+        },
+      },
+    })
+  } catch (error) {
+    logger.error(`[${requestId}] Error downloading Cursor artifact:`, error)
+    return NextResponse.json(
+      { success: false, error: error instanceof Error ? error.message : 'Unknown error occurred' },
+      { status: 500 }
+    )
+  }
+}
diff --git a/apps/sim/app/api/tools/dynamodb/introspect/route.ts b/apps/sim/app/api/tools/dynamodb/introspect/route.ts
index 6e55bde87b0..bad2d517ca7 100644
--- a/apps/sim/app/api/tools/dynamodb/introspect/route.ts
+++ b/apps/sim/app/api/tools/dynamodb/introspect/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRawDynamoDBClient, describeTable, listTables } from '@/app/api/tools/dynamodb/utils'
 
 const logger = createLogger('DynamoDBIntrospectAPI')
@@ -15,7 +15,7 @@ const IntrospectSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mongodb/delete/route.ts b/apps/sim/app/api/tools/mongodb/delete/route.ts
index 95dcf328cd0..5325aa57446 100644
--- a/apps/sim/app/api/tools/mongodb/delete/route.ts
+++ b/apps/sim/app/api/tools/mongodb/delete/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMongoDBConnection, sanitizeCollectionName, validateFilter } from '../utils'
 
 const logger = createLogger('MongoDBDeleteAPI')
@@ -38,7 +38,7 @@ const DeleteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let client = null
 
   const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mongodb/execute/route.ts b/apps/sim/app/api/tools/mongodb/execute/route.ts
index 666d4a45069..9ae06a07871 100644
--- a/apps/sim/app/api/tools/mongodb/execute/route.ts
+++ b/apps/sim/app/api/tools/mongodb/execute/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMongoDBConnection, sanitizeCollectionName, validatePipeline } from '../utils'
 
 const logger = createLogger('MongoDBExecuteAPI')
@@ -30,7 +30,7 @@ const ExecuteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let client = null
 
   const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mongodb/insert/route.ts b/apps/sim/app/api/tools/mongodb/insert/route.ts
index f7feafd615a..94957ae5630 100644
--- a/apps/sim/app/api/tools/mongodb/insert/route.ts
+++ b/apps/sim/app/api/tools/mongodb/insert/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMongoDBConnection, sanitizeCollectionName } from '../utils'
 
 const logger = createLogger('MongoDBInsertAPI')
@@ -35,7 +35,7 @@ const InsertSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let client = null
 
   const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mongodb/introspect/route.ts b/apps/sim/app/api/tools/mongodb/introspect/route.ts
index 67f281553e3..d6c4b6e5f7f 100644
--- a/apps/sim/app/api/tools/mongodb/introspect/route.ts
+++ b/apps/sim/app/api/tools/mongodb/introspect/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMongoDBConnection, executeIntrospect } from '../utils'
 
 const logger = createLogger('MongoDBIntrospectAPI')
@@ -18,7 +18,7 @@ const IntrospectSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let client = null
 
   const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mongodb/query/route.ts b/apps/sim/app/api/tools/mongodb/query/route.ts
index 06533e3a8f4..24829c660b1 100644
--- a/apps/sim/app/api/tools/mongodb/query/route.ts
+++ b/apps/sim/app/api/tools/mongodb/query/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMongoDBConnection, sanitizeCollectionName, validateFilter } from '../utils'
 
 const logger = createLogger('MongoDBQueryAPI')
@@ -47,7 +47,7 @@ const QuerySchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let client = null
 
   const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mongodb/update/route.ts b/apps/sim/app/api/tools/mongodb/update/route.ts
index e6c0f867f7e..47022203ee7 100644
--- a/apps/sim/app/api/tools/mongodb/update/route.ts
+++ b/apps/sim/app/api/tools/mongodb/update/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMongoDBConnection, sanitizeCollectionName, validateFilter } from '../utils'
 
 const logger = createLogger('MongoDBUpdateAPI')
@@ -57,7 +57,7 @@ const UpdateSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let client = null
 
   const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mysql/delete/route.ts b/apps/sim/app/api/tools/mysql/delete/route.ts
index 7a9e5c81c51..b1871cff38a 100644
--- a/apps/sim/app/api/tools/mysql/delete/route.ts
+++ b/apps/sim/app/api/tools/mysql/delete/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildDeleteQuery, createMySQLConnection, executeQuery } from '@/app/api/tools/mysql/utils'
 
 const logger = createLogger('MySQLDeleteAPI')
@@ -19,7 +19,7 @@ const DeleteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mysql/execute/route.ts b/apps/sim/app/api/tools/mysql/execute/route.ts
index 5ab45b85a11..1e8e1685ba3 100644
--- a/apps/sim/app/api/tools/mysql/execute/route.ts
+++ b/apps/sim/app/api/tools/mysql/execute/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMySQLConnection, executeQuery, validateQuery } from '@/app/api/tools/mysql/utils'
 
 const logger = createLogger('MySQLExecuteAPI')
@@ -18,7 +18,7 @@ const ExecuteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mysql/insert/route.ts b/apps/sim/app/api/tools/mysql/insert/route.ts
index 4e9b3a953ca..862a3332c25 100644
--- a/apps/sim/app/api/tools/mysql/insert/route.ts
+++ b/apps/sim/app/api/tools/mysql/insert/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildInsertQuery, createMySQLConnection, executeQuery } from '@/app/api/tools/mysql/utils'
 
 const logger = createLogger('MySQLInsertAPI')
@@ -40,7 +40,7 @@ const InsertSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mysql/introspect/route.ts b/apps/sim/app/api/tools/mysql/introspect/route.ts
index 686705da404..792b012d126 100644
--- a/apps/sim/app/api/tools/mysql/introspect/route.ts
+++ b/apps/sim/app/api/tools/mysql/introspect/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMySQLConnection, executeIntrospect } from '@/app/api/tools/mysql/utils'
 
 const logger = createLogger('MySQLIntrospectAPI')
@@ -17,7 +17,7 @@ const IntrospectSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mysql/query/route.ts b/apps/sim/app/api/tools/mysql/query/route.ts
index 9237ab45427..5e1105053fc 100644
--- a/apps/sim/app/api/tools/mysql/query/route.ts
+++ b/apps/sim/app/api/tools/mysql/query/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createMySQLConnection, executeQuery, validateQuery } from '@/app/api/tools/mysql/utils'
 
 const logger = createLogger('MySQLQueryAPI')
@@ -18,7 +18,7 @@ const QuerySchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/mysql/update/route.ts b/apps/sim/app/api/tools/mysql/update/route.ts
index 5204d92a362..0eff371d83c 100644
--- a/apps/sim/app/api/tools/mysql/update/route.ts
+++ b/apps/sim/app/api/tools/mysql/update/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildUpdateQuery, createMySQLConnection, executeQuery } from '@/app/api/tools/mysql/utils'
 
 const logger = createLogger('MySQLUpdateAPI')
@@ -38,7 +38,7 @@ const UpdateSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/neo4j/create/route.ts b/apps/sim/app/api/tools/neo4j/create/route.ts
index c599b9c13e1..83c1b16c6d4 100644
--- a/apps/sim/app/api/tools/neo4j/create/route.ts
+++ b/apps/sim/app/api/tools/neo4j/create/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   convertNeo4jTypesToJSON,
   createNeo4jDriver,
@@ -23,7 +23,7 @@ const CreateSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/neo4j/delete/route.ts b/apps/sim/app/api/tools/neo4j/delete/route.ts
index 7a4ed7b315a..5b4c42d7da2 100644
--- a/apps/sim/app/api/tools/neo4j/delete/route.ts
+++ b/apps/sim/app/api/tools/neo4j/delete/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createNeo4jDriver, validateCypherQuery } from '@/app/api/tools/neo4j/utils'
 
 const logger = createLogger('Neo4jDeleteAPI')
@@ -20,7 +20,7 @@ const DeleteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/neo4j/execute/route.ts b/apps/sim/app/api/tools/neo4j/execute/route.ts
index df4dc43b5aa..70eb498b5b2 100644
--- a/apps/sim/app/api/tools/neo4j/execute/route.ts
+++ b/apps/sim/app/api/tools/neo4j/execute/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   convertNeo4jTypesToJSON,
   createNeo4jDriver,
@@ -23,7 +23,7 @@ const ExecuteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/neo4j/introspect/route.ts b/apps/sim/app/api/tools/neo4j/introspect/route.ts
index f463e153255..36604473fb6 100644
--- a/apps/sim/app/api/tools/neo4j/introspect/route.ts
+++ b/apps/sim/app/api/tools/neo4j/introspect/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createNeo4jDriver } from '@/app/api/tools/neo4j/utils'
 import type { Neo4jNodeSchema, Neo4jRelationshipSchema } from '@/tools/neo4j/types'
 
@@ -18,7 +18,7 @@ const IntrospectSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/neo4j/merge/route.ts b/apps/sim/app/api/tools/neo4j/merge/route.ts
index 839b98f3846..e4865aeabf4 100644
--- a/apps/sim/app/api/tools/neo4j/merge/route.ts
+++ b/apps/sim/app/api/tools/neo4j/merge/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   convertNeo4jTypesToJSON,
   createNeo4jDriver,
@@ -23,7 +23,7 @@ const MergeSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/neo4j/query/route.ts b/apps/sim/app/api/tools/neo4j/query/route.ts
index 1bb22ab9809..7c6d8983675 100644
--- a/apps/sim/app/api/tools/neo4j/query/route.ts
+++ b/apps/sim/app/api/tools/neo4j/query/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   convertNeo4jTypesToJSON,
   createNeo4jDriver,
@@ -23,7 +23,7 @@ const QuerySchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/neo4j/update/route.ts b/apps/sim/app/api/tools/neo4j/update/route.ts
index 828d6ef6f5b..5d90e17a568 100644
--- a/apps/sim/app/api/tools/neo4j/update/route.ts
+++ b/apps/sim/app/api/tools/neo4j/update/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   convertNeo4jTypesToJSON,
   createNeo4jDriver,
@@ -23,7 +23,7 @@ const UpdateSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   let driver = null
   let session = null
 
diff --git a/apps/sim/app/api/tools/onedrive/files/route.ts b/apps/sim/app/api/tools/onedrive/files/route.ts
index 4f6828c48cb..16baea2e23d 100644
--- a/apps/sim/app/api/tools/onedrive/files/route.ts
+++ b/apps/sim/app/api/tools/onedrive/files/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { account } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -6,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { validateMicrosoftGraphId } from '@/lib/core/security/input-validation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'
@@ -18,7 +18,7 @@ import type { MicrosoftGraphDriveItem } from '@/tools/onedrive/types'
  * Get files (not folders) from Microsoft OneDrive
  */
 export async function GET(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   logger.info(`[${requestId}] OneDrive files request received`)
 
   try {
diff --git a/apps/sim/app/api/tools/onedrive/folder/route.ts b/apps/sim/app/api/tools/onedrive/folder/route.ts
index a4e80b66f9b..2ab90355b7c 100644
--- a/apps/sim/app/api/tools/onedrive/folder/route.ts
+++ b/apps/sim/app/api/tools/onedrive/folder/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { account } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -6,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { validateMicrosoftGraphId } from '@/lib/core/security/input-validation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'
@@ -13,7 +13,7 @@ export const dynamic = 'force-dynamic'
 const logger = createLogger('OneDriveFolderAPI')
 
 export async function GET(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const session = await getSession()
diff --git a/apps/sim/app/api/tools/onedrive/folders/route.ts b/apps/sim/app/api/tools/onedrive/folders/route.ts
index 271c4e69f7e..5cf6981f801 100644
--- a/apps/sim/app/api/tools/onedrive/folders/route.ts
+++ b/apps/sim/app/api/tools/onedrive/folders/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { account } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -6,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { validateMicrosoftGraphId } from '@/lib/core/security/input-validation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'
@@ -18,7 +18,7 @@ import type { MicrosoftGraphDriveItem } from '@/tools/onedrive/types'
  * Get folders from Microsoft OneDrive
  */
 export async function GET(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const session = await getSession()
diff --git a/apps/sim/app/api/tools/onepassword/create-item/route.ts b/apps/sim/app/api/tools/onepassword/create-item/route.ts
index dae8cbffa57..497e71b1991 100644
--- a/apps/sim/app/api/tools/onepassword/create-item/route.ts
+++ b/apps/sim/app/api/tools/onepassword/create-item/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import type { ItemCreateParams } from '@1password/sdk'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -28,7 +28,7 @@ const CreateItemSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
@@ -55,7 +55,7 @@ export async function POST(request: NextRequest) {
 
       const parsedFields = params.fields
         ? (JSON.parse(params.fields) as Array<Record<string, any>>).map((f) => ({
-            id: f.id || randomUUID().slice(0, 8),
+            id: f.id || generateId().slice(0, 8),
             title: f.label || f.title || '',
             fieldType: toSdkFieldType(f.type || 'STRING'),
             value: f.value || '',
diff --git a/apps/sim/app/api/tools/onepassword/delete-item/route.ts b/apps/sim/app/api/tools/onepassword/delete-item/route.ts
index 8909adf88fc..c2be6e8f1eb 100644
--- a/apps/sim/app/api/tools/onepassword/delete-item/route.ts
+++ b/apps/sim/app/api/tools/onepassword/delete-item/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { connectRequest, createOnePasswordClient, resolveCredentials } from '../utils'
 
 const logger = createLogger('OnePasswordDeleteItemAPI')
@@ -17,7 +17,7 @@ const DeleteItemSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/onepassword/get-item/route.ts b/apps/sim/app/api/tools/onepassword/get-item/route.ts
index 63ac2906b4b..92065228e81 100644
--- a/apps/sim/app/api/tools/onepassword/get-item/route.ts
+++ b/apps/sim/app/api/tools/onepassword/get-item/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -22,7 +22,7 @@ const GetItemSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/onepassword/get-vault/route.ts b/apps/sim/app/api/tools/onepassword/get-vault/route.ts
index 16343134a5b..09b2b227fe2 100644
--- a/apps/sim/app/api/tools/onepassword/get-vault/route.ts
+++ b/apps/sim/app/api/tools/onepassword/get-vault/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -21,7 +21,7 @@ const GetVaultSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/onepassword/list-items/route.ts b/apps/sim/app/api/tools/onepassword/list-items/route.ts
index 0e9afabdcf9..6f4d4c6eb9d 100644
--- a/apps/sim/app/api/tools/onepassword/list-items/route.ts
+++ b/apps/sim/app/api/tools/onepassword/list-items/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -22,7 +22,7 @@ const ListItemsSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/onepassword/list-vaults/route.ts b/apps/sim/app/api/tools/onepassword/list-vaults/route.ts
index d1b08e781f8..e24d8567abc 100644
--- a/apps/sim/app/api/tools/onepassword/list-vaults/route.ts
+++ b/apps/sim/app/api/tools/onepassword/list-vaults/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -21,7 +21,7 @@ const ListVaultsSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/onepassword/replace-item/route.ts b/apps/sim/app/api/tools/onepassword/replace-item/route.ts
index 3fc198d62b3..48b84918b5f 100644
--- a/apps/sim/app/api/tools/onepassword/replace-item/route.ts
+++ b/apps/sim/app/api/tools/onepassword/replace-item/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import type { Item } from '@1password/sdk'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -26,7 +26,7 @@ const ReplaceItemSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
@@ -57,7 +57,7 @@ export async function POST(request: NextRequest) {
         vaultId: params.vaultId,
         fields: itemData.fields
           ? (itemData.fields as Array<Record<string, any>>).map((f) => ({
-              id: f.id || randomUUID().slice(0, 8),
+              id: f.id || generateId().slice(0, 8),
               title: f.label || f.title || '',
               fieldType: toSdkFieldType(f.type || 'STRING'),
               value: f.value || '',
diff --git a/apps/sim/app/api/tools/onepassword/resolve-secret/route.ts b/apps/sim/app/api/tools/onepassword/resolve-secret/route.ts
index 408ac48c548..e327da13d68 100644
--- a/apps/sim/app/api/tools/onepassword/resolve-secret/route.ts
+++ b/apps/sim/app/api/tools/onepassword/resolve-secret/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createOnePasswordClient, resolveCredentials } from '../utils'
 
 const logger = createLogger('OnePasswordResolveSecretAPI')
@@ -16,7 +16,7 @@ const ResolveSecretSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/onepassword/update-item/route.ts b/apps/sim/app/api/tools/onepassword/update-item/route.ts
index 543b5f052ee..1bfca62a68b 100644
--- a/apps/sim/app/api/tools/onepassword/update-item/route.ts
+++ b/apps/sim/app/api/tools/onepassword/update-item/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   connectRequest,
   createOnePasswordClient,
@@ -23,7 +23,7 @@ const UpdateItemSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/postgresql/delete/route.ts b/apps/sim/app/api/tools/postgresql/delete/route.ts
index f26248d6f23..05309cda907 100644
--- a/apps/sim/app/api/tools/postgresql/delete/route.ts
+++ b/apps/sim/app/api/tools/postgresql/delete/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createPostgresConnection, executeDelete } from '@/app/api/tools/postgresql/utils'
 
 const logger = createLogger('PostgreSQLDeleteAPI')
@@ -19,7 +19,7 @@ const DeleteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/postgresql/execute/route.ts b/apps/sim/app/api/tools/postgresql/execute/route.ts
index 35cfe03b6a7..1dba7c11414 100644
--- a/apps/sim/app/api/tools/postgresql/execute/route.ts
+++ b/apps/sim/app/api/tools/postgresql/execute/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createPostgresConnection,
   executeQuery,
@@ -22,7 +22,7 @@ const ExecuteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/postgresql/insert/route.ts b/apps/sim/app/api/tools/postgresql/insert/route.ts
index 28e898d8c2d..01073a96577 100644
--- a/apps/sim/app/api/tools/postgresql/insert/route.ts
+++ b/apps/sim/app/api/tools/postgresql/insert/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createPostgresConnection, executeInsert } from '@/app/api/tools/postgresql/utils'
 
 const logger = createLogger('PostgreSQLInsertAPI')
@@ -40,7 +40,7 @@ const InsertSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/postgresql/introspect/route.ts b/apps/sim/app/api/tools/postgresql/introspect/route.ts
index 7d504f918c0..cf376bef9de 100644
--- a/apps/sim/app/api/tools/postgresql/introspect/route.ts
+++ b/apps/sim/app/api/tools/postgresql/introspect/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createPostgresConnection, executeIntrospect } from '@/app/api/tools/postgresql/utils'
 
 const logger = createLogger('PostgreSQLIntrospectAPI')
@@ -18,7 +18,7 @@ const IntrospectSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/postgresql/query/route.ts b/apps/sim/app/api/tools/postgresql/query/route.ts
index 6e1f8c35933..72e73489a5b 100644
--- a/apps/sim/app/api/tools/postgresql/query/route.ts
+++ b/apps/sim/app/api/tools/postgresql/query/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createPostgresConnection, executeQuery } from '@/app/api/tools/postgresql/utils'
 
 const logger = createLogger('PostgreSQLQueryAPI')
@@ -18,7 +18,7 @@ const QuerySchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/postgresql/update/route.ts b/apps/sim/app/api/tools/postgresql/update/route.ts
index a3d5784e2a9..4eb2cc9d4da 100644
--- a/apps/sim/app/api/tools/postgresql/update/route.ts
+++ b/apps/sim/app/api/tools/postgresql/update/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createPostgresConnection, executeUpdate } from '@/app/api/tools/postgresql/utils'
 
 const logger = createLogger('PostgreSQLUpdateAPI')
@@ -38,7 +38,7 @@ const UpdateSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/rds/delete/route.ts b/apps/sim/app/api/tools/rds/delete/route.ts
index 8db9e2e1dd1..92b2c9d0b93 100644
--- a/apps/sim/app/api/tools/rds/delete/route.ts
+++ b/apps/sim/app/api/tools/rds/delete/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRdsClient, executeDelete } from '@/app/api/tools/rds/utils'
 
 const logger = createLogger('RDSDeleteAPI')
@@ -21,7 +21,7 @@ const DeleteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/rds/execute/route.ts b/apps/sim/app/api/tools/rds/execute/route.ts
index 8c88edb0f74..af6304f98da 100644
--- a/apps/sim/app/api/tools/rds/execute/route.ts
+++ b/apps/sim/app/api/tools/rds/execute/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRdsClient, executeStatement } from '@/app/api/tools/rds/utils'
 
 const logger = createLogger('RDSExecuteAPI')
@@ -18,7 +18,7 @@ const ExecuteSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/rds/insert/route.ts b/apps/sim/app/api/tools/rds/insert/route.ts
index 783d80821a0..7fba5fcbb7c 100644
--- a/apps/sim/app/api/tools/rds/insert/route.ts
+++ b/apps/sim/app/api/tools/rds/insert/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRdsClient, executeInsert } from '@/app/api/tools/rds/utils'
 
 const logger = createLogger('RDSInsertAPI')
@@ -21,7 +21,7 @@ const InsertSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/rds/introspect/route.ts b/apps/sim/app/api/tools/rds/introspect/route.ts
index ea96f05b243..2e8aa42a8ef 100644
--- a/apps/sim/app/api/tools/rds/introspect/route.ts
+++ b/apps/sim/app/api/tools/rds/introspect/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRdsClient, executeIntrospect, type RdsEngine } from '@/app/api/tools/rds/utils'
 
 const logger = createLogger('RDSIntrospectAPI')
@@ -19,7 +19,7 @@ const IntrospectSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/rds/query/route.ts b/apps/sim/app/api/tools/rds/query/route.ts
index 6caf743c3ab..21a73291073 100644
--- a/apps/sim/app/api/tools/rds/query/route.ts
+++ b/apps/sim/app/api/tools/rds/query/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRdsClient, executeStatement, validateQuery } from '@/app/api/tools/rds/utils'
 
 const logger = createLogger('RDSQueryAPI')
@@ -18,7 +18,7 @@ const QuerySchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/rds/update/route.ts b/apps/sim/app/api/tools/rds/update/route.ts
index d973d04d8c6..1e2826e4ac7 100644
--- a/apps/sim/app/api/tools/rds/update/route.ts
+++ b/apps/sim/app/api/tools/rds/update/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createRdsClient, executeUpdate } from '@/app/api/tools/rds/utils'
 
 const logger = createLogger('RDSUpdateAPI')
@@ -24,7 +24,7 @@ const UpdateSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/search/route.ts b/apps/sim/app/api/tools/search/route.ts
index c3b23303181..b45213115d8 100644
--- a/apps/sim/app/api/tools/search/route.ts
+++ b/apps/sim/app/api/tools/search/route.ts
@@ -4,6 +4,7 @@ import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { SEARCH_TOOL_COST } from '@/lib/billing/constants'
 import { env } from '@/lib/core/config/env'
+import { generateId } from '@/lib/core/utils/uuid'
 import { executeTool } from '@/tools'
 
 const logger = createLogger('search')
@@ -16,7 +17,7 @@ export const maxDuration = 60
 export const dynamic = 'force-dynamic'
 
 export async function POST(request: NextRequest) {
-  const requestId = crypto.randomUUID()
+  const requestId = generateId()
 
   try {
     const { searchParams: urlParams } = new URL(request.url)
diff --git a/apps/sim/app/api/tools/secrets_manager/create-secret/route.ts b/apps/sim/app/api/tools/secrets_manager/create-secret/route.ts
index baa3f39de9b..7cb4a60160b 100644
--- a/apps/sim/app/api/tools/secrets_manager/create-secret/route.ts
+++ b/apps/sim/app/api/tools/secrets_manager/create-secret/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSecret, createSecretsManagerClient } from '../utils'
 
 const logger = createLogger('SecretsManagerCreateSecretAPI')
@@ -17,7 +17,7 @@ const CreateSecretSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/secrets_manager/delete-secret/route.ts b/apps/sim/app/api/tools/secrets_manager/delete-secret/route.ts
index 87b76f2391c..21a35e64af7 100644
--- a/apps/sim/app/api/tools/secrets_manager/delete-secret/route.ts
+++ b/apps/sim/app/api/tools/secrets_manager/delete-secret/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSecretsManagerClient, deleteSecret } from '../utils'
 
 const logger = createLogger('SecretsManagerDeleteSecretAPI')
@@ -17,7 +17,7 @@ const DeleteSecretSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/secrets_manager/get-secret/route.ts b/apps/sim/app/api/tools/secrets_manager/get-secret/route.ts
index f96c81bd811..22df5b57072 100644
--- a/apps/sim/app/api/tools/secrets_manager/get-secret/route.ts
+++ b/apps/sim/app/api/tools/secrets_manager/get-secret/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSecretsManagerClient, getSecretValue } from '../utils'
 
 const logger = createLogger('SecretsManagerGetSecretAPI')
@@ -17,7 +17,7 @@ const GetSecretSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/secrets_manager/list-secrets/route.ts b/apps/sim/app/api/tools/secrets_manager/list-secrets/route.ts
index 00b0e68e591..58617b4864f 100644
--- a/apps/sim/app/api/tools/secrets_manager/list-secrets/route.ts
+++ b/apps/sim/app/api/tools/secrets_manager/list-secrets/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSecretsManagerClient, listSecrets } from '../utils'
 
 const logger = createLogger('SecretsManagerListSecretsAPI')
@@ -16,7 +16,7 @@ const ListSecretsSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/secrets_manager/update-secret/route.ts b/apps/sim/app/api/tools/secrets_manager/update-secret/route.ts
index e82f2aedda3..5becf7f0dc3 100644
--- a/apps/sim/app/api/tools/secrets_manager/update-secret/route.ts
+++ b/apps/sim/app/api/tools/secrets_manager/update-secret/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSecretsManagerClient, updateSecretValue } from '../utils'
 
 const logger = createLogger('SecretsManagerUpdateSecretAPI')
@@ -17,7 +17,7 @@ const UpdateSecretSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/sharepoint/site/route.ts b/apps/sim/app/api/tools/sharepoint/site/route.ts
index 24941f034de..7afc3954fa2 100644
--- a/apps/sim/app/api/tools/sharepoint/site/route.ts
+++ b/apps/sim/app/api/tools/sharepoint/site/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { account } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -6,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { validateMicrosoftGraphId } from '@/lib/core/security/input-validation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'
@@ -13,7 +13,7 @@ export const dynamic = 'force-dynamic'
 const logger = createLogger('SharePointSiteAPI')
 
 export async function GET(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const session = await getSession()
diff --git a/apps/sim/app/api/tools/sqs/send/route.ts b/apps/sim/app/api/tools/sqs/send/route.ts
index 2c3e643e376..c9078aecc4b 100644
--- a/apps/sim/app/api/tools/sqs/send/route.ts
+++ b/apps/sim/app/api/tools/sqs/send/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSqsClient, sendMessage } from '../utils'
 
 const logger = createLogger('SQSSendMessageAPI')
@@ -20,7 +20,7 @@ const SendMessageSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   const auth = await checkInternalAuth(request)
   if (!auth.success || !auth.userId) {
diff --git a/apps/sim/app/api/tools/ssh/check-command-exists/route.ts b/apps/sim/app/api/tools/ssh/check-command-exists/route.ts
index 6290cde47d1..186b4c390aa 100644
--- a/apps/sim/app/api/tools/ssh/check-command-exists/route.ts
+++ b/apps/sim/app/api/tools/ssh/check-command-exists/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSSHConnection, escapeShellArg, executeSSHCommand } from '@/app/api/tools/ssh/utils'
 
 const logger = createLogger('SSHCheckCommandExistsAPI')
@@ -18,7 +18,7 @@ const CheckCommandExistsSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/check-file-exists/route.ts b/apps/sim/app/api/tools/ssh/check-file-exists/route.ts
index b5e2546279a..e7e65cc633b 100644
--- a/apps/sim/app/api/tools/ssh/check-file-exists/route.ts
+++ b/apps/sim/app/api/tools/ssh/check-file-exists/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import type { Client, SFTPWrapper, Stats } from 'ssh2'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSSHConnection,
   getFileType,
@@ -37,7 +37,7 @@ function getSFTP(client: Client): Promise<SFTPWrapper> {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/create-directory/route.ts b/apps/sim/app/api/tools/ssh/create-directory/route.ts
index 3fd058ba689..467c097d4e3 100644
--- a/apps/sim/app/api/tools/ssh/create-directory/route.ts
+++ b/apps/sim/app/api/tools/ssh/create-directory/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSSHConnection,
   escapeShellArg,
@@ -25,7 +25,7 @@ const CreateDirectorySchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/delete-file/route.ts b/apps/sim/app/api/tools/ssh/delete-file/route.ts
index 14cbc2ae6f3..44506996b07 100644
--- a/apps/sim/app/api/tools/ssh/delete-file/route.ts
+++ b/apps/sim/app/api/tools/ssh/delete-file/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSSHConnection,
   escapeShellArg,
@@ -25,7 +25,7 @@ const DeleteFileSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/download-file/route.ts b/apps/sim/app/api/tools/ssh/download-file/route.ts
index cd908a1b948..6dbfdf3c5ee 100644
--- a/apps/sim/app/api/tools/ssh/download-file/route.ts
+++ b/apps/sim/app/api/tools/ssh/download-file/route.ts
@@ -1,10 +1,10 @@
-import { randomUUID } from 'crypto'
 import path from 'path'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import type { Client, SFTPWrapper } from 'ssh2'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils'
 import { createSSHConnection, sanitizePath } from '@/app/api/tools/ssh/utils'
 
@@ -33,7 +33,7 @@ function getSFTP(client: Client): Promise<SFTPWrapper> {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/execute-command/route.ts b/apps/sim/app/api/tools/ssh/execute-command/route.ts
index ba7f7b91c89..66b5dfb1555 100644
--- a/apps/sim/app/api/tools/ssh/execute-command/route.ts
+++ b/apps/sim/app/api/tools/ssh/execute-command/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSSHConnection,
   escapeShellArg,
@@ -24,7 +24,7 @@ const ExecuteCommandSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/execute-script/route.ts b/apps/sim/app/api/tools/ssh/execute-script/route.ts
index f52dbc00c54..b0158e43fdd 100644
--- a/apps/sim/app/api/tools/ssh/execute-script/route.ts
+++ b/apps/sim/app/api/tools/ssh/execute-script/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSSHConnection, escapeShellArg, executeSSHCommand } from '@/app/api/tools/ssh/utils'
 
 const logger = createLogger('SSHExecuteScriptAPI')
@@ -20,7 +20,7 @@ const ExecuteScriptSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
@@ -55,7 +55,7 @@ export async function POST(request: NextRequest) {
       const escapedScriptPath = escapeShellArg(scriptPath)
       const escapedInterpreter = escapeShellArg(params.interpreter)
 
-      const heredocDelimiter = `SIMEOF_${randomUUID().replace(/-/g, '')}`
+      const heredocDelimiter = `SIMEOF_${generateId().replace(/-/g, '')}`
       let command = `cat > '${escapedScriptPath}' << '${heredocDelimiter}'
 ${params.script}
 ${heredocDelimiter}
diff --git a/apps/sim/app/api/tools/ssh/get-system-info/route.ts b/apps/sim/app/api/tools/ssh/get-system-info/route.ts
index cdb6c0cf25f..65a25e82e21 100644
--- a/apps/sim/app/api/tools/ssh/get-system-info/route.ts
+++ b/apps/sim/app/api/tools/ssh/get-system-info/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSSHConnection, executeSSHCommand } from '@/app/api/tools/ssh/utils'
 
 const logger = createLogger('SSHGetSystemInfoAPI')
@@ -17,7 +17,7 @@ const GetSystemInfoSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/list-directory/route.ts b/apps/sim/app/api/tools/ssh/list-directory/route.ts
index cb256f42396..2971ef9202b 100644
--- a/apps/sim/app/api/tools/ssh/list-directory/route.ts
+++ b/apps/sim/app/api/tools/ssh/list-directory/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import type { Client, FileEntry, SFTPWrapper } from 'ssh2'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSSHConnection,
   getFileType,
@@ -58,7 +58,7 @@ async function listDir(sftp: SFTPWrapper, dirPath: string): Promise<FileEntry[]>
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/move-rename/route.ts b/apps/sim/app/api/tools/ssh/move-rename/route.ts
index ba4a9a2956b..98285041707 100644
--- a/apps/sim/app/api/tools/ssh/move-rename/route.ts
+++ b/apps/sim/app/api/tools/ssh/move-rename/route.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSSHConnection,
   escapeShellArg,
@@ -25,7 +25,7 @@ const MoveRenameSchema = z.object({
 })
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/read-file-content/route.ts b/apps/sim/app/api/tools/ssh/read-file-content/route.ts
index 237c8336ca2..7493a6cb10c 100644
--- a/apps/sim/app/api/tools/ssh/read-file-content/route.ts
+++ b/apps/sim/app/api/tools/ssh/read-file-content/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import type { Client, SFTPWrapper } from 'ssh2'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSSHConnection, sanitizePath } from '@/app/api/tools/ssh/utils'
 
 const logger = createLogger('SSHReadFileContentAPI')
@@ -33,7 +33,7 @@ function getSFTP(client: Client): Promise<SFTPWrapper> {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/upload-file/route.ts b/apps/sim/app/api/tools/ssh/upload-file/route.ts
index 2ce4804303c..2020271465b 100644
--- a/apps/sim/app/api/tools/ssh/upload-file/route.ts
+++ b/apps/sim/app/api/tools/ssh/upload-file/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import type { Client, SFTPWrapper } from 'ssh2'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSSHConnection, sanitizePath } from '@/app/api/tools/ssh/utils'
 
 const logger = createLogger('SSHUploadFileAPI')
@@ -35,7 +35,7 @@ function getSFTP(client: Client): Promise<SFTPWrapper> {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/ssh/write-file-content/route.ts b/apps/sim/app/api/tools/ssh/write-file-content/route.ts
index ede5252004c..77a180b9dae 100644
--- a/apps/sim/app/api/tools/ssh/write-file-content/route.ts
+++ b/apps/sim/app/api/tools/ssh/write-file-content/route.ts
@@ -1,9 +1,9 @@
-import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import type { Client, SFTPWrapper } from 'ssh2'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createSSHConnection, sanitizePath } from '@/app/api/tools/ssh/utils'
 
 const logger = createLogger('SSHWriteFileContentAPI')
@@ -34,7 +34,7 @@ function getSFTP(client: Client): Promise<SFTPWrapper> {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const auth = await checkInternalAuth(request)
diff --git a/apps/sim/app/api/tools/stt/route.ts b/apps/sim/app/api/tools/stt/route.ts
index aaacadd5a69..e45bb273f06 100644
--- a/apps/sim/app/api/tools/stt/route.ts
+++ b/apps/sim/app/api/tools/stt/route.ts
@@ -7,6 +7,7 @@ import {
   secureFetchWithPinnedIP,
   validateUrlWithDNS,
 } from '@/lib/core/security/input-validation.server'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getMimeTypeFromExtension, isInternalFileUrl } from '@/lib/uploads/utils/file-utils'
 import {
   downloadFileFromStorage,
@@ -45,7 +46,7 @@ interface SttRequestBody {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = crypto.randomUUID()
+  const requestId = generateId()
   logger.info(`[${requestId}] STT transcription request started`)
 
   try {
diff --git a/apps/sim/app/api/tools/tts/unified/route.ts b/apps/sim/app/api/tools/tts/unified/route.ts
index c8b6b89c930..5b6ba35198a 100644
--- a/apps/sim/app/api/tools/tts/unified/route.ts
+++ b/apps/sim/app/api/tools/tts/unified/route.ts
@@ -4,6 +4,7 @@ import { NextResponse } from 'next/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { validateAlphanumericId } from '@/lib/core/security/input-validation'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { StorageService } from '@/lib/uploads'
 import type {
   AzureTtsParams,
@@ -83,7 +84,7 @@ interface TtsUnifiedRequestBody {
 }
 
 export async function POST(request: NextRequest) {
-  const requestId = crypto.randomUUID()
+  const requestId = generateId()
   logger.info(`[${requestId}] TTS unified request started`)
 
   try {
diff --git a/apps/sim/app/api/tools/video/route.ts b/apps/sim/app/api/tools/video/route.ts
index 258928289eb..3a5a5b817f7 100644
--- a/apps/sim/app/api/tools/video/route.ts
+++ b/apps/sim/app/api/tools/video/route.ts
@@ -2,6 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
+import { generateId } from '@/lib/core/utils/uuid'
 import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server'
 import type { UserFile } from '@/executor/types'
 import type { VideoRequestBody } from '@/tools/video/types'
@@ -12,7 +13,7 @@ export const dynamic = 'force-dynamic'
 export const maxDuration = 600 // 10 minutes for video generation
 
 export async function POST(request: NextRequest) {
-  const requestId = crypto.randomUUID()
+  const requestId = generateId()
   logger.info(`[${requestId}] Video generation request started`)
 
   try {
diff --git a/apps/sim/app/api/users/me/api-keys/route.ts b/apps/sim/app/api/users/me/api-keys/route.ts
index 25a63120875..173bc01be7a 100644
--- a/apps/sim/app/api/users/me/api-keys/route.ts
+++ b/apps/sim/app/api/users/me/api-keys/route.ts
@@ -2,11 +2,11 @@ import { db } from '@sim/db'
 import { apiKey } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createApiKey, getApiKeyDisplayFormat } from '@/lib/api-key/auth'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('ApiKeysAPI')
 
@@ -96,7 +96,7 @@ export async function POST(request: NextRequest) {
     const [newKey] = await db
       .insert(apiKey)
       .values({
-        id: nanoid(),
+        id: generateShortId(),
         userId,
         workspaceId: null,
         name,
diff --git a/apps/sim/app/api/users/me/settings/route.ts b/apps/sim/app/api/users/me/settings/route.ts
index b1277754c32..84876b67071 100644
--- a/apps/sim/app/api/users/me/settings/route.ts
+++ b/apps/sim/app/api/users/me/settings/route.ts
@@ -2,11 +2,11 @@ import { db } from '@sim/db'
 import { settings } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('UserSettingsAPI')
 
@@ -108,7 +108,7 @@ export async function PATCH(request: Request) {
       await db
         .insert(settings)
         .values({
-          id: nanoid(),
+          id: generateShortId(),
           userId,
           ...validatedData,
           updatedAt: new Date(),
diff --git a/apps/sim/app/api/v1/admin/credits/route.ts b/apps/sim/app/api/v1/admin/credits/route.ts
index 93276f8afc3..feaec3b95d9 100644
--- a/apps/sim/app/api/v1/admin/credits/route.ts
+++ b/apps/sim/app/api/v1/admin/credits/route.ts
@@ -27,7 +27,6 @@ import { db } from '@sim/db'
 import { organization, subscription, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { addCredits } from '@/lib/billing/credits/balance'
 import { setUsageLimitForCredits } from '@/lib/billing/credits/purchase'
@@ -36,6 +35,7 @@ import {
   ENTITLED_SUBSCRIPTION_STATUSES,
   getEffectiveSeats,
 } from '@/lib/billing/subscriptions/utils'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { withAdminAuth } from '@/app/api/v1/admin/middleware'
 import {
   badRequestResponse,
@@ -148,7 +148,7 @@ export const POST = withAdminAuth(async (request) => {
 
       if (!existingStats) {
         await db.insert(userStats).values({
-          id: nanoid(),
+          id: generateShortId(),
           userId: entityId,
         })
       }
diff --git a/apps/sim/app/api/v1/admin/organizations/route.ts b/apps/sim/app/api/v1/admin/organizations/route.ts
index 5cac5aba078..f4da57737e6 100644
--- a/apps/sim/app/api/v1/admin/organizations/route.ts
+++ b/apps/sim/app/api/v1/admin/organizations/route.ts
@@ -21,11 +21,11 @@
  * Response: AdminSingleResponse<AdminOrganization & { memberId: string }>
  */
 
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { member, organization, user } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { count, eq } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { withAdminAuth } from '@/app/api/v1/admin/middleware'
 import {
   badRequestResponse,
@@ -108,8 +108,8 @@ export const POST = withAdminAuth(async (request) => {
         .replace(/[^a-z0-9]+/g, '-')
         .replace(/^-|-$/g, '')
 
-    const organizationId = randomUUID()
-    const memberId = randomUUID()
+    const organizationId = generateId()
+    const memberId = generateId()
     const now = new Date()
 
     await db.transaction(async (tx) => {
diff --git a/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts b/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts
index 5e863c82ab9..1639db0baea 100644
--- a/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts
+++ b/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts
@@ -22,9 +22,9 @@ import { db } from '@sim/db'
 import { member, organization, subscription, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq, or } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { isOrgPlan } from '@/lib/billing/plan-helpers'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
 import {
   badRequestResponse,
@@ -232,7 +232,7 @@ export const PATCH = withAdminAuthParams<RouteParams>(async (request, context) =
       await db.update(userStats).set(updateData).where(eq(userStats.userId, userId))
     } else {
       await db.insert(userStats).values({
-        id: nanoid(),
+        id: generateShortId(),
         userId,
         ...updateData,
       })
diff --git a/apps/sim/app/api/v1/admin/workflows/import/route.ts b/apps/sim/app/api/v1/admin/workflows/import/route.ts
index d5907ce3995..1d384f0cf6b 100644
--- a/apps/sim/app/api/v1/admin/workflows/import/route.ts
+++ b/apps/sim/app/api/v1/admin/workflows/import/route.ts
@@ -19,6 +19,7 @@ import { workflow, workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
+import { generateId } from '@/lib/core/utils/uuid'
 import { parseWorkflowJson } from '@/lib/workflows/operations/import-export'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { deduplicateWorkflowName } from '@/lib/workflows/utils'
@@ -92,7 +93,7 @@ export const POST = withAdminAuth(async (request) => {
       description: workflowDescription,
     } = extractWorkflowMetadata(parsedWorkflow, overrideName)
 
-    const workflowId = crypto.randomUUID()
+    const workflowId = generateId()
     const now = new Date()
     const dedupedName = await deduplicateWorkflowName(workflowName, workspaceId, folderId || null)
 
@@ -122,7 +123,7 @@ export const POST = withAdminAuth(async (request) => {
     if (workflowData.variables && Array.isArray(workflowData.variables)) {
       const variablesRecord: Record<string, WorkflowVariable> = {}
       workflowData.variables.forEach((v) => {
-        const varId = v.id || crypto.randomUUID()
+        const varId = v.id || generateId()
         variablesRecord[varId] = {
           id: varId,
           name: v.name,
diff --git a/apps/sim/app/api/v1/admin/workspaces/[id]/import/route.ts b/apps/sim/app/api/v1/admin/workspaces/[id]/import/route.ts
index 15830d2e6dd..adcc927785d 100644
--- a/apps/sim/app/api/v1/admin/workspaces/[id]/import/route.ts
+++ b/apps/sim/app/api/v1/admin/workspaces/[id]/import/route.ts
@@ -28,6 +28,7 @@ import { workflow, workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   extractWorkflowName,
   extractWorkflowsFromZip,
@@ -126,7 +127,7 @@ export const POST = withAdminAuthParams<RouteParams>(async (request, context) =>
 
     let rootFolderId: string | undefined
     if (rootFolderName && createFolders) {
-      rootFolderId = crypto.randomUUID()
+      rootFolderId = generateId()
       await db.insert(workflowFolder).values({
         id: rootFolderId,
         name: rootFolderName,
@@ -203,7 +204,7 @@ async function importSingleWorkflow(
         const fullPath = rootFolderId ? `root/${pathSegment}` : pathSegment
 
         if (!folderMap.has(fullPath)) {
-          const folderId = crypto.randomUUID()
+          const folderId = generateId()
           await db.insert(workflowFolder).values({
             id: folderId,
             name: wf.folderPath[i],
@@ -234,7 +235,7 @@ async function importSingleWorkflow(
       }
     })()
     const { color: workflowColor } = extractWorkflowMetadata(parsedContent)
-    const workflowId = crypto.randomUUID()
+    const workflowId = generateId()
     const now = new Date()
     const dedupedName = await deduplicateWorkflowName(workflowName, workspaceId, targetFolderId)
 
@@ -269,7 +270,7 @@ async function importSingleWorkflow(
     if (workflowData.variables && Array.isArray(workflowData.variables)) {
       const variablesRecord: Record<string, WorkflowVariable> = {}
       workflowData.variables.forEach((v) => {
-        const varId = v.id || crypto.randomUUID()
+        const varId = v.id || generateId()
         variablesRecord[varId] = {
           id: varId,
           name: v.name,
diff --git a/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts b/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts
index 78b70b7d52e..d9a399268fd 100644
--- a/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts
+++ b/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts
@@ -30,11 +30,11 @@
  * Response: AdminSingleResponse<{ removed: true }>
  */
 
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import { permissions, user, workspaceEnvironment } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, count, eq } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
 import { getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
@@ -209,7 +209,7 @@ export const POST = withAdminAuthParams<RouteParams>(async (request, context) =>
     }
 
     const now = new Date()
-    const permissionId = crypto.randomUUID()
+    const permissionId = generateId()
 
     await db.insert(permissions).values({
       id: permissionId,
diff --git a/apps/sim/app/api/v1/audit-logs/[id]/route.ts b/apps/sim/app/api/v1/audit-logs/[id]/route.ts
index 3cf6351d2bd..948a034afc0 100644
--- a/apps/sim/app/api/v1/audit-logs/[id]/route.ts
+++ b/apps/sim/app/api/v1/audit-logs/[id]/route.ts
@@ -15,6 +15,7 @@ import { auditLog, workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
+import { generateId } from '@/lib/core/utils/uuid'
 import { validateEnterpriseAuditAccess } from '@/app/api/v1/audit-logs/auth'
 import { formatAuditLogEntry } from '@/app/api/v1/audit-logs/format'
 import { createApiResponse, getUserLimits } from '@/app/api/v1/logs/meta'
@@ -25,7 +26,7 @@ const logger = createLogger('V1AuditLogDetailAPI')
 export const revalidate = 0
 
 export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = crypto.randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const rateLimit = await checkRateLimit(request, 'audit-logs')
diff --git a/apps/sim/app/api/v1/audit-logs/route.ts b/apps/sim/app/api/v1/audit-logs/route.ts
index 825cf376203..5a090391da4 100644
--- a/apps/sim/app/api/v1/audit-logs/route.ts
+++ b/apps/sim/app/api/v1/audit-logs/route.ts
@@ -25,6 +25,7 @@ import { createLogger } from '@sim/logger'
 import { and, desc, eq, gte, inArray, lt, lte, or, type SQL } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
+import { generateId } from '@/lib/core/utils/uuid'
 import { validateEnterpriseAuditAccess } from '@/app/api/v1/audit-logs/auth'
 import { formatAuditLogEntry } from '@/app/api/v1/audit-logs/format'
 import { createApiResponse, getUserLimits } from '@/app/api/v1/logs/meta'
@@ -74,7 +75,7 @@ function decodeCursor(cursor: string): CursorData | null {
 }
 
 export async function GET(request: NextRequest) {
-  const requestId = crypto.randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const rateLimit = await checkRateLimit(request, 'audit-logs')
diff --git a/apps/sim/app/api/v1/copilot/chat/route.ts b/apps/sim/app/api/v1/copilot/chat/route.ts
index 09a5a70f3e1..52be435d681 100644
--- a/apps/sim/app/api/v1/copilot/chat/route.ts
+++ b/apps/sim/app/api/v1/copilot/chat/route.ts
@@ -4,6 +4,7 @@ import { z } from 'zod'
 import { createRunSegment } from '@/lib/copilot/async-runs/repository'
 import { COPILOT_REQUEST_MODES } from '@/lib/copilot/models'
 import { orchestrateCopilotStream } from '@/lib/copilot/orchestrator'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getWorkflowById, resolveWorkflowIdForUser } from '@/lib/workflows/utils'
 import { authenticateV1Request } from '@/app/api/v1/auth'
 
@@ -80,9 +81,9 @@ export async function POST(req: NextRequest) {
     const transportMode = effectiveMode === 'build' ? 'agent' : effectiveMode
 
     // Always generate a chatId - required for artifacts system to work with subagents
-    const chatId = parsed.chatId || crypto.randomUUID()
+    const chatId = parsed.chatId || generateId()
 
-    messageId = crypto.randomUUID()
+    messageId = generateId()
     const reqLogger = logger.withMetadata({ messageId })
     reqLogger.info('Received headless copilot chat start request', {
       workflowId: resolved.workflowId,
@@ -102,8 +103,8 @@ export async function POST(req: NextRequest) {
       chatId,
     }
 
-    const executionId = crypto.randomUUID()
-    const runId = crypto.randomUUID()
+    const executionId = generateId()
+    const runId = generateId()
 
     await createRunSegment({
       id: runId,
diff --git a/apps/sim/app/api/v1/logs/[id]/route.ts b/apps/sim/app/api/v1/logs/[id]/route.ts
index 6e5176c5760..e9b33de99ff 100644
--- a/apps/sim/app/api/v1/logs/[id]/route.ts
+++ b/apps/sim/app/api/v1/logs/[id]/route.ts
@@ -3,6 +3,7 @@ import { permissions, workflow, workflowExecutionLogs } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
+import { generateId } from '@/lib/core/utils/uuid'
 import { createApiResponse, getUserLimits } from '@/app/api/v1/logs/meta'
 import { checkRateLimit, createRateLimitResponse } from '@/app/api/v1/middleware'
 
@@ -11,7 +12,7 @@ const logger = createLogger('V1LogDetailsAPI')
 export const revalidate = 0
 
 export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = crypto.randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const rateLimit = await checkRateLimit(request, 'logs-detail')
diff --git a/apps/sim/app/api/v1/logs/route.ts b/apps/sim/app/api/v1/logs/route.ts
index bc9562fd273..cab370d8141 100644
--- a/apps/sim/app/api/v1/logs/route.ts
+++ b/apps/sim/app/api/v1/logs/route.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildLogFilters, getOrderBy } from '@/app/api/v1/logs/filters'
 import { createApiResponse, getUserLimits } from '@/app/api/v1/logs/meta'
 import { checkRateLimit, createRateLimitResponse } from '@/app/api/v1/middleware'
@@ -53,7 +54,7 @@ function decodeCursor(cursor: string): CursorData | null {
 }
 
 export async function GET(request: NextRequest) {
-  const requestId = crypto.randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const rateLimit = await checkRateLimit(request, 'logs')
diff --git a/apps/sim/app/api/v1/workflows/[id]/route.ts b/apps/sim/app/api/v1/workflows/[id]/route.ts
index 9fe825e6224..15a97f9b9ad 100644
--- a/apps/sim/app/api/v1/workflows/[id]/route.ts
+++ b/apps/sim/app/api/v1/workflows/[id]/route.ts
@@ -3,6 +3,7 @@ import { workflowBlocks } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getActiveWorkflowRecord } from '@/lib/workflows/active-context'
 import { extractInputFieldsFromBlocks } from '@/lib/workflows/input-format'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -14,7 +15,7 @@ const logger = createLogger('V1WorkflowDetailsAPI')
 export const revalidate = 0
 
 export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = crypto.randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const rateLimit = await checkRateLimit(request, 'workflow-detail')
diff --git a/apps/sim/app/api/v1/workflows/route.ts b/apps/sim/app/api/v1/workflows/route.ts
index 267650aff10..718f0afb37f 100644
--- a/apps/sim/app/api/v1/workflows/route.ts
+++ b/apps/sim/app/api/v1/workflows/route.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, asc, eq, gt, isNull, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import { createApiResponse, getUserLimits } from '@/app/api/v1/logs/meta'
 import { checkRateLimit, createRateLimitResponse } from '@/app/api/v1/middleware'
@@ -40,7 +41,7 @@ function decodeCursor(cursor: string): CursorData | null {
 }
 
 export async function GET(request: NextRequest) {
-  const requestId = crypto.randomUUID().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
 
   try {
     const rateLimit = await checkRateLimit(request, 'workflows')
diff --git a/apps/sim/app/api/webhooks/agentmail/route.ts b/apps/sim/app/api/webhooks/agentmail/route.ts
index 7486a24556e..25e87f1de35 100644
--- a/apps/sim/app/api/webhooks/agentmail/route.ts
+++ b/apps/sim/app/api/webhooks/agentmail/route.ts
@@ -12,8 +12,8 @@ import { tasks } from '@trigger.dev/sdk'
 import { and, eq, gt, ne, sql } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { Webhook } from 'svix'
-import { v4 as uuidv4 } from 'uuid'
 import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
+import { generateId } from '@/lib/core/utils/uuid'
 import { executeInboxTask } from '@/lib/mothership/inbox/executor'
 import type { AgentMailWebhookPayload, RejectionReason } from '@/lib/mothership/inbox/types'
 
@@ -137,7 +137,7 @@ export async function POST(req: Request) {
 
     const fromName = extractDisplayName(message.from_)
 
-    const taskId = uuidv4()
+    const taskId = generateId()
     const bodyText = message.text?.substring(0, 50_000) || null
     const bodyHtml = message.html?.substring(0, 50_000) || null
     const bodyPreview = (bodyText || '')?.substring(0, 200) || null
@@ -254,7 +254,7 @@ async function createRejectedTask(
   reason: RejectionReason
 ): Promise<void> {
   await db.insert(mothershipInboxTask).values({
-    id: uuidv4(),
+    id: generateId(),
     workspaceId,
     fromEmail: extractSenderEmail(message.from_) || 'unknown',
     fromName: extractDisplayName(message.from_),
diff --git a/apps/sim/app/api/webhooks/poll/gmail/route.ts b/apps/sim/app/api/webhooks/poll/gmail/route.ts
index 7b8f6c250b0..5eabf8b9b63 100644
--- a/apps/sim/app/api/webhooks/poll/gmail/route.ts
+++ b/apps/sim/app/api/webhooks/poll/gmail/route.ts
@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { pollGmailWebhooks } from '@/lib/webhooks/gmail-polling-service'
 
 const logger = createLogger('GmailPollingAPI')
@@ -14,7 +14,7 @@ const LOCK_KEY = 'gmail-polling-lock'
 const LOCK_TTL_SECONDS = 180 // Same as maxDuration (3 min)
 
 export async function GET(request: NextRequest) {
-  const requestId = nanoid()
+  const requestId = generateShortId()
   logger.info(`Gmail webhook polling triggered (${requestId})`)
 
   let lockValue: string | undefined
diff --git a/apps/sim/app/api/webhooks/poll/imap/route.ts b/apps/sim/app/api/webhooks/poll/imap/route.ts
index 1759f43c0b4..29826e04bff 100644
--- a/apps/sim/app/api/webhooks/poll/imap/route.ts
+++ b/apps/sim/app/api/webhooks/poll/imap/route.ts
@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { pollImapWebhooks } from '@/lib/webhooks/imap-polling-service'
 
 const logger = createLogger('ImapPollingAPI')
@@ -14,7 +14,7 @@ const LOCK_KEY = 'imap-polling-lock'
 const LOCK_TTL_SECONDS = 180 // Same as maxDuration (3 min)
 
 export async function GET(request: NextRequest) {
-  const requestId = nanoid()
+  const requestId = generateShortId()
   logger.info(`IMAP webhook polling triggered (${requestId})`)
 
   let lockValue: string | undefined
diff --git a/apps/sim/app/api/webhooks/poll/outlook/route.ts b/apps/sim/app/api/webhooks/poll/outlook/route.ts
index c7266fa6363..2a72c34f86a 100644
--- a/apps/sim/app/api/webhooks/poll/outlook/route.ts
+++ b/apps/sim/app/api/webhooks/poll/outlook/route.ts
@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { pollOutlookWebhooks } from '@/lib/webhooks/outlook-polling-service'
 
 const logger = createLogger('OutlookPollingAPI')
@@ -14,7 +14,7 @@ const LOCK_KEY = 'outlook-polling-lock'
 const LOCK_TTL_SECONDS = 180 // Same as maxDuration (3 min)
 
 export async function GET(request: NextRequest) {
-  const requestId = nanoid()
+  const requestId = generateShortId()
   logger.info(`Outlook webhook polling triggered (${requestId})`)
 
   let lockValue: string | undefined
diff --git a/apps/sim/app/api/webhooks/poll/rss/route.ts b/apps/sim/app/api/webhooks/poll/rss/route.ts
index 1f9201ee7d2..cd221abe394 100644
--- a/apps/sim/app/api/webhooks/poll/rss/route.ts
+++ b/apps/sim/app/api/webhooks/poll/rss/route.ts
@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { pollRssWebhooks } from '@/lib/webhooks/rss-polling-service'
 
 const logger = createLogger('RssPollingAPI')
@@ -14,7 +14,7 @@ const LOCK_KEY = 'rss-polling-lock'
 const LOCK_TTL_SECONDS = 180 // Same as maxDuration (3 min)
 
 export async function GET(request: NextRequest) {
-  const requestId = nanoid()
+  const requestId = generateShortId()
   logger.info(`RSS webhook polling triggered (${requestId})`)
 
   let lockValue: string | undefined
diff --git a/apps/sim/app/api/webhooks/route.ts b/apps/sim/app/api/webhooks/route.ts
index e58baa8d54c..ea17b75cefe 100644
--- a/apps/sim/app/api/webhooks/route.ts
+++ b/apps/sim/app/api/webhooks/route.ts
@@ -2,12 +2,12 @@ import { db } from '@sim/db'
 import { permissions, webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, desc, eq, inArray, isNull, or } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId, generateShortId } from '@/lib/core/utils/uuid'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { resolveEnvVarsInObject } from '@/lib/webhooks/env-resolver'
@@ -247,7 +247,7 @@ export async function POST(request: NextRequest) {
 
         // If still no path, generate a new dummy path (first-time save)
         if (!finalPath || finalPath.trim() === '') {
-          finalPath = `${provider}-${crypto.randomUUID()}`
+          finalPath = `${provider}-${generateId()}`
           logger.info(`[${requestId}] Generated webhook path for ${provider} trigger: ${finalPath}`)
         }
       } else {
@@ -492,7 +492,7 @@ export async function POST(request: NextRequest) {
 
     let externalSubscriptionCreated = false
     const createTempWebhookData = (providerConfigOverride = resolvedProviderConfig) => ({
-      id: targetWebhookId || nanoid(),
+      id: targetWebhookId || generateShortId(),
       path: finalPath,
       provider,
       providerConfig: providerConfigOverride,
@@ -579,7 +579,7 @@ export async function POST(request: NextRequest) {
         })
       } else {
         // Create a new webhook
-        const webhookId = nanoid()
+        const webhookId = generateShortId()
         logger.info(`[${requestId}] Creating new webhook with ID: ${webhookId}`)
         const newResult = await db
           .insert(webhook)
diff --git a/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts b/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
index 7938123e1d1..7ee5d198f3f 100644
--- a/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
+++ b/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
@@ -414,12 +414,6 @@ describe('Webhook Trigger API Route', () => {
     handleWhatsAppVerificationMock.mockResolvedValue(null)
     processGenericDeduplicationMock.mockResolvedValue(null)
     processWebhookMock.mockResolvedValue(new Response('Webhook processed', { status: 200 }))
-
-    if ((global as any).crypto?.randomUUID) {
-      vi.spyOn(crypto, 'randomUUID').mockRestore()
-    }
-
-    vi.spyOn(crypto, 'randomUUID').mockReturnValue('mock-uuid-12345')
   })
 
   afterEach(() => {
diff --git a/apps/sim/app/api/workflows/[id]/execute/route.async.test.ts b/apps/sim/app/api/workflows/[id]/execute/route.async.test.ts
index a800994c004..77feaf9843a 100644
--- a/apps/sim/app/api/workflows/[id]/execute/route.async.test.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.async.test.ts
@@ -93,9 +93,12 @@ vi.mock('@sim/logger', () => {
   return { createLogger: vi.fn(() => createMockLogger()) }
 })
 
-vi.mock('uuid', () => ({
-  validate: vi.fn().mockReturnValue(true),
-  v4: vi.fn().mockReturnValue('execution-123'),
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: vi.fn(() => 'execution-123'),
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 import { POST } from './route'
diff --git a/apps/sim/app/api/workflows/[id]/execute/route.ts b/apps/sim/app/api/workflows/[id]/execute/route.ts
index 37e87cb4de2..d5b484dfaca 100644
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -1,6 +1,5 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { validate as uuidValidate, v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { AuthType, checkHybridAuth, hasExternalApiCredentials } from '@/lib/auth/hybrid'
 import { admissionRejectedResponse, tryAdmit } from '@/lib/core/admission/gate'
@@ -14,6 +13,7 @@ import {
 import { generateRequestId } from '@/lib/core/utils/request'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId, isValidUuid } from '@/lib/core/utils/uuid'
 import {
   DispatchQueueFullError,
   enqueueWorkspaceDispatch,
@@ -133,19 +133,19 @@ function resolveOutputIds(
     const dotIndex = outputId.indexOf('.')
     if (underscoreIndex > 0) {
       const maybeUuid = outputId.substring(0, underscoreIndex)
-      if (uuidValidate(maybeUuid)) {
+      if (isValidUuid(maybeUuid)) {
         return outputId
       }
     }
 
     if (dotIndex > 0) {
       const maybeUuid = outputId.substring(0, dotIndex)
-      if (uuidValidate(maybeUuid)) {
+      if (isValidUuid(maybeUuid)) {
         return `${outputId.substring(0, dotIndex)}_${outputId.substring(dotIndex + 1)}`
       }
     }
 
-    if (uuidValidate(outputId)) {
+    if (isValidUuid(outputId)) {
       return outputId
     }
 
@@ -594,7 +594,7 @@ async function handleExecutePost(
       )
     }
 
-    const executionId = uuidv4()
+    const executionId = generateId()
     reqLogger = reqLogger.withMetadata({ userId, executionId })
 
     reqLogger.info('Starting server-side execution', {
diff --git a/apps/sim/app/api/workflows/route.ts b/apps/sim/app/api/workflows/route.ts
index cab2bbb2324..3615afd0890 100644
--- a/apps/sim/app/api/workflows/route.ts
+++ b/apps/sim/app/api/workflows/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
@@ -162,7 +163,7 @@ export async function POST(req: NextRequest) {
       )
     }
 
-    const workflowId = clientId || crypto.randomUUID()
+    const workflowId = clientId || generateId()
     const now = new Date()
 
     logger.info(`[${requestId}] Creating workflow ${workflowId} for user ${userId}`)
diff --git a/apps/sim/app/api/workspaces/[id]/api-keys/route.ts b/apps/sim/app/api/workspaces/[id]/api-keys/route.ts
index 62638bbb47a..a6a15bb52f2 100644
--- a/apps/sim/app/api/workspaces/[id]/api-keys/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/api-keys/route.ts
@@ -2,7 +2,6 @@ import { db } from '@sim/db'
 import { apiKey } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createApiKey, getApiKeyDisplayFormat } from '@/lib/api-key/auth'
@@ -10,6 +9,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions, getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 
@@ -135,7 +135,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     const [newKey] = await db
       .insert(apiKey)
       .values({
-        id: nanoid(),
+        id: generateShortId(),
         workspaceId,
         userId: userId,
         createdBy: userId,
diff --git a/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts b/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
index 49efb08d59f..65f177b1c55 100644
--- a/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
@@ -2,13 +2,13 @@ import { db } from '@sim/db'
 import { workspaceBYOKKeys } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions, getWorkspaceById } from '@/lib/workspaces/permissions/utils'
 
@@ -186,7 +186,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     const [newKey] = await db
       .insert(workspaceBYOKKeys)
       .values({
-        id: nanoid(),
+        id: generateShortId(),
         workspaceId,
         providerId,
         encryptedApiKey: encrypted,
diff --git a/apps/sim/app/api/workspaces/[id]/environment/route.ts b/apps/sim/app/api/workspaces/[id]/environment/route.ts
index 25bbe66719f..2e118b628d7 100644
--- a/apps/sim/app/api/workspaces/[id]/environment/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/environment/route.ts
@@ -8,6 +8,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
 import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { getUserEntityPermissions, getWorkspaceById } from '@/lib/workspaces/permissions/utils'
@@ -114,7 +115,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
     await db
       .insert(workspaceEnvironment)
       .values({
-        id: crypto.randomUUID(),
+        id: generateId(),
         workspaceId,
         variables: merged,
         createdAt: new Date(),
@@ -199,7 +200,7 @@ export async function DELETE(
     await db
       .insert(workspaceEnvironment)
       .values({
-        id: wsRows[0]?.id || crypto.randomUUID(),
+        id: wsRows[0]?.id || generateId(),
         workspaceId,
         variables: current,
         createdAt: wsRows[0]?.createdAt || new Date(),
diff --git a/apps/sim/app/api/workspaces/[id]/inbox/senders/route.ts b/apps/sim/app/api/workspaces/[id]/inbox/senders/route.ts
index 3b48f75db04..488f819a48f 100644
--- a/apps/sim/app/api/workspaces/[id]/inbox/senders/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/inbox/senders/route.ts
@@ -2,10 +2,10 @@ import { db, mothershipInboxAllowedSender, permissions, user } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { hasInboxAccess } from '@/lib/billing/core/subscription'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('InboxSendersAPI')
@@ -113,7 +113,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
     const [sender] = await db
       .insert(mothershipInboxAllowedSender)
       .values({
-        id: uuidv4(),
+        id: generateId(),
         workspaceId,
         email: normalizedEmail,
         label: label || null,
diff --git a/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts b/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts
index 5e13dc9a540..c1d0c930339 100644
--- a/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts
@@ -4,7 +4,6 @@ import { account, workspaceNotificationSubscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import {
   type EmailRateLimitsData,
   type EmailUsageData,
@@ -14,6 +13,7 @@ import { getSession } from '@/lib/auth'
 import { decryptSecret } from '@/lib/core/security/encryption'
 import { secureFetchWithValidation } from '@/lib/core/security/input-validation.server'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
@@ -41,8 +41,8 @@ function generateSignature(secret: string, timestamp: number, body: string): str
 
 function buildTestPayload(subscription: typeof workspaceNotificationSubscription.$inferSelect) {
   const timestamp = Date.now()
-  const eventId = `evt_test_${uuidv4()}`
-  const executionId = `exec_test_${uuidv4()}`
+  const eventId = `evt_test_${generateId()}`
+  const executionId = `exec_test_${generateId()}`
 
   const payload: Record<string, unknown> = {
     id: eventId,
@@ -120,7 +120,7 @@ async function testWebhook(subscription: typeof workspaceNotificationSubscriptio
 
   const { payload, timestamp } = buildTestPayload(subscription)
   const body = JSON.stringify(payload)
-  const deliveryId = `delivery_test_${uuidv4()}`
+  const deliveryId = `delivery_test_${generateId()}`
 
   const headers: Record<string, string> = {
     'Content-Type': 'application/json',
diff --git a/apps/sim/app/api/workspaces/[id]/notifications/route.ts b/apps/sim/app/api/workspaces/[id]/notifications/route.ts
index c49c451752f..1a18f8d2386 100644
--- a/apps/sim/app/api/workspaces/[id]/notifications/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/notifications/route.ts
@@ -3,11 +3,11 @@ import { workflow, workspaceNotificationSubscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { encryptSecret } from '@/lib/core/security/encryption'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import { MAX_EMAIL_RECIPIENTS, MAX_NOTIFICATIONS_PER_TYPE, MAX_WORKFLOW_IDS } from './constants'
@@ -232,7 +232,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     const [subscription] = await db
       .insert(workspaceNotificationSubscription)
       .values({
-        id: uuidv4(),
+        id: generateId(),
         workspaceId,
         notificationType: data.notificationType,
         workflowIds: data.workflowIds,
diff --git a/apps/sim/app/api/workspaces/[id]/permissions/route.ts b/apps/sim/app/api/workspaces/[id]/permissions/route.ts
index 01d5a01ae9d..f31bce34ba6 100644
--- a/apps/sim/app/api/workspaces/[id]/permissions/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/permissions/route.ts
@@ -1,4 +1,3 @@
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import { permissions, user, workspace, workspaceEnvironment } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -7,6 +6,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
 import { captureServerEvent } from '@/lib/posthog/server'
 import {
@@ -161,7 +161,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
           )
 
         await tx.insert(permissions).values({
-          id: crypto.randomUUID(),
+          id: generateId(),
           userId: update.userId,
           entityType: 'workspace' as const,
           entityId: workspaceId,
diff --git a/apps/sim/app/api/workspaces/invitations/[invitationId]/route.test.ts b/apps/sim/app/api/workspaces/invitations/[invitationId]/route.test.ts
index 6ccb82e0252..5d1681f1052 100644
--- a/apps/sim/app/api/workspaces/invitations/[invitationId]/route.test.ts
+++ b/apps/sim/app/api/workspaces/invitations/[invitationId]/route.test.ts
@@ -143,8 +143,12 @@ vi.mock('drizzle-orm', () => ({
   isNull: vi.fn((field: unknown) => ({ type: 'isNull', field })),
 }))
 
-vi.mock('crypto', () => ({
-  randomUUID: vi.fn().mockReturnValue('mock-uuid-1234'),
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: vi.fn().mockReturnValue('mock-uuid-1234'),
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 import { DELETE, GET } from './route'
diff --git a/apps/sim/app/api/workspaces/invitations/[invitationId]/route.ts b/apps/sim/app/api/workspaces/invitations/[invitationId]/route.ts
index df71f666986..602b60e88cd 100644
--- a/apps/sim/app/api/workspaces/invitations/[invitationId]/route.ts
+++ b/apps/sim/app/api/workspaces/invitations/[invitationId]/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { render } from '@react-email/render'
 import { db } from '@sim/db'
 import {
@@ -16,6 +15,7 @@ import { WorkspaceInvitationEmail } from '@/components/emails'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { syncWorkspaceEnvCredentials } from '@/lib/credentials/environment'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress } from '@/lib/messaging/email/utils'
@@ -147,7 +147,7 @@ export async function GET(
 
       await db.transaction(async (tx) => {
         await tx.insert(permissions).values({
-          id: randomUUID(),
+          id: generateId(),
           entityType: 'workspace' as const,
           entityId: invitation.workspaceId,
           userId: session.user.id,
@@ -325,7 +325,7 @@ export async function POST(
       return NextResponse.json({ error: 'Workspace not found' }, { status: 404 })
     }
 
-    const newToken = randomUUID()
+    const newToken = generateId()
     const newExpiresAt = new Date()
     newExpiresAt.setDate(newExpiresAt.getDate() + 7)
 
diff --git a/apps/sim/app/api/workspaces/invitations/route.test.ts b/apps/sim/app/api/workspaces/invitations/route.test.ts
index 248e721258d..20b697fd8e1 100644
--- a/apps/sim/app/api/workspaces/invitations/route.test.ts
+++ b/apps/sim/app/api/workspaces/invitations/route.test.ts
@@ -58,8 +58,12 @@ const {
   }
 })
 
-vi.mock('crypto', () => ({
-  randomUUID: mockRandomUUID,
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: mockRandomUUID,
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 vi.mock('@/lib/auth', () => ({
diff --git a/apps/sim/app/api/workspaces/invitations/route.ts b/apps/sim/app/api/workspaces/invitations/route.ts
index 4dbcc3152e7..30c91acd22f 100644
--- a/apps/sim/app/api/workspaces/invitations/route.ts
+++ b/apps/sim/app/api/workspaces/invitations/route.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { render } from '@react-email/render'
 import { db } from '@sim/db'
 import {
@@ -17,6 +16,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress } from '@/lib/messaging/email/utils'
 import { captureServerEvent } from '@/lib/posthog/server'
@@ -184,12 +184,12 @@ export async function POST(req: NextRequest) {
       )
     }
 
-    const token = randomUUID()
+    const token = generateId()
     const expiresAt = new Date()
     expiresAt.setDate(expiresAt.getDate() + 7) // 7 days expiry
 
     const invitationData = {
-      id: randomUUID(),
+      id: generateId(),
       workspaceId,
       email,
       inviterId: session.user.id,
diff --git a/apps/sim/app/api/workspaces/route.ts b/apps/sim/app/api/workspaces/route.ts
index 686d6a0a1a2..d64fd05f758 100644
--- a/apps/sim/app/api/workspaces/route.ts
+++ b/apps/sim/app/api/workspaces/route.ts
@@ -7,6 +7,7 @@ import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { getSession } from '@/lib/auth'
 import { PlatformEvents } from '@/lib/core/telemetry'
+import { generateId } from '@/lib/core/utils/uuid'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
@@ -140,8 +141,8 @@ async function createWorkspace(
   skipDefaultWorkflow = false,
   explicitColor?: string
 ) {
-  const workspaceId = crypto.randomUUID()
-  const workflowId = crypto.randomUUID()
+  const workspaceId = generateId()
+  const workflowId = generateId()
   const now = new Date()
   const color = explicitColor || getRandomWorkspaceColor()
 
@@ -159,7 +160,7 @@ async function createWorkspace(
       })
 
       await tx.insert(permissions).values({
-        id: crypto.randomUUID(),
+        id: generateId(),
         entityType: 'workspace' as const,
         entityId: workspaceId,
         userId: userId,
diff --git a/apps/sim/app/changelog/layout.tsx b/apps/sim/app/changelog/layout.tsx
index e392181c182..5095ef2c0e5 100644
--- a/apps/sim/app/changelog/layout.tsx
+++ b/apps/sim/app/changelog/layout.tsx
@@ -1,7 +1,7 @@
 import { getNavBlogPosts } from '@/lib/blog/registry'
 import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
-import Footer from '@/app/(home)/components/footer/footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Footer from '@/app/(landing)/components/footer/footer'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export default async function ChangelogLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
diff --git a/apps/sim/app/chat/[identifier]/chat.tsx b/apps/sim/app/chat/[identifier]/chat.tsx
index 964773cfc15..5d7cf9e6f8f 100644
--- a/apps/sim/app/chat/[identifier]/chat.tsx
+++ b/apps/sim/app/chat/[identifier]/chat.tsx
@@ -2,9 +2,9 @@
 
 import { type RefObject, useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { v4 as uuidv4 } from 'uuid'
 import { noop } from '@/lib/core/utils/request'
-import { getFormattedGitHubStars } from '@/app/(home)/actions/github'
+import { generateId } from '@/lib/core/utils/uuid'
+import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
 import {
   ChatErrorState,
   ChatHeader,
@@ -256,7 +256,7 @@ export default function ChatClient({ identifier }: { identifier: string }) {
 
   useEffect(() => {
     fetchChatConfig()
-    setConversationId(uuidv4())
+    setConversationId(generateId())
 
     getFormattedGitHubStars()
       .then((formattedStars) => {
@@ -303,7 +303,7 @@ export default function ChatClient({ identifier }: { identifier: string }) {
     setUserHasScrolled(false)
 
     const userMessage: ChatMessage = {
-      id: crypto.randomUUID(),
+      id: generateId(),
       content: messageToSend || (files && files.length > 0 ? `Sent ${files.length} file(s)` : ''),
       type: 'user',
       timestamp: new Date(),
@@ -416,7 +416,7 @@ export default function ChatClient({ identifier }: { identifier: string }) {
       logger.error('Error sending message:', error)
       setIsLoading(false)
       const errorMessage: ChatMessage = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         content: CHAT_ERROR_MESSAGES.GENERIC_ERROR,
         type: 'assistant',
         timestamp: new Date(),
diff --git a/apps/sim/app/chat/components/auth/email/email-auth.tsx b/apps/sim/app/chat/components/auth/email/email-auth.tsx
index 651920a8439..6100fde6314 100644
--- a/apps/sim/app/chat/components/auth/email/email-auth.tsx
+++ b/apps/sim/app/chat/components/auth/email/email-auth.tsx
@@ -9,7 +9,7 @@ import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import AuthBackground from '@/app/(auth)/components/auth-background'
 import { AUTH_SUBMIT_BTN } from '@/app/(auth)/components/auth-button-classes'
 import { SupportFooter } from '@/app/(auth)/components/support-footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 const logger = createLogger('EmailAuth')
 
diff --git a/apps/sim/app/chat/components/auth/password/password-auth.tsx b/apps/sim/app/chat/components/auth/password/password-auth.tsx
index 086fe467828..a89f25c16da 100644
--- a/apps/sim/app/chat/components/auth/password/password-auth.tsx
+++ b/apps/sim/app/chat/components/auth/password/password-auth.tsx
@@ -8,7 +8,7 @@ import { cn } from '@/lib/core/utils/cn'
 import AuthBackground from '@/app/(auth)/components/auth-background'
 import { AUTH_SUBMIT_BTN } from '@/app/(auth)/components/auth-button-classes'
 import { SupportFooter } from '@/app/(auth)/components/support-footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 const logger = createLogger('PasswordAuth')
 
diff --git a/apps/sim/app/chat/components/input/input.tsx b/apps/sim/app/chat/components/input/input.tsx
index 31ba5922701..7a282525d03 100644
--- a/apps/sim/app/chat/components/input/input.tsx
+++ b/apps/sim/app/chat/components/input/input.tsx
@@ -6,6 +6,7 @@ import { createLogger } from '@sim/logger'
 import { ArrowUp, Mic, Paperclip, X } from 'lucide-react'
 import { Badge, Tooltip } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { CHAT_ACCEPT_ATTRIBUTE } from '@/lib/uploads/utils/validation'
 import { VoiceInput } from '@/app/chat/components/input/voice-input'
 
@@ -92,7 +93,7 @@ export const ChatInput: React.FC<{
       }
 
       newFiles.push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         name: file.name,
         size: file.size,
         type: file.type,
diff --git a/apps/sim/app/chat/hooks/use-chat-streaming.ts b/apps/sim/app/chat/hooks/use-chat-streaming.ts
index 79dfb02f40a..807cb0a1733 100644
--- a/apps/sim/app/chat/hooks/use-chat-streaming.ts
+++ b/apps/sim/app/chat/hooks/use-chat-streaming.ts
@@ -3,6 +3,7 @@
 import { useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { ChatFile, ChatMessage } from '@/app/chat/components/message/message'
 import { CHAT_ERROR_MESSAGES } from '@/app/chat/constants'
 
@@ -136,7 +137,7 @@ export function useChatStreaming() {
     let lastAudioPosition = 0
 
     const messageIdMap = new Map<string, string>()
-    const messageId = crypto.randomUUID()
+    const messageId = generateId()
 
     const UI_BATCH_MAX_MS = 50
     let uiDirty = false
diff --git a/apps/sim/app/form/[identifier]/components/loading-state.tsx b/apps/sim/app/form/[identifier]/components/loading-state.tsx
index 83a18fb9672..a77bbab23d0 100644
--- a/apps/sim/app/form/[identifier]/components/loading-state.tsx
+++ b/apps/sim/app/form/[identifier]/components/loading-state.tsx
@@ -1,6 +1,6 @@
 import { Skeleton } from '@/components/emcn'
 import AuthBackground from '@/app/(auth)/components/auth-background'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export function FormLoadingState() {
   return (
diff --git a/apps/sim/app/form/[identifier]/components/password-auth.tsx b/apps/sim/app/form/[identifier]/components/password-auth.tsx
index 5f035360a29..e3830e76de0 100644
--- a/apps/sim/app/form/[identifier]/components/password-auth.tsx
+++ b/apps/sim/app/form/[identifier]/components/password-auth.tsx
@@ -7,7 +7,7 @@ import { cn } from '@/lib/core/utils/cn'
 import AuthBackground from '@/app/(auth)/components/auth-background'
 import { AUTH_SUBMIT_BTN } from '@/app/(auth)/components/auth-button-classes'
 import { SupportFooter } from '@/app/(auth)/components/support-footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 interface PasswordAuthProps {
   onSubmit: (password: string) => void
diff --git a/apps/sim/app/form/[identifier]/form.tsx b/apps/sim/app/form/[identifier]/form.tsx
index f46fe4fd644..2b7051b8552 100644
--- a/apps/sim/app/form/[identifier]/form.tsx
+++ b/apps/sim/app/form/[identifier]/form.tsx
@@ -7,7 +7,7 @@ import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
 import AuthBackground from '@/app/(auth)/components/auth-background'
 import { AUTH_SUBMIT_BTN } from '@/app/(auth)/components/auth-button-classes'
 import { SupportFooter } from '@/app/(auth)/components/support-footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 import {
   FormErrorState,
   FormField,
diff --git a/apps/sim/app/invite/components/layout.tsx b/apps/sim/app/invite/components/layout.tsx
index c2e0d8e724c..90125cd0e5e 100644
--- a/apps/sim/app/invite/components/layout.tsx
+++ b/apps/sim/app/invite/components/layout.tsx
@@ -1,5 +1,5 @@
 import { SupportFooter } from '@/app/(auth)/components/support-footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 interface InviteLayoutProps {
   children: React.ReactNode
diff --git a/apps/sim/app/layout.tsx b/apps/sim/app/layout.tsx
index 5863c4405d3..c7b35d1c1fa 100644
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -31,24 +31,6 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <html lang='en' suppressHydrationWarning>
       <head>
-        {/* Polyfill crypto.randomUUID for non-secure contexts (HTTP on non-localhost) */}
-        <script
-          id='crypto-randomuuid-polyfill'
-          dangerouslySetInnerHTML={{
-            __html: `
-              if (typeof crypto !== 'undefined' && typeof crypto.randomUUID !== 'function' && typeof crypto.getRandomValues === 'function') {
-                crypto.randomUUID = function() {
-                  var a = new Uint8Array(16);
-                  crypto.getRandomValues(a);
-                  a[6] = (a[6] & 0x0f) | 0x40;
-                  a[8] = (a[8] & 0x3f) | 0x80;
-                  var h = Array.prototype.map.call(a, function(b) { return ('0' + b.toString(16)).slice(-2); }).join('');
-                  return h.slice(0,8) + '-' + h.slice(8,12) + '-' + h.slice(12,16) + '-' + h.slice(16,20) + '-' + h.slice(20);
-                };
-              }
-            `,
-          }}
-        />
         {isReactScanEnabled && (
           <Script
             src='https://unpkg.com/react-scan/dist/auto.global.js'
diff --git a/apps/sim/app/not-found.tsx b/apps/sim/app/not-found.tsx
index 2d1ab6be6fb..73b95cf2caf 100644
--- a/apps/sim/app/not-found.tsx
+++ b/apps/sim/app/not-found.tsx
@@ -3,7 +3,7 @@ import Link from 'next/link'
 import { getNavBlogPosts } from '@/lib/blog/registry'
 import AuthBackground from '@/app/(auth)/components/auth-background'
 import { AUTH_PRIMARY_CTA_BASE } from '@/app/(auth)/components/auth-button-classes'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 export const metadata: Metadata = {
   title: 'Page Not Found',
diff --git a/apps/sim/app/page.tsx b/apps/sim/app/page.tsx
index c01b92647ef..c5e693a4cac 100644
--- a/apps/sim/app/page.tsx
+++ b/apps/sim/app/page.tsx
@@ -1,6 +1,6 @@
 import type { Metadata } from 'next'
 import { getBaseUrl } from '@/lib/core/utils/urls'
-import Landing from '@/app/(home)/landing'
+import Landing from '@/app/(landing)/landing'
 
 export const revalidate = 3600
 
diff --git a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
index 72dfbcd1c16..ec34adc43ca 100644
--- a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
+++ b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
@@ -24,7 +24,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 import { useBrandConfig } from '@/ee/whitelabeling'
 import type { ResumeStatus } from '@/executor/types'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/data-table.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/data-table.tsx
new file mode 100644
index 00000000000..5e31edcfb55
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/data-table.tsx
@@ -0,0 +1,38 @@
+import { memo } from 'react'
+
+interface DataTableProps {
+  headers: string[]
+  rows: string[][]
+}
+
+export const DataTable = memo(function DataTable({ headers, rows }: DataTableProps) {
+  return (
+    <div className='overflow-x-auto rounded-md border border-[var(--border)]'>
+      <table className='w-full border-collapse text-[13px]'>
+        <thead className='bg-[var(--surface-2)]'>
+          <tr>
+            {headers.map((header, i) => (
+              <th
+                key={i}
+                className='whitespace-nowrap px-3 py-2 text-left font-semibold text-[12px] text-[var(--text-primary)]'
+              >
+                {String(header ?? '')}
+              </th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>
+          {rows.map((row, ri) => (
+            <tr key={ri} className='border-[var(--border)] border-t'>
+              {headers.map((_, ci) => (
+                <td key={ci} className='whitespace-nowrap px-3 py-2 text-[var(--text-secondary)]'>
+                  {String(row[ci] ?? '')}
+                </td>
+              ))}
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  )
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx
index fe8660aa464..f62caa1f51c 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx
@@ -7,6 +7,7 @@ import { Skeleton } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { getFileExtension } from '@/lib/uploads/utils/file-utils'
+import { SUPPORTED_CODE_EXTENSIONS } from '@/lib/uploads/utils/validation'
 import {
   useUpdateWorkspaceFileContent,
   useWorkspaceFileBinary,
@@ -14,6 +15,7 @@ import {
 } from '@/hooks/queries/workspace-files'
 import { useAutosave } from '@/hooks/use-autosave'
 import { useStreamingText } from '@/hooks/use-streaming-text'
+import { DataTable } from './data-table'
 import { PreviewPanel, resolvePreviewType } from './preview-panel'
 
 const logger = createLogger('FileViewer')
@@ -29,6 +31,16 @@ const TEXT_EDITABLE_MIME_TYPES = new Set([
   'application/x-yaml',
   'text/csv',
   'text/html',
+  'text/xml',
+  'application/xml',
+  'text/css',
+  'text/javascript',
+  'application/javascript',
+  'application/typescript',
+  'application/toml',
+  'text/x-python',
+  'text/x-sh',
+  'text/x-sql',
   'image/svg+xml',
 ])
 
@@ -42,6 +54,7 @@ const TEXT_EDITABLE_EXTENSIONS = new Set([
   'html',
   'htm',
   'svg',
+  ...SUPPORTED_CODE_EXTENSIONS,
 ])
 
 const IFRAME_PREVIEWABLE_MIME_TYPES = new Set(['application/pdf'])
@@ -55,11 +68,23 @@ const PPTX_PREVIEWABLE_MIME_TYPES = new Set([
 ])
 const PPTX_PREVIEWABLE_EXTENSIONS = new Set(['pptx'])
 
+const DOCX_PREVIEWABLE_MIME_TYPES = new Set([
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+])
+const DOCX_PREVIEWABLE_EXTENSIONS = new Set(['docx'])
+
+const XLSX_PREVIEWABLE_MIME_TYPES = new Set([
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+])
+const XLSX_PREVIEWABLE_EXTENSIONS = new Set(['xlsx'])
+
 type FileCategory =
   | 'text-editable'
   | 'iframe-previewable'
   | 'image-previewable'
   | 'pptx-previewable'
+  | 'docx-previewable'
+  | 'xlsx-previewable'
   | 'unsupported'
 
 function resolveFileCategory(mimeType: string | null, filename: string): FileCategory {
@@ -67,12 +92,17 @@ function resolveFileCategory(mimeType: string | null, filename: string): FileCat
   if (mimeType && IFRAME_PREVIEWABLE_MIME_TYPES.has(mimeType)) return 'iframe-previewable'
   if (mimeType && IMAGE_PREVIEWABLE_MIME_TYPES.has(mimeType)) return 'image-previewable'
   if (mimeType && PPTX_PREVIEWABLE_MIME_TYPES.has(mimeType)) return 'pptx-previewable'
+  if (mimeType && DOCX_PREVIEWABLE_MIME_TYPES.has(mimeType)) return 'docx-previewable'
+  if (mimeType && XLSX_PREVIEWABLE_MIME_TYPES.has(mimeType)) return 'xlsx-previewable'
 
   const ext = getFileExtension(filename)
-  if (TEXT_EDITABLE_EXTENSIONS.has(ext)) return 'text-editable'
+  const nameKey = ext || filename.toLowerCase()
+  if (TEXT_EDITABLE_EXTENSIONS.has(nameKey)) return 'text-editable'
   if (IFRAME_PREVIEWABLE_EXTENSIONS.has(ext)) return 'iframe-previewable'
   if (IMAGE_PREVIEWABLE_EXTENSIONS.has(ext)) return 'image-previewable'
   if (PPTX_PREVIEWABLE_EXTENSIONS.has(ext)) return 'pptx-previewable'
+  if (DOCX_PREVIEWABLE_EXTENSIONS.has(ext)) return 'docx-previewable'
+  if (XLSX_PREVIEWABLE_EXTENSIONS.has(ext)) return 'xlsx-previewable'
 
   return 'unsupported'
 }
@@ -142,6 +172,14 @@ export function FileViewer({
     return <PptxPreview file={file} workspaceId={workspaceId} streamingContent={streamingContent} />
   }
 
+  if (category === 'docx-previewable') {
+    return <DocxPreview file={file} workspaceId={workspaceId} />
+  }
+
+  if (category === 'xlsx-previewable') {
+    return <XlsxPreview file={file} workspaceId={workspaceId} />
+  }
+
   return <UnsupportedPreview file={file} />
 }
 
@@ -339,16 +377,7 @@ function TextEditor({
   }, [isStreaming, revealedContent])
 
   if (streamingContent === undefined) {
-    if (isLoading) {
-      return (
-        <div className='flex flex-1 flex-col gap-[8px] p-[24px]'>
-          <Skeleton className='h-[16px] w-[60%]' />
-          <Skeleton className='h-[16px] w-[80%]' />
-          <Skeleton className='h-[16px] w-[40%]' />
-          <Skeleton className='h-[16px] w-[70%]' />
-        </div>
-      )
-    }
+    if (isLoading) return DOCUMENT_SKELETON
 
     if (error) {
       return (
@@ -551,6 +580,29 @@ const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileR
   )
 })
 
+function resolvePreviewError(fetchError: Error | null, renderError: string | null): string | null {
+  if (fetchError) return fetchError.message
+  return renderError
+}
+
+function PreviewError({ label, error }: { label: string; error: string }) {
+  return (
+    <div className='flex flex-1 flex-col items-center justify-center gap-[8px]'>
+      <p className='font-medium text-[14px] text-[var(--text-body)]'>Failed to preview {label}</p>
+      <p className='text-[13px] text-[var(--text-muted)]'>{error}</p>
+    </div>
+  )
+}
+
+const DOCUMENT_SKELETON = (
+  <div className='flex flex-1 flex-col gap-[8px] p-[24px]'>
+    <Skeleton className='h-[16px] w-[60%]' />
+    <Skeleton className='h-[16px] w-[80%]' />
+    <Skeleton className='h-[16px] w-[40%]' />
+    <Skeleton className='h-[16px] w-[70%]' />
+  </div>
+)
+
 const pptxSlideCache = new Map<string, string[]>()
 
 function pptxCacheKey(fileId: string, dataUpdatedAt: number, byteLength: number): string {
@@ -769,23 +821,10 @@ function PptxPreview({
     }
   }, [fileData, dataUpdatedAt, streamingContent, cacheKey, workspaceId])
 
-  const error = fetchError
-    ? fetchError instanceof Error
-      ? fetchError.message
-      : 'Failed to load file'
-    : renderError
+  const error = resolvePreviewError(fetchError, renderError)
   const loading = isFetching || rendering
 
-  if (error) {
-    return (
-      <div className='flex flex-1 flex-col items-center justify-center gap-[8px]'>
-        <p className='font-medium text-[14px] text-[var(--text-body)]'>
-          Failed to preview presentation
-        </p>
-        <p className='text-[13px] text-[var(--text-muted)]'>{error}</p>
-      </div>
-    )
-  }
+  if (error) return <PreviewError label='presentation' error={error} />
 
   if (loading && slides.length === 0) {
     return (
@@ -826,6 +865,211 @@ function toggleMarkdownCheckbox(markdown: string, targetIndex: number, checked:
   })
 }
 
+const DocxPreview = memo(function DocxPreview({
+  file,
+  workspaceId,
+}: {
+  file: WorkspaceFileRecord
+  workspaceId: string
+}) {
+  const {
+    data: fileData,
+    isLoading,
+    error: fetchError,
+  } = useWorkspaceFileBinary(workspaceId, file.id, file.key)
+
+  const [html, setHtml] = useState<string | null>(null)
+  const [renderError, setRenderError] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!fileData) return
+    const data = fileData
+
+    let cancelled = false
+
+    async function convert() {
+      try {
+        setRenderError(null)
+        const mammoth = await import('mammoth')
+        const result = await mammoth.convertToHtml({ arrayBuffer: data })
+        if (!cancelled) setHtml(result.value)
+      } catch (err) {
+        if (!cancelled) {
+          const msg = err instanceof Error ? err.message : 'Failed to render document'
+          logger.error('DOCX render failed', { error: msg })
+          setRenderError(msg)
+        }
+      }
+    }
+
+    convert()
+    return () => {
+      cancelled = true
+    }
+  }, [fileData])
+
+  const error = resolvePreviewError(fetchError, renderError)
+  if (error) return <PreviewError label='document' error={error} />
+  if (isLoading || html === null) return DOCUMENT_SKELETON
+
+  return (
+    <div className='flex flex-1 overflow-hidden'>
+      <iframe
+        srcDoc={buildDocxPreviewHtml(html)}
+        sandbox=''
+        title={file.name}
+        className='h-full w-full border-0'
+      />
+    </div>
+  )
+})
+
+/** Wraps mammoth HTML output with base styles. Uses raw hex colors because iframes cannot inherit CSS variables from the parent document. */
+function buildDocxPreviewHtml(html: string): string {
+  return `<!DOCTYPE html><html><head><style>
+body { margin: 0; padding: 24px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; font-size: 14px; line-height: 1.6; color: #e4e4e7; background: transparent; }
+table { border-collapse: collapse; width: 100%; margin: 12px 0; }
+td, th { border: 1px solid #3f3f46; padding: 6px 10px; }
+img { max-width: 100%; height: auto; }
+p { margin: 0 0 8px; }
+h1, h2, h3, h4, h5, h6 { margin: 16px 0 8px; }
+</style></head><body>${html}</body></html>`
+}
+
+const XLSX_MAX_ROWS = 1_000
+
+interface XlsxSheet {
+  name: string
+  headers: string[]
+  rows: string[][]
+  truncated: boolean
+}
+
+const XlsxPreview = memo(function XlsxPreview({
+  file,
+  workspaceId,
+}: {
+  file: WorkspaceFileRecord
+  workspaceId: string
+}) {
+  const {
+    data: fileData,
+    isLoading,
+    error: fetchError,
+  } = useWorkspaceFileBinary(workspaceId, file.id, file.key)
+
+  const [sheetNames, setSheetNames] = useState<string[]>([])
+  const [activeSheet, setActiveSheet] = useState(0)
+  const [currentSheet, setCurrentSheet] = useState<XlsxSheet | null>(null)
+  const [renderError, setRenderError] = useState<string | null>(null)
+  const workbookRef = useRef<import('xlsx').WorkBook | null>(null)
+
+  useEffect(() => {
+    if (!fileData) return
+    const data = fileData
+
+    let cancelled = false
+
+    async function parse() {
+      try {
+        setRenderError(null)
+        const XLSX = await import('xlsx')
+        const workbook = XLSX.read(new Uint8Array(data), { type: 'array' })
+        if (!cancelled) {
+          workbookRef.current = workbook
+          setSheetNames(workbook.SheetNames)
+          setActiveSheet(0)
+        }
+      } catch (err) {
+        if (!cancelled) {
+          const msg = err instanceof Error ? err.message : 'Failed to parse spreadsheet'
+          logger.error('XLSX parse failed', { error: msg })
+          setRenderError(msg)
+        }
+      }
+    }
+
+    parse()
+    return () => {
+      cancelled = true
+    }
+  }, [fileData])
+
+  useEffect(() => {
+    if (sheetNames.length === 0 || !workbookRef.current) return
+
+    let cancelled = false
+
+    async function parseSheet() {
+      try {
+        const XLSX = await import('xlsx')
+        const workbook = workbookRef.current!
+        const name = sheetNames[activeSheet]
+        const sheet = workbook.Sheets[name]
+        const allRows = XLSX.utils.sheet_to_json<string[]>(sheet, { header: 1 })
+        const headers = allRows[0] ?? []
+        const dataRows = allRows.slice(1)
+        const truncated = dataRows.length > XLSX_MAX_ROWS
+        if (!cancelled) {
+          setCurrentSheet({
+            name,
+            headers,
+            rows: truncated ? dataRows.slice(0, XLSX_MAX_ROWS) : dataRows,
+            truncated,
+          })
+        }
+      } catch (err) {
+        if (!cancelled) {
+          const msg = err instanceof Error ? err.message : 'Failed to parse sheet'
+          logger.error('XLSX sheet parse failed', { error: msg })
+          setRenderError(msg)
+        }
+      }
+    }
+
+    parseSheet()
+    return () => {
+      cancelled = true
+    }
+  }, [sheetNames, activeSheet])
+
+  const error = resolvePreviewError(fetchError, renderError)
+  if (error) return <PreviewError label='spreadsheet' error={error} />
+  if (isLoading || currentSheet === null) return DOCUMENT_SKELETON
+
+  return (
+    <div className='flex flex-1 flex-col overflow-hidden'>
+      {sheetNames.length > 1 && (
+        <div className='flex shrink-0 gap-0 border-[var(--border)] border-b bg-[var(--surface-1)]'>
+          {sheetNames.map((name, i) => (
+            <button
+              key={name}
+              type='button'
+              onClick={() => setActiveSheet(i)}
+              className={cn(
+                'px-3 py-1.5 text-[12px] transition-colors',
+                i === activeSheet
+                  ? 'border-[var(--brand-secondary)] border-b-2 font-medium text-[var(--text-primary)]'
+                  : 'text-[var(--text-muted)] hover:text-[var(--text-secondary)]'
+              )}
+            >
+              {name}
+            </button>
+          ))}
+        </div>
+      )}
+      <div className='flex-1 overflow-auto p-6'>
+        <DataTable headers={currentSheet.headers} rows={currentSheet.rows} />
+        {currentSheet.truncated && (
+          <p className='mt-3 text-center text-[12px] text-[var(--text-muted)]'>
+            Showing first {XLSX_MAX_ROWS.toLocaleString()} rows. Download the file to view all data.
+          </p>
+        )}
+      </div>
+    </div>
+  )
+})
+
 const UnsupportedPreview = memo(function UnsupportedPreview({
   file,
 }: {
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx
index 953ceac9039..2e77eae3eb4 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx
@@ -12,6 +12,7 @@ import { cn } from '@/lib/core/utils/cn'
 import { getFileExtension } from '@/lib/uploads/utils/file-utils'
 import { useAutoScroll } from '@/hooks/use-auto-scroll'
 import { useStreamingReveal } from '@/hooks/use-streaming-reveal'
+import { DataTable } from './data-table'
 
 type PreviewType = 'markdown' | 'html' | 'csv' | 'svg' | null
 
@@ -486,33 +487,7 @@ const CsvPreview = memo(function CsvPreview({ content }: { content: string }) {
 
   return (
     <div className='h-full overflow-auto p-6'>
-      <div className='overflow-x-auto rounded-md border border-[var(--border)]'>
-        <table className='w-full border-collapse text-[13px]'>
-          <thead className='bg-[var(--surface-2)]'>
-            <tr>
-              {headers.map((header, i) => (
-                <th
-                  key={i}
-                  className='whitespace-nowrap px-3 py-2 text-left font-semibold text-[12px] text-[var(--text-primary)]'
-                >
-                  {header}
-                </th>
-              ))}
-            </tr>
-          </thead>
-          <tbody>
-            {rows.map((row, ri) => (
-              <tr key={ri} className='border-[var(--border)] border-t'>
-                {headers.map((_, ci) => (
-                  <td key={ci} className='whitespace-nowrap px-3 py-2 text-[var(--text-secondary)]'>
-                    {row[ci] ?? ''}
-                  </td>
-                ))}
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </div>
+      <DataTable headers={headers} rows={rows} />
     </div>
   )
 })
diff --git a/apps/sim/app/workspace/[workspaceId]/files/files.tsx b/apps/sim/app/workspace/[workspaceId]/files/files.tsx
index a4c82e1672e..a16f13eaf7e 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/files.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/files.tsx
@@ -39,6 +39,7 @@ import {
 import {
   isSupportedExtension,
   SUPPORTED_AUDIO_EXTENSIONS,
+  SUPPORTED_CODE_EXTENSIONS,
   SUPPORTED_DOCUMENT_EXTENSIONS,
   SUPPORTED_VIDEO_EXTENSIONS,
 } from '@/lib/uploads/utils/validation'
@@ -83,6 +84,7 @@ const logger = createLogger('Files')
 
 const SUPPORTED_EXTENSIONS = [
   ...SUPPORTED_DOCUMENT_EXTENSIONS,
+  ...SUPPORTED_CODE_EXTENSIONS,
   ...SUPPORTED_AUDIO_EXTENSIONS,
   ...SUPPORTED_VIDEO_EXTENSIONS,
 ] as const
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
index d1a061c1f40..3003704c65a 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -20,6 +20,7 @@ import {
 } from '@/lib/copilot/resource-extraction'
 import { VFS_DIR_TO_RESOURCE } from '@/lib/copilot/resource-types'
 import { isWorkflowToolName } from '@/lib/copilot/workflow-tools'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { invalidateResourceQueries } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
@@ -908,7 +909,7 @@ export function useChat(
       streamingBlocksRef.current = []
       clientExecutionStartedRef.current = extractToolCallIdsFromSnapshot(snapshot)
 
-      const assistantId = crypto.randomUUID()
+      const assistantId = generateId()
 
       const reconnect = async () => {
         const succeeded = await retryReconnectRef.current({
@@ -1886,7 +1887,7 @@ export function useChat(
 
       if (sendingRef.current) {
         const queued: QueuedMessage = {
-          id: crypto.randomUUID(),
+          id: generateId(),
           content: message,
           fileAttachments,
           contexts,
@@ -1901,8 +1902,8 @@ export function useChat(
       setIsSending(true)
       sendingRef.current = true
 
-      const userMessageId = crypto.randomUUID()
-      const assistantId = crypto.randomUUID()
+      const userMessageId = generateId()
+      const assistantId = generateId()
 
       pendingUserMsgRef.current = { id: userMessageId, content: message }
       streamIdRef.current = userMessageId
@@ -2038,7 +2039,7 @@ export function useChat(
           }
           setMessages(previousMessages)
           const queuedMessage: QueuedMessage = {
-            id: crypto.randomUUID(),
+            id: generateId(),
             content: message,
             fileAttachments,
             contexts,
diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
index e81701bac4d..d21b7614f31 100644
--- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx
@@ -25,6 +25,7 @@ import {
 import { Database, DatabaseX } from '@/components/emcn/icons'
 import { SearchHighlight } from '@/components/ui/search-highlight'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { ADD_CONNECTOR_SEARCH_PARAM } from '@/lib/credentials/client-state'
 import { ALL_TAG_SLOTS, type AllTagSlot, getFieldTypeForSlot } from '@/lib/knowledge/constants'
 import type { DocumentSortField, SortOrder } from '@/lib/knowledge/documents/types'
@@ -1407,7 +1408,7 @@ interface TagFilterEntry {
 }
 
 const createEmptyEntry = (): TagFilterEntry => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   tagName: '',
   tagSlot: '',
   fieldType: 'text',
diff --git a/apps/sim/app/workspace/[workspaceId]/providers/global-commands-provider.tsx b/apps/sim/app/workspace/[workspaceId]/providers/global-commands-provider.tsx
index 2d8747efb92..75d4bafec1d 100644
--- a/apps/sim/app/workspace/[workspaceId]/providers/global-commands-provider.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/providers/global-commands-provider.tsx
@@ -12,6 +12,7 @@ import {
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
 import { isMacPlatform } from '@/lib/core/utils/platform'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('GlobalCommands')
 
@@ -92,7 +93,7 @@ export function GlobalCommandsProvider({ children }: { children: ReactNode }) {
   const register = useCallback((commands: GlobalCommand[]) => {
     const createdIds: string[] = []
     for (const cmd of commands) {
-      const id = cmd.id ?? crypto.randomUUID()
+      const id = cmd.id ?? generateId()
       const parsed = parseShortcut(cmd.shortcut)
       registryRef.current.set(id, {
         ...cmd,
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
index 352a0cfd334..ddda31f2a41 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx
@@ -16,7 +16,9 @@ import { CredentialsSkeleton } from '@/app/workspace/[workspaceId]/settings/comp
 import { CustomToolsSkeleton } from '@/app/workspace/[workspaceId]/settings/components/custom-tools/custom-tool-skeleton'
 import { GeneralSkeleton } from '@/app/workspace/[workspaceId]/settings/components/general/general-skeleton'
 import { InboxSkeleton } from '@/app/workspace/[workspaceId]/settings/components/inbox/inbox-skeleton'
+import { IntegrationsSkeleton } from '@/app/workspace/[workspaceId]/settings/components/integrations/integrations-skeleton'
 import { McpSkeleton } from '@/app/workspace/[workspaceId]/settings/components/mcp/mcp-skeleton'
+import { RecentlyDeletedSkeleton } from '@/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted-skeleton'
 import { SkillsSkeleton } from '@/app/workspace/[workspaceId]/settings/components/skills/skill-skeleton'
 import { WorkflowMcpServersSkeleton } from '@/app/workspace/[workspaceId]/settings/components/workflow-mcp-servers/workflow-mcp-servers-skeleton'
 import type { SettingsSection } from '@/app/workspace/[workspaceId]/settings/navigation'
@@ -52,7 +54,7 @@ const Integrations = dynamic(
     import('@/app/workspace/[workspaceId]/settings/components/integrations/integrations').then(
       (m) => m.Integrations
     ),
-  { loading: () => <CredentialsSkeleton /> }
+  { loading: () => <IntegrationsSkeleton /> }
 )
 const Credentials = dynamic(
   () =>
@@ -145,7 +147,7 @@ const RecentlyDeleted = dynamic(
     import(
       '@/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted'
     ).then((m) => m.RecentlyDeleted),
-  { loading: () => <SettingsSectionSkeleton /> }
+  { loading: () => <RecentlyDeletedSkeleton /> }
 )
 const AccessControl = dynamic(
   () => import('@/ee/access-control/components/access-control').then((m) => m.AccessControl),
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton.tsx
index 5fc7bfcf968..5115edac650 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin-skeleton.tsx
@@ -1,5 +1,9 @@
 import { Skeleton } from '@/components/emcn'
 
+/**
+ * Skeleton component for admin settings loading state.
+ * Matches the exact layout structure of the Admin component.
+ */
 export function AdminSkeleton() {
   return (
     <div className='flex h-full flex-col gap-6'>
@@ -7,6 +11,9 @@ export function AdminSkeleton() {
         <Skeleton className='h-[14px] w-[120px]' />
         <Skeleton className='h-[20px] w-[36px] rounded-full' />
       </div>
+
+      <div className='h-px bg-[var(--border-secondary)]' />
+
       <div className='flex flex-col gap-2'>
         <Skeleton className='h-[14px] w-[340px]' />
         <div className='flex gap-2'>
@@ -14,9 +21,51 @@ export function AdminSkeleton() {
           <Skeleton className='h-9 w-[80px] rounded-md' />
         </div>
       </div>
-      <div className='flex flex-col gap-2'>
+
+      <div className='h-px bg-[var(--border-secondary)]' />
+
+      <div className='flex flex-col gap-3'>
         <Skeleton className='h-[14px] w-[120px]' />
-        <Skeleton className='h-[200px] w-full rounded-lg' />
+
+        <div className='flex gap-2'>
+          <Skeleton className='h-9 flex-1 rounded-md' />
+          <Skeleton className='h-9 w-[80px] rounded-md' />
+        </div>
+
+        <div className='flex flex-col gap-0.5'>
+          <div className='flex items-center gap-3 border-[var(--border-secondary)] border-b px-3 py-2'>
+            <Skeleton className='h-[12px] w-[200px]' />
+            <Skeleton className='h-[12px] flex-1' />
+            <Skeleton className='h-[12px] w-[80px]' />
+            <Skeleton className='h-[12px] w-[80px]' />
+            <Skeleton className='h-[12px] w-[250px]' />
+          </div>
+
+          {Array.from({ length: 5 }).map((_, i) => (
+            <div
+              key={i}
+              className='flex items-center gap-3 border-[var(--border-secondary)] border-b px-3 py-2 last:border-b-0'
+            >
+              <Skeleton className='h-[14px] w-[200px]' />
+              <Skeleton className='h-[14px] flex-1' />
+              <Skeleton className='h-[20px] w-[50px] rounded-full' />
+              <Skeleton className='h-[20px] w-[50px] rounded-full' />
+              <div className='flex w-[250px] justify-end gap-1'>
+                <Skeleton className='h-[28px] w-[80px] rounded-md' />
+                <Skeleton className='h-[28px] w-[64px] rounded-md' />
+                <Skeleton className='h-[28px] w-[40px] rounded-md' />
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <div className='flex items-center justify-between'>
+          <Skeleton className='h-[14px] w-[160px]' />
+          <div className='flex gap-1'>
+            <Skeleton className='h-[28px] w-[64px] rounded-md' />
+            <Skeleton className='h-[28px] w-[48px] rounded-md' />
+          </div>
+        </div>
       </div>
     </div>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-key-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-key-skeleton.tsx
index 2840852df87..a4131c5cb77 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-key-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-key-skeleton.tsx
@@ -25,12 +25,31 @@ export function ApiKeysSkeleton() {
   return (
     <div className='flex h-full flex-col gap-4.5'>
       <div className='flex items-center gap-2'>
-        <Skeleton className='h-[30px] flex-1 rounded-lg' />
-        <Skeleton className='h-[30px] w-[80px] rounded-md' />
+        <Skeleton className='h-[38px] flex-1 rounded-lg' />
+        <Skeleton className='h-[38px] w-[90px] rounded-md' />
       </div>
-      <div className='flex flex-col gap-2'>
-        <ApiKeySkeleton />
-        <ApiKeySkeleton />
+
+      <div className='min-h-0 flex-1 overflow-y-auto'>
+        <div className='flex flex-col gap-4.5'>
+          <div className='flex flex-col gap-2'>
+            <Skeleton className='h-5 w-[80px]' />
+            <Skeleton className='h-5 w-[180px]' />
+          </div>
+
+          <div className='flex flex-col gap-2'>
+            <Skeleton className='h-5 w-[60px]' />
+            <ApiKeySkeleton />
+            <ApiKeySkeleton />
+          </div>
+        </div>
+      </div>
+
+      <div className='mt-6 flex items-center justify-between'>
+        <div className='flex items-center gap-2'>
+          <Skeleton className='h-5 w-[170px]' />
+          <Skeleton className='h-3 w-3 rounded-full' />
+        </div>
+        <Skeleton className='h-5 w-9 rounded-full' />
       </div>
     </div>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx
index d60b76eeffd..5db8c7d592f 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx
@@ -158,14 +158,14 @@ export function ApiKeys() {
       <div ref={scrollContainerRef} className='min-h-0 flex-1 overflow-y-auto'>
         {isLoading ? (
           <div className='flex flex-col gap-4.5'>
+            {/* Workspace section header */}
             <div className='flex flex-col gap-2'>
-              <Skeleton className='h-5 w-[70px]' />
-              <div className='text-[var(--text-muted)] text-sm'>
-                <Skeleton className='h-5 w-[140px]' />
-              </div>
+              <Skeleton className='h-5 w-[80px]' />
+              <Skeleton className='h-5 w-[180px]' />
             </div>
+            {/* Personal section header + keys */}
             <div className='flex flex-col gap-2'>
-              <Skeleton className='h-5 w-[55px]' />
+              <Skeleton className='h-5 w-[60px]' />
               <ApiKeySkeleton />
               <ApiKeySkeleton />
             </div>
@@ -310,6 +310,15 @@ export function ApiKeys() {
       </div>
 
       {/* Allow Personal API Keys Toggle - Fixed at bottom */}
+      {isLoading && canManageWorkspaceKeys && (
+        <div className='mt-6 flex items-center justify-between'>
+          <div className='flex items-center gap-2'>
+            <Skeleton className='h-5 w-[170px]' />
+            <Skeleton className='h-3 w-3 rounded-full' />
+          </div>
+          <Skeleton className='h-5 w-9 rounded-full' />
+        </div>
+      )}
       {!isLoading && canManageWorkspaceKeys && (
         <Tooltip.Provider delayDuration={150}>
           <div className='mt-6 flex items-center justify-between'>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok-skeleton.tsx
index de080c3c23b..ead1b66fbc9 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/byok/byok-skeleton.tsx
@@ -9,11 +9,14 @@ export function BYOKKeySkeleton() {
       <div className='flex items-center gap-3'>
         <Skeleton className='h-9 w-9 flex-shrink-0 rounded-md' />
         <div className='flex min-w-0 flex-col justify-center gap-[1px]'>
-          <Skeleton className='h-[14px] w-[100px]' />
-          <Skeleton className='h-[13px] w-[200px]' />
+          <Skeleton className='h-[16px] w-[100px]' />
+          <Skeleton className='h-[14px] w-[200px]' />
         </div>
       </div>
-      <Skeleton className='h-[32px] w-[72px] rounded-md' />
+      <div className='flex flex-shrink-0 items-center gap-2'>
+        <Skeleton className='h-[32px] w-[72px] rounded-md' />
+        <Skeleton className='h-[32px] w-[64px] rounded-md' />
+      </div>
     </div>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credential-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credential-skeleton.tsx
index 32823978561..c6812a3d2de 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credential-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credential-skeleton.tsx
@@ -1,46 +1,70 @@
 import { Skeleton } from '@/components/emcn'
 
-const GRID_COLS = 'grid grid-cols-[minmax(0,1fr)_8px_minmax(0,1fr)_auto] items-center'
+const GRID_COLS = 'grid grid-cols-[minmax(0,1fr)_8px_minmax(0,1fr)_auto_auto] items-center'
+const COL_SPAN_ALL = 'col-span-5'
 
 /**
- * Skeleton component for a single secret row in the grid layout.
+ * Skeleton for a single integration credential row.
  */
 export function CredentialSkeleton() {
   return (
-    <div className={GRID_COLS}>
+    <div className='flex items-center justify-between gap-3'>
+      <div className='flex min-w-0 items-center gap-2.5'>
+        <Skeleton className='h-8 w-8 flex-shrink-0 rounded-md' />
+        <div className='flex min-w-0 flex-col justify-center gap-[1px]'>
+          <Skeleton className='h-4 w-[120px] rounded' />
+          <Skeleton className='h-3.5 w-[160px] rounded' />
+        </div>
+      </div>
+      <div className='flex flex-shrink-0 items-center gap-1'>
+        <Skeleton className='h-9 w-[60px] rounded-md' />
+        <Skeleton className='h-9 w-[88px] rounded-md' />
+      </div>
+    </div>
+  )
+}
+
+/**
+ * Skeleton for a single secret row matching the credentials grid layout.
+ */
+function CredentialRowSkeleton() {
+  return (
+    <div className='contents'>
       <Skeleton className='h-9 rounded-md' />
       <div />
       <Skeleton className='h-9 rounded-md' />
-      <div className='ml-2 flex items-center gap-0'>
-        <Skeleton className='h-9 w-9 rounded-md' />
-        <Skeleton className='h-9 w-9 rounded-md' />
-      </div>
+      <Skeleton className='ml-2 h-9 w-[60px] rounded-md' />
+      <Skeleton className='h-9 w-9 rounded-md' />
     </div>
   )
 }
 
 /**
- * Skeleton for the Secrets section shown during dynamic import loading.
+ * Skeleton for the Credentials (Secrets) page shown during dynamic import loading.
  */
 export function CredentialsSkeleton() {
   return (
     <div className='flex h-full flex-col gap-4'>
       <div className='flex items-center gap-2'>
         <Skeleton className='h-[30px] flex-1 rounded-lg' />
-        <Skeleton className='h-[30px] w-[56px] rounded-md' />
         <Skeleton className='h-[30px] w-[50px] rounded-md' />
       </div>
-      <div className='flex flex-col gap-2'>
-        <Skeleton className='h-5 w-[70px]' />
-        <div className='text-[var(--text-muted)] text-small'>
-          <Skeleton className='h-5 w-[160px]' />
+
+      <div className='min-h-0 flex-1 overflow-y-auto'>
+        <div className='flex flex-col gap-4'>
+          <div className={`${GRID_COLS} gap-y-2`}>
+            <Skeleton className={`${COL_SPAN_ALL} h-5 w-[70px]`} />
+            <CredentialRowSkeleton />
+            <CredentialRowSkeleton />
+
+            <div className={`${COL_SPAN_ALL} h-[8px]`} />
+
+            <Skeleton className={`${COL_SPAN_ALL} h-5 w-[55px]`} />
+            <CredentialRowSkeleton />
+            <CredentialRowSkeleton />
+          </div>
         </div>
       </div>
-      <div className='flex flex-col gap-2'>
-        <Skeleton className='h-5 w-[55px]' />
-        <CredentialSkeleton />
-        <CredentialSkeleton />
-      </div>
     </div>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/custom-tools/custom-tool-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/custom-tools/custom-tool-skeleton.tsx
index 93f2895d768..6fe69f3630c 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/custom-tools/custom-tool-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/custom-tools/custom-tool-skeleton.tsx
@@ -7,11 +7,11 @@ export function CustomToolSkeleton() {
   return (
     <div className='flex items-center justify-between gap-3'>
       <div className='flex min-w-0 flex-col justify-center gap-[1px]'>
-        <Skeleton className='h-[14px] w-[100px]' />
-        <Skeleton className='h-[13px] w-[200px]' />
+        <Skeleton className='h-4 w-[100px]' />
+        <Skeleton className='h-3.5 w-[200px]' />
       </div>
       <div className='flex flex-shrink-0 items-center gap-2'>
-        <Skeleton className='h-[30px] w-[40px] rounded-sm' />
+        <Skeleton className='h-[30px] w-[52px] rounded-sm' />
         <Skeleton className='h-[30px] w-[54px] rounded-sm' />
       </div>
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general-skeleton.tsx
index e58ef57af15..dae014f0bf4 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general-skeleton.tsx
@@ -11,10 +11,10 @@ export function GeneralSkeleton() {
         <Skeleton className='h-9 w-9 rounded-full' />
         <div className='flex flex-1 flex-col justify-center gap-[1px]'>
           <div className='flex items-center gap-2'>
-            <Skeleton className='h-5 w-24' />
+            <Skeleton className='h-4 w-24' />
             <Skeleton className='h-[10.5px] w-[10.5px]' />
           </div>
-          <Skeleton className='h-5 w-40' />
+          <Skeleton className='h-3.5 w-40' />
         </div>
       </div>
 
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/inbox-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/inbox-skeleton.tsx
index 70768951c2d..1948ccb1146 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/inbox-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/inbox/inbox-skeleton.tsx
@@ -8,7 +8,7 @@ export function InboxTaskSkeleton() {
     <div className='flex flex-col gap-1 rounded-lg border border-[var(--border)] p-3'>
       <div className='flex items-center justify-between'>
         <Skeleton className='h-[14px] w-[200px]' />
-        <Skeleton className='h-[14px] w-[50px]' />
+        <Skeleton className='h-[12px] w-[50px]' />
       </div>
       <div className='flex items-center justify-between'>
         <Skeleton className='h-[12px] w-[140px]' />
@@ -20,36 +20,64 @@ export function InboxTaskSkeleton() {
 }
 
 /**
- * Skeleton for the full Inbox section shown during dynamic import loading.
+ * Skeleton for the full Inbox section shown while data is loading.
  */
 export function InboxSkeleton() {
   return (
     <div className='flex h-full flex-col gap-4.5'>
-      <Skeleton className='h-[32px] w-full rounded-lg' />
-      <Skeleton className='h-[20px] w-[140px] rounded-sm' />
-      <Skeleton className='h-[40px] w-full rounded-lg' />
-      <div className='flex flex-col gap-1.5'>
-        <Skeleton className='h-[14px] w-[100px]' />
-        <Skeleton className='h-[13px] w-[200px]' />
-        <Skeleton className='h-[40px] w-full rounded-lg' />
+      <div className='flex items-center justify-between'>
+        <div className='flex flex-col gap-0.5'>
+          <Skeleton className='h-[14px] w-[140px]' />
+          <Skeleton className='h-[13px] w-[260px]' />
+        </div>
+        <Skeleton className='h-[20px] w-[36px] rounded-full' />
       </div>
-      <div className='flex flex-col gap-1.5'>
-        <Skeleton className='h-[14px] w-[120px]' />
-        <Skeleton className='h-[13px] w-[250px]' />
-        <Skeleton className='h-[80px] w-full rounded-lg' />
+
+      <div className='border-[var(--border)] border-t' />
+
+      <div className='flex flex-col gap-6'>
+        <div className='flex flex-col gap-1.5'>
+          <Skeleton className='h-[14px] w-[90px]' />
+          <div className='flex items-center justify-between'>
+            <Skeleton className='h-[13px] w-[200px]' />
+            <div className='flex items-center gap-1.5'>
+              <Skeleton className='h-[12px] w-[12px] rounded-sm' />
+              <Skeleton className='h-[12px] w-[12px] rounded-sm' />
+            </div>
+          </div>
+          <Skeleton className='h-9 w-full rounded-md' />
+        </div>
+
+        <div className='flex flex-col gap-1.5'>
+          <Skeleton className='h-[14px] w-[110px]' />
+          <Skeleton className='h-[13px] w-[260px]' />
+          <div className='mt-1 overflow-hidden rounded-lg border border-[var(--border)]'>
+            <div className='px-3 py-2.5'>
+              <Skeleton className='h-[14px] w-[180px]' />
+            </div>
+            <div className='border-[var(--border)] border-t px-3 py-2.5'>
+              <Skeleton className='h-[14px] w-[160px]' />
+            </div>
+          </div>
+          <Skeleton className='mt-1 h-[32px] w-[100px] rounded-md' />
+        </div>
       </div>
+
       <div className='border-[var(--border)] border-t pt-4'>
         <Skeleton className='h-[14px] w-[40px]' />
         <Skeleton className='mt-0.5 h-[13px] w-[220px]' />
       </div>
-      <div className='flex items-center gap-2'>
-        <Skeleton className='h-[30px] flex-1 rounded-lg' />
-        <Skeleton className='h-[30px] w-[100px] rounded-md' />
-      </div>
-      <div className='flex flex-col gap-1'>
-        <InboxTaskSkeleton />
-        <InboxTaskSkeleton />
-        <InboxTaskSkeleton />
+
+      <div className='flex flex-col gap-3'>
+        <div className='flex items-center gap-2'>
+          <Skeleton className='h-[32px] flex-1 rounded-lg' />
+          <Skeleton className='h-[32px] w-[100px] rounded-md' />
+        </div>
+        <div className='flex flex-col gap-1'>
+          <InboxTaskSkeleton />
+          <InboxTaskSkeleton />
+          <InboxTaskSkeleton />
+        </div>
       </div>
     </div>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-skeleton.tsx
new file mode 100644
index 00000000000..223c274568d
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-skeleton.tsx
@@ -0,0 +1,23 @@
+import { Skeleton } from '@/components/emcn'
+import { CredentialSkeleton } from '@/app/workspace/[workspaceId]/settings/components/credentials/credential-skeleton'
+
+/**
+ * Skeleton for the Integrations section shown during dynamic import loading.
+ */
+export function IntegrationsSkeleton() {
+  return (
+    <div className='flex h-full flex-col gap-4.5'>
+      <div className='flex items-center gap-2'>
+        <Skeleton className='h-[30px] flex-1 rounded-lg' />
+        <Skeleton className='h-[30px] w-[100px] rounded-md' />
+      </div>
+      <div className='min-h-0 flex-1 overflow-y-auto'>
+        <div className='flex flex-col gap-2'>
+          <CredentialSkeleton />
+          <CredentialSkeleton />
+          <CredentialSkeleton />
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-skeleton/mcp-server-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-skeleton/mcp-server-skeleton.tsx
index 87b6f0ce01a..f32b4591c3e 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-skeleton/mcp-server-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/mcp/components/mcp-server-skeleton/mcp-server-skeleton.tsx
@@ -9,10 +9,10 @@ export function McpServerSkeleton() {
     <div className='flex items-center justify-between gap-3'>
       <div className='flex min-w-0 flex-col justify-center gap-[1px]'>
         <div className='flex items-center gap-1.5'>
-          <Skeleton className='h-[14px] w-[100px]' />
-          <Skeleton className='h-[13px] w-[80px]' />
+          <Skeleton className='h-4 w-[100px]' />
+          <Skeleton className='h-3.5 w-[80px]' />
         </div>
-        <Skeleton className='h-[13px] w-[120px]' />
+        <Skeleton className='h-3.5 w-[120px]' />
       </div>
       <div className='flex flex-shrink-0 items-center gap-1'>
         <Skeleton className='h-[30px] w-[60px] rounded-sm' />
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/deleted-item-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/deleted-item-skeleton.tsx
index 58a62e1f52a..e6cf2de3306 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/deleted-item-skeleton.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/deleted-item-skeleton.tsx
@@ -5,7 +5,7 @@ import { Skeleton } from '@/components/emcn'
  */
 export function DeletedItemSkeleton() {
   return (
-    <div className='flex items-center gap-3 px-2 py-2'>
+    <div className='flex items-center gap-3 rounded-md px-2 py-2'>
       <Skeleton className='h-[14px] w-[14px] shrink-0 rounded-[3px]' />
       <div className='flex min-w-0 flex-1 flex-col gap-0.5'>
         <Skeleton className='h-[14px] w-[120px]' />
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted-skeleton.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted-skeleton.tsx
new file mode 100644
index 00000000000..59846faac9a
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted-skeleton.tsx
@@ -0,0 +1,33 @@
+import { Skeleton } from '@/components/emcn'
+import { DeletedItemSkeleton } from '@/app/workspace/[workspaceId]/settings/components/recently-deleted/deleted-item-skeleton'
+
+/**
+ * Skeleton component for the entire Recently Deleted settings section.
+ * Renders placeholder UI for the search bar, sort dropdown, tabs, and item list.
+ */
+export function RecentlyDeletedSkeleton() {
+  return (
+    <div className='flex h-full flex-col gap-4.5'>
+      <div className='flex items-center gap-2'>
+        <Skeleton className='h-[30px] flex-1 rounded-lg' />
+        <Skeleton className='h-[30px] w-[190px] shrink-0 rounded-lg' />
+      </div>
+
+      <div className='relative flex gap-4 border-[var(--border)] border-b px-4'>
+        <Skeleton className='mb-2 h-[20px] w-[32px] rounded-sm' />
+        <Skeleton className='mb-2 h-[20px] w-[72px] rounded-sm' />
+        <Skeleton className='mb-2 h-[20px] w-[52px] rounded-sm' />
+        <Skeleton className='mb-2 h-[20px] w-[112px] rounded-sm' />
+        <Skeleton className='mb-2 h-[20px] w-[40px] rounded-sm' />
+      </div>
+
+      <div className='min-h-0 flex-1 overflow-y-auto'>
+        <div className='flex flex-col gap-2'>
+          <DeletedItemSkeleton />
+          <DeletedItemSkeleton />
+          <DeletedItemSkeleton />
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/components/credit-balance/credit-balance.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/components/credit-balance/credit-balance.tsx
index 87b4e2b8d78..aa71081950a 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/components/credit-balance/credit-balance.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/components/credit-balance/credit-balance.tsx
@@ -14,6 +14,7 @@ import {
   ModalTrigger,
 } from '@/components/emcn'
 import { dollarsToCredits, formatCredits } from '@/lib/billing/credits/conversion'
+import { generateId } from '@/lib/core/utils/uuid'
 import { usePurchaseCredits } from '@/hooks/queries/subscription'
 
 interface CreditBalanceProps {
@@ -60,7 +61,7 @@ export function CreditBalance({
   const openModal = () => {
     clearCloseTimeout()
     resetModalState()
-    setRequestId(crypto.randomUUID())
+    setRequestId(generateId())
     setIsOpen(true)
   }
 
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx
index 07d5046283b..2f9a6fcb9a6 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-filter/table-filter.tsx
@@ -2,7 +2,6 @@
 
 import { memo, useCallback, useMemo, useRef, useState } from 'react'
 import { X } from 'lucide-react'
-import { nanoid } from 'nanoid'
 import {
   Button,
   DropdownMenu,
@@ -11,6 +10,7 @@ import {
   DropdownMenuTrigger,
 } from '@/components/emcn'
 import { ChevronDown, Plus } from '@/components/emcn/icons'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import type { Filter, FilterRule } from '@/lib/table'
 import { COMPARISON_OPERATORS } from '@/lib/table/query-builder/constants'
 import { filterRulesToFilter, filterToRules } from '@/lib/table/query-builder/converters'
@@ -220,7 +220,7 @@ const FilterRuleRow = memo(function FilterRuleRow({
 
 function createRule(columns: Array<{ name: string }>): FilterRule {
   return {
-    id: nanoid(),
+    id: generateShortId(),
     logicalOperator: 'and',
     column: columns[0]?.name ?? '',
     operator: 'eq',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
index 505795fc5c1..edd6f1ed408 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
@@ -31,6 +31,7 @@ import {
   extractPathFromOutputId,
   parseOutputContentSafely,
 } from '@/lib/core/utils/response-format'
+import { generateId } from '@/lib/core/utils/uuid'
 import { CHAT_ACCEPT_ATTRIBUTE } from '@/lib/uploads/utils/validation'
 import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
 import { StartBlockPath, TriggerUtils } from '@/lib/workflows/triggers/triggers'
@@ -654,7 +655,7 @@ export function Chat() {
       if (typeof result !== 'object') return
 
       if ('stream' in result && result.stream instanceof ReadableStream) {
-        const responseMessageId = crypto.randomUUID()
+        const responseMessageId = generateId()
         addMessage({
           id: responseMessageId,
           content: '',
@@ -852,7 +853,7 @@ export function Chat() {
           const defaultType = fieldName === 'files' ? 'file[]' : 'string'
 
           return {
-            id: crypto.randomUUID(),
+            id: generateId(),
             name: fieldName,
             type: defaultType,
             value: '',
@@ -867,7 +868,7 @@ export function Chat() {
 
       const userId = session?.user?.id || 'unknown'
       addToQueue({
-        id: crypto.randomUUID(),
+        id: generateId(),
         operation: {
           operation: 'subblock-update',
           target: 'subblock',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/hooks/use-chat-file-upload.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/hooks/use-chat-file-upload.ts
index 9ef57824cf5..d86a22312d6 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/hooks/use-chat-file-upload.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/hooks/use-chat-file-upload.ts
@@ -1,4 +1,5 @@
 import { useCallback, useState } from 'react'
+import { generateId } from '@/lib/core/utils/uuid'
 
 export interface ChatFile {
   id: string
@@ -53,7 +54,7 @@ export function useChatFileUpload() {
         }
 
         validNewFiles.push({
-          id: crypto.randomUUID(),
+          id: generateId(),
           name: file.name,
           size: file.size,
           type: file.type,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts
index 499b62d1a51..7bf0f2079b5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts
@@ -2,6 +2,7 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import { resolveFileType } from '@/lib/uploads/utils/file-utils'
 
 const logger = createLogger('useFileAttachments')
@@ -122,7 +123,7 @@ export function useFileAttachments(props: UseFileAttachmentsProps) {
         const resolvedType = resolveFileType(file)
 
         const tempFile: AttachedFile = {
-          id: crypto.randomUUID(),
+          id: generateId(),
           name: file.name,
           size: file.size,
           type: resolvedType,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx
index b4afb2fca26..a5864aea640 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx
@@ -19,6 +19,7 @@ import {
 } from '@/components/emcn'
 import type { AgentAuthentication, AgentCapabilities } from '@/lib/a2a/types'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
 import { StartBlockPath, TriggerUtils } from '@/lib/workflows/triggers/triggers'
 import {
@@ -155,7 +156,7 @@ export function A2aDeploy({
     // Add input field if missing (for TextPart)
     if (missingFields.input) {
       newFields.push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         name: 'input',
         type: 'string',
         value: '',
@@ -166,7 +167,7 @@ export function A2aDeploy({
     // Add data field if missing (for DataPart)
     if (missingFields.data) {
       newFields.push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         name: 'data',
         type: 'object',
         value: '',
@@ -177,7 +178,7 @@ export function A2aDeploy({
     // Add files field if missing (for FilePart)
     if (missingFields.files) {
       newFields.push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         name: 'files',
         type: 'file[]',
         value: '',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
index 067b2c29753..c3827f33a56 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
@@ -12,6 +12,7 @@ import {
   Trash,
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { FIELD_TYPE_LABELS, getPlaceholderForFieldType } from '@/lib/knowledge/constants'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
@@ -45,7 +46,7 @@ interface DocumentTagEntryProps {
  * Creates a new document tag with default values
  */
 const createDefaultTag = (): DocumentTag => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   tagName: '',
   fieldType: 'text',
   value: '',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
index 4abb1110183..09e5399f336 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
@@ -3,6 +3,7 @@ import { isEqual } from 'es-toolkit'
 import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { Badge } from '@/components/emcn'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { getBlock } from '@/blocks/registry'
@@ -271,7 +272,7 @@ export const Dropdown = memo(function Dropdown({
             fieldType === 'object' || fieldType === 'array' ? JSON.stringify(value, null, 2) : value
 
           return {
-            id: crypto.randomUUID(),
+            id: generateId(),
             name: key,
             type: fieldType,
             value: fieldValue,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
index d8c9f8a84d6..b115eda4327 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
@@ -4,6 +4,7 @@ import { Button, Input, Textarea, Tooltip } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
@@ -30,7 +31,7 @@ interface EvalInputProps {
 
 // Default values
 const createDefaultMetric = (): EvalMetric => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   name: '',
   description: '',
   range: { min: 0, max: 1 },
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx
index 147b9f3f6c3..02cb4b93dad 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/filter-builder/filter-builder.tsx
@@ -2,6 +2,7 @@
 
 import { useCallback, useMemo } from 'react'
 import type { ComboboxOption } from '@/components/emcn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { useTableColumns } from '@/lib/table/hooks'
 import type { FilterRule } from '@/lib/table/query-builder/constants'
 import { useFilterBuilder } from '@/lib/table/query-builder/use-query-builder'
@@ -20,7 +21,7 @@ interface FilterBuilderProps {
 }
 
 const createDefaultRule = (columns: ComboboxOption[]): FilterRule => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   logicalOperator: 'and',
   column: columns[0]?.value || '',
   operator: 'eq',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
index 5963ec9a829..ec2b3b21254 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
@@ -12,6 +12,7 @@ import {
   Trash,
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { FIELD_TYPE_LABELS, getPlaceholderForFieldType } from '@/lib/knowledge/constants'
 import { type FilterFieldType, getOperatorsForFieldType } from '@/lib/knowledge/filters/types'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
@@ -48,7 +49,7 @@ interface KnowledgeTagFiltersProps {
  * Creates a new filter with default values
  */
 const createDefaultFilter = (): TagFilter => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   tagName: '',
   fieldType: 'text',
   operator: 'eq',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx
index 95170154f18..c706b8e419c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sort-builder/sort-builder.tsx
@@ -2,6 +2,7 @@
 
 import { useCallback, useMemo } from 'react'
 import type { ComboboxOption } from '@/components/emcn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { useTableColumns } from '@/lib/table/hooks'
 import { SORT_DIRECTIONS, type SortRule } from '@/lib/table/query-builder/constants'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
@@ -18,7 +19,7 @@ interface SortBuilderProps {
 }
 
 const createDefaultRule = (columns: ComboboxOption[]): SortRule => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   column: columns[0]?.value || '',
   direction: 'asc',
   collapsed: false,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
index b2b8b96aa45..80e1e215c97 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
@@ -1,6 +1,7 @@
 import { useCallback, useRef } from 'react'
 import { Plus } from 'lucide-react'
 import { Trash } from '@/components/emcn/icons/trash'
+import { generateId } from '@/lib/core/utils/uuid'
 import 'prismjs/components/prism-json'
 import Editor from 'react-simple-code-editor'
 import {
@@ -74,7 +75,7 @@ const BOOLEAN_OPTIONS: ComboboxOption[] = [
  * Creates a new field with default values
  */
 const createDefaultField = (): Field => ({
-  id: crypto.randomUUID(),
+  id: generateId(),
   name: '',
   type: 'string',
   value: '',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx
index 7a155228616..fc4d27748c0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx
@@ -5,6 +5,7 @@ import { Button } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
 import { Input } from '@/components/ui/input'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
@@ -74,7 +75,7 @@ export function Table({
   useEffect(() => {
     if (!isPreview && !disabled && (!Array.isArray(storeValue) || storeValue.length === 0)) {
       const initialRow: WorkflowTableRow = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         cells: { ...emptyCellsTemplate },
       }
       setStoreValue([initialRow])
@@ -86,7 +87,7 @@ export function Table({
     if (!Array.isArray(value) || value.length === 0) {
       return [
         {
-          id: crypto.randomUUID(),
+          id: generateId(),
           cells: { ...emptyCellsTemplate },
         },
       ]
@@ -105,7 +106,7 @@ export function Table({
       }
 
       return {
-        id: row?.id ?? crypto.randomUUID(),
+        id: row?.id ?? generateId(),
         cells: normalizedCells,
       }
     })
@@ -133,7 +134,7 @@ export function Table({
 
     if (rowIndex === rows.length - 1 && newValue !== '') {
       updatedRows.push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         cells: { ...emptyCellsTemplate },
       })
     }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
index c71a48f77bc..5ecb73e01fd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
@@ -12,6 +12,7 @@ import {
 } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
   checkTagTrigger,
@@ -124,7 +125,7 @@ export function VariablesInput({
     if (!isReadOnly && assignments.length === 0 && currentWorkflowVariables.length > 0) {
       const initialAssignment: VariableAssignment = {
         ...DEFAULT_ASSIGNMENT,
-        id: crypto.randomUUID(),
+        id: generateId(),
       }
       setStoreValue([initialAssignment])
     }
@@ -151,7 +152,7 @@ export function VariablesInput({
 
     const newAssignment: VariableAssignment = {
       ...DEFAULT_ASSIGNMENT,
-      id: crypto.randomUUID(),
+      id: generateId(),
     }
     setStoreValue([...assignments, newAssignment])
   }
@@ -160,7 +161,7 @@ export function VariablesInput({
     if (isReadOnly) return
 
     if (assignments.length === 1) {
-      setStoreValue([{ ...DEFAULT_ASSIGNMENT, id: crypto.randomUUID() }])
+      setStoreValue([{ ...DEFAULT_ASSIGNMENT, id: generateId() }])
       return
     }
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
index 8b9ca1fa0a9..32959c8a321 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
@@ -2,8 +2,8 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { useQueryClient } from '@tanstack/react-query'
 import { useParams } from 'next/navigation'
-import { v4 as uuidv4 } from 'uuid'
 import { useShallow } from 'zustand/react/shallow'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
 import { processStreamingBlockLogs } from '@/lib/tokenization'
 import {
@@ -260,7 +260,7 @@ export function useWorkflowExecution() {
       setExecutionResult(result)
 
       // Persist logs
-      await persistLogs(uuidv4(), result)
+      await persistLogs(generateId(), result)
 
       // Reset debug state
       resetDebugState()
@@ -307,7 +307,7 @@ export function useWorkflowExecution() {
       setExecutionResult(errorResult)
 
       // Persist logs
-      await persistLogs(uuidv4(), errorResult)
+      await persistLogs(generateId(), errorResult)
 
       // Reset debug state
       resetDebugState()
@@ -413,7 +413,7 @@ export function useWorkflowExecution() {
       // For chat executions, we'll use a streaming approach
       if (isChatExecution) {
         let isCancelled = false
-        const executionId = uuidv4()
+        const executionId = generateId()
         currentChatExecutionIdRef.current = executionId
         const stream = new ReadableStream({
           async start(controller) {
@@ -717,7 +717,7 @@ export function useWorkflowExecution() {
         return { success: true, stream }
       }
 
-      const manualExecutionId = uuidv4()
+      const manualExecutionId = generateId()
       try {
         const result = await executeWorkflow(
           workflowInput,
@@ -1791,7 +1791,7 @@ export function useWorkflowExecution() {
       setExecutionResult(null)
       setIsExecuting(workflowId, true)
 
-      const executionId = uuidv4()
+      const executionId = generateId()
       try {
         await executeWorkflow(undefined, undefined, executionId, undefined, 'manual', blockId)
       } catch (error) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts
index 3f27004a04e..fe22f6164bd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts
@@ -1,5 +1,5 @@
 import { createLogger } from '@sim/logger'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import type {
   BlockCompletedData,
   BlockErrorData,
@@ -592,7 +592,7 @@ export async function executeWorkflowWithFullLogging(
     throw new Error('No active workflow')
   }
 
-  const executionId = options.executionId || uuidv4()
+  const executionId = options.executionId || generateId()
   const { addConsole, updateConsole, cancelRunningEntries } = useTerminalConsoleStore.getState()
   const { setActiveBlocks, setBlockRunStatus, setEdgeRunStatus, setCurrentExecutionId } =
     useExecutionStore.getState()
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
index 0a8c196c60c..83a2f8c0b43 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -19,6 +19,7 @@ import { createLogger } from '@sim/logger'
 import { useShallow } from 'zustand/react/shallow'
 import { useSession } from '@/lib/auth/auth-client'
 import type { OAuthConnectEventDetail } from '@/lib/copilot/tools/client/base-tool'
+import { generateId } from '@/lib/core/utils/uuid'
 import { consumeOAuthReturnContext, writeOAuthReturnContext } from '@/lib/credentials/client-state'
 import type { OAuthProvider } from '@/lib/oauth'
 import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
@@ -1030,7 +1031,7 @@ const WorkflowContent = React.memo(
           }
 
           // Prevent cycle: pasting a container that is the target container itself or one of its ancestors.
-          // Use original clipboard IDs since preparePasteData regenerates them via uuidv4().
+          // Use original clipboard IDs since preparePasteData regenerates them via generateId().
           const ancestorIds = new Set<string>()
           let walkId: string | undefined = targetContainer.loopId
           while (walkId && !ancestorIds.has(walkId)) {
@@ -1560,7 +1561,7 @@ const WorkflowContent = React.memo(
     const createEdgeObject = useCallback(
       (sourceId: string, targetId: string, sourceHandle: string): Edge => {
         const edge = {
-          id: crypto.randomUUID(),
+          id: generateId(),
           source: sourceId,
           target: targetId,
           sourceHandle,
@@ -1737,7 +1738,7 @@ const WorkflowContent = React.memo(
           clearDragHighlights()
 
           if (data.type === 'loop' || data.type === 'parallel') {
-            const id = crypto.randomUUID()
+            const id = generateId()
             const baseName = data.type === 'loop' ? 'Loop' : 'Parallel'
             const name = getUniqueBlockName(baseName, blocks)
 
@@ -1816,7 +1817,7 @@ const WorkflowContent = React.memo(
           }
 
           // Generate id and name here so they're available in all code paths
-          const id = crypto.randomUUID()
+          const id = generateId()
           // Prefer semantic default names for triggers; then ensure unique numbering centrally
           const defaultTriggerNameDrop = TriggerUtils.getDefaultTriggerName(data.type)
           const baseName = defaultTriggerNameDrop || blockConfig.name
@@ -1935,7 +1936,7 @@ const WorkflowContent = React.memo(
         const basePosition = getViewportCenter()
 
         if (type === 'loop' || type === 'parallel') {
-          const id = crypto.randomUUID()
+          const id = generateId()
           const baseName = type === 'loop' ? 'Loop' : 'Parallel'
           const name = getUniqueBlockName(baseName, blocks)
 
@@ -1969,7 +1970,7 @@ const WorkflowContent = React.memo(
 
         if (checkTriggerConstraints(type)) return
 
-        const id = crypto.randomUUID()
+        const id = generateId()
         const defaultTriggerName = TriggerUtils.getDefaultTriggerName(type)
         const baseName = defaultTriggerName || blockConfig.name
         const name = getUniqueBlockName(baseName, blocks)
@@ -2954,7 +2955,7 @@ const WorkflowContent = React.memo(
           const targetParentId = blocks[targetNode.id]?.data?.parentId
 
           // Generate a unique edge ID
-          const edgeId = crypto.randomUUID()
+          const edgeId = generateId()
 
           // Special case for container start source: Always allow connections to nodes within the same container
           if (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
index 6c9b0b21953..afae818c6ac 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
@@ -5,6 +5,7 @@ import { createLogger } from '@sim/logger'
 import clsx from 'clsx'
 import { ChevronRight, Folder, FolderOpen, MoreHorizontal } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
@@ -139,7 +140,7 @@ export function FolderItem({
   const handleCreateWorkflowInFolder = useCallback(() => {
     const name = generateCreativeWorkflowName()
     const color = getNextWorkflowColor()
-    const id = crypto.randomUUID()
+    const id = generateId()
 
     createWorkflowMutation.mutate({
       workspaceId,
@@ -161,7 +162,7 @@ export function FolderItem({
         workspaceId,
         name: 'New Folder',
         parentId: folder.id,
-        id: crypto.randomUUID(),
+        id: generateId(),
       })
       if (result.id) {
         expandFolder()
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-folder-operations.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-folder-operations.ts
index 7efbe64decc..45b58376685 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-folder-operations.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-folder-operations.ts
@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import { generateFolderName } from '@/lib/workspaces/naming'
 import { useCreateFolder } from '@/hooks/queries/folders'
 
@@ -30,7 +31,7 @@ export function useFolderOperations({ workspaceId }: UseFolderOperationsProps) {
       const folder = await createFolderMutation.mutateAsync({
         name: folderName,
         workspaceId,
-        id: crypto.randomUUID(),
+        id: generateId(),
       })
       logger.info(`Created folder: ${folderName}`)
       return folder.id
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
index 3ed24ec83ed..2e49e8e9a04 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
@@ -1,5 +1,6 @@
 import { useCallback, useMemo } from 'react'
 import { useRouter } from 'next/navigation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { useCreateWorkflow, useWorkflowMap } from '@/hooks/queries/workflows'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -29,7 +30,7 @@ export function useWorkflowOperations({ workspaceId }: UseWorkflowOperationsProp
 
     const name = generateCreativeWorkflowName()
     const color = getNextWorkflowColor()
-    const id = crypto.randomUUID()
+    const id = generateId()
 
     createWorkflowMutation.mutate({
       workspaceId,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts
index 56851aed4f0..8703c34f017 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts
@@ -1,5 +1,6 @@
 import { useCallback, useState } from 'react'
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getChildFolders, getFolderById } from '@/lib/folders/tree'
 import { useDuplicateFolderMutation } from '@/hooks/queries/folders'
 import { getFolderMap } from '@/hooks/queries/utils/folder-cache'
@@ -79,7 +80,7 @@ export function useDuplicateFolder({ workspaceId, folderIds, onSuccess }: UseDup
           name: duplicateName,
           parentId: folder.parentId,
           color: folder.color,
-          newId: crypto.randomUUID(),
+          newId: generateId(),
         })
         const newFolderId = result?.id
         if (newFolderId) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-selection.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-selection.ts
index 4ee23292533..5bf684a72ac 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-selection.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-selection.ts
@@ -1,6 +1,7 @@
 import { useCallback, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getChildFolders, getFolderById } from '@/lib/folders/tree'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { useDuplicateFolderMutation } from '@/hooks/queries/folders'
@@ -90,7 +91,7 @@ export function useDuplicateSelection({ workspaceId, onSuccess }: UseDuplicateSe
             name: duplicateName,
             parentId: folder.parentId,
             color: folder.color,
-            newId: crypto.randomUUID(),
+            newId: generateId(),
           })
 
           if (result?.id) {
@@ -112,7 +113,7 @@ export function useDuplicateSelection({ workspaceId, onSuccess }: UseDuplicateSe
             description: workflow.description,
             color: getNextWorkflowColor(),
             folderId: workflow.folderId,
-            newId: crypto.randomUUID(),
+            newId: generateId(),
           })
 
           duplicatedWorkflowIds.push(result.id)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
index bffe42d6266..32621febc96 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
@@ -1,6 +1,7 @@
 import { useCallback, useRef } from 'react'
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { getWorkflows } from '@/hooks/queries/utils/workflow-cache'
 import { useDuplicateWorkflowMutation } from '@/hooks/queries/workflows'
@@ -77,7 +78,7 @@ export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWor
             description: sourceWorkflow.description,
             color: getNextWorkflowColor(),
             folderId: sourceWorkflow.folderId,
-            newId: crypto.randomUUID(),
+            newId: generateId(),
           })
 
           duplicatedIds.push(result.id)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts
index 6b6b5df81ac..ffa082ca994 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts
@@ -1,6 +1,7 @@
 import { useCallback, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   extractWorkflowName,
   extractWorkflowsFromZip,
@@ -210,7 +211,7 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
                 > = {}
 
                 for (const v of variablesArray) {
-                  const id = typeof v.id === 'string' && v.id.trim() ? v.id : crypto.randomUUID()
+                  const id = typeof v.id === 'string' && v.id.trim() ? v.id : generateId()
                   variablesRecord[id] = {
                     id,
                     workflowId: newWorkflow.id,
diff --git a/apps/sim/app/workspace/providers/socket-provider.tsx b/apps/sim/app/workspace/providers/socket-provider.tsx
index 91a415df132..b2257280c10 100644
--- a/apps/sim/app/workspace/providers/socket-provider.tsx
+++ b/apps/sim/app/workspace/providers/socket-provider.tsx
@@ -14,6 +14,7 @@ import { createLogger } from '@sim/logger'
 import { useParams } from 'next/navigation'
 import type { Socket } from 'socket.io-client'
 import { getEnv } from '@/lib/core/config/env'
+import { generateId } from '@/lib/core/utils/uuid'
 import { useOperationQueueStore } from '@/stores/operation-queue/store'
 import { useWorkflowRegistry as useWorkflowRegistryStore } from '@/stores/workflows/registry/store'
 
@@ -26,7 +27,7 @@ function getTabSessionId(): string {
 
   let tabSessionId = sessionStorage.getItem(TAB_SESSION_ID_KEY)
   if (!tabSessionId) {
-    tabSessionId = crypto.randomUUID()
+    tabSessionId = generateId()
     sessionStorage.setItem(TAB_SESSION_ID_KEY, tabSessionId)
   }
   return tabSessionId
diff --git a/apps/sim/background/schedule-execution.ts b/apps/sim/background/schedule-execution.ts
index 38f17af1db0..007f4d5b071 100644
--- a/apps/sim/background/schedule-execution.ts
+++ b/apps/sim/background/schedule-execution.ts
@@ -3,9 +3,9 @@ import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { Cron } from 'croner'
 import { and, eq, isNull } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
+import { generateId } from '@/lib/core/utils/uuid'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
@@ -46,7 +46,7 @@ type RunWorkflowResult =
 export function buildScheduleCorrelation(
   payload: ScheduleExecutionPayload
 ): AsyncExecutionCorrelation {
-  const executionId = payload.executionId || uuidv4()
+  const executionId = payload.executionId || generateId()
   const requestId = payload.requestId || payload.correlation?.requestId || executionId.slice(0, 8)
 
   return {
@@ -804,7 +804,7 @@ async function createJobLogEntry(params: {
     }))
 
     const traceSpan = {
-      id: uuidv4(),
+      id: generateId(),
       name,
       type: 'mothership',
       duration: durationMs,
@@ -822,10 +822,10 @@ async function createJobLogEntry(params: {
     }
 
     await db.insert(jobExecutionLogs).values({
-      id: uuidv4(),
+      id: generateId(),
       scheduleId,
       workspaceId,
-      executionId: uuidv4(),
+      executionId: generateId(),
       level: success ? 'info' : 'error',
       status: success ? 'completed' : 'failed',
       trigger: 'mothership',
@@ -859,7 +859,7 @@ async function createJobLogEntry(params: {
 }
 
 export async function executeJobInline(payload: JobExecutionPayload) {
-  const requestId = uuidv4().slice(0, 8)
+  const requestId = generateId().slice(0, 8)
   const now = new Date(payload.now)
 
   logger.info(`[${requestId}] Starting job execution`, { scheduleId: payload.scheduleId })
@@ -920,7 +920,7 @@ export async function executeJobInline(payload: JobExecutionPayload) {
       messages: [{ role: 'user', content: promptText }],
       workspaceId: jobRecord.sourceWorkspaceId,
       userId: jobRecord.sourceUserId,
-      chatId: jobRecord.sourceChatId || crypto.randomUUID(),
+      chatId: jobRecord.sourceChatId || generateId(),
     }
 
     const startTime = new Date()
diff --git a/apps/sim/background/webhook-execution.ts b/apps/sim/background/webhook-execution.ts
index ab64b8e21ae..f9e01c6300c 100644
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -3,10 +3,10 @@ import { account, webhook } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { eq } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
 import { IdempotencyService, webhookIdempotency } from '@/lib/core/idempotency'
+import { generateId } from '@/lib/core/utils/uuid'
 import { processExecutionFiles } from '@/lib/execution/files'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
@@ -32,7 +32,7 @@ const logger = createLogger('TriggerWebhookExecution')
 export function buildWebhookCorrelation(
   payload: WebhookExecutionPayload
 ): AsyncExecutionCorrelation {
-  const executionId = payload.executionId || uuidv4()
+  const executionId = payload.executionId || generateId()
   const requestId = payload.requestId || payload.correlation?.requestId || executionId.slice(0, 8)
 
   return {
diff --git a/apps/sim/background/workflow-execution.ts b/apps/sim/background/workflow-execution.ts
index aa2411a2580..316ccfc5bbb 100644
--- a/apps/sim/background/workflow-execution.ts
+++ b/apps/sim/background/workflow-execution.ts
@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
-import { v4 as uuidv4 } from 'uuid'
 import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
+import { generateId } from '@/lib/core/utils/uuid'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
@@ -21,7 +21,7 @@ const logger = createLogger('TriggerWorkflowExecution')
 export function buildWorkflowCorrelation(
   payload: WorkflowExecutionPayload
 ): AsyncExecutionCorrelation {
-  const executionId = payload.executionId || uuidv4()
+  const executionId = payload.executionId || generateId()
   const requestId = payload.requestId || payload.correlation?.requestId || executionId.slice(0, 8)
 
   return {
diff --git a/apps/sim/background/workspace-notification-delivery.ts b/apps/sim/background/workspace-notification-delivery.ts
index 9e0d7b632a7..db61f05cc63 100644
--- a/apps/sim/background/workspace-notification-delivery.ts
+++ b/apps/sim/background/workspace-notification-delivery.ts
@@ -8,7 +8,6 @@ import {
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { and, eq, isNull, lte, or, sql } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import {
   type EmailRateLimitsData,
   type EmailUsageData,
@@ -24,6 +23,7 @@ import { decryptSecret } from '@/lib/core/security/encryption'
 import { secureFetchWithValidation } from '@/lib/core/security/input-validation.server'
 import { formatDuration } from '@/lib/core/utils/formatting'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { enqueueWorkspaceDispatch } from '@/lib/core/workspace-dispatch'
 import type { TraceSpan, WorkflowExecutionLog } from '@/lib/logs/types'
 import { sendEmail } from '@/lib/messaging/email/mailer'
@@ -92,7 +92,7 @@ async function buildPayload(
     : null
 
   const payload: NotificationPayload = {
-    id: `evt_${uuidv4()}`,
+    id: `evt_${generateId()}`,
     type: 'workflow.execution.completed',
     timestamp,
     data: {
@@ -195,7 +195,7 @@ async function deliverWebhook(
   }
 
   const body = JSON.stringify(payload)
-  const deliveryId = `delivery_${uuidv4()}`
+  const deliveryId = `delivery_${generateId()}`
   const headers: Record<string, string> = {
     'Content-Type': 'application/json',
     'sim-event': 'workflow.execution.completed',
diff --git a/apps/sim/blocks/blocks/cursor.ts b/apps/sim/blocks/blocks/cursor.ts
index 60ceec13e32..b6ef6a52411 100644
--- a/apps/sim/blocks/blocks/cursor.ts
+++ b/apps/sim/blocks/blocks/cursor.ts
@@ -31,6 +31,8 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
         { label: 'List Agents', id: 'cursor_list_agents' },
         { label: 'Stop Agent', id: 'cursor_stop_agent' },
         { label: 'Delete Agent', id: 'cursor_delete_agent' },
+        { label: 'List Artifacts', id: 'cursor_list_artifacts' },
+        { label: 'Download Artifact', id: 'cursor_download_artifact' },
       ],
       value: () => 'cursor_launch_agent',
     },
@@ -48,6 +50,7 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       type: 'short-input',
       placeholder: 'main (optional)',
       condition: { field: 'operation', value: 'cursor_launch_agent' },
+      mode: 'advanced',
     },
     {
       id: 'promptText',
@@ -57,12 +60,21 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       condition: { field: 'operation', value: 'cursor_launch_agent' },
       required: true,
     },
+    {
+      id: 'promptImages',
+      title: 'Prompt Images',
+      type: 'long-input',
+      placeholder: '[{"data": "base64...", "dimension": {"width": 1024, "height": 768}}]',
+      condition: { field: 'operation', value: ['cursor_launch_agent', 'cursor_add_followup'] },
+      mode: 'advanced',
+    },
     {
       id: 'model',
       title: 'Model',
       type: 'short-input',
       placeholder: 'Auto-selection by default',
       condition: { field: 'operation', value: 'cursor_launch_agent' },
+      mode: 'advanced',
     },
     {
       id: 'branchName',
@@ -70,6 +82,7 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       type: 'short-input',
       placeholder: 'Custom branch name (optional)',
       condition: { field: 'operation', value: 'cursor_launch_agent' },
+      mode: 'advanced',
     },
     {
       id: 'autoCreatePr',
@@ -82,12 +95,14 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       title: 'Open as Cursor GitHub App',
       type: 'switch',
       condition: { field: 'operation', value: 'cursor_launch_agent' },
+      mode: 'advanced',
     },
     {
       id: 'skipReviewerRequest',
       title: 'Skip Reviewer Request',
       type: 'switch',
       condition: { field: 'operation', value: 'cursor_launch_agent' },
+      mode: 'advanced',
     },
     {
       id: 'agentId',
@@ -102,10 +117,20 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
           'cursor_add_followup',
           'cursor_stop_agent',
           'cursor_delete_agent',
+          'cursor_list_artifacts',
+          'cursor_download_artifact',
         ],
       },
       required: true,
     },
+    {
+      id: 'path',
+      title: 'Artifact Path',
+      type: 'short-input',
+      placeholder: '/opt/cursor/artifacts/screenshot.png',
+      condition: { field: 'operation', value: 'cursor_download_artifact' },
+      required: true,
+    },
     {
       id: 'followupPromptText',
       title: 'Follow-up Prompt',
@@ -114,12 +139,21 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       condition: { field: 'operation', value: 'cursor_add_followup' },
       required: true,
     },
+    {
+      id: 'prUrl',
+      title: 'PR URL Filter',
+      type: 'short-input',
+      placeholder: 'Filter by pull request URL (optional)',
+      condition: { field: 'operation', value: 'cursor_list_agents' },
+      mode: 'advanced',
+    },
     {
       id: 'limit',
       title: 'Limit',
       type: 'short-input',
       placeholder: '20 (default, max 100)',
       condition: { field: 'operation', value: 'cursor_list_agents' },
+      mode: 'advanced',
     },
     {
       id: 'cursor',
@@ -127,6 +161,7 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       type: 'short-input',
       placeholder: 'Cursor from previous response',
       condition: { field: 'operation', value: 'cursor_list_agents' },
+      mode: 'advanced',
     },
     {
       id: 'apiKey',
@@ -146,6 +181,8 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
       'cursor_add_followup',
       'cursor_stop_agent',
       'cursor_delete_agent',
+      'cursor_list_artifacts',
+      'cursor_download_artifact',
     ],
     config: {
       tool: (params) => params.operation || 'cursor_launch_agent',
@@ -157,15 +194,20 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
     ref: { type: 'string', description: 'Branch, tag, or commit reference' },
     promptText: { type: 'string', description: 'Instruction text for the agent' },
     followupPromptText: { type: 'string', description: 'Follow-up instruction text for the agent' },
-    promptImages: { type: 'string', description: 'JSON array of image objects' },
+    promptImages: {
+      type: 'string',
+      description: 'JSON array of image objects with base64 data and dimensions',
+    },
     model: { type: 'string', description: 'Model to use (empty for auto-selection)' },
     branchName: { type: 'string', description: 'Custom branch name' },
     autoCreatePr: { type: 'boolean', description: 'Auto-create PR when done' },
     openAsCursorGithubApp: { type: 'boolean', description: 'Open PR as Cursor GitHub App' },
     skipReviewerRequest: { type: 'boolean', description: 'Skip reviewer request' },
     agentId: { type: 'string', description: 'Agent identifier' },
+    prUrl: { type: 'string', description: 'Filter agents by pull request URL' },
     limit: { type: 'number', description: 'Number of results to return' },
     cursor: { type: 'string', description: 'Pagination cursor' },
+    path: { type: 'string', description: 'Absolute path of the artifact to download' },
     apiKey: { type: 'string', description: 'Cursor API key' },
   },
   outputs: {
@@ -192,6 +234,8 @@ export const CursorV2Block: BlockConfig<CursorResponse> = {
       'cursor_add_followup_v2',
       'cursor_stop_agent_v2',
       'cursor_delete_agent_v2',
+      'cursor_list_artifacts_v2',
+      'cursor_download_artifact_v2',
     ],
     config: {
       tool: createVersionedToolSelector({
@@ -213,5 +257,7 @@ export const CursorV2Block: BlockConfig<CursorResponse> = {
     agents: { type: 'json', description: 'Array of agent objects (list operation)' },
     nextCursor: { type: 'string', description: 'Pagination cursor (list operation)' },
     messages: { type: 'json', description: 'Conversation messages (get conversation operation)' },
+    artifacts: { type: 'json', description: 'List of artifact files (list artifacts operation)' },
+    file: { type: 'file', description: 'Downloaded artifact file (download artifact operation)' },
   },
 }
diff --git a/apps/sim/blocks/blocks/response.ts b/apps/sim/blocks/blocks/response.ts
index 82f5ddb58bb..d11f6814850 100644
--- a/apps/sim/blocks/blocks/response.ts
+++ b/apps/sim/blocks/blocks/response.ts
@@ -12,12 +12,13 @@ export const ResponseBlock: BlockConfig<ResponseBlockOutput> = {
   bestPractices: `
   - Only use this if the trigger block is the API Trigger.
   - Prefer the builder mode over the editor mode.
-  - This is usually used as the last block in the workflow.
+  - The Response block is an exit point. When it executes, the workflow stops and the API response is sent immediately.
+  - Multiple Response blocks can be placed on different branches (e.g. after a Router or Condition). The first one to execute determines the API response and ends the workflow.
+  - If a Response block is on a parallel branch, there are no guarantees about whether other parallel blocks will run. Avoid placing Response blocks in parallel with blocks that have important side effects.
   `,
   category: 'blocks',
   bgColor: '#2F55FF',
   icon: ResponseIcon,
-  singleInstance: true,
   subBlocks: [
     {
       id: 'dataMode',
diff --git a/apps/sim/blocks/utils.test.ts b/apps/sim/blocks/utils.test.ts
new file mode 100644
index 00000000000..0e147a3c7f3
--- /dev/null
+++ b/apps/sim/blocks/utils.test.ts
@@ -0,0 +1,267 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockIsHosted, mockIsAzureConfigured, mockIsOllamaConfigured } = vi.hoisted(() => ({
+  mockIsHosted: { value: false },
+  mockIsAzureConfigured: { value: false },
+  mockIsOllamaConfigured: { value: false },
+}))
+
+const {
+  mockGetHostedModels,
+  mockGetProviderModels,
+  mockGetProviderIcon,
+  mockGetBaseModelProviders,
+} = vi.hoisted(() => ({
+  mockGetHostedModels: vi.fn(() => []),
+  mockGetProviderModels: vi.fn(() => []),
+  mockGetProviderIcon: vi.fn(() => null),
+  mockGetBaseModelProviders: vi.fn(() => ({})),
+}))
+
+const { mockProviders } = vi.hoisted(() => ({
+  mockProviders: {
+    value: {
+      base: { models: [] as string[], isLoading: false },
+      ollama: { models: [] as string[], isLoading: false },
+      vllm: { models: [] as string[], isLoading: false },
+      openrouter: { models: [] as string[], isLoading: false },
+      fireworks: { models: [] as string[], isLoading: false },
+    },
+  },
+}))
+
+vi.mock('@/lib/core/config/feature-flags', () => ({
+  get isHosted() {
+    return mockIsHosted.value
+  },
+  get isAzureConfigured() {
+    return mockIsAzureConfigured.value
+  },
+  get isOllamaConfigured() {
+    return mockIsOllamaConfigured.value
+  },
+}))
+
+vi.mock('@/providers/models', () => ({
+  getHostedModels: mockGetHostedModels,
+  getProviderModels: mockGetProviderModels,
+  getProviderIcon: mockGetProviderIcon,
+  getBaseModelProviders: mockGetBaseModelProviders,
+}))
+
+vi.mock('@/stores/providers/store', () => ({
+  useProvidersStore: {
+    getState: () => ({
+      get providers() {
+        return mockProviders.value
+      },
+    }),
+  },
+}))
+
+vi.mock('@/lib/oauth/utils', () => ({
+  getScopesForService: vi.fn(() => []),
+}))
+
+import { getApiKeyCondition } from '@/blocks/utils'
+
+const BASE_CLOUD_MODELS: Record<string, string> = {
+  'gpt-4o': 'openai',
+  'claude-sonnet-4-5': 'anthropic',
+  'gemini-2.5-pro': 'google',
+  'mistral-large-latest': 'mistral',
+}
+
+describe('getApiKeyCondition / shouldRequireApiKeyForModel', () => {
+  const evaluateCondition = (model: string): boolean => {
+    const conditionFn = getApiKeyCondition()
+    const condition = conditionFn({ model })
+    if ('not' in condition && condition.not) return false
+    if (condition.value === '__no_model_selected__') return false
+    return true
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockIsHosted.value = false
+    mockIsAzureConfigured.value = false
+    mockIsOllamaConfigured.value = false
+    mockProviders.value = {
+      base: { models: [], isLoading: false },
+      ollama: { models: [], isLoading: false },
+      vllm: { models: [], isLoading: false },
+      openrouter: { models: [], isLoading: false },
+      fireworks: { models: [], isLoading: false },
+    }
+    mockGetHostedModels.mockReturnValue([])
+    mockGetProviderModels.mockReturnValue([])
+    mockGetBaseModelProviders.mockReturnValue({})
+  })
+
+  describe('empty or missing model', () => {
+    it('does not require API key when model is empty', () => {
+      expect(evaluateCondition('')).toBe(false)
+    })
+
+    it('does not require API key when model is whitespace', () => {
+      expect(evaluateCondition('   ')).toBe(false)
+    })
+  })
+
+  describe('hosted models', () => {
+    it('does not require API key for hosted models on hosted platform', () => {
+      mockIsHosted.value = true
+      mockGetHostedModels.mockReturnValue(['gpt-4o', 'claude-sonnet-4-5'])
+      expect(evaluateCondition('gpt-4o')).toBe(false)
+      expect(evaluateCondition('claude-sonnet-4-5')).toBe(false)
+    })
+
+    it('requires API key for non-hosted models on hosted platform', () => {
+      mockIsHosted.value = true
+      mockGetHostedModels.mockReturnValue(['gpt-4o'])
+      expect(evaluateCondition('claude-sonnet-4-5')).toBe(true)
+    })
+  })
+
+  describe('Vertex AI models', () => {
+    it('does not require API key for vertex/ prefixed models', () => {
+      expect(evaluateCondition('vertex/gemini-2.5-pro')).toBe(false)
+    })
+  })
+
+  describe('Bedrock models', () => {
+    it('does not require API key for bedrock/ prefixed models', () => {
+      expect(evaluateCondition('bedrock/anthropic.claude-v2')).toBe(false)
+    })
+  })
+
+  describe('Azure models', () => {
+    it('does not require API key for azure/ models when Azure is configured', () => {
+      mockIsAzureConfigured.value = true
+      expect(evaluateCondition('azure/gpt-4o')).toBe(false)
+      expect(evaluateCondition('azure-openai/gpt-4o')).toBe(false)
+      expect(evaluateCondition('azure-anthropic/claude-sonnet-4-5')).toBe(false)
+    })
+
+    it('requires API key for azure/ models when Azure is not configured', () => {
+      mockIsAzureConfigured.value = false
+      expect(evaluateCondition('azure/gpt-4o')).toBe(true)
+    })
+  })
+
+  describe('vLLM models', () => {
+    it('does not require API key for vllm/ prefixed models', () => {
+      expect(evaluateCondition('vllm/my-model')).toBe(false)
+      expect(evaluateCondition('vllm/llama-3-70b')).toBe(false)
+    })
+  })
+
+  describe('provider store lookup (client-side)', () => {
+    it('does not require API key when model is in the Ollama store bucket', () => {
+      mockProviders.value.ollama.models = ['llama3:latest', 'mistral:latest']
+      expect(evaluateCondition('llama3:latest')).toBe(false)
+      expect(evaluateCondition('mistral:latest')).toBe(false)
+    })
+
+    it('requires API key when model is in the base store bucket', () => {
+      mockProviders.value.base.models = ['gpt-4o', 'claude-sonnet-4-5']
+      expect(evaluateCondition('gpt-4o')).toBe(true)
+      expect(evaluateCondition('claude-sonnet-4-5')).toBe(true)
+    })
+
+    it('does not require API key when model is in the vLLM store bucket', () => {
+      mockProviders.value.vllm.models = ['my-custom-model']
+      expect(evaluateCondition('my-custom-model')).toBe(false)
+    })
+
+    it('requires API key when model is in the fireworks store bucket', () => {
+      mockProviders.value.fireworks.models = ['fireworks/llama-3']
+      expect(evaluateCondition('fireworks/llama-3')).toBe(true)
+    })
+
+    it('requires API key when model is in the openrouter store bucket', () => {
+      mockProviders.value.openrouter.models = ['openrouter/anthropic/claude']
+      expect(evaluateCondition('openrouter/anthropic/claude')).toBe(true)
+    })
+
+    it('is case-insensitive for store lookup', () => {
+      mockProviders.value.ollama.models = ['Llama3:Latest']
+      expect(evaluateCondition('llama3:latest')).toBe(false)
+    })
+  })
+
+  describe('Ollama — OLLAMA_URL env var (server-safe)', () => {
+    it('does not require API key for unknown models when OLLAMA_URL is set', () => {
+      mockIsOllamaConfigured.value = true
+      expect(evaluateCondition('llama3:latest')).toBe(false)
+      expect(evaluateCondition('phi3:latest')).toBe(false)
+      expect(evaluateCondition('gemma2:latest')).toBe(false)
+      expect(evaluateCondition('deepseek-coder:latest')).toBe(false)
+    })
+
+    it('does not require API key for Ollama models that match cloud provider regex patterns', () => {
+      mockIsOllamaConfigured.value = true
+      expect(evaluateCondition('mistral:latest')).toBe(false)
+      expect(evaluateCondition('mistral')).toBe(false)
+      expect(evaluateCondition('mistral-nemo')).toBe(false)
+      expect(evaluateCondition('gpt2')).toBe(false)
+    })
+
+    it('requires API key for known cloud models even when OLLAMA_URL is set', () => {
+      mockIsOllamaConfigured.value = true
+      mockGetBaseModelProviders.mockReturnValue(BASE_CLOUD_MODELS)
+      expect(evaluateCondition('gpt-4o')).toBe(true)
+      expect(evaluateCondition('claude-sonnet-4-5')).toBe(true)
+      expect(evaluateCondition('gemini-2.5-pro')).toBe(true)
+      expect(evaluateCondition('mistral-large-latest')).toBe(true)
+    })
+
+    it('requires API key for slash-prefixed cloud models when OLLAMA_URL is set', () => {
+      mockIsOllamaConfigured.value = true
+      expect(evaluateCondition('azure/gpt-4o')).toBe(true)
+      expect(evaluateCondition('fireworks/llama-3')).toBe(true)
+      expect(evaluateCondition('openrouter/anthropic/claude')).toBe(true)
+      expect(evaluateCondition('groq/llama-3')).toBe(true)
+    })
+  })
+
+  describe('cloud provider models that need API key', () => {
+    it('requires API key for standard cloud models on hosted platform', () => {
+      mockIsHosted.value = true
+      mockGetHostedModels.mockReturnValue([])
+      expect(evaluateCondition('gpt-4o')).toBe(true)
+      expect(evaluateCondition('claude-sonnet-4-5')).toBe(true)
+      expect(evaluateCondition('gemini-2.5-pro')).toBe(true)
+      expect(evaluateCondition('mistral-large-latest')).toBe(true)
+    })
+
+    it('requires API key for prefixed cloud models on hosted platform', () => {
+      mockIsHosted.value = true
+      expect(evaluateCondition('fireworks/llama-3')).toBe(true)
+      expect(evaluateCondition('openrouter/anthropic/claude')).toBe(true)
+      expect(evaluateCondition('groq/llama-3')).toBe(true)
+      expect(evaluateCondition('cerebras/gpt-oss-120b')).toBe(true)
+    })
+
+    it('requires API key for prefixed cloud models on self-hosted', () => {
+      mockIsHosted.value = false
+      expect(evaluateCondition('fireworks/llama-3')).toBe(true)
+      expect(evaluateCondition('openrouter/anthropic/claude')).toBe(true)
+      expect(evaluateCondition('groq/llama-3')).toBe(true)
+      expect(evaluateCondition('cerebras/gpt-oss-120b')).toBe(true)
+    })
+  })
+
+  describe('self-hosted without OLLAMA_URL', () => {
+    it('requires API key for any model (Ollama models cannot appear without OLLAMA_URL)', () => {
+      mockIsHosted.value = false
+      mockIsOllamaConfigured.value = false
+      expect(evaluateCondition('llama3:latest')).toBe(true)
+      expect(evaluateCondition('mistral:latest')).toBe(true)
+      expect(evaluateCondition('gpt-4o')).toBe(true)
+    })
+  })
+})
diff --git a/apps/sim/blocks/utils.ts b/apps/sim/blocks/utils.ts
index f1f05efc562..a31bd10c725 100644
--- a/apps/sim/blocks/utils.ts
+++ b/apps/sim/blocks/utils.ts
@@ -1,9 +1,9 @@
-import { isAzureConfigured, isHosted } from '@/lib/core/config/feature-flags'
+import { isAzureConfigured, isHosted, isOllamaConfigured } from '@/lib/core/config/feature-flags'
 import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockOutput, OutputFieldDefinition, SubBlockConfig } from '@/blocks/types'
 import {
+  getBaseModelProviders,
   getHostedModels,
-  getProviderFromModel,
   getProviderIcon,
   getProviderModels,
 } from '@/providers/models'
@@ -100,11 +100,15 @@ export function resolveOutputType(
   return resolvedOutputs
 }
 
-/**
- * Helper to get current Ollama models from store
- */
-const getCurrentOllamaModels = () => {
-  return useProvidersStore.getState().providers.ollama.models
+function getProviderFromStore(model: string): string | null {
+  const { providers } = useProvidersStore.getState()
+  const normalized = model.toLowerCase()
+  for (const [key, state] of Object.entries(providers)) {
+    if (state.models.some((m: string) => m.toLowerCase() === normalized)) {
+      return key
+    }
+  }
+  return null
 }
 
 function buildModelVisibilityCondition(model: string, shouldShow: boolean) {
@@ -119,16 +123,14 @@ function shouldRequireApiKeyForModel(model: string): boolean {
   const normalizedModel = model.trim().toLowerCase()
   if (!normalizedModel) return false
 
-  const hostedModels = getHostedModels()
-  const isHostedModel = hostedModels.some(
-    (hostedModel) => hostedModel.toLowerCase() === normalizedModel
-  )
-  if (isHosted && isHostedModel) return false
+  if (isHosted) {
+    const hostedModels = getHostedModels()
+    if (hostedModels.some((m) => m.toLowerCase() === normalizedModel)) return false
+  }
 
   if (normalizedModel.startsWith('vertex/') || normalizedModel.startsWith('bedrock/')) {
     return false
   }
-
   if (
     isAzureConfigured &&
     (normalizedModel.startsWith('azure/') ||
@@ -138,30 +140,18 @@ function shouldRequireApiKeyForModel(model: string): boolean {
   ) {
     return false
   }
-
   if (normalizedModel.startsWith('vllm/')) {
     return false
   }
 
-  const currentOllamaModels = getCurrentOllamaModels()
-  if (currentOllamaModels.some((ollamaModel) => ollamaModel.toLowerCase() === normalizedModel)) {
-    return false
-  }
+  const storeProvider = getProviderFromStore(normalizedModel)
+  if (storeProvider === 'ollama' || storeProvider === 'vllm') return false
+  if (storeProvider) return true
 
-  if (!isHosted) {
-    try {
-      const providerId = getProviderFromModel(model)
-      if (
-        providerId === 'ollama' ||
-        providerId === 'vllm' ||
-        providerId === 'vertex' ||
-        providerId === 'bedrock'
-      ) {
-        return false
-      }
-    } catch {
-      // If model resolution fails, fall through and require an API key.
-    }
+  if (isOllamaConfigured) {
+    if (normalizedModel.includes('/')) return true
+    if (normalizedModel in getBaseModelProviders()) return true
+    return false
   }
 
   return true
diff --git a/apps/sim/components/emcn/components/modal/modal.tsx b/apps/sim/components/emcn/components/modal/modal.tsx
index f9afb95b6d6..3e2341ce0cf 100644
--- a/apps/sim/components/emcn/components/modal/modal.tsx
+++ b/apps/sim/components/emcn/components/modal/modal.tsx
@@ -150,37 +150,42 @@ const ModalContent = React.forwardRef<
   return (
     <ModalPortal>
       <ModalOverlay />
-      <DialogPrimitive.Content
-        ref={ref}
-        className={cn(
-          'fixed top-[50%] z-[var(--z-modal)] flex max-h-[84vh] translate-x-[-50%] translate-y-[-50%] flex-col overflow-hidden rounded-xl bg-[var(--bg)] text-small ring-1 ring-foreground/10 duration-200',
-          MODAL_SIZES[size],
-          className
-        )}
+      <div
+        className='pointer-events-none fixed inset-0 z-[var(--z-modal)] flex items-center justify-center'
         style={{
-          left: isWorkflowPage
-            ? // --panel-width is always the rendered panel width on /w/ routes (panel is never hidden/collapsed)
-              'calc(50% + (var(--sidebar-width) - var(--panel-width)) / 2)'
-            : 'calc(var(--sidebar-width) / 2 + 50%)',
-          ...style,
-        }}
-        onEscapeKeyDown={(e) => {
-          if (!isInteractionReady) {
-            e.preventDefault()
-            return
-          }
-          e.stopPropagation()
-        }}
-        onPointerDown={(e) => {
-          e.stopPropagation()
+          paddingLeft: isWorkflowPage
+            ? 'calc(var(--sidebar-width) - var(--panel-width))'
+            : 'var(--sidebar-width)',
         }}
-        onPointerUp={(e) => {
-          e.stopPropagation()
-        }}
-        {...props}
       >
-        {children}
-      </DialogPrimitive.Content>
+        <DialogPrimitive.Content
+          ref={ref}
+          className={cn(
+            'pointer-events-auto flex max-h-[84vh] flex-col overflow-hidden rounded-xl bg-[var(--bg)] text-small ring-1 ring-foreground/10',
+            ANIMATION_CLASSES,
+            'data-[state=open]:zoom-in-95 data-[state=closed]:zoom-out-95 duration-200',
+            MODAL_SIZES[size],
+            className
+          )}
+          style={style}
+          onEscapeKeyDown={(e) => {
+            if (!isInteractionReady) {
+              e.preventDefault()
+              return
+            }
+            e.stopPropagation()
+          }}
+          onPointerDown={(e) => {
+            e.stopPropagation()
+          }}
+          onPointerUp={(e) => {
+            e.stopPropagation()
+          }}
+          {...props}
+        >
+          {children}
+        </DialogPrimitive.Content>
+      </div>
     </ModalPortal>
   )
 })
diff --git a/apps/sim/components/emcn/components/toast/toast.tsx b/apps/sim/components/emcn/components/toast/toast.tsx
index e90acb9a590..1c892c1857c 100644
--- a/apps/sim/components/emcn/components/toast/toast.tsx
+++ b/apps/sim/components/emcn/components/toast/toast.tsx
@@ -13,6 +13,7 @@ import {
 import { X } from 'lucide-react'
 import { createPortal } from 'react-dom'
 import { cn } from '@/lib/core/utils/cn'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const AUTO_DISMISS_MS = 5000
 const EXIT_ANIMATION_MS = 200
@@ -236,7 +237,7 @@ export function ToastProvider({ children }: { children?: ReactNode }) {
   }, [])
 
   const addToast = useCallback((input: ToastInput): string => {
-    const id = crypto.randomUUID()
+    const id = generateId()
     const data: ToastData = {
       id,
       message: input.message,
diff --git a/apps/sim/content/blog/enterprise/index.mdx b/apps/sim/content/blog/enterprise/index.mdx
index d979d568c23..3f57456617a 100644
--- a/apps/sim/content/blog/enterprise/index.mdx
+++ b/apps/sim/content/blog/enterprise/index.mdx
@@ -1,6 +1,6 @@
 ---
 slug: enterprise
-title: 'Build with Sim for Enterprise'
+title: 'Sim for Enterprise'
 description: 'Access control, BYOK, self-hosted deployments, on-prem Copilot, SSO & SAML, whitelabeling, Admin API, and flexible data retention—enterprise features for teams with strict security and compliance requirements.'
 date: 2026-02-11
 updated: 2026-02-11
diff --git a/apps/sim/content/blog/multiplayer/index.mdx b/apps/sim/content/blog/multiplayer/index.mdx
index 58b59970815..71a48fa89fd 100644
--- a/apps/sim/content/blog/multiplayer/index.mdx
+++ b/apps/sim/content/blog/multiplayer/index.mdx
@@ -1,6 +1,6 @@
 ---
 slug: multiplayer
-title: 'Realtime Collaboration on Sim'
+title: 'Realtime Collaboration'
 description: A high-level explanation into Sim realtime collaborative workflow builder - from operation queues to conflict resolution.
 date: 2025-11-11
 updated: 2025-11-11
diff --git a/apps/sim/ee/sso/components/sso-auth.tsx b/apps/sim/ee/sso/components/sso-auth.tsx
index bdc182c0a29..cf83249fe2d 100644
--- a/apps/sim/ee/sso/components/sso-auth.tsx
+++ b/apps/sim/ee/sso/components/sso-auth.tsx
@@ -10,7 +10,7 @@ import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import AuthBackground from '@/app/(auth)/components/auth-background'
 import { AUTH_SUBMIT_BTN } from '@/app/(auth)/components/auth-button-classes'
 import { SupportFooter } from '@/app/(auth)/components/support-footer'
-import Navbar from '@/app/(home)/components/navbar/navbar'
+import Navbar from '@/app/(landing)/components/navbar/navbar'
 
 const logger = createLogger('SSOAuth')
 
diff --git a/apps/sim/executor/execution/engine.test.ts b/apps/sim/executor/execution/engine.test.ts
index ce62d78e33d..f9c0ab41209 100644
--- a/apps/sim/executor/execution/engine.test.ts
+++ b/apps/sim/executor/execution/engine.test.ts
@@ -957,6 +957,297 @@ describe('ExecutionEngine', () => {
     })
   })
 
+  describe('Response block exit-point behavior', () => {
+    it('should lock finalOutput and stop execution when a terminal Response block fires', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const responseNode = createMockNode('response', 'response')
+
+      startNode.outgoingEdges.set('edge1', { target: 'response' })
+
+      const dag = createMockDAG([startNode, responseNode])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['response']
+        return []
+      })
+
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'response') {
+            return {
+              nodeId,
+              output: { data: { message: 'ok' }, status: 200, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          return { nodeId, output: {}, isFinalOutput: false }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ data: { message: 'ok' }, status: 200, headers: {} })
+      expect(nodeOrchestrator.executionCount).toBe(2)
+    })
+
+    it('should stop execution after Response block on a branch (Router)', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const routerNode = createMockNode('router', 'router')
+      const successResponse = createMockNode('success-response', 'response')
+      const errorResponse = createMockNode('error-response', 'response')
+
+      startNode.outgoingEdges.set('edge1', { target: 'router' })
+      routerNode.outgoingEdges.set('success', { target: 'success-response' })
+      routerNode.outgoingEdges.set('error', { target: 'error-response' })
+
+      const dag = createMockDAG([startNode, routerNode, successResponse, errorResponse])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['router']
+        if (node.id === 'router') return ['success-response']
+        return []
+      })
+
+      const executedNodes: string[] = []
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          executedNodes.push(nodeId)
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'success-response') {
+            return {
+              nodeId,
+              output: { data: { result: 'success' }, status: 200, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          return { nodeId, output: {}, isFinalOutput: false }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ data: { result: 'success' }, status: 200, headers: {} })
+      expect(executedNodes).not.toContain('error-response')
+    })
+
+    it('should stop all branches when a parallel Response block fires first', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const responseNode = createMockNode('fast-response', 'response')
+      const slowNode = createMockNode('slow-work', 'function')
+      const afterSlowNode = createMockNode('after-slow', 'function')
+
+      startNode.outgoingEdges.set('edge1', { target: 'fast-response' })
+      startNode.outgoingEdges.set('edge2', { target: 'slow-work' })
+      slowNode.outgoingEdges.set('edge3', { target: 'after-slow' })
+
+      const dag = createMockDAG([startNode, responseNode, slowNode, afterSlowNode])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['fast-response', 'slow-work']
+        if (node.id === 'slow-work') return ['after-slow']
+        return []
+      })
+
+      const executedNodes: string[] = []
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          executedNodes.push(nodeId)
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'fast-response') {
+            return {
+              nodeId,
+              output: { data: { fast: true }, status: 200, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          if (nodeId === 'slow-work') {
+            await new Promise((resolve) => setTimeout(resolve, 1))
+            return { nodeId, output: { slow: true }, isFinalOutput: false }
+          }
+          return { nodeId, output: {}, isFinalOutput: true }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ data: { fast: true }, status: 200, headers: {} })
+      expect(executedNodes).not.toContain('after-slow')
+    })
+
+    it('should use standard finalOutput logic when no Response block exists', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const endNode = createMockNode('end', 'function')
+      startNode.outgoingEdges.set('edge1', { target: 'end' })
+
+      const dag = createMockDAG([startNode, endNode])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['end']
+        return []
+      })
+
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'end') {
+            return { nodeId, output: { result: 'done' }, isFinalOutput: true }
+          }
+          return { nodeId, output: {}, isFinalOutput: false }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ result: 'done' })
+    })
+
+    it('should not let a second Response block overwrite the first', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const response1 = createMockNode('response1', 'response')
+      const response2 = createMockNode('response2', 'response')
+
+      startNode.outgoingEdges.set('edge1', { target: 'response1' })
+      startNode.outgoingEdges.set('edge2', { target: 'response2' })
+
+      const dag = createMockDAG([startNode, response1, response2])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['response1', 'response2']
+        return []
+      })
+
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'response1') {
+            return {
+              nodeId,
+              output: { data: { first: true }, status: 200, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          if (nodeId === 'response2') {
+            return {
+              nodeId,
+              output: { data: { second: true }, status: 201, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          return { nodeId, output: {}, isFinalOutput: false }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ data: { first: true }, status: 200, headers: {} })
+    })
+
+    it('should not let non-Response terminals overwrite a Response block output', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const responseNode = createMockNode('response', 'response')
+      const otherTerminal = createMockNode('other', 'function')
+
+      startNode.outgoingEdges.set('edge1', { target: 'response' })
+      startNode.outgoingEdges.set('edge2', { target: 'other' })
+
+      const dag = createMockDAG([startNode, responseNode, otherTerminal])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['response', 'other']
+        return []
+      })
+
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'response') {
+            return {
+              nodeId,
+              output: { data: { response: true }, status: 200, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          if (nodeId === 'other') {
+            await new Promise((resolve) => setTimeout(resolve, 1))
+            return { nodeId, output: { other: true }, isFinalOutput: true }
+          }
+          return { nodeId, output: {}, isFinalOutput: false }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ data: { response: true }, status: 200, headers: {} })
+    })
+
+    it('should honor locked Response output even when a parallel node throws an error', async () => {
+      const startNode = createMockNode('start', 'starter')
+      const responseNode = createMockNode('response', 'response')
+      const errorNode = createMockNode('error-node', 'function')
+
+      startNode.outgoingEdges.set('edge1', { target: 'response' })
+      startNode.outgoingEdges.set('edge2', { target: 'error-node' })
+
+      const dag = createMockDAG([startNode, responseNode, errorNode])
+      const context = createMockContext()
+      const edgeManager = createMockEdgeManager((node) => {
+        if (node.id === 'start') return ['response', 'error-node']
+        return []
+      })
+
+      const nodeOrchestrator = {
+        executionCount: 0,
+        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
+          nodeOrchestrator.executionCount++
+          if (nodeId === 'response') {
+            return {
+              nodeId,
+              output: { data: { ok: true }, status: 200, headers: {} },
+              isFinalOutput: true,
+            }
+          }
+          if (nodeId === 'error-node') {
+            await new Promise((resolve) => setTimeout(resolve, 1))
+            throw new Error('Parallel branch failed')
+          }
+          return { nodeId, output: {}, isFinalOutput: false }
+        }),
+        handleNodeCompletion: vi.fn(),
+      } as unknown as MockNodeOrchestrator
+
+      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
+      const result = await engine.run('start')
+
+      expect(result.success).toBe(true)
+      expect(result.output).toEqual({ data: { ok: true }, status: 200, headers: {} })
+    })
+  })
+
   describe('Cancellation flag behavior', () => {
     it('should set cancelledFlag when abort signal fires', async () => {
       const abortController = new AbortController()
diff --git a/apps/sim/executor/execution/engine.ts b/apps/sim/executor/execution/engine.ts
index a420c5df7dd..756ab0a03b3 100644
--- a/apps/sim/executor/execution/engine.ts
+++ b/apps/sim/executor/execution/engine.ts
@@ -23,6 +23,7 @@ export class ExecutionEngine {
   private executing = new Set<Promise<void>>()
   private queueLock = Promise.resolve()
   private finalOutput: NormalizedBlockOutput = {}
+  private responseOutputLocked = false
   private pausedBlocks: Map<string, PauseMetadata> = new Map()
   private allowResumeTriggers: boolean
   private cancelledFlag = false
@@ -127,8 +128,7 @@ export class ExecutionEngine {
         await this.waitForAllExecutions()
       }
 
-      // Rethrow the captured error so it's handled by the catch block
-      if (this.errorFlag && this.executionError) {
+      if (this.errorFlag && this.executionError && !this.responseOutputLocked) {
         throw this.executionError
       }
 
@@ -399,6 +399,12 @@ export class ExecutionEngine {
       return
     }
 
+    if (this.stoppedEarlyFlag && this.responseOutputLocked) {
+      // Workflow already ended via Response block. Skip state persistence (setBlockOutput),
+      // parallel/loop scope tracking, and edge propagation — no downstream blocks will run.
+      return
+    }
+
     if (output._pauseMetadata) {
       const pauseMetadata = output._pauseMetadata
       this.pausedBlocks.set(pauseMetadata.contextId, pauseMetadata)
@@ -410,7 +416,17 @@ export class ExecutionEngine {
 
     await this.nodeOrchestrator.handleNodeCompletion(this.context, nodeId, output)
 
-    if (isFinalOutput) {
+    const isResponseBlock = node.block.metadata?.id === BlockType.RESPONSE
+    if (isResponseBlock) {
+      if (!this.responseOutputLocked) {
+        this.finalOutput = output
+        this.responseOutputLocked = true
+      }
+      this.stoppedEarlyFlag = true
+      return
+    }
+
+    if (isFinalOutput && !this.responseOutputLocked) {
       this.finalOutput = output
     }
 
diff --git a/apps/sim/executor/handlers/agent/memory.ts b/apps/sim/executor/handlers/agent/memory.ts
index 66fc6833a00..00252bfd812 100644
--- a/apps/sim/executor/handlers/agent/memory.ts
+++ b/apps/sim/executor/handlers/agent/memory.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'node:crypto'
 import { db } from '@sim/db'
 import { memory } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, sql } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getAccurateTokenCount } from '@/lib/tokenization/estimators'
 import { MEMORY } from '@/executor/constants'
 import type { AgentInputs, Message } from '@/executor/handlers/agent/types'
@@ -221,7 +221,7 @@ export class Memory {
     await db
       .insert(memory)
       .values({
-        id: randomUUID(),
+        id: generateId(),
         workspaceId,
         key,
         data: messages,
@@ -237,7 +237,7 @@ export class Memory {
     await db
       .insert(memory)
       .values({
-        id: randomUUID(),
+        id: generateId(),
         workspaceId,
         key,
         data: [message],
diff --git a/apps/sim/executor/handlers/mothership/mothership-handler.ts b/apps/sim/executor/handlers/mothership/mothership-handler.ts
index 97a399cd2b2..0b40a17fdc4 100644
--- a/apps/sim/executor/handlers/mothership/mothership-handler.ts
+++ b/apps/sim/executor/handlers/mothership/mothership-handler.ts
@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { BlockOutput } from '@/blocks/types'
 import { BlockType } from '@/executor/constants'
 import type { BlockHandler, ExecutionContext } from '@/executor/types'
@@ -29,7 +30,7 @@ export class MothershipBlockHandler implements BlockHandler {
       throw new Error('Prompt input is required')
     }
     const messages = [{ role: 'user' as const, content: prompt }]
-    const chatId = crypto.randomUUID()
+    const chatId = generateId()
 
     const url = buildAPIUrl('/api/mothership/execute')
     const headers = await buildAuthHeaders(ctx.userId)
diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.ts b/apps/sim/executor/handlers/workflow/workflow-handler.ts
index 4e92948ee17..aaf10d9b9ee 100644
--- a/apps/sim/executor/handlers/workflow/workflow-handler.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.ts
@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import { buildNextCallChain, validateCallChain } from '@/lib/execution/call-chain'
 import { snapshotService } from '@/lib/logs/execution/snapshot/service'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
@@ -77,7 +78,7 @@ export class WorkflowBlockHandler implements BlockHandler {
 
     // Unique ID per invocation — used to correlate child block events with this specific
     // workflow block execution, preventing cross-iteration child mixing in loop contexts.
-    const instanceId = crypto.randomUUID()
+    const instanceId = generateId()
 
     const childCallChain = buildNextCallChain(ctx.callChain || [], workflowId)
     const depthError = validateCallChain(childCallChain)
diff --git a/apps/sim/hooks/queries/a2a/tasks.ts b/apps/sim/hooks/queries/a2a/tasks.ts
index b0033141ac0..d4650443a76 100644
--- a/apps/sim/hooks/queries/a2a/tasks.ts
+++ b/apps/sim/hooks/queries/a2a/tasks.ts
@@ -7,6 +7,7 @@
 import type { Artifact, Message, TaskState } from '@a2a-js/sdk'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { isTerminalState } from '@/lib/a2a/utils'
+import { generateId } from '@/lib/core/utils/uuid'
 
 /** A2A v0.3 JSON-RPC method names */
 const A2A_METHODS = {
@@ -70,7 +71,7 @@ export interface SendA2ATaskResponse {
 async function sendA2ATask(params: SendA2ATaskParams): Promise<SendA2ATaskResponse> {
   const userMessage: Message = {
     kind: 'message',
-    messageId: crypto.randomUUID(),
+    messageId: generateId(),
     role: 'user',
     parts: [{ kind: 'text', text: params.message }],
     ...(params.taskId && { taskId: params.taskId }),
@@ -85,7 +86,7 @@ async function sendA2ATask(params: SendA2ATaskParams): Promise<SendA2ATaskRespon
     },
     body: JSON.stringify({
       jsonrpc: '2.0',
-      id: crypto.randomUUID(),
+      id: generateId(),
       method: A2A_METHODS.MESSAGE_SEND,
       params: {
         message: userMessage,
@@ -162,7 +163,7 @@ async function fetchA2ATask(params: GetA2ATaskParams, signal?: AbortSignal): Pro
     },
     body: JSON.stringify({
       jsonrpc: '2.0',
-      id: crypto.randomUUID(),
+      id: generateId(),
       method: A2A_METHODS.TASKS_GET,
       params: {
         id: params.taskId,
@@ -225,7 +226,7 @@ async function cancelA2ATask(params: CancelA2ATaskParams): Promise<A2ATask> {
     },
     body: JSON.stringify({
       jsonrpc: '2.0',
-      id: crypto.randomUUID(),
+      id: generateId(),
       method: A2A_METHODS.TASKS_CANCEL,
       params: {
         id: params.taskId,
diff --git a/apps/sim/hooks/queries/admin-users.ts b/apps/sim/hooks/queries/admin-users.ts
index 2ede1af8ab1..7228aacf60d 100644
--- a/apps/sim/hooks/queries/admin-users.ts
+++ b/apps/sim/hooks/queries/admin-users.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { client } from '@/lib/auth/auth-client'
+import { isValidUuid } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('AdminUsersQuery')
 
@@ -25,8 +26,6 @@ interface AdminUsersResponse {
   total: number
 }
 
-const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-
 function mapUser(u: {
   id: string
   name: string
@@ -50,7 +49,7 @@ async function fetchAdminUsers(
   limit: number,
   searchQuery: string
 ): Promise<AdminUsersResponse> {
-  if (UUID_REGEX.test(searchQuery.trim())) {
+  if (isValidUuid(searchQuery.trim())) {
     const { data, error } = await client.admin.getUser({ query: { id: searchQuery.trim() } })
     if (error) throw new Error(error.message ?? 'Failed to fetch user')
     if (!data) return { users: [], total: 0 }
diff --git a/apps/sim/hooks/queries/folders.ts b/apps/sim/hooks/queries/folders.ts
index 8b8ccb408a7..b3ebf900f99 100644
--- a/apps/sim/hooks/queries/folders.ts
+++ b/apps/sim/hooks/queries/folders.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getFolderMap } from '@/hooks/queries/utils/folder-cache'
 import { folderKeys } from '@/hooks/queries/utils/folder-keys'
 import { invalidateWorkflowLists } from '@/hooks/queries/utils/invalidate-workflow-lists'
@@ -159,7 +160,7 @@ export function useCreateFolder() {
         updatedAt: new Date(),
       }
     },
-    (variables) => variables.id ?? crypto.randomUUID()
+    (variables) => variables.id ?? generateId()
   )
 
   return useMutation({
@@ -259,7 +260,7 @@ export function useDuplicateFolderMutation() {
         updatedAt: new Date(),
       }
     },
-    (variables) => variables.newId ?? crypto.randomUUID()
+    (variables) => variables.newId ?? generateId()
   )
 
   return useMutation({
diff --git a/apps/sim/hooks/queries/inbox.ts b/apps/sim/hooks/queries/inbox.ts
index 14a35642053..e372d639692 100644
--- a/apps/sim/hooks/queries/inbox.ts
+++ b/apps/sim/hooks/queries/inbox.ts
@@ -1,4 +1,5 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { InboxTaskStatus } from '@/lib/mothership/inbox/types'
 
 export const inboxKeys = {
@@ -219,7 +220,7 @@ export function useAddInboxSender() {
           senders: [
             ...previous.senders,
             {
-              id: `optimistic-${crypto.randomUUID()}`,
+              id: `optimistic-${generateId()}`,
               email,
               label: label || null,
               createdAt: new Date().toISOString(),
diff --git a/apps/sim/hooks/queries/workflows.ts b/apps/sim/hooks/queries/workflows.ts
index 729d3adf288..efa7f0029ba 100644
--- a/apps/sim/hooks/queries/workflows.ts
+++ b/apps/sim/hooks/queries/workflows.ts
@@ -10,6 +10,7 @@ import {
   useQuery,
   useQueryClient,
 } from '@tanstack/react-query'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { deploymentKeys } from '@/hooks/queries/deployments'
 import { fetchDeploymentVersionState } from '@/hooks/queries/utils/fetch-deployment-version-state'
@@ -164,7 +165,7 @@ export function useCreateWorkflow() {
         workflowKeys.list(variables.workspaceId, 'active')
       )
 
-      const tempId = variables.id ?? crypto.randomUUID()
+      const tempId = variables.id ?? generateId()
       let sortOrder: number
       if (variables.sortOrder !== undefined) {
         sortOrder = variables.sortOrder
@@ -344,7 +345,7 @@ export function useDuplicateWorkflowMutation() {
       const snapshot = queryClient.getQueryData<WorkflowMetadata[]>(
         workflowKeys.list(variables.workspaceId, 'active')
       )
-      const tempId = variables.newId ?? crypto.randomUUID()
+      const tempId = variables.newId ?? generateId()
 
       const currentWorkflows = Object.fromEntries(
         getWorkflows(variables.workspaceId).map((w) => [w.id, w])
diff --git a/apps/sim/hooks/use-code-undo-redo.ts b/apps/sim/hooks/use-code-undo-redo.ts
index d0edbb535ec..82c20da6192 100644
--- a/apps/sim/hooks/use-code-undo-redo.ts
+++ b/apps/sim/hooks/use-code-undo-redo.ts
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { createLogger } from '@sim/logger'
 import { useShallow } from 'zustand/react/shallow'
+import { generateId } from '@/lib/core/utils/uuid'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useCodeUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -83,7 +84,7 @@ export function useCodeUndoRedo({
     }
 
     useCodeUndoRedoStore.getState().push({
-      id: crypto.randomUUID(),
+      id: generateId(),
       createdAt: Date.now(),
       workflowId: activeWorkflowId,
       blockId,
@@ -128,7 +129,7 @@ export function useCodeUndoRedo({
       }
 
       useCodeUndoRedoStore.getState().push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         createdAt: Date.now(),
         workflowId: activeWorkflowId,
         blockId,
diff --git a/apps/sim/hooks/use-collaborative-workflow.ts b/apps/sim/hooks/use-collaborative-workflow.ts
index 60c36eeb645..dada66d9c9b 100644
--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -3,6 +3,7 @@ import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
 import { useShallow } from 'zustand/react/shallow'
 import { useSession } from '@/lib/auth/auth-client'
+import { generateId } from '@/lib/core/utils/uuid'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
 import { normalizeName, RESERVED_BLOCK_NAMES } from '@/executor/constants'
@@ -688,7 +689,7 @@ export function useCollaborativeWorkflow() {
         return
       }
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -724,7 +725,7 @@ export function useCollaborativeWorkflow() {
 
       if (updates.length === 0) return
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -845,7 +846,7 @@ export function useCollaborativeWorkflow() {
                 subBlockId: string
                 newValue: any
               }) => {
-                const operationId = crypto.randomUUID()
+                const operationId = generateId()
                 addToQueue({
                   id: operationId,
                   operation: {
@@ -901,7 +902,7 @@ export function useCollaborativeWorkflow() {
 
       if (validIds.length === 0) return
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -959,7 +960,7 @@ export function useCollaborativeWorkflow() {
       // Collect all edge IDs to remove
       const edgeIdsToRemove = updates.flatMap((u) => u.affectedEdges.map((e) => e.id))
       if (edgeIdsToRemove.length > 0) {
-        const edgeOperationId = crypto.randomUUID()
+        const edgeOperationId = generateId()
         addToQueue({
           id: edgeOperationId,
           operation: {
@@ -984,7 +985,7 @@ export function useCollaborativeWorkflow() {
 
       undoRedo.recordBatchUpdateParent(batchUpdates)
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
       addToQueue({
         id: operationId,
         operation: {
@@ -1034,7 +1035,7 @@ export function useCollaborativeWorkflow() {
         return
       }
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
       addToQueue({
         id: operationId,
         operation: {
@@ -1072,7 +1073,7 @@ export function useCollaborativeWorkflow() {
 
       if (validIds.length === 0) return
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -1120,7 +1121,7 @@ export function useCollaborativeWorkflow() {
 
       if (validIds.length === 0) return
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -1159,7 +1160,7 @@ export function useCollaborativeWorkflow() {
       const newEdges = filterNewEdges(validEdges, currentEdges)
       if (newEdges.length === 0) return false
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -1216,7 +1217,7 @@ export function useCollaborativeWorkflow() {
         return false
       }
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -1255,7 +1256,7 @@ export function useCollaborativeWorkflow() {
       useWorkflowStore.getState().syncDynamicHandleSubblockValue(blockId, subblockId, value)
 
       if (activeWorkflowId) {
-        const operationId = crypto.randomUUID()
+        const operationId = generateId()
 
         addToQueue({
           id: operationId,
@@ -1318,7 +1319,7 @@ export function useCollaborativeWorkflow() {
       useSubBlockStore.getState().setValue(blockId, subblockId, value)
 
       // Use the operation queue but with immediate processing (no debouncing)
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -1565,7 +1566,7 @@ export function useCollaborativeWorkflow() {
 
   const collaborativeAddVariable = useCallback(
     (variableData: { name: string; type: any; value: any; workflowId: string }) => {
-      const id = crypto.randomUUID()
+      const id = generateId()
 
       // Optimistically add to local store first
       useVariablesStore.getState().addVariable(variableData, id)
@@ -1649,7 +1650,7 @@ export function useCollaborativeWorkflow() {
         filteredEdges: edges.length - validEdges.length,
       })
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
@@ -1740,7 +1741,7 @@ export function useCollaborativeWorkflow() {
         totalCount: allBlocksToRemove.size,
       })
 
-      const operationId = crypto.randomUUID()
+      const operationId = generateId()
 
       addToQueue({
         id: operationId,
diff --git a/apps/sim/hooks/use-undo-redo.ts b/apps/sim/hooks/use-undo-redo.ts
index 11054669ea0..5ba2f9d929b 100644
--- a/apps/sim/hooks/use-undo-redo.ts
+++ b/apps/sim/hooks/use-undo-redo.ts
@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 
 declare global {
   interface Window {
@@ -58,7 +59,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || blockSnapshots.length === 0) return
 
       const operation: BatchAddBlocksOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_ADD_BLOCKS,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -71,7 +72,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchRemoveBlocksOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_REMOVE_BLOCKS,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -104,7 +105,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || blockSnapshots.length === 0) return
 
       const operation: BatchRemoveBlocksOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_REMOVE_BLOCKS,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -117,7 +118,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchAddBlocksOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_ADD_BLOCKS,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -152,7 +153,7 @@ export function useUndoRedo() {
       }
 
       const operation: BatchAddEdgesOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_ADD_EDGES,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -161,7 +162,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchRemoveEdgesOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_REMOVE_EDGES,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -182,7 +183,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || edgeSnapshots.length === 0) return
 
       const operation: BatchRemoveEdgesOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_REMOVE_EDGES,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -193,7 +194,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchAddEdgesOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_ADD_EDGES,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -225,7 +226,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || moves.length === 0) return
 
       const operation: BatchMoveBlocksOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_MOVE_BLOCKS,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -234,7 +235,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchMoveBlocksOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_MOVE_BLOCKS,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -268,7 +269,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId) return
 
       const operation: UpdateParentOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.UPDATE_PARENT,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -284,7 +285,7 @@ export function useUndoRedo() {
       }
 
       const inverse: UpdateParentOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.UPDATE_PARENT,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -326,7 +327,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || updates.length === 0) return
 
       const operation: BatchUpdateParentOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_UPDATE_PARENT,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -335,7 +336,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchUpdateParentOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_UPDATE_PARENT,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -368,7 +369,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || blockIds.length === 0) return
 
       const operation: BatchToggleEnabledOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_TOGGLE_ENABLED,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -377,7 +378,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchToggleEnabledOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_TOGGLE_ENABLED,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -398,7 +399,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || blockIds.length === 0) return
 
       const operation: BatchToggleHandlesOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_TOGGLE_HANDLES,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -407,7 +408,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchToggleHandlesOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_TOGGLE_HANDLES,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -428,7 +429,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId || blockIds.length === 0) return
 
       const operation: BatchToggleLockedOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_TOGGLE_LOCKED,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -437,7 +438,7 @@ export function useUndoRedo() {
       }
 
       const inverse: BatchToggleLockedOperation = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.BATCH_TOGGLE_LOCKED,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -469,7 +470,7 @@ export function useUndoRedo() {
         workflowId: activeWorkflowId,
       })
 
-      const opId = crypto.randomUUID()
+      const opId = generateId()
 
       switch (entry.inverse.type) {
         case UNDO_REDO_OPERATIONS.BATCH_REMOVE_BLOCKS: {
@@ -637,7 +638,7 @@ export function useUndoRedo() {
               const edgesToAdd = affectedEdges.filter((e) => !existingEdgeIds.has(e.id))
               if (edgesToAdd.length > 0) {
                 addToQueue({
-                  id: crypto.randomUUID(),
+                  id: generateId(),
                   operation: {
                     operation: EDGES_OPERATIONS.BATCH_ADD_EDGES,
                     target: OPERATION_TARGETS.EDGES,
@@ -651,7 +652,7 @@ export function useUndoRedo() {
             }
 
             addToQueue({
-              id: crypto.randomUUID(),
+              id: generateId(),
               operation: {
                 operation: BLOCK_OPERATIONS.UPDATE_POSITION,
                 target: OPERATION_TARGETS.BLOCK,
@@ -706,7 +707,7 @@ export function useUndoRedo() {
                 useWorkflowStore.getState().batchRemoveEdges(edgeIdsToRemove)
                 edgeIdsToRemove.forEach((edgeId) => {
                   addToQueue({
-                    id: crypto.randomUUID(),
+                    id: generateId(),
                     operation: {
                       operation: EDGE_OPERATIONS.REMOVE,
                       target: OPERATION_TARGETS.EDGE,
@@ -759,7 +760,7 @@ export function useUndoRedo() {
           // Apply edge operations in batch
           if (allEdgesToAdd.length > 0) {
             addToQueue({
-              id: crypto.randomUUID(),
+              id: generateId(),
               operation: {
                 operation: EDGES_OPERATIONS.BATCH_ADD_EDGES,
                 target: OPERATION_TARGETS.EDGES,
@@ -774,7 +775,7 @@ export function useUndoRedo() {
           if (allEdgeIdsToRemove.length > 0) {
             useWorkflowStore.getState().batchRemoveEdges(allEdgeIdsToRemove)
             addToQueue({
-              id: crypto.randomUUID(),
+              id: generateId(),
               operation: {
                 operation: EDGES_OPERATIONS.BATCH_REMOVE_EDGES,
                 target: OPERATION_TARGETS.EDGES,
@@ -1087,7 +1088,7 @@ export function useUndoRedo() {
         return
       }
 
-      const opId = crypto.randomUUID()
+      const opId = generateId()
 
       switch (entry.operation.type) {
         case UNDO_REDO_OPERATIONS.BATCH_ADD_BLOCKS: {
@@ -1262,7 +1263,7 @@ export function useUndoRedo() {
                 useWorkflowStore.getState().batchRemoveEdges(edgeIdsToRemove)
                 edgeIdsToRemove.forEach((edgeId) => {
                   addToQueue({
-                    id: crypto.randomUUID(),
+                    id: generateId(),
                     operation: {
                       operation: EDGE_OPERATIONS.REMOVE,
                       target: OPERATION_TARGETS.EDGE,
@@ -1277,7 +1278,7 @@ export function useUndoRedo() {
 
             // Send position update to server
             addToQueue({
-              id: crypto.randomUUID(),
+              id: generateId(),
               operation: {
                 operation: BLOCK_OPERATIONS.UPDATE_POSITION,
                 target: OPERATION_TARGETS.BLOCK,
@@ -1328,7 +1329,7 @@ export function useUndoRedo() {
               const edgesToAdd = affectedEdges.filter((e) => !existingEdgeIds.has(e.id))
               if (edgesToAdd.length > 0) {
                 addToQueue({
-                  id: crypto.randomUUID(),
+                  id: generateId(),
                   operation: {
                     operation: EDGES_OPERATIONS.BATCH_ADD_EDGES,
                     target: OPERATION_TARGETS.EDGES,
@@ -1382,7 +1383,7 @@ export function useUndoRedo() {
           if (allEdgeIdsToRemove.length > 0) {
             useWorkflowStore.getState().batchRemoveEdges(allEdgeIdsToRemove)
             addToQueue({
-              id: crypto.randomUUID(),
+              id: generateId(),
               operation: {
                 operation: EDGES_OPERATIONS.BATCH_REMOVE_EDGES,
                 target: OPERATION_TARGETS.EDGES,
@@ -1404,7 +1405,7 @@ export function useUndoRedo() {
           // Apply edge additions in batch after
           if (allEdgesToAdd.length > 0) {
             addToQueue({
-              id: crypto.randomUUID(),
+              id: generateId(),
               operation: {
                 operation: EDGES_OPERATIONS.BATCH_ADD_EDGES,
                 target: OPERATION_TARGETS.EDGES,
@@ -1717,7 +1718,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId) return
 
       const operation: any = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.APPLY_DIFF,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -1730,7 +1731,7 @@ export function useUndoRedo() {
       }
 
       const inverse: any = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.APPLY_DIFF,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -1761,7 +1762,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId) return
 
       const operation: any = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.ACCEPT_DIFF,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -1775,7 +1776,7 @@ export function useUndoRedo() {
       }
 
       const inverse: any = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.ACCEPT_DIFF,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -1801,7 +1802,7 @@ export function useUndoRedo() {
       if (!activeWorkflowId) return
 
       const operation: any = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.REJECT_DIFF,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
@@ -1815,7 +1816,7 @@ export function useUndoRedo() {
       }
 
       const inverse: any = {
-        id: crypto.randomUUID(),
+        id: generateId(),
         type: UNDO_REDO_OPERATIONS.REJECT_DIFF,
         timestamp: Date.now(),
         workflowId: activeWorkflowId,
diff --git a/apps/sim/lib/a2a/utils.ts b/apps/sim/lib/a2a/utils.ts
index 89a90978865..5a704e20aea 100644
--- a/apps/sim/lib/a2a/utils.ts
+++ b/apps/sim/lib/a2a/utils.ts
@@ -17,6 +17,7 @@ import {
 } from '@a2a-js/sdk/client'
 import { createLogger } from '@sim/logger'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
+import { generateId } from '@/lib/core/utils/uuid'
 import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils'
 import { A2A_TERMINAL_STATES } from './constants'
 
@@ -201,7 +202,7 @@ export function createTextPart(text: string): Part {
 export function createUserMessage(text: string): Message {
   return {
     kind: 'message',
-    messageId: crypto.randomUUID(),
+    messageId: generateId(),
     role: 'user',
     parts: [{ kind: 'text', text }],
   }
@@ -210,7 +211,7 @@ export function createUserMessage(text: string): Message {
 export function createAgentMessage(text: string): Message {
   return {
     kind: 'message',
-    messageId: crypto.randomUUID(),
+    messageId: generateId(),
     role: 'agent',
     parts: [{ kind: 'text', text }],
   }
diff --git a/apps/sim/lib/api-key/auth.ts b/apps/sim/lib/api-key/auth.ts
index c6ee12f73e3..8ecb7a4a441 100644
--- a/apps/sim/lib/api-key/auth.ts
+++ b/apps/sim/lib/api-key/auth.ts
@@ -2,7 +2,6 @@ import { db } from '@sim/db'
 import { apiKey } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import {
   decryptApiKey,
   encryptApiKey,
@@ -13,6 +12,7 @@ import {
 } from '@/lib/api-key/crypto'
 import { env } from '@/lib/core/config/env'
 import { safeCompare } from '@/lib/core/security/encryption'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('ApiKeyAuth')
 
@@ -250,7 +250,7 @@ export async function createWorkspaceApiKey(params: {
   const [newKey] = await db
     .insert(apiKey)
     .values({
-      id: nanoid(),
+      id: generateShortId(),
       workspaceId: params.workspaceId,
       userId: params.userId,
       createdBy: params.userId,
diff --git a/apps/sim/lib/audit/log.test.ts b/apps/sim/lib/audit/log.test.ts
index 38b0f8db0f3..57381729a43 100644
--- a/apps/sim/lib/audit/log.test.ts
+++ b/apps/sim/lib/audit/log.test.ts
@@ -13,7 +13,12 @@ vi.mock('@sim/db/schema', () => ({
 }))
 vi.mock('drizzle-orm', () => drizzleOrmMock)
 vi.mock('@sim/logger', () => loggerMock)
-vi.mock('nanoid', () => ({ nanoid: () => 'test-id-123' }))
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: () => 'test-uuid-123',
+  generateShortId: () => 'test-id-123',
+  isValidUuid: (v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v),
+}))
 
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 
diff --git a/apps/sim/lib/audit/log.ts b/apps/sim/lib/audit/log.ts
index f37e27b382a..27eefd05c11 100644
--- a/apps/sim/lib/audit/log.ts
+++ b/apps/sim/lib/audit/log.ts
@@ -2,7 +2,7 @@ import { auditLog, db } from '@sim/db'
 import { user } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('AuditLog')
 
@@ -258,7 +258,7 @@ async function insertAuditLog(params: AuditLogParams): Promise<void> {
   }
 
   await db.insert(auditLog).values({
-    id: nanoid(),
+    id: generateShortId(),
     workspaceId: params.workspaceId || null,
     actorId: params.actorId,
     action: params.action,
diff --git a/apps/sim/lib/auth/anonymous.ts b/apps/sim/lib/auth/anonymous.ts
index 97a06b9565a..4df32329130 100644
--- a/apps/sim/lib/auth/anonymous.ts
+++ b/apps/sim/lib/auth/anonymous.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import * as schema from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { ANONYMOUS_USER, ANONYMOUS_USER_ID } from './constants'
 
 const logger = createLogger('AnonymousAuth')
@@ -36,7 +37,7 @@ export async function ensureAnonymousUserExists(): Promise<void> {
 
     if (!existingStats) {
       await db.insert(schema.userStats).values({
-        id: crypto.randomUUID(),
+        id: generateId(),
         userId: ANONYMOUS_USER_ID,
         currentUsageLimit: '10000000000',
       })
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 868284935c2..6aa989e720b 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -72,6 +72,7 @@ import {
 } from '@/lib/core/config/feature-flags'
 import { PlatformEvents } from '@/lib/core/telemetry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { processCredentialDraft } from '@/lib/credentials/draft-processor'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress, getPersonalEmailFrom } from '@/lib/messaging/email/utils'
@@ -123,7 +124,7 @@ function getMicrosoftUserInfoFromIdToken(tokens: { accessToken?: string }, provi
 
   const now = new Date()
   return {
-    id: `${payload.oid || payload.sub}-${crypto.randomUUID()}`,
+    id: `${payload.oid || payload.sub}-${generateId()}`,
     name: (payload.name as string) || 'Microsoft User',
     email,
     emailVerified: true,
@@ -455,7 +456,7 @@ export const auth = betterAuth({
           }
 
           // Sync webhooks for credential sets after connecting a new credential
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           const userMemberships = await db
             .select({
               credentialSetId: schema.credentialSetMember.credentialSetId,
@@ -899,7 +900,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -935,7 +936,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -971,7 +972,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1007,7 +1008,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1043,7 +1044,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1080,7 +1081,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1116,7 +1117,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1151,7 +1152,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1187,7 +1188,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1224,7 +1225,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1261,7 +1262,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1298,7 +1299,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1334,7 +1335,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1371,7 +1372,7 @@ export const auth = betterAuth({
               const profile = await response.json()
               const now = new Date()
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'Google User',
                 email: profile.email,
                 image: profile.picture || undefined,
@@ -1546,7 +1547,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${uniqueId}-${crypto.randomUUID()}`,
+                id: `${uniqueId}-${generateId()}`,
                 name: 'Wealthbox User',
                 email: `${uniqueId}@wealthbox.user`,
                 emailVerified: false,
@@ -1593,7 +1594,7 @@ export const auth = betterAuth({
               const user = data.data
 
               return {
-                id: `${user.id.toString()}-${crypto.randomUUID()}`,
+                id: `${user.id.toString()}-${generateId()}`,
                 name: user.name,
                 email: user.email,
                 emailVerified: user.activated,
@@ -1661,7 +1662,7 @@ export const auth = betterAuth({
               })
 
               return {
-                id: `${(data.user_id || data.hub_id).toString()}-${crypto.randomUUID()}`,
+                id: `${(data.user_id || data.hub_id).toString()}-${generateId()}`,
                 name: data.user || 'HubSpot User',
                 email: data.user || `hubspot-${data.hub_id}@hubspot.com`,
                 emailVerified: true,
@@ -1716,7 +1717,7 @@ export const auth = betterAuth({
               const data = await response.json()
 
               return {
-                id: `${(data.user_id || data.sub).toString()}-${crypto.randomUUID()}`,
+                id: `${(data.user_id || data.sub).toString()}-${generateId()}`,
                 name: data.name || 'Salesforce User',
                 email: data.email || `salesforce-${data.user_id}@salesforce.com`,
                 emailVerified: data.email_verified || true,
@@ -1776,7 +1777,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${profile.data.id.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.data.id.toString()}-${generateId()}`,
                 name: profile.data.name || 'X User',
                 email: `${profile.data.username}@x.com`,
                 image: profile.data.profile_image_url,
@@ -1828,7 +1829,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${profile.account_id.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.account_id.toString()}-${generateId()}`,
                 name: profile.name || profile.display_name || 'Confluence User',
                 email: profile.email || `${profile.account_id}@atlassian.com`,
                 image: profile.picture || undefined,
@@ -1880,7 +1881,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${profile.account_id.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.account_id.toString()}-${generateId()}`,
                 name: profile.name || profile.display_name || 'Jira User',
                 email: profile.email || `${profile.account_id}@atlassian.com`,
                 image: profile.picture || undefined,
@@ -1931,7 +1932,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${data.id.toString()}-${crypto.randomUUID()}`,
+                id: `${data.id.toString()}-${generateId()}`,
                 name: data.email ? data.email.split('@')[0] : 'Airtable User',
                 email: data.email || `${data.id}@airtable.user`,
                 emailVerified: !!data.email,
@@ -1981,7 +1982,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${(profile.bot?.owner?.user?.id || profile.id).toString()}-${crypto.randomUUID()}`,
+                id: `${(profile.bot?.owner?.user?.id || profile.id).toString()}-${generateId()}`,
                 name: profile.name || profile.bot?.owner?.user?.name || 'Notion User',
                 email: profile.person?.email || `${profile.id}@notion.user`,
                 emailVerified: !!profile.person?.email,
@@ -2032,7 +2033,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${data.id.toString()}-${crypto.randomUUID()}`,
+                id: `${data.id.toString()}-${generateId()}`,
                 name: data.name || 'Reddit User',
                 email: `${data.name}@reddit.user`,
                 image: data.icon_img || undefined,
@@ -2104,7 +2105,7 @@ export const auth = betterAuth({
               const viewer = data.viewer
 
               return {
-                id: `${viewer.id.toString()}-${crypto.randomUUID()}`,
+                id: `${viewer.id.toString()}-${generateId()}`,
                 email: viewer.email,
                 name: viewer.name,
                 emailVerified: true,
@@ -2155,7 +2156,7 @@ export const auth = betterAuth({
               const member = data[0]
 
               return {
-                id: `${member.id.workspace_member_id}-${crypto.randomUUID()}`,
+                id: `${member.id.workspace_member_id}-${generateId()}`,
                 email: member.email_address,
                 name:
                   `${member.first_name ?? ''} ${member.last_name ?? ''}`.trim() ||
@@ -2202,7 +2203,7 @@ export const auth = betterAuth({
               const data = await response.json()
 
               return {
-                id: `${data.id}-${crypto.randomUUID()}`,
+                id: `${data.id}-${generateId()}`,
                 email: data.login,
                 name: data.name || data.login,
                 emailVerified: true,
@@ -2257,7 +2258,7 @@ export const auth = betterAuth({
               const data = await response.json()
 
               return {
-                id: `${data.account_id.toString()}-${crypto.randomUUID()}`,
+                id: `${data.account_id.toString()}-${generateId()}`,
                 email: data.email,
                 name: data.name?.display_name || data.email,
                 emailVerified: data.email_verified || false,
@@ -2309,7 +2310,7 @@ export const auth = betterAuth({
               const now = new Date()
 
               return {
-                id: `${profile.gid.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.gid.toString()}-${generateId()}`,
                 name: profile.name || 'Asana User',
                 email: profile.email || `${profile.gid}@asana.user`,
                 image: profile.photo?.image_128x128 || undefined,
@@ -2370,7 +2371,7 @@ export const auth = betterAuth({
               logger.info('Slack credential identifier', { teamId, userId, uniqueId, teamName })
 
               return {
-                id: `${uniqueId}-${crypto.randomUUID()}`,
+                id: `${uniqueId}-${generateId()}`,
                 name: teamName,
                 email: `${teamId}-${userId}@slack.bot`,
                 emailVerified: false,
@@ -2421,7 +2422,7 @@ export const auth = betterAuth({
               const uniqueId = `webflow-${userId}`
 
               return {
-                id: `${uniqueId}-${crypto.randomUUID()}`,
+                id: `${uniqueId}-${generateId()}`,
                 name: data.user_name || 'Webflow User',
                 email: `${uniqueId.replace(/[^a-zA-Z0-9]/g, '')}@webflow.user`,
                 emailVerified: false,
@@ -2469,7 +2470,7 @@ export const auth = betterAuth({
               const profile = await response.json()
 
               return {
-                id: `${profile.sub}-${crypto.randomUUID()}`,
+                id: `${profile.sub}-${generateId()}`,
                 name: profile.name || 'LinkedIn User',
                 email: profile.email || `${profile.sub}@linkedin.user`,
                 emailVerified: profile.email_verified || true,
@@ -2520,7 +2521,7 @@ export const auth = betterAuth({
               const profile = await response.json()
 
               return {
-                id: `${profile.id.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.id.toString()}-${generateId()}`,
                 name:
                   `${profile.first_name || ''} ${profile.last_name || ''}`.trim() || 'Zoom User',
                 email: profile.email || `${profile.id}@zoom.user`,
@@ -2570,7 +2571,7 @@ export const auth = betterAuth({
               const profile = await response.json()
 
               return {
-                id: `${profile.id.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.id.toString()}-${generateId()}`,
                 name: profile.display_name || 'Spotify User',
                 email: profile.email || `${profile.id}@spotify.user`,
                 emailVerified: true,
@@ -2619,7 +2620,7 @@ export const auth = betterAuth({
               const profile = await response.json()
 
               return {
-                id: `${profile.ID?.toString() || profile.id?.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.ID?.toString() || profile.id?.toString()}-${generateId()}`,
                 name: profile.display_name || profile.username || 'WordPress User',
                 email: profile.email || `${profile.username}@wordpress.com`,
                 emailVerified: profile.email_verified || false,
@@ -2677,7 +2678,7 @@ export const auth = betterAuth({
               }
 
               return {
-                id: `${data.sub}-${crypto.randomUUID()}`,
+                id: `${data.sub}-${generateId()}`,
                 name: data.name || accountName,
                 email: data.email || `${data.sub}@docusign.com`,
                 emailVerified: true,
@@ -2728,7 +2729,7 @@ export const auth = betterAuth({
               const profile = data.data || data
 
               return {
-                id: `${profile.id?.toString()}-${crypto.randomUUID()}`,
+                id: `${profile.id?.toString()}-${generateId()}`,
                 name: profile.name || 'Cal.com User',
                 email: profile.email || `${profile.id}@cal.com`,
                 emailVerified: true,
diff --git a/apps/sim/lib/auth/cimd.ts b/apps/sim/lib/auth/cimd.ts
index f3437156eac..8a4990fd850 100644
--- a/apps/sim/lib/auth/cimd.ts
+++ b/apps/sim/lib/auth/cimd.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'node:crypto'
 import { db } from '@sim/db'
 import { oauthApplication } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { secureFetchWithValidation } from '@/lib/core/security/input-validation.server'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('cimd')
 
@@ -138,7 +138,7 @@ export async function upsertCimdClient(metadata: ClientMetadataDocument): Promis
   await db
     .insert(oauthApplication)
     .values({
-      id: randomUUID(),
+      id: generateId(),
       clientId: metadata.client_id,
       name: metadata.client_name,
       icon: metadata.logo_uri ?? null,
diff --git a/apps/sim/lib/billing/core/usage-log.ts b/apps/sim/lib/billing/core/usage-log.ts
index 9a9b18df379..a1b083e1412 100644
--- a/apps/sim/lib/billing/core/usage-log.ts
+++ b/apps/sim/lib/billing/core/usage-log.ts
@@ -3,6 +3,7 @@ import { usageLog, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, desc, eq, gte, lte, type SQL, sql } from 'drizzle-orm'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('UsageLog')
 
@@ -104,7 +105,7 @@ export async function recordUsage(params: RecordUsageParams): Promise<void> {
     if (validEntries.length > 0) {
       await tx.insert(usageLog).values(
         validEntries.map((entry) => ({
-          id: crypto.randomUUID(),
+          id: generateId(),
           userId,
           category: entry.category,
           source: entry.source,
diff --git a/apps/sim/lib/billing/core/usage.ts b/apps/sim/lib/billing/core/usage.ts
index 658f856f6b8..75058dcf4e3 100644
--- a/apps/sim/lib/billing/core/usage.ts
+++ b/apps/sim/lib/billing/core/usage.ts
@@ -34,6 +34,7 @@ import type { BillingData, UsageData, UsageLimitInfo } from '@/lib/billing/types
 import { Decimal, toDecimal, toNumber } from '@/lib/billing/utils/decimal'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getEmailPreferences } from '@/lib/messaging/email/unsubscribe'
 
@@ -96,7 +97,7 @@ export async function getOrgUsageLimit(
 export async function handleNewUser(userId: string): Promise<void> {
   try {
     await db.insert(userStats).values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       userId: userId,
       currentUsageLimit: getFreeTierLimit().toString(),
       usageLimitUpdatedAt: new Date(),
@@ -123,7 +124,7 @@ export async function ensureUserStatsExists(userId: string): Promise<void> {
   await db
     .insert(userStats)
     .values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       userId: userId,
       currentUsageLimit: getFreeTierLimit().toString(),
       usageLimitUpdatedAt: new Date(),
@@ -304,7 +305,7 @@ export async function initializeUserUsageLimit(userId: string): Promise<void> {
 
   // Create initial usage stats
   await db.insert(userStats).values({
-    id: crypto.randomUUID(),
+    id: generateId(),
     userId,
     // Team/enterprise: null (use org limit), Free/Pro: individual limit
     currentUsageLimit: isTeamOrEnterprise ? null : getFreeTierLimit().toString(),
diff --git a/apps/sim/lib/billing/organization.ts b/apps/sim/lib/billing/organization.ts
index cc75af83374..9617eb9b402 100644
--- a/apps/sim/lib/billing/organization.ts
+++ b/apps/sim/lib/billing/organization.ts
@@ -12,6 +12,7 @@ import { hasPaidSubscription } from '@/lib/billing'
 import { getPlanPricing } from '@/lib/billing/core/billing'
 import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
 import { isTeam } from '@/lib/billing/plan-helpers'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('BillingOrganization')
 
@@ -57,7 +58,7 @@ async function createOrganizationWithOwner(
   organizationSlug: string,
   metadata: Record<string, any> = {}
 ): Promise<string> {
-  const orgId = `org_${crypto.randomUUID()}`
+  const orgId = `org_${generateId()}`
   let sessionsUpdated = 0
 
   await db.transaction(async (tx) => {
@@ -69,7 +70,7 @@ async function createOrganizationWithOwner(
     })
 
     await tx.insert(member).values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       userId: userId,
       organizationId: orgId,
       role: 'owner',
diff --git a/apps/sim/lib/billing/organizations/membership.ts b/apps/sim/lib/billing/organizations/membership.ts
index 424f8c07147..1f9a8780451 100644
--- a/apps/sim/lib/billing/organizations/membership.ts
+++ b/apps/sim/lib/billing/organizations/membership.ts
@@ -5,7 +5,6 @@
  * Used by both regular routes and admin routes to ensure consistent business logic.
  */
 
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import {
   member,
@@ -21,6 +20,7 @@ import { isOrgPlan, sqlIsPro } from '@/lib/billing/plan-helpers'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
 import { validateSeatAvailability } from '@/lib/billing/validation/seat-management'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('OrganizationMembership')
 
@@ -419,7 +419,7 @@ export async function addUserToOrganization(params: AddMemberParams): Promise<Ad
     let memberId = ''
 
     await db.transaction(async (tx) => {
-      memberId = randomUUID()
+      memberId = generateId()
       await tx.insert(member).values({
         id: memberId,
         userId,
diff --git a/apps/sim/lib/billing/webhooks/enterprise.ts b/apps/sim/lib/billing/webhooks/enterprise.ts
index 92c3bcf459f..ed34d08a3c0 100644
--- a/apps/sim/lib/billing/webhooks/enterprise.ts
+++ b/apps/sim/lib/billing/webhooks/enterprise.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import type Stripe from 'stripe'
 import { getEmailSubject, renderEnterpriseSubscriptionEmail } from '@/components/emails'
+import { generateId } from '@/lib/core/utils/uuid'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress } from '@/lib/messaging/email/utils'
 import { parseEnterpriseSubscriptionMetadata } from '../types'
@@ -62,7 +63,7 @@ export async function handleManualEnterpriseSubscription(event: Stripe.Event) {
   const referenceItem = stripeSubscription.items?.data?.[0]
 
   const subscriptionRow = {
-    id: crypto.randomUUID(),
+    id: generateId(),
     plan: 'enterprise',
     referenceId,
     stripeCustomerId,
diff --git a/apps/sim/lib/blog/registry.ts b/apps/sim/lib/blog/registry.ts
index fe1b65a39b2..289fc536ab9 100644
--- a/apps/sim/lib/blog/registry.ts
+++ b/apps/sim/lib/blog/registry.ts
@@ -96,7 +96,7 @@ export const getNavBlogPosts = cache(
     const allPosts = await getAllPostMeta()
     const featuredPost = allPosts.find((p) => p.featured) ?? allPosts[0]
     if (!featuredPost) return []
-    const recentPosts = allPosts.filter((p) => p.slug !== featuredPost.slug).slice(0, 4)
+    const recentPosts = allPosts.filter((p) => p.slug !== featuredPost.slug).slice(0, 5)
     return [featuredPost, ...recentPosts].map((p) => ({
       slug: p.slug,
       title: p.title,
diff --git a/apps/sim/lib/copilot/client-sse/run-tool-execution.ts b/apps/sim/lib/copilot/client-sse/run-tool-execution.ts
index c289202d505..7c80d159840 100644
--- a/apps/sim/lib/copilot/client-sse/run-tool-execution.ts
+++ b/apps/sim/lib/copilot/client-sse/run-tool-execution.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
-import { v4 as uuidv4 } from 'uuid'
 import { COPILOT_CONFIRM_API_PATH } from '@/lib/copilot/constants'
 import { ClientToolCallState } from '@/lib/copilot/tools/client/tool-display-registry'
+import { generateId } from '@/lib/core/utils/uuid'
 import { executeWorkflowWithFullLogging } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils'
 import { useExecutionStore } from '@/stores/execution/store'
 import { clearExecutionPointer, consolePersistence, saveExecutionPointer } from '@/stores/terminal'
@@ -151,7 +151,7 @@ async function doExecuteRunTool(
 
   consolePersistence.executionStarted()
   setIsExecuting(targetWorkflowId, true)
-  const executionId = uuidv4()
+  const executionId = generateId()
   setCurrentExecutionId(targetWorkflowId, executionId)
   saveExecutionPointer({ workflowId: targetWorkflowId, executionId, lastEventId: 0 })
   const executionStartTime = new Date().toISOString()
diff --git a/apps/sim/lib/copilot/orchestrator/index.ts b/apps/sim/lib/copilot/orchestrator/index.ts
index 3b03aa8c982..5893ce7bb4f 100644
--- a/apps/sim/lib/copilot/orchestrator/index.ts
+++ b/apps/sim/lib/copilot/orchestrator/index.ts
@@ -27,6 +27,7 @@ import {
   type ToolCallState,
 } from '@/lib/copilot/orchestrator/types'
 import { env } from '@/lib/core/config/env'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { buildToolCallSummaries, createStreamingContext, runStreamLoop } from './stream/core'
 
@@ -118,7 +119,7 @@ export async function orchestrateCopilotStream(
   execContext.userStopSignal = options.userStopSignal
 
   const payloadMsgId = requestPayload?.messageId
-  const messageId = typeof payloadMsgId === 'string' ? payloadMsgId : crypto.randomUUID()
+  const messageId = typeof payloadMsgId === 'string' ? payloadMsgId : generateId()
   execContext.messageId = messageId
   const context = createStreamingContext({
     chatId,
@@ -126,7 +127,7 @@ export async function orchestrateCopilotStream(
     runId,
     messageId,
   })
-  const continuationWorkerId = `sim-resume:${crypto.randomUUID()}`
+  const continuationWorkerId = `sim-resume:${generateId()}`
   const reqLogger = logger.withMetadata({ requestId: context.requestId, messageId })
   let claimedToolCallIds: string[] = []
   let claimedByWorkerId: string | null = null
diff --git a/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts b/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
index e3f1cd829df..7fb50f4c9b9 100644
--- a/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
+++ b/apps/sim/lib/copilot/orchestrator/sse/handlers/handlers.ts
@@ -20,6 +20,7 @@ import type {
   ToolCallState,
 } from '@/lib/copilot/orchestrator/types'
 import { isWorkflowToolName } from '@/lib/copilot/workflow-tools'
+import { generateId } from '@/lib/core/utils/uuid'
 import { executeToolAndReport, waitForToolCompletion } from './tool-execution'
 
 const logger = createLogger('CopilotSseHandlers')
@@ -457,7 +458,7 @@ export const sseHandlers: Record<string, SSEHandler> = {
       const pendingPromise = (async () => {
         try {
           await upsertAsyncToolCall({
-            runId: context.runId || crypto.randomUUID(),
+            runId: context.runId || generateId(),
             toolCallId,
             toolName,
             args,
@@ -512,7 +513,7 @@ export const sseHandlers: Record<string, SSEHandler> = {
       } else {
         toolCall.status = 'executing'
         await upsertAsyncToolCall({
-          runId: context.runId || crypto.randomUUID(),
+          runId: context.runId || generateId(),
           toolCallId,
           toolName,
           args,
@@ -709,7 +710,7 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
       const pendingPromise = (async () => {
         try {
           await upsertAsyncToolCall({
-            runId: context.runId || crypto.randomUUID(),
+            runId: context.runId || generateId(),
             toolCallId,
             toolName,
             args,
@@ -759,7 +760,7 @@ export const subAgentHandlers: Record<string, SSEHandler> = {
       } else {
         toolCall.status = 'executing'
         await upsertAsyncToolCall({
-          runId: context.runId || crypto.randomUUID(),
+          runId: context.runId || generateId(),
           toolCallId,
           toolName,
           args,
diff --git a/apps/sim/lib/copilot/orchestrator/sse/handlers/tool-execution.ts b/apps/sim/lib/copilot/orchestrator/sse/handlers/tool-execution.ts
index e0296f8b525..e960b08a1fe 100644
--- a/apps/sim/lib/copilot/orchestrator/sse/handlers/tool-execution.ts
+++ b/apps/sim/lib/copilot/orchestrator/sse/handlers/tool-execution.ts
@@ -22,6 +22,7 @@ import {
   persistChatResources,
   removeChatResources,
 } from '@/lib/copilot/resources'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getTableById } from '@/lib/table/service'
 import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager'
 
@@ -381,7 +382,7 @@ async function maybeWriteOutputToTable(
         }
         const chunk = rows.slice(i, i + BATCH_CHUNK_SIZE)
         const values = chunk.map((rowData, j) => ({
-          id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
+          id: `row_${generateId().replace(/-/g, '')}`,
           tableId: outputTable,
           workspaceId: context.workspaceId!,
           data: rowData,
@@ -502,7 +503,7 @@ async function maybeWriteReadCsvToTable(
         }
         const chunk = rows.slice(i, i + BATCH_CHUNK_SIZE)
         const values = chunk.map((rowData, j) => ({
-          id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
+          id: `row_${generateId().replace(/-/g, '')}`,
           tableId: outputTable,
           workspaceId: context.workspaceId!,
           data: rowData,
diff --git a/apps/sim/lib/copilot/orchestrator/stream/core.ts b/apps/sim/lib/copilot/orchestrator/stream/core.ts
index 1dccfa2700c..43c0bc342c9 100644
--- a/apps/sim/lib/copilot/orchestrator/stream/core.ts
+++ b/apps/sim/lib/copilot/orchestrator/stream/core.ts
@@ -20,6 +20,7 @@ import type {
   StreamingContext,
   ToolCallSummary,
 } from '@/lib/copilot/orchestrator/types'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('CopilotStreamCore')
 
@@ -42,7 +43,7 @@ export function createStreamingContext(overrides?: Partial<StreamingContext>): S
     chatId: undefined,
     executionId: undefined,
     runId: undefined,
-    messageId: crypto.randomUUID(),
+    messageId: generateId(),
     accumulatedContent: '',
     contentBlocks: [],
     toolCalls: new Map(),
diff --git a/apps/sim/lib/copilot/orchestrator/subagent.ts b/apps/sim/lib/copilot/orchestrator/subagent.ts
index c2d40c044ac..0fc6716bc6c 100644
--- a/apps/sim/lib/copilot/orchestrator/subagent.ts
+++ b/apps/sim/lib/copilot/orchestrator/subagent.ts
@@ -9,6 +9,7 @@ import type {
   ToolCallSummary,
 } from '@/lib/copilot/orchestrator/types'
 import { env } from '@/lib/core/config/env'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { buildToolCallSummaries, createStreamingContext, runStreamLoop } from './stream/core'
 
@@ -46,7 +47,7 @@ export async function orchestrateSubagentStream(
 
   const msgId = requestPayload?.messageId
   const context = createStreamingContext({
-    messageId: typeof msgId === 'string' ? msgId : crypto.randomUUID(),
+    messageId: typeof msgId === 'string' ? msgId : generateId(),
   })
 
   let structuredResult: SubagentOrchestratorResult['structuredResult']
diff --git a/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/deploy.ts b/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/deploy.ts
index 062bedaceb6..eb89c876cee 100644
--- a/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/deploy.ts
+++ b/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/deploy.ts
@@ -1,10 +1,10 @@
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import { chat, workflowMcpTool } from '@sim/db/schema'
 import { and, eq, isNull } from 'drizzle-orm'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import type { ExecutionContext, ToolCallResult } from '@/lib/copilot/orchestrator/types'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
 import { generateParameterSchemaForWorkflow } from '@/lib/mcp/workflow-mcp-sync'
 import { sanitizeToolName } from '@/lib/mcp/workflow-tool-schema'
@@ -332,7 +332,7 @@ export async function executeDeployMcp(
       }
     }
 
-    const toolId = crypto.randomUUID()
+    const toolId = generateId()
     await db.insert(workflowMcpTool).values({
       id: toolId,
       serverId,
diff --git a/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/manage.ts b/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/manage.ts
index ecc2456d544..233b1cbfe25 100644
--- a/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/manage.ts
+++ b/apps/sim/lib/copilot/orchestrator/tool-executor/deployment-tools/manage.ts
@@ -1,4 +1,3 @@
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import {
   chat,
@@ -10,6 +9,7 @@ import {
 import { and, eq, inArray, isNull } from 'drizzle-orm'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import type { ExecutionContext, ToolCallResult } from '@/lib/copilot/orchestrator/types'
+import { generateId } from '@/lib/core/utils/uuid'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
 import { generateParameterSchemaForWorkflow } from '@/lib/mcp/workflow-mcp-sync'
 import { sanitizeToolName } from '@/lib/mcp/workflow-tool-schema'
@@ -198,7 +198,7 @@ export async function executeCreateWorkspaceMcpServer(
       return { success: false, error: 'name is required' }
     }
 
-    const serverId = crypto.randomUUID()
+    const serverId = generateId()
     const [server] = await db
       .insert(workflowMcpServer)
       .values({
@@ -230,7 +230,7 @@ export async function executeCreateWorkspaceMcpServer(
         const toolName = sanitizeToolName(wf.name || `workflow_${wf.id}`)
         const parameterSchema = await generateParameterSchemaForWorkflow(wf.id)
         await db.insert(workflowMcpTool).values({
-          id: crypto.randomUUID(),
+          id: generateId(),
           serverId,
           workflowId: wf.id,
           toolName,
diff --git a/apps/sim/lib/copilot/orchestrator/tool-executor/index.ts b/apps/sim/lib/copilot/orchestrator/tool-executor/index.ts
index cf6b623717e..5cbbcdd5730 100644
--- a/apps/sim/lib/copilot/orchestrator/tool-executor/index.ts
+++ b/apps/sim/lib/copilot/orchestrator/tool-executor/index.ts
@@ -12,6 +12,7 @@ import type {
 import { routeExecution } from '@/lib/copilot/tools/server/router'
 import { env } from '@/lib/core/config/env'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { getKnowledgeBaseById } from '@/lib/knowledge/service'
 import { validateMcpDomain } from '@/lib/mcp/domain-check'
@@ -929,7 +930,7 @@ async function generateOAuthLink(
   await db
     .insert(pendingCredentialDraft)
     .values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       userId,
       workspaceId,
       providerId,
diff --git a/apps/sim/lib/copilot/orchestrator/tool-executor/job-tools.ts b/apps/sim/lib/copilot/orchestrator/tool-executor/job-tools.ts
index 6870bde0d50..00d18a6188d 100644
--- a/apps/sim/lib/copilot/orchestrator/tool-executor/job-tools.ts
+++ b/apps/sim/lib/copilot/orchestrator/tool-executor/job-tools.ts
@@ -2,9 +2,9 @@ import { db } from '@sim/db'
 import { copilotChats, workflowSchedule } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import type { ExecutionContext, ToolCallResult } from '@/lib/copilot/orchestrator/types'
+import { generateId } from '@/lib/core/utils/uuid'
 import { parseCronToHumanReadable, validateCronExpression } from '@/lib/workflows/schedules/utils'
 
 const logger = createLogger('JobTools')
@@ -117,7 +117,7 @@ export async function executeCreateJob(
     return { success: false, error: 'Could not determine next run time' }
   }
 
-  const jobId = uuidv4()
+  const jobId = generateId()
   const now = new Date()
 
   try {
diff --git a/apps/sim/lib/copilot/orchestrator/tool-executor/materialize-file.ts b/apps/sim/lib/copilot/orchestrator/tool-executor/materialize-file.ts
index 2fce7e695ad..6b2542394b9 100644
--- a/apps/sim/lib/copilot/orchestrator/tool-executor/materialize-file.ts
+++ b/apps/sim/lib/copilot/orchestrator/tool-executor/materialize-file.ts
@@ -5,6 +5,7 @@ import { and, eq, isNull } from 'drizzle-orm'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { findMothershipUploadRowByChatAndName } from '@/lib/copilot/orchestrator/tool-executor/upload-file-reader'
 import type { ExecutionContext, ToolCallResult } from '@/lib/copilot/orchestrator/types'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getServePathPrefix } from '@/lib/uploads'
 import { downloadWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager'
 import { parseWorkflowJson } from '@/lib/workflows/operations/import-export'
@@ -104,7 +105,7 @@ async function executeImport(
     description: workflowDescription,
   } = extractWorkflowMetadata(parsed)
 
-  const workflowId = crypto.randomUUID()
+  const workflowId = generateId()
   const now = new Date()
   const dedupedName = await deduplicateWorkflowName(rawName, workspaceId, null)
 
@@ -136,7 +137,7 @@ async function executeImport(
       { id: string; name: string; type: string; value: unknown }
     > = {}
     for (const v of workflowData.variables) {
-      const varId = (v as { id?: string }).id || crypto.randomUUID()
+      const varId = (v as { id?: string }).id || generateId()
       const variable = v as { name: string; type?: string; value: unknown }
       variablesRecord[varId] = {
         id: varId,
diff --git a/apps/sim/lib/copilot/orchestrator/tool-executor/workflow-tools/mutations.ts b/apps/sim/lib/copilot/orchestrator/tool-executor/workflow-tools/mutations.ts
index c30d6b3e578..c2a378cb768 100644
--- a/apps/sim/lib/copilot/orchestrator/tool-executor/workflow-tools/mutations.ts
+++ b/apps/sim/lib/copilot/orchestrator/tool-executor/workflow-tools/mutations.ts
@@ -1,9 +1,9 @@
-import crypto from 'crypto'
 import { createLogger } from '@sim/logger'
 import { createWorkspaceApiKey } from '@/lib/api-key/auth'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import type { ExecutionContext, ToolCallResult } from '@/lib/copilot/orchestrator/types'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 import { executeWorkflow } from '@/lib/workflows/executor/execute-workflow'
 import {
   getExecutionState,
@@ -334,7 +334,7 @@ export async function executeSetGlobalWorkflowVariables(
       const typedValue = coerceValue(op.value, nextType)
       if (op.operation === 'add') {
         byName[key] = {
-          id: crypto.randomUUID(),
+          id: generateId(),
           workflowId,
           name: key,
           type: nextType,
@@ -345,7 +345,7 @@ export async function executeSetGlobalWorkflowVariables(
       if (op.operation === 'edit') {
         if (!byName[key]) {
           byName[key] = {
-            id: crypto.randomUUID(),
+            id: generateId(),
             workflowId,
             name: key,
             type: nextType,
diff --git a/apps/sim/lib/copilot/request-helpers.ts b/apps/sim/lib/copilot/request-helpers.ts
index 01b46e9f721..0e7be51df41 100644
--- a/apps/sim/lib/copilot/request-helpers.ts
+++ b/apps/sim/lib/copilot/request-helpers.ts
@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateId } from '@/lib/core/utils/uuid'
 
 export type { NotificationStatus } from '@/lib/copilot/types'
 
@@ -26,7 +27,7 @@ export function createInternalServerErrorResponse(message: string): NextResponse
 }
 
 export function createRequestId(): string {
-  return crypto.randomUUID()
+  return generateId()
 }
 
 export function createShortRequestId(): string {
diff --git a/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts b/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
index d0115015699..5cc6538025d 100644
--- a/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
+++ b/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
@@ -10,6 +10,7 @@ import {
 } from '@/lib/copilot/tools/server/base-tool'
 import type { KnowledgeBaseArgs, KnowledgeBaseResult } from '@/lib/copilot/tools/shared/schemas'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   createSingleDocument,
   deleteDocument,
@@ -82,7 +83,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const newKnowledgeBase = await createKnowledgeBase(
             {
@@ -268,7 +269,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             5 * 60
           )
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const doc = await createSingleDocument(
             {
@@ -344,7 +345,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const updatedKb = await updateKnowledgeBase(args.knowledgeBaseId, updates, requestId)
 
@@ -383,7 +384,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           await deleteKnowledgeBase(args.knowledgeBaseId, requestId)
 
@@ -410,7 +411,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
           if (!args.documentId) {
             return { success: false, message: 'documentId is required for delete_document' }
           }
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const result = await deleteDocument(args.documentId, requestId)
           return {
@@ -440,7 +441,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
               message: 'At least one of filename or enabled is required for update_document',
             }
           }
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           await updateDocument(args.documentId, updateData, requestId)
           return {
@@ -506,7 +507,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const newTag = await createTagDefinition(
             {
@@ -565,7 +566,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const updatedTag = await updateTagDefinition(args.tagDefinitionId, updateData, requestId)
 
@@ -602,7 +603,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const deleted = await deleteTagDefinition(
             args.knowledgeBaseId,
@@ -636,7 +637,7 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           const stats = await getTagUsageStats(args.knowledgeBaseId, requestId)
 
           return {
diff --git a/apps/sim/lib/copilot/tools/server/table/user-table.ts b/apps/sim/lib/copilot/tools/server/table/user-table.ts
index be64c89416e..e324c4c2b7b 100644
--- a/apps/sim/lib/copilot/tools/server/table/user-table.ts
+++ b/apps/sim/lib/copilot/tools/server/table/user-table.ts
@@ -5,6 +5,7 @@ import {
   type ServerToolContext,
 } from '@/lib/copilot/tools/server/base-tool'
 import type { UserTableArgs, UserTableResult } from '@/lib/copilot/tools/shared/schemas'
+import { generateId } from '@/lib/core/utils/uuid'
 import { COLUMN_TYPES } from '@/lib/table/constants'
 import {
   addTableColumn,
@@ -231,7 +232,7 @@ async function batchInsertAll(
   for (let i = 0; i < rows.length; i += MAX_BATCH_SIZE) {
     assertServerToolNotAborted(context, 'Request aborted before table mutation could be applied.')
     const batch = rows.slice(i, i + MAX_BATCH_SIZE)
-    const requestId = crypto.randomUUID().slice(0, 8)
+    const requestId = generateId().slice(0, 8)
     const result = await batchInsertRows({ tableId, rows: batch, workspaceId }, table, requestId)
     inserted += result.length
   }
@@ -267,7 +268,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Workspace ID is required' }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const table = await createTable(
             {
@@ -337,7 +338,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Table not found' }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           await deleteTable(args.tableId, requestId)
 
@@ -363,7 +364,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: `Table not found: ${args.tableId}` }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const row = await insertRow(
             { tableId: args.tableId, data: args.data, workspaceId },
@@ -394,7 +395,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: `Table not found: ${args.tableId}` }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const rows = await batchInsertRows(
             { tableId: args.tableId, rows: args.rows, workspaceId },
@@ -440,7 +441,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Workspace ID is required' }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           const result = await queryRows(
             args.tableId,
             workspaceId,
@@ -479,7 +480,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: `Table not found: ${args.tableId}` }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const updatedRow = await updateRow(
             { tableId: args.tableId, rowId: args.rowId, data: args.data, workspaceId },
@@ -505,7 +506,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Workspace ID is required' }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           await deleteRow(args.tableId, args.rowId, workspaceId, requestId)
 
@@ -534,7 +535,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: `Table not found: ${args.tableId}` }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const result = await updateRowsByFilter(
             {
@@ -566,7 +567,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Workspace ID is required' }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const result = await deleteRowsByFilter(
             {
@@ -629,7 +630,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: `Table not found: ${args.tableId}` }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const result = await batchUpdateRows(
             {
@@ -668,7 +669,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const result = await deleteRowsByIds(
             { tableId: args.tableId, rowIds, workspaceId },
@@ -708,7 +709,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
 
           const columns = inferSchema(headers, rows)
           const tableName = args.name || file.name.replace(/\.[^.]+$/, '')
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const table = await createTable(
             {
@@ -841,7 +842,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
               message: 'column with name and type is required for add_column',
             }
           }
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const updated = await addTableColumn(args.tableId, col, requestId)
           return {
@@ -860,7 +861,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
           if (!colName || !newColName) {
             return { success: false, message: 'columnName and newName are required' }
           }
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const updated = await renameColumn(
             { tableId: args.tableId, oldName: colName, newName: newColName },
@@ -883,7 +884,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
           if (!names || names.length === 0) {
             return { success: false, message: 'columnName or columnNames is required' }
           }
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           if (names.length === 1) {
             assertNotAborted()
             const updated = await deleteColumn(
@@ -924,7 +925,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
               message: 'At least one of newType or unique must be provided',
             }
           }
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           let result: TableDefinition | undefined
           if (newType !== undefined) {
             if (!(COLUMN_TYPES as readonly string[]).includes(newType)) {
@@ -977,7 +978,7 @@ export const userTableServerTool: BaseServerTool<UserTableArgs, UserTableResult>
             return { success: false, message: 'Table not found' }
           }
 
-          const requestId = crypto.randomUUID().slice(0, 8)
+          const requestId = generateId().slice(0, 8)
           assertNotAborted()
           const renamed = await renameTable(args.tableId, newName, requestId)
 
diff --git a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts
index bb04f7c8fb2..a13b1402dab 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts
@@ -1,5 +1,5 @@
-import crypto from 'crypto'
 import { createLogger } from '@sim/logger'
+import { generateId, isValidUuid } from '@/lib/core/utils/uuid'
 import type { PermissionGroupConfig } from '@/lib/permission-groups/types'
 import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import {
@@ -12,7 +12,7 @@ import { getAllBlocks } from '@/blocks/registry'
 import type { BlockConfig } from '@/blocks/types'
 import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
 import type { EditWorkflowOperation, SkippedItem, ValidationError } from './types'
-import { logSkippedItem, UUID_REGEX } from './types'
+import { logSkippedItem } from './types'
 import {
   validateInputsForBlock,
   validateSourceHandleForBlock,
@@ -160,15 +160,15 @@ export function createBlockFromParams(
       id: 'conditions',
       type: 'condition-input',
       value: JSON.stringify([
-        { id: crypto.randomUUID(), title: 'If', value: '' },
-        { id: crypto.randomUUID(), title: 'Else', value: '' },
+        { id: generateId(), title: 'If', value: '' },
+        { id: generateId(), title: 'Else', value: '' },
       ]),
     }
   } else if (params.type === 'router_v2' && !blockState.subBlocks.routes?.value) {
     blockState.subBlocks.routes = {
       id: 'routes',
       type: 'router-input',
-      value: JSON.stringify([{ id: crypto.randomUUID(), title: 'Route 1', value: '' }]),
+      value: JSON.stringify([{ id: generateId(), title: 'Route 1', value: '' }]),
     }
   }
 
@@ -302,9 +302,9 @@ export function normalizeArrayWithIds(value: unknown): any[] {
       return item
     }
 
-    const hasValidUUID = typeof item.id === 'string' && UUID_REGEX.test(item.id)
+    const hasValidUUID = typeof item.id === 'string' && isValidUuid(item.id)
     if (!hasValidUUID) {
-      return { ...item, id: crypto.randomUUID() }
+      return { ...item, id: generateId() }
     }
 
     return item
@@ -514,7 +514,7 @@ export function createValidatedEdge(
   const finalSourceHandle = sourceValidation.normalizedHandle || sourceHandle
 
   modifiedState.edges.push({
-    id: crypto.randomUUID(),
+    id: generateId(),
     source: sourceBlockId,
     sourceHandle: finalSourceHandle,
     target: targetBlockId,
@@ -669,8 +669,8 @@ export function normalizeBlockIdsInOperations(operations: EditWorkflowOperation[
   // First pass: collect all non-UUID block_ids from add/insert operations
   for (const op of operations) {
     if (op.operation_type === 'add' || op.operation_type === 'insert_into_subflow') {
-      if (op.block_id && !UUID_REGEX.test(op.block_id)) {
-        const newId = crypto.randomUUID()
+      if (op.block_id && !isValidUuid(op.block_id)) {
+        const newId = generateId()
         idMapping.set(op.block_id, newId)
         logger.debug('Normalizing block ID', { oldId: op.block_id, newId })
       }
diff --git a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/types.ts b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/types.ts
index 9a118467b1f..db9b773ec16 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/types.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/types.ts
@@ -17,9 +17,6 @@ export const SELECTOR_TYPES = new Set([
 
 const validationLogger = createLogger('EditWorkflowValidation')
 
-/** UUID v4 regex pattern for validation */
-export const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-
 /**
  * Validation error for a specific field
  */
diff --git a/apps/sim/lib/core/async-jobs/backends/database.ts b/apps/sim/lib/core/async-jobs/backends/database.ts
index 1ce4f23a150..f0066e5189f 100644
--- a/apps/sim/lib/core/async-jobs/backends/database.ts
+++ b/apps/sim/lib/core/async-jobs/backends/database.ts
@@ -10,6 +10,7 @@ import {
   type JobStatus,
   type JobType,
 } from '@/lib/core/async-jobs/types'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('DatabaseJobQueue')
 
@@ -38,7 +39,7 @@ export class DatabaseJobQueue implements JobQueueBackend {
     payload: TPayload,
     options?: EnqueueOptions
   ): Promise<string> {
-    const jobId = `run_${crypto.randomUUID().replace(/-/g, '').slice(0, 20)}`
+    const jobId = `run_${generateId().replace(/-/g, '').slice(0, 20)}`
     const now = new Date()
 
     await db.insert(asyncJobs).values({
diff --git a/apps/sim/lib/core/config/feature-flags.ts b/apps/sim/lib/core/config/feature-flags.ts
index b688924afed..7aeb4c33071 100644
--- a/apps/sim/lib/core/config/feature-flags.ts
+++ b/apps/sim/lib/core/config/feature-flags.ts
@@ -122,6 +122,14 @@ export const isInboxEnabled = isTruthy(env.INBOX_ENABLED)
  */
 export const isE2bEnabled = isTruthy(env.E2B_ENABLED)
 
+/**
+ * Whether Ollama is configured (OLLAMA_URL is set).
+ * When true, models that are not in the static cloud model list and have no
+ * slash-prefixed provider namespace are assumed to be Ollama models
+ * and do not require an API key.
+ */
+export const isOllamaConfigured = Boolean(env.OLLAMA_URL)
+
 /**
  * Whether Azure OpenAI / Azure Anthropic credentials are pre-configured at the server level
  * (via AZURE_OPENAI_ENDPOINT, AZURE_OPENAI_API_KEY, AZURE_ANTHROPIC_ENDPOINT, etc.).
diff --git a/apps/sim/lib/core/idempotency/service.ts b/apps/sim/lib/core/idempotency/service.ts
index 9582c5ba22a..d9adf4f504f 100644
--- a/apps/sim/lib/core/idempotency/service.ts
+++ b/apps/sim/lib/core/idempotency/service.ts
@@ -1,4 +1,3 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { idempotencyKey } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -6,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import { getRedisClient } from '@/lib/core/config/redis'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
 import { getStorageMethod, type StorageMethod } from '@/lib/core/storage'
+import { generateId } from '@/lib/core/utils/uuid'
 import { extractProviderIdentifierFromBody } from '@/lib/webhooks/provider-utils'
 
 const logger = createLogger('IdempotencyService')
@@ -432,7 +432,7 @@ export class IdempotencyService {
       }
     }
 
-    const uniqueId = randomUUID()
+    const uniqueId = generateId()
     logger.warn('No unique identifier found, duplicate executions may occur', {
       webhookId,
       provider,
diff --git a/apps/sim/lib/core/utils/request.ts b/apps/sim/lib/core/utils/request.ts
index 6e64b9b108e..9da835dfb34 100644
--- a/apps/sim/lib/core/utils/request.ts
+++ b/apps/sim/lib/core/utils/request.ts
@@ -1,8 +1,9 @@
+import { generateId } from '@/lib/core/utils/uuid'
 /**
  * Generate a short request ID for correlation
  */
 export function generateRequestId(): string {
-  return crypto.randomUUID().slice(0, 8)
+  return generateId().slice(0, 8)
 }
 
 /**
diff --git a/apps/sim/lib/core/utils/uuid.ts b/apps/sim/lib/core/utils/uuid.ts
new file mode 100644
index 00000000000..a0010e8789a
--- /dev/null
+++ b/apps/sim/lib/core/utils/uuid.ts
@@ -0,0 +1,53 @@
+/**
+ * Generates a UUID v4 string safe for all contexts.
+ *
+ * `crypto.randomUUID()` requires a secure context (HTTPS or localhost) in
+ * browsers. Self-hosted deployments served over plain HTTP will throw
+ * `TypeError: crypto.randomUUID is not a function`. This utility falls back
+ * to `crypto.getRandomValues()`, which does not require a secure context.
+ */
+export function generateId(): string {
+  if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') {
+    return crypto.randomUUID()
+  }
+
+  const bytes = new Uint8Array(16)
+  crypto.getRandomValues(bytes)
+
+  bytes[6] = (bytes[6] & 0x0f) | 0x40
+  bytes[8] = (bytes[8] & 0x3f) | 0x80
+
+  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, '0')).join('')
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
+}
+
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+/**
+ * Validates whether a string is a well-formed UUID (any version).
+ */
+export function isValidUuid(value: string): boolean {
+  return UUID_RE.test(value)
+}
+
+const URL_SAFE_ALPHABET = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+/**
+ * Generates a short, URL-safe random ID.
+ *
+ * Replaces `nanoid` — uses `crypto.getRandomValues()` which works in all
+ * contexts including non-secure (HTTP) browsers.
+ *
+ * @param size - Length of the generated ID (default: 21)
+ * @returns A URL-safe random string
+ */
+export function generateShortId(size = 21): string {
+  const bytes = new Uint8Array(size)
+  crypto.getRandomValues(bytes)
+
+  let id = ''
+  for (let i = 0; i < size; i++) {
+    id += URL_SAFE_ALPHABET[bytes[i] & 63]
+  }
+  return id
+}
diff --git a/apps/sim/lib/core/workspace-dispatch/memory-store.ts b/apps/sim/lib/core/workspace-dispatch/memory-store.ts
index 1c874d091be..52295172bb3 100644
--- a/apps/sim/lib/core/workspace-dispatch/memory-store.ts
+++ b/apps/sim/lib/core/workspace-dispatch/memory-store.ts
@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { WorkspaceDispatchStorageAdapter } from '@/lib/core/workspace-dispatch/adapter'
 import {
   WORKSPACE_DISPATCH_CLAIM_RESULTS,
@@ -139,7 +140,7 @@ export class MemoryWorkspaceDispatchStorage implements WorkspaceDispatchStorageA
   async enqueueWorkspaceDispatchJob(
     input: WorkspaceDispatchEnqueueInput
   ): Promise<WorkspaceDispatchJobRecord> {
-    const id = input.id ?? `dispatch_${crypto.randomUUID().replace(/-/g, '').slice(0, 20)}`
+    const id = input.id ?? `dispatch_${generateId().replace(/-/g, '').slice(0, 20)}`
     const createdAt = Date.now()
 
     const record: WorkspaceDispatchJobRecord = {
diff --git a/apps/sim/lib/core/workspace-dispatch/planner.ts b/apps/sim/lib/core/workspace-dispatch/planner.ts
index 8ba42f83a0a..9912b22aba2 100644
--- a/apps/sim/lib/core/workspace-dispatch/planner.ts
+++ b/apps/sim/lib/core/workspace-dispatch/planner.ts
@@ -2,6 +2,7 @@ import { createLogger } from '@sim/logger'
 import { getWorkspaceConcurrencyLimit } from '@/lib/billing/workspace-concurrency'
 import { type BullMQJobData, getBullMQQueueByName } from '@/lib/core/bullmq'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   claimWorkspaceJob,
   markDispatchJobAdmitted,
@@ -95,7 +96,7 @@ export async function dispatchNextAdmissibleWorkspaceJob(): Promise<DispatchScan
     return DISPATCH_SCAN_RESULTS.NO_WORKSPACE
   }
 
-  const lockValue = `lock_${crypto.randomUUID()}`
+  const lockValue = `lock_${generateId()}`
   try {
     const lockKey = `workspace-dispatch:claim-lock:${workspaceId}`
     const acquired = await acquireLock(lockKey, lockValue, WORKSPACE_CLAIM_LOCK_TTL_SECONDS)
@@ -105,7 +106,7 @@ export async function dispatchNextAdmissibleWorkspaceJob(): Promise<DispatchScan
     }
 
     const limit = await getWorkspaceConcurrencyLimit(workspaceId)
-    const leaseId = `lease_${crypto.randomUUID()}`
+    const leaseId = `lease_${generateId()}`
     const claimResult = await claimWorkspaceJob(workspaceId, {
       lanes: WORKSPACE_DISPATCH_LANES,
       concurrencyLimit: limit,
diff --git a/apps/sim/lib/core/workspace-dispatch/redis-store.ts b/apps/sim/lib/core/workspace-dispatch/redis-store.ts
index 8fbf8dfee4f..e7ce5a87696 100644
--- a/apps/sim/lib/core/workspace-dispatch/redis-store.ts
+++ b/apps/sim/lib/core/workspace-dispatch/redis-store.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type Redis from 'ioredis'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { WorkspaceDispatchStorageAdapter } from '@/lib/core/workspace-dispatch/adapter'
 import {
   WORKSPACE_DISPATCH_CLAIM_RESULTS,
@@ -259,7 +260,7 @@ export class RedisWorkspaceDispatchStorage implements WorkspaceDispatchStorageAd
   async enqueueWorkspaceDispatchJob(
     input: WorkspaceDispatchEnqueueInput
   ): Promise<WorkspaceDispatchJobRecord> {
-    const id = input.id ?? `dispatch_${crypto.randomUUID().replace(/-/g, '').slice(0, 20)}`
+    const id = input.id ?? `dispatch_${generateId().replace(/-/g, '').slice(0, 20)}`
     const createdAt = Date.now()
     const sequence = await this.nextSequence()
 
diff --git a/apps/sim/lib/credentials/access.ts b/apps/sim/lib/credentials/access.ts
index 18573879ac2..f1a7341b5ce 100644
--- a/apps/sim/lib/credentials/access.ts
+++ b/apps/sim/lib/credentials/access.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { credential, credentialMember, workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray, ne } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('CredentialAccess')
@@ -133,7 +134,7 @@ export async function revokeWorkspaceCredentialMemberships(
           .where(eq(credentialMember.id, existingOwnerMembership.id))
       } else {
         await db.insert(credentialMember).values({
-          id: crypto.randomUUID(),
+          id: generateId(),
           credentialId: credId,
           userId: ownerId,
           role: 'admin',
diff --git a/apps/sim/lib/credentials/draft-hooks.ts b/apps/sim/lib/credentials/draft-hooks.ts
index 8f852210f6f..6c1840c1030 100644
--- a/apps/sim/lib/credentials/draft-hooks.ts
+++ b/apps/sim/lib/credentials/draft-hooks.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import * as schema from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, sql } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('CredentialDraftHooks')
 
@@ -16,7 +17,7 @@ export async function handleCreateCredentialFromDraft(params: {
   now: Date
 }) {
   const { draft, accountId, providerId, userId, now } = params
-  const credentialId = crypto.randomUUID()
+  const credentialId = generateId()
 
   try {
     await db.insert(schema.credential).values({
@@ -33,7 +34,7 @@ export async function handleCreateCredentialFromDraft(params: {
     })
 
     await db.insert(schema.credentialMember).values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       credentialId,
       userId,
       role: 'admin',
diff --git a/apps/sim/lib/credentials/environment.ts b/apps/sim/lib/credentials/environment.ts
index 31ff04d9dc9..5d945b1c317 100644
--- a/apps/sim/lib/credentials/environment.ts
+++ b/apps/sim/lib/credentials/environment.ts
@@ -1,6 +1,7 @@
 import { db } from '@sim/db'
 import { credential, credentialMember, permissions, workspace } from '@sim/db/schema'
 import { and, eq, inArray, isNull, notInArray } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 
 interface AccessibleEnvCredential {
   type: 'env_workspace' | 'env_personal'
@@ -85,7 +86,7 @@ async function upsertCredentialAdminMember(credentialId: string, adminUserId: st
   }
 
   await db.insert(credentialMember).values({
-    id: crypto.randomUUID(),
+    id: generateId(),
     credentialId,
     userId: adminUserId,
     role: 'admin',
@@ -144,7 +145,7 @@ async function ensureWorkspaceCredentialMemberships(
     }
 
     await db.insert(credentialMember).values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       credentialId,
       userId: memberUserId,
       role: targetRole,
@@ -196,7 +197,7 @@ export async function syncWorkspaceEnvCredentials(params: {
       continue
     }
 
-    const createdId = crypto.randomUUID()
+    const createdId = generateId()
     try {
       await db.insert(credential).values({
         id: createdId,
@@ -276,7 +277,7 @@ export async function syncPersonalEnvCredentialsForUser(params: {
         continue
       }
 
-      const createdId = crypto.randomUUID()
+      const createdId = generateId()
       try {
         await db.insert(credential).values({
           id: createdId,
diff --git a/apps/sim/lib/credentials/oauth.ts b/apps/sim/lib/credentials/oauth.ts
index 3fdf86801a5..840b99030b7 100644
--- a/apps/sim/lib/credentials/oauth.ts
+++ b/apps/sim/lib/credentials/oauth.ts
@@ -1,6 +1,7 @@
 import { db } from '@sim/db'
 import { account, credential, credentialMember } from '@sim/db/schema'
 import { and, eq, inArray, notInArray } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getServiceConfigByProviderId } from '@/lib/oauth'
 
 /** Provider IDs that are not real OAuth integrations (login-only social providers and password) */
@@ -146,7 +147,7 @@ export async function syncWorkspaceOAuthCredentialsForUser(
 
     try {
       await db.insert(credentialMember).values({
-        id: crypto.randomUUID(),
+        id: generateId(),
         credentialId,
         userId,
         role: 'admin',
diff --git a/apps/sim/lib/environment/utils.ts b/apps/sim/lib/environment/utils.ts
index 188f0a7d9ff..9b1b37900ff 100644
--- a/apps/sim/lib/environment/utils.ts
+++ b/apps/sim/lib/environment/utils.ts
@@ -1,9 +1,9 @@
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import { environment, workspaceEnvironment } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq, inArray } from 'drizzle-orm'
 import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   getAccessibleEnvCredentials,
   syncPersonalEnvCredentialsForUser,
@@ -236,7 +236,7 @@ export async function upsertPersonalEnvVars(
   await db
     .insert(environment)
     .values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       userId,
       variables: finalEncrypted,
       updatedAt: new Date(),
@@ -281,7 +281,7 @@ export async function upsertWorkspaceEnvVars(
   await db
     .insert(workspaceEnvironment)
     .values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       workspaceId,
       variables: merged,
       createdAt: new Date(),
diff --git a/apps/sim/lib/knowledge/chunks/service.ts b/apps/sim/lib/knowledge/chunks/service.ts
index 35c73395981..847f61871fc 100644
--- a/apps/sim/lib/knowledge/chunks/service.ts
+++ b/apps/sim/lib/knowledge/chunks/service.ts
@@ -1,8 +1,9 @@
-import { createHash, randomUUID } from 'crypto'
+import { createHash } from 'crypto'
 import { db } from '@sim/db'
 import { document, embedding, knowledgeBase } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, asc, desc, eq, ilike, inArray, isNull, sql } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import type {
   BatchOperationResult,
   ChunkData,
@@ -115,7 +116,7 @@ export async function createChunk(
   // Calculate accurate token count
   const tokenCount = estimateTokenCount(chunkData.content, 'openai')
 
-  const chunkId = randomUUID()
+  const chunkId = generateId()
   const now = new Date()
 
   // Use transaction to atomically get next index and insert chunk
diff --git a/apps/sim/lib/knowledge/connectors/sync-engine.ts b/apps/sim/lib/knowledge/connectors/sync-engine.ts
index e8fede9f0ea..0b545516a3b 100644
--- a/apps/sim/lib/knowledge/connectors/sync-engine.ts
+++ b/apps/sim/lib/knowledge/connectors/sync-engine.ts
@@ -11,6 +11,7 @@ import { and, eq, gt, inArray, isNull, lt, ne, or, sql } from 'drizzle-orm'
 import { decryptApiKey } from '@/lib/api-key/crypto'
 import { createBullMQJobData, isBullMQEnabled } from '@/lib/core/bullmq'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { enqueueWorkspaceDispatch } from '@/lib/core/workspace-dispatch'
 import type { DocumentData } from '@/lib/knowledge/documents/service'
 import {
@@ -149,7 +150,7 @@ export async function dispatchSync(
   connectorId: string,
   options?: { fullSync?: boolean; requestId?: string }
 ): Promise<void> {
-  const requestId = options?.requestId ?? crypto.randomUUID()
+  const requestId = options?.requestId ?? generateId()
 
   if (isTriggerAvailable()) {
     const connectorRows = await db
@@ -328,7 +329,7 @@ export async function executeSync(
     return result
   }
 
-  const syncLogId = crypto.randomUUID()
+  const syncLogId = generateId()
   const syncStartedAt = new Date()
   await db.insert(knowledgeConnectorSyncLog).values({
     id: syncLogId,
@@ -343,7 +344,7 @@ export async function executeSync(
     const externalDocs: ExternalDocument[] = []
     let cursor: string | undefined
     let hasMore = true
-    const syncContext: Record<string, unknown> = { syncRunId: crypto.randomUUID() }
+    const syncContext: Record<string, unknown> = { syncRunId: generateId() }
 
     // Determine if this sync should be incremental
     const isIncremental =
@@ -589,12 +590,7 @@ export async function executeSync(
 
       if (batchDocs.length > 0) {
         try {
-          await processDocumentsWithQueue(
-            batchDocs,
-            connector.knowledgeBaseId,
-            {},
-            crypto.randomUUID()
-          )
+          await processDocumentsWithQueue(batchDocs, connector.knowledgeBaseId, {}, generateId())
         } catch (error) {
           logger.warn('Failed to enqueue batch for processing — will retry on next sync', {
             connectorId,
@@ -703,7 +699,7 @@ export async function executeSync(
           })),
           connector.knowledgeBaseId,
           {},
-          crypto.randomUUID()
+          generateId()
         )
       } catch (error) {
         logger.warn('Failed to enqueue stuck documents for reprocessing', {
@@ -859,7 +855,7 @@ async function addDocument(
   if (await isKnowledgeBaseDeleted(knowledgeBaseId)) {
     throw new Error(`Knowledge base ${knowledgeBaseId} is deleted`)
   }
-  const documentId = crypto.randomUUID()
+  const documentId = generateId()
   const contentBuffer = Buffer.from(extDoc.content, 'utf-8')
   const safeTitle = sanitizeStorageTitle(extDoc.title)
   const customKey = `kb/${Date.now()}-${documentId}-${safeTitle}.txt`
diff --git a/apps/sim/lib/knowledge/documents/service.ts b/apps/sim/lib/knowledge/documents/service.ts
index bc6497bdf76..ff613b4e8cd 100644
--- a/apps/sim/lib/knowledge/documents/service.ts
+++ b/apps/sim/lib/knowledge/documents/service.ts
@@ -1,4 +1,4 @@
-import crypto, { randomUUID } from 'crypto'
+import crypto from 'crypto'
 import { db } from '@sim/db'
 import {
   document,
@@ -30,6 +30,7 @@ import { checkAndBillOverageThreshold } from '@/lib/billing/threshold-billing'
 import { createBullMQJobData, isBullMQEnabled } from '@/lib/core/bullmq'
 import { env } from '@/lib/core/config/env'
 import { getCostMultiplier, isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
+import { generateId } from '@/lib/core/utils/uuid'
 import { enqueueWorkspaceDispatch } from '@/lib/core/workspace-dispatch'
 import { processDocument } from '@/lib/knowledge/documents/document-processor'
 import type { DocumentSortField, SortOrder } from '@/lib/knowledge/documents/types'
@@ -565,7 +566,7 @@ export async function processDocumentAsync(
         logger.info(`[${documentId}] Creating embedding records with tags`)
 
         const embeddingRecords = processed.chunks.map((chunk, chunkIndex) => ({
-          id: crypto.randomUUID(),
+          id: generateId(),
           knowledgeBaseId,
           documentId,
           chunkIndex,
@@ -815,7 +816,7 @@ export async function createDocumentRecords(
     const returnData: DocumentData[] = []
 
     for (const docData of documents) {
-      const documentId = randomUUID()
+      const documentId = generateId()
 
       let processedTags: Partial<ProcessedDocumentTags> = {}
 
@@ -1315,7 +1316,7 @@ export async function createSingleDocument(
   tag6: string | null
   tag7: string | null
 }> {
-  const documentId = randomUUID()
+  const documentId = generateId()
   const now = new Date()
 
   let processedTags: ProcessedDocumentTags = {
diff --git a/apps/sim/lib/knowledge/service.ts b/apps/sim/lib/knowledge/service.ts
index f81cb29a25c..4867bf251ce 100644
--- a/apps/sim/lib/knowledge/service.ts
+++ b/apps/sim/lib/knowledge/service.ts
@@ -1,10 +1,10 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { document, knowledgeBase, knowledgeConnector, permissions, workspace } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, count, eq, inArray, isNotNull, isNull, ne, or, sql } from 'drizzle-orm'
 import { getPostgresErrorCode } from '@/lib/core/utils/pg-error'
 import { generateRestoreName } from '@/lib/core/utils/restore-name'
+import { generateId } from '@/lib/core/utils/uuid'
 import type {
   ChunkingConfig,
   CreateKnowledgeBaseData,
@@ -143,7 +143,7 @@ export async function createKnowledgeBase(
   data: CreateKnowledgeBaseData,
   requestId: string
 ): Promise<KnowledgeBaseWithCounts> {
-  const kbId = randomUUID()
+  const kbId = generateId()
   const now = new Date()
 
   const hasPermission = await getUserEntityPermissions(data.userId, 'workspace', data.workspaceId)
diff --git a/apps/sim/lib/knowledge/tags/service.ts b/apps/sim/lib/knowledge/tags/service.ts
index f5578e18929..ea8e2cd23ae 100644
--- a/apps/sim/lib/knowledge/tags/service.ts
+++ b/apps/sim/lib/knowledge/tags/service.ts
@@ -1,8 +1,8 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { document, embedding, knowledgeBaseTagDefinitions } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNotNull, isNull, sql } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { DbOrTx } from '@/lib/db/types'
 import { getSlotsForFieldType, SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/constants'
 import type { BulkTagDefinitionsData, DocumentTagDefinition } from '@/lib/knowledge/tags/types'
@@ -237,7 +237,7 @@ export async function createOrUpdateTagDefinitionsBulk(
           continue
         }
 
-        const id = randomUUID()
+        const id = generateId()
         const now = new Date()
 
         const newDefinition = {
@@ -534,7 +534,7 @@ export async function createTagDefinition(
   txDb?: DbOrTx
 ): Promise<TagDefinition> {
   const dbInstance = txDb ?? db
-  const tagDefinitionId = randomUUID()
+  const tagDefinitionId = generateId()
   const now = new Date()
 
   const newDefinition = {
diff --git a/apps/sim/lib/logs/events.ts b/apps/sim/lib/logs/events.ts
index 78f9529c71a..b08b7dc1313 100644
--- a/apps/sim/lib/logs/events.ts
+++ b/apps/sim/lib/logs/events.ts
@@ -2,8 +2,8 @@ import { db } from '@sim/db'
 import { workspaceNotificationDelivery, workspaceNotificationSubscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, or, sql } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { WorkflowExecutionLog } from '@/lib/logs/types'
 import {
   type AlertCheckContext,
@@ -115,7 +115,7 @@ export async function emitWorkflowExecutionCompleted(log: WorkflowExecutionLog):
         })
       }
 
-      const deliveryId = uuidv4()
+      const deliveryId = generateId()
 
       await db.insert(workspaceNotificationDelivery).values({
         id: deliveryId,
diff --git a/apps/sim/lib/logs/execution/logger.ts b/apps/sim/lib/logs/execution/logger.ts
index 83f97e6cd58..afa70de6ea5 100644
--- a/apps/sim/lib/logs/execution/logger.ts
+++ b/apps/sim/lib/logs/execution/logger.ts
@@ -8,7 +8,6 @@ import {
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq, sql } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import { BASE_EXECUTION_CHARGE } from '@/lib/billing/constants'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import {
@@ -22,6 +21,7 @@ import { checkAndBillOverageThreshold } from '@/lib/billing/threshold-billing'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { redactApiKeys } from '@/lib/core/security/redaction'
 import { filterForDisplay } from '@/lib/core/utils/display-filters'
+import { generateId } from '@/lib/core/utils/uuid'
 import { emitWorkflowExecutionCompleted } from '@/lib/logs/events'
 import { snapshotService } from '@/lib/logs/execution/snapshot/service'
 import type {
@@ -198,7 +198,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
     const [workflowLog] = await db
       .insert(workflowExecutionLogs)
       .values({
-        id: uuidv4(),
+        id: generateId(),
         workflowId,
         workspaceId,
         executionId,
diff --git a/apps/sim/lib/logs/execution/snapshot/service.test.ts b/apps/sim/lib/logs/execution/snapshot/service.test.ts
index 64a0f4284e4..213d887e53b 100644
--- a/apps/sim/lib/logs/execution/snapshot/service.test.ts
+++ b/apps/sim/lib/logs/execution/snapshot/service.test.ts
@@ -24,7 +24,13 @@ vi.mock('@sim/db', () => databaseMock)
 vi.mock('@sim/db/schema', () => mockSchemaExports)
 vi.mock('@sim/logger', () => loggerMock)
 vi.mock('drizzle-orm', () => drizzleOrmMock)
-vi.mock('uuid', () => ({ v4: vi.fn(() => 'generated-uuid-1') }))
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: vi.fn(() => 'generated-uuid-1'),
+  generateShortId: vi.fn(() => 'generated-short-1'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
+}))
 
 import { SnapshotService } from '@/lib/logs/execution/snapshot/service'
 import type { WorkflowState } from '@/lib/logs/types'
diff --git a/apps/sim/lib/logs/execution/snapshot/service.ts b/apps/sim/lib/logs/execution/snapshot/service.ts
index f6822b74a00..f23d88072ae 100644
--- a/apps/sim/lib/logs/execution/snapshot/service.ts
+++ b/apps/sim/lib/logs/execution/snapshot/service.ts
@@ -3,7 +3,7 @@ import { db } from '@sim/db'
 import { workflowExecutionLogs, workflowExecutionSnapshots } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, lt, notExists, sql } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import type {
   SnapshotService as ISnapshotService,
   SnapshotCreationResult,
@@ -31,7 +31,7 @@ export class SnapshotService implements ISnapshotService {
     const stateHash = this.computeStateHash(state)
 
     const snapshotData: WorkflowExecutionSnapshotInsert = {
-      id: uuidv4(),
+      id: generateId(),
       workflowId,
       stateHash,
       stateData: state,
diff --git a/apps/sim/lib/mothership/inbox/executor.ts b/apps/sim/lib/mothership/inbox/executor.ts
index ae6ce93fbc9..1691861963d 100644
--- a/apps/sim/lib/mothership/inbox/executor.ts
+++ b/apps/sim/lib/mothership/inbox/executor.ts
@@ -10,6 +10,7 @@ import type { OrchestratorResult } from '@/lib/copilot/orchestrator/types'
 import { taskPubSub } from '@/lib/copilot/task-events'
 import { generateWorkspaceContext } from '@/lib/copilot/workspace-context'
 import { isHosted } from '@/lib/core/config/feature-flags'
+import { generateId } from '@/lib/core/utils/uuid'
 import * as agentmail from '@/lib/mothership/inbox/agentmail-client'
 import { formatEmailAsMessage } from '@/lib/mothership/inbox/format'
 import { sendInboxResponse } from '@/lib/mothership/inbox/response'
@@ -174,7 +175,7 @@ export async function executeInboxTask(taskId: string): Promise<void> {
     }
     const messageContent = formatEmailAsMessage(truncatedTask, attachments)
 
-    const userMessageId = crypto.randomUUID()
+    const userMessageId = generateId()
     const requestPayload: Record<string, unknown> = {
       message: messageContent,
       userId,
@@ -188,9 +189,9 @@ export async function executeInboxTask(taskId: string): Promise<void> {
       ...(fileAttachments.length > 0 ? { fileAttachments } : {}),
     }
 
-    const executionId = crypto.randomUUID()
-    const runId = crypto.randomUUID()
-    const runStreamId = crypto.randomUUID()
+    const executionId = generateId()
+    const runId = generateId()
+    const runStreamId = generateId()
 
     if (chatId) {
       await createRunSegment({
@@ -337,7 +338,7 @@ async function persistChatMessages(
     }
 
     const assistantMessage = {
-      id: crypto.randomUUID(),
+      id: generateId(),
       role: 'assistant' as const,
       content: result.content || '',
       timestamp: now,
diff --git a/apps/sim/lib/mothership/inbox/lifecycle.ts b/apps/sim/lib/mothership/inbox/lifecycle.ts
index 768757003c2..1159aa727ec 100644
--- a/apps/sim/lib/mothership/inbox/lifecycle.ts
+++ b/apps/sim/lib/mothership/inbox/lifecycle.ts
@@ -1,8 +1,8 @@
 import { db, mothershipInboxWebhook, workspace } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import * as agentmail from '@/lib/mothership/inbox/agentmail-client'
 import type { InboxConfig } from '@/lib/mothership/inbox/types'
 
@@ -39,7 +39,7 @@ export async function enableInbox(
     })
 
     await db.insert(mothershipInboxWebhook).values({
-      id: uuidv4(),
+      id: generateId(),
       workspaceId,
       webhookId: webhook.webhook_id,
       secret: webhook.secret,
diff --git a/apps/sim/lib/notifications/inactivity-polling.ts b/apps/sim/lib/notifications/inactivity-polling.ts
index 2fa689f42fc..63e0e248e02 100644
--- a/apps/sim/lib/notifications/inactivity-polling.ts
+++ b/apps/sim/lib/notifications/inactivity-polling.ts
@@ -8,8 +8,8 @@ import {
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, gte, inArray, sql } from 'drizzle-orm'
-import { v4 as uuidv4 } from 'uuid'
 import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
+import { generateId } from '@/lib/core/utils/uuid'
 import { TRIGGER_TYPES } from '@/lib/workflows/triggers/triggers'
 import {
   enqueueNotificationDeliveryDispatch,
@@ -150,7 +150,7 @@ async function checkWorkflowInactivity(
     .set({ lastAlertAt: new Date() })
     .where(eq(workspaceNotificationSubscription.id, subscription.id))
 
-  const deliveryId = uuidv4()
+  const deliveryId = generateId()
 
   await db.insert(workspaceNotificationDelivery).values({
     id: deliveryId,
@@ -164,7 +164,7 @@ async function checkWorkflowInactivity(
 
   const now = new Date().toISOString()
   const mockLog = {
-    id: `inactivity_log_${uuidv4()}`,
+    id: `inactivity_log_${generateId()}`,
     workflowId,
     executionId: `inactivity_${Date.now()}`,
     stateSnapshotId: '',
diff --git a/apps/sim/lib/table/query-builder/converters.ts b/apps/sim/lib/table/query-builder/converters.ts
index bf6ffafbb60..6f65f859dc8 100644
--- a/apps/sim/lib/table/query-builder/converters.ts
+++ b/apps/sim/lib/table/query-builder/converters.ts
@@ -2,7 +2,7 @@
  * Converters for transforming between UI builder state and API filter/sort objects.
  */
 
-import { nanoid } from 'nanoid'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import type { Filter, FilterRule, JsonValue, Sort, SortDirection, SortRule } from '../types'
 
 /** Converts UI filter rules to a Filter object for API queries. */
@@ -70,7 +70,7 @@ export function sortToRules(sort: Sort | null): SortRule[] {
   if (!sort) return []
 
   return Object.entries(sort).map(([column, direction]) => ({
-    id: nanoid(),
+    id: generateShortId(),
     column,
     direction: normalizeSortDirection(direction),
   }))
@@ -132,7 +132,7 @@ function parseFilterGroup(group: Filter): FilterRule[] {
       for (const [op, opValue] of Object.entries(value)) {
         if (op.startsWith('$')) {
           rules.push({
-            id: nanoid(),
+            id: generateShortId(),
             logicalOperator: 'and',
             column,
             operator: op.substring(1),
@@ -144,7 +144,7 @@ function parseFilterGroup(group: Filter): FilterRule[] {
     }
 
     rules.push({
-      id: nanoid(),
+      id: generateShortId(),
       logicalOperator: 'and',
       column,
       operator: 'eq',
diff --git a/apps/sim/lib/table/query-builder/use-query-builder.ts b/apps/sim/lib/table/query-builder/use-query-builder.ts
index c4df1b11937..baa76d6cc7f 100644
--- a/apps/sim/lib/table/query-builder/use-query-builder.ts
+++ b/apps/sim/lib/table/query-builder/use-query-builder.ts
@@ -3,7 +3,7 @@
  */
 
 import { useCallback, useMemo } from 'react'
-import { nanoid } from 'nanoid'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import type { ColumnOption } from '../types'
 import {
   COMPARISON_OPERATORS,
@@ -39,7 +39,7 @@ export function useFilterBuilder({
 
   const createDefaultRule = useCallback((): FilterRule => {
     return {
-      id: nanoid(),
+      id: generateShortId(),
       logicalOperator: 'and',
       column: columns[0]?.value || '',
       operator: 'eq',
@@ -92,7 +92,7 @@ export function useSortBuilder({
 
   const addSort = useCallback(() => {
     setSortRule({
-      id: nanoid(),
+      id: generateShortId(),
       column: columns[0]?.value || '',
       direction: 'asc',
     })
diff --git a/apps/sim/lib/table/service.ts b/apps/sim/lib/table/service.ts
index abea2110393..5a874be671b 100644
--- a/apps/sim/lib/table/service.ts
+++ b/apps/sim/lib/table/service.ts
@@ -13,6 +13,7 @@ import { createLogger } from '@sim/logger'
 import { and, count, eq, gt, gte, inArray, isNull, sql } from 'drizzle-orm'
 import { getPostgresErrorCode } from '@/lib/core/utils/pg-error'
 import { generateRestoreName } from '@/lib/core/utils/restore-name'
+import { generateId } from '@/lib/core/utils/uuid'
 import { COLUMN_TYPES, NAME_PATTERN, TABLE_LIMITS, USER_TABLE_ROWS_SQL_NAME } from './constants'
 import { buildFilterClause, buildSortClause } from './sql'
 import type {
@@ -213,7 +214,7 @@ export async function createTable(
     throw new Error(`Invalid schema: ${schemaValidation.errors.join(', ')}`)
   }
 
-  const tableId = `tbl_${crypto.randomUUID().replace(/-/g, '')}`
+  const tableId = `tbl_${generateId().replace(/-/g, '')}`
   const now = new Date()
 
   // Use provided maxRows (from billing plan) or fall back to default
@@ -276,7 +277,7 @@ export async function createTable(
       const initialRowCount = data.initialRowCount ?? 0
       if (initialRowCount > 0) {
         const rowsToInsert = Array.from({ length: initialRowCount }, (_, i) => ({
-          id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
+          id: `row_${generateId().replace(/-/g, '')}`,
           tableId,
           data: {},
           position: i,
@@ -579,7 +580,7 @@ export async function insertRow(
     }
   }
 
-  const rowId = `row_${crypto.randomUUID().replace(/-/g, '')}`
+  const rowId = `row_${generateId().replace(/-/g, '')}`
   const now = new Date()
 
   // Atomic capacity check + insert inside a transaction.
@@ -723,7 +724,7 @@ export async function batchInsertRows(
     }
 
     const buildRow = (rowData: RowData, position: number) => ({
-      id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
+      id: `row_${generateId().replace(/-/g, '')}`,
       tableId: data.tableId,
       workspaceId: data.workspaceId,
       data: rowData,
@@ -923,7 +924,7 @@ export async function upsertRow(
     const [insertedRow] = await trx
       .insert(userTableRows)
       .values({
-        id: `row_${crypto.randomUUID().replace(/-/g, '')}`,
+        id: `row_${generateId().replace(/-/g, '')}`,
         tableId: data.tableId,
         workspaceId: data.workspaceId,
         data: data.data,
diff --git a/apps/sim/lib/uploads/providers/blob/client.ts b/apps/sim/lib/uploads/providers/blob/client.ts
index f83e6b576bc..7b863b7d6cf 100644
--- a/apps/sim/lib/uploads/providers/blob/client.ts
+++ b/apps/sim/lib/uploads/providers/blob/client.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { BLOB_CONFIG } from '@/lib/uploads/config'
+import { generateId } from '@/lib/core/utils/uuid'
 import type {
   AzureMultipartPart,
   AzureMultipartUploadInit,
@@ -402,10 +403,9 @@ export async function initiateMultipartUpload(
   }
 
   const safeFileName = sanitizeFileName(fileName)
-  const { v4: uuidv4 } = await import('uuid')
-  const uniqueKey = `kb/${uuidv4()}-${safeFileName}`
+  const uniqueKey = `kb/${generateId()}-${safeFileName}`
 
-  const uploadId = uuidv4()
+  const uploadId = generateId()
 
   const containerClient = blobServiceClient.getContainerClient(containerName)
   const blockBlobClient = containerClient.getBlockBlobClient(uniqueKey)
diff --git a/apps/sim/lib/uploads/providers/s3/client.ts b/apps/sim/lib/uploads/providers/s3/client.ts
index 31dd50f4589..073ac882a2e 100644
--- a/apps/sim/lib/uploads/providers/s3/client.ts
+++ b/apps/sim/lib/uploads/providers/s3/client.ts
@@ -10,6 +10,7 @@ import {
 } from '@aws-sdk/client-s3'
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 import { env } from '@/lib/core/config/env'
+import { generateId } from '@/lib/core/utils/uuid'
 import { S3_CONFIG, S3_KB_CONFIG } from '@/lib/uploads/config'
 import type {
   S3Config,
@@ -232,8 +233,7 @@ export async function initiateS3MultipartUpload(
   const s3Client = getS3Client()
 
   const safeFileName = sanitizeFileName(fileName)
-  const { v4: uuidv4 } = await import('uuid')
-  const uniqueKey = `kb/${uuidv4()}-${safeFileName}`
+  const uniqueKey = `kb/${generateId()}-${safeFileName}`
 
   const command = new CreateMultipartUploadCommand({
     Bucket: config.bucket,
diff --git a/apps/sim/lib/uploads/utils/validation.ts b/apps/sim/lib/uploads/utils/validation.ts
index 05e4aee82ca..3752e421d79 100644
--- a/apps/sim/lib/uploads/utils/validation.ts
+++ b/apps/sim/lib/uploads/utils/validation.ts
@@ -1,5 +1,3 @@
-import path from 'path'
-
 /**
  * Checks whether a string is a valid file extension (lowercase alphanumeric only).
  * Rejects extensions containing spaces, punctuation, or other non-alphanumeric characters
@@ -9,6 +7,11 @@ export function isAlphanumericExtension(ext: string): boolean {
   return /^[a-z0-9]+$/.test(ext)
 }
 
+function extractExtension(fileName: string): string {
+  const lastDot = fileName.lastIndexOf('.')
+  return lastDot !== -1 ? fileName.slice(lastDot + 1).toLowerCase() : ''
+}
+
 export const MAX_FILE_SIZE = 100 * 1024 * 1024 // 100MB
 
 export const SUPPORTED_DOCUMENT_EXTENSIONS = [
@@ -29,6 +32,54 @@ export const SUPPORTED_DOCUMENT_EXTENSIONS = [
   'yml',
 ] as const
 
+export const SUPPORTED_CODE_EXTENSIONS = [
+  'mdx',
+  'xml',
+  'css',
+  'scss',
+  'less',
+  'js',
+  'jsx',
+  'ts',
+  'tsx',
+  'py',
+  'rb',
+  'go',
+  'rs',
+  'java',
+  'kt',
+  'swift',
+  'c',
+  'cpp',
+  'h',
+  'hpp',
+  'cs',
+  'php',
+  'sh',
+  'bash',
+  'zsh',
+  'fish',
+  'sql',
+  'graphql',
+  'gql',
+  'toml',
+  'ini',
+  'conf',
+  'cfg',
+  'env',
+  'log',
+  'diff',
+  'patch',
+  'dockerfile',
+  'makefile',
+  'gitignore',
+  'editorconfig',
+  'prettierrc',
+  'eslintrc',
+] as const
+
+export type SupportedCodeExtension = (typeof SUPPORTED_CODE_EXTENSIONS)[number]
+
 export const SUPPORTED_AUDIO_EXTENSIONS = [
   'mp3',
   'm4a',
@@ -146,7 +197,7 @@ export interface FileValidationError {
  * Validate if a file type is supported for document processing
  */
 export function validateFileType(fileName: string, mimeType: string): FileValidationError | null {
-  const raw = path.extname(fileName).toLowerCase().substring(1)
+  const raw = extractExtension(fileName)
   const extension = (isAlphanumericExtension(raw) ? raw : '') as SupportedDocumentExtension
 
   if (!SUPPORTED_DOCUMENT_EXTENSIONS.includes(extension)) {
@@ -231,7 +282,7 @@ export function validateMediaFileType(
   fileName: string,
   mimeType: string
 ): FileValidationError | null {
-  const raw = path.extname(fileName).toLowerCase().substring(1)
+  const raw = extractExtension(fileName)
   const extension = isAlphanumericExtension(raw) ? raw : ''
 
   const isAudio = SUPPORTED_AUDIO_EXTENSIONS.includes(extension as SupportedAudioExtension)
diff --git a/apps/sim/lib/webhooks/deploy.ts b/apps/sim/lib/webhooks/deploy.ts
index 248fc5d2ede..1dd2f8b8f99 100644
--- a/apps/sim/lib/webhooks/deploy.ts
+++ b/apps/sim/lib/webhooks/deploy.ts
@@ -2,8 +2,8 @@ import { db } from '@sim/db'
 import { webhook } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray, isNull } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import type { NextRequest } from 'next/server'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
 import { PendingWebhookVerificationTracker } from '@/lib/webhooks/pending-verification'
 import {
@@ -588,7 +588,7 @@ export async function saveTriggerWebhooksForDeploy({
     if (!config) continue
 
     const { provider, providerConfig, triggerPath } = config
-    const webhookId = nanoid()
+    const webhookId = generateShortId()
     const createPayload = {
       id: webhookId,
       path: triggerPath,
diff --git a/apps/sim/lib/webhooks/gmail-polling-service.ts b/apps/sim/lib/webhooks/gmail-polling-service.ts
index 5d4af906346..6c916cc3cf8 100644
--- a/apps/sim/lib/webhooks/gmail-polling-service.ts
+++ b/apps/sim/lib/webhooks/gmail-polling-service.ts
@@ -8,10 +8,10 @@ import {
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, or, sql } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { isOrganizationOnTeamOrEnterprisePlan } from '@/lib/billing'
 import { pollingIdempotency } from '@/lib/core/idempotency/service'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import {
   getOAuthToken,
   refreshAccessTokenIfNeeded,
@@ -159,7 +159,7 @@ export async function pollGmailWebhooks() {
 
     const enqueue = async (webhookData: (typeof activeWebhooks)[number]) => {
       const webhookId = webhookData.id
-      const requestId = nanoid()
+      const requestId = generateShortId()
 
       try {
         const metadata = webhookData.providerConfig as any
diff --git a/apps/sim/lib/webhooks/imap-polling-service.ts b/apps/sim/lib/webhooks/imap-polling-service.ts
index 6f2f3ca09c0..73219f72353 100644
--- a/apps/sim/lib/webhooks/imap-polling-service.ts
+++ b/apps/sim/lib/webhooks/imap-polling-service.ts
@@ -5,10 +5,10 @@ import type { InferSelectModel } from 'drizzle-orm'
 import { and, eq, isNull, or, sql } from 'drizzle-orm'
 import type { FetchMessageObject, MailboxLockObject } from 'imapflow'
 import { ImapFlow } from 'imapflow'
-import { nanoid } from 'nanoid'
 import { pollingIdempotency } from '@/lib/core/idempotency/service'
 import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { MAX_CONSECUTIVE_FAILURES } from '@/triggers/constants'
 
 const logger = createLogger('ImapPollingService')
@@ -160,7 +160,7 @@ export async function pollImapWebhooks() {
 
     const enqueue = async (webhookData: (typeof activeWebhooks)[number]) => {
       const webhookId = webhookData.id
-      const requestId = nanoid()
+      const requestId = generateShortId()
 
       try {
         const config = webhookData.providerConfig as unknown as ImapWebhookConfig
diff --git a/apps/sim/lib/webhooks/outlook-polling-service.ts b/apps/sim/lib/webhooks/outlook-polling-service.ts
index d5e963cea32..7cf87f1707c 100644
--- a/apps/sim/lib/webhooks/outlook-polling-service.ts
+++ b/apps/sim/lib/webhooks/outlook-polling-service.ts
@@ -9,10 +9,10 @@ import {
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, or, sql } from 'drizzle-orm'
 import { htmlToText } from 'html-to-text'
-import { nanoid } from 'nanoid'
 import { isOrganizationOnTeamOrEnterprisePlan } from '@/lib/billing'
 import { pollingIdempotency } from '@/lib/core/idempotency'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import {
   getOAuthToken,
   refreshAccessTokenIfNeeded,
@@ -206,7 +206,7 @@ export async function pollOutlookWebhooks() {
 
     const enqueue = async (webhookData: (typeof activeWebhooks)[number]) => {
       const webhookId = webhookData.id
-      const requestId = nanoid()
+      const requestId = generateShortId()
 
       try {
         logger.info(`[${requestId}] Processing Outlook webhook: ${webhookId}`)
diff --git a/apps/sim/lib/webhooks/processor.test.ts b/apps/sim/lib/webhooks/processor.test.ts
index 86876fda02b..e3cb8dcde41 100644
--- a/apps/sim/lib/webhooks/processor.test.ts
+++ b/apps/sim/lib/webhooks/processor.test.ts
@@ -6,14 +6,14 @@ import { createMockRequest } from '@sim/testing'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const {
-  mockUuidV4,
+  mockGenerateId,
   mockPreprocessExecution,
   mockEnqueue,
   mockEnqueueWorkspaceDispatch,
   mockGetJobQueue,
   mockShouldExecuteInline,
 } = vi.hoisted(() => ({
-  mockUuidV4: vi.fn(),
+  mockGenerateId: vi.fn(),
   mockPreprocessExecution: vi.fn(),
   mockEnqueue: vi.fn(),
   mockEnqueueWorkspaceDispatch: vi.fn(),
@@ -49,8 +49,12 @@ vi.mock('drizzle-orm', () => ({
   or: vi.fn(),
 }))
 
-vi.mock('uuid', () => ({
-  v4: mockUuidV4,
+vi.mock('@/lib/core/utils/uuid', () => ({
+  generateId: mockGenerateId,
+  generateShortId: vi.fn(() => 'mock-short-id'),
+  isValidUuid: vi.fn((v: string) =>
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(v)
+  ),
 }))
 
 vi.mock('@/lib/billing/subscriptions/utils', () => ({
@@ -156,7 +160,7 @@ describe('webhook processor execution identity', () => {
     mockEnqueueWorkspaceDispatch.mockResolvedValue('job-1')
     mockGetJobQueue.mockResolvedValue({ enqueue: mockEnqueue })
     mockShouldExecuteInline.mockReturnValue(false)
-    mockUuidV4.mockReturnValue('generated-execution-id')
+    mockGenerateId.mockReturnValue('generated-execution-id')
   })
 
   it('reuses preprocessing execution identity when queueing a polling webhook', async () => {
@@ -213,7 +217,7 @@ describe('webhook processor execution identity', () => {
       }
     )
 
-    expect(mockUuidV4).toHaveBeenCalledTimes(1)
+    expect(mockGenerateId).toHaveBeenCalledTimes(1)
     expect(mockEnqueueWorkspaceDispatch).toHaveBeenCalledWith(
       expect.objectContaining({
         id: 'generated-execution-id',
diff --git a/apps/sim/lib/webhooks/processor.ts b/apps/sim/lib/webhooks/processor.ts
index 932ae3b05d6..34de5f54ba6 100644
--- a/apps/sim/lib/webhooks/processor.ts
+++ b/apps/sim/lib/webhooks/processor.ts
@@ -3,13 +3,13 @@ import { credentialSet } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { v4 as uuidv4 } from 'uuid'
 import { isOrganizationOnTeamOrEnterprisePlan } from '@/lib/billing/core/subscription'
 import { getInlineJobQueue, getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs'
 import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createBullMQJobData, isBullMQEnabled } from '@/lib/core/bullmq'
 import { isProd } from '@/lib/core/config/feature-flags'
 import { safeCompare } from '@/lib/core/security/encryption'
+import { generateId } from '@/lib/core/utils/uuid'
 import { enqueueWorkspaceDispatch } from '@/lib/core/workspace-dispatch'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
@@ -951,7 +951,7 @@ export async function checkWebhookPreprocessing(
   requestId: string
 ): Promise<WebhookPreprocessingResult> {
   try {
-    const executionId = uuidv4()
+    const executionId = generateId()
     const correlation = {
       executionId,
       requestId,
@@ -1233,7 +1233,7 @@ export async function queueWebhookExecution(
       return NextResponse.json({ error: 'Unable to resolve billing account' }, { status: 500 })
     }
 
-    const executionId = options.executionId ?? uuidv4()
+    const executionId = options.executionId ?? generateId()
     const correlation =
       options.correlation ??
       ({
diff --git a/apps/sim/lib/webhooks/provider-subscriptions.ts b/apps/sim/lib/webhooks/provider-subscriptions.ts
index c78538883b2..4c5e16ffc1a 100644
--- a/apps/sim/lib/webhooks/provider-subscriptions.ts
+++ b/apps/sim/lib/webhooks/provider-subscriptions.ts
@@ -5,6 +5,7 @@ import { eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { validateAirtableId, validateAlphanumericId } from '@/lib/core/security/input-validation'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   getOAuthToken,
   refreshAccessTokenIfNeeded,
@@ -2221,7 +2222,7 @@ export async function createAshbyWebhookSubscription(
       webhookId: webhookData.id,
     })
 
-    const secretToken = crypto.randomUUID()
+    const secretToken = generateId()
 
     const requestBody: Record<string, unknown> = {
       requestUrl: notificationUrl,
diff --git a/apps/sim/lib/webhooks/rss-polling-service.ts b/apps/sim/lib/webhooks/rss-polling-service.ts
index c9fe6c84140..e6727a2f7ca 100644
--- a/apps/sim/lib/webhooks/rss-polling-service.ts
+++ b/apps/sim/lib/webhooks/rss-polling-service.ts
@@ -2,7 +2,6 @@ import { db } from '@sim/db'
 import { webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, or, sql } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import Parser from 'rss-parser'
 import { pollingIdempotency } from '@/lib/core/idempotency/service'
 import {
@@ -10,6 +9,7 @@ import {
   validateUrlWithDNS,
 } from '@/lib/core/security/input-validation.server'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import { MAX_CONSECUTIVE_FAILURES } from '@/triggers/constants'
 
 const logger = createLogger('RssPollingService')
@@ -160,7 +160,7 @@ export async function pollRssWebhooks() {
 
     const enqueue = async (webhookData: (typeof activeWebhooks)[number]) => {
       const webhookId = webhookData.id
-      const requestId = nanoid()
+      const requestId = generateShortId()
 
       try {
         const config = webhookData.providerConfig as unknown as RssWebhookConfig
diff --git a/apps/sim/lib/webhooks/utils.server.ts b/apps/sim/lib/webhooks/utils.server.ts
index 4decf492eb5..49c29227ff4 100644
--- a/apps/sim/lib/webhooks/utils.server.ts
+++ b/apps/sim/lib/webhooks/utils.server.ts
@@ -3,7 +3,6 @@ import { db, workflowDeploymentVersion } from '@sim/db'
 import { account, webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, or } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { safeCompare } from '@/lib/core/security/encryption'
 import {
@@ -12,6 +11,7 @@ import {
   validateUrlWithDNS,
 } from '@/lib/core/security/input-validation.server'
 import { sanitizeUrlForLog } from '@/lib/core/utils/logging'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import type { DbOrTx } from '@/lib/db/types'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
 import { cleanupExternalWebhook } from '@/lib/webhooks/provider-subscriptions'
@@ -2391,7 +2391,7 @@ export async function syncWebhooksForCredentialSet(params: {
         )
       } else {
         // Create new webhook for this credential
-        const webhookId = nanoid()
+        const webhookId = generateShortId()
         const webhookPath = useUniquePaths
           ? `${basePath}-${cred.credentialId.slice(0, 8)}`
           : basePath
diff --git a/apps/sim/lib/workflows/custom-tools/operations.ts b/apps/sim/lib/workflows/custom-tools/operations.ts
index 1a10b10d490..d77b8220110 100644
--- a/apps/sim/lib/workflows/custom-tools/operations.ts
+++ b/apps/sim/lib/workflows/custom-tools/operations.ts
@@ -2,8 +2,8 @@ import { db } from '@sim/db'
 import { customTools } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, desc, eq, isNull, or } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('CustomToolsOperations')
 
@@ -87,7 +87,7 @@ export async function upsertCustomTools(params: {
       }
 
       await tx.insert(customTools).values({
-        id: nanoid(),
+        id: generateShortId(),
         workspaceId,
         userId,
         title: tool.title,
diff --git a/apps/sim/lib/workflows/defaults.ts b/apps/sim/lib/workflows/defaults.ts
index b0b6f4de2e3..c6c4c001c5c 100644
--- a/apps/sim/lib/workflows/defaults.ts
+++ b/apps/sim/lib/workflows/defaults.ts
@@ -1,3 +1,4 @@
+import { generateId } from '@/lib/core/utils/uuid'
 import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { getBlock } from '@/blocks'
 import type { BlockConfig, SubBlockConfig } from '@/blocks/types'
@@ -40,7 +41,7 @@ function resolveInitialValue(subBlock: SubBlockConfig): unknown {
   if (subBlock.type === 'input-format') {
     return [
       {
-        id: crypto.randomUUID(),
+        id: generateId(),
         name: '',
         type: 'string',
         value: '',
@@ -111,7 +112,7 @@ function buildStartBlockState(
 
 export function buildDefaultWorkflowArtifacts(): DefaultWorkflowArtifacts {
   const blockConfig = buildStartBlockConfig()
-  const startBlockId = crypto.randomUUID()
+  const startBlockId = generateId()
 
   const { blockState, subBlockValues } = buildStartBlockState(blockConfig, startBlockId)
 
diff --git a/apps/sim/lib/workflows/diff/diff-engine.ts b/apps/sim/lib/workflows/diff/diff-engine.ts
index 9a600e90d88..5093ac865fc 100644
--- a/apps/sim/lib/workflows/diff/diff-engine.ts
+++ b/apps/sim/lib/workflows/diff/diff-engine.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getTargetedLayoutImpact } from '@/lib/workflows/autolayout'
 import type { BlockWithDiff } from '@/lib/workflows/diff/types'
 import { isValidKey } from '@/lib/workflows/sanitization/key-validation'
@@ -384,7 +384,7 @@ export class WorkflowDiffEngine {
           idMap[proposedId] = proposedId
         } else {
           // New block with a non-UUID ID (e.g., from YAML parsing) — mint a UUID
-          idMap[proposedId] = uuidv4()
+          idMap[proposedId] = generateId()
         }
       }
 
@@ -470,7 +470,7 @@ export class WorkflowDiffEngine {
         if (!edgeMap.has(edgeKey)) {
           edgeMap.set(edgeKey, {
             ...edge,
-            id: uuidv4(), // Use UUID for unique edge IDs
+            id: generateId(), // Use UUID for unique edge IDs
             source,
             target,
             sourceHandle,
diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts
index 3101ef9f860..b8c430406c4 100644
--- a/apps/sim/lib/workflows/executor/execute-workflow.ts
+++ b/apps/sim/lib/workflows/executor/execute-workflow.ts
@@ -1,5 +1,5 @@
 import { createLogger } from '@sim/logger'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
@@ -54,7 +54,7 @@ export async function executeWorkflow(
 
   const workflowId = workflow.id
   const workspaceId = workflow.workspaceId
-  const executionId = providedExecutionId || uuidv4()
+  const executionId = providedExecutionId || generateId()
   const triggerType = streamConfig?.workflowTriggerType || 'api'
   const loggingSession = new LoggingSession(workflowId, executionId, triggerType, requestId)
 
diff --git a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts
index 5649cf40e65..7b9f0c66ece 100644
--- a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts
+++ b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts
@@ -1,10 +1,10 @@
-import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { pausedExecutions, resumeQueue, workflowExecutionLogs } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, asc, desc, eq, inArray, lt, type SQL, sql } from 'drizzle-orm'
 import type { Edge } from 'reactflow'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
+import { generateId } from '@/lib/core/utils/uuid'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
@@ -125,7 +125,7 @@ export class PauseResumeManager {
     await db
       .insert(pausedExecutions)
       .values({
-        id: randomUUID(),
+        id: generateId(),
         workflowId,
         executionId,
         executionSnapshot: snapshotSeed,
@@ -208,7 +208,7 @@ export class PauseResumeManager {
         const [entry] = await tx
           .insert(resumeQueue)
           .values({
-            id: randomUUID(),
+            id: generateId(),
             pausedExecutionId: pausedExecution.id,
             parentExecutionId: executionId,
             newExecutionId: resumeExecutionId,
@@ -246,7 +246,7 @@ export class PauseResumeManager {
         }
       }
 
-      const resumeEntryId = randomUUID()
+      const resumeEntryId = generateId()
       await tx.insert(resumeQueue).values({
         id: resumeEntryId,
         pausedExecutionId: pausedExecution.id,
diff --git a/apps/sim/lib/workflows/operations/import-export.ts b/apps/sim/lib/workflows/operations/import-export.ts
index 164e9ff89ae..fdac248f134 100644
--- a/apps/sim/lib/workflows/operations/import-export.ts
+++ b/apps/sim/lib/workflows/operations/import-export.ts
@@ -1,4 +1,5 @@
 import { createLogger } from '@sim/logger'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   type ExportWorkflowState,
   sanitizeForExport,
@@ -710,7 +711,7 @@ export async function persistImportedWorkflow({
 
       for (const variable of variablesArray) {
         const id =
-          typeof variable.id === 'string' && variable.id.trim() ? variable.id : crypto.randomUUID()
+          typeof variable.id === 'string' && variable.id.trim() ? variable.id : generateId()
 
         variablesRecord[id] = {
           id,
diff --git a/apps/sim/lib/workflows/operations/socket-operations.ts b/apps/sim/lib/workflows/operations/socket-operations.ts
index 5aaf99ed993..8c951088aa4 100644
--- a/apps/sim/lib/workflows/operations/socket-operations.ts
+++ b/apps/sim/lib/workflows/operations/socket-operations.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { client } from '@/lib/auth/auth-client'
+import { generateId } from '@/lib/core/utils/uuid'
 import { useOperationQueueStore } from '@/stores/operation-queue/store'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 import { normalizeWorkflowState } from '@/stores/workflows/workflow/validation'
@@ -40,7 +41,7 @@ export async function enqueueWorkflowOperation({
   operationId,
 }: EnqueueWorkflowOperationArgs): Promise<string> {
   const userId = await resolveUserId()
-  const opId = operationId ?? crypto.randomUUID()
+  const opId = operationId ?? generateId()
 
   useOperationQueueStore.getState().addToQueue({
     id: opId,
diff --git a/apps/sim/lib/workflows/orchestration/chat-deploy.ts b/apps/sim/lib/workflows/orchestration/chat-deploy.ts
index 8eda5054a86..1a00e325d29 100644
--- a/apps/sim/lib/workflows/orchestration/chat-deploy.ts
+++ b/apps/sim/lib/workflows/orchestration/chat-deploy.ts
@@ -1,4 +1,3 @@
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import { chat } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
@@ -6,6 +5,7 @@ import { and, eq, isNull } from 'drizzle-orm'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { encryptSecret } from '@/lib/core/security/encryption'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { generateId } from '@/lib/core/utils/uuid'
 import { performFullDeploy } from '@/lib/workflows/orchestration/deploy'
 
 const logger = createLogger('ChatDeployOrchestration')
@@ -101,7 +101,7 @@ export async function performChatDeploy(
       })
       .where(eq(chat.id, chatId))
   } else {
-    chatId = crypto.randomUUID()
+    chatId = generateId()
     await db.insert(chat).values({
       id: chatId,
       workflowId,
diff --git a/apps/sim/lib/workflows/persistence/duplicate.ts b/apps/sim/lib/workflows/persistence/duplicate.ts
index bbc07a5ad15..f0dd52614b5 100644
--- a/apps/sim/lib/workflows/persistence/duplicate.ts
+++ b/apps/sim/lib/workflows/persistence/duplicate.ts
@@ -8,6 +8,7 @@ import {
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, min } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { remapConditionBlockIds, remapConditionEdgeHandle } from '@/lib/workflows/condition-ids'
 import {
   authorizeWorkflowByWorkspacePermission,
@@ -135,7 +136,7 @@ export async function duplicateWorkflow(
     newWorkflowId: clientNewWorkflowId,
   } = options
 
-  const newWorkflowId = clientNewWorkflowId || crypto.randomUUID()
+  const newWorkflowId = clientNewWorkflowId || generateId()
   const now = new Date()
 
   // Duplicate workflow and all related data in a transaction
@@ -227,7 +228,7 @@ export async function duplicateWorkflow(
         const sourceVars = (source.variables as Record<string, Variable>) || {}
         const remapped: Record<string, Variable> = {}
         for (const [oldVarId, variable] of Object.entries(sourceVars) as [string, Variable][]) {
-          const newVarId = crypto.randomUUID()
+          const newVarId = generateId()
           varIdMapping.set(oldVarId, newVarId)
           remapped[newVarId] = {
             ...variable,
@@ -251,7 +252,7 @@ export async function duplicateWorkflow(
     if (sourceBlocks.length > 0) {
       // First pass: Create all block ID mappings
       sourceBlocks.forEach((block) => {
-        const newBlockId = crypto.randomUUID()
+        const newBlockId = generateId()
         blockIdMapping.set(block.id, newBlockId)
       })
 
@@ -344,7 +345,7 @@ export async function duplicateWorkflow(
 
         return {
           ...edge,
-          id: crypto.randomUUID(),
+          id: generateId(),
           workflowId: newWorkflowId,
           sourceBlockId: newSourceBlockId,
           targetBlockId: blockIdMapping.get(edge.targetBlockId) || edge.targetBlockId,
diff --git a/apps/sim/lib/workflows/persistence/utils.ts b/apps/sim/lib/workflows/persistence/utils.ts
index e33c531cf6a..b1f0641bd8b 100644
--- a/apps/sim/lib/workflows/persistence/utils.ts
+++ b/apps/sim/lib/workflows/persistence/utils.ts
@@ -1,4 +1,3 @@
-import crypto from 'crypto'
 import {
   db,
   workflow,
@@ -12,7 +11,7 @@ import { createLogger } from '@sim/logger'
 import type { InferInsertModel, InferSelectModel } from 'drizzle-orm'
 import { and, desc, eq, inArray, sql } from 'drizzle-orm'
 import type { Edge } from 'reactflow'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { DbOrTx } from '@/lib/db/types'
 import { getActiveWorkflowContext } from '@/lib/workflows/active-context'
 import { remapConditionBlockIds, remapConditionEdgeHandle } from '@/lib/workflows/condition-ids'
@@ -691,7 +690,7 @@ export async function deployWorkflow(params: {
         .where(eq(workflowDeploymentVersion.workflowId, workflowId))
 
       const nextVersion = Number(maxVersion) + 1
-      const deploymentVersionId = uuidv4()
+      const deploymentVersionId = generateId()
 
       // Deactivate all existing versions
       await tx
@@ -803,23 +802,23 @@ export function regenerateWorkflowStateIds(state: RegenerateStateInput): Regener
   // First pass: Create all ID mappings
   // Map block IDs
   Object.keys(state.blocks || {}).forEach((oldId) => {
-    blockIdMapping.set(oldId, crypto.randomUUID())
+    blockIdMapping.set(oldId, generateId())
   })
 
   // Map edge IDs
 
   ;(state.edges || []).forEach((edge: Edge) => {
-    edgeIdMapping.set(edge.id, crypto.randomUUID())
+    edgeIdMapping.set(edge.id, generateId())
   })
 
   // Map loop IDs
   Object.keys(state.loops || {}).forEach((oldId) => {
-    loopIdMapping.set(oldId, crypto.randomUUID())
+    loopIdMapping.set(oldId, generateId())
   })
 
   // Map parallel IDs
   Object.keys(state.parallels || {}).forEach((oldId) => {
-    parallelIdMapping.set(oldId, crypto.randomUUID())
+    parallelIdMapping.set(oldId, generateId())
   })
 
   // Second pass: Create new state with regenerated IDs and updated references
diff --git a/apps/sim/lib/workflows/schedules/deploy.ts b/apps/sim/lib/workflows/schedules/deploy.ts
index b6546293a84..1405aa3f073 100644
--- a/apps/sim/lib/workflows/schedules/deploy.ts
+++ b/apps/sim/lib/workflows/schedules/deploy.ts
@@ -1,6 +1,7 @@
 import { db, workflowSchedule } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray, isNull } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { DbOrTx } from '@/lib/db/types'
 import { cleanupWebhooksForWorkflow } from '@/lib/webhooks/deploy'
 import type { BlockState } from '@/lib/workflows/schedules/utils'
@@ -100,7 +101,7 @@ export async function createSchedulesForDeploy(
 
       for (const validated of validatedBlocks) {
         const { blockId, cronExpression, nextRunAt, timezone } = validated
-        const scheduleId = crypto.randomUUID()
+        const scheduleId = generateId()
         const now = new Date()
 
         const values = {
diff --git a/apps/sim/lib/workflows/skills/operations.ts b/apps/sim/lib/workflows/skills/operations.ts
index 6dda5fa4f87..2c725d3fa64 100644
--- a/apps/sim/lib/workflows/skills/operations.ts
+++ b/apps/sim/lib/workflows/skills/operations.ts
@@ -2,8 +2,8 @@ import { db } from '@sim/db'
 import { skill } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, desc, eq, ne } from 'drizzle-orm'
-import { nanoid } from 'nanoid'
 import { generateRequestId } from '@/lib/core/utils/request'
+import { generateShortId } from '@/lib/core/utils/uuid'
 
 const logger = createLogger('SkillsOperations')
 
@@ -111,7 +111,7 @@ export async function upsertSkills(params: {
       }
 
       await tx.insert(skill).values({
-        id: nanoid(),
+        id: generateShortId(),
         workspaceId,
         userId,
         name: s.name,
diff --git a/apps/sim/lib/workflows/utils.ts b/apps/sim/lib/workflows/utils.ts
index d7838b0ee41..36496fd4cfa 100644
--- a/apps/sim/lib/workflows/utils.ts
+++ b/apps/sim/lib/workflows/utils.ts
@@ -1,10 +1,10 @@
-import crypto from 'crypto'
 import { db } from '@sim/db'
 import { permissions, userStats, workflowFolder, workflow as workflowTable } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, asc, eq, inArray, isNull, max, min, sql } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getActiveWorkflowContext } from '@/lib/workflows/active-context'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
@@ -100,7 +100,7 @@ export async function deduplicateWorkflowName(
     }
   }
 
-  return `${name} (${crypto.randomUUID().slice(0, 6)})`
+  return `${name} (${generateId().slice(0, 6)})`
 }
 
 export async function resolveWorkflowIdForUser(
@@ -437,7 +437,7 @@ export async function createWorkflowRecord(params: CreateWorkflowInput) {
     color = getNextWorkflowColor(),
     folderId = null,
   } = params
-  const workflowId = crypto.randomUUID()
+  const workflowId = generateId()
   const now = new Date()
 
   const duplicateConditions = [
@@ -567,7 +567,7 @@ export async function createFolderRecord(params: CreateFolderInput) {
     )
   const sortOrder = (maxResult?.maxOrder ?? 0) + 1
 
-  const folderId = crypto.randomUUID()
+  const folderId = generateId()
   await db.insert(workflowFolder).values({
     id: folderId,
     userId,
diff --git a/apps/sim/lib/workspaces/duplicate.ts b/apps/sim/lib/workspaces/duplicate.ts
index 871cd6e7371..53172001eff 100644
--- a/apps/sim/lib/workspaces/duplicate.ts
+++ b/apps/sim/lib/workspaces/duplicate.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { permissions, workflow, workflowFolder, workspace as workspaceTable } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
+import { generateId } from '@/lib/core/utils/uuid'
 import { duplicateWorkflow } from '@/lib/workflows/persistence/duplicate'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
@@ -32,7 +33,7 @@ export async function duplicateWorkspace(
   const { sourceWorkspaceId, userId, name, requestId = 'unknown' } = options
 
   // Generate new workspace ID
-  const newWorkspaceId = crypto.randomUUID()
+  const newWorkspaceId = generateId()
   const now = new Date()
 
   // Verify the source workspace exists and user has permission
@@ -69,7 +70,7 @@ export async function duplicateWorkspace(
 
     // Grant admin permission to the user on the new workspace
     await tx.insert(permissions).values({
-      id: crypto.randomUUID(),
+      id: generateId(),
       userId,
       entityType: 'workspace',
       entityId: newWorkspaceId,
@@ -103,7 +104,7 @@ export async function duplicateWorkspace(
     const foldersAtLevel = foldersByParent.get(parentId) || []
 
     for (const sourceFolder of foldersAtLevel) {
-      const newFolderId = crypto.randomUUID()
+      const newFolderId = generateId()
       folderIdMap.set(sourceFolder.id, newFolderId)
 
       await db.insert(workflowFolder).values({
diff --git a/apps/sim/package.json b/apps/sim/package.json
index 36704047dff..0a8150656fe 100644
--- a/apps/sim/package.json
+++ b/apps/sim/package.json
@@ -144,7 +144,6 @@
     "micromatch": "4.0.8",
     "mongodb": "6.19.0",
     "mysql2": "3.14.3",
-    "nanoid": "^3.3.7",
     "neo4j-driver": "6.0.1",
     "next": "16.1.6",
     "next-mdx-remote": "^5.0.0",
diff --git a/apps/sim/public/blog/copilot/cover.png b/apps/sim/public/blog/copilot/cover.png
index 6f31c49f63a..ff764b6b121 100644
Binary files a/apps/sim/public/blog/copilot/cover.png and b/apps/sim/public/blog/copilot/cover.png differ
diff --git a/apps/sim/public/blog/enterprise/cover.png b/apps/sim/public/blog/enterprise/cover.png
index a18cae5aaa0..f16df6e1686 100644
Binary files a/apps/sim/public/blog/enterprise/cover.png and b/apps/sim/public/blog/enterprise/cover.png differ
diff --git a/apps/sim/public/blog/executor/cover.png b/apps/sim/public/blog/executor/cover.png
index 99f7438647f..5f9031fcbf7 100644
Binary files a/apps/sim/public/blog/executor/cover.png and b/apps/sim/public/blog/executor/cover.png differ
diff --git a/apps/sim/public/blog/mothership/cover.png b/apps/sim/public/blog/mothership/cover.png
index 7dcb8273f2e..c023f635727 100644
Binary files a/apps/sim/public/blog/mothership/cover.png and b/apps/sim/public/blog/mothership/cover.png differ
diff --git a/apps/sim/public/blog/multiplayer/cover.png b/apps/sim/public/blog/multiplayer/cover.png
index ae54fbac62e..ecacfe49e17 100644
Binary files a/apps/sim/public/blog/multiplayer/cover.png and b/apps/sim/public/blog/multiplayer/cover.png differ
diff --git a/apps/sim/public/blog/openai-vs-n8n-vs-sim/workflow.png b/apps/sim/public/blog/openai-vs-n8n-vs-sim/workflow.png
index ef314047d41..e5ba786385a 100644
Binary files a/apps/sim/public/blog/openai-vs-n8n-vs-sim/workflow.png and b/apps/sim/public/blog/openai-vs-n8n-vs-sim/workflow.png differ
diff --git a/apps/sim/public/blog/series-a/cover.png b/apps/sim/public/blog/series-a/cover.png
index 83dc953e26d..71aeb92ce84 100644
Binary files a/apps/sim/public/blog/series-a/cover.png and b/apps/sim/public/blog/series-a/cover.png differ
diff --git a/apps/sim/public/blog/v0-5/cover.png b/apps/sim/public/blog/v0-5/cover.png
index 271a85b44e2..6ccf4ba8e36 100644
Binary files a/apps/sim/public/blog/v0-5/cover.png and b/apps/sim/public/blog/v0-5/cover.png differ
diff --git a/apps/sim/serializer/index.ts b/apps/sim/serializer/index.ts
index 485b4e3cc2c..83fd292bb68 100644
--- a/apps/sim/serializer/index.ts
+++ b/apps/sim/serializer/index.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { CanonicalModeOverrides } from '@/lib/workflows/subblocks/visibility'
 import {
   buildCanonicalIndex,
@@ -565,7 +566,7 @@ export class Serializer {
     // Deserialize connections
     workflow.connections.forEach((connection) => {
       edges.push({
-        id: crypto.randomUUID(),
+        id: generateId(),
         source: connection.source,
         target: connection.target,
         sourceHandle: connection.sourceHandle,
diff --git a/apps/sim/socket/handlers/operations.ts b/apps/sim/socket/handlers/operations.ts
index 4852d79d399..207bd569369 100644
--- a/apps/sim/socket/handlers/operations.ts
+++ b/apps/sim/socket/handlers/operations.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { ZodError } from 'zod'
+import { generateId } from '@/lib/core/utils/uuid'
 import {
   BLOCK_OPERATIONS,
   BLOCKS_OPERATIONS,
@@ -152,7 +153,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           userName: session.userName,
           metadata: {
             workflowId,
-            operationId: crypto.randomUUID(),
+            operationId: generateId(),
             isPositionUpdate: true,
           },
         }
@@ -206,7 +207,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID(), isBatchPositionUpdate: true },
+          metadata: { workflowId, operationId: generateId(), isBatchPositionUpdate: true },
         })
 
         try {
@@ -262,7 +263,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           userName: session.userName,
           metadata: {
             workflowId,
-            operationId: crypto.randomUUID(),
+            operationId: generateId(),
           },
         }
 
@@ -302,7 +303,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           userName: session.userName,
           metadata: {
             workflowId,
-            operationId: crypto.randomUUID(),
+            operationId: generateId(),
           },
         }
 
@@ -337,7 +338,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -369,7 +370,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -398,7 +399,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -430,7 +431,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -462,7 +463,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -494,7 +495,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -523,7 +524,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
           senderId: socket.id,
           userId: session.userId,
           userName: session.userName,
-          metadata: { workflowId, operationId: crypto.randomUUID() },
+          metadata: { workflowId, operationId: generateId() },
         })
 
         if (operationId) {
@@ -554,7 +555,7 @@ export function setupOperationsHandlers(socket: AuthenticatedSocket, roomManager
         userName: session.userName,
         metadata: {
           workflowId,
-          operationId: crypto.randomUUID(),
+          operationId: generateId(),
         },
       }
 
diff --git a/apps/sim/stores/chat/store.ts b/apps/sim/stores/chat/store.ts
index fa0a37f293e..070ec6bfa27 100644
--- a/apps/sim/stores/chat/store.ts
+++ b/apps/sim/stores/chat/store.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
-import { v4 as uuidv4 } from 'uuid'
 import { create } from 'zustand'
 import { devtools, persist } from 'zustand/middleware'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { ChatMessage, ChatState } from './types'
 import { MAX_CHAT_HEIGHT, MAX_CHAT_WIDTH, MIN_CHAT_HEIGHT, MIN_CHAT_WIDTH } from './utils'
 
@@ -58,7 +58,7 @@ export const useChatStore = create<ChatState>()(
           set((state) => {
             const newMessage: ChatMessage = {
               ...message,
-              id: (message as any).id ?? crypto.randomUUID(),
+              id: (message as any).id ?? generateId(),
               timestamp: (message as any).timestamp ?? new Date().toISOString(),
             }
 
@@ -78,7 +78,7 @@ export const useChatStore = create<ChatState>()(
 
             if (workflowId) {
               const newConversationIds = { ...state.conversationIds }
-              newConversationIds[workflowId] = uuidv4()
+              newConversationIds[workflowId] = generateId()
               return {
                 ...newState,
                 conversationIds: newConversationIds,
@@ -191,7 +191,7 @@ export const useChatStore = create<ChatState>()(
         },
 
         generateNewConversationId: (workflowId) => {
-          const newId = uuidv4()
+          const newId = generateId()
           set((state) => {
             const newConversationIds = { ...state.conversationIds }
             newConversationIds[workflowId] = newId
diff --git a/apps/sim/stores/notifications/store.ts b/apps/sim/stores/notifications/store.ts
index 264cd014da7..9e843ceed18 100644
--- a/apps/sim/stores/notifications/store.ts
+++ b/apps/sim/stores/notifications/store.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { AddNotificationParams, Notification } from './types'
 
 const logger = createLogger('NotificationStore')
@@ -55,7 +56,7 @@ export const useNotificationStore = create<NotificationStore>()(
       notifications: [],
 
       addNotification: (params: AddNotificationParams) => {
-        const id = crypto.randomUUID()
+        const id = generateId()
 
         const notification: Notification = {
           id,
diff --git a/apps/sim/stores/table/store.ts b/apps/sim/stores/table/store.ts
index c3239e515d8..3b5b1d3de96 100644
--- a/apps/sim/stores/table/store.ts
+++ b/apps/sim/stores/table/store.ts
@@ -3,9 +3,9 @@
  * Ephemeral — no persistence. Stacks are keyed by tableId.
  */
 
-import { nanoid } from 'nanoid'
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
+import { generateShortId } from '@/lib/core/utils/uuid'
 import type { TableUndoAction, TableUndoStacks, TableUndoState, UndoEntry } from './types'
 
 const STACK_CAPACITY = 100
@@ -34,7 +34,7 @@ export const useTableUndoStore = create<TableUndoState>()(
       push: (tableId: string, action: TableUndoAction) => {
         if (undoRedoInProgress) return
 
-        const entry: UndoEntry = { id: nanoid(), action, timestamp: Date.now() }
+        const entry: UndoEntry = { id: generateShortId(), action, timestamp: Date.now() }
 
         set((state) => {
           const current = state.stacks[tableId] ?? EMPTY_STACKS
diff --git a/apps/sim/stores/terminal/console/store.ts b/apps/sim/stores/terminal/console/store.ts
index 55f388b465b..db11856dd5d 100644
--- a/apps/sim/stores/terminal/console/store.ts
+++ b/apps/sim/stores/terminal/console/store.ts
@@ -3,6 +3,7 @@ import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 import { useShallow } from 'zustand/react/shallow'
 import { redactApiKeys } from '@/lib/core/security/redaction'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getQueryClient } from '@/app/_shell/providers/query-provider'
 import type { NormalizedBlockOutput } from '@/executor/types'
 import { type GeneralSettings, generalSettingsKeys } from '@/hooks/queries/general-settings'
@@ -291,7 +292,7 @@ export const useTerminalConsoleStore = create<ConsoleStore>()(
 
       const createdEntry: ConsoleEntry = {
         ...redactedEntry,
-        id: crypto.randomUUID(),
+        id: generateId(),
         timestamp: new Date().toISOString(),
         input: normalizeConsoleInput(redactedEntry.input),
         output: normalizeConsoleOutput(redactedEntry.output),
diff --git a/apps/sim/stores/undo-redo/utils.ts b/apps/sim/stores/undo-redo/utils.ts
index d07225b3f54..1837585b285 100644
--- a/apps/sim/stores/undo-redo/utils.ts
+++ b/apps/sim/stores/undo-redo/utils.ts
@@ -1,4 +1,5 @@
 import type { Edge } from 'reactflow'
+import { generateId } from '@/lib/core/utils/uuid'
 import { UNDO_REDO_OPERATIONS } from '@/socket/constants'
 import type {
   BatchAddBlocksOperation,
@@ -15,7 +16,7 @@ import type { BlockState } from '@/stores/workflows/workflow/types'
 
 export function createOperationEntry(operation: Operation, inverse: Operation): OperationEntry {
   return {
-    id: crypto.randomUUID(),
+    id: generateId(),
     operation,
     inverse,
     createdAt: Date.now(),
diff --git a/apps/sim/stores/variables/store.ts b/apps/sim/stores/variables/store.ts
index 0980f2ae6b3..bf25ccbc55e 100644
--- a/apps/sim/stores/variables/store.ts
+++ b/apps/sim/stores/variables/store.ts
@@ -2,6 +2,7 @@ import { createLogger } from '@sim/logger'
 import JSON5 from 'json5'
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
+import { generateId } from '@/lib/core/utils/uuid'
 import { normalizeName } from '@/executor/constants'
 import { useOperationQueueStore } from '@/stores/operation-queue/store'
 import type { Variable, VariablesStore } from '@/stores/variables/types'
@@ -66,7 +67,7 @@ export const useVariablesStore = create<VariablesStore>()(
     isEditing: null,
 
     addVariable: (variable, providedId?: string) => {
-      const id = providedId || crypto.randomUUID()
+      const id = providedId || generateId()
 
       const workflowVariables = get().getVariablesByWorkflowId(variable.workflowId)
 
@@ -194,7 +195,7 @@ export const useVariablesStore = create<VariablesStore>()(
 
               for (const { blockId, subBlockId, value } of changedSubBlocks) {
                 operationQueue.addToQueue({
-                  id: crypto.randomUUID(),
+                  id: generateId(),
                   operation: {
                     operation: 'subblock-update',
                     target: 'subblock',
diff --git a/apps/sim/stores/workflows/subblock/store.ts b/apps/sim/stores/workflows/subblock/store.ts
index ef4d497003c..405eb21be5a 100644
--- a/apps/sim/stores/workflows/subblock/store.ts
+++ b/apps/sim/stores/workflows/subblock/store.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
+import { generateId } from '@/lib/core/utils/uuid'
 import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
 import { populateTriggerFieldsFromConfig } from '@/hooks/use-trigger-config-aggregation'
@@ -42,13 +43,13 @@ export const useSubBlockStore = create<SubBlockStore>()(
             if (!row || typeof row !== 'object') {
               logger.warn('Fixing malformed table row', { blockId, subBlockId, row })
               return {
-                id: crypto.randomUUID(),
+                id: generateId(),
                 cells: { Key: '', Value: '' },
               }
             }
 
             if (!row.id) {
-              row.id = crypto.randomUUID()
+              row.id = generateId()
             }
 
             if (!row.cells || typeof row.cells !== 'object') {
diff --git a/apps/sim/stores/workflows/utils.ts b/apps/sim/stores/workflows/utils.ts
index eecb95c665b..2e11760917e 100644
--- a/apps/sim/stores/workflows/utils.ts
+++ b/apps/sim/stores/workflows/utils.ts
@@ -1,5 +1,5 @@
 import type { Edge } from 'reactflow'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import { DEFAULT_DUPLICATE_OFFSET } from '@/lib/workflows/autolayout/constants'
 import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { remapConditionBlockIds, remapConditionEdgeHandle } from '@/lib/workflows/condition-ids'
@@ -153,7 +153,7 @@ export function prepareBlockState(options: PrepareBlockStateOptions): BlockState
       } else if (subBlock.type === 'input-format' || subBlock.type === 'response-format') {
         initialValue = [
           {
-            id: crypto.randomUUID(),
+            id: generateId(),
             name: '',
             type: 'string',
             value: '',
@@ -347,7 +347,7 @@ export function regenerateWorkflowIds(
 
   // First pass: generate new IDs and remap condition/router IDs in subBlocks
   Object.entries(workflowState.blocks).forEach(([oldId, block]) => {
-    const newId = uuidv4()
+    const newId = generateId()
     blockIdMap.set(oldId, newId)
     const oldNormalizedName = normalizeName(block.name)
     nameMap.set(oldNormalizedName, oldNormalizedName)
@@ -378,7 +378,7 @@ export function regenerateWorkflowIds(
 
     return {
       ...edge,
-      id: uuidv4(),
+      id: generateId(),
       source: newSource,
       target: blockIdMap.get(edge.target) || edge.target,
       sourceHandle: newSourceHandle,
@@ -473,7 +473,7 @@ export function regenerateBlockIds(
 
   // First pass: generate new IDs and names for all blocks
   Object.entries(blocks).forEach(([oldId, block]) => {
-    const newId = uuidv4()
+    const newId = generateId()
     blockIdMap.set(oldId, newId)
 
     const oldNormalizedName = normalizeName(block.name)
@@ -579,7 +579,7 @@ export function regenerateBlockIds(
 
     return {
       ...edge,
-      id: uuidv4(),
+      id: generateId(),
       source: newSource,
       target: blockIdMap.get(edge.target) || edge.target,
       sourceHandle: newSourceHandle,
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index e7900c5a8a2..8044a16bf38 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -2,6 +2,7 @@ import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
+import { generateId } from '@/lib/core/utils/uuid'
 import { DEFAULT_DUPLICATE_OFFSET } from '@/lib/workflows/autolayout/constants'
 import {
   getDynamicHandleSubblockType,
@@ -84,7 +85,7 @@ function resolveInitialSubblockValue(config: SubBlockConfig): unknown {
   if (config.type === 'input-format') {
     return [
       {
-        id: crypto.randomUUID(),
+        id: generateId(),
         name: '',
         type: 'string',
         value: '',
@@ -251,7 +252,7 @@ export const useWorkflowStore = create<WorkflowStore>()(
           for (const edge of validEdges) {
             if (!existingEdgeIds.has(edge.id)) {
               newEdges.push({
-                id: edge.id || crypto.randomUUID(),
+                id: edge.id || generateId(),
                 source: edge.source,
                 target: edge.target,
                 sourceHandle: edge.sourceHandle,
@@ -471,7 +472,7 @@ export const useWorkflowStore = create<WorkflowStore>()(
         for (const edge of filtered) {
           if (wouldCreateCycle([...newEdges], edge.source, edge.target)) continue
           newEdges.push({
-            id: edge.id || crypto.randomUUID(),
+            id: edge.id || generateId(),
             source: edge.source,
             target: edge.target,
             sourceHandle: edge.sourceHandle,
@@ -605,7 +606,7 @@ export const useWorkflowStore = create<WorkflowStore>()(
         const block = get().blocks[id]
         if (!block) return
 
-        const newId = crypto.randomUUID()
+        const newId = generateId()
 
         // Check if block is inside a locked container - if so, place duplicate outside
         const parentId = block.data?.parentId
diff --git a/apps/sim/tools/cursor/add_followup.ts b/apps/sim/tools/cursor/add_followup.ts
index 5e161fc27f9..8dcf46c3b20 100644
--- a/apps/sim/tools/cursor/add_followup.ts
+++ b/apps/sim/tools/cursor/add_followup.ts
@@ -30,7 +30,7 @@ const addFollowupBase = {
   },
   request: {
     url: (params: AddFollowupParams) =>
-      `https://api.cursor.com/v0/agents/${params.agentId}/followup`,
+      `https://api.cursor.com/v0/agents/${params.agentId.trim()}/followup`,
     method: 'POST',
     headers: (params: AddFollowupParams) => ({
       'Content-Type': 'application/json',
diff --git a/apps/sim/tools/cursor/delete_agent.ts b/apps/sim/tools/cursor/delete_agent.ts
index 2acf9ea0dec..a3b8e51a45d 100644
--- a/apps/sim/tools/cursor/delete_agent.ts
+++ b/apps/sim/tools/cursor/delete_agent.ts
@@ -17,7 +17,7 @@ const deleteAgentBase = {
     },
   },
   request: {
-    url: (params: DeleteAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId}`,
+    url: (params: DeleteAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId.trim()}`,
     method: 'DELETE',
     headers: (params: DeleteAgentParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
diff --git a/apps/sim/tools/cursor/download_artifact.ts b/apps/sim/tools/cursor/download_artifact.ts
new file mode 100644
index 00000000000..5b891688410
--- /dev/null
+++ b/apps/sim/tools/cursor/download_artifact.ts
@@ -0,0 +1,113 @@
+import type {
+  DownloadArtifactParams,
+  DownloadArtifactResponse,
+  DownloadArtifactV2Response,
+} from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+const downloadArtifactBase = {
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Cursor API key',
+    },
+    agentId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+    },
+    path: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Absolute path of the artifact to download (e.g., /src/index.ts)',
+    },
+  },
+  request: {
+    url: '/api/tools/cursor/download-artifact',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params: DownloadArtifactParams) => ({
+      apiKey: params.apiKey,
+      agentId: params.agentId?.trim(),
+      path: params.path?.trim(),
+    }),
+  },
+} satisfies Pick<ToolConfig<DownloadArtifactParams, any>, 'params' | 'request'>
+
+export const downloadArtifactTool: ToolConfig<DownloadArtifactParams, DownloadArtifactResponse> = {
+  id: 'cursor_download_artifact',
+  name: 'Cursor Download Artifact',
+  description: 'Download a generated artifact file from a cloud agent.',
+  version: '1.0.0',
+
+  ...downloadArtifactBase,
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    if (!data.success) {
+      throw new Error(data.error || 'Failed to download artifact')
+    }
+
+    return {
+      success: true,
+      output: {
+        content: `Downloaded artifact: ${data.output.file.name}`,
+        metadata: data.output.file,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable download result' },
+    metadata: {
+      type: 'object',
+      description: 'Downloaded file metadata',
+      properties: {
+        name: { type: 'string', description: 'File name' },
+        mimeType: { type: 'string', description: 'MIME type' },
+        size: { type: 'number', description: 'File size in bytes' },
+      },
+    },
+  },
+}
+
+export const downloadArtifactV2Tool: ToolConfig<
+  DownloadArtifactParams,
+  DownloadArtifactV2Response
+> = {
+  ...downloadArtifactBase,
+  id: 'cursor_download_artifact_v2',
+  name: 'Cursor Download Artifact',
+  description:
+    'Download a generated artifact file from a cloud agent. Returns the file for execution storage.',
+  version: '2.0.0',
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    if (!data.success) {
+      throw new Error(data.error || 'Failed to download artifact')
+    }
+
+    return {
+      success: true,
+      output: {
+        file: data.output.file,
+      },
+    }
+  },
+
+  outputs: {
+    file: {
+      type: 'file',
+      description: 'Downloaded artifact file stored in execution files',
+    },
+  },
+}
diff --git a/apps/sim/tools/cursor/get_agent.ts b/apps/sim/tools/cursor/get_agent.ts
index 920dec4a29f..9ac829c26fd 100644
--- a/apps/sim/tools/cursor/get_agent.ts
+++ b/apps/sim/tools/cursor/get_agent.ts
@@ -17,7 +17,7 @@ const getAgentBase = {
     },
   },
   request: {
-    url: (params: GetAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId}`,
+    url: (params: GetAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId.trim()}`,
     method: 'GET',
     headers: (params: GetAgentParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
diff --git a/apps/sim/tools/cursor/get_conversation.ts b/apps/sim/tools/cursor/get_conversation.ts
index 32752ea7b31..c271e857823 100644
--- a/apps/sim/tools/cursor/get_conversation.ts
+++ b/apps/sim/tools/cursor/get_conversation.ts
@@ -18,7 +18,7 @@ const getConversationBase = {
   },
   request: {
     url: (params: GetConversationParams) =>
-      `https://api.cursor.com/v0/agents/${params.agentId}/conversation`,
+      `https://api.cursor.com/v0/agents/${params.agentId.trim()}/conversation`,
     method: 'GET',
     headers: (params: GetConversationParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
diff --git a/apps/sim/tools/cursor/index.ts b/apps/sim/tools/cursor/index.ts
index 2ec9cebfd15..80573009eec 100644
--- a/apps/sim/tools/cursor/index.ts
+++ b/apps/sim/tools/cursor/index.ts
@@ -1,9 +1,11 @@
 import { addFollowupTool, addFollowupV2Tool } from '@/tools/cursor/add_followup'
 import { deleteAgentTool, deleteAgentV2Tool } from '@/tools/cursor/delete_agent'
+import { downloadArtifactTool, downloadArtifactV2Tool } from '@/tools/cursor/download_artifact'
 import { getAgentTool, getAgentV2Tool } from '@/tools/cursor/get_agent'
 import { getConversationTool, getConversationV2Tool } from '@/tools/cursor/get_conversation'
 import { launchAgentTool, launchAgentV2Tool } from '@/tools/cursor/launch_agent'
 import { listAgentsTool, listAgentsV2Tool } from '@/tools/cursor/list_agents'
+import { listArtifactsTool, listArtifactsV2Tool } from '@/tools/cursor/list_artifacts'
 import { stopAgentTool, stopAgentV2Tool } from '@/tools/cursor/stop_agent'
 
 export const cursorListAgentsTool = listAgentsTool
@@ -13,6 +15,8 @@ export const cursorLaunchAgentTool = launchAgentTool
 export const cursorAddFollowupTool = addFollowupTool
 export const cursorStopAgentTool = stopAgentTool
 export const cursorDeleteAgentTool = deleteAgentTool
+export const cursorDownloadArtifactTool = downloadArtifactTool
+export const cursorListArtifactsTool = listArtifactsTool
 
 export const cursorListAgentsV2Tool = listAgentsV2Tool
 export const cursorGetAgentV2Tool = getAgentV2Tool
@@ -21,3 +25,5 @@ export const cursorLaunchAgentV2Tool = launchAgentV2Tool
 export const cursorAddFollowupV2Tool = addFollowupV2Tool
 export const cursorStopAgentV2Tool = stopAgentV2Tool
 export const cursorDeleteAgentV2Tool = deleteAgentV2Tool
+export const cursorDownloadArtifactV2Tool = downloadArtifactV2Tool
+export const cursorListArtifactsV2Tool = listArtifactsV2Tool
diff --git a/apps/sim/tools/cursor/list_agents.ts b/apps/sim/tools/cursor/list_agents.ts
index 9c52b754afa..6caa4686f92 100644
--- a/apps/sim/tools/cursor/list_agents.ts
+++ b/apps/sim/tools/cursor/list_agents.ts
@@ -21,12 +21,19 @@ const listAgentsBase = {
       visibility: 'user-or-llm',
       description: 'Pagination cursor from previous response',
     },
+    prUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter agents by pull request URL',
+    },
   },
   request: {
     url: (params: ListAgentsParams) => {
       const url = new URL('https://api.cursor.com/v0/agents')
       if (params.limit) url.searchParams.set('limit', String(params.limit))
       if (params.cursor) url.searchParams.set('cursor', params.cursor)
+      if (params.prUrl) url.searchParams.set('prUrl', params.prUrl)
       return url.toString()
     },
     method: 'GET',
@@ -53,7 +60,7 @@ export const listAgentsTool: ToolConfig<ListAgentsParams, ListAgentsResponse> =
         content: `Found ${data.agents.length} agents`,
         metadata: {
           agents: data.agents,
-          nextCursor: data.nextCursor,
+          nextCursor: data.nextCursor ?? null,
         },
       },
     }
diff --git a/apps/sim/tools/cursor/list_artifacts.ts b/apps/sim/tools/cursor/list_artifacts.ts
new file mode 100644
index 00000000000..99580f7d6a7
--- /dev/null
+++ b/apps/sim/tools/cursor/list_artifacts.ts
@@ -0,0 +1,113 @@
+import type { ListArtifactsParams, ListArtifactsResponse } from '@/tools/cursor/types'
+import type { ToolConfig } from '@/tools/types'
+
+const listArtifactsBase = {
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Cursor API key',
+    },
+    agentId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
+    },
+  },
+  request: {
+    url: (params: ListArtifactsParams) =>
+      `https://api.cursor.com/v0/agents/${params.agentId.trim()}/artifacts`,
+    method: 'GET',
+    headers: (params: ListArtifactsParams) => ({
+      Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
+    }),
+  },
+} satisfies Pick<ToolConfig<ListArtifactsParams, any>, 'params' | 'request'>
+
+export const listArtifactsTool: ToolConfig<ListArtifactsParams, ListArtifactsResponse> = {
+  id: 'cursor_list_artifacts',
+  name: 'Cursor List Artifacts',
+  description: 'List generated artifact files for a cloud agent.',
+  version: '1.0.0',
+
+  ...listArtifactsBase,
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    const artifacts = data.artifacts ?? []
+
+    return {
+      success: true,
+      output: {
+        content: `Found ${artifacts.length} artifact(s)`,
+        metadata: {
+          artifacts,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable artifact count' },
+    metadata: {
+      type: 'object',
+      description: 'Artifacts metadata',
+      properties: {
+        artifacts: {
+          type: 'array',
+          description: 'List of artifacts',
+          items: {
+            type: 'object',
+            properties: {
+              path: { type: 'string', description: 'Artifact file path' },
+              size: { type: 'number', description: 'File size in bytes', optional: true },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+interface ListArtifactsV2Response {
+  success: boolean
+  output: {
+    artifacts: Array<{ path: string; size?: number }>
+  }
+}
+
+export const listArtifactsV2Tool: ToolConfig<ListArtifactsParams, ListArtifactsV2Response> = {
+  ...listArtifactsBase,
+  id: 'cursor_list_artifacts_v2',
+  name: 'Cursor List Artifacts',
+  description: 'List generated artifact files for a cloud agent. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    const artifacts = data.artifacts ?? []
+
+    return {
+      success: true,
+      output: {
+        artifacts: Array.isArray(artifacts) ? artifacts : [],
+      },
+    }
+  },
+
+  outputs: {
+    artifacts: {
+      type: 'array',
+      description: 'List of artifact files',
+      items: {
+        type: 'object',
+        properties: {
+          path: { type: 'string', description: 'Artifact file path' },
+          size: { type: 'number', description: 'File size in bytes', optional: true },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/cursor/stop_agent.ts b/apps/sim/tools/cursor/stop_agent.ts
index 728ca9af608..04373c16644 100644
--- a/apps/sim/tools/cursor/stop_agent.ts
+++ b/apps/sim/tools/cursor/stop_agent.ts
@@ -17,7 +17,8 @@ const stopAgentBase = {
     },
   },
   request: {
-    url: (params: StopAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId}/stop`,
+    url: (params: StopAgentParams) =>
+      `https://api.cursor.com/v0/agents/${params.agentId.trim()}/stop`,
     method: 'POST',
     headers: (params: StopAgentParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
diff --git a/apps/sim/tools/cursor/types.ts b/apps/sim/tools/cursor/types.ts
index 4ec843ce280..3cce5f362ca 100644
--- a/apps/sim/tools/cursor/types.ts
+++ b/apps/sim/tools/cursor/types.ts
@@ -7,6 +7,7 @@ export interface BaseCursorParams {
 export interface ListAgentsParams extends BaseCursorParams {
   limit?: number
   cursor?: string
+  prUrl?: string
 }
 
 export interface GetAgentParams extends BaseCursorParams {
@@ -60,7 +61,7 @@ interface AgentTarget {
 interface AgentMetadata {
   id: string
   name: string
-  status: 'RUNNING' | 'FINISHED' | 'STOPPED' | 'FAILED'
+  status: 'CREATING' | 'RUNNING' | 'FINISHED' | 'STOPPED' | 'FAILED'
   source: AgentSource
   target: AgentTarget
   summary?: string
@@ -174,6 +175,47 @@ export interface ListRepositoriesResponse extends ToolResponse {
   }
 }
 
+export interface ListArtifactsParams extends BaseCursorParams {
+  agentId: string
+}
+
+export interface ArtifactMetadata {
+  path: string
+  size?: number
+}
+
+export interface ListArtifactsResponse extends ToolResponse {
+  output: {
+    content: string
+    metadata: {
+      artifacts: ArtifactMetadata[]
+    }
+  }
+}
+
+export interface DownloadArtifactParams extends BaseCursorParams {
+  agentId: string
+  path: string
+}
+
+export interface DownloadArtifactResponse extends ToolResponse {
+  output: {
+    content: string
+    metadata: Record<string, unknown>
+  }
+}
+
+export interface DownloadArtifactV2Response extends ToolResponse {
+  output: {
+    file: {
+      name: string
+      mimeType: string
+      data: string
+      size: number
+    }
+  }
+}
+
 export type CursorResponse =
   | ListAgentsResponse
   | GetAgentResponse
@@ -185,3 +227,6 @@ export type CursorResponse =
   | GetApiKeyInfoResponse
   | ListModelsResponse
   | ListRepositoriesResponse
+  | ListArtifactsResponse
+  | DownloadArtifactResponse
+  | DownloadArtifactV2Response
diff --git a/apps/sim/tools/http/webhook_request.ts b/apps/sim/tools/http/webhook_request.ts
index a0838855961..f57b8db15e2 100644
--- a/apps/sim/tools/http/webhook_request.ts
+++ b/apps/sim/tools/http/webhook_request.ts
@@ -1,5 +1,5 @@
 import { createHmac } from 'crypto'
-import { v4 as uuidv4 } from 'uuid'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { RequestResponse, WebhookRequestParams } from '@/tools/http/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -48,7 +48,7 @@ export const webhookRequestTool: ToolConfig<WebhookRequestParams, RequestRespons
 
     headers: (params: WebhookRequestParams) => {
       const timestamp = Date.now()
-      const deliveryId = uuidv4()
+      const deliveryId = generateId()
 
       const webhookHeaders: Record<string, string> = {
         'Content-Type': 'application/json',
diff --git a/apps/sim/tools/langsmith/utils.ts b/apps/sim/tools/langsmith/utils.ts
index cbe3ae8872c..07daa0d4efe 100644
--- a/apps/sim/tools/langsmith/utils.ts
+++ b/apps/sim/tools/langsmith/utils.ts
@@ -1,3 +1,4 @@
+import { generateId } from '@/lib/core/utils/uuid'
 import type { LangsmithRunPayload } from '@/tools/langsmith/types'
 
 interface NormalizedRunPayload {
@@ -20,7 +21,7 @@ const toCompactTimestamp = (startTime?: string): string => {
 }
 
 export const normalizeLangsmithRunPayload = (run: LangsmithRunPayload): NormalizedRunPayload => {
-  const runId = run.id ?? crypto.randomUUID()
+  const runId = run.id ?? generateId()
   const traceId = run.trace_id ?? runId
   const startTime = run.start_time ?? new Date().toISOString()
   const dottedOrder = run.dotted_order ?? `${toCompactTimestamp(startTime)}Z${runId}`
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index d5065039edd..b39ab298a63 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -346,6 +346,8 @@ import {
   cursorAddFollowupV2Tool,
   cursorDeleteAgentTool,
   cursorDeleteAgentV2Tool,
+  cursorDownloadArtifactTool,
+  cursorDownloadArtifactV2Tool,
   cursorGetAgentTool,
   cursorGetAgentV2Tool,
   cursorGetConversationTool,
@@ -354,6 +356,8 @@ import {
   cursorLaunchAgentV2Tool,
   cursorListAgentsTool,
   cursorListAgentsV2Tool,
+  cursorListArtifactsTool,
+  cursorListArtifactsV2Tool,
   cursorStopAgentTool,
   cursorStopAgentV2Tool,
 } from '@/tools/cursor'
@@ -4123,6 +4127,10 @@ export const tools: Record<string, ToolConfig> = {
   cursor_stop_agent_v2: cursorStopAgentV2Tool,
   cursor_delete_agent: cursorDeleteAgentTool,
   cursor_delete_agent_v2: cursorDeleteAgentV2Tool,
+  cursor_download_artifact: cursorDownloadArtifactTool,
+  cursor_download_artifact_v2: cursorDownloadArtifactV2Tool,
+  cursor_list_artifacts: cursorListArtifactsTool,
+  cursor_list_artifacts_v2: cursorListArtifactsV2Tool,
   trello_list_lists: trelloListListsTool,
   trello_list_cards: trelloListCardsTool,
   trello_create_card: trelloCreateCardTool,
diff --git a/apps/sim/triggers/generic/webhook.ts b/apps/sim/triggers/generic/webhook.ts
index d9e0e2ea5fd..8c918cfaa81 100644
--- a/apps/sim/triggers/generic/webhook.ts
+++ b/apps/sim/triggers/generic/webhook.ts
@@ -1,4 +1,5 @@
 import { WebhookIcon } from '@/components/icons'
+import { generateId } from '@/lib/core/utils/uuid'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const genericWebhookTrigger: TriggerConfig = {
@@ -36,7 +37,7 @@ export const genericWebhookTrigger: TriggerConfig = {
       description: 'Token used to authenticate webhook requests via Bearer token or custom header',
       password: true,
       required: false,
-      value: () => crypto.randomUUID(),
+      value: () => generateId(),
       mode: 'trigger',
     },
     {
diff --git a/bun.lock b/bun.lock
index 2813130991f..44ba1a838c9 100644
--- a/bun.lock
+++ b/bun.lock
@@ -164,7 +164,6 @@
         "micromatch": "4.0.8",
         "mongodb": "6.19.0",
         "mysql2": "3.14.3",
-        "nanoid": "^3.3.7",
         "neo4j-driver": "6.0.1",
         "next": "16.1.6",
         "next-mdx-remote": "^5.0.0",
@@ -300,9 +299,6 @@
     "packages/testing": {
       "name": "@sim/testing",
       "version": "0.1.0",
-      "dependencies": {
-        "nanoid": "5.1.6",
-      },
       "devDependencies": {
         "@sim/tsconfig": "workspace:*",
         "typescript": "^5.7.3",
@@ -2935,7 +2931,7 @@
 
     "nano-spawn": ["nano-spawn@1.0.3", "", {}, "sha512-jtpsQDetTnvS2Ts1fiRdci5rx0VYws5jGyC+4IYOTnIQ/wwdf6JdomlHBwqC3bJYOvaKu0C2GSZ1A60anrYpaA=="],
 
-    "nanoid": ["nanoid@5.1.6", "", { "bin": { "nanoid": "bin/nanoid.js" } }, "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg=="],
+    "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
 
     "nanostores": ["nanostores@1.2.0", "", {}, "sha512-F0wCzbsH80G7XXo0Jd9/AVQC7ouWY6idUCTnMwW5t/Rv9W8qmO6endavDwg7TNp5GbugwSukFMVZqzPSrSMndg=="],
 
@@ -4451,8 +4447,6 @@
 
     "playwright/fsevents": ["fsevents@2.3.2", "", { "os": "darwin" }, "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="],
 
-    "postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
-
     "postcss-nested/postcss-selector-parser": ["postcss-selector-parser@6.1.2", "", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="],
 
     "posthog-js/@opentelemetry/api-logs": ["@opentelemetry/api-logs@0.208.0", "", { "dependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg=="],
@@ -4505,8 +4499,6 @@
 
     "sim/lucide-react": ["lucide-react@0.479.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-aBhNnveRhorBOK7uA4gDjgaf+YlHMdMhQ/3cupk6exM10hWlEU+2QtWYOfhXhjAsmdb6LeKR+NZnow4UxRRiTQ=="],
 
-    "sim/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
-
     "sim/tailwind-merge": ["tailwind-merge@2.6.1", "", {}, "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ=="],
 
     "sim/tailwindcss": ["tailwindcss@3.4.19", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.6.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.3.2", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.21.7", "lilconfig": "^3.1.3", "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.1.1", "postcss": "^8.4.47", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0", "postcss-nested": "^6.2.0", "postcss-selector-parser": "^6.1.2", "resolve": "^1.22.8", "sucrase": "^3.35.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ=="],
@@ -4921,8 +4913,6 @@
 
     "log-update/wrap-ansi/string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="],
 
-    "next/postcss/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
-
     "next/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="],
 
     "next/sharp/@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.4" }, "os": "darwin", "cpu": "x64" }, "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw=="],
diff --git a/packages/testing/package.json b/packages/testing/package.json
index 86a77d81795..e309809577a 100644
--- a/packages/testing/package.json
+++ b/packages/testing/package.json
@@ -56,7 +56,5 @@
     "typescript": "^5.7.3",
     "vitest": "^3.0.8"
   },
-  "dependencies": {
-    "nanoid": "5.1.6"
-  }
+  "dependencies": {}
 }
diff --git a/packages/testing/src/factories/id.ts b/packages/testing/src/factories/id.ts
new file mode 100644
index 00000000000..858963f6058
--- /dev/null
+++ b/packages/testing/src/factories/id.ts
@@ -0,0 +1,18 @@
+const URL_SAFE_ALPHABET = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+/**
+ * Generates a short, URL-safe random ID for test fixtures.
+ *
+ * Uses `crypto.getRandomValues()` instead of `crypto.randomUUID()` for
+ * consistency with the app-level `generateShortId` utility.
+ */
+export function shortId(size = 8): string {
+  const bytes = new Uint8Array(size)
+  crypto.getRandomValues(bytes)
+
+  let id = ''
+  for (let i = 0; i < size; i++) {
+    id += URL_SAFE_ALPHABET[bytes[i] & 63]
+  }
+  return id
+}
diff --git a/packages/testing/src/factories/permission.factory.ts b/packages/testing/src/factories/permission.factory.ts
index fe8b9264117..78de7f85f8a 100644
--- a/packages/testing/src/factories/permission.factory.ts
+++ b/packages/testing/src/factories/permission.factory.ts
@@ -1,4 +1,4 @@
-import { nanoid } from 'nanoid'
+import { shortId } from './id'
 
 /**
  * Permission types in order of access level (highest to lowest).
@@ -39,10 +39,10 @@ export interface PermissionFactoryOptions {
  */
 export function createPermission(options: PermissionFactoryOptions = {}): Permission {
   return {
-    id: options.id ?? nanoid(8),
-    userId: options.userId ?? `user-${nanoid(6)}`,
+    id: options.id ?? shortId(8),
+    userId: options.userId ?? `user-${shortId(6)}`,
     entityType: options.entityType ?? 'workspace',
-    entityId: options.entityId ?? `ws-${nanoid(6)}`,
+    entityId: options.entityId ?? `ws-${shortId(6)}`,
     permissionType: options.permissionType ?? 'read',
     createdAt: options.createdAt ?? new Date(),
   }
@@ -127,8 +127,8 @@ export interface WorkspaceRecordFactoryOptions {
 export function createWorkspaceRecord(
   options: WorkspaceRecordFactoryOptions = {}
 ): WorkspaceRecord {
-  const id = options.id ?? `ws-${nanoid(6)}`
-  const ownerId = options.ownerId ?? `user-${nanoid(6)}`
+  const id = options.id ?? `ws-${shortId(6)}`
+  const ownerId = options.ownerId ?? `user-${shortId(6)}`
   return {
     id,
     name: options.name ?? `Workspace ${id}`,
@@ -170,11 +170,11 @@ export interface WorkflowRecordFactoryOptions {
  * Creates a mock workflow database record.
  */
 export function createWorkflowRecord(options: WorkflowRecordFactoryOptions = {}): WorkflowRecord {
-  const id = options.id ?? `wf-${nanoid(6)}`
+  const id = options.id ?? `wf-${shortId(6)}`
   return {
     id,
     name: options.name ?? `Workflow ${id}`,
-    userId: options.userId ?? `user-${nanoid(6)}`,
+    userId: options.userId ?? `user-${shortId(6)}`,
     workspaceId: options.workspaceId ?? null,
     state: options.state ?? '{}',
     isDeployed: options.isDeployed ?? false,
@@ -209,7 +209,7 @@ export interface SessionFactoryOptions {
  * Creates a mock session object.
  */
 export function createSession(options: SessionFactoryOptions = {}): MockSession {
-  const userId = options.userId ?? `user-${nanoid(6)}`
+  const userId = options.userId ?? `user-${shortId(6)}`
   return {
     user: {
       id: userId,
@@ -327,7 +327,7 @@ export interface ApiKeyTestData {
  * Creates test API key data.
  */
 export function createLegacyApiKey(): { key: string; prefix: string } {
-  const random = nanoid(24)
+  const random = shortId(24)
   return {
     key: `sim_${random}`,
     prefix: 'sim_',
@@ -338,7 +338,7 @@ export function createLegacyApiKey(): { key: string; prefix: string } {
  * Creates test encrypted format API key data.
  */
 export function createEncryptedApiKey(): { key: string; prefix: string } {
-  const random = nanoid(24)
+  const random = shortId(24)
   return {
     key: `sk-sim-${random}`,
     prefix: 'sk-sim-',
diff --git a/packages/testing/src/factories/undo-redo.factory.ts b/packages/testing/src/factories/undo-redo.factory.ts
index 86c26ef9279..e9b4db1fc39 100644
--- a/packages/testing/src/factories/undo-redo.factory.ts
+++ b/packages/testing/src/factories/undo-redo.factory.ts
@@ -1,4 +1,4 @@
-import { nanoid } from 'nanoid'
+import { shortId } from './id'
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -137,7 +137,12 @@ interface OperationEntryOptions {
  * Creates a mock batch-add-blocks operation entry.
  */
 export function createAddBlockEntry(blockId: string, options: OperationEntryOptions = {}): any {
-  const { id = nanoid(8), workflowId = 'wf-1', userId = 'user-1', createdAt = Date.now() } = options
+  const {
+    id = shortId(8),
+    workflowId = 'wf-1',
+    userId = 'user-1',
+    createdAt = Date.now(),
+  } = options
   const timestamp = Date.now()
 
   const mockBlockSnapshot = {
@@ -151,7 +156,7 @@ export function createAddBlockEntry(blockId: string, options: OperationEntryOpti
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-add-blocks',
       timestamp,
       workflowId,
@@ -163,7 +168,7 @@ export function createAddBlockEntry(blockId: string, options: OperationEntryOpti
       },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-remove-blocks',
       timestamp,
       workflowId,
@@ -185,7 +190,12 @@ export function createRemoveBlockEntry(
   blockSnapshot: any = null,
   options: OperationEntryOptions = {}
 ): any {
-  const { id = nanoid(8), workflowId = 'wf-1', userId = 'user-1', createdAt = Date.now() } = options
+  const {
+    id = shortId(8),
+    workflowId = 'wf-1',
+    userId = 'user-1',
+    createdAt = Date.now(),
+  } = options
   const timestamp = Date.now()
 
   const snapshotToUse = blockSnapshot || {
@@ -199,7 +209,7 @@ export function createRemoveBlockEntry(
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-remove-blocks',
       timestamp,
       workflowId,
@@ -211,7 +221,7 @@ export function createRemoveBlockEntry(
       },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-add-blocks',
       timestamp,
       workflowId,
@@ -233,7 +243,12 @@ export function createAddEdgeEntry(
   edgeSnapshot: any = null,
   options: OperationEntryOptions = {}
 ): any {
-  const { id = nanoid(8), workflowId = 'wf-1', userId = 'user-1', createdAt = Date.now() } = options
+  const {
+    id = shortId(8),
+    workflowId = 'wf-1',
+    userId = 'user-1',
+    createdAt = Date.now(),
+  } = options
   const timestamp = Date.now()
 
   const snapshot = edgeSnapshot || { id: edgeId, source: 'block-1', target: 'block-2' }
@@ -242,7 +257,7 @@ export function createAddEdgeEntry(
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-add-edges',
       timestamp,
       workflowId,
@@ -250,7 +265,7 @@ export function createAddEdgeEntry(
       data: { edgeSnapshots: [snapshot] },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-remove-edges',
       timestamp,
       workflowId,
@@ -267,14 +282,19 @@ export function createBatchRemoveEdgesEntry(
   edgeSnapshots: any[],
   options: OperationEntryOptions = {}
 ): any {
-  const { id = nanoid(8), workflowId = 'wf-1', userId = 'user-1', createdAt = Date.now() } = options
+  const {
+    id = shortId(8),
+    workflowId = 'wf-1',
+    userId = 'user-1',
+    createdAt = Date.now(),
+  } = options
   const timestamp = Date.now()
 
   return {
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-remove-edges',
       timestamp,
       workflowId,
@@ -282,7 +302,7 @@ export function createBatchRemoveEdgesEntry(
       data: { edgeSnapshots },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-add-edges',
       timestamp,
       workflowId,
@@ -302,7 +322,7 @@ interface MoveBlockOptions extends OperationEntryOptions {
  */
 export function createMoveBlockEntry(blockId: string, options: MoveBlockOptions = {}): any {
   const {
-    id = nanoid(8),
+    id = shortId(8),
     workflowId = 'wf-1',
     userId = 'user-1',
     createdAt = Date.now(),
@@ -315,7 +335,7 @@ export function createMoveBlockEntry(blockId: string, options: MoveBlockOptions
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-move-blocks',
       timestamp,
       workflowId,
@@ -323,7 +343,7 @@ export function createMoveBlockEntry(blockId: string, options: MoveBlockOptions
       data: { moves: [{ blockId, before, after }] },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-move-blocks',
       timestamp,
       workflowId,
@@ -346,7 +366,7 @@ export function createUpdateParentEntry(
   } = {}
 ): any {
   const {
-    id = nanoid(8),
+    id = shortId(8),
     workflowId = 'wf-1',
     userId = 'user-1',
     createdAt = Date.now(),
@@ -361,7 +381,7 @@ export function createUpdateParentEntry(
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'update-parent',
       timestamp,
       workflowId,
@@ -369,7 +389,7 @@ export function createUpdateParentEntry(
       data: { blockId, oldParentId, newParentId, oldPosition, newPosition },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'update-parent',
       timestamp,
       workflowId,
@@ -401,7 +421,7 @@ interface BatchUpdateParentOptions extends OperationEntryOptions {
  */
 export function createBatchUpdateParentEntry(options: BatchUpdateParentOptions = {}): any {
   const {
-    id = nanoid(8),
+    id = shortId(8),
     workflowId = 'wf-1',
     userId = 'user-1',
     createdAt = Date.now(),
@@ -430,7 +450,7 @@ export function createBatchUpdateParentEntry(options: BatchUpdateParentOptions =
     id,
     createdAt,
     operation: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-update-parent',
       timestamp,
       workflowId,
@@ -438,7 +458,7 @@ export function createBatchUpdateParentEntry(options: BatchUpdateParentOptions =
       data: { updates: processedUpdates },
     },
     inverse: {
-      id: nanoid(8),
+      id: shortId(8),
       type: 'batch-update-parent',
       timestamp,
       workflowId,
diff --git a/packages/testing/src/index.ts b/packages/testing/src/index.ts
index ce84686a152..9c9382fb0ba 100644
--- a/packages/testing/src/index.ts
+++ b/packages/testing/src/index.ts
@@ -73,11 +73,9 @@ export {
   mockAuth,
   mockCommonSchemas,
   mockConsoleLogger,
-  mockCryptoUuid,
   mockDrizzleOrm,
   mockHybridAuth,
   mockKnowledgeSchemas,
-  mockUuid,
   requestUtilsMock,
   setupCommonApiMocks,
   setupGlobalFetchMock,
diff --git a/packages/testing/src/mocks/index.ts b/packages/testing/src/mocks/index.ts
index 69a2e5984d5..67fa5349903 100644
--- a/packages/testing/src/mocks/index.ts
+++ b/packages/testing/src/mocks/index.ts
@@ -82,5 +82,3 @@ export {
 export { clearStorageMocks, createMockStorage, setupGlobalStorageMocks } from './storage.mock'
 // Telemetry mocks
 export { telemetryMock } from './telemetry.mock'
-// UUID mocks
-export { mockCryptoUuid, mockUuid } from './uuid.mock'
diff --git a/packages/testing/src/mocks/uuid.mock.ts b/packages/testing/src/mocks/uuid.mock.ts
index f278e76b64e..d8294a4d1d5 100644
--- a/packages/testing/src/mocks/uuid.mock.ts
+++ b/packages/testing/src/mocks/uuid.mock.ts
@@ -1,40 +1,6 @@
 /**
- * Mock UUID utilities for testing
- */
-import { vi } from 'vitest'
-
-/**
- * Mock UUID v4 generation for consistent test results.
- * Uses vi.doMock to mock the uuid module.
- *
- * @param mockValue - The UUID value to return (defaults to 'test-uuid')
- *
- * @example
- * ```ts
- * mockUuid('my-test-uuid')
- * // Now uuid.v4() will return 'my-test-uuid'
- * ```
- */
-export function mockUuid(mockValue = 'test-uuid') {
-  vi.doMock('uuid', () => ({
-    v4: vi.fn().mockReturnValue(mockValue),
-  }))
-}
-
-/**
- * Mock crypto.randomUUID for tests.
- * Uses vi.stubGlobal to replace the global crypto object.
- *
- * @param mockValue - The UUID value to return (defaults to 'mock-uuid-1234-5678')
+ * UUID mock utilities — intentionally empty.
  *
- * @example
- * ```ts
- * mockCryptoUuid('custom-uuid')
- * // Now crypto.randomUUID() will return 'custom-uuid'
- * ```
+ * All test files should mock `@/lib/core/utils/uuid` directly using
+ * `vi.hoisted()` + `vi.mock()` per project testing rules.
  */
-export function mockCryptoUuid(mockValue = 'mock-uuid-1234-5678') {
-  vi.stubGlobal('crypto', {
-    randomUUID: vi.fn().mockReturnValue(mockValue),
-  })
-}