v0.5.72: azure connection string, supabase improvement, multitrigger resolution, docs quick reference

v0.5.71: ux, ci improvements, docs updates
v0.5.70: router fix, anthropic agent response format adherence
2026-01-27 15:58:11 -05:00 · 2026-01-25 23:42:27 -08:00 · 2026-01-25 03:08:08 -08:00 · 2026-01-24 20:57:02 -08:00 · 2026-01-24 14:29:53 -08:00 · 2026-01-22 13:48:15 -08:00
105 changed files with 2061 additions and 4635 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,9 +10,6 @@ concurrency:
  group: ci-${{ github.ref }}
  cancel-in-progress: false

-permissions:
-  contents: read
-
 jobs:
  test-build:
    name: Test and Build
@@ -281,30 +278,3 @@ jobs:
    if: needs.check-docs-changes.outputs.docs_changed == 'true'
    uses: ./.github/workflows/docs-embeddings.yml
    secrets: inherit
-
-  # Create GitHub Release (only for version commits on main, after all builds complete)
-  create-release:
-    name: Create GitHub Release
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    needs: [create-ghcr-manifests, detect-version]
-    if: needs.detect-version.outputs.is_release == 'true'
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-
-      - name: Install dependencies
-        run: bun install --frozen-lockfile
-
-      - name: Create release
-        env:
-          GH_PAT: ${{ secrets.GITHUB_TOKEN }}
-        run: bun run scripts/create-single-release.ts ${{ needs.detect-version.outputs.version }}
--- a/.github/workflows/docs-embeddings.yml
+++ b/.github/workflows/docs-embeddings.yml
@@ -4,9 +4,6 @@ on:
  workflow_call:
  workflow_dispatch: # Allow manual triggering

-permissions:
-  contents: read
-
 jobs:
  process-docs-embeddings:
    name: Process Documentation Embeddings
--- a/.github/workflows/migrations.yml
+++ b/.github/workflows/migrations.yml
@@ -4,9 +4,6 @@ on:
  workflow_call:
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  migrate:
    name: Apply Database Migrations
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -6,9 +6,6 @@ on:
    paths:
      - 'packages/cli/**'

-permissions:
-  contents: read
-
 jobs:
  publish-npm:
    runs-on: blacksmith-4vcpu-ubuntu-2404
--- a/.github/workflows/publish-python-sdk.yml
+++ b/.github/workflows/publish-python-sdk.yml
@@ -6,9 +6,6 @@ on:
    paths:
      - 'packages/python-sdk/**'

-permissions:
-  contents: write
-
 jobs:
  publish-pypi:
    runs-on: blacksmith-4vcpu-ubuntu-2404
--- a/.github/workflows/publish-ts-sdk.yml
+++ b/.github/workflows/publish-ts-sdk.yml
@@ -6,9 +6,6 @@ on:
    paths:
      - 'packages/ts-sdk/**'

-permissions:
-  contents: write
-
 jobs:
  publish-npm:
    runs-on: blacksmith-4vcpu-ubuntu-2404
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -4,9 +4,6 @@ on:
  workflow_call:
  workflow_dispatch:

-permissions:
-  contents: read
-
 jobs:
  test-build:
    name: Test and Build
--- a/apps/docs/app/[lang]/[[...slug]]/page.tsx
+++ b/apps/docs/app/[lang]/[[...slug]]/page.tsx
@@ -185,6 +185,11 @@ export default async function Page(props: { params: Promise<{ slug?: string[]; l
        tableOfContent={{
          style: 'clerk',
          enabled: true,
+          header: (
+            <div key='toc-header' className='mb-2 font-medium text-sm'>
+              On this page
+            </div>
+          ),
          footer: <TOCFooter />,
          single: false,
        }}
--- a/apps/docs/app/[lang]/layout.tsx
+++ b/apps/docs/app/[lang]/layout.tsx
@@ -3,13 +3,13 @@ import { defineI18nUI } from 'fumadocs-ui/i18n'
 import { DocsLayout } from 'fumadocs-ui/layouts/docs'
 import { RootProvider } from 'fumadocs-ui/provider/next'
 import { Geist_Mono, Inter } from 'next/font/google'
+import Image from 'next/image'
 import {
  SidebarFolder,
  SidebarItem,
  SidebarSeparator,
 } from '@/components/docs-layout/sidebar-components'
 import { Navbar } from '@/components/navbar/navbar'
-import { SimLogoFull } from '@/components/ui/sim-logo'
 import { i18n } from '@/lib/i18n'
 import { source } from '@/lib/source'
 import '../global.css'
@@ -102,7 +102,16 @@ export default async function Layout({ children, params }: LayoutProps) {
          <DocsLayout
            tree={source.pageTree[lang]}
            nav={{
-              title: <SimLogoFull className='h-7 w-auto' />,
+              title: (
+                <Image
+                  src='/static/logo.png'
+                  alt='Sim'
+                  width={72}
+                  height={28}
+                  className='h-7 w-auto'
+                  priority
+                />
+              ),
            }}
            sidebar={{
              defaultOpenLevel: 0,
--- a/apps/docs/app/api/og/route.tsx
+++ b/apps/docs/app/api/og/route.tsx
@@ -33,41 +33,15 @@ async function loadGoogleFont(font: string, weights: string, text: string): Prom
  throw new Error('Failed to load font data')
 }

-/**
- * Sim logo with icon and "Sim" text for OG image.
- */
-function SimLogoFull() {
-  return (
-    <svg height='28' viewBox='720 440 1020 320' fill='none'>
-      {/* Green icon - top left shape with cutout */}
-      <path
-        fillRule='evenodd'
-        clipRule='evenodd'
-        d='M875.791 577.171C875.791 581.922 873.911 586.483 870.576 589.842L870.098 590.323C866.764 593.692 862.234 595.575 857.517 595.575H750.806C740.978 595.575 733 603.6 733 613.498V728.902C733 738.799 740.978 746.826 750.806 746.826H865.382C875.209 746.826 883.177 738.799 883.177 728.902V620.853C883.177 616.448 884.912 612.222 888.008 609.104C891.093 605.997 895.29 604.249 899.664 604.249H1008.16C1017.99 604.249 1025.96 596.224 1025.96 586.327V470.923C1025.96 461.025 1017.99 453 1008.16 453H893.586C883.759 453 875.791 461.025 875.791 470.923V577.171ZM910.562 477.566H991.178C996.922 477.566 1001.57 482.254 1001.57 488.029V569.22C1001.57 574.995 996.922 579.683 991.178 579.683H910.562C904.828 579.683 900.173 574.995 900.173 569.22V488.029C900.173 482.254 904.828 477.566 910.562 477.566Z'
-        fill='#33C482'
-      />
-      {/* Green icon - bottom right square */}
-      <path
-        d='M1008.3 624.59H923.113C912.786 624.59 904.414 633.022 904.414 643.423V728.171C904.414 738.572 912.786 747.004 923.113 747.004H1008.3C1018.63 747.004 1027 738.572 1027 728.171V643.423C1027 633.022 1018.63 624.59 1008.3 624.59Z'
-        fill='#33C482'
-      />
-      {/* "Sim" text - white for dark background */}
-      <path
-        d='M1210.54 515.657C1226.65 515.657 1240.59 518.51 1252.31 524.257H1252.31C1264.3 529.995 1273.63 538.014 1280.26 548.319H1280.26C1287.19 558.635 1290.78 570.899 1291.08 585.068L1291.1 586.089H1249.11L1249.09 585.115C1248.8 574.003 1245.18 565.493 1238.32 559.451C1231.45 553.399 1221.79 550.308 1209.21 550.308C1196.3 550.308 1186.48 553.113 1179.61 558.588C1172.76 564.046 1169.33 571.499 1169.33 581.063C1169.33 588.092 1171.88 593.978 1177.01 598.783C1182.17 603.618 1189.99 607.399 1200.56 610.061H1200.56L1238.77 619.451C1257.24 623.65 1271.21 630.571 1280.57 640.293L1281.01 640.739C1290.13 650.171 1294.64 662.97 1294.64 679.016C1294.64 692.923 1290.88 705.205 1283.34 715.822L1283.33 715.834C1275.81 726.134 1265.44 734.14 1252.26 739.866L1252.25 739.871C1239.36 745.302 1224.12 748 1206.54 748C1180.9 748 1160.36 741.696 1145.02 728.984C1129.67 716.258 1122 699.269 1122 678.121V677.121H1163.99V678.121C1163.99 688.869 1167.87 697.367 1175.61 703.722L1176.34 704.284C1184.04 709.997 1194.37 712.902 1207.43 712.902C1222.13 712.902 1233.3 710.087 1241.07 704.588C1248.8 698.812 1252.64 691.21 1252.64 681.699C1252.64 674.769 1250.5 669.057 1246.25 664.49L1246.23 664.478L1246.22 664.464C1242.28 659.929 1234.83 656.119 1223.64 653.152L1185.43 644.208L1185.42 644.204C1166.05 639.407 1151.49 632.035 1141.83 622.012L1141.83 622.006L1141.82 622C1132.43 611.94 1127.78 598.707 1127.78 582.405C1127.78 568.81 1131.23 556.976 1138.17 546.949L1138.18 546.941L1138.19 546.933C1145.41 536.936 1155.18 529.225 1167.48 523.793L1167.48 523.79C1180.07 518.36 1194.43 515.657 1210.54 515.657ZM1323.39 521.979C1331.68 525.008 1337.55 526.482 1343.51 526.482C1349.48 526.482 1355.64 525.005 1364.49 521.973L1365.82 521.52V742.633H1322.05V521.489L1323.39 521.979ZM1642.01 515.657C1667.11 515.657 1686.94 523.031 1701.39 537.876C1715.83 552.716 1723 572.968 1723 598.507V742.633H1680.12V608.794C1680.12 591.666 1675.72 578.681 1667.07 569.681L1667.06 569.669L1667.04 569.656C1658.67 560.359 1647.26 555.675 1632.68 555.675C1622.47 555.675 1613.47 558.022 1605.64 562.69L1605.63 562.696C1598.11 567.064 1592.17 573.475 1587.8 581.968C1583.44 590.448 1581.25 600.424 1581.25 611.925V742.633H1537.92V608.347C1537.92 591.208 1533.67 578.376 1525.31 569.68L1525.31 569.674L1525.3 569.668C1516.93 560.664 1505.52 556.122 1490.93 556.122C1480.72 556.122 1471.72 558.469 1463.89 563.138L1463.88 563.144C1456.36 567.511 1450.41 573.922 1446.05 582.415L1446.05 582.422L1446.04 582.428C1441.69 590.602 1439.5 600.423 1439.5 611.925V742.633H1395.72V521.919H1435.05V554.803C1439.92 544.379 1447.91 535.465 1458.37 528.356C1470.71 519.875 1485.58 515.657 1502.93 515.657C1522.37 515.657 1538.61 520.931 1551.55 531.538C1560.38 538.771 1567.1 547.628 1571.72 558.091C1576.05 547.619 1582.83 538.757 1592.07 531.524C1605.61 520.93 1622.28 515.657 1642.01 515.657ZM1343.49 452C1351.45 452 1358.23 454.786 1363.75 460.346C1369.27 465.905 1372.04 472.721 1372.04 480.73C1372.04 488.452 1369.27 495.254 1363.77 501.096L1363.76 501.105L1363.75 501.115C1358.23 506.675 1351.45 509.461 1343.49 509.461C1335.81 509.461 1329.05 506.669 1323.25 501.134L1323.23 501.115L1323.21 501.096C1317.71 495.254 1314.94 488.452 1314.94 480.73C1314.94 472.721 1317.7 465.905 1323.23 460.346L1323.24 460.337L1323.25 460.327C1329.05 454.792 1335.81 452 1343.49 452Z'
-        fill='#fafafa'
-      />
-    </svg>
-  )
-}
-
 /**
 * Generates dynamic Open Graph images for documentation pages.
- * Style matches Cursor docs: dark background, title at top, logo bottom-left, domain bottom-right.
 */
 export async function GET(request: NextRequest) {
  const { searchParams } = new URL(request.url)
  const title = searchParams.get('title') || 'Documentation'

+  const baseUrl = new URL(request.url).origin
+
  const allText = `${title}docs.sim.ai`
  const fontData = await loadGoogleFont('Geist', '400;500;600', allText)

@@ -78,39 +52,84 @@ export async function GET(request: NextRequest) {
        width: '100%',
        display: 'flex',
        flexDirection: 'column',
-        justifyContent: 'space-between',
-        padding: '56px 64px',
-        background: '#121212', // Dark mode background matching docs (hsla 0, 0%, 7%)
+        background: '#0c0c0c',
+        position: 'relative',
        fontFamily: 'Geist',
      }}
    >
-      {/* Title at top */}
-      <span
+      {/* Base gradient layer - subtle purple tint across the entire image */}
+      <div
        style={{
-          fontSize: getTitleFontSize(title),
-          fontWeight: 500,
-          color: '#fafafa', // Light text matching docs
-          lineHeight: 1.2,
-          letterSpacing: '-0.02em',
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          width: '100%',
+          height: '100%',
+          background:
+            'radial-gradient(ellipse 150% 100% at 50% 100%, rgba(88, 28, 135, 0.15) 0%, rgba(88, 28, 135, 0.08) 25%, rgba(88, 28, 135, 0.03) 50%, transparent 80%)',
+          display: 'flex',
        }}
-      >
-        {title}
-      </span>
+      />

-      {/* Footer: icon left, domain right */}
+      {/* Secondary glow - adds depth without harsh edges */}
+      <div
+        style={{
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          width: '100%',
+          height: '100%',
+          background:
+            'radial-gradient(ellipse 100% 80% at 80% 90%, rgba(112, 31, 252, 0.12) 0%, rgba(112, 31, 252, 0.04) 40%, transparent 70%)',
+          display: 'flex',
+        }}
+      />
+
+      {/* Top darkening - creates natural vignette */}
+      <div
+        style={{
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          width: '100%',
+          height: '100%',
+          background:
+            'linear-gradient(180deg, rgba(0, 0, 0, 0.3) 0%, transparent 40%, transparent 100%)',
+          display: 'flex',
+        }}
+      />
+
+      {/* Content */}
      <div
        style={{
          display: 'flex',
+          flexDirection: 'column',
+          padding: '56px 72px',
+          height: '100%',
          justifyContent: 'space-between',
-          alignItems: 'center',
-          width: '100%',
        }}
      >
-        <SimLogoFull />
+        {/* Logo */}
+        <img src={`${baseUrl}/static/logo.png`} alt='sim' height={32} />
+
+        {/* Title */}
+        <span
+          style={{
+            fontSize: getTitleFontSize(title),
+            fontWeight: 600,
+            color: '#ffffff',
+            lineHeight: 1.1,
+            letterSpacing: '-0.02em',
+          }}
+        >
+          {title}
+        </span>
+
+        {/* Footer */}
        <span
          style={{
            fontSize: 20,
-            fontWeight: 400,
+            fontWeight: 500,
            color: '#71717a',
          }}
        >
--- a/apps/docs/app/global.css
+++ b/apps/docs/app/global.css
@@ -9,20 +9,11 @@ body {
 }

@theme {
-  --color-fd-primary: #33c482; /* Green from Sim logo */
+  --color-fd-primary: #802fff; /* Purple from control-bar component */
  --font-geist-sans: var(--font-geist-sans);
  --font-geist-mono: var(--font-geist-mono);
 }

-/* Ensure primary color is set in both light and dark modes */
-:root {
-  --color-fd-primary: #33c482;
-}
-
-.dark {
-  --color-fd-primary: #33c482;
-}
-
 /* Font family utilities */
 .font-sans {
  font-family: var(--font-geist-sans), ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
@@ -43,7 +34,7 @@ body {
 :root {
  --fd-border: transparent !important;
  --fd-border-sidebar: transparent !important;
-  --fd-nav-height: 65px; /* Custom navbar height (h-16 = 64px + 1px border) */
+  --fd-nav-height: 64px; /* Custom navbar height (h-16 = 4rem = 64px) */
  /* Content container width used to center main content */
  --spacing-fd-container: 1400px;
  /* Edge gutter = leftover space on each side of centered container */
@@ -145,11 +136,11 @@ aside#nd-sidebar {
 /* On mobile, let fumadocs handle the layout natively */
@media (min-width: 1024px) {
  :root {
-    --fd-banner-height: 65px !important; /* 64px navbar + 1px border */
+    --fd-banner-height: 64px !important;
  }

  #nd-docs-layout {
-    --fd-docs-height: calc(100dvh - 65px) !important; /* 64px navbar + 1px border */
+    --fd-docs-height: calc(100dvh - 64px) !important;
    --fd-sidebar-width: 300px !important;
    margin-left: var(--sidebar-offset) !important;
    margin-right: var(--toc-offset) !important;
@@ -236,19 +227,19 @@ html:not(.dark) #nd-sidebar button:not([aria-label*="ollapse"]):not([aria-label*
  letter-spacing: 0.05em !important;
 }

-/* Override active state */
+/* Override active state (NO PURPLE) */
 #nd-sidebar a[data-active="true"],
 #nd-sidebar button[data-active="true"],
 #nd-sidebar a.bg-fd-primary\/10,
 #nd-sidebar a.text-fd-primary,
 #nd-sidebar a[class*="bg-fd-primary"],
 #nd-sidebar a[class*="text-fd-primary"],
-/* Override custom sidebar green classes */
+/* Override custom sidebar purple classes */
  #nd-sidebar
-  a.bg-emerald-50\/80,
-#nd-sidebar a.text-emerald-600,
-#nd-sidebar a[class*="bg-emerald"],
-#nd-sidebar a[class*="text-emerald"] {
+  a.bg-purple-50\/80,
+#nd-sidebar a.text-purple-600,
+#nd-sidebar a[class*="bg-purple"],
+#nd-sidebar a[class*="text-purple"] {
  background-image: none !important;
 }

@@ -259,10 +250,10 @@ html.dark #nd-sidebar a.bg-fd-primary\/10,
 html.dark #nd-sidebar a.text-fd-primary,
 html.dark #nd-sidebar a[class*="bg-fd-primary"],
 html.dark #nd-sidebar a[class*="text-fd-primary"],
-html.dark #nd-sidebar a.bg-emerald-50\/80,
-html.dark #nd-sidebar a.text-emerald-600,
-html.dark #nd-sidebar a[class*="bg-emerald"],
-html.dark #nd-sidebar a[class*="text-emerald"] {
+html.dark #nd-sidebar a.bg-purple-50\/80,
+html.dark #nd-sidebar a.text-purple-600,
+html.dark #nd-sidebar a[class*="bg-purple"],
+html.dark #nd-sidebar a[class*="text-purple"] {
  background-color: rgba(255, 255, 255, 0.15) !important;
  color: rgba(255, 255, 255, 1) !important;
 }
@@ -274,10 +265,10 @@ html:not(.dark) #nd-sidebar a.bg-fd-primary\/10,
 html:not(.dark) #nd-sidebar a.text-fd-primary,
 html:not(.dark) #nd-sidebar a[class*="bg-fd-primary"],
 html:not(.dark) #nd-sidebar a[class*="text-fd-primary"],
-html:not(.dark) #nd-sidebar a.bg-emerald-50\/80,
-html:not(.dark) #nd-sidebar a.text-emerald-600,
-html:not(.dark) #nd-sidebar a[class*="bg-emerald"],
-html:not(.dark) #nd-sidebar a[class*="text-emerald"] {
+html:not(.dark) #nd-sidebar a.bg-purple-50\/80,
+html:not(.dark) #nd-sidebar a.text-purple-600,
+html:not(.dark) #nd-sidebar a[class*="bg-purple"],
+html:not(.dark) #nd-sidebar a[class*="text-purple"] {
  background-color: rgba(0, 0, 0, 0.07) !important;
  color: rgba(0, 0, 0, 0.9) !important;
 }
@@ -295,8 +286,8 @@ html:not(.dark) #nd-sidebar button:hover:not([data-active="true"]) {
 }

 /* Dark mode - ensure active/selected items don't change on hover */
-html.dark #nd-sidebar a.bg-emerald-50\/80:hover,
-html.dark #nd-sidebar a[class*="bg-emerald"]:hover,
+html.dark #nd-sidebar a.bg-purple-50\/80:hover,
+html.dark #nd-sidebar a[class*="bg-purple"]:hover,
 html.dark #nd-sidebar a[data-active="true"]:hover,
 html.dark #nd-sidebar button[data-active="true"]:hover {
  background-color: rgba(255, 255, 255, 0.15) !important;
@@ -304,8 +295,8 @@ html.dark #nd-sidebar button[data-active="true"]:hover {
 }

 /* Light mode - ensure active/selected items don't change on hover */
-html:not(.dark) #nd-sidebar a.bg-emerald-50\/80:hover,
-html:not(.dark) #nd-sidebar a[class*="bg-emerald"]:hover,
+html:not(.dark) #nd-sidebar a.bg-purple-50\/80:hover,
+html:not(.dark) #nd-sidebar a[class*="bg-purple"]:hover,
 html:not(.dark) #nd-sidebar a[data-active="true"]:hover,
 html:not(.dark) #nd-sidebar button[data-active="true"]:hover {
  background-color: rgba(0, 0, 0, 0.07) !important;
@@ -377,24 +368,16 @@ aside[data-sidebar] > *:not([data-sidebar-viewport]) {
  button[aria-label="Toggle Sidebar"],
  button[aria-label="Collapse Sidebar"],
  /* Hide nav title/logo in sidebar on desktop - target all possible locations */
-    /* Lower specificity selectors first (attribute selectors) */
-    [data-sidebar-header],
-  [data-sidebar] [data-title],
  aside[data-sidebar] a[href="/"],
  aside[data-sidebar] a[href="/"] img,
  aside[data-sidebar] > a:first-child,
  aside[data-sidebar] > div > a:first-child,
  aside[data-sidebar] img[alt="Sim"],
-  aside[data-sidebar] svg[aria-label="Sim"],
-  /* Higher specificity selectors (ID selectors) */
-    #nd-sidebar
-    a[href="/"],
-  #nd-sidebar a[href="/"] img,
-  #nd-sidebar a[href="/"] svg,
+  [data-sidebar-header],
+  [data-sidebar] [data-title],
  #nd-sidebar > a:first-child,
  #nd-sidebar > div:first-child > a:first-child,
  #nd-sidebar img[alt="Sim"],
-  #nd-sidebar svg[aria-label="Sim"],
  /* Hide theme toggle at bottom of sidebar on desktop */
    #nd-sidebar
    > footer,
@@ -532,15 +515,6 @@ pre code .line {
  color: var(--color-fd-primary);
 }

-/* ============================================
-   TOC (Table of Contents) Styling
-   ============================================ */
-
-/* Remove the thin border-left on nested TOC items (keeps main indicator only) */
-#nd-toc a[style*="padding-inline-start"] {
-  border-left: none !important;
-}
-
 /* Add bottom spacing to prevent abrupt page endings */
 [data-content] {
  padding-top: 1.5rem !important;
--- a/apps/docs/components/docs-layout/sidebar-components.tsx
+++ b/apps/docs/components/docs-layout/sidebar-components.tsx
@@ -44,7 +44,7 @@ export function SidebarItem({ item }: { item: Item }) {
        'lg:text-gray-600 lg:dark:text-gray-400',
        !active && 'lg:hover:bg-gray-100/60 lg:dark:hover:bg-gray-800/40',
        active &&
-          'lg:bg-emerald-50/80 lg:font-normal lg:text-emerald-600 lg:dark:bg-emerald-900/15 lg:dark:text-emerald-400'
+          'lg:bg-purple-50/80 lg:font-normal lg:text-purple-600 lg:dark:bg-purple-900/15 lg:dark:text-purple-400'
      )}
    >
      {item.name}
@@ -79,7 +79,7 @@ export function SidebarFolder({ item, children }: { item: Folder; children: Reac
          'lg:text-gray-600 lg:dark:text-gray-400',
          !active && 'lg:hover:bg-gray-100/60 lg:dark:hover:bg-gray-800/40',
          active &&
-            'lg:bg-emerald-50/80 lg:font-normal lg:text-emerald-600 lg:dark:bg-emerald-900/15 lg:dark:text-emerald-400'
+            'lg:bg-purple-50/80 lg:font-normal lg:text-purple-600 lg:dark:bg-purple-900/15 lg:dark:text-purple-400'
        )}
      >
        {item.name}
@@ -104,7 +104,7 @@ export function SidebarFolder({ item, children }: { item: Folder; children: Reac
              'lg:text-gray-800 lg:dark:text-gray-200',
              !active && 'lg:hover:bg-gray-100/60 lg:dark:hover:bg-gray-800/40',
              active &&
-                'lg:bg-emerald-50/80 lg:text-emerald-600 lg:dark:bg-emerald-900/15 lg:dark:text-emerald-400'
+                'lg:bg-purple-50/80 lg:text-purple-600 lg:dark:bg-purple-900/15 lg:dark:text-purple-400'
            )}
          >
            {item.name}
--- a/apps/docs/components/docs-layout/toc-footer.tsx
+++ b/apps/docs/components/docs-layout/toc-footer.tsx
@@ -23,7 +23,7 @@ export function TOCFooter() {
          rel='noopener noreferrer'
          onMouseEnter={() => setIsHovered(true)}
          onMouseLeave={() => setIsHovered(false)}
-          className='group mt-2 inline-flex h-8 w-fit items-center justify-center gap-1 whitespace-nowrap rounded-[10px] border border-[#2AAD6C] bg-gradient-to-b from-[#3ED990] to-[#2AAD6C] px-3 pr-[10px] pl-[12px] font-medium text-sm text-white shadow-[inset_0_2px_4px_0_#5EE8A8] outline-none transition-all hover:shadow-lg focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50'
+          className='group mt-2 inline-flex h-8 w-fit items-center justify-center gap-1 whitespace-nowrap rounded-[10px] border border-[#6F3DFA] bg-gradient-to-b from-[#8357FF] to-[#6F3DFA] px-3 pr-[10px] pl-[12px] font-medium text-sm text-white shadow-[inset_0_2px_4px_0_#9B77FF] outline-none transition-all hover:shadow-lg focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50'
          aria-label='Get started with Sim - Sign up for free'
        >
          <span>Get started</span>
--- a/apps/docs/components/navbar/navbar.tsx
+++ b/apps/docs/components/navbar/navbar.tsx
@@ -1,9 +1,9 @@
 'use client'

+import Image from 'next/image'
 import Link from 'next/link'
 import { LanguageDropdown } from '@/components/ui/language-dropdown'
 import { SearchTrigger } from '@/components/ui/search-trigger'
-import { SimLogoFull } from '@/components/ui/sim-logo'
 import { ThemeToggle } from '@/components/ui/theme-toggle'

 export function Navbar() {
@@ -27,7 +27,13 @@ export function Navbar() {
          {/* Left cluster: logo */}
          <div className='flex items-center'>
            <Link href='/' className='flex min-w-[100px] items-center'>
-              <SimLogoFull className='h-7 w-auto' />
+              <Image
+                src='/static/logo.png'
+                alt='Sim'
+                width={72}
+                height={28}
+                className='h-7 w-auto'
+              />
            </Link>
          </div>

--- a/apps/docs/components/ui/action-media.tsx
+++ b/apps/docs/components/ui/action-media.tsx
@@ -1,87 +1,40 @@
 'use client'

-import { useState } from 'react'
-import { cn, getAssetUrl } from '@/lib/utils'
-import { Lightbox } from './lightbox'
+import { getAssetUrl } from '@/lib/utils'

 interface ActionImageProps {
  src: string
  alt: string
-  enableLightbox?: boolean
 }

 interface ActionVideoProps {
  src: string
  alt: string
-  enableLightbox?: boolean
 }

-export function ActionImage({ src, alt, enableLightbox = true }: ActionImageProps) {
-  const [isLightboxOpen, setIsLightboxOpen] = useState(false)
-
-  const handleClick = () => {
-    if (enableLightbox) {
-      setIsLightboxOpen(true)
-    }
-  }
+export function ActionImage({ src, alt }: ActionImageProps) {
+  const resolvedSrc = getAssetUrl(src.startsWith('/') ? src.slice(1) : src)

  return (
-    <>
-      <img
-        src={src}
-        alt={alt}
-        onClick={handleClick}
-        className={cn(
-          'inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700',
-          enableLightbox && 'cursor-pointer transition-opacity hover:opacity-90'
-        )}
-      />
-      {enableLightbox && (
-        <Lightbox
-          isOpen={isLightboxOpen}
-          onClose={() => setIsLightboxOpen(false)}
-          src={src}
-          alt={alt}
-          type='image'
-        />
-      )}
-    </>
+    <img
+      src={resolvedSrc}
+      alt={alt}
+      className='inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700'
+    />
  )
 }

-export function ActionVideo({ src, alt, enableLightbox = true }: ActionVideoProps) {
-  const [isLightboxOpen, setIsLightboxOpen] = useState(false)
-  const resolvedSrc = getAssetUrl(src)
-
-  const handleClick = () => {
-    if (enableLightbox) {
-      setIsLightboxOpen(true)
-    }
-  }
+export function ActionVideo({ src, alt }: ActionVideoProps) {
+  const resolvedSrc = getAssetUrl(src.startsWith('/') ? src.slice(1) : src)

  return (
-    <>
-      <video
-        src={resolvedSrc}
-        autoPlay
-        loop
-        muted
-        playsInline
-        onClick={handleClick}
-        className={cn(
-          'inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700',
-          enableLightbox && 'cursor-pointer transition-opacity hover:opacity-90'
-        )}
-      />
-      {enableLightbox && (
-        <Lightbox
-          isOpen={isLightboxOpen}
-          onClose={() => setIsLightboxOpen(false)}
-          src={src}
-          alt={alt}
-          type='video'
-        />
-      )}
-    </>
+    <video
+      src={resolvedSrc}
+      autoPlay
+      loop
+      muted
+      playsInline
+      className='inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700'
+    />
  )
 }
--- a/apps/docs/components/ui/language-dropdown.tsx
+++ b/apps/docs/components/ui/language-dropdown.tsx
@@ -1,9 +1,8 @@
 'use client'

 import { useEffect, useState } from 'react'
-import { Check, ChevronDown } from 'lucide-react'
+import { Check, ChevronRight } from 'lucide-react'
 import { useParams, usePathname, useRouter } from 'next/navigation'
-import { cn } from '@/lib/utils'

 const languages = {
  en: { name: 'English', flag: '🇺🇸' },
@@ -16,7 +15,6 @@ const languages = {

 export function LanguageDropdown() {
  const [isOpen, setIsOpen] = useState(false)
-  const [hoveredIndex, setHoveredIndex] = useState<number>(-1)
  const pathname = usePathname()
  const params = useParams()
  const router = useRouter()
@@ -73,15 +71,6 @@ export function LanguageDropdown() {
    return () => window.removeEventListener('keydown', onKey)
  }, [isOpen])

-  // Reset hovered index when popover closes
-  useEffect(() => {
-    if (!isOpen) {
-      setHoveredIndex(-1)
-    }
-  }, [isOpen])
-
-  const languageEntries = Object.entries(languages)
-
  return (
    <div className='relative'>
      <button
@@ -93,14 +82,14 @@ export function LanguageDropdown() {
        aria-haspopup='listbox'
        aria-expanded={isOpen}
        aria-controls='language-menu'
-        className='flex cursor-pointer items-center gap-1.5 rounded-[6px] px-3 py-2 font-normal text-[0.9375rem] text-foreground/60 leading-[1.4] transition-colors hover:bg-foreground/8 hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-ring'
+        className='flex cursor-pointer items-center gap-1.5 rounded-xl px-3 py-2 font-normal text-[0.9375rem] text-foreground/60 leading-[1.4] transition-colors hover:bg-foreground/8 hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-ring'
        style={{
          fontFamily:
            '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
        }}
      >
        <span>{languages[currentLang as keyof typeof languages]?.name}</span>
-        <ChevronDown className={cn('h-3.5 w-3.5 transition-transform', isOpen && 'rotate-180')} />
+        <ChevronRight className='h-3.5 w-3.5' />
      </button>

      {isOpen && (
@@ -109,37 +98,29 @@ export function LanguageDropdown() {
          <div
            id='language-menu'
            role='listbox'
-            className='absolute top-full right-0 z-[1001] mt-2 max-h-[400px] min-w-[160px] overflow-auto rounded-[6px] bg-white px-[6px] py-[6px] shadow-lg dark:bg-neutral-900'
+            className='absolute top-full right-0 z-[1001] mt-1 max-h-[75vh] w-56 overflow-auto rounded-xl border border-border/50 bg-white shadow-2xl md:w-44 md:bg-background/95 md:backdrop-blur-md dark:bg-neutral-950 md:dark:bg-background/95'
          >
-            {languageEntries.map(([code, lang], index) => {
-              const isSelected = currentLang === code
-              const isHovered = hoveredIndex === index
-
-              return (
-                <button
-                  key={code}
-                  onClick={(e) => {
-                    e.preventDefault()
-                    e.stopPropagation()
-                    handleLanguageChange(code)
-                  }}
-                  onMouseEnter={() => setHoveredIndex(index)}
-                  onMouseLeave={() => setHoveredIndex(-1)}
-                  role='option'
-                  aria-selected={isSelected}
-                  className={cn(
-                    'flex h-[26px] w-full min-w-0 cursor-pointer items-center gap-[8px] rounded-[6px] px-[6px] text-[13px] transition-colors',
-                    'text-neutral-700 dark:text-neutral-200',
-                    isHovered && 'bg-neutral-100 dark:bg-neutral-800',
-                    'focus:outline-none'
-                  )}
-                >
-                  <span className='text-[13px]'>{lang.flag}</span>
-                  <span className='flex-1 text-left leading-none'>{lang.name}</span>
-                  {isSelected && <Check className='ml-auto h-3.5 w-3.5' />}
-                </button>
-              )
-            })}
+            {Object.entries(languages).map(([code, lang]) => (
+              <button
+                key={code}
+                onClick={(e) => {
+                  e.preventDefault()
+                  e.stopPropagation()
+                  handleLanguageChange(code)
+                }}
+                role='option'
+                aria-selected={currentLang === code}
+                className={`flex w-full cursor-pointer items-center gap-3 px-3 py-3 text-base transition-colors first:rounded-t-xl last:rounded-b-xl hover:bg-muted/80 focus:outline-none focus-visible:ring-2 focus-visible:ring-ring md:gap-2 md:px-2.5 md:py-2 md:text-sm ${
+                  currentLang === code ? 'bg-muted/60 font-medium text-primary' : 'text-foreground'
+                }`}
+              >
+                <span className='text-base md:text-sm'>{lang.flag}</span>
+                <span className='leading-none'>{lang.name}</span>
+                {currentLang === code && (
+                  <Check className='ml-auto h-4 w-4 text-primary md:h-3.5 md:w-3.5' />
+                )}
+              </button>
+            ))}
          </div>
        </>
      )}
--- a/apps/docs/components/ui/sim-logo.tsx
+++ b/apps/docs/components/ui/sim-logo.tsx
@@ -1,108 +0,0 @@
-'use client'
-
-import { cn } from '@/lib/utils'
-
-interface SimLogoProps {
-  className?: string
-}
-
-/**
- * Sim logo with icon and text.
- * The icon stays green (#33C482), text adapts to light/dark mode.
- */
-export function SimLogo({ className }: SimLogoProps) {
-  return (
-    <svg
-      viewBox='720 440 320 320'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-      className={cn('h-7 w-auto', className)}
-      aria-label='Sim'
-    >
-      {/* Green icon - top left shape with cutout */}
-      <path
-        fillRule='evenodd'
-        clipRule='evenodd'
-        d='M875.791 577.171C875.791 581.922 873.911 586.483 870.576 589.842L870.098 590.323C866.764 593.692 862.234 595.575 857.517 595.575H750.806C740.978 595.575 733 603.6 733 613.498V728.902C733 738.799 740.978 746.826 750.806 746.826H865.382C875.209 746.826 883.177 738.799 883.177 728.902V620.853C883.177 616.448 884.912 612.222 888.008 609.104C891.093 605.997 895.29 604.249 899.664 604.249H1008.16C1017.99 604.249 1025.96 596.224 1025.96 586.327V470.923C1025.96 461.025 1017.99 453 1008.16 453H893.586C883.759 453 875.791 461.025 875.791 470.923V577.171ZM910.562 477.566H991.178C996.922 477.566 1001.57 482.254 1001.57 488.029V569.22C1001.57 574.995 996.922 579.683 991.178 579.683H910.562C904.828 579.683 900.173 574.995 900.173 569.22V488.029C900.173 482.254 904.828 477.566 910.562 477.566Z'
-        fill='#33C482'
-      />
-      {/* Green icon - bottom right square */}
-      <path
-        d='M1008.3 624.59H923.113C912.786 624.59 904.414 633.022 904.414 643.423V728.171C904.414 738.572 912.786 747.004 923.113 747.004H1008.3C1018.63 747.004 1027 738.572 1027 728.171V643.423C1027 633.022 1018.63 624.59 1008.3 624.59Z'
-        fill='#33C482'
-      />
-      {/* Gradient overlay on bottom right square */}
-      <path
-        d='M1008.3 624.199H923.113C912.786 624.199 904.414 632.631 904.414 643.033V727.78C904.414 738.181 912.786 746.612 923.113 746.612H1008.3C1018.63 746.612 1027 738.181 1027 727.78V643.033C1027 632.631 1018.63 624.199 1008.3 624.199Z'
-        fill='url(#sim-logo-gradient)'
-        fillOpacity='0.2'
-      />
-      <defs>
-        <linearGradient
-          id='sim-logo-gradient'
-          x1='904.414'
-          y1='624.199'
-          x2='978.836'
-          y2='698.447'
-          gradientUnits='userSpaceOnUse'
-        >
-          <stop />
-          <stop offset='1' stopOpacity='0' />
-        </linearGradient>
-      </defs>
-    </svg>
-  )
-}
-
-/**
- * Full Sim logo with icon and "Sim" text.
- * The icon stays green (#33C482), text adapts to light/dark mode.
- */
-export function SimLogoFull({ className }: SimLogoProps) {
-  return (
-    <svg
-      viewBox='720 440 1020 320'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-      className={cn('h-7 w-auto', className)}
-      aria-label='Sim'
-    >
-      {/* Green icon - top left shape with cutout */}
-      <path
-        fillRule='evenodd'
-        clipRule='evenodd'
-        d='M875.791 577.171C875.791 581.922 873.911 586.483 870.576 589.842L870.098 590.323C866.764 593.692 862.234 595.575 857.517 595.575H750.806C740.978 595.575 733 603.6 733 613.498V728.902C733 738.799 740.978 746.826 750.806 746.826H865.382C875.209 746.826 883.177 738.799 883.177 728.902V620.853C883.177 616.448 884.912 612.222 888.008 609.104C891.093 605.997 895.29 604.249 899.664 604.249H1008.16C1017.99 604.249 1025.96 596.224 1025.96 586.327V470.923C1025.96 461.025 1017.99 453 1008.16 453H893.586C883.759 453 875.791 461.025 875.791 470.923V577.171ZM910.562 477.566H991.178C996.922 477.566 1001.57 482.254 1001.57 488.029V569.22C1001.57 574.995 996.922 579.683 991.178 579.683H910.562C904.828 579.683 900.173 574.995 900.173 569.22V488.029C900.173 482.254 904.828 477.566 910.562 477.566Z'
-        fill='#33C482'
-      />
-      {/* Green icon - bottom right square */}
-      <path
-        d='M1008.3 624.59H923.113C912.786 624.59 904.414 633.022 904.414 643.423V728.171C904.414 738.572 912.786 747.004 923.113 747.004H1008.3C1018.63 747.004 1027 738.572 1027 728.171V643.423C1027 633.022 1018.63 624.59 1008.3 624.59Z'
-        fill='#33C482'
-      />
-      {/* Gradient overlay on bottom right square */}
-      <path
-        d='M1008.3 624.199H923.113C912.786 624.199 904.414 632.631 904.414 643.033V727.78C904.414 738.181 912.786 746.612 923.113 746.612H1008.3C1018.63 746.612 1027 738.181 1027 727.78V643.033C1027 632.631 1018.63 624.199 1008.3 624.199Z'
-        fill='url(#sim-logo-full-gradient)'
-        fillOpacity='0.2'
-      />
-      {/* "Sim" text - adapts to light/dark mode via currentColor */}
-      <path
-        d='M1210.54 515.657C1226.65 515.657 1240.59 518.51 1252.31 524.257H1252.31C1264.3 529.995 1273.63 538.014 1280.26 548.319H1280.26C1287.19 558.635 1290.78 570.899 1291.08 585.068L1291.1 586.089H1249.11L1249.09 585.115C1248.8 574.003 1245.18 565.493 1238.32 559.451C1231.45 553.399 1221.79 550.308 1209.21 550.308C1196.3 550.308 1186.48 553.113 1179.61 558.588C1172.76 564.046 1169.33 571.499 1169.33 581.063C1169.33 588.092 1171.88 593.978 1177.01 598.783C1182.17 603.618 1189.99 607.399 1200.56 610.061H1200.56L1238.77 619.451C1257.24 623.65 1271.21 630.571 1280.57 640.293L1281.01 640.739C1290.13 650.171 1294.64 662.97 1294.64 679.016C1294.64 692.923 1290.88 705.205 1283.34 715.822L1283.33 715.834C1275.81 726.134 1265.44 734.14 1252.26 739.866L1252.25 739.871C1239.36 745.302 1224.12 748 1206.54 748C1180.9 748 1160.36 741.696 1145.02 728.984C1129.67 716.258 1122 699.269 1122 678.121V677.121H1163.99V678.121C1163.99 688.869 1167.87 697.367 1175.61 703.722L1176.34 704.284C1184.04 709.997 1194.37 712.902 1207.43 712.902C1222.13 712.902 1233.3 710.087 1241.07 704.588C1248.8 698.812 1252.64 691.21 1252.64 681.699C1252.64 674.769 1250.5 669.057 1246.25 664.49L1246.23 664.478L1246.22 664.464C1242.28 659.929 1234.83 656.119 1223.64 653.152L1185.43 644.208L1185.42 644.204C1166.05 639.407 1151.49 632.035 1141.83 622.012L1141.83 622.006L1141.82 622C1132.43 611.94 1127.78 598.707 1127.78 582.405C1127.78 568.81 1131.23 556.976 1138.17 546.949L1138.18 546.941L1138.19 546.933C1145.41 536.936 1155.18 529.225 1167.48 523.793L1167.48 523.79C1180.07 518.36 1194.43 515.657 1210.54 515.657ZM1323.39 521.979C1331.68 525.008 1337.55 526.482 1343.51 526.482C1349.48 526.482 1355.64 525.005 1364.49 521.973L1365.82 521.52V742.633H1322.05V521.489L1323.39 521.979ZM1642.01 515.657C1667.11 515.657 1686.94 523.031 1701.39 537.876C1715.83 552.716 1723 572.968 1723 598.507V742.633H1680.12V608.794C1680.12 591.666 1675.72 578.681 1667.07 569.681L1667.06 569.669L1667.04 569.656C1658.67 560.359 1647.26 555.675 1632.68 555.675C1622.47 555.675 1613.47 558.022 1605.64 562.69L1605.63 562.696C1598.11 567.064 1592.17 573.475 1587.8 581.968C1583.44 590.448 1581.25 600.424 1581.25 611.925V742.633H1537.92V608.347C1537.92 591.208 1533.67 578.376 1525.31 569.68L1525.31 569.674L1525.3 569.668C1516.93 560.664 1505.52 556.122 1490.93 556.122C1480.72 556.122 1471.72 558.469 1463.89 563.138L1463.88 563.144C1456.36 567.511 1450.41 573.922 1446.05 582.415L1446.05 582.422L1446.04 582.428C1441.69 590.602 1439.5 600.423 1439.5 611.925V742.633H1395.72V521.919H1435.05V554.803C1439.92 544.379 1447.91 535.465 1458.37 528.356C1470.71 519.875 1485.58 515.657 1502.93 515.657C1522.37 515.657 1538.61 520.931 1551.55 531.538C1560.38 538.771 1567.1 547.628 1571.72 558.091C1576.05 547.619 1582.83 538.757 1592.07 531.524C1605.61 520.93 1622.28 515.657 1642.01 515.657ZM1343.49 452C1351.45 452 1358.23 454.786 1363.75 460.346C1369.27 465.905 1372.04 472.721 1372.04 480.73C1372.04 488.452 1369.27 495.254 1363.77 501.096L1363.76 501.105L1363.75 501.115C1358.23 506.675 1351.45 509.461 1343.49 509.461C1335.81 509.461 1329.05 506.669 1323.25 501.134L1323.23 501.115L1323.21 501.096C1317.71 495.254 1314.94 488.452 1314.94 480.73C1314.94 472.721 1317.7 465.905 1323.23 460.346L1323.24 460.337L1323.25 460.327C1329.05 454.792 1335.81 452 1343.49 452Z'
-        className='fill-neutral-900 dark:fill-white'
-      />
-      <defs>
-        <linearGradient
-          id='sim-logo-full-gradient'
-          x1='904.414'
-          y1='624.199'
-          x2='978.836'
-          y2='698.447'
-          gradientUnits='userSpaceOnUse'
-        >
-          <stop />
-          <stop offset='1' stopOpacity='0' />
-        </linearGradient>
-      </defs>
-    </svg>
-  )
-}
--- a/apps/docs/content/docs/de/mcp/deploy-workflows.mdx
+++ b/apps/docs/content/docs/de/mcp/deploy-workflows.mdx
@@ -17,7 +17,7 @@ MCP-Server gruppieren Ihre Workflow-Tools zusammen. Erstellen und verwalten Sie
  <Video src="mcp/mcp-server.mp4" width={700} height={450} />
 </div>

-1. Navigieren Sie zu **Einstellungen → MCP-Server**
+1. Navigieren Sie zu **Einstellungen → Bereitgestellte MCPs**
 2. Klicken Sie auf **Server erstellen**
 3. Geben Sie einen Namen und eine optionale Beschreibung ein
 4. Kopieren Sie die Server-URL zur Verwendung in Ihren MCP-Clients
@@ -79,7 +79,7 @@ Füge deinen API-Key-Header (`X-API-Key`) für authentifizierten Zugriff hinzu,

 ## Server-Verwaltung

-In der Server-Detailansicht unter **Einstellungen → MCP-Server** können Sie:
+In der Server-Detailansicht unter **Einstellungen → Bereitgestellte MCPs** können Sie:

 - **Tools anzeigen**: Alle Workflows sehen, die einem Server hinzugefügt wurden
 - **URL kopieren**: Die Server-URL für MCP-Clients abrufen
--- a/apps/docs/content/docs/de/mcp/index.mdx
+++ b/apps/docs/content/docs/de/mcp/index.mdx
@@ -27,7 +27,7 @@ MCP-Server stellen Sammlungen von Tools bereit, die Ihre Agenten nutzen können.
 </div>

 1. Navigieren Sie zu Ihren Workspace-Einstellungen
-2. Gehen Sie zum Abschnitt **MCP-Server**
+2. Gehen Sie zum Abschnitt **Bereitgestellte MCPs**
 3. Klicken Sie auf **MCP-Server hinzufügen**
 4. Geben Sie die Server-Konfigurationsdetails ein
 5. Speichern Sie die Konfiguration
--- a/apps/docs/content/docs/en/blocks/agent.mdx
+++ b/apps/docs/content/docs/en/blocks/agent.mdx
@@ -56,10 +56,6 @@ Controls response randomness and creativity:
 - **Medium (0.3-0.7)**: Balanced creativity and focus. Good for general use.
 - **High (0.7-2.0)**: Creative and varied. Ideal for brainstorming and content generation.

-### Max Output Tokens
-
-Controls the maximum length of the model's response. For Anthropic models, Sim uses reliable defaults: streaming executions use the model's full capacity (e.g. 64,000 tokens for Claude 4.5), while non-streaming executions default to 8,192 to avoid timeout issues. For long-form content generation via API, explicitly set a higher value.
-
 ### API Key

 Your API key for the selected LLM provider. This is securely stored and used for authentication.
--- a/apps/docs/content/docs/en/mcp/deploy-workflows.mdx
+++ b/apps/docs/content/docs/en/mcp/deploy-workflows.mdx
@@ -16,7 +16,7 @@ MCP servers group your workflow tools together. Create and manage them in worksp
  <Video src="mcp/mcp-server.mp4" width={700} height={450} />
 </div>

-1. Navigate to **Settings → MCP Servers**
+1. Navigate to **Settings → Deployed MCPs**
 2. Click **Create Server**
 3. Enter a name and optional description
 4. Copy the server URL for use in your MCP clients
@@ -78,7 +78,7 @@ Include your API key header (`X-API-Key`) for authenticated access when using mc

 ## Server Management

-From the server detail view in **Settings → MCP Servers**, you can:
+From the server detail view in **Settings → Deployed MCPs**, you can:

 - **View tools**: See all workflows added to a server
 - **Copy URL**: Get the server URL for MCP clients
--- a/apps/docs/content/docs/en/mcp/index.mdx
+++ b/apps/docs/content/docs/en/mcp/index.mdx
@@ -27,7 +27,7 @@ MCP servers provide collections of tools that your agents can use. Configure the
 </div>

 1. Navigate to your workspace settings
-2. Go to the **MCP Servers** section
+2. Go to the **Deployed MCPs** section
 3. Click **Add MCP Server**
 4. Enter the server configuration details
 5. Save the configuration
--- a/apps/docs/content/docs/en/quick-reference/index.mdx
+++ b/apps/docs/content/docs/en/quick-reference/index.mdx
@@ -22,17 +22,17 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Create a workspace</td>
      <td>Click workspace dropdown → **New Workspace**</td>
-      <td><ActionVideo src="quick-reference/create-workspace.mp4" alt="Create workspace" /></td>
+      <td><ActionVideo src="/static/quick-reference/create-workspace.mp4" alt="Create workspace" /></td>
    </tr>
    <tr>
      <td>Switch workspaces</td>
      <td>Click workspace dropdown → Select workspace</td>
-      <td><ActionVideo src="quick-reference/switch-workspace.mp4" alt="Switch workspaces" /></td>
+      <td><ActionVideo src="/static/quick-reference/switch-workspace.mp4" alt="Switch workspaces" /></td>
    </tr>
    <tr>
      <td>Invite team members</td>
      <td>Sidebar → **Invite**</td>
-      <td><ActionVideo src="quick-reference/invite.mp4" alt="Invite team members" /></td>
+      <td><ActionVideo src="/static/quick-reference/invite.mp4" alt="Invite team members" /></td>
    </tr>
    <tr>
      <td>Rename a workspace</td>
@@ -69,7 +69,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Reorder / move workflows</td>
      <td>Drag workflow up/down or onto a folder</td>
-      <td><ActionVideo src="quick-reference/reordering.mp4" alt="Reorder workflows" /></td>
+      <td><ActionVideo src="/static/quick-reference/reordering.mp4" alt="Reorder workflows" /></td>
    </tr>
    <tr>
      <td>Import a workflow</td>
@@ -79,7 +79,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Multi-select workflows</td>
      <td>`Mod+Click` or `Shift+Click` workflows in sidebar</td>
-      <td><ActionVideo src="quick-reference/multiselect.mp4" alt="Multi-select workflows" /></td>
+      <td><ActionVideo src="/static/quick-reference/multiselect.mp4" alt="Multi-select workflows" /></td>
    </tr>
    <tr>
      <td>Open in new tab</td>
@@ -144,17 +144,17 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Add a block</td>
      <td>Drag from Toolbar panel, or right-click canvas → **Add Block**</td>
-      <td><ActionVideo src="quick-reference/add-block.mp4" alt="Add a block" /></td>
+      <td><ActionVideo src="/static/quick-reference/add-block.mp4" alt="Add a block" /></td>
    </tr>
    <tr>
      <td>Multi-select blocks</td>
      <td>`Mod+Click` additional blocks, or shift-drag to draw selection box</td>
-      <td><ActionVideo src="quick-reference/multiselect-blocks.mp4" alt="Multi-select blocks" /></td>
+      <td><ActionVideo src="/static/quick-reference/multiselect-blocks.mp4" alt="Multi-select blocks" /></td>
    </tr>
    <tr>
      <td>Copy blocks</td>
      <td>`Mod+C` with blocks selected</td>
-      <td rowSpan={2}><ActionVideo src="quick-reference/copy-paste.mp4" alt="Copy and paste blocks" /></td>
+      <td rowSpan={2}><ActionVideo src="/static/quick-reference/copy-paste.mp4" alt="Copy and paste blocks" /></td>
    </tr>
    <tr>
      <td>Paste blocks</td>
@@ -163,7 +163,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Duplicate blocks</td>
      <td>Right-click → **Duplicate**</td>
-      <td><ActionVideo src="quick-reference/duplicate-block.mp4" alt="Duplicate blocks" /></td>
+      <td><ActionVideo src="/static/quick-reference/duplicate-block.mp4" alt="Duplicate blocks" /></td>
    </tr>
    <tr>
      <td>Delete blocks</td>
@@ -173,7 +173,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Rename a block</td>
      <td>Click block name in header, or edit in the Editor panel</td>
-      <td><ActionVideo src="quick-reference/rename-block.mp4" alt="Rename a block" /></td>
+      <td><ActionVideo src="/static/quick-reference/rename-block.mp4" alt="Rename a block" /></td>
    </tr>
    <tr>
      <td>Enable/Disable a block</td>
@@ -183,12 +183,12 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Toggle handle orientation</td>
      <td>Right-click → **Toggle Handles**</td>
-      <td><ActionVideo src="quick-reference/toggle-handles.mp4" alt="Toggle handle orientation" /></td>
+      <td><ActionVideo src="/static/quick-reference/toggle-handles.mp4" alt="Toggle handle orientation" /></td>
    </tr>
    <tr>
      <td>Configure a block</td>
      <td>Select block → use Editor panel on right</td>
-      <td><ActionVideo src="quick-reference/configure-block.mp4" alt="Configure a block" /></td>
+      <td><ActionVideo src="/static/quick-reference/configure-block.mp4" alt="Configure a block" /></td>
    </tr>
  </tbody>
 </table>
@@ -203,17 +203,17 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Create a connection</td>
      <td>Drag from output handle to input handle</td>
-      <td><ActionVideo src="quick-reference/connect-blocks.mp4" alt="Connect blocks" /></td>
+      <td><ActionVideo src="/static/quick-reference/connect-blocks.mp4" alt="Connect blocks" /></td>
    </tr>
    <tr>
      <td>Delete a connection</td>
      <td>Click edge to select → `Delete` key</td>
-      <td><ActionVideo src="quick-reference/delete-connection.mp4" alt="Delete connection" /></td>
+      <td><ActionVideo src="/static/quick-reference/delete-connection.mp4" alt="Delete connection" /></td>
    </tr>
    <tr>
      <td>Use output in another block</td>
      <td>Drag connection tag into input field</td>
-      <td><ActionVideo src="quick-reference/connection-tag.mp4" alt="Use connection tag" /></td>
+      <td><ActionVideo src="/static/quick-reference/connection-tag.mp4" alt="Use connection tag" /></td>
    </tr>
  </tbody>
 </table>
@@ -228,7 +228,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Search toolbar</td>
      <td>`Mod+F`</td>
-      <td><ActionVideo src="quick-reference/search-toolbar.mp4" alt="Search toolbar" /></td>
+      <td><ActionVideo src="/static/quick-reference/search-toolbar.mp4" alt="Search toolbar" /></td>
    </tr>
    <tr>
      <td>Search everything</td>
@@ -243,7 +243,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    <tr>
      <td>Collapse/expand sidebar</td>
      <td>Click collapse button on sidebar</td>
-      <td><ActionVideo src="quick-reference/collapse-sidebar.mp4" alt="Collapse sidebar" /></td>
+      <td><ActionVideo src="/static/quick-reference/collapse-sidebar.mp4" alt="Collapse sidebar" /></td>
    </tr>
  </tbody>
 </table>
@@ -337,7 +337,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    </tr>
    <tr>
      <td>Copy API endpoint</td>
-      <td>Deploy tab → API → Copy API cURL</td>
+      <td>Deploy tab → Copy API endpoint URL</td>
      <td><ActionImage src="/static/quick-reference/copy-api.png" alt="Copy API endpoint" /></td>
    </tr>
  </tbody>
@@ -367,7 +367,7 @@ A quick lookup for everyday actions in the Sim workflow editor. For keyboard sho
    </tr>
    <tr>
      <td>Reference an environment variable</td>
-      <td>Use `{{ENV_VAR}}` syntax in block inputs</td>
+      <td>Use `&#123;&#123;ENV_VAR&#125;&#125;` syntax in block inputs</td>
      <td><ActionImage src="/static/quick-reference/env-variable-reference.png" alt="Reference environment variable" /></td>
    </tr>
  </tbody>
--- a/apps/docs/content/docs/es/mcp/deploy-workflows.mdx
+++ b/apps/docs/content/docs/es/mcp/deploy-workflows.mdx
@@ -17,7 +17,7 @@ Los servidores MCP agrupan tus herramientas de flujo de trabajo. Créalos y gest
  <Video src="mcp/mcp-server.mp4" width={700} height={450} />
 </div>

-1. Navega a **Configuración → Servidores MCP**
+1. Navega a **Configuración → MCP implementados**
 2. Haz clic en **Crear servidor**
 3. Introduce un nombre y una descripción opcional
 4. Copia la URL del servidor para usarla en tus clientes MCP
@@ -79,7 +79,7 @@ Incluye tu encabezado de clave API (`X-API-Key`) para acceso autenticado al usar

 ## Gestión del servidor

-Desde la vista de detalles del servidor en **Configuración → Servidores MCP**, puedes:
+Desde la vista de detalles del servidor en **Configuración → MCP implementados**, puedes:

 - **Ver herramientas**: consulta todos los flujos de trabajo añadidos a un servidor
 - **Copiar URL**: obtén la URL del servidor para clientes MCP
--- a/apps/docs/content/docs/es/mcp/index.mdx
+++ b/apps/docs/content/docs/es/mcp/index.mdx
@@ -27,7 +27,7 @@ Los servidores MCP proporcionan colecciones de herramientas que tus agentes pued
 </div>

 1. Navega a la configuración de tu espacio de trabajo
-2. Ve a la sección **Servidores MCP**
+2. Ve a la sección **MCP implementados**
 3. Haz clic en **Añadir servidor MCP**
 4. Introduce los detalles de configuración del servidor
 5. Guarda la configuración
--- a/apps/docs/content/docs/fr/mcp/deploy-workflows.mdx
+++ b/apps/docs/content/docs/fr/mcp/deploy-workflows.mdx
@@ -17,7 +17,7 @@ Les serveurs MCP regroupent vos outils de workflow. Créez-les et gérez-les dan
  <Video src="mcp/mcp-server.mp4" width={700} height={450} />
 </div>

-1. Accédez à **Paramètres → Serveurs MCP**
+1. Accédez à **Paramètres → MCP déployés**
 2. Cliquez sur **Créer un serveur**
 3. Saisissez un nom et une description facultative
 4. Copiez l'URL du serveur pour l'utiliser dans vos clients MCP
@@ -79,7 +79,7 @@ Incluez votre en-tête de clé API (`X-API-Key`) pour un accès authentifié lor

 ## Gestion du serveur

-Depuis la vue détaillée du serveur dans **Paramètres → Serveurs MCP**, vous pouvez :
+Depuis la vue détaillée du serveur dans **Paramètres → MCP déployés**, vous pouvez :

 - **Voir les outils** : voir tous les workflows ajoutés à un serveur
 - **Copier l'URL** : obtenir l'URL du serveur pour les clients MCP
--- a/apps/docs/content/docs/fr/mcp/index.mdx
+++ b/apps/docs/content/docs/fr/mcp/index.mdx
@@ -28,7 +28,7 @@ Les serveurs MCP fournissent des collections d'outils que vos agents peuvent uti
 </div>

 1. Accédez aux paramètres de votre espace de travail
-2. Allez dans la section **Serveurs MCP**
+2. Allez dans la section **MCP déployés**
 3. Cliquez sur **Ajouter un serveur MCP**
 4. Saisissez les détails de configuration du serveur
 5. Enregistrez la configuration
--- a/apps/docs/content/docs/ja/mcp/deploy-workflows.mdx
+++ b/apps/docs/content/docs/ja/mcp/deploy-workflows.mdx
@@ -16,7 +16,7 @@ MCPサーバーは、ワークフローツールをまとめてグループ化
  <Video src="mcp/mcp-server.mp4" width={700} height={450} />
 </div>

-1. **設定 → MCP サーバー**に移動します
+1. **設定 → デプロイ済みMCP**に移動します
 2. **サーバーを作成**をクリックします
 3. 名前とオプションの説明を入力します
 4. MCPクライアントで使用するためにサーバーURLをコピーします
@@ -78,7 +78,7 @@ mcp-remoteまたは他のHTTPベースのMCPトランスポートを使用する

 ## サーバー管理

-**設定 → MCP サーバー**のサーバー詳細ビューから、次のことができます:
+**設定 → デプロイ済みMCP**のサーバー詳細ビューから、次のことができます:

 - **ツールを表示**: サーバーに追加されたすべてのワークフローを確認
 - **URLをコピー**: MCPクライアント用のサーバーURLを取得
--- a/apps/docs/content/docs/ja/mcp/index.mdx
+++ b/apps/docs/content/docs/ja/mcp/index.mdx
@@ -27,7 +27,7 @@ MCPサーバーはエージェントが使用できるツールのコレクシ
 </div>

 1. ワークスペース設定に移動します
-2. **MCP サーバー**セクションに移動します
+2. **デプロイ済みMCP**セクションに移動します
 3. **MCPサーバーを追加**をクリックします
 4. サーバー設定の詳細を入力します
 5. 設定を保存します
--- a/apps/docs/content/docs/zh/mcp/deploy-workflows.mdx
+++ b/apps/docs/content/docs/zh/mcp/deploy-workflows.mdx
@@ -16,7 +16,7 @@ MCP 服务器用于将您的工作流工具进行分组。您可以在工作区
  <Video src="mcp/mcp-server.mp4" width={700} height={450} />
 </div>

-1. 进入 **设置 → MCP 服务器**
+1. 进入 **设置 → 已部署的 MCPs**
 2. 点击 **创建服务器**
 3. 输入名称和可选描述
 4. 复制服务器 URL 以在你的 MCP 客户端中使用
@@ -78,7 +78,7 @@ MCP 服务器用于将您的工作流工具进行分组。您可以在工作区

 ## 服务器管理

-在 **设置 → MCP 服务器** 的服务器详情页，你可以：
+在 **设置 → 已部署的 MCPs** 的服务器详情页，你可以：

 - **查看工具**：查看添加到服务器的所有工作流
 - **复制 URL**：获取 MCP 客户端的服务器 URL
--- a/apps/docs/content/docs/zh/mcp/index.mdx
+++ b/apps/docs/content/docs/zh/mcp/index.mdx
@@ -27,7 +27,7 @@ MCP 服务器提供工具集合，供您的代理使用。您可以在工作区
 </div>

 1. 进入您的工作区设置
-2. 前往 **MCP Servers** 部分
+2. 前往 **Deployed MCPs** 部分
 3. 点击 **Add MCP Server**
 4. 输入服务器配置信息
 5. 保存配置
--- a/apps/sim/app/api/function/execute/route.ts
+++ b/apps/sim/app/api/function/execute/route.ts
@@ -8,7 +8,6 @@ import { executeInIsolatedVM } from '@/lib/execution/isolated-vm'
 import { CodeLanguage, DEFAULT_CODE_LANGUAGE, isValidCodeLanguage } from '@/lib/execution/languages'
 import { escapeRegExp, normalizeName, REFERENCE } from '@/executor/constants'
 import { type OutputSchema, resolveBlockReference } from '@/executor/utils/block-reference'
-import { formatLiteralForCode } from '@/executor/utils/code-formatting'
 import {
  createEnvVarPattern,
  createWorkflowVariablePattern,
@@ -388,12 +387,7 @@ function resolveWorkflowVariables(
      if (type === 'number') {
        variableValue = Number(variableValue)
      } else if (type === 'boolean') {
-        if (typeof variableValue === 'boolean') {
-          // Already a boolean, keep as-is
-        } else {
-          const normalized = String(variableValue).toLowerCase().trim()
-          variableValue = normalized === 'true'
-        }
+        variableValue = variableValue === 'true' || variableValue === true
      } else if (type === 'json' && typeof variableValue === 'string') {
        try {
          variableValue = JSON.parse(variableValue)
@@ -693,7 +687,11 @@ export async function POST(req: NextRequest) {
        prologue += `const environmentVariables = JSON.parse(${JSON.stringify(JSON.stringify(envVars))});\n`
        prologueLineCount++
        for (const [k, v] of Object.entries(contextVariables)) {
-          prologue += `const ${k} = ${formatLiteralForCode(v, 'javascript')};\n`
+          if (v === undefined) {
+            prologue += `const ${k} = undefined;\n`
+          } else {
+            prologue += `const ${k} = JSON.parse(${JSON.stringify(JSON.stringify(v))});\n`
+          }
          prologueLineCount++
        }

@@ -764,7 +762,11 @@ export async function POST(req: NextRequest) {
      prologue += `environmentVariables = json.loads(${JSON.stringify(JSON.stringify(envVars))})\n`
      prologueLineCount++
      for (const [k, v] of Object.entries(contextVariables)) {
-        prologue += `${k} = ${formatLiteralForCode(v, 'python')}\n`
+        if (v === undefined) {
+          prologue += `${k} = None\n`
+        } else {
+          prologue += `${k} = json.loads(${JSON.stringify(JSON.stringify(v))})\n`
+        }
        prologueLineCount++
      }
      const wrapped = [
--- a/apps/sim/app/api/knowledge/route.test.ts
+++ b/apps/sim/app/api/knowledge/route.test.ts
@@ -16,10 +16,6 @@ mockKnowledgeSchemas()
 mockDrizzleOrm()
 mockConsoleLogger()

-vi.mock('@/lib/workspaces/permissions/utils', () => ({
-  getUserEntityPermissions: vi.fn().mockResolvedValue({ role: 'owner' }),
-}))
-
 describe('Knowledge Base API Route', () => {
  const mockAuth$ = mockAuth()

@@ -90,7 +86,6 @@ describe('Knowledge Base API Route', () => {
    const validKnowledgeBaseData = {
      name: 'Test Knowledge Base',
      description: 'Test description',
-      workspaceId: 'test-workspace-id',
      chunkingConfig: {
        maxSize: 1024,
        minSize: 100,
@@ -138,25 +133,11 @@ describe('Knowledge Base API Route', () => {
      expect(data.details).toBeDefined()
    })

-    it('should require workspaceId', async () => {
-      mockAuth$.mockAuthenticatedUser()
-
-      const req = createMockRequest('POST', { name: 'Test KB' })
-      const { POST } = await import('@/app/api/knowledge/route')
-      const response = await POST(req)
-      const data = await response.json()
-
-      expect(response.status).toBe(400)
-      expect(data.error).toBe('Invalid request data')
-      expect(data.details).toBeDefined()
-    })
-
    it('should validate chunking config constraints', async () => {
      mockAuth$.mockAuthenticatedUser()

      const invalidData = {
        name: 'Test KB',
-        workspaceId: 'test-workspace-id',
        chunkingConfig: {
          maxSize: 100, // 100 tokens = 400 characters
          minSize: 500, // Invalid: minSize (500 chars) > maxSize (400 chars)
@@ -176,7 +157,7 @@ describe('Knowledge Base API Route', () => {
    it('should use default values for optional fields', async () => {
      mockAuth$.mockAuthenticatedUser()

-      const minimalData = { name: 'Test KB', workspaceId: 'test-workspace-id' }
+      const minimalData = { name: 'Test KB' }
      const req = createMockRequest('POST', minimalData)
      const { POST } = await import('@/app/api/knowledge/route')
      const response = await POST(req)
--- a/apps/sim/app/api/knowledge/route.ts
+++ b/apps/sim/app/api/knowledge/route.ts
@@ -19,7 +19,7 @@ const logger = createLogger('KnowledgeBaseAPI')
 const CreateKnowledgeBaseSchema = z.object({
  name: z.string().min(1, 'Name is required'),
  description: z.string().optional(),
-  workspaceId: z.string().min(1, 'Workspace ID is required'),
+  workspaceId: z.string().optional(),
  embeddingModel: z.literal('text-embedding-3-small').default('text-embedding-3-small'),
  embeddingDimension: z.literal(1536).default(1536),
  chunkingConfig: z
--- a/apps/sim/app/templates/[id]/template.tsx
+++ b/apps/sim/app/templates/[id]/template.tsx
@@ -36,7 +36,7 @@ import { useSession } from '@/lib/auth/auth-client'
 import { cn } from '@/lib/core/utils/cn'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import type { CredentialRequirement } from '@/lib/workflows/credentials/credential-extractor'
-import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { getBlock } from '@/blocks/registry'
 import { useStarTemplate, useTemplate } from '@/hooks/queries/templates'

@@ -330,7 +330,7 @@ export default function TemplateDetails({ isWorkspaceContext = false }: Template

    try {
      return (
-        <PreviewWorkflow
+        <WorkflowPreview
          workflowState={template.state}
          height='100%'
          width='100%'
--- a/apps/sim/app/templates/components/template-card.tsx
+++ b/apps/sim/app/templates/components/template-card.tsx
@@ -4,7 +4,7 @@ import { Star, User } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
 import { VerifiedBadge } from '@/components/ui/verified-badge'
 import { cn } from '@/lib/core/utils/cn'
-import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { getBlock } from '@/blocks/registry'
 import { useStarTemplate } from '@/hooks/queries/templates'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
@@ -200,14 +200,13 @@ function TemplateCardInner({
        className='pointer-events-none h-[180px] w-full cursor-pointer overflow-hidden rounded-[6px]'
      >
        {normalizedState && isInView ? (
-          <PreviewWorkflow
+          <WorkflowPreview
            workflowState={normalizedState}
            height={180}
            width='100%'
            isPannable={false}
            defaultZoom={0.8}
            fitPadding={0.2}
-            lightweight
          />
        ) : (
          <div className='h-full w-full bg-[var(--surface-4)]' />
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/execution-snapshot/execution-snapshot.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/execution-snapshot/execution-snapshot.tsx
@@ -1,6 +1,6 @@
 'use client'

-import { useCallback, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { AlertCircle, Loader2 } from 'lucide-react'
 import { createPortal } from 'react-dom'
 import {
@@ -13,8 +13,13 @@ import {
  PopoverContent,
  PopoverItem,
 } from '@/components/emcn'
+import { redactApiKeys } from '@/lib/core/security/redaction'
 import { cn } from '@/lib/core/utils/cn'
-import { Preview } from '@/app/workspace/[workspaceId]/w/components/preview'
+import {
+  getLeftmostBlockId,
+  PreviewEditor,
+  WorkflowPreview,
+} from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useExecutionSnapshot } from '@/hooks/queries/logs'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'

@@ -27,6 +32,13 @@ interface TraceSpan {
  children?: TraceSpan[]
 }

+interface BlockExecutionData {
+  input: unknown
+  output: unknown
+  status: string
+  durationMs: number
+}
+
 interface MigratedWorkflowState extends WorkflowState {
  _migrated: true
  _note?: string
@@ -58,35 +70,98 @@ export function ExecutionSnapshot({
  onClose = () => {},
 }: ExecutionSnapshotProps) {
  const { data, isLoading, error } = useExecutionSnapshot(executionId)
-  const lastExecutionIdRef = useRef<string | null>(null)
+  const [pinnedBlockId, setPinnedBlockId] = useState<string | null>(null)
+  const autoSelectedForExecutionRef = useRef<string | null>(null)

  const [isMenuOpen, setIsMenuOpen] = useState(false)
  const [menuPosition, setMenuPosition] = useState({ x: 0, y: 0 })
+  const [contextMenuBlockId, setContextMenuBlockId] = useState<string | null>(null)
  const menuRef = useRef<HTMLDivElement>(null)

  const closeMenu = useCallback(() => {
    setIsMenuOpen(false)
+    setContextMenuBlockId(null)
  }, [])

  const handleCanvasContextMenu = useCallback((e: React.MouseEvent) => {
    e.preventDefault()
    e.stopPropagation()
+    setContextMenuBlockId(null)
    setMenuPosition({ x: e.clientX, y: e.clientY })
    setIsMenuOpen(true)
  }, [])

+  const handleNodeContextMenu = useCallback(
+    (blockId: string, mousePosition: { x: number; y: number }) => {
+      setContextMenuBlockId(blockId)
+      setMenuPosition(mousePosition)
+      setIsMenuOpen(true)
+    },
+    []
+  )
+
  const handleCopyExecutionId = useCallback(() => {
    navigator.clipboard.writeText(executionId)
    closeMenu()
  }, [executionId, closeMenu])

+  const handleOpenDetails = useCallback(() => {
+    if (contextMenuBlockId) {
+      setPinnedBlockId(contextMenuBlockId)
+    }
+    closeMenu()
+  }, [contextMenuBlockId, closeMenu])
+
+  const blockExecutions = useMemo(() => {
+    if (!traceSpans || !Array.isArray(traceSpans)) return {}
+
+    const blockExecutionMap: Record<string, BlockExecutionData> = {}
+
+    const collectBlockSpans = (spans: TraceSpan[]): TraceSpan[] => {
+      const blockSpans: TraceSpan[] = []
+
+      for (const span of spans) {
+        if (span.blockId) {
+          blockSpans.push(span)
+        }
+        if (span.children && Array.isArray(span.children)) {
+          blockSpans.push(...collectBlockSpans(span.children))
+        }
+      }
+
+      return blockSpans
+    }
+
+    const allBlockSpans = collectBlockSpans(traceSpans)
+
+    for (const span of allBlockSpans) {
+      if (span.blockId && !blockExecutionMap[span.blockId]) {
+        blockExecutionMap[span.blockId] = {
+          input: redactApiKeys(span.input || {}),
+          output: redactApiKeys(span.output || {}),
+          status: span.status || 'unknown',
+          durationMs: span.duration || 0,
+        }
+      }
+    }
+
+    return blockExecutionMap
+  }, [traceSpans])
+
  const workflowState = data?.workflowState as WorkflowState | undefined

-  // Track execution ID changes for key reset
-  const executionKey = executionId !== lastExecutionIdRef.current ? executionId : undefined
-  if (executionId !== lastExecutionIdRef.current) {
-    lastExecutionIdRef.current = executionId
-  }
+  // Auto-select the leftmost block once when data loads for a new executionId
+  useEffect(() => {
+    if (
+      workflowState &&
+      !isMigratedWorkflowState(workflowState) &&
+      autoSelectedForExecutionRef.current !== executionId
+    ) {
+      autoSelectedForExecutionRef.current = executionId
+      const leftmostId = getLeftmostBlockId(workflowState)
+      setPinnedBlockId(leftmostId)
+    }
+  }, [executionId, workflowState])

  const renderContent = () => {
    if (isLoading) {
@@ -151,17 +226,44 @@ export function ExecutionSnapshot({
    }

    return (
-      <Preview
-        key={executionKey}
-        workflowState={workflowState}
-        traceSpans={traceSpans}
-        className={className}
-        height={height}
-        width={width}
-        onCanvasContextMenu={handleCanvasContextMenu}
-        showBorder={!isModal}
-        autoSelectLeftmost
-      />
+      <div
+        style={{ height, width }}
+        className={cn(
+          'flex overflow-hidden',
+          !isModal && 'rounded-[4px] border border-[var(--border)]',
+          className
+        )}
+      >
+        <div className='h-full flex-1' onContextMenu={handleCanvasContextMenu}>
+          <WorkflowPreview
+            workflowState={workflowState}
+            isPannable={true}
+            defaultPosition={{ x: 0, y: 0 }}
+            defaultZoom={0.8}
+            onNodeClick={(blockId) => {
+              setPinnedBlockId(blockId)
+            }}
+            onNodeContextMenu={handleNodeContextMenu}
+            onPaneClick={() => setPinnedBlockId(null)}
+            cursorStyle='pointer'
+            executedBlocks={blockExecutions}
+            selectedBlockId={pinnedBlockId}
+          />
+        </div>
+        {pinnedBlockId && workflowState.blocks[pinnedBlockId] && (
+          <PreviewEditor
+            block={workflowState.blocks[pinnedBlockId]}
+            executionData={blockExecutions[pinnedBlockId]}
+            allBlockExecutions={blockExecutions}
+            workflowBlocks={workflowState.blocks}
+            workflowVariables={workflowState.variables}
+            loops={workflowState.loops}
+            parallels={workflowState.parallels}
+            isExecutionMode
+            onClose={() => setPinnedBlockId(null)}
+          />
+        )}
+      </div>
    )
  }

@@ -185,6 +287,9 @@ export function ExecutionSnapshot({
              }}
            />
            <PopoverContent ref={menuRef} align='start' side='bottom' sideOffset={4}>
+              {contextMenuBlockId && (
+                <PopoverItem onClick={handleOpenDetails}>Open Details</PopoverItem>
+              )}
              <PopoverItem onClick={handleCopyExecutionId}>Copy Execution ID</PopoverItem>
            </PopoverContent>
          </Popover>,
@@ -199,6 +304,7 @@ export function ExecutionSnapshot({
          open={isOpen}
          onOpenChange={(open) => {
            if (!open) {
+              setPinnedBlockId(null)
              onClose()
            }
          }}
--- a/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx
@@ -3,7 +3,7 @@ import { Star, User } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
 import { VerifiedBadge } from '@/components/ui/verified-badge'
 import { cn } from '@/lib/core/utils/cn'
-import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { getBlock } from '@/blocks/registry'
 import { useStarTemplate } from '@/hooks/queries/templates'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
@@ -206,7 +206,7 @@ function TemplateCardInner({
        className='pointer-events-none h-[180px] w-full overflow-hidden rounded-[6px]'
      >
        {normalizedState && isInView ? (
-          <PreviewWorkflow
+          <WorkflowPreview
            workflowState={normalizedState}
            height={180}
            width='100%'
@@ -214,7 +214,6 @@ function TemplateCardInner({
            defaultZoom={0.8}
            fitPadding={0.2}
            cursorStyle='pointer'
-            lightweight
          />
        ) : (
          <div className='h-full w-full bg-[var(--surface-4)] dark:bg-[var(--surface-5)]' />
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx
@@ -25,277 +25,18 @@ function extractFieldValue(rawValue: unknown): string | undefined {
  return undefined
 }

-type EmbedInfo = {
-  url: string
-  type: 'iframe' | 'video' | 'audio'
-  aspectRatio?: string
-}
-
-const EMBED_SCALE = 0.78
-const EMBED_INVERSE_SCALE = `${(1 / EMBED_SCALE) * 100}%`
-
-function getTwitchParent(): string {
-  return typeof window !== 'undefined' ? window.location.hostname : 'localhost'
-}
-
 /**
- * Get embed info for supported media platforms
+ * Extract YouTube video ID from various YouTube URL formats
 */
-function getEmbedInfo(url: string): EmbedInfo | null {
-  const youtubeMatch = url.match(
-    /(?:youtube\.com\/watch\?(?:.*&)?v=|youtu\.be\/|youtube\.com\/embed\/)([a-zA-Z0-9_-]{11})/
-  )
-  if (youtubeMatch) {
-    return { url: `https://www.youtube.com/embed/${youtubeMatch[1]}`, type: 'iframe' }
+function getYouTubeVideoId(url: string): string | null {
+  const patterns = [
+    /(?:youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/embed\/)([a-zA-Z0-9_-]{11})/,
+    /youtube\.com\/watch\?.*v=([a-zA-Z0-9_-]{11})/,
+  ]
+  for (const pattern of patterns) {
+    const match = url.match(pattern)
+    if (match) return match[1]
  }
-
-  const vimeoMatch = url.match(/vimeo\.com\/(\d+)/)
-  if (vimeoMatch) {
-    return { url: `https://player.vimeo.com/video/${vimeoMatch[1]}`, type: 'iframe' }
-  }
-
-  const dailymotionMatch = url.match(/dailymotion\.com\/video\/([a-zA-Z0-9]+)/)
-  if (dailymotionMatch) {
-    return { url: `https://www.dailymotion.com/embed/video/${dailymotionMatch[1]}`, type: 'iframe' }
-  }
-
-  const twitchVideoMatch = url.match(/twitch\.tv\/videos\/(\d+)/)
-  if (twitchVideoMatch) {
-    return {
-      url: `https://player.twitch.tv/?video=${twitchVideoMatch[1]}&parent=${getTwitchParent()}`,
-      type: 'iframe',
-    }
-  }
-
-  const twitchChannelMatch = url.match(/twitch\.tv\/([a-zA-Z0-9_]+)(?:\/|$)/)
-  if (twitchChannelMatch && !url.includes('/videos/') && !url.includes('/clip/')) {
-    return {
-      url: `https://player.twitch.tv/?channel=${twitchChannelMatch[1]}&parent=${getTwitchParent()}`,
-      type: 'iframe',
-    }
-  }
-
-  const streamableMatch = url.match(/streamable\.com\/([a-zA-Z0-9]+)/)
-  if (streamableMatch) {
-    return { url: `https://streamable.com/e/${streamableMatch[1]}`, type: 'iframe' }
-  }
-
-  const wistiaMatch = url.match(/(?:wistia\.com|wistia\.net)\/(?:medias|embed)\/([a-zA-Z0-9]+)/)
-  if (wistiaMatch) {
-    return { url: `https://fast.wistia.net/embed/iframe/${wistiaMatch[1]}`, type: 'iframe' }
-  }
-
-  const tiktokMatch = url.match(/tiktok\.com\/@[^/]+\/video\/(\d+)/)
-  if (tiktokMatch) {
-    return {
-      url: `https://www.tiktok.com/embed/v2/${tiktokMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '9/16',
-    }
-  }
-
-  const soundcloudMatch = url.match(/soundcloud\.com\/([a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+)/)
-  if (soundcloudMatch) {
-    return {
-      url: `https://w.soundcloud.com/player/?url=${encodeURIComponent(url)}&color=%23ff5500&auto_play=false&hide_related=true&show_comments=false&show_user=true&show_reposts=false&show_teaser=false`,
-      type: 'iframe',
-      aspectRatio: '3/2',
-    }
-  }
-
-  const spotifyTrackMatch = url.match(/open\.spotify\.com\/track\/([a-zA-Z0-9]+)/)
-  if (spotifyTrackMatch) {
-    return {
-      url: `https://open.spotify.com/embed/track/${spotifyTrackMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '3.7/1',
-    }
-  }
-
-  const spotifyAlbumMatch = url.match(/open\.spotify\.com\/album\/([a-zA-Z0-9]+)/)
-  if (spotifyAlbumMatch) {
-    return {
-      url: `https://open.spotify.com/embed/album/${spotifyAlbumMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '2/3',
-    }
-  }
-
-  const spotifyPlaylistMatch = url.match(/open\.spotify\.com\/playlist\/([a-zA-Z0-9]+)/)
-  if (spotifyPlaylistMatch) {
-    return {
-      url: `https://open.spotify.com/embed/playlist/${spotifyPlaylistMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '2/3',
-    }
-  }
-
-  const spotifyEpisodeMatch = url.match(/open\.spotify\.com\/episode\/([a-zA-Z0-9]+)/)
-  if (spotifyEpisodeMatch) {
-    return {
-      url: `https://open.spotify.com/embed/episode/${spotifyEpisodeMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '2.5/1',
-    }
-  }
-
-  const spotifyShowMatch = url.match(/open\.spotify\.com\/show\/([a-zA-Z0-9]+)/)
-  if (spotifyShowMatch) {
-    return {
-      url: `https://open.spotify.com/embed/show/${spotifyShowMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '3.7/1',
-    }
-  }
-
-  const appleMusicSongMatch = url.match(/music\.apple\.com\/([a-z]{2})\/song\/[^/]+\/(\d+)/)
-  if (appleMusicSongMatch) {
-    const [, country, songId] = appleMusicSongMatch
-    return {
-      url: `https://embed.music.apple.com/${country}/song/${songId}`,
-      type: 'iframe',
-      aspectRatio: '3/2',
-    }
-  }
-
-  const appleMusicAlbumMatch = url.match(/music\.apple\.com\/([a-z]{2})\/album\/(?:[^/]+\/)?(\d+)/)
-  if (appleMusicAlbumMatch) {
-    const [, country, albumId] = appleMusicAlbumMatch
-    return {
-      url: `https://embed.music.apple.com/${country}/album/${albumId}`,
-      type: 'iframe',
-      aspectRatio: '2/3',
-    }
-  }
-
-  const appleMusicPlaylistMatch = url.match(
-    /music\.apple\.com\/([a-z]{2})\/playlist\/[^/]+\/(pl\.[a-zA-Z0-9]+)/
-  )
-  if (appleMusicPlaylistMatch) {
-    const [, country, playlistId] = appleMusicPlaylistMatch
-    return {
-      url: `https://embed.music.apple.com/${country}/playlist/${playlistId}`,
-      type: 'iframe',
-      aspectRatio: '2/3',
-    }
-  }
-
-  const loomMatch = url.match(/loom\.com\/share\/([a-zA-Z0-9]+)/)
-  if (loomMatch) {
-    return { url: `https://www.loom.com/embed/${loomMatch[1]}`, type: 'iframe' }
-  }
-
-  const facebookVideoMatch =
-    url.match(/facebook\.com\/.*\/videos\/(\d+)/) || url.match(/fb\.watch\/([a-zA-Z0-9_-]+)/)
-  if (facebookVideoMatch) {
-    return {
-      url: `https://www.facebook.com/plugins/video.php?href=${encodeURIComponent(url)}&show_text=false`,
-      type: 'iframe',
-    }
-  }
-
-  const instagramReelMatch = url.match(/instagram\.com\/reel\/([a-zA-Z0-9_-]+)/)
-  if (instagramReelMatch) {
-    return {
-      url: `https://www.instagram.com/reel/${instagramReelMatch[1]}/embed`,
-      type: 'iframe',
-      aspectRatio: '9/16',
-    }
-  }
-
-  const instagramPostMatch = url.match(/instagram\.com\/p\/([a-zA-Z0-9_-]+)/)
-  if (instagramPostMatch) {
-    return {
-      url: `https://www.instagram.com/p/${instagramPostMatch[1]}/embed`,
-      type: 'iframe',
-      aspectRatio: '4/5',
-    }
-  }
-
-  const twitterMatch = url.match(/(?:twitter\.com|x\.com)\/[^/]+\/status\/(\d+)/)
-  if (twitterMatch) {
-    return {
-      url: `https://platform.twitter.com/embed/Tweet.html?id=${twitterMatch[1]}`,
-      type: 'iframe',
-      aspectRatio: '3/4',
-    }
-  }
-
-  const rumbleMatch =
-    url.match(/rumble\.com\/embed\/([a-zA-Z0-9]+)/) || url.match(/rumble\.com\/([a-zA-Z0-9]+)-/)
-  if (rumbleMatch) {
-    return { url: `https://rumble.com/embed/${rumbleMatch[1]}/`, type: 'iframe' }
-  }
-
-  const bilibiliMatch = url.match(/bilibili\.com\/video\/(BV[a-zA-Z0-9]+)/)
-  if (bilibiliMatch) {
-    return {
-      url: `https://player.bilibili.com/player.html?bvid=${bilibiliMatch[1]}&high_quality=1`,
-      type: 'iframe',
-    }
-  }
-
-  const vidyardMatch = url.match(/(?:vidyard\.com|share\.vidyard\.com)\/watch\/([a-zA-Z0-9]+)/)
-  if (vidyardMatch) {
-    return { url: `https://play.vidyard.com/${vidyardMatch[1]}`, type: 'iframe' }
-  }
-
-  const cfStreamMatch =
-    url.match(/cloudflarestream\.com\/([a-zA-Z0-9]+)/) ||
-    url.match(/videodelivery\.net\/([a-zA-Z0-9]+)/)
-  if (cfStreamMatch) {
-    return { url: `https://iframe.cloudflarestream.com/${cfStreamMatch[1]}`, type: 'iframe' }
-  }
-
-  const twitchClipMatch =
-    url.match(/clips\.twitch\.tv\/([a-zA-Z0-9_-]+)/) ||
-    url.match(/twitch\.tv\/[^/]+\/clip\/([a-zA-Z0-9_-]+)/)
-  if (twitchClipMatch) {
-    return {
-      url: `https://clips.twitch.tv/embed?clip=${twitchClipMatch[1]}&parent=${getTwitchParent()}`,
-      type: 'iframe',
-    }
-  }
-
-  const mixcloudMatch = url.match(/mixcloud\.com\/([^/]+\/[^/]+)/)
-  if (mixcloudMatch) {
-    return {
-      url: `https://www.mixcloud.com/widget/iframe/?feed=%2F${encodeURIComponent(mixcloudMatch[1])}%2F&hide_cover=1`,
-      type: 'iframe',
-      aspectRatio: '2/1',
-    }
-  }
-
-  const googleDriveMatch = url.match(/drive\.google\.com\/file\/d\/([a-zA-Z0-9_-]+)/)
-  if (googleDriveMatch) {
-    return { url: `https://drive.google.com/file/d/${googleDriveMatch[1]}/preview`, type: 'iframe' }
-  }
-
-  if (url.includes('dropbox.com') && /\.(mp4|mov|webm)/.test(url)) {
-    const directUrl = url
-      .replace('www.dropbox.com', 'dl.dropboxusercontent.com')
-      .replace('?dl=0', '')
-    return { url: directUrl, type: 'video' }
-  }
-
-  const tenorMatch = url.match(/tenor\.com\/view\/[^/]+-(\d+)/)
-  if (tenorMatch) {
-    return { url: `https://tenor.com/embed/${tenorMatch[1]}`, type: 'iframe', aspectRatio: '1/1' }
-  }
-
-  const giphyMatch = url.match(/giphy\.com\/(?:gifs|embed)\/(?:.*-)?([a-zA-Z0-9]+)/)
-  if (giphyMatch) {
-    return { url: `https://giphy.com/embed/${giphyMatch[1]}`, type: 'iframe', aspectRatio: '1/1' }
-  }
-
-  if (/\.(mp4|webm|ogg|mov)(\?|$)/i.test(url)) {
-    return { url, type: 'video' }
-  }
-
-  if (/\.(mp3|wav|m4a|aac)(\?|$)/i.test(url)) {
-    return { url, type: 'audio' }
-  }
-
  return null
 }

@@ -367,57 +108,29 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
          )
        },
        a: ({ href, children }: any) => {
-          const embedInfo = href ? getEmbedInfo(href) : null
-          if (embedInfo) {
+          const videoId = href ? getYouTubeVideoId(href) : null
+          if (videoId) {
            return (
-              <span className='my-2 block w-full'>
+              <span className='inline'>
                <a
                  href={href}
                  target='_blank'
                  rel='noopener noreferrer'
-                  className='mb-1 block break-all text-[var(--brand-secondary)] underline-offset-2 hover:underline'
+                  className='text-[var(--brand-secondary)] underline-offset-2 hover:underline'
                >
                  {children}
                </a>
-                <span className='block w-full overflow-hidden rounded-md'>
-                  {embedInfo.type === 'iframe' && (
-                    <span
-                      className='block overflow-hidden'
-                      style={{
-                        width: '100%',
-                        aspectRatio: embedInfo.aspectRatio || '16/9',
-                      }}
-                    >
-                      <iframe
-                        src={embedInfo.url}
-                        title='Media'
-                        allow='accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share'
-                        allowFullScreen
-                        loading='lazy'
-                        className='origin-top-left'
-                        style={{
-                          width: EMBED_INVERSE_SCALE,
-                          height: EMBED_INVERSE_SCALE,
-                          transform: `scale(${EMBED_SCALE})`,
-                        }}
-                      />
-                    </span>
-                  )}
-                  {embedInfo.type === 'video' && (
-                    <video
-                      src={embedInfo.url}
-                      controls
-                      preload='metadata'
-                      className='aspect-video w-full'
-                    >
-                      <track kind='captions' src='' default />
-                    </video>
-                  )}
-                  {embedInfo.type === 'audio' && (
-                    <audio src={embedInfo.url} controls preload='metadata' className='w-full'>
-                      <track kind='captions' src='' default />
-                    </audio>
-                  )}
+                <span className='mt-1.5 block overflow-hidden rounded-md'>
+                  <iframe
+                    src={`https://www.youtube.com/embed/${videoId}`}
+                    title='YouTube video'
+                    allow='accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture; web-share'
+                    allowFullScreen
+                    loading='lazy'
+                    referrerPolicy='strict-origin-when-cross-origin'
+                    sandbox='allow-scripts allow-same-origin allow-presentation allow-popups'
+                    className='aspect-video w-full'
+                  />
                </span>
              </span>
            )
@@ -427,7 +140,7 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
              href={href}
              target='_blank'
              rel='noopener noreferrer'
-              className='break-all text-[var(--brand-secondary)] underline-offset-2 hover:underline'
+              className='text-[var(--brand-secondary)] underline-offset-2 hover:underline'
            >
              {children}
            </a>
@@ -446,26 +159,6 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
            {children}
          </blockquote>
        ),
-        table: ({ children }: any) => (
-          <div className='my-2 max-w-full overflow-x-auto'>
-            <table className='w-full border-collapse text-xs'>{children}</table>
-          </div>
-        ),
-        thead: ({ children }: any) => (
-          <thead className='border-[var(--border)] border-b'>{children}</thead>
-        ),
-        tbody: ({ children }: any) => <tbody>{children}</tbody>,
-        tr: ({ children }: any) => (
-          <tr className='border-[var(--border)] border-b last:border-b-0'>{children}</tr>
-        ),
-        th: ({ children }: any) => (
-          <th className='px-2 py-1 text-left font-semibold text-[var(--text-primary)]'>
-            {children}
-          </th>
-        ),
-        td: ({ children }: any) => (
-          <td className='px-2 py-1 text-[var(--text-secondary)]'>{children}</td>
-        ),
      }}
    >
      {content}
@@ -478,7 +171,7 @@ export const NoteBlock = memo(function NoteBlock({
  data,
  selected,
 }: NodeProps<NoteBlockNodeData>) {
-  const { type, name } = data
+  const { type, config, name } = data

  const { activeWorkflowId, isEnabled, handleClick, hasRing, ringStyles } = useBlockVisual({
    blockId: id,
@@ -555,8 +248,8 @@ export const NoteBlock = memo(function NoteBlock({
          </div>
        </div>

-        <div className='relative overflow-hidden p-[8px]'>
-          <div className='relative max-w-full break-all'>
+        <div className='relative p-[8px]'>
+          <div className='relative break-words'>
            {isEmpty ? (
              <p className='text-[#868686] text-sm'>Add note...</p>
            ) : (
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/general.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/general.tsx
@@ -1,6 +1,6 @@
 'use client'

-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import {
  Button,
@@ -17,7 +17,11 @@ import {
 } from '@/components/emcn'
 import { Skeleton } from '@/components/ui'
 import type { WorkflowDeploymentVersionResponse } from '@/lib/workflows/persistence/utils'
-import { Preview, PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
+import {
+  getLeftmostBlockId,
+  PreviewEditor,
+  WorkflowPreview,
+} from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useDeploymentVersionState, useRevertToVersion } from '@/hooks/queries/workflows'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 import { Versions } from './components'
@@ -55,6 +59,8 @@ export function GeneralDeploy({
  const [showLoadDialog, setShowLoadDialog] = useState(false)
  const [showPromoteDialog, setShowPromoteDialog] = useState(false)
  const [showExpandedPreview, setShowExpandedPreview] = useState(false)
+  const [expandedSelectedBlockId, setExpandedSelectedBlockId] = useState<string | null>(null)
+  const hasAutoSelectedRef = useRef(false)
  const [versionToLoad, setVersionToLoad] = useState<number | null>(null)
  const [versionToPromote, setVersionToPromote] = useState<number | null>(null)

@@ -129,6 +135,19 @@ export function GeneralDeploy({
  const hasDeployedData = deployedState && Object.keys(deployedState.blocks || {}).length > 0
  const showLoadingSkeleton = isLoadingDeployedState && !hasDeployedData

+  // Auto-select the leftmost block once when expanded preview opens
+  useEffect(() => {
+    if (showExpandedPreview && workflowToShow && !hasAutoSelectedRef.current) {
+      hasAutoSelectedRef.current = true
+      const leftmostId = getLeftmostBlockId(workflowToShow)
+      setExpandedSelectedBlockId(leftmostId)
+    }
+    // Reset when modal closes
+    if (!showExpandedPreview) {
+      hasAutoSelectedRef.current = false
+    }
+  }, [showExpandedPreview, workflowToShow])
+
  if (showLoadingSkeleton) {
    return (
      <div className='space-y-[12px]'>
@@ -186,7 +205,7 @@ export function GeneralDeploy({
            {workflowToShow ? (
              <>
                <div className='[&_*]:!cursor-default h-full w-full cursor-default'>
-                  <PreviewWorkflow
+                  <WorkflowPreview
                    workflowState={workflowToShow}
                    height='100%'
                    width='100%'
@@ -287,15 +306,46 @@ export function GeneralDeploy({
      </Modal>

      {workflowToShow && (
-        <Modal open={showExpandedPreview} onOpenChange={setShowExpandedPreview}>
+        <Modal
+          open={showExpandedPreview}
+          onOpenChange={(open) => {
+            if (!open) {
+              setExpandedSelectedBlockId(null)
+            }
+            setShowExpandedPreview(open)
+          }}
+        >
          <ModalContent size='full' className='flex h-[90vh] flex-col'>
            <ModalHeader>
              {previewMode === 'selected' && selectedVersionInfo
                ? selectedVersionInfo.name || `v${selectedVersion}`
                : 'Live Workflow'}
            </ModalHeader>
-            <ModalBody className='!p-0 min-h-0 flex-1 overflow-hidden'>
-              <Preview workflowState={workflowToShow} autoSelectLeftmost />
+            <ModalBody className='!p-0 min-h-0 flex-1'>
+              <div className='flex h-full w-full overflow-hidden'>
+                <div className='h-full flex-1'>
+                  <WorkflowPreview
+                    workflowState={workflowToShow}
+                    isPannable={true}
+                    defaultPosition={{ x: 0, y: 0 }}
+                    defaultZoom={0.6}
+                    onNodeClick={(blockId) => {
+                      setExpandedSelectedBlockId(blockId)
+                    }}
+                    onPaneClick={() => setExpandedSelectedBlockId(null)}
+                    selectedBlockId={expandedSelectedBlockId}
+                  />
+                </div>
+                {expandedSelectedBlockId && workflowToShow.blocks?.[expandedSelectedBlockId] && (
+                  <PreviewEditor
+                    block={workflowToShow.blocks[expandedSelectedBlockId]}
+                    workflowVariables={workflowToShow.variables}
+                    loops={workflowToShow.loops}
+                    parallels={workflowToShow.parallels}
+                    onClose={() => setExpandedSelectedBlockId(null)}
+                  />
+                )}
+              </div>
            </ModalBody>
          </ModalContent>
        </Modal>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp/mcp.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp/mcp.tsx
@@ -435,7 +435,7 @@ export function McpDeploy({
    return (
      <div className='flex h-full flex-col items-center justify-center gap-3'>
        <p className='text-[13px] text-[var(--text-muted)]'>
-          Create an MCP Server in Settings → MCP Servers first.
+          Create an MCP Server in Settings → Deployed MCPs first.
        </p>
        <Button
          variant='tertiary'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx
@@ -19,7 +19,7 @@ import { Skeleton } from '@/components/ui'
 import { useSession } from '@/lib/auth/auth-client'
 import { cn } from '@/lib/core/utils/cn'
 import { captureAndUploadOGImage, OG_IMAGE_HEIGHT, OG_IMAGE_WIDTH } from '@/lib/og'
-import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useCreatorProfiles } from '@/hooks/queries/creator-profile'
 import {
  useCreateTemplate,
@@ -439,14 +439,13 @@ const OGCaptureContainer = forwardRef<HTMLDivElement>((_, ref) => {
      }}
      aria-hidden='true'
    >
-      <PreviewWorkflow
+      <WorkflowPreview
        workflowState={workflowState}
        height='100%'
        width='100%'
        isPannable={false}
        defaultZoom={0.8}
        fitPadding={0.2}
-        lightweight
      />
    </div>
  )
@@ -478,7 +477,7 @@ function TemplatePreviewContent({ existingTemplate }: TemplatePreviewContentProp
  }

  return (
-    <PreviewWorkflow
+    <WorkflowPreview
      key={`template-preview-${existingTemplate.id}`}
      workflowState={workflowState}
      height='100%'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
@@ -39,8 +39,6 @@ import { normalizeName } from '@/executor/constants'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useTagSelection } from '@/hooks/kb/use-tag-selection'
 import { createShouldHighlightEnvVar, useAvailableEnvVarKeys } from '@/hooks/use-available-env-vars'
-import { useCodeUndoRedo } from '@/hooks/use-code-undo-redo'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'

 const logger = createLogger('Code')

@@ -214,6 +212,7 @@ export const Code = memo(function Code({
  const handleStreamStartRef = useRef<() => void>(() => {})
  const handleGeneratedContentRef = useRef<(generatedCode: string) => void>(() => {})
  const handleStreamChunkRef = useRef<(chunk: string) => void>(() => {})
+  const hasEditedSinceFocusRef = useRef(false)
  const codeRef = useRef(code)
  codeRef.current = code

@@ -221,12 +220,8 @@ export const Code = memo(function Code({
  const emitTagSelection = useTagSelection(blockId, subBlockId)
  const [languageValue] = useSubBlockValue<string>(blockId, 'language')
  const availableEnvVars = useAvailableEnvVarKeys(workspaceId)
-  const blockType = useWorkflowStore(
-    useCallback((state) => state.blocks?.[blockId]?.type, [blockId])
-  )

  const effectiveLanguage = (languageValue as 'javascript' | 'python' | 'json') || language
-  const isFunctionCode = blockType === 'function' && subBlockId === 'code'

  const trimmedCode = code.trim()
  const containsReferencePlaceholders =
@@ -301,15 +296,6 @@ export const Code = memo(function Code({
  const updatePromptValue = wandHook?.updatePromptValue || (() => {})
  const cancelGeneration = wandHook?.cancelGeneration || (() => {})

-  const { recordChange, recordReplace, flushPending, startSession, undo, redo } = useCodeUndoRedo({
-    blockId,
-    subBlockId,
-    value: code,
-    enabled: isFunctionCode,
-    isReadOnly: readOnly || disabled || isPreview,
-    isStreaming: isAiStreaming,
-  })
-
  const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlockId, false, {
    isStreaming: isAiStreaming,
    onStreamingEnd: () => {
@@ -361,10 +347,9 @@ export const Code = memo(function Code({
      setCode(generatedCode)
      if (!isPreview && !disabled) {
        setStoreValue(generatedCode)
-        recordReplace(generatedCode)
      }
    }
-  }, [disabled, isPreview, recordReplace, setStoreValue])
+  }, [isPreview, disabled, setStoreValue])

  useEffect(() => {
    if (!editorRef.current) return
@@ -507,7 +492,7 @@ export const Code = memo(function Code({

      setCode(newValue)
      setStoreValue(newValue)
-      recordChange(newValue)
+      hasEditedSinceFocusRef.current = true
      const newCursorPosition = dropPosition + 1
      setCursorPosition(newCursorPosition)

@@ -536,7 +521,7 @@ export const Code = memo(function Code({
    if (!isPreview && !readOnly) {
      setCode(newValue)
      emitTagSelection(newValue)
-      recordChange(newValue)
+      hasEditedSinceFocusRef.current = true
    }
    setShowTags(false)
    setActiveSourceBlockId(null)
@@ -554,7 +539,7 @@ export const Code = memo(function Code({
    if (!isPreview && !readOnly) {
      setCode(newValue)
      emitTagSelection(newValue)
-      recordChange(newValue)
+      hasEditedSinceFocusRef.current = true
    }
    setShowEnvVars(false)

@@ -640,9 +625,9 @@ export const Code = memo(function Code({
  const handleValueChange = useCallback(
    (newCode: string) => {
      if (!isAiStreaming && !isPreview && !disabled && !readOnly) {
+        hasEditedSinceFocusRef.current = true
        setCode(newCode)
        setStoreValue(newCode)
-        recordChange(newCode)

        const textarea = editorRef.current?.querySelector('textarea')
        if (textarea) {
@@ -661,7 +646,7 @@ export const Code = memo(function Code({
        }
      }
    },
-    [isAiStreaming, isPreview, disabled, readOnly, recordChange, setStoreValue]
+    [isAiStreaming, isPreview, disabled, readOnly, setStoreValue]
  )

  const handleKeyDown = useCallback(
@@ -672,39 +657,21 @@ export const Code = memo(function Code({
      }
      if (isAiStreaming) {
        e.preventDefault()
-        return
      }
-      if (!isFunctionCode) return
-      const isUndo = (e.key === 'z' || e.key === 'Z') && (e.metaKey || e.ctrlKey) && !e.shiftKey
-      const isRedo =
-        ((e.key === 'z' || e.key === 'Z') && (e.metaKey || e.ctrlKey) && e.shiftKey) ||
-        (e.key === 'y' && (e.metaKey || e.ctrlKey))
-      if (isUndo) {
+      if (e.key === 'z' && (e.metaKey || e.ctrlKey) && !hasEditedSinceFocusRef.current) {
        e.preventDefault()
-        e.stopPropagation()
-        undo()
-        return
-      }
-      if (isRedo) {
-        e.preventDefault()
-        e.stopPropagation()
-        redo()
      }
    },
-    [isAiStreaming, isFunctionCode, redo, undo]
+    [isAiStreaming]
  )

  const handleEditorFocus = useCallback(() => {
-    startSession(codeRef.current)
+    hasEditedSinceFocusRef.current = false
    if (!isPreview && !disabled && !readOnly && codeRef.current.trim() === '') {
      setShowTags(true)
      setCursorPosition(0)
    }
-  }, [disabled, isPreview, readOnly, startSession])
-
-  const handleEditorBlur = useCallback(() => {
-    flushPending()
-  }, [flushPending])
+  }, [isPreview, disabled, readOnly])

  /**
   * Renders the line numbers, aligned with wrapped visual lines and highlighting the active line.
@@ -824,7 +791,6 @@ export const Code = memo(function Code({
            onValueChange={handleValueChange}
            onKeyDown={handleKeyDown}
            onFocus={handleEditorFocus}
-            onBlur={handleEditorBlur}
            highlight={highlightCode}
            {...getCodeEditorProps({ isStreaming: isAiStreaming, isPreview, disabled })}
          />
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
@@ -38,7 +38,7 @@ import { LoopTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/component
 import { ParallelTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/parallel/parallel-config'
 import { getSubBlockStableKey } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { getBlock } from '@/blocks/registry'
 import type { SubBlockType } from '@/blocks/types'
 import { useWorkflowState } from '@/hooks/queries/workflows'
@@ -458,7 +458,7 @@ export function Editor() {
                      ) : childWorkflowState ? (
                        <>
                          <div className='[&_*:active]:!cursor-grabbing [&_*]:!cursor-grab [&_.react-flow__handle]:!hidden h-full w-full'>
-                            <PreviewWorkflow
+                            <WorkflowPreview
                              workflowState={childWorkflowState}
                              height={160}
                              width='100%'
@@ -466,7 +466,6 @@ export function Editor() {
                              defaultZoom={0.6}
                              fitPadding={0.15}
                              cursorStyle='grab'
-                              lightweight
                            />
                          </div>
                          <Tooltip.Root>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/index.ts
@@ -1,2 +1,2 @@
 export { LogRowContextMenu } from './log-row-context-menu'
-export { OutputPanel } from './output-panel'
+export { OutputContextMenu } from './output-context-menu'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/components/output-context-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/components/output-context-menu.tsx
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/index.ts
@@ -1,2 +0,0 @@
-export type { OutputPanelProps } from './output-panel'
-export { OutputPanel } from './output-panel'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/output-panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/output-panel.tsx
@@ -1,601 +0,0 @@
-'use client'
-
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import clsx from 'clsx'
-import {
-  ArrowDown,
-  ArrowDownToLine,
-  ArrowUp,
-  Check,
-  ChevronDown,
-  Clipboard,
-  Database,
-  FilterX,
-  MoreHorizontal,
-  Palette,
-  Pause,
-  Search,
-  Trash2,
-  X,
-} from 'lucide-react'
-import Link from 'next/link'
-import {
-  Button,
-  Code,
-  Input,
-  Popover,
-  PopoverContent,
-  PopoverItem,
-  PopoverTrigger,
-  Tooltip,
-} from '@/components/emcn'
-import { OutputContextMenu } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components/output-panel/components/output-context-menu'
-import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
-import { useCodeViewerFeatures } from '@/hooks/use-code-viewer'
-import type { ConsoleEntry } from '@/stores/terminal'
-
-interface OutputCodeContentProps {
-  code: string
-  language: 'javascript' | 'json'
-  wrapText: boolean
-  searchQuery: string | undefined
-  currentMatchIndex: number
-  onMatchCountChange: (count: number) => void
-  contentRef: React.RefObject<HTMLDivElement | null>
-}
-
-const OutputCodeContent = React.memo(function OutputCodeContent({
-  code,
-  language,
-  wrapText,
-  searchQuery,
-  currentMatchIndex,
-  onMatchCountChange,
-  contentRef,
-}: OutputCodeContentProps) {
-  return (
-    <Code.Viewer
-      code={code}
-      showGutter
-      language={language}
-      className='m-0 min-h-full rounded-none border-0 bg-[var(--surface-1)] dark:bg-[var(--surface-1)]'
-      paddingLeft={8}
-      gutterStyle={{ backgroundColor: 'transparent' }}
-      wrapText={wrapText}
-      searchQuery={searchQuery}
-      currentMatchIndex={currentMatchIndex}
-      onMatchCountChange={onMatchCountChange}
-      contentRef={contentRef}
-      virtualized
-      showCollapseColumn={language === 'json'}
-    />
-  )
-})
-
-/**
- * Reusable toggle button component
- */
-const ToggleButton = ({
-  isExpanded,
-  onClick,
-}: {
-  isExpanded: boolean
-  onClick: (e: React.MouseEvent) => void
-}) => (
-  <Button variant='ghost' className='!p-1.5 -m-1.5' onClick={onClick} aria-label='Toggle terminal'>
-    <ChevronDown
-      className={clsx(
-        'h-3.5 w-3.5 flex-shrink-0 transition-transform duration-100',
-        !isExpanded && 'rotate-180'
-      )}
-    />
-  </Button>
-)
-
-/**
- * Props for the OutputPanel component
- */
-export interface OutputPanelProps {
-  selectedEntry: ConsoleEntry
-  outputPanelWidth: number
-  handleOutputPanelResizeMouseDown: (e: React.MouseEvent) => void
-  handleHeaderClick: () => void
-  isExpanded: boolean
-  expandToLastHeight: () => void
-  showInput: boolean
-  setShowInput: (show: boolean) => void
-  hasInputData: boolean
-  isPlaygroundEnabled: boolean
-  shouldShowTrainingButton: boolean
-  isTraining: boolean
-  handleTrainingClick: (e: React.MouseEvent) => void
-  showCopySuccess: boolean
-  handleCopy: () => void
-  filteredEntries: ConsoleEntry[]
-  handleExportConsole: (e: React.MouseEvent) => void
-  hasActiveFilters: boolean
-  clearFilters: () => void
-  handleClearConsole: (e: React.MouseEvent) => void
-  wrapText: boolean
-  setWrapText: (wrap: boolean) => void
-  openOnRun: boolean
-  setOpenOnRun: (open: boolean) => void
-  outputOptionsOpen: boolean
-  setOutputOptionsOpen: (open: boolean) => void
-  shouldShowCodeDisplay: boolean
-  outputDataStringified: string
-  handleClearConsoleFromMenu: () => void
-}
-
-/**
- * Output panel component that manages its own search state.
- */
-export const OutputPanel = React.memo(function OutputPanel({
-  selectedEntry,
-  outputPanelWidth,
-  handleOutputPanelResizeMouseDown,
-  handleHeaderClick,
-  isExpanded,
-  expandToLastHeight,
-  showInput,
-  setShowInput,
-  hasInputData,
-  isPlaygroundEnabled,
-  shouldShowTrainingButton,
-  isTraining,
-  handleTrainingClick,
-  showCopySuccess,
-  handleCopy,
-  filteredEntries,
-  handleExportConsole,
-  hasActiveFilters,
-  clearFilters,
-  handleClearConsole,
-  wrapText,
-  setWrapText,
-  openOnRun,
-  setOpenOnRun,
-  outputOptionsOpen,
-  setOutputOptionsOpen,
-  shouldShowCodeDisplay,
-  outputDataStringified,
-  handleClearConsoleFromMenu,
-}: OutputPanelProps) {
-  const outputContentRef = useRef<HTMLDivElement>(null)
-  const {
-    isSearchActive: isOutputSearchActive,
-    searchQuery: outputSearchQuery,
-    setSearchQuery: setOutputSearchQuery,
-    matchCount,
-    currentMatchIndex,
-    activateSearch: activateOutputSearch,
-    closeSearch: closeOutputSearch,
-    goToNextMatch,
-    goToPreviousMatch,
-    handleMatchCountChange,
-    searchInputRef: outputSearchInputRef,
-  } = useCodeViewerFeatures({
-    contentRef: outputContentRef,
-    externalWrapText: wrapText,
-    onWrapTextChange: setWrapText,
-  })
-
-  // Context menu state for output panel
-  const [hasSelection, setHasSelection] = useState(false)
-  const [storedSelectionText, setStoredSelectionText] = useState('')
-  const {
-    isOpen: isOutputMenuOpen,
-    position: outputMenuPosition,
-    menuRef: outputMenuRef,
-    handleContextMenu: handleOutputContextMenu,
-    closeMenu: closeOutputMenu,
-  } = useContextMenu()
-
-  const handleOutputPanelContextMenu = useCallback(
-    (e: React.MouseEvent) => {
-      const selection = window.getSelection()
-      const selectionText = selection?.toString() || ''
-      setStoredSelectionText(selectionText)
-      setHasSelection(selectionText.length > 0)
-      handleOutputContextMenu(e)
-    },
-    [handleOutputContextMenu]
-  )
-
-  const handleCopySelection = useCallback(() => {
-    if (storedSelectionText) {
-      navigator.clipboard.writeText(storedSelectionText)
-    }
-  }, [storedSelectionText])
-
-  /**
-   * Track text selection state for context menu.
-   * Skip updates when the context menu is open to prevent the selection
-   * state from changing mid-click (which would disable the copy button).
-   */
-  useEffect(() => {
-    const handleSelectionChange = () => {
-      if (isOutputMenuOpen) return
-
-      const selection = window.getSelection()
-      setHasSelection(Boolean(selection && selection.toString().length > 0))
-    }
-
-    document.addEventListener('selectionchange', handleSelectionChange)
-    return () => document.removeEventListener('selectionchange', handleSelectionChange)
-  }, [isOutputMenuOpen])
-
-  return (
-    <>
-      <div
-        className='absolute top-0 right-0 bottom-0 flex flex-col border-[var(--border)] border-l bg-[var(--surface-1)]'
-        style={{ width: `${outputPanelWidth}px` }}
-      >
-        {/* Horizontal Resize Handle */}
-        <div
-          className='-ml-[4px] absolute top-0 bottom-0 left-0 z-20 w-[8px] cursor-ew-resize'
-          onMouseDown={handleOutputPanelResizeMouseDown}
-          role='separator'
-          aria-label='Resize output panel'
-          aria-orientation='vertical'
-        />
-
-        {/* Header */}
-        <div
-          className='group flex h-[30px] flex-shrink-0 cursor-pointer items-center justify-between bg-[var(--surface-1)] pr-[16px] pl-[10px]'
-          onClick={handleHeaderClick}
-        >
-          <div className='flex items-center'>
-            <Button
-              variant='ghost'
-              className={clsx(
-                'px-[8px] py-[6px] text-[12px]',
-                !showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
-              )}
-              onClick={(e) => {
-                e.stopPropagation()
-                if (!isExpanded) {
-                  expandToLastHeight()
-                }
-                if (showInput) setShowInput(false)
-              }}
-              aria-label='Show output'
-            >
-              Output
-            </Button>
-            {hasInputData && (
-              <Button
-                variant='ghost'
-                className={clsx(
-                  'px-[8px] py-[6px] text-[12px]',
-                  showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
-                )}
-                onClick={(e) => {
-                  e.stopPropagation()
-                  if (!isExpanded) {
-                    expandToLastHeight()
-                  }
-                  setShowInput(true)
-                }}
-                aria-label='Show input'
-              >
-                Input
-              </Button>
-            )}
-          </div>
-          <div className='flex flex-shrink-0 items-center gap-[8px]'>
-            {isOutputSearchActive ? (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Button
-                    variant='ghost'
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      closeOutputSearch()
-                    }}
-                    aria-label='Search in output'
-                    className='!p-1.5 -m-1.5'
-                  >
-                    <X className='h-[12px] w-[12px]' />
-                  </Button>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <span>Close search</span>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            ) : (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Button
-                    variant='ghost'
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      activateOutputSearch()
-                    }}
-                    aria-label='Search in output'
-                    className='!p-1.5 -m-1.5'
-                  >
-                    <Search className='h-[12px] w-[12px]' />
-                  </Button>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <span>Search</span>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            )}
-
-            {isPlaygroundEnabled && (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Link href='/playground'>
-                    <Button
-                      variant='ghost'
-                      aria-label='Component Playground'
-                      className='!p-1.5 -m-1.5'
-                    >
-                      <Palette className='h-[12px] w-[12px]' />
-                    </Button>
-                  </Link>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <span>Component Playground</span>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            )}
-
-            {shouldShowTrainingButton && (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Button
-                    variant='ghost'
-                    onClick={handleTrainingClick}
-                    aria-label={isTraining ? 'Stop training' : 'Train Copilot'}
-                    className={clsx(
-                      '!p-1.5 -m-1.5',
-                      isTraining && 'text-orange-600 dark:text-orange-400'
-                    )}
-                  >
-                    {isTraining ? (
-                      <Pause className='h-[12px] w-[12px]' />
-                    ) : (
-                      <Database className='h-[12px] w-[12px]' />
-                    )}
-                  </Button>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <span>{isTraining ? 'Stop Training' : 'Train Copilot'}</span>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            )}
-
-            <Tooltip.Root>
-              <Tooltip.Trigger asChild>
-                <Button
-                  variant='ghost'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    handleCopy()
-                  }}
-                  aria-label='Copy output'
-                  className='!p-1.5 -m-1.5'
-                >
-                  {showCopySuccess ? (
-                    <Check className='h-[12px] w-[12px]' />
-                  ) : (
-                    <Clipboard className='h-[12px] w-[12px]' />
-                  )}
-                </Button>
-              </Tooltip.Trigger>
-              <Tooltip.Content>
-                <span>{showCopySuccess ? 'Copied' : 'Copy output'}</span>
-              </Tooltip.Content>
-            </Tooltip.Root>
-            {filteredEntries.length > 0 && (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Button
-                    variant='ghost'
-                    onClick={handleExportConsole}
-                    aria-label='Download console CSV'
-                    className='!p-1.5 -m-1.5'
-                  >
-                    <ArrowDownToLine className='h-3 w-3' />
-                  </Button>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <span>Download CSV</span>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            )}
-            {hasActiveFilters && (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Button
-                    variant='ghost'
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      clearFilters()
-                    }}
-                    aria-label='Clear filters'
-                    className='!p-1.5 -m-1.5'
-                  >
-                    <FilterX className='h-3 w-3' />
-                  </Button>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <span>Clear filters</span>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            )}
-            {filteredEntries.length > 0 && (
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <Button
-                    variant='ghost'
-                    onClick={handleClearConsole}
-                    aria-label='Clear console'
-                    className='!p-1.5 -m-1.5'
-                  >
-                    <Trash2 className='h-3 w-3' />
-                  </Button>
-                </Tooltip.Trigger>
-                <Tooltip.Content>
-                  <Tooltip.Shortcut keys='⌘D'>Clear console</Tooltip.Shortcut>
-                </Tooltip.Content>
-              </Tooltip.Root>
-            )}
-            <Popover open={outputOptionsOpen} onOpenChange={setOutputOptionsOpen} size='sm'>
-              <PopoverTrigger asChild>
-                <Button
-                  variant='ghost'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                  }}
-                  aria-label='Terminal options'
-                  className='!p-1.5 -m-1.5'
-                >
-                  <MoreHorizontal className='h-3.5 w-3.5' />
-                </Button>
-              </PopoverTrigger>
-              <PopoverContent
-                side='bottom'
-                align='end'
-                sideOffset={4}
-                collisionPadding={0}
-                onClick={(e) => e.stopPropagation()}
-                style={{ minWidth: '140px', maxWidth: '160px' }}
-                className='gap-[2px]'
-              >
-                <PopoverItem
-                  active={wrapText}
-                  showCheck={wrapText}
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    setWrapText(!wrapText)
-                  }}
-                >
-                  <span>Wrap text</span>
-                </PopoverItem>
-                <PopoverItem
-                  active={openOnRun}
-                  showCheck={openOnRun}
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    setOpenOnRun(!openOnRun)
-                  }}
-                >
-                  <span>Open on run</span>
-                </PopoverItem>
-              </PopoverContent>
-            </Popover>
-            <ToggleButton
-              isExpanded={isExpanded}
-              onClick={(e) => {
-                e.stopPropagation()
-                handleHeaderClick()
-              }}
-            />
-          </div>
-        </div>
-
-        {/* Search Overlay */}
-        {isOutputSearchActive && (
-          <div
-            className='absolute top-[30px] right-[8px] z-30 flex h-[34px] items-center gap-[6px] rounded-b-[4px] border border-[var(--border)] border-t-0 bg-[var(--surface-1)] px-[6px] shadow-sm'
-            onClick={(e) => e.stopPropagation()}
-            data-toolbar-root
-            data-search-active='true'
-          >
-            <Input
-              ref={outputSearchInputRef}
-              type='text'
-              value={outputSearchQuery}
-              onChange={(e) => setOutputSearchQuery(e.target.value)}
-              placeholder='Search...'
-              className='mr-[2px] h-[23px] w-[94px] text-[12px]'
-            />
-            <span
-              className={clsx(
-                'w-[58px] font-medium text-[11px]',
-                matchCount > 0 ? 'text-[var(--text-secondary)]' : 'text-[var(--text-tertiary)]'
-              )}
-            >
-              {matchCount > 0 ? `${currentMatchIndex + 1}/${matchCount}` : 'No results'}
-            </span>
-            <Button
-              variant='ghost'
-              onClick={goToPreviousMatch}
-              aria-label='Previous match'
-              className='!p-1.5 -m-1.5'
-              disabled={matchCount === 0}
-            >
-              <ArrowUp className='h-[12px] w-[12px]' />
-            </Button>
-            <Button
-              variant='ghost'
-              onClick={goToNextMatch}
-              aria-label='Next match'
-              className='!p-1.5 -m-1.5'
-              disabled={matchCount === 0}
-            >
-              <ArrowDown className='h-[12px] w-[12px]' />
-            </Button>
-            <Button
-              variant='ghost'
-              onClick={closeOutputSearch}
-              aria-label='Close search'
-              className='!p-1.5 -m-1.5'
-            >
-              <X className='h-[12px] w-[12px]' />
-            </Button>
-          </div>
-        )}
-
-        {/* Content */}
-        <div
-          className={clsx('flex-1 overflow-y-auto', !wrapText && 'overflow-x-auto')}
-          onContextMenu={handleOutputPanelContextMenu}
-        >
-          {shouldShowCodeDisplay ? (
-            <OutputCodeContent
-              code={selectedEntry.input.code}
-              language={(selectedEntry.input.language as 'javascript' | 'json') || 'javascript'}
-              wrapText={wrapText}
-              searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
-              currentMatchIndex={currentMatchIndex}
-              onMatchCountChange={handleMatchCountChange}
-              contentRef={outputContentRef}
-            />
-          ) : (
-            <OutputCodeContent
-              code={outputDataStringified}
-              language='json'
-              wrapText={wrapText}
-              searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
-              currentMatchIndex={currentMatchIndex}
-              onMatchCountChange={handleMatchCountChange}
-              contentRef={outputContentRef}
-            />
-          )}
-        </div>
-      </div>
-
-      {/* Output Panel Context Menu */}
-      <OutputContextMenu
-        isOpen={isOutputMenuOpen}
-        position={outputMenuPosition}
-        menuRef={outputMenuRef}
-        onClose={closeOutputMenu}
-        onCopySelection={handleCopySelection}
-        onCopyAll={handleCopy}
-        onSearch={activateOutputSearch}
-        wrapText={wrapText}
-        onToggleWrap={() => setWrapText(!wrapText)}
-        openOnRun={openOnRun}
-        onToggleOpenOnRun={() => setOpenOnRun(!openOnRun)}
-        onClearConsole={handleClearConsoleFromMenu}
-        hasSelection={hasSelection}
-      />
-    </>
-  )
-})
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
@@ -1,13 +1,14 @@
 'use client'

-import type React from 'react'
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import clsx from 'clsx'
 import {
  ArrowDown,
  ArrowDownToLine,
  ArrowUp,
+  Check,
  ChevronDown,
+  Clipboard,
  Database,
  Filter,
  FilterX,
@@ -15,14 +16,18 @@ import {
  Palette,
  Pause,
  RepeatIcon,
+  Search,
  SplitIcon,
  Trash2,
+  X,
 } from 'lucide-react'
 import Link from 'next/link'
 import { useShallow } from 'zustand/react/shallow'
 import {
  Badge,
  Button,
+  Code,
+  Input,
  Popover,
  PopoverContent,
  PopoverItem,
@@ -36,7 +41,7 @@ import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/provide
 import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils'
 import {
  LogRowContextMenu,
-  OutputPanel,
+  OutputContextMenu,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/components'
 import {
  useOutputPanelResize,
@@ -46,6 +51,7 @@ import {
 import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
 import { getBlock } from '@/blocks'
 import { useShowTrainingControls } from '@/hooks/queries/general-settings'
+import { useCodeViewerFeatures } from '@/hooks/use-code-viewer'
 import { OUTPUT_PANEL_WIDTH, TERMINAL_HEIGHT } from '@/stores/constants'
 import { useCopilotTrainingStore } from '@/stores/copilot-training/store'
 import { openCopilotWithMessage } from '@/stores/notifications/utils'
@@ -229,6 +235,551 @@ const isEventFromEditableElement = (e: KeyboardEvent): boolean => {
  return false
 }

+interface OutputCodeContentProps {
+  code: string
+  language: 'javascript' | 'json'
+  wrapText: boolean
+  searchQuery: string | undefined
+  currentMatchIndex: number
+  onMatchCountChange: (count: number) => void
+  contentRef: React.RefObject<HTMLDivElement | null>
+}
+
+const OutputCodeContent = React.memo(function OutputCodeContent({
+  code,
+  language,
+  wrapText,
+  searchQuery,
+  currentMatchIndex,
+  onMatchCountChange,
+  contentRef,
+}: OutputCodeContentProps) {
+  return (
+    <Code.Viewer
+      code={code}
+      showGutter
+      language={language}
+      className='m-0 min-h-full rounded-none border-0 bg-[var(--surface-1)] dark:bg-[var(--surface-1)]'
+      paddingLeft={8}
+      gutterStyle={{ backgroundColor: 'transparent' }}
+      wrapText={wrapText}
+      searchQuery={searchQuery}
+      currentMatchIndex={currentMatchIndex}
+      onMatchCountChange={onMatchCountChange}
+      contentRef={contentRef}
+      virtualized
+    />
+  )
+})
+
+/**
+ * Props for the OutputPanel component
+ */
+interface OutputPanelProps {
+  selectedEntry: ConsoleEntry
+  outputPanelWidth: number
+  handleOutputPanelResizeMouseDown: (e: React.MouseEvent) => void
+  handleHeaderClick: () => void
+  isExpanded: boolean
+  expandToLastHeight: () => void
+  showInput: boolean
+  setShowInput: (show: boolean) => void
+  hasInputData: boolean
+  isPlaygroundEnabled: boolean
+  shouldShowTrainingButton: boolean
+  isTraining: boolean
+  handleTrainingClick: (e: React.MouseEvent) => void
+  showCopySuccess: boolean
+  handleCopy: () => void
+  filteredEntries: ConsoleEntry[]
+  handleExportConsole: (e: React.MouseEvent) => void
+  hasActiveFilters: boolean
+  clearFilters: () => void
+  handleClearConsole: (e: React.MouseEvent) => void
+  wrapText: boolean
+  setWrapText: (wrap: boolean) => void
+  openOnRun: boolean
+  setOpenOnRun: (open: boolean) => void
+  outputOptionsOpen: boolean
+  setOutputOptionsOpen: (open: boolean) => void
+  shouldShowCodeDisplay: boolean
+  outputDataStringified: string
+  handleClearConsoleFromMenu: () => void
+}
+
+/**
+ * Output panel component that manages its own search state.
+ */
+const OutputPanel = React.memo(function OutputPanel({
+  selectedEntry,
+  outputPanelWidth,
+  handleOutputPanelResizeMouseDown,
+  handleHeaderClick,
+  isExpanded,
+  expandToLastHeight,
+  showInput,
+  setShowInput,
+  hasInputData,
+  isPlaygroundEnabled,
+  shouldShowTrainingButton,
+  isTraining,
+  handleTrainingClick,
+  showCopySuccess,
+  handleCopy,
+  filteredEntries,
+  handleExportConsole,
+  hasActiveFilters,
+  clearFilters,
+  handleClearConsole,
+  wrapText,
+  setWrapText,
+  openOnRun,
+  setOpenOnRun,
+  outputOptionsOpen,
+  setOutputOptionsOpen,
+  shouldShowCodeDisplay,
+  outputDataStringified,
+  handleClearConsoleFromMenu,
+}: OutputPanelProps) {
+  const outputContentRef = useRef<HTMLDivElement>(null)
+  const {
+    isSearchActive: isOutputSearchActive,
+    searchQuery: outputSearchQuery,
+    setSearchQuery: setOutputSearchQuery,
+    matchCount,
+    currentMatchIndex,
+    activateSearch: activateOutputSearch,
+    closeSearch: closeOutputSearch,
+    goToNextMatch,
+    goToPreviousMatch,
+    handleMatchCountChange,
+    searchInputRef: outputSearchInputRef,
+  } = useCodeViewerFeatures({
+    contentRef: outputContentRef,
+    externalWrapText: wrapText,
+    onWrapTextChange: setWrapText,
+  })
+
+  // Context menu state for output panel
+  const [hasSelection, setHasSelection] = useState(false)
+  const [storedSelectionText, setStoredSelectionText] = useState('')
+  const {
+    isOpen: isOutputMenuOpen,
+    position: outputMenuPosition,
+    menuRef: outputMenuRef,
+    handleContextMenu: handleOutputContextMenu,
+    closeMenu: closeOutputMenu,
+  } = useContextMenu()
+
+  const handleOutputPanelContextMenu = useCallback(
+    (e: React.MouseEvent) => {
+      const selection = window.getSelection()
+      const selectionText = selection?.toString() || ''
+      setStoredSelectionText(selectionText)
+      setHasSelection(selectionText.length > 0)
+      handleOutputContextMenu(e)
+    },
+    [handleOutputContextMenu]
+  )
+
+  const handleCopySelection = useCallback(() => {
+    if (storedSelectionText) {
+      navigator.clipboard.writeText(storedSelectionText)
+    }
+  }, [storedSelectionText])
+
+  /**
+   * Track text selection state for context menu.
+   * Skip updates when the context menu is open to prevent the selection
+   * state from changing mid-click (which would disable the copy button).
+   */
+  useEffect(() => {
+    const handleSelectionChange = () => {
+      if (isOutputMenuOpen) return
+
+      const selection = window.getSelection()
+      setHasSelection(Boolean(selection && selection.toString().length > 0))
+    }
+
+    document.addEventListener('selectionchange', handleSelectionChange)
+    return () => document.removeEventListener('selectionchange', handleSelectionChange)
+  }, [isOutputMenuOpen])
+
+  return (
+    <>
+      <div
+        className='absolute top-0 right-0 bottom-0 flex flex-col border-[var(--border)] border-l bg-[var(--surface-1)]'
+        style={{ width: `${outputPanelWidth}px` }}
+      >
+        {/* Horizontal Resize Handle */}
+        <div
+          className='-ml-[4px] absolute top-0 bottom-0 left-0 z-20 w-[8px] cursor-ew-resize'
+          onMouseDown={handleOutputPanelResizeMouseDown}
+          role='separator'
+          aria-label='Resize output panel'
+          aria-orientation='vertical'
+        />
+
+        {/* Header */}
+        <div
+          className='group flex h-[30px] flex-shrink-0 cursor-pointer items-center justify-between bg-[var(--surface-1)] pr-[16px] pl-[10px]'
+          onClick={handleHeaderClick}
+        >
+          <div className='flex items-center'>
+            <Button
+              variant='ghost'
+              className={clsx(
+                'px-[8px] py-[6px] text-[12px]',
+                !showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
+              )}
+              onClick={(e) => {
+                e.stopPropagation()
+                if (!isExpanded) {
+                  expandToLastHeight()
+                }
+                if (showInput) setShowInput(false)
+              }}
+              aria-label='Show output'
+            >
+              Output
+            </Button>
+            {hasInputData && (
+              <Button
+                variant='ghost'
+                className={clsx(
+                  'px-[8px] py-[6px] text-[12px]',
+                  showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
+                )}
+                onClick={(e) => {
+                  e.stopPropagation()
+                  if (!isExpanded) {
+                    expandToLastHeight()
+                  }
+                  setShowInput(true)
+                }}
+                aria-label='Show input'
+              >
+                Input
+              </Button>
+            )}
+          </div>
+          <div className='flex flex-shrink-0 items-center gap-[8px]'>
+            {isOutputSearchActive ? (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      closeOutputSearch()
+                    }}
+                    aria-label='Search in output'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <X className='h-[12px] w-[12px]' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Close search</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            ) : (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      activateOutputSearch()
+                    }}
+                    aria-label='Search in output'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <Search className='h-[12px] w-[12px]' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Search</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+
+            {isPlaygroundEnabled && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Link href='/playground'>
+                    <Button
+                      variant='ghost'
+                      aria-label='Component Playground'
+                      className='!p-1.5 -m-1.5'
+                    >
+                      <Palette className='h-[12px] w-[12px]' />
+                    </Button>
+                  </Link>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Component Playground</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+
+            {shouldShowTrainingButton && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={handleTrainingClick}
+                    aria-label={isTraining ? 'Stop training' : 'Train Copilot'}
+                    className={clsx(
+                      '!p-1.5 -m-1.5',
+                      isTraining && 'text-orange-600 dark:text-orange-400'
+                    )}
+                  >
+                    {isTraining ? (
+                      <Pause className='h-[12px] w-[12px]' />
+                    ) : (
+                      <Database className='h-[12px] w-[12px]' />
+                    )}
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>{isTraining ? 'Stop Training' : 'Train Copilot'}</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+
+            <Tooltip.Root>
+              <Tooltip.Trigger asChild>
+                <Button
+                  variant='ghost'
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    handleCopy()
+                  }}
+                  aria-label='Copy output'
+                  className='!p-1.5 -m-1.5'
+                >
+                  {showCopySuccess ? (
+                    <Check className='h-[12px] w-[12px]' />
+                  ) : (
+                    <Clipboard className='h-[12px] w-[12px]' />
+                  )}
+                </Button>
+              </Tooltip.Trigger>
+              <Tooltip.Content>
+                <span>{showCopySuccess ? 'Copied' : 'Copy output'}</span>
+              </Tooltip.Content>
+            </Tooltip.Root>
+            {filteredEntries.length > 0 && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={handleExportConsole}
+                    aria-label='Download console CSV'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <ArrowDownToLine className='h-3 w-3' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Download CSV</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+            {hasActiveFilters && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      clearFilters()
+                    }}
+                    aria-label='Clear filters'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <FilterX className='h-3 w-3' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Clear filters</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+            {filteredEntries.length > 0 && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={handleClearConsole}
+                    aria-label='Clear console'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <Trash2 className='h-3 w-3' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <Tooltip.Shortcut keys='⌘D'>Clear console</Tooltip.Shortcut>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+            <Popover open={outputOptionsOpen} onOpenChange={setOutputOptionsOpen} size='sm'>
+              <PopoverTrigger asChild>
+                <Button
+                  variant='ghost'
+                  onClick={(e) => {
+                    e.stopPropagation()
+                  }}
+                  aria-label='Terminal options'
+                  className='!p-1.5 -m-1.5'
+                >
+                  <MoreHorizontal className='h-3.5 w-3.5' />
+                </Button>
+              </PopoverTrigger>
+              <PopoverContent
+                side='bottom'
+                align='end'
+                sideOffset={4}
+                collisionPadding={0}
+                onClick={(e) => e.stopPropagation()}
+                style={{ minWidth: '140px', maxWidth: '160px' }}
+                className='gap-[2px]'
+              >
+                <PopoverItem
+                  active={wrapText}
+                  showCheck={wrapText}
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    setWrapText(!wrapText)
+                  }}
+                >
+                  <span>Wrap text</span>
+                </PopoverItem>
+                <PopoverItem
+                  active={openOnRun}
+                  showCheck={openOnRun}
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    setOpenOnRun(!openOnRun)
+                  }}
+                >
+                  <span>Open on run</span>
+                </PopoverItem>
+              </PopoverContent>
+            </Popover>
+            <ToggleButton
+              isExpanded={isExpanded}
+              onClick={(e) => {
+                e.stopPropagation()
+                handleHeaderClick()
+              }}
+            />
+          </div>
+        </div>
+
+        {/* Search Overlay */}
+        {isOutputSearchActive && (
+          <div
+            className='absolute top-[30px] right-[8px] z-30 flex h-[34px] items-center gap-[6px] rounded-b-[4px] border border-[var(--border)] border-t-0 bg-[var(--surface-1)] px-[6px] shadow-sm'
+            onClick={(e) => e.stopPropagation()}
+            data-toolbar-root
+            data-search-active='true'
+          >
+            <Input
+              ref={outputSearchInputRef}
+              type='text'
+              value={outputSearchQuery}
+              onChange={(e) => setOutputSearchQuery(e.target.value)}
+              placeholder='Search...'
+              className='mr-[2px] h-[23px] w-[94px] text-[12px]'
+            />
+            <span
+              className={clsx(
+                'w-[58px] font-medium text-[11px]',
+                matchCount > 0 ? 'text-[var(--text-secondary)]' : 'text-[var(--text-tertiary)]'
+              )}
+            >
+              {matchCount > 0 ? `${currentMatchIndex + 1}/${matchCount}` : 'No results'}
+            </span>
+            <Button
+              variant='ghost'
+              onClick={goToPreviousMatch}
+              aria-label='Previous match'
+              className='!p-1.5 -m-1.5'
+              disabled={matchCount === 0}
+            >
+              <ArrowUp className='h-[12px] w-[12px]' />
+            </Button>
+            <Button
+              variant='ghost'
+              onClick={goToNextMatch}
+              aria-label='Next match'
+              className='!p-1.5 -m-1.5'
+              disabled={matchCount === 0}
+            >
+              <ArrowDown className='h-[12px] w-[12px]' />
+            </Button>
+            <Button
+              variant='ghost'
+              onClick={closeOutputSearch}
+              aria-label='Close search'
+              className='!p-1.5 -m-1.5'
+            >
+              <X className='h-[12px] w-[12px]' />
+            </Button>
+          </div>
+        )}
+
+        {/* Content */}
+        <div
+          className={clsx('flex-1 overflow-y-auto', !wrapText && 'overflow-x-auto')}
+          onContextMenu={handleOutputPanelContextMenu}
+        >
+          {shouldShowCodeDisplay ? (
+            <OutputCodeContent
+              code={selectedEntry.input.code}
+              language={(selectedEntry.input.language as 'javascript' | 'json') || 'javascript'}
+              wrapText={wrapText}
+              searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
+              currentMatchIndex={currentMatchIndex}
+              onMatchCountChange={handleMatchCountChange}
+              contentRef={outputContentRef}
+            />
+          ) : (
+            <OutputCodeContent
+              code={outputDataStringified}
+              language='json'
+              wrapText={wrapText}
+              searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
+              currentMatchIndex={currentMatchIndex}
+              onMatchCountChange={handleMatchCountChange}
+              contentRef={outputContentRef}
+            />
+          )}
+        </div>
+      </div>
+
+      {/* Output Panel Context Menu */}
+      <OutputContextMenu
+        isOpen={isOutputMenuOpen}
+        position={outputMenuPosition}
+        menuRef={outputMenuRef}
+        onClose={closeOutputMenu}
+        onCopySelection={handleCopySelection}
+        onCopyAll={handleCopy}
+        onSearch={activateOutputSearch}
+        wrapText={wrapText}
+        onToggleWrap={() => setWrapText(!wrapText)}
+        openOnRun={openOnRun}
+        onToggleOpenOnRun={() => setOpenOnRun(!openOnRun)}
+        onClearConsole={handleClearConsoleFromMenu}
+        hasSelection={hasSelection}
+      />
+    </>
+  )
+})
+
 /**
 * Terminal component with resizable height that persists across page refreshes.
 *
@@ -820,7 +1371,7 @@ export const Terminal = memo(function Terminal() {
  }, [expandToLastHeight, selectedEntry, showInput, hasInputData, isExpanded])

  /**
-   * Handle Escape to unselect entry (search close is handled by OutputPanel internally)
+   * Handle Escape to unselect entry (search close is handled by useCodeViewerFeatures)
   * Check if the focused element is in the search overlay to avoid conflicting with search close.
   */
  useEffect(() => {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge.tsx
@@ -6,7 +6,6 @@ import type { EdgeDiffStatus } from '@/lib/workflows/diff/types'
 import { useExecutionStore } from '@/stores/execution'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'

-/** Extended edge props with optional handle identifiers */
 interface WorkflowEdgeProps extends EdgeProps {
  sourceHandle?: string | null
  targetHandle?: string | null
@@ -91,17 +90,15 @@ const WorkflowEdgeComponent = ({
    if (edgeDiffStatus === 'deleted') {
      color = 'var(--text-error)'
      opacity = 0.7
+    } else if (isErrorEdge) {
+      color = 'var(--text-error)'
    } else if (edgeDiffStatus === 'new') {
      color = 'var(--brand-tertiary-2)'
    } else if (edgeRunStatus === 'success') {
      // Use green for preview mode, default for canvas execution
-      // This also applies to error edges that were taken (error path executed)
      color = previewExecutionStatus ? 'var(--brand-tertiary-2)' : 'var(--border-success)'
    } else if (edgeRunStatus === 'error') {
      color = 'var(--text-error)'
-    } else if (isErrorEdge) {
-      // Error edges that weren't taken stay red
-      color = 'var(--text-error)'
    }

    if (isSelected) {
@@ -154,14 +151,4 @@ const WorkflowEdgeComponent = ({
  )
 }

-/**
- * Workflow edge component with execution status and diff visualization.
- *
- * @remarks
- * Edge coloring priority:
- * 1. Diff status (deleted/new) - for version comparison
- * 2. Execution status (success/error) - for run visualization
- * 3. Error edge default (red) - for untaken error paths
- * 4. Default edge color - normal workflow connections
- */
 export const WorkflowEdge = memo(WorkflowEdgeComponent)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -1641,36 +1641,51 @@ const WorkflowContent = React.memo(() => {
  }, [screenToFlowPosition, handleToolbarDrop])

  /**
-   * Focus canvas on changed blocks when diff appears.
+   * Focus canvas on changed blocks when diff appears
+   * Focuses on new/edited blocks rather than fitting the entire workflow
   */
-  const pendingZoomBlockIdsRef = useRef<Set<string> | null>(null)
  const prevDiffReadyRef = useRef(false)
-
-  // Phase 1: When diff becomes ready, record which blocks we want to zoom to
-  // Phase 2 effect is located after displayNodes is defined (search for "Phase 2")
  useEffect(() => {
+    // Only focus when diff transitions from not ready to ready
    if (isDiffReady && !prevDiffReadyRef.current && diffAnalysis) {
-      // Diff just became ready - record blocks to zoom to
      const changedBlockIds = [
        ...(diffAnalysis.new_blocks || []),
        ...(diffAnalysis.edited_blocks || []),
      ]

      if (changedBlockIds.length > 0) {
-        pendingZoomBlockIdsRef.current = new Set(changedBlockIds)
+        const allNodes = getNodes()
+        const changedNodes = allNodes.filter((node) => changedBlockIds.includes(node.id))
+
+        if (changedNodes.length > 0) {
+          logger.info('Diff ready - focusing on changed blocks', {
+            changedBlockIds,
+            foundNodes: changedNodes.length,
+          })
+          requestAnimationFrame(() => {
+            fitViewToBounds({
+              nodes: changedNodes,
+              duration: 600,
+              padding: 0.1,
+              minZoom: 0.5,
+              maxZoom: 1.0,
+            })
+          })
+        } else {
+          logger.info('Diff ready - no changed nodes found, fitting all')
+          requestAnimationFrame(() => {
+            fitViewToBounds({ padding: 0.1, duration: 600 })
+          })
+        }
      } else {
-        // No specific blocks to focus on, fit all after a frame
-        pendingZoomBlockIdsRef.current = null
+        logger.info('Diff ready - no changed blocks, fitting all')
        requestAnimationFrame(() => {
          fitViewToBounds({ padding: 0.1, duration: 600 })
        })
      }
-    } else if (!isDiffReady && prevDiffReadyRef.current) {
-      // Diff was cleared (accepted/rejected) - cancel any pending zoom
-      pendingZoomBlockIdsRef.current = null
    }
    prevDiffReadyRef.current = isDiffReady
-  }, [isDiffReady, diffAnalysis, fitViewToBounds])
+  }, [isDiffReady, diffAnalysis, fitViewToBounds, getNodes])

  /** Displays trigger warning notifications. */
  useEffect(() => {
@@ -2078,48 +2093,6 @@ const WorkflowContent = React.memo(() => {
    })
  }, [derivedNodes, blocks, pendingSelection, clearPendingSelection])

-  // Phase 2: When displayNodes updates, check if pending zoom blocks are ready
-  // (Phase 1 is located earlier in the file where pendingZoomBlockIdsRef is defined)
-  useEffect(() => {
-    const pendingBlockIds = pendingZoomBlockIdsRef.current
-    if (!pendingBlockIds || pendingBlockIds.size === 0) {
-      return
-    }
-
-    // Find the nodes we're waiting for
-    const pendingNodes = displayNodes.filter((node) => pendingBlockIds.has(node.id))
-
-    // Check if all expected nodes are present with valid dimensions
-    const allNodesReady =
-      pendingNodes.length === pendingBlockIds.size &&
-      pendingNodes.every(
-        (node) =>
-          typeof node.width === 'number' &&
-          typeof node.height === 'number' &&
-          node.width > 0 &&
-          node.height > 0
-      )
-
-    if (allNodesReady) {
-      logger.info('Diff ready - focusing on changed blocks', {
-        changedBlockIds: Array.from(pendingBlockIds),
-        foundNodes: pendingNodes.length,
-      })
-      // Clear pending state before zooming to prevent re-triggers
-      pendingZoomBlockIdsRef.current = null
-      // Use requestAnimationFrame to ensure React has finished rendering
-      requestAnimationFrame(() => {
-        fitViewToBounds({
-          nodes: pendingNodes,
-          duration: 600,
-          padding: 0.1,
-          minZoom: 0.5,
-          maxZoom: 1.0,
-        })
-      })
-    }
-  }, [displayNodes, fitViewToBounds])
-
  /** Handles ActionBar remove-from-subflow events. */
  useEffect(() => {
    const handleRemoveFromSubflow = (event: Event) => {
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
@@ -1,6 +1,6 @@
 'use client'

-import { type CSSProperties, memo, useMemo } from 'react'
+import { memo, useMemo } from 'react'
 import { Handle, type NodeProps, Position } from 'reactflow'
 import { HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
 import {
@@ -23,27 +23,6 @@ interface SubBlockValueEntry {
  value: unknown
 }

-/**
- * Handle style constants for preview blocks.
- * Extracted to avoid recreating style objects on each render.
- */
-const HANDLE_STYLES = {
-  horizontal: '!border-none !bg-[var(--surface-7)] !h-5 !w-[7px] !rounded-[2px]',
-  vertical: '!border-none !bg-[var(--surface-7)] !h-[7px] !w-5 !rounded-[2px]',
-  right:
-    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-r-[2px] !rounded-l-none',
-  error:
-    '!z-[10] !border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-r-[2px] !rounded-l-none',
-} as const
-
-/** Reusable style object for error handles positioned at bottom-right */
-const ERROR_HANDLE_STYLE: CSSProperties = {
-  right: '-7px',
-  top: 'auto',
-  bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
-  transform: 'translateY(50%)',
-}
-
 interface WorkflowPreviewBlockData {
  type: string
  name: string
@@ -56,8 +35,6 @@ interface WorkflowPreviewBlockData {
  executionStatus?: ExecutionStatus
  /** Subblock values from the workflow state */
  subBlockValues?: Record<string, SubBlockValueEntry | unknown>
-  /** Skips expensive subblock computations for thumbnails/template previews */
-  lightweight?: boolean
 }

 /**
@@ -180,17 +157,21 @@ function resolveToolsDisplay(
      if (!tool || typeof tool !== 'object') return null
      const t = tool as Record<string, unknown>

+      // Priority 1: Use tool.title if already populated
      if (t.title && typeof t.title === 'string') return t.title

+      // Priority 2: Extract from inline schema (legacy format)
      const schema = t.schema as Record<string, unknown> | undefined
      if (schema?.function && typeof schema.function === 'object') {
        const fn = schema.function as Record<string, unknown>
        if (fn.name && typeof fn.name === 'string') return fn.name
      }

+      // Priority 3: Extract from OpenAI function format
      const fn = t.function as Record<string, unknown> | undefined
      if (fn?.name && typeof fn.name === 'string') return fn.name

+      // Priority 4: Resolve built-in tool blocks from registry
      if (
        typeof t.type === 'string' &&
        t.type !== 'custom-tool' &&
@@ -223,16 +204,21 @@ function resolveToolsDisplay(
 * - Shows '-' for other selector types that need hydration
 */
 function SubBlockRow({ title, value, subBlock, rawValue }: SubBlockRowProps) {
+  // Mask password fields
  const isPasswordField = subBlock?.password === true
  const maskedValue = isPasswordField && value && value !== '-' ? '•••' : null

+  // Resolve various display names (synchronous access, matching WorkflowBlock priority)
  const dropdownLabel = resolveDropdownLabel(subBlock, rawValue)
  const variablesDisplay = resolveVariablesDisplay(subBlock, rawValue)
  const toolsDisplay = resolveToolsDisplay(subBlock, rawValue)
  const workflowName = resolveWorkflowName(subBlock, rawValue)

+  // Check if this is a selector type that needs hydration (show '-' for raw IDs)
  const isSelectorType = subBlock?.type && SELECTOR_TYPES_HYDRATION_REQUIRED.includes(subBlock.type)

+  // Compute final display value matching WorkflowBlock logic
+  // Priority order matches WorkflowBlock: masked > hydrated names > selector fallback > raw value
  const hydratedName = dropdownLabel || variablesDisplay || toolsDisplay || workflowName
  const displayValue = maskedValue || hydratedName || (isSelectorType && value ? '-' : value)

@@ -272,7 +258,6 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
    isPreviewSelected = false,
    executionStatus,
    subBlockValues,
-    lightweight = false,
  } = data

  const blockConfig = getBlock(type)
@@ -283,68 +268,44 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
  )

  const rawValues = useMemo(() => {
-    if (lightweight || !subBlockValues) return {}
+    if (!subBlockValues) return {}
    return Object.entries(subBlockValues).reduce<Record<string, unknown>>((acc, [key, entry]) => {
      acc[key] = extractValue(entry)
      return acc
    }, {})
-  }, [subBlockValues, lightweight])
+  }, [subBlockValues])

  const visibleSubBlocks = useMemo(() => {
    if (!blockConfig?.subBlocks) return []

-    const isPureTriggerBlock = blockConfig.triggers?.enabled && blockConfig.category === 'triggers'
-    const effectiveTrigger = isTrigger || type === 'starter'
+    const isStarterOrTrigger =
+      blockConfig.category === 'triggers' || type === 'starter' || isTrigger

    return blockConfig.subBlocks.filter((subBlock) => {
      if (subBlock.hidden) return false
      if (subBlock.hideFromPreview) return false
      if (!isSubBlockFeatureEnabled(subBlock)) return false

-      if (effectiveTrigger) {
-        const isValidTriggerSubblock = isPureTriggerBlock
-          ? subBlock.mode === 'trigger' || !subBlock.mode
-          : subBlock.mode === 'trigger'
-        if (!isValidTriggerSubblock) return false
-      } else {
-        if (subBlock.mode === 'trigger') return false
-      }
-
-      /** Skip value-dependent visibility checks in lightweight mode */
-      if (lightweight) return !subBlock.condition
+      // Handle trigger mode visibility
+      if (subBlock.mode === 'trigger' && !isStarterOrTrigger) return false

+      // Check advanced mode visibility
      if (!isSubBlockVisibleForMode(subBlock, false, canonicalIndex, rawValues, undefined)) {
        return false
      }
+
+      // Check condition visibility
      if (!subBlock.condition) return true
      return evaluateSubBlockCondition(subBlock.condition, rawValues)
    })
-  }, [
-    lightweight,
-    blockConfig?.subBlocks,
-    blockConfig?.triggers?.enabled,
-    blockConfig?.category,
-    type,
-    isTrigger,
-    canonicalIndex,
-    rawValues,
-  ])
+  }, [blockConfig?.subBlocks, blockConfig?.category, type, isTrigger, canonicalIndex, rawValues])

  /**
-   * Compute condition rows for condition blocks.
-   * In lightweight mode, returns default structure without parsing values.
+   * Compute condition rows for condition blocks
   */
  const conditionRows = useMemo(() => {
    if (type !== 'condition') return []

-    /** Default structure for lightweight mode or when no values */
-    const defaultRows = [
-      { id: 'if', title: 'if', value: '' },
-      { id: 'else', title: 'else', value: '' },
-    ]
-
-    if (lightweight) return defaultRows
-
    const conditionsValue = rawValues.conditions
    const raw = typeof conditionsValue === 'string' ? conditionsValue : undefined

@@ -364,24 +325,21 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
        }
      }
    } catch {
-      /* empty */
+      // Failed to parse, use fallback
    }

-    return defaultRows
-  }, [type, rawValues, lightweight])
+    return [
+      { id: 'if', title: 'if', value: '' },
+      { id: 'else', title: 'else', value: '' },
+    ]
+  }, [type, rawValues])

  /**
-   * Compute router rows for router_v2 blocks.
-   * In lightweight mode, returns default structure without parsing values.
+   * Compute router rows for router_v2 blocks
   */
  const routerRows = useMemo(() => {
    if (type !== 'router_v2') return []

-    /** Default structure for lightweight mode or when no values */
-    const defaultRows = [{ id: 'route1', value: '' }]
-
-    if (lightweight) return defaultRows
-
    const routesValue = rawValues.routes
    const raw = typeof routesValue === 'string' ? routesValue : undefined

@@ -399,11 +357,11 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
        }
      }
    } catch {
-      /* empty */
+      // Failed to parse, use fallback
    }

-    return defaultRows
-  }, [type, rawValues, lightweight])
+    return [{ id: 'route1', value: '' }]
+  }, [type, rawValues])

  if (!blockConfig) {
    return null
@@ -421,6 +379,9 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
        ? routerRows.length > 0 || shouldShowDefaultHandles
        : hasSubBlocks || shouldShowDefaultHandles

+  const horizontalHandleClass = '!border-none !bg-[var(--surface-7)] !h-5 !w-[7px] !rounded-[2px]'
+  const verticalHandleClass = '!border-none !bg-[var(--surface-7)] !h-[7px] !w-5 !rounded-[2px]'
+
  const hasError = executionStatus === 'error'
  const hasSuccess = executionStatus === 'success'

@@ -445,7 +406,7 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
          type='target'
          position={horizontalHandles ? Position.Left : Position.Top}
          id='target'
-          className={horizontalHandles ? HANDLE_STYLES.horizontal : HANDLE_STYLES.vertical}
+          className={horizontalHandles ? horizontalHandleClass : verticalHandleClass}
          style={
            horizontalHandles
              ? { left: '-7px', top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px` }
@@ -478,37 +439,36 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
      {hasContentBelowHeader && (
        <div className='flex flex-col gap-[8px] p-[8px]'>
          {type === 'condition' ? (
+            // Condition block: render condition rows
            conditionRows.map((cond) => (
-              <SubBlockRow
-                key={cond.id}
-                title={cond.title}
-                value={lightweight ? undefined : getDisplayValue(cond.value)}
-              />
+              <SubBlockRow key={cond.id} title={cond.title} value={getDisplayValue(cond.value)} />
            ))
          ) : type === 'router_v2' ? (
+            // Router block: render context + route rows
            <>
              <SubBlockRow
                key='context'
                title='Context'
-                value={lightweight ? undefined : getDisplayValue(rawValues.context)}
+                value={getDisplayValue(rawValues.context)}
              />
              {routerRows.map((route, index) => (
                <SubBlockRow
                  key={route.id}
                  title={`Route ${index + 1}`}
-                  value={lightweight ? undefined : getDisplayValue(route.value)}
+                  value={getDisplayValue(route.value)}
                />
              ))}
            </>
          ) : (
+            // Standard blocks: render visible subblocks
            visibleSubBlocks.map((subBlock) => {
-              const rawValue = lightweight ? undefined : rawValues[subBlock.id]
+              const rawValue = rawValues[subBlock.id]
              return (
                <SubBlockRow
                  key={subBlock.id}
                  title={subBlock.title ?? subBlock.id}
-                  value={lightweight ? undefined : getDisplayValue(rawValue)}
-                  subBlock={lightweight ? undefined : subBlock}
+                  value={getDisplayValue(rawValue)}
+                  subBlock={subBlock}
                  rawValue={rawValue}
                />
              )
@@ -519,101 +479,27 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
        </div>
      )}

-      {/* Condition block handles */}
-      {type === 'condition' && (
-        <>
-          {conditionRows.map((cond, condIndex) => {
-            const topOffset =
-              HANDLE_POSITIONS.CONDITION_START_Y + condIndex * HANDLE_POSITIONS.CONDITION_ROW_HEIGHT
-            return (
-              <Handle
-                key={`handle-${cond.id}`}
-                type='source'
-                position={Position.Right}
-                id={`condition-${cond.id}`}
-                className={HANDLE_STYLES.right}
-                style={{ top: `${topOffset}px`, right: '-7px', transform: 'translateY(-50%)' }}
-              />
-            )
-          })}
-          <Handle
-            type='source'
-            position={Position.Right}
-            id='error'
-            className={HANDLE_STYLES.error}
-            style={ERROR_HANDLE_STYLE}
-          />
-        </>
-      )}
-
-      {/* Router block handles */}
-      {type === 'router_v2' && (
-        <>
-          {routerRows.map((route, routeIndex) => {
-            const topOffset =
-              HANDLE_POSITIONS.CONDITION_START_Y +
-              (routeIndex + 1) * HANDLE_POSITIONS.CONDITION_ROW_HEIGHT
-            return (
-              <Handle
-                key={`handle-${route.id}`}
-                type='source'
-                position={Position.Right}
-                id={`router-${route.id}`}
-                className={HANDLE_STYLES.right}
-                style={{ top: `${topOffset}px`, right: '-7px', transform: 'translateY(-50%)' }}
-              />
-            )
-          })}
-          <Handle
-            type='source'
-            position={Position.Right}
-            id='error'
-            className={HANDLE_STYLES.error}
-            style={ERROR_HANDLE_STYLE}
-          />
-        </>
-      )}
-
-      {/* Source and error handles for non-condition/router blocks */}
-      {type !== 'condition' && type !== 'router_v2' && type !== 'response' && (
-        <>
-          <Handle
-            type='source'
-            position={horizontalHandles ? Position.Right : Position.Bottom}
-            id='source'
-            className={horizontalHandles ? HANDLE_STYLES.right : HANDLE_STYLES.vertical}
-            style={
-              horizontalHandles
-                ? { right: '-7px', top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px` }
-                : { bottom: '-7px', left: '50%', transform: 'translateX(-50%)' }
-            }
-          />
-          {shouldShowDefaultHandles && (
-            <Handle
-              type='source'
-              position={Position.Right}
-              id='error'
-              className={HANDLE_STYLES.error}
-              style={ERROR_HANDLE_STYLE}
-            />
-          )}
-        </>
-      )}
+      {/* Source handle */}
+      <Handle
+        type='source'
+        position={horizontalHandles ? Position.Right : Position.Bottom}
+        id='source'
+        className={horizontalHandles ? horizontalHandleClass : verticalHandleClass}
+        style={
+          horizontalHandles
+            ? { right: '-7px', top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px` }
+            : { bottom: '-7px', left: '50%', transform: 'translateX(-50%)' }
+        }
+      />
    </div>
  )
 }

-/**
- * Custom comparison function for React.memo optimization.
- * Uses fast-path primitive comparison before shallow comparing subBlockValues.
- * @param prevProps - Previous render props
- * @param nextProps - Next render props
- * @returns True if render should be skipped (props are equal)
- */
 function shouldSkipPreviewBlockRender(
  prevProps: NodeProps<WorkflowPreviewBlockData>,
  nextProps: NodeProps<WorkflowPreviewBlockData>
 ): boolean {
+  // Check primitive props first (fast path)
  if (
    prevProps.id !== nextProps.id ||
    prevProps.data.type !== nextProps.data.type ||
@@ -622,41 +508,38 @@ function shouldSkipPreviewBlockRender(
    prevProps.data.horizontalHandles !== nextProps.data.horizontalHandles ||
    prevProps.data.enabled !== nextProps.data.enabled ||
    prevProps.data.isPreviewSelected !== nextProps.data.isPreviewSelected ||
-    prevProps.data.executionStatus !== nextProps.data.executionStatus ||
-    prevProps.data.lightweight !== nextProps.data.lightweight
+    prevProps.data.executionStatus !== nextProps.data.executionStatus
  ) {
    return false
  }

-  /** Skip subBlockValues comparison in lightweight mode */
-  if (nextProps.data.lightweight) return true
-
+  // Compare subBlockValues by reference first
  const prevValues = prevProps.data.subBlockValues
  const nextValues = nextProps.data.subBlockValues

-  if (prevValues === nextValues) return true
-  if (!prevValues || !nextValues) return false
+  if (prevValues === nextValues) {
+    return true
+  }

+  if (!prevValues || !nextValues) {
+    return false
+  }
+
+  // Shallow compare keys and values
  const prevKeys = Object.keys(prevValues)
  const nextKeys = Object.keys(nextValues)

-  if (prevKeys.length !== nextKeys.length) return false
+  if (prevKeys.length !== nextKeys.length) {
+    return false
+  }

  for (const key of prevKeys) {
-    if (prevValues[key] !== nextValues[key]) return false
+    if (prevValues[key] !== nextValues[key]) {
+      return false
+    }
  }

  return true
 }

-/**
- * Preview block component for workflow visualization in readonly contexts.
- * Optimized for rendering without hooks or store subscriptions.
- *
- * @remarks
- * - Renders block header, subblock values, and connection handles
- * - Supports condition, router, and standard block types
- * - Shows error handles for non-trigger blocks
- * - Displays execution status via colored ring overlays
- */
-export const PreviewBlock = memo(WorkflowPreviewBlockInner, shouldSkipPreviewBlockRender)
+export const WorkflowPreviewBlock = memo(WorkflowPreviewBlockInner, shouldSkipPreviewBlockRender)
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/index.ts
@@ -1 +0,0 @@
-export { PreviewContextMenu } from './preview-context-menu'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/preview-context-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/preview-context-menu.tsx
@@ -1,97 +0,0 @@
-'use client'
-
-import type { RefObject } from 'react'
-import { createPortal } from 'react-dom'
-import {
-  Popover,
-  PopoverAnchor,
-  PopoverContent,
-  PopoverDivider,
-  PopoverItem,
-} from '@/components/emcn'
-
-interface PreviewContextMenuProps {
-  isOpen: boolean
-  position: { x: number; y: number }
-  menuRef: RefObject<HTMLDivElement | null>
-  onClose: () => void
-  onCopy: () => void
-  onSearch?: () => void
-  wrapText?: boolean
-  onToggleWrap?: () => void
-  /** When true, only shows Copy option (for subblock values) */
-  copyOnly?: boolean
-}
-
-/**
- * Context menu for preview editor sidebar.
- * Provides copy, search, and display options.
- * Uses createPortal to render outside any transformed containers (like modals).
- */
-export function PreviewContextMenu({
-  isOpen,
-  position,
-  menuRef,
-  onClose,
-  onCopy,
-  onSearch,
-  wrapText,
-  onToggleWrap,
-  copyOnly = false,
-}: PreviewContextMenuProps) {
-  if (typeof document === 'undefined') return null
-
-  return createPortal(
-    <Popover
-      open={isOpen}
-      onOpenChange={(open) => !open && onClose()}
-      variant='secondary'
-      size='sm'
-      colorScheme='inverted'
-    >
-      <PopoverAnchor
-        style={{
-          position: 'fixed',
-          left: `${position.x}px`,
-          top: `${position.y}px`,
-          width: '1px',
-          height: '1px',
-        }}
-      />
-      <PopoverContent ref={menuRef} align='start' side='bottom' sideOffset={4}>
-        <PopoverItem
-          onClick={() => {
-            onCopy()
-            onClose()
-          }}
-        >
-          Copy
-        </PopoverItem>
-
-        {!copyOnly && onSearch && (
-          <>
-            <PopoverDivider />
-            <PopoverItem
-              onClick={() => {
-                onSearch()
-                onClose()
-              }}
-            >
-              Search
-            </PopoverItem>
-          </>
-        )}
-
-        {!copyOnly && onToggleWrap && (
-          <>
-            <PopoverDivider />
-            <PopoverItem showCheck={wrapText} onClick={onToggleWrap}>
-              Wrap Text
-            </PopoverItem>
-          </>
-        )}
-      </PopoverContent>
-    </Popover>,
-    document.body
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
@@ -6,24 +6,12 @@ import {
  ArrowUp,
  ChevronDown as ChevronDownIcon,
  ChevronUp,
-  ExternalLink,
-  Maximize2,
  RepeatIcon,
  SplitIcon,
  X,
 } from 'lucide-react'
-import { useParams } from 'next/navigation'
 import { ReactFlowProvider } from 'reactflow'
-import {
-  Badge,
-  Button,
-  ChevronDown,
-  Code,
-  Combobox,
-  Input,
-  Label,
-  Tooltip,
-} from '@/components/emcn'
+import { Badge, Button, ChevronDown, Code, Combobox, Input, Label } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { formatDuration } from '@/lib/core/utils/formatting'
 import { extractReferencePrefixes } from '@/lib/workflows/sanitization/references'
@@ -34,42 +22,15 @@ import {
  isSubBlockFeatureEnabled,
  isSubBlockVisibleForMode,
 } from '@/lib/workflows/subblocks/visibility'
+import { SnapshotContextMenu } from '@/app/workspace/[workspaceId]/logs/components/log-details/components/execution-snapshot/components'
 import { SubBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components'
-import { PreviewContextMenu } from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu'
-import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow'
 import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
 import { getBlock } from '@/blocks'
 import type { BlockConfig, BlockIcon, SubBlockConfig } from '@/blocks/types'
 import { normalizeName } from '@/executor/constants'
 import { navigatePath } from '@/executor/variables/resolvers/reference'
-import { useWorkflowState } from '@/hooks/queries/workflows'
 import { useCodeViewerFeatures } from '@/hooks/use-code-viewer'
-import type { BlockState, Loop, Parallel, WorkflowState } from '@/stores/workflows/workflow/types'
-
-/**
- * CSS override to show full opacity and prevent interaction in readonly preview mode.
- * Extracted to avoid duplicating the style block in multiple places.
- */
-const READONLY_PREVIEW_STYLES = `
-  .readonly-preview,
-  .readonly-preview * {
-    cursor: default !important;
-  }
-  .readonly-preview [disabled],
-  .readonly-preview [data-disabled],
-  .readonly-preview input,
-  .readonly-preview textarea,
-  .readonly-preview [role="combobox"],
-  .readonly-preview [role="slider"],
-  .readonly-preview [role="switch"],
-  .readonly-preview [role="checkbox"] {
-    opacity: 1 !important;
-    pointer-events: none;
-  }
-  .readonly-preview .opacity-50 {
-    opacity: 1 !important;
-  }
-`
+import type { BlockState, Loop, Parallel } from '@/stores/workflows/workflow/types'

 /**
 * Format a value for display as JSON string
@@ -162,31 +123,44 @@ function formatInlineValue(value: unknown): string {
  return String(value)
 }

-interface CollapsibleSectionProps {
+interface ExecutionDataSectionProps {
  title: string
-  defaultExpanded?: boolean
-  children: React.ReactNode
-  isEmpty?: boolean
-  emptyMessage?: string
-  /** Whether this section represents an error state (styles title red) */
+  data: unknown
  isError?: boolean
+  wrapText?: boolean
+  searchQuery?: string
+  currentMatchIndex?: number
+  onMatchCountChange?: (count: number) => void
+  contentRef?: React.RefObject<HTMLDivElement | null>
+  onContextMenu?: (e: React.MouseEvent) => void
 }

 /**
- * Collapsible section wrapper for organizing preview editor content
+ * Collapsible section for execution data (input/output)
+ * Uses Code.Viewer for proper syntax highlighting matching the logs UI
 */
-function CollapsibleSection({
+function ExecutionDataSection({
  title,
-  defaultExpanded = false,
-  children,
-  isEmpty = false,
-  emptyMessage = 'No data',
+  data,
  isError = false,
-}: CollapsibleSectionProps) {
-  const [isExpanded, setIsExpanded] = useState(defaultExpanded)
+  wrapText = true,
+  searchQuery,
+  currentMatchIndex = 0,
+  onMatchCountChange,
+  contentRef,
+  onContextMenu,
+}: ExecutionDataSectionProps) {
+  const [isExpanded, setIsExpanded] = useState(false)
+
+  const jsonString = useMemo(() => {
+    if (!data) return ''
+    return formatValueAsJson(data)
+  }, [data])
+
+  const isEmpty = jsonString === '—' || jsonString === ''

  return (
-    <div className='flex min-w-0 flex-col gap-[8px] overflow-hidden border-[var(--border)] border-b px-[12px] py-[10px]'>
+    <div className='flex min-w-0 flex-col gap-[8px] overflow-hidden'>
      <div
        className='group flex cursor-pointer items-center justify-between'
        onClick={() => setIsExpanded(!isExpanded)}
@@ -225,10 +199,20 @@ function CollapsibleSection({
        <>
          {isEmpty ? (
            <div className='rounded-[6px] bg-[var(--surface-3)] px-[10px] py-[8px]'>
-              <span className='text-[12px] text-[var(--text-tertiary)]'>{emptyMessage}</span>
+              <span className='text-[12px] text-[var(--text-tertiary)]'>No data</span>
            </div>
          ) : (
-            children
+            <div onContextMenu={onContextMenu} ref={contentRef}>
+              <Code.Viewer
+                code={jsonString}
+                language='json'
+                className='!bg-[var(--surface-3)] max-h-[300px] min-h-0 max-w-full rounded-[6px] border-0 [word-break:break-all]'
+                wrapText={wrapText}
+                searchQuery={searchQuery}
+                currentMatchIndex={currentMatchIndex}
+                onMatchCountChange={onMatchCountChange}
+              />
+            </div>
          )}
        </>
      )}
@@ -277,12 +261,9 @@ function ConnectionsSection({
  const [expandedVariables, setExpandedVariables] = useState(true)
  const [expandedEnvVars, setExpandedEnvVars] = useState(true)

-  /** Stable string of connection IDs to prevent effect from running on every render */
-  const connectionIds = useMemo(() => connections.map((c) => c.blockId).join(','), [connections])
-
  useEffect(() => {
-    setExpandedBlocks(new Set(connectionIds.split(',').filter(Boolean)))
-  }, [connectionIds])
+    setExpandedBlocks(new Set(connections.map((c) => c.blockId)))
+  }, [connections])

  const hasContent = connections.length > 0 || workflowVars.length > 0 || envVars.length > 0

@@ -568,22 +549,27 @@ function SubflowConfigDisplay({ block, loop, parallel }: SubflowConfigDisplayPro
  const isLoop = block.type === 'loop'
  const config = isLoop ? SUBFLOW_CONFIG.loop : SUBFLOW_CONFIG.parallel

+  // Determine current type
  const currentType = isLoop
    ? loop?.loopType || (block.data?.loopType as string) || 'for'
    : parallel?.parallelType || (block.data?.parallelType as string) || 'count'

+  // Build type options for combobox - matches SubflowEditor
  const typeOptions = Object.entries(config.typeLabels).map(([value, label]) => ({
    value,
    label,
  }))

+  // Determine mode
  const isCountMode = currentType === 'for' || currentType === 'count'
  const isConditionMode = currentType === 'while' || currentType === 'doWhile'

+  // Get iterations value
  const iterations = isLoop
    ? (loop?.iterations ?? (block.data?.count as number) ?? 5)
    : (parallel?.count ?? (block.data?.count as number) ?? 1)

+  // Get collection/condition value
  const getEditorValue = (): string => {
    if (isConditionMode && isLoop) {
      if (currentType === 'while') {
@@ -603,6 +589,7 @@ function SubflowConfigDisplay({ block, loop, parallel }: SubflowConfigDisplayPro

  const editorValue = getEditorValue()

+  // Get label for configuration field - matches SubflowEditor exactly
  const getConfigLabel = (): string => {
    if (isCountMode) {
      return `${isLoop ? 'Loop' : 'Parallel'} Iterations`
@@ -614,7 +601,7 @@ function SubflowConfigDisplay({ block, loop, parallel }: SubflowConfigDisplayPro
  }

  return (
-    <div className='flex-1 overflow-y-auto overflow-x-hidden pt-[8px] pb-[8px]'>
+    <div className='flex-1 overflow-y-auto overflow-x-hidden pt-[5px] pb-[8px]'>
      {/* Type Selection - matches SubflowEditor */}
      <div>
        <Label className='mb-[6.5px] block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'>
@@ -716,8 +703,6 @@ interface PreviewEditorProps {
  isExecutionMode?: boolean
  /** Optional close handler - if not provided, no close button is shown */
  onClose?: () => void
-  /** Callback to drill down into a nested workflow block */
-  onDrillDown?: (blockId: string, childWorkflowState: WorkflowState) => void
 }

 /** Minimum height for the connections section (header only) */
@@ -740,8 +725,8 @@ function PreviewEditorContent({
  parallels,
  isExecutionMode = false,
  onClose,
-  onDrillDown,
 }: PreviewEditorProps) {
+  // Convert Record<string, Variable> to Array<Variable> for iteration
  const normalizedWorkflowVariables = useMemo(() => {
    if (!workflowVariables) return []
    return Object.values(workflowVariables)
@@ -750,39 +735,10 @@ function PreviewEditorContent({
  const blockConfig = getBlock(block.type) as BlockConfig | undefined
  const subBlockValues = block.subBlocks || {}

-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const isWorkflowBlock = block.type === 'workflow' || block.type === 'workflow_input'
-
-  /** Extracts child workflow ID from subblock values for workflow blocks */
-  const childWorkflowId = useMemo(() => {
-    if (!isWorkflowBlock) return null
-    const workflowIdValue = subBlockValues?.workflowId
-    if (workflowIdValue && typeof workflowIdValue === 'object' && 'value' in workflowIdValue) {
-      return (workflowIdValue as { value: unknown }).value as string | null
-    }
-    return workflowIdValue as string | null
-  }, [isWorkflowBlock, subBlockValues?.workflowId])
-
-  const { data: childWorkflowState, isLoading: isLoadingChildWorkflow } = useWorkflowState(
-    childWorkflowId ?? undefined
-  )
-
-  /** Drills down into the child workflow or opens it in a new tab */
-  const handleExpandChildWorkflow = useCallback(() => {
-    if (!childWorkflowId || !childWorkflowState) return
-
-    if (isExecutionMode && onDrillDown) {
-      onDrillDown(block.id, childWorkflowState)
-    } else if (workspaceId) {
-      window.open(`/workspace/${workspaceId}/w/${childWorkflowId}`, '_blank', 'noopener,noreferrer')
-    }
-  }, [childWorkflowId, childWorkflowState, isExecutionMode, onDrillDown, block.id, workspaceId])
-
  const contentRef = useRef<HTMLDivElement>(null)
  const subBlocksRef = useRef<HTMLDivElement>(null)

+  // Connections resize state
  const [connectionsHeight, setConnectionsHeight] = useState(DEFAULT_CONNECTIONS_HEIGHT)
  const [isResizing, setIsResizing] = useState(false)
  const startYRef = useRef<number>(0)
@@ -890,8 +846,10 @@ function PreviewEditorContent({
    if (!isResizing) return

    const handleMouseMove = (e: MouseEvent) => {
-      const deltaY = startYRef.current - e.clientY
+      const deltaY = startYRef.current - e.clientY // Inverted because we're resizing from bottom up
      let newHeight = startHeightRef.current + deltaY
+
+      // Clamp height between fixed min and max for stable behavior
      newHeight = Math.max(MIN_CONNECTIONS_HEIGHT, Math.min(MAX_CONNECTIONS_HEIGHT, newHeight))
      setConnectionsHeight(newHeight)
    }
@@ -913,6 +871,7 @@ function PreviewEditorContent({
    }
  }, [isResizing])

+  // Determine if connections are at minimum height (collapsed state)
  const isConnectionsAtMinHeight = connectionsHeight <= MIN_CONNECTIONS_HEIGHT + 5

  const blockNameToId = useMemo(() => {
@@ -932,7 +891,7 @@ function PreviewEditorContent({
      if (!allBlockExecutions || !workflowBlocks) return undefined
      if (!reference.startsWith('<') || !reference.endsWith('>')) return undefined

-      const inner = reference.slice(1, -1)
+      const inner = reference.slice(1, -1) // Remove < and >
      const parts = inner.split('.')
      if (parts.length < 1) return undefined

@@ -1048,10 +1007,12 @@ function PreviewEditorContent({
    [blockConfig?.subBlocks]
  )

+  // Check if this is a subflow block (loop or parallel)
  const isSubflow = block.type === 'loop' || block.type === 'parallel'
  const loopConfig = block.type === 'loop' ? loops?.[block.id] : undefined
  const parallelConfig = block.type === 'parallel' ? parallels?.[block.id] : undefined

+  // Handle subflow blocks
  if (isSubflow) {
    const isLoop = block.type === 'loop'
    const SubflowIcon = isLoop ? RepeatIcon : SplitIcon
@@ -1082,7 +1043,27 @@ function PreviewEditorContent({
        <div className='flex flex-1 flex-col overflow-hidden pt-[0px]'>
          <div className='flex-1 overflow-y-auto overflow-x-hidden'>
            <div className='readonly-preview px-[8px]'>
-              <style>{READONLY_PREVIEW_STYLES}</style>
+              {/* CSS override to show full opacity and prevent interaction instead of dimmed disabled state */}
+              <style>{`
+                .readonly-preview,
+                .readonly-preview * {
+                  cursor: default !important;
+                }
+                .readonly-preview [disabled],
+                .readonly-preview [data-disabled],
+                .readonly-preview input,
+                .readonly-preview textarea,
+                .readonly-preview [role="combobox"],
+                .readonly-preview [role="slider"],
+                .readonly-preview [role="switch"],
+                .readonly-preview [role="checkbox"] {
+                  opacity: 1 !important;
+                  pointer-events: none;
+                }
+                .readonly-preview .opacity-50 {
+                  opacity: 1 !important;
+                }
+              `}</style>
              <SubflowConfigDisplay block={block} loop={loopConfig} parallel={parallelConfig} />
            </div>
          </div>
@@ -1114,6 +1095,8 @@ function PreviewEditorContent({

  const visibleSubBlocks = blockConfig.subBlocks.filter((subBlock) => {
    if (subBlock.hidden || subBlock.hideFromPreview) return false
+    // Only filter out trigger-mode subblocks for non-trigger blocks
+    // Trigger-only blocks (category 'triggers') should display their trigger subblocks
    if (subBlock.mode === 'trigger' && blockConfig.category !== 'triggers') return false
    if (!isSubBlockFeatureEnabled(subBlock)) return false
    if (
@@ -1162,7 +1145,7 @@ function PreviewEditorContent({

      {/* Content area */}
      <div className='flex flex-1 flex-col overflow-hidden pt-[0px]'>
-        {/* Main content sections */}
+        {/* Subblocks Section */}
        <div ref={subBlocksRef} className='subblocks-section flex flex-1 flex-col overflow-hidden'>
          <div className='flex-1 overflow-y-auto overflow-x-hidden'>
            {/* Not Executed Banner - shown when in execution mode but block wasn't executed */}
@@ -1176,154 +1159,91 @@ function PreviewEditorContent({
              </div>
            )}

-            {/* Execution Status & Duration Header */}
-            {executionData && (executionData.status || executionData.durationMs !== undefined) && (
-              <div className='flex min-w-0 items-center justify-between overflow-hidden border-[var(--border)] border-b px-[12px] py-[10px]'>
-                {executionData.status && (
-                  <Badge variant={statusVariant} size='sm' dot>
-                    <span className='capitalize'>{executionData.status}</span>
-                  </Badge>
+            {/* Execution Input/Output (if provided) */}
+            {executionData &&
+            (executionData.input !== undefined || executionData.output !== undefined) ? (
+              <div className='flex min-w-0 flex-col gap-[8px] overflow-hidden border-[var(--border)] border-b px-[12px] py-[10px]'>
+                {/* Execution Status & Duration Header */}
+                {(executionData.status || executionData.durationMs !== undefined) && (
+                  <div className='flex items-center justify-between'>
+                    {executionData.status && (
+                      <Badge variant={statusVariant} size='sm' dot>
+                        <span className='capitalize'>{executionData.status}</span>
+                      </Badge>
+                    )}
+                    {executionData.durationMs !== undefined && (
+                      <span className='font-medium text-[12px] text-[var(--text-tertiary)]'>
+                        {formatDuration(executionData.durationMs, { precision: 2 })}
+                      </span>
+                    )}
+                  </div>
                )}
-                {executionData.durationMs !== undefined && (
-                  <span className='font-medium text-[12px] text-[var(--text-tertiary)]'>
-                    {formatDuration(executionData.durationMs, { precision: 2 })}
-                  </span>
-                )}
-              </div>
-            )}

-            {/* Input Section - Collapsible */}
-            {executionData?.input !== undefined && (
-              <CollapsibleSection
-                title='Input'
-                defaultExpanded={false}
-                isEmpty={
-                  formatValueAsJson(executionData.input) === '—' ||
-                  formatValueAsJson(executionData.input) === ''
-                }
-                emptyMessage='No input data'
-              >
-                <div onContextMenu={handleExecutionContextMenu} ref={contentRef}>
-                  <Code.Viewer
-                    code={formatValueAsJson(executionData.input)}
-                    language='json'
-                    className='!bg-[var(--surface-3)] max-h-[300px] min-h-0 max-w-full rounded-[6px] border-0 [word-break:break-all]'
+                {/* Divider between Status/Duration and Input/Output */}
+                {(executionData.status || executionData.durationMs !== undefined) &&
+                  (executionData.input !== undefined || executionData.output !== undefined) && (
+                    <div className='border-[var(--border)] border-t border-dashed' />
+                  )}
+
+                {/* Input Section */}
+                {executionData.input !== undefined && (
+                  <ExecutionDataSection
+                    title='Input'
+                    data={executionData.input}
                    wrapText={wrapText}
                    searchQuery={isSearchActive ? searchQuery : undefined}
                    currentMatchIndex={currentMatchIndex}
                    onMatchCountChange={handleMatchCountChange}
+                    contentRef={contentRef}
+                    onContextMenu={handleExecutionContextMenu}
                  />
-                </div>
-              </CollapsibleSection>
-            )}
+                )}

-            {/* Output Section - Collapsible, expanded by default */}
-            {executionData?.output !== undefined && (
-              <CollapsibleSection
-                title={executionData.status === 'error' ? 'Error' : 'Output'}
-                defaultExpanded={true}
-                isEmpty={
-                  formatValueAsJson(executionData.output) === '—' ||
-                  formatValueAsJson(executionData.output) === ''
-                }
-                emptyMessage='No output data'
-                isError={executionData.status === 'error'}
-              >
-                <div onContextMenu={handleExecutionContextMenu}>
-                  <Code.Viewer
-                    code={formatValueAsJson(executionData.output)}
-                    language='json'
-                    className={cn(
-                      '!bg-[var(--surface-3)] max-h-[300px] min-h-0 max-w-full rounded-[6px] border-0 [word-break:break-all]',
-                      executionData.status === 'error' && 'text-[var(--text-error)]'
-                    )}
+                {/* Divider between Input and Output */}
+                {executionData.input !== undefined && executionData.output !== undefined && (
+                  <div className='border-[var(--border)] border-t border-dashed' />
+                )}
+
+                {/* Output Section */}
+                {executionData.output !== undefined && (
+                  <ExecutionDataSection
+                    title={executionData.status === 'error' ? 'Error' : 'Output'}
+                    data={executionData.output}
+                    isError={executionData.status === 'error'}
                    wrapText={wrapText}
                    searchQuery={isSearchActive ? searchQuery : undefined}
                    currentMatchIndex={currentMatchIndex}
                    onMatchCountChange={handleMatchCountChange}
+                    contentRef={contentRef}
+                    onContextMenu={handleExecutionContextMenu}
                  />
-                </div>
-              </CollapsibleSection>
-            )}
-
-            {/* Workflow Preview - only for workflow blocks with a selected child workflow */}
-            {isWorkflowBlock && childWorkflowId && (
-              <div className='px-[8px] pt-[12px]'>
-                <div className='subblock-content flex flex-col gap-[9.5px]'>
-                  <div className='pl-[2px] font-medium text-[13px] text-[var(--text-primary)] leading-none'>
-                    Workflow Preview
-                  </div>
-                  <div className='relative h-[160px] overflow-hidden rounded-[4px] border border-[var(--border)]'>
-                    {isLoadingChildWorkflow ? (
-                      <div className='flex h-full items-center justify-center bg-[var(--surface-3)]'>
-                        <div
-                          className='h-[18px] w-[18px] animate-spin rounded-full'
-                          style={{
-                            background:
-                              'conic-gradient(from 0deg, hsl(var(--muted-foreground)) 0deg 120deg, transparent 120deg 180deg, hsl(var(--muted-foreground)) 180deg 300deg, transparent 300deg 360deg)',
-                            mask: 'radial-gradient(farthest-side, transparent calc(100% - 1.5px), black calc(100% - 1.5px))',
-                            WebkitMask:
-                              'radial-gradient(farthest-side, transparent calc(100% - 1.5px), black calc(100% - 1.5px))',
-                          }}
-                        />
-                      </div>
-                    ) : childWorkflowState ? (
-                      <>
-                        <div className='[&_*:active]:!cursor-grabbing [&_*]:!cursor-grab [&_.react-flow__handle]:!hidden h-full w-full'>
-                          <PreviewWorkflow
-                            workflowState={childWorkflowState}
-                            height={160}
-                            width='100%'
-                            isPannable={true}
-                            defaultZoom={0.6}
-                            fitPadding={0.15}
-                            cursorStyle='grab'
-                          />
-                        </div>
-                        <Tooltip.Root>
-                          <Tooltip.Trigger asChild>
-                            <Button
-                              type='button'
-                              variant='ghost'
-                              onClick={handleExpandChildWorkflow}
-                              className='absolute right-[6px] bottom-[6px] z-10 h-[24px] w-[24px] cursor-pointer border border-[var(--border)] bg-[var(--surface-2)] p-0 hover:bg-[var(--surface-4)]'
-                            >
-                              {isExecutionMode && onDrillDown ? (
-                                <Maximize2 className='h-[12px] w-[12px]' />
-                              ) : (
-                                <ExternalLink className='h-[12px] w-[12px]' />
-                              )}
-                            </Button>
-                          </Tooltip.Trigger>
-                          <Tooltip.Content side='top'>
-                            {isExecutionMode && onDrillDown ? 'Expand workflow' : 'Open in new tab'}
-                          </Tooltip.Content>
-                        </Tooltip.Root>
-                      </>
-                    ) : (
-                      <div className='flex h-full items-center justify-center bg-[var(--surface-3)]'>
-                        <span className='text-[13px] text-[var(--text-tertiary)]'>
-                          Unable to load preview
-                        </span>
-                      </div>
-                    )}
-                  </div>
-                </div>
-                <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
-                  <div
-                    className='h-[1.25px]'
-                    style={{
-                      backgroundImage:
-                        'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
-                    }}
-                  />
-                </div>
+                )}
              </div>
-            )}
+            ) : null}

            {/* Subblock Values - Using SubBlock components in preview mode */}
-            <div className='readonly-preview px-[8px] pt-[12px] pb-[8px]'>
-              <style>{READONLY_PREVIEW_STYLES}</style>
+            <div className='readonly-preview px-[8px] py-[8px]'>
+              {/* CSS override to show full opacity and prevent interaction instead of dimmed disabled state */}
+              <style>{`
+            .readonly-preview,
+            .readonly-preview * {
+              cursor: default !important;
+            }
+            .readonly-preview [disabled],
+            .readonly-preview [data-disabled],
+            .readonly-preview input,
+            .readonly-preview textarea,
+            .readonly-preview [role="combobox"],
+            .readonly-preview [role="slider"],
+            .readonly-preview [role="switch"],
+            .readonly-preview [role="checkbox"] {
+              opacity: 1 !important;
+              pointer-events: none;
+            }
+            .readonly-preview .opacity-50 {
+              opacity: 1 !important;
+            }
+          `}</style>
              {visibleSubBlocks.length > 0 ? (
                <div className='flex flex-col'>
                  {visibleSubBlocks.map((subBlockConfig, index) => (
@@ -1429,7 +1349,7 @@ function PreviewEditorContent({
      )}

      {/* Context Menu */}
-      <PreviewContextMenu
+      <SnapshotContextMenu
        isOpen={isContextMenuOpen}
        position={contextMenuPosition}
        menuRef={contextMenuRef}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/index.ts
@@ -1 +0,0 @@
-export { PreviewEditor } from './preview-editor'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/index.ts
@@ -1 +0,0 @@
-export { PreviewBlock } from './block'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/index.ts
@@ -1 +0,0 @@
-export { PreviewSubflow } from './subflow'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/index.ts
@@ -1 +0,0 @@
-export { getLeftmostBlockId, PreviewWorkflow } from './preview-workflow'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx
@@ -1,613 +0,0 @@
-'use client'
-
-import { useEffect, useMemo, useRef } from 'react'
-import ReactFlow, {
-  ConnectionLineType,
-  type Edge,
-  type EdgeTypes,
-  type Node,
-  type NodeTypes,
-  ReactFlowProvider,
-  useReactFlow,
-} from 'reactflow'
-import 'reactflow/dist/style.css'
-
-import { createLogger } from '@sim/logger'
-import { cn } from '@/lib/core/utils/cn'
-import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
-import { WorkflowEdge } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge'
-import { estimateBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
-import { PreviewBlock } from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block'
-import { PreviewSubflow } from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow'
-import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'
-
-const logger = createLogger('PreviewWorkflow')
-
-/**
- * Gets block dimensions for preview purposes.
- * For containers, uses stored dimensions or defaults.
- * For regular blocks, uses stored height or estimates based on type.
- */
-function getPreviewBlockDimensions(block: BlockState): { width: number; height: number } {
-  if (block.type === 'loop' || block.type === 'parallel') {
-    return {
-      width: block.data?.width
-        ? Math.max(block.data.width, CONTAINER_DIMENSIONS.MIN_WIDTH)
-        : CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
-      height: block.data?.height
-        ? Math.max(block.data.height, CONTAINER_DIMENSIONS.MIN_HEIGHT)
-        : CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
-    }
-  }
-
-  if (block.height) {
-    return {
-      width: BLOCK_DIMENSIONS.FIXED_WIDTH,
-      height: Math.max(block.height, BLOCK_DIMENSIONS.MIN_HEIGHT),
-    }
-  }
-
-  return estimateBlockDimensions(block.type)
-}
-
-/**
- * Calculates container dimensions based on child block positions and sizes.
- * Mirrors the logic from useNodeUtilities.calculateLoopDimensions.
- */
-function calculateContainerDimensions(
-  containerId: string,
-  blocks: Record<string, BlockState>
-): { width: number; height: number } {
-  const childBlocks = Object.values(blocks).filter((block) => block?.data?.parentId === containerId)
-
-  if (childBlocks.length === 0) {
-    return {
-      width: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
-      height: CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
-    }
-  }
-
-  let maxRight = 0
-  let maxBottom = 0
-
-  for (const child of childBlocks) {
-    if (!child?.position) continue
-
-    const { width: childWidth, height: childHeight } = getPreviewBlockDimensions(child)
-
-    maxRight = Math.max(maxRight, child.position.x + childWidth)
-    maxBottom = Math.max(maxBottom, child.position.y + childHeight)
-  }
-
-  const width = Math.max(
-    CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
-    maxRight + CONTAINER_DIMENSIONS.RIGHT_PADDING
-  )
-  const height = Math.max(
-    CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
-    maxBottom + CONTAINER_DIMENSIONS.BOTTOM_PADDING
-  )
-
-  return { width, height }
-}
-
-/**
- * Finds the leftmost block ID from a workflow state.
- * Excludes subflow containers (loop/parallel) from consideration.
- * @param workflowState - The workflow state to search
- * @returns The ID of the leftmost block, or null if no blocks exist
- */
-export function getLeftmostBlockId(workflowState: WorkflowState | null | undefined): string | null {
-  if (!workflowState?.blocks) return null
-
-  let leftmostId: string | null = null
-  let minX = Number.POSITIVE_INFINITY
-
-  for (const [blockId, block] of Object.entries(workflowState.blocks)) {
-    if (!block || block.type === 'loop' || block.type === 'parallel') continue
-    const x = block.position?.x ?? Number.POSITIVE_INFINITY
-    if (x < minX) {
-      minX = x
-      leftmostId = blockId
-    }
-  }
-
-  return leftmostId
-}
-
-/** Execution status for edges/nodes in the preview */
-type ExecutionStatus = 'success' | 'error' | 'not-executed'
-
-/** Calculates absolute position for blocks, handling nested subflows */
-function calculateAbsolutePosition(
-  block: BlockState,
-  blocks: Record<string, BlockState>
-): { x: number; y: number } {
-  if (!block.data?.parentId) {
-    return block.position
-  }
-
-  const parentBlock = blocks[block.data.parentId]
-  if (!parentBlock) {
-    logger.warn(`Parent block not found for child block`)
-    return block.position
-  }
-
-  const parentAbsolutePosition = calculateAbsolutePosition(parentBlock, blocks)
-  return {
-    x: parentAbsolutePosition.x + block.position.x,
-    y: parentAbsolutePosition.y + block.position.y,
-  }
-}
-
-interface PreviewWorkflowProps {
-  workflowState: WorkflowState
-  className?: string
-  height?: string | number
-  width?: string | number
-  isPannable?: boolean
-  defaultPosition?: { x: number; y: number }
-  defaultZoom?: number
-  fitPadding?: number
-  onNodeClick?: (blockId: string, mousePosition: { x: number; y: number }) => void
-  /** Callback when a node is right-clicked */
-  onNodeContextMenu?: (blockId: string, mousePosition: { x: number; y: number }) => void
-  /** Callback when the canvas (empty area) is clicked */
-  onPaneClick?: () => void
-  /** Cursor style to show when hovering the canvas */
-  cursorStyle?: 'default' | 'pointer' | 'grab'
-  /** Map of executed block IDs to their status for highlighting the execution path */
-  executedBlocks?: Record<string, { status: string }>
-  /** Currently selected block ID for highlighting */
-  selectedBlockId?: string | null
-  /** Skips expensive subblock computations for thumbnails/template previews */
-  lightweight?: boolean
-}
-
-/**
- * Preview node types using minimal components without hooks or store subscriptions.
- * This prevents interaction issues while allowing canvas panning and node clicking.
- */
-const previewNodeTypes: NodeTypes = {
-  workflowBlock: PreviewBlock,
-  noteBlock: PreviewBlock,
-  subflowNode: PreviewSubflow,
-}
-
-const edgeTypes: EdgeTypes = {
-  default: WorkflowEdge,
-  workflowEdge: WorkflowEdge,
-}
-
-interface FitViewOnChangeProps {
-  nodeIds: string
-  fitPadding: number
-  containerRef: React.RefObject<HTMLDivElement | null>
-}
-
-/**
- * Helper component that calls fitView when the set of nodes changes or when the container resizes.
- * Only triggers on actual node additions/removals, not on selection changes.
- * Must be rendered inside ReactFlowProvider.
- */
-function FitViewOnChange({ nodeIds, fitPadding, containerRef }: FitViewOnChangeProps) {
-  const { fitView } = useReactFlow()
-  const lastNodeIdsRef = useRef<string | null>(null)
-
-  useEffect(() => {
-    if (!nodeIds.length) return
-    const shouldFit = lastNodeIdsRef.current !== nodeIds
-    if (!shouldFit) return
-    lastNodeIdsRef.current = nodeIds
-
-    const timeoutId = setTimeout(() => {
-      fitView({ padding: fitPadding, duration: 200 })
-    }, 50)
-    return () => clearTimeout(timeoutId)
-  }, [nodeIds, fitPadding, fitView])
-
-  useEffect(() => {
-    const container = containerRef.current
-    if (!container) return
-
-    let timeoutId: ReturnType<typeof setTimeout> | null = null
-
-    const resizeObserver = new ResizeObserver(() => {
-      if (timeoutId) clearTimeout(timeoutId)
-      timeoutId = setTimeout(() => {
-        fitView({ padding: fitPadding, duration: 150 })
-      }, 100)
-    })
-
-    resizeObserver.observe(container)
-    return () => {
-      if (timeoutId) clearTimeout(timeoutId)
-      resizeObserver.disconnect()
-    }
-  }, [containerRef, fitPadding, fitView])
-
-  return null
-}
-
-/**
- * Readonly workflow component for visualizing workflow state.
- * Renders blocks, subflows, and edges with execution status highlighting.
- *
- * @remarks
- * - Supports panning and node click interactions
- * - Shows execution path via green edges for successful paths
- * - Error edges display red by default, green when error path was taken
- * - Fits view automatically when nodes change or container resizes
- */
-export function PreviewWorkflow({
-  workflowState,
-  className,
-  height = '100%',
-  width = '100%',
-  isPannable = true,
-  defaultPosition,
-  defaultZoom = 0.8,
-  fitPadding = 0.25,
-  onNodeClick,
-  onNodeContextMenu,
-  onPaneClick,
-  cursorStyle = 'grab',
-  executedBlocks,
-  selectedBlockId,
-  lightweight = false,
-}: PreviewWorkflowProps) {
-  const containerRef = useRef<HTMLDivElement>(null)
-  const nodeTypes = previewNodeTypes
-  const isValidWorkflowState = workflowState?.blocks && workflowState.edges
-
-  const blocksStructure = useMemo(() => {
-    if (!isValidWorkflowState) return { count: 0, ids: '' }
-    return {
-      count: Object.keys(workflowState.blocks || {}).length,
-      ids: Object.keys(workflowState.blocks || {}).join(','),
-    }
-  }, [workflowState.blocks, isValidWorkflowState])
-
-  const loopsStructure = useMemo(() => {
-    if (!isValidWorkflowState) return { count: 0, ids: '' }
-    return {
-      count: Object.keys(workflowState.loops || {}).length,
-      ids: Object.keys(workflowState.loops || {}).join(','),
-    }
-  }, [workflowState.loops, isValidWorkflowState])
-
-  const parallelsStructure = useMemo(() => {
-    if (!isValidWorkflowState) return { count: 0, ids: '' }
-    return {
-      count: Object.keys(workflowState.parallels || {}).length,
-      ids: Object.keys(workflowState.parallels || {}).join(','),
-    }
-  }, [workflowState.parallels, isValidWorkflowState])
-
-  /** Map of subflow ID to child block IDs */
-  const subflowChildrenMap = useMemo(() => {
-    if (!isValidWorkflowState) return new Map<string, string[]>()
-
-    const map = new Map<string, string[]>()
-    for (const [blockId, block] of Object.entries(workflowState.blocks || {})) {
-      const parentId = block?.data?.parentId
-      if (parentId) {
-        const children = map.get(parentId) || []
-        children.push(blockId)
-        map.set(parentId, children)
-      }
-    }
-    return map
-  }, [workflowState.blocks, isValidWorkflowState])
-
-  /** Derives subflow execution status from child blocks */
-  const getSubflowExecutionStatus = useMemo(() => {
-    return (subflowId: string): ExecutionStatus | undefined => {
-      if (!executedBlocks) return undefined
-
-      const childIds = subflowChildrenMap.get(subflowId)
-      if (!childIds?.length) return undefined
-
-      const childStatuses = childIds.map((id) => executedBlocks[id]).filter(Boolean)
-      if (childStatuses.length === 0) return undefined
-
-      if (childStatuses.some((s) => s.status === 'error')) return 'error'
-      if (childStatuses.some((s) => s.status === 'success')) return 'success'
-      return 'not-executed'
-    }
-  }, [executedBlocks, subflowChildrenMap])
-
-  /** Gets execution status for any block, deriving subflow status from children */
-  const getBlockExecutionStatus = useMemo(() => {
-    return (blockId: string): { status: string; executed: boolean } | undefined => {
-      if (!executedBlocks) return undefined
-
-      const directStatus = executedBlocks[blockId]
-      if (directStatus) {
-        return { status: directStatus.status, executed: true }
-      }
-
-      const block = workflowState.blocks?.[blockId]
-      if (block && (block.type === 'loop' || block.type === 'parallel')) {
-        const subflowStatus = getSubflowExecutionStatus(blockId)
-        if (subflowStatus) {
-          return { status: subflowStatus, executed: true }
-        }
-
-        const incomingEdge = workflowState.edges?.find((e) => e.target === blockId)
-        if (incomingEdge && executedBlocks[incomingEdge.source]?.status === 'success') {
-          return { status: 'not-executed', executed: true }
-        }
-      }
-
-      return undefined
-    }
-  }, [executedBlocks, workflowState.blocks, workflowState.edges, getSubflowExecutionStatus])
-
-  const edgesStructure = useMemo(() => {
-    if (!isValidWorkflowState) return { count: 0, ids: '' }
-    return {
-      count: workflowState.edges?.length || 0,
-      ids: workflowState.edges?.map((e) => e.id).join(',') || '',
-    }
-  }, [workflowState.edges, isValidWorkflowState])
-
-  const nodes: Node[] = useMemo(() => {
-    if (!isValidWorkflowState) return []
-
-    const nodeArray: Node[] = []
-
-    Object.entries(workflowState.blocks || {}).forEach(([blockId, block]) => {
-      if (!block || !block.type) {
-        logger.warn(`Skipping invalid block: ${blockId}`)
-        return
-      }
-
-      const absolutePosition = calculateAbsolutePosition(block, workflowState.blocks)
-
-      if (block.type === 'loop' || block.type === 'parallel') {
-        const isSelected = selectedBlockId === blockId
-        const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
-        const subflowExecutionStatus = getSubflowExecutionStatus(blockId)
-
-        nodeArray.push({
-          id: blockId,
-          type: 'subflowNode',
-          position: absolutePosition,
-          draggable: false,
-          data: {
-            name: block.name,
-            width: dimensions.width,
-            height: dimensions.height,
-            kind: block.type as 'loop' | 'parallel',
-            isPreviewSelected: isSelected,
-            executionStatus: subflowExecutionStatus,
-            lightweight,
-          },
-        })
-        return
-      }
-
-      const isSelected = selectedBlockId === blockId
-
-      let executionStatus: ExecutionStatus | undefined
-      if (executedBlocks) {
-        const blockExecution = executedBlocks[blockId]
-        if (blockExecution) {
-          if (blockExecution.status === 'error') {
-            executionStatus = 'error'
-          } else if (blockExecution.status === 'success') {
-            executionStatus = 'success'
-          } else {
-            executionStatus = 'not-executed'
-          }
-        } else {
-          executionStatus = 'not-executed'
-        }
-      }
-
-      nodeArray.push({
-        id: blockId,
-        type: 'workflowBlock',
-        position: absolutePosition,
-        draggable: false,
-        zIndex: block.data?.parentId ? 10 : undefined,
-        data: {
-          type: block.type,
-          name: block.name,
-          isTrigger: block.triggerMode === true,
-          horizontalHandles: block.horizontalHandles ?? false,
-          enabled: block.enabled ?? true,
-          isPreviewSelected: isSelected,
-          executionStatus,
-          subBlockValues: block.subBlocks,
-          lightweight,
-        },
-      })
-    })
-
-    return nodeArray
-  }, [
-    blocksStructure,
-    loopsStructure,
-    parallelsStructure,
-    workflowState.blocks,
-    isValidWorkflowState,
-    executedBlocks,
-    selectedBlockId,
-    getSubflowExecutionStatus,
-    lightweight,
-  ])
-
-  const edges: Edge[] = useMemo(() => {
-    if (!isValidWorkflowState) return []
-
-    /**
-     * Determines edge execution status for visualization.
-     * Error edges turn green when taken (source errored, target executed).
-     * Normal edges turn green when both source succeeded and target executed.
-     */
-    const getEdgeExecutionStatus = (edge: {
-      source: string
-      target: string
-      sourceHandle?: string | null
-    }): ExecutionStatus | undefined => {
-      if (!executedBlocks) return undefined
-
-      const sourceStatus = getBlockExecutionStatus(edge.source)
-      const targetStatus = getBlockExecutionStatus(edge.target)
-      const isErrorEdge = edge.sourceHandle === 'error'
-
-      if (isErrorEdge) {
-        return sourceStatus?.status === 'error' && targetStatus?.executed
-          ? 'success'
-          : 'not-executed'
-      }
-
-      const isSubflowStartEdge =
-        edge.sourceHandle === 'loop-start-source' || edge.sourceHandle === 'parallel-start-source'
-
-      if (isSubflowStartEdge) {
-        const incomingEdge = workflowState.edges?.find((e) => e.target === edge.source)
-        const incomingSucceeded = incomingEdge
-          ? executedBlocks[incomingEdge.source]?.status === 'success'
-          : false
-        return incomingSucceeded ? 'success' : 'not-executed'
-      }
-
-      const targetBlock = workflowState.blocks?.[edge.target]
-      const targetIsSubflow =
-        targetBlock && (targetBlock.type === 'loop' || targetBlock.type === 'parallel')
-
-      if (sourceStatus?.status === 'success' && (targetStatus?.executed || targetIsSubflow)) {
-        return 'success'
-      }
-
-      return 'not-executed'
-    }
-
-    return (workflowState.edges || []).map((edge) => {
-      const status = getEdgeExecutionStatus(edge)
-      const isErrorEdge = edge.sourceHandle === 'error'
-      return {
-        id: edge.id,
-        source: edge.source,
-        target: edge.target,
-        sourceHandle: edge.sourceHandle,
-        targetHandle: edge.targetHandle,
-        data: {
-          ...(status ? { executionStatus: status } : {}),
-          sourceHandle: edge.sourceHandle,
-        },
-        zIndex: status === 'success' ? 10 : isErrorEdge ? 5 : 0,
-      }
-    })
-  }, [
-    edgesStructure,
-    workflowState.edges,
-    workflowState.blocks,
-    isValidWorkflowState,
-    executedBlocks,
-    getBlockExecutionStatus,
-  ])
-
-  if (!isValidWorkflowState) {
-    return (
-      <div
-        style={{ height, width }}
-        className='flex items-center justify-center rounded-lg border border-gray-200 bg-gray-50 dark:border-gray-700 dark:bg-gray-900'
-      >
-        <div className='text-center text-gray-500 dark:text-gray-400'>
-          <div className='mb-2 font-medium text-lg'>⚠️ Logged State Not Found</div>
-          <div className='text-sm'>
-            This log was migrated from the old system and doesn't contain workflow state data.
-          </div>
-        </div>
-      </div>
-    )
-  }
-
-  return (
-    <ReactFlowProvider>
-      <div
-        ref={containerRef}
-        style={{ height, width, backgroundColor: 'var(--bg)' }}
-        className={cn('preview-mode', onNodeClick && 'interactive-nodes', className)}
-      >
-        <style>{`
-          /* Canvas cursor - grab on the flow container and pane */
-          .preview-mode .react-flow { cursor: ${cursorStyle}; }
-          .preview-mode .react-flow__pane { cursor: ${cursorStyle} !important; }
-          .preview-mode .react-flow__selectionpane { cursor: ${cursorStyle} !important; }
-          .preview-mode .react-flow__renderer { cursor: ${cursorStyle}; }
-
-          /* Active/grabbing cursor when dragging */
-          ${
-            cursorStyle === 'grab'
-              ? `
-          .preview-mode .react-flow:active { cursor: grabbing; }
-          .preview-mode .react-flow__pane:active { cursor: grabbing !important; }
-          .preview-mode .react-flow__selectionpane:active { cursor: grabbing !important; }
-          .preview-mode .react-flow__renderer:active { cursor: grabbing; }
-          .preview-mode .react-flow__node:active { cursor: grabbing !important; }
-          .preview-mode .react-flow__node:active * { cursor: grabbing !important; }
-          `
-              : ''
-          }
-
-          /* Node cursor - pointer on nodes when onNodeClick is provided */
-          .preview-mode.interactive-nodes .react-flow__node { cursor: pointer !important; }
-          .preview-mode.interactive-nodes .react-flow__node > div { cursor: pointer !important; }
-          .preview-mode.interactive-nodes .react-flow__node * { cursor: pointer !important; }
-        `}</style>
-        <ReactFlow
-          nodes={nodes}
-          edges={edges}
-          nodeTypes={nodeTypes}
-          edgeTypes={edgeTypes}
-          connectionLineType={ConnectionLineType.SmoothStep}
-          fitView
-          fitViewOptions={{ padding: fitPadding }}
-          panOnScroll={isPannable}
-          panOnDrag={isPannable}
-          zoomOnScroll={false}
-          draggable={false}
-          defaultViewport={{
-            x: defaultPosition?.x ?? 0,
-            y: defaultPosition?.y ?? 0,
-            zoom: defaultZoom ?? 1,
-          }}
-          minZoom={0.1}
-          maxZoom={2}
-          proOptions={{ hideAttribution: true }}
-          elementsSelectable={false}
-          nodesDraggable={false}
-          nodesConnectable={false}
-          onNodeClick={
-            onNodeClick
-              ? (event, node) => {
-                  logger.debug('Node clicked:', { nodeId: node.id, event })
-                  onNodeClick(node.id, { x: event.clientX, y: event.clientY })
-                }
-              : undefined
-          }
-          onNodeContextMenu={
-            onNodeContextMenu
-              ? (event, node) => {
-                  event.preventDefault()
-                  event.stopPropagation()
-                  onNodeContextMenu(node.id, { x: event.clientX, y: event.clientY })
-                }
-              : undefined
-          }
-          onPaneClick={onPaneClick}
-        />
-        <FitViewOnChange
-          nodeIds={blocksStructure.ids}
-          fitPadding={fitPadding}
-          containerRef={containerRef}
-        />
-      </div>
-    </ReactFlowProvider>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/subflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/subflow.tsx
@@ -5,9 +5,6 @@ import { RepeatIcon, SplitIcon } from 'lucide-react'
 import { Handle, type NodeProps, Position } from 'reactflow'
 import { HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'

-/** Execution status for subflows in preview mode */
-type ExecutionStatus = 'success' | 'error' | 'not-executed'
-
 interface WorkflowPreviewSubflowData {
  name: string
  width?: number
@@ -15,10 +12,6 @@ interface WorkflowPreviewSubflowData {
  kind: 'loop' | 'parallel'
  /** Whether this subflow is selected in preview mode */
  isPreviewSelected?: boolean
-  /** Execution status for highlighting the subflow container */
-  executionStatus?: ExecutionStatus
-  /** Skips expensive computations for thumbnails/template previews (unused in subflow, for consistency) */
-  lightweight?: boolean
 }

 /**
@@ -27,7 +20,7 @@ interface WorkflowPreviewSubflowData {
 * or interactive features.
 */
 function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowData>) {
-  const { name, width = 500, height = 300, kind, isPreviewSelected = false, executionStatus } = data
+  const { name, width = 500, height = 300, kind, isPreviewSelected = false } = data

  const isLoop = kind === 'loop'
  const BlockIcon = isLoop ? RepeatIcon : SplitIcon
@@ -42,9 +35,6 @@ function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowD
  const rightHandleClass =
    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-r-[2px] !rounded-l-none'

-  const hasError = executionStatus === 'error'
-  const hasSuccess = executionStatus === 'success'
-
  return (
    <div
      className='relative select-none rounded-[8px] border border-[var(--border-1)]'
@@ -53,18 +43,10 @@ function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowD
        height,
      }}
    >
-      {/* Selection ring overlay (takes priority over execution rings) */}
+      {/* Selection ring overlay */}
      {isPreviewSelected && (
        <div className='pointer-events-none absolute inset-0 z-40 rounded-[8px] ring-[1.75px] ring-[var(--brand-secondary)]' />
      )}
-      {/* Success ring overlay (only shown if not selected) */}
-      {!isPreviewSelected && hasSuccess && (
-        <div className='pointer-events-none absolute inset-0 z-40 rounded-[8px] ring-[1.75px] ring-[var(--brand-tertiary-2)]' />
-      )}
-      {/* Error ring overlay (only shown if not selected) */}
-      {!isPreviewSelected && hasError && (
-        <div className='pointer-events-none absolute inset-0 z-40 rounded-[8px] ring-[1.75px] ring-[var(--text-error)]' />
-      )}

      {/* Target handle on left (input to the subflow) */}
      <Handle
@@ -128,4 +110,4 @@ function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowD
  )
 }

-export const PreviewSubflow = memo(WorkflowPreviewSubflowInner)
+export const WorkflowPreviewSubflow = memo(WorkflowPreviewSubflowInner)
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts
@@ -1,6 +1,2 @@
-export { PreviewContextMenu } from './components/preview-context-menu'
 export { PreviewEditor } from './components/preview-editor'
-export { getLeftmostBlockId, PreviewWorkflow } from './components/preview-workflow'
-export { PreviewBlock } from './components/preview-workflow/components/block'
-export { PreviewSubflow } from './components/preview-workflow/components/subflow'
-export { buildBlockExecutions, Preview } from './preview'
+export { getLeftmostBlockId, WorkflowPreview } from './preview'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
@@ -1,292 +1,499 @@
 'use client'

-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { ArrowLeft } from 'lucide-react'
-import { Button, Tooltip } from '@/components/emcn'
-import { redactApiKeys } from '@/lib/core/security/redaction'
+import { useEffect, useMemo, useRef } from 'react'
+import ReactFlow, {
+  ConnectionLineType,
+  type Edge,
+  type EdgeTypes,
+  type Node,
+  type NodeTypes,
+  ReactFlowProvider,
+  useReactFlow,
+} from 'reactflow'
+import 'reactflow/dist/style.css'
+
+import { createLogger } from '@sim/logger'
 import { cn } from '@/lib/core/utils/cn'
-import { PreviewEditor } from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-editor'
-import {
-  getLeftmostBlockId,
-  PreviewWorkflow,
-} from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow'
-import type { WorkflowState } from '@/stores/workflows/workflow/types'
+import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
+import { WorkflowEdge } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge'
+import { estimateBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
+import { WorkflowPreviewBlock } from '@/app/workspace/[workspaceId]/w/components/preview/components/block'
+import { WorkflowPreviewSubflow } from '@/app/workspace/[workspaceId]/w/components/preview/components/subflow'
+import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'

-interface TraceSpan {
-  blockId?: string
-  input?: unknown
-  output?: unknown
-  status?: string
-  duration?: number
-  children?: TraceSpan[]
-}
+const logger = createLogger('WorkflowPreview')

-interface BlockExecutionData {
-  input: unknown
-  output: unknown
-  status: string
-  durationMs: number
-  /** Child trace spans for nested workflow blocks */
-  children?: TraceSpan[]
-}
+/**
+ * Gets block dimensions for preview purposes.
+ * For containers, uses stored dimensions or defaults.
+ * For regular blocks, uses stored height or estimates based on type.
+ */
+function getPreviewBlockDimensions(block: BlockState): { width: number; height: number } {
+  if (block.type === 'loop' || block.type === 'parallel') {
+    return {
+      width: block.data?.width
+        ? Math.max(block.data.width, CONTAINER_DIMENSIONS.MIN_WIDTH)
+        : CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+      height: block.data?.height
+        ? Math.max(block.data.height, CONTAINER_DIMENSIONS.MIN_HEIGHT)
+        : CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
+    }
+  }

-/** Represents a level in the workflow navigation stack */
-interface WorkflowStackEntry {
-  workflowState: WorkflowState
-  traceSpans: TraceSpan[]
-  blockExecutions: Record<string, BlockExecutionData>
+  if (block.height) {
+    return {
+      width: BLOCK_DIMENSIONS.FIXED_WIDTH,
+      height: Math.max(block.height, BLOCK_DIMENSIONS.MIN_HEIGHT),
+    }
+  }
+
+  return estimateBlockDimensions(block.type)
 }

 /**
- * Extracts child trace spans from a workflow block's execution data.
- * Checks both the `children` property (where trace span processing moves them)
- * and the legacy `output.childTraceSpans` for compatibility.
+ * Calculates container dimensions based on child block positions and sizes.
+ * Mirrors the logic from useNodeUtilities.calculateLoopDimensions.
 */
-function extractChildTraceSpans(blockExecution: BlockExecutionData | undefined): TraceSpan[] {
-  if (!blockExecution) return []
+function calculateContainerDimensions(
+  containerId: string,
+  blocks: Record<string, BlockState>
+): { width: number; height: number } {
+  const childBlocks = Object.values(blocks).filter((block) => block?.data?.parentId === containerId)

-  if (Array.isArray(blockExecution.children) && blockExecution.children.length > 0) {
-    return blockExecution.children
-  }
-
-  if (blockExecution.output && typeof blockExecution.output === 'object') {
-    const output = blockExecution.output as Record<string, unknown>
-    if (Array.isArray(output.childTraceSpans)) {
-      return output.childTraceSpans as TraceSpan[]
+  if (childBlocks.length === 0) {
+    return {
+      width: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+      height: CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
    }
  }

-  return []
+  let maxRight = 0
+  let maxBottom = 0
+
+  for (const child of childBlocks) {
+    if (!child?.position) continue
+
+    const { width: childWidth, height: childHeight } = getPreviewBlockDimensions(child)
+
+    maxRight = Math.max(maxRight, child.position.x + childWidth)
+    maxBottom = Math.max(maxBottom, child.position.y + childHeight)
+  }
+
+  const width = Math.max(
+    CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+    maxRight + CONTAINER_DIMENSIONS.RIGHT_PADDING
+  )
+  const height = Math.max(
+    CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
+    maxBottom + CONTAINER_DIMENSIONS.BOTTOM_PADDING
+  )
+
+  return { width, height }
 }

 /**
- * Builds block execution data from trace spans
+ * Finds the leftmost block ID from a workflow state.
+ * Returns the block with the smallest x position, excluding subflow containers (loop/parallel).
 */
-export function buildBlockExecutions(spans: TraceSpan[]): Record<string, BlockExecutionData> {
-  const blockExecutionMap: Record<string, BlockExecutionData> = {}
+export function getLeftmostBlockId(workflowState: WorkflowState | null | undefined): string | null {
+  if (!workflowState?.blocks) return null

-  const collectBlockSpans = (traceSpans: TraceSpan[]): TraceSpan[] => {
-    const blockSpans: TraceSpan[] = []
-    for (const span of traceSpans) {
-      if (span.blockId) {
-        blockSpans.push(span)
-      }
-      if (span.children && Array.isArray(span.children)) {
-        blockSpans.push(...collectBlockSpans(span.children))
-      }
-    }
-    return blockSpans
-  }
+  let leftmostId: string | null = null
+  let minX = Number.POSITIVE_INFINITY

-  const allBlockSpans = collectBlockSpans(spans)
-
-  for (const span of allBlockSpans) {
-    if (span.blockId && !blockExecutionMap[span.blockId]) {
-      blockExecutionMap[span.blockId] = {
-        input: redactApiKeys(span.input || {}),
-        output: redactApiKeys(span.output || {}),
-        status: span.status || 'unknown',
-        durationMs: span.duration || 0,
-        children: span.children,
-      }
+  for (const [blockId, block] of Object.entries(workflowState.blocks)) {
+    if (!block || block.type === 'loop' || block.type === 'parallel') continue
+    const x = block.position?.x ?? Number.POSITIVE_INFINITY
+    if (x < minX) {
+      minX = x
+      leftmostId = blockId
    }
  }

-  return blockExecutionMap
+  return leftmostId
 }

-interface PreviewProps {
-  /** The workflow state to display */
+/** Execution status for edges/nodes in the preview */
+type ExecutionStatus = 'success' | 'error' | 'not-executed'
+
+interface WorkflowPreviewProps {
  workflowState: WorkflowState
-  /** Trace spans for the execution (optional - enables execution mode features) */
-  traceSpans?: TraceSpan[]
-  /** Pre-computed block executions (optional - will be built from traceSpans if not provided) */
-  blockExecutions?: Record<string, BlockExecutionData>
-  /** Additional CSS class names */
  className?: string
-  /** Height of the component */
  height?: string | number
-  /** Width of the component */
  width?: string | number
-  /** Callback when canvas context menu is opened */
-  onCanvasContextMenu?: (e: React.MouseEvent) => void
-  /** Callback when a node context menu is opened */
+  isPannable?: boolean
+  defaultPosition?: { x: number; y: number }
+  defaultZoom?: number
+  fitPadding?: number
+  onNodeClick?: (blockId: string, mousePosition: { x: number; y: number }) => void
+  /** Callback when a node is right-clicked */
  onNodeContextMenu?: (blockId: string, mousePosition: { x: number; y: number }) => void
-  /** Whether to show border around the component */
-  showBorder?: boolean
-  /** Initial block to select (defaults to leftmost block) */
-  initialSelectedBlockId?: string | null
-  /** Whether to auto-select the leftmost block on mount */
-  autoSelectLeftmost?: boolean
+  /** Callback when the canvas (empty area) is clicked */
+  onPaneClick?: () => void
+  /** Cursor style to show when hovering the canvas */
+  cursorStyle?: 'default' | 'pointer' | 'grab'
+  /** Map of executed block IDs to their status for highlighting the execution path */
+  executedBlocks?: Record<string, { status: string }>
+  /** Currently selected block ID for highlighting */
+  selectedBlockId?: string | null
 }

 /**
- * Main preview component that combines PreviewCanvas with PreviewEditor
- * and handles nested workflow navigation via a stack.
- *
- * @remarks
- * - Manages navigation stack for drilling into nested workflow blocks
- * - Displays back button when viewing nested workflows
- * - Properly passes execution data through to nested levels
- * - Can be used anywhere a workflow preview with editor is needed
+ * Preview node types using minimal components without hooks or store subscriptions.
+ * This prevents interaction issues while allowing canvas panning and node clicking.
 */
-export function Preview({
-  workflowState: rootWorkflowState,
-  traceSpans: rootTraceSpans,
-  blockExecutions: providedBlockExecutions,
+const previewNodeTypes: NodeTypes = {
+  workflowBlock: WorkflowPreviewBlock,
+  noteBlock: WorkflowPreviewBlock,
+  subflowNode: WorkflowPreviewSubflow,
+}
+
+// Define edge types
+const edgeTypes: EdgeTypes = {
+  default: WorkflowEdge,
+  workflowEdge: WorkflowEdge, // Keep for backward compatibility
+}
+
+interface FitViewOnChangeProps {
+  nodeIds: string
+  fitPadding: number
+  containerRef: React.RefObject<HTMLDivElement | null>
+}
+
+/**
+ * Helper component that calls fitView when the set of nodes changes or when the container resizes.
+ * Only triggers on actual node additions/removals, not on selection changes.
+ * Must be rendered inside ReactFlowProvider.
+ */
+function FitViewOnChange({ nodeIds, fitPadding, containerRef }: FitViewOnChangeProps) {
+  const { fitView } = useReactFlow()
+  const lastNodeIdsRef = useRef<string | null>(null)
+
+  // Fit view when nodes change
+  useEffect(() => {
+    if (!nodeIds.length) return
+    const shouldFit = lastNodeIdsRef.current !== nodeIds
+    if (!shouldFit) return
+    lastNodeIdsRef.current = nodeIds
+
+    const timeoutId = setTimeout(() => {
+      fitView({ padding: fitPadding, duration: 200 })
+    }, 50)
+    return () => clearTimeout(timeoutId)
+  }, [nodeIds, fitPadding, fitView])
+
+  // Fit view when container resizes (debounced to avoid excessive calls during drag)
+  useEffect(() => {
+    const container = containerRef.current
+    if (!container) return
+
+    let timeoutId: ReturnType<typeof setTimeout> | null = null
+
+    const resizeObserver = new ResizeObserver(() => {
+      if (timeoutId) clearTimeout(timeoutId)
+      timeoutId = setTimeout(() => {
+        fitView({ padding: fitPadding, duration: 150 })
+      }, 100)
+    })
+
+    resizeObserver.observe(container)
+    return () => {
+      if (timeoutId) clearTimeout(timeoutId)
+      resizeObserver.disconnect()
+    }
+  }, [containerRef, fitPadding, fitView])
+
+  return null
+}
+
+export function WorkflowPreview({
+  workflowState,
  className,
  height = '100%',
  width = '100%',
-  onCanvasContextMenu,
+  isPannable = true,
+  defaultPosition,
+  defaultZoom = 0.8,
+  fitPadding = 0.25,
+  onNodeClick,
  onNodeContextMenu,
-  showBorder = false,
-  initialSelectedBlockId,
-  autoSelectLeftmost = true,
-}: PreviewProps) {
-  /** Initialize pinnedBlockId synchronously to ensure sidebar is present from first render */
-  const [pinnedBlockId, setPinnedBlockId] = useState<string | null>(() => {
-    if (initialSelectedBlockId) return initialSelectedBlockId
-    if (autoSelectLeftmost) {
-      return getLeftmostBlockId(rootWorkflowState)
+  onPaneClick,
+  cursorStyle = 'grab',
+  executedBlocks,
+  selectedBlockId,
+}: WorkflowPreviewProps) {
+  const containerRef = useRef<HTMLDivElement>(null)
+  const nodeTypes = previewNodeTypes
+  const isValidWorkflowState = workflowState?.blocks && workflowState.edges
+
+  const blocksStructure = useMemo(() => {
+    if (!isValidWorkflowState) return { count: 0, ids: '' }
+    return {
+      count: Object.keys(workflowState.blocks || {}).length,
+      ids: Object.keys(workflowState.blocks || {}).join(','),
    }
-    return null
-  })
+  }, [workflowState.blocks, isValidWorkflowState])

-  /** Stack for nested workflow navigation. Empty means we're at the root level. */
-  const [workflowStack, setWorkflowStack] = useState<WorkflowStackEntry[]>([])
-
-  /** Block executions for the root level */
-  const rootBlockExecutions = useMemo(() => {
-    if (providedBlockExecutions) return providedBlockExecutions
-    if (!rootTraceSpans || !Array.isArray(rootTraceSpans)) return {}
-    return buildBlockExecutions(rootTraceSpans)
-  }, [providedBlockExecutions, rootTraceSpans])
-
-  /** Current block executions - either from stack or root */
-  const blockExecutions = useMemo(() => {
-    if (workflowStack.length > 0) {
-      return workflowStack[workflowStack.length - 1].blockExecutions
+  const loopsStructure = useMemo(() => {
+    if (!isValidWorkflowState) return { count: 0, ids: '' }
+    return {
+      count: Object.keys(workflowState.loops || {}).length,
+      ids: Object.keys(workflowState.loops || {}).join(','),
    }
-    return rootBlockExecutions
-  }, [workflowStack, rootBlockExecutions])
+  }, [workflowState.loops, isValidWorkflowState])

-  /** Current workflow state - either from stack or root */
-  const workflowState = useMemo(() => {
-    if (workflowStack.length > 0) {
-      return workflowStack[workflowStack.length - 1].workflowState
+  const parallelsStructure = useMemo(() => {
+    if (!isValidWorkflowState) return { count: 0, ids: '' }
+    return {
+      count: Object.keys(workflowState.parallels || {}).length,
+      ids: Object.keys(workflowState.parallels || {}).join(','),
    }
-    return rootWorkflowState
-  }, [workflowStack, rootWorkflowState])
+  }, [workflowState.parallels, isValidWorkflowState])

-  /** Whether we're in execution mode (have trace spans/block executions) */
-  const isExecutionMode = useMemo(() => {
-    return Object.keys(blockExecutions).length > 0
-  }, [blockExecutions])
+  const edgesStructure = useMemo(() => {
+    if (!isValidWorkflowState) return { count: 0, ids: '' }
+    return {
+      count: workflowState.edges?.length || 0,
+      ids: workflowState.edges?.map((e) => e.id).join(',') || '',
+    }
+  }, [workflowState.edges, isValidWorkflowState])

-  /** Handler to drill down into a nested workflow block */
-  const handleDrillDown = useCallback(
-    (blockId: string, childWorkflowState: WorkflowState) => {
-      const blockExecution = blockExecutions[blockId]
-      const childTraceSpans = extractChildTraceSpans(blockExecution)
-      const childBlockExecutions = buildBlockExecutions(childTraceSpans)
+  const calculateAbsolutePosition = (
+    block: any,
+    blocks: Record<string, any>
+  ): { x: number; y: number } => {
+    if (!block.data?.parentId) {
+      return block.position
+    }

-      setWorkflowStack((prev) => [
-        ...prev,
-        {
-          workflowState: childWorkflowState,
-          traceSpans: childTraceSpans,
-          blockExecutions: childBlockExecutions,
+    const parentBlock = blocks[block.data.parentId]
+    if (!parentBlock) {
+      logger.warn(`Parent block not found for child block: ${block.id}`)
+      return block.position
+    }
+
+    const parentAbsolutePosition = calculateAbsolutePosition(parentBlock, blocks)
+
+    return {
+      x: parentAbsolutePosition.x + block.position.x,
+      y: parentAbsolutePosition.y + block.position.y,
+    }
+  }
+
+  const nodes: Node[] = useMemo(() => {
+    if (!isValidWorkflowState) return []
+
+    const nodeArray: Node[] = []
+
+    Object.entries(workflowState.blocks || {}).forEach(([blockId, block]) => {
+      if (!block || !block.type) {
+        logger.warn(`Skipping invalid block: ${blockId}`)
+        return
+      }
+
+      const absolutePosition = calculateAbsolutePosition(block, workflowState.blocks)
+
+      // Handle loop/parallel containers
+      if (block.type === 'loop' || block.type === 'parallel') {
+        const isSelected = selectedBlockId === blockId
+        const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
+        nodeArray.push({
+          id: blockId,
+          type: 'subflowNode',
+          position: absolutePosition,
+          draggable: false,
+          data: {
+            name: block.name,
+            width: dimensions.width,
+            height: dimensions.height,
+            kind: block.type as 'loop' | 'parallel',
+            isPreviewSelected: isSelected,
+          },
+        })
+        return
+      }
+
+      // Handle regular blocks
+      const isSelected = selectedBlockId === blockId
+
+      let executionStatus: ExecutionStatus | undefined
+      if (executedBlocks) {
+        const blockExecution = executedBlocks[blockId]
+        if (blockExecution) {
+          if (blockExecution.status === 'error') {
+            executionStatus = 'error'
+          } else if (blockExecution.status === 'success') {
+            executionStatus = 'success'
+          } else {
+            executionStatus = 'not-executed'
+          }
+        } else {
+          executionStatus = 'not-executed'
+        }
+      }
+
+      nodeArray.push({
+        id: blockId,
+        type: 'workflowBlock',
+        position: absolutePosition,
+        draggable: false,
+        // Blocks inside subflows need higher z-index to appear above the container
+        zIndex: block.data?.parentId ? 10 : undefined,
+        data: {
+          type: block.type,
+          name: block.name,
+          isTrigger: block.triggerMode === true,
+          horizontalHandles: block.horizontalHandles ?? false,
+          enabled: block.enabled ?? true,
+          isPreviewSelected: isSelected,
+          executionStatus,
+          subBlockValues: block.subBlocks,
        },
-      ])
+      })
+    })

-      /** Set pinned block synchronously to avoid double fitView from sidebar resize */
-      const leftmostId = getLeftmostBlockId(childWorkflowState)
-      setPinnedBlockId(leftmostId)
-    },
-    [blockExecutions]
-  )
+    return nodeArray
+  }, [
+    blocksStructure,
+    loopsStructure,
+    parallelsStructure,
+    workflowState.blocks,
+    isValidWorkflowState,
+    executedBlocks,
+    selectedBlockId,
+  ])

-  /** Handler to go back up the stack */
-  const handleGoBack = useCallback(() => {
-    setWorkflowStack((prev) => prev.slice(0, -1))
-    setPinnedBlockId(null)
-  }, [])
+  const edges: Edge[] = useMemo(() => {
+    if (!isValidWorkflowState) return []

-  /** Handlers for node interactions - memoized to prevent unnecessary re-renders */
-  const handleNodeClick = useCallback((blockId: string) => {
-    setPinnedBlockId(blockId)
-  }, [])
+    return (workflowState.edges || []).map((edge) => {
+      let executionStatus: ExecutionStatus | undefined
+      if (executedBlocks) {
+        const sourceExecuted = executedBlocks[edge.source]
+        const targetExecuted = executedBlocks[edge.target]

-  const handlePaneClick = useCallback(() => {
-    setPinnedBlockId(null)
-  }, [])
+        if (sourceExecuted && targetExecuted) {
+          // Edge is success if source succeeded and target was executed (even if target errored)
+          if (sourceExecuted.status === 'success') {
+            executionStatus = 'success'
+          } else {
+            executionStatus = 'not-executed'
+          }
+        } else {
+          executionStatus = 'not-executed'
+        }
+      }

-  const handleEditorClose = useCallback(() => {
-    setPinnedBlockId(null)
-  }, [])
+      return {
+        id: edge.id,
+        source: edge.source,
+        target: edge.target,
+        sourceHandle: edge.sourceHandle,
+        targetHandle: edge.targetHandle,
+        data: executionStatus ? { executionStatus } : undefined,
+        // Raise executed edges above default edges
+        zIndex: executionStatus === 'success' ? 10 : 0,
+      }
+    })
+  }, [edgesStructure, workflowState.edges, isValidWorkflowState, executedBlocks])

-  useEffect(() => {
-    setWorkflowStack([])
-  }, [rootWorkflowState])
-
-  const isNested = workflowStack.length > 0
+  if (!isValidWorkflowState) {
+    return (
+      <div
+        style={{ height, width }}
+        className='flex items-center justify-center rounded-lg border border-gray-200 bg-gray-50 dark:border-gray-700 dark:bg-gray-900'
+      >
+        <div className='text-center text-gray-500 dark:text-gray-400'>
+          <div className='mb-2 font-medium text-lg'>⚠️ Logged State Not Found</div>
+          <div className='text-sm'>
+            This log was migrated from the old system and doesn't contain workflow state data.
+          </div>
+        </div>
+      </div>
+    )
+  }

  return (
-    <div
-      style={{ height, width }}
-      className={cn(
-        'relative flex overflow-hidden',
-        showBorder && 'rounded-[4px] border border-[var(--border)]',
-        className
-      )}
-    >
-      {isNested && (
-        <div className='absolute top-[12px] left-[12px] z-20'>
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <Button
-                variant='ghost'
-                onClick={handleGoBack}
-                className='flex h-[30px] items-center gap-[5px] border border-[var(--border)] bg-[var(--surface-2)] px-[10px] hover:bg-[var(--surface-4)]'
-              >
-                <ArrowLeft className='h-[13px] w-[13px]' />
-                <span className='font-medium text-[13px]'>Back</span>
-              </Button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='bottom'>Go back to parent workflow</Tooltip.Content>
-          </Tooltip.Root>
-        </div>
-      )}
+    <ReactFlowProvider>
+      <div
+        ref={containerRef}
+        style={{ height, width, backgroundColor: 'var(--bg)' }}
+        className={cn('preview-mode', onNodeClick && 'interactive-nodes', className)}
+      >
+        <style>{`
+          /* Canvas cursor - grab on the flow container and pane */
+          .preview-mode .react-flow { cursor: ${cursorStyle}; }
+          .preview-mode .react-flow__pane { cursor: ${cursorStyle} !important; }
+          .preview-mode .react-flow__selectionpane { cursor: ${cursorStyle} !important; }
+          .preview-mode .react-flow__renderer { cursor: ${cursorStyle}; }

-      <div className='h-full flex-1' onContextMenu={onCanvasContextMenu}>
-        <PreviewWorkflow
-          workflowState={workflowState}
-          isPannable={true}
-          defaultPosition={{ x: 0, y: 0 }}
-          defaultZoom={0.8}
-          onNodeClick={handleNodeClick}
-          onNodeContextMenu={onNodeContextMenu}
-          onPaneClick={handlePaneClick}
-          cursorStyle='pointer'
-          executedBlocks={blockExecutions}
-          selectedBlockId={pinnedBlockId}
+          /* Active/grabbing cursor when dragging */
+          ${
+            cursorStyle === 'grab'
+              ? `
+          .preview-mode .react-flow:active { cursor: grabbing; }
+          .preview-mode .react-flow__pane:active { cursor: grabbing !important; }
+          .preview-mode .react-flow__selectionpane:active { cursor: grabbing !important; }
+          .preview-mode .react-flow__renderer:active { cursor: grabbing; }
+          .preview-mode .react-flow__node:active { cursor: grabbing !important; }
+          .preview-mode .react-flow__node:active * { cursor: grabbing !important; }
+          `
+              : ''
+          }
+
+          /* Node cursor - pointer on nodes when onNodeClick is provided */
+          .preview-mode.interactive-nodes .react-flow__node { cursor: pointer !important; }
+          .preview-mode.interactive-nodes .react-flow__node > div { cursor: pointer !important; }
+          .preview-mode.interactive-nodes .react-flow__node * { cursor: pointer !important; }
+        `}</style>
+        <ReactFlow
+          nodes={nodes}
+          edges={edges}
+          nodeTypes={nodeTypes}
+          edgeTypes={edgeTypes}
+          connectionLineType={ConnectionLineType.SmoothStep}
+          fitView
+          fitViewOptions={{ padding: fitPadding }}
+          panOnScroll={isPannable}
+          panOnDrag={isPannable}
+          zoomOnScroll={false}
+          draggable={false}
+          defaultViewport={{
+            x: defaultPosition?.x ?? 0,
+            y: defaultPosition?.y ?? 0,
+            zoom: defaultZoom ?? 1,
+          }}
+          minZoom={0.1}
+          maxZoom={2}
+          proOptions={{ hideAttribution: true }}
+          elementsSelectable={false}
+          nodesDraggable={false}
+          nodesConnectable={false}
+          onNodeClick={
+            onNodeClick
+              ? (event, node) => {
+                  logger.debug('Node clicked:', { nodeId: node.id, event })
+                  onNodeClick(node.id, { x: event.clientX, y: event.clientY })
+                }
+              : undefined
+          }
+          onNodeContextMenu={
+            onNodeContextMenu
+              ? (event, node) => {
+                  event.preventDefault()
+                  event.stopPropagation()
+                  onNodeContextMenu(node.id, { x: event.clientX, y: event.clientY })
+                }
+              : undefined
+          }
+          onPaneClick={onPaneClick}
+        />
+        <FitViewOnChange
+          nodeIds={blocksStructure.ids}
+          fitPadding={fitPadding}
+          containerRef={containerRef}
        />
      </div>
-
-      {pinnedBlockId && workflowState.blocks[pinnedBlockId] && (
-        <PreviewEditor
-          block={workflowState.blocks[pinnedBlockId]}
-          executionData={blockExecutions[pinnedBlockId]}
-          allBlockExecutions={blockExecutions}
-          workflowBlocks={workflowState.blocks}
-          workflowVariables={workflowState.variables}
-          loops={workflowState.loops}
-          parallels={workflowState.parallels}
-          isExecutionMode={isExecutionMode}
-          onClose={handleEditorClose}
-          onDrillDown={handleDrillDown}
-        />
-      )}
-    </div>
+    </ReactFlowProvider>
  )
 }
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/workflow-mcp-servers/workflow-mcp-servers.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/workflow-mcp-servers/workflow-mcp-servers.tsx
@@ -185,16 +185,6 @@ function ServerDetailView({ workspaceId, serverId, onBack }: ServerDetailViewPro
        return `claude mcp add "${safeName}" --url "${mcpServerUrl}" --header "X-API-Key:$SIM_API_KEY"`
      }

-      // Cursor supports direct URL configuration (no mcp-remote needed)
-      if (client === 'cursor') {
-        const cursorConfig = isPublic
-          ? { url: mcpServerUrl }
-          : { url: mcpServerUrl, headers: { 'X-API-Key': '$SIM_API_KEY' } }
-
-        return JSON.stringify({ mcpServers: { [safeName]: cursorConfig } }, null, 2)
-      }
-
-      // Claude Desktop and VS Code still use mcp-remote (stdio transport)
      const mcpRemoteArgs = isPublic
        ? ['-y', 'mcp-remote', mcpServerUrl]
        : ['-y', 'mcp-remote', mcpServerUrl, '--header', 'X-API-Key:$SIM_API_KEY']
@@ -275,8 +265,14 @@ function ServerDetailView({ workspaceId, serverId, onBack }: ServerDetailViewPro
        .replace(/[^a-z0-9-]/g, '')

      const config = isPublic
-        ? { url: mcpServerUrl }
-        : { url: mcpServerUrl, headers: { 'X-API-Key': '$SIM_API_KEY' } }
+        ? {
+            command: 'npx',
+            args: ['-y', 'mcp-remote', mcpServerUrl],
+          }
+        : {
+            command: 'npx',
+            args: ['-y', 'mcp-remote', mcpServerUrl, '--header', 'X-API-Key:$SIM_API_KEY'],
+          }

      const base64Config = btoa(JSON.stringify(config))
      return `cursor://anysphere.cursor-deeplink/mcp/install?name=${encodeURIComponent(safeName)}&config=${encodeURIComponent(base64Config)}`
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
@@ -158,7 +158,7 @@ const allNavigationItems: NavigationItem[] = [
  { id: 'mcp', label: 'MCP Tools', icon: McpIcon, section: 'tools' },
  { id: 'environment', label: 'Environment', icon: FolderCode, section: 'system' },
  { id: 'apikeys', label: 'API Keys', icon: Key, section: 'system' },
-  { id: 'workflow-mcp-servers', label: 'MCP Servers', icon: Server, section: 'system' },
+  { id: 'workflow-mcp-servers', label: 'Deployed MCPs', icon: Server, section: 'system' },
  {
    id: 'byok',
    label: 'BYOK',
--- a/apps/sim/blocks/blocks/agent.ts
+++ b/apps/sim/blocks/blocks/agent.ts
@@ -513,12 +513,6 @@ Return ONLY the JSON array.`,
        })(),
      }),
    },
-    {
-      id: 'maxTokens',
-      title: 'Max Output Tokens',
-      type: 'short-input',
-      placeholder: 'Enter max tokens (e.g., 4096)...',
-    },
    {
      id: 'responseFormat',
      title: 'Response Format',
@@ -760,7 +754,6 @@ Example 3 (Array Input):
      },
    },
    temperature: { type: 'number', description: 'Response randomness level' },
-    maxTokens: { type: 'number', description: 'Maximum number of tokens in the response' },
    reasoningEffort: { type: 'string', description: 'Reasoning effort level for GPT-5 models' },
    verbosity: { type: 'string', description: 'Verbosity level for GPT-5 models' },
    thinkingLevel: { type: 'string', description: 'Thinking level for Gemini 3 models' },
--- a/apps/sim/components/emcn/components/code/code.tsx
+++ b/apps/sim/components/emcn/components/code/code.tsx
--- a/apps/sim/components/emcn/components/switch/switch.tsx
+++ b/apps/sim/components/emcn/components/switch/switch.tsx
@@ -5,8 +5,9 @@ import * as SwitchPrimitives from '@radix-ui/react-switch'
 import { cn } from '@/lib/core/utils/cn'

 /**
- * Switch component styled to match Sim's design system.
- * Uses brand color for checked state, neutral border for unchecked.
+ * Custom switch component with thin track design.
+ * Track: 28px width, 6px height, 20px border-radius
+ * Thumb: 14px diameter circle that overlaps the track
 */
 const Switch = React.forwardRef<
  React.ElementRef<typeof SwitchPrimitives.Root>,
@@ -15,13 +16,21 @@ const Switch = React.forwardRef<
  <SwitchPrimitives.Root
    disabled={disabled}
    className={cn(
-      'peer inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full bg-[var(--border-1)] transition-colors focus-visible:outline-none data-[disabled]:cursor-not-allowed data-[state=checked]:bg-[var(--brand-tertiary-2)] data-[disabled]:opacity-50',
+      'peer inline-flex h-[17px] w-[30px] shrink-0 cursor-pointer items-center rounded-[20px] transition-colors focus-visible:outline-none',
+      'data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50',
+      'bg-[var(--border-1)] data-[state=checked]:bg-[var(--text-primary)]',
      className
    )}
    {...props}
    ref={ref}
  >
-    <SwitchPrimitives.Thumb className='pointer-events-none block h-4 w-4 rounded-full bg-[var(--white)] shadow-sm ring-0 transition-transform data-[state=checked]:translate-x-[18px] data-[state=unchecked]:translate-x-0.5' />
+    <SwitchPrimitives.Thumb
+      className={cn(
+        'pointer-events-none block h-[14px] w-[14px] rounded-full shadow-sm ring-0 transition-transform',
+        'bg-[var(--white)]',
+        'data-[state=checked]:translate-x-[14px] data-[state=unchecked]:translate-x-[2px]'
+      )}
+    />
  </SwitchPrimitives.Root>
 ))

--- a/apps/sim/executor/constants.ts
+++ b/apps/sim/executor/constants.ts
@@ -275,26 +275,6 @@ export function isTriggerBlockType(blockType: string | undefined): boolean {
  return blockType !== undefined && (TRIGGER_BLOCK_TYPES as readonly string[]).includes(blockType)
 }

-/**
- * Determines if a block behaves as a trigger based on its metadata and config.
- * This is used for execution flow decisions where trigger-like behavior matters.
- *
- * A block is considered trigger-like if:
- * - Its category is 'triggers'
- * - It has triggerMode enabled
- * - It's a starter block (legacy entry point)
- */
-export function isTriggerBehavior(block: {
-  metadata?: { category?: string; id?: string }
-  config?: { params?: { triggerMode?: boolean } }
-}): boolean {
-  return (
-    block.metadata?.category === 'triggers' ||
-    block.config?.params?.triggerMode === true ||
-    block.metadata?.id === BlockType.STARTER
-  )
-}
-
 export function isMetadataOnlyBlockType(blockType: string | undefined): boolean {
  return (
    blockType !== undefined && (METADATA_ONLY_BLOCK_TYPES as readonly string[]).includes(blockType)
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -11,8 +11,6 @@ import {
  DEFAULTS,
  EDGE,
  isSentinelBlockType,
-  isTriggerBehavior,
-  isWorkflowBlockType,
 } from '@/executor/constants'
 import type { DAGNode } from '@/executor/dag/builder'
 import { ChildWorkflowError } from '@/executor/errors/child-workflow-error'
@@ -155,8 +153,8 @@ export class BlockExecutor {
      this.state.setBlockOutput(node.id, normalizedOutput, duration)

      if (!isSentinel) {
-        const displayOutput = this.filterOutputForDisplay(block, normalizedOutput)
-        this.callOnBlockComplete(ctx, node, block, resolvedInputs, displayOutput, duration)
+        const filteredOutput = this.filterOutputForLog(block, normalizedOutput)
+        this.callOnBlockComplete(ctx, node, block, resolvedInputs, filteredOutput, duration)
      }

      return normalizedOutput
@@ -246,8 +244,7 @@ export class BlockExecutor {
    )

    if (!isSentinel) {
-      const displayOutput = this.filterOutputForDisplay(block, errorOutput)
-      this.callOnBlockComplete(ctx, node, block, input, displayOutput, duration)
+      this.callOnBlockComplete(ctx, node, block, input, errorOutput, duration)
    }

    const hasErrorPort = this.hasErrorPortEdge(node)
@@ -339,9 +336,7 @@ export class BlockExecutor {
    block: SerializedBlock,
    output: NormalizedBlockOutput
  ): NormalizedBlockOutput {
-    const blockType = block.metadata?.id
-
-    if (blockType === BlockType.HUMAN_IN_THE_LOOP) {
+    if (block.metadata?.id === BlockType.HUMAN_IN_THE_LOOP) {
      const filtered: NormalizedBlockOutput = {}
      for (const [key, value] of Object.entries(output)) {
        if (key.startsWith('_')) continue
@@ -351,7 +346,12 @@ export class BlockExecutor {
      return filtered
    }

-    if (isTriggerBehavior(block)) {
+    const isTrigger =
+      block.metadata?.category === 'triggers' ||
+      block.config?.params?.triggerMode === true ||
+      block.metadata?.id === BlockType.STARTER
+
+    if (isTrigger) {
      const filtered: NormalizedBlockOutput = {}
      const internalKeys = ['webhook', 'workflowId']
      for (const [key, value] of Object.entries(output)) {
@@ -364,22 +364,6 @@ export class BlockExecutor {
    return output
  }

-  private filterOutputForDisplay(
-    block: SerializedBlock,
-    output: NormalizedBlockOutput
-  ): NormalizedBlockOutput {
-    const filtered = this.filterOutputForLog(block, output)
-
-    if (isWorkflowBlockType(block.metadata?.id)) {
-      const { childTraceSpans: _, ...displayOutput } = filtered as {
-        childTraceSpans?: unknown
-      } & Record<string, unknown>
-      return displayOutput
-    }
-
-    return filtered
-  }
-
  private callOnBlockStart(ctx: ExecutionContext, node: DAGNode, block: SerializedBlock): void {
    const blockId = node.id
    const blockName = block.metadata?.name ?? blockId
--- a/apps/sim/executor/execution/edge-manager.test.ts
+++ b/apps/sim/executor/execution/edge-manager.test.ts
@@ -773,176 +773,6 @@ describe('EdgeManager', () => {
    })
  })

-  describe('Multiple error ports to same target', () => {
-    it('should mark target ready when one source errors and another succeeds', () => {
-      // This tests the case where a node has multiple incoming error edges
-      // from different sources. When one source errors (activating its error edge)
-      // and another source succeeds (deactivating its error edge), the target
-      // should become ready after both sources complete.
-      //
-      // Workflow 1 (errors) ─── error ───┐
-      //                                  ├──→ Error Handler
-      // Workflow 7 (succeeds) ─ error ───┘
-
-      const workflow1Id = 'workflow-1'
-      const workflow7Id = 'workflow-7'
-      const errorHandlerId = 'error-handler'
-
-      const workflow1Node = createMockNode(workflow1Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const workflow7Node = createMockNode(workflow7Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const errorHandlerNode = createMockNode(errorHandlerId, [], [workflow1Id, workflow7Id])
-
-      const nodes = new Map<string, DAGNode>([
-        [workflow1Id, workflow1Node],
-        [workflow7Id, workflow7Node],
-        [errorHandlerId, errorHandlerNode],
-      ])
-
-      const dag = createMockDAG(nodes)
-      const edgeManager = new EdgeManager(dag)
-
-      // Workflow 1 errors first - error edge activates
-      const readyAfterWorkflow1 = edgeManager.processOutgoingEdges(workflow1Node, {
-        error: 'Something went wrong',
-      })
-      // Error handler should NOT be ready yet (waiting for workflow 7)
-      expect(readyAfterWorkflow1).not.toContain(errorHandlerId)
-
-      // Workflow 7 succeeds - error edge deactivates
-      const readyAfterWorkflow7 = edgeManager.processOutgoingEdges(workflow7Node, {
-        result: 'success',
-      })
-      // Error handler SHOULD be ready now (workflow 1's error edge activated)
-      expect(readyAfterWorkflow7).toContain(errorHandlerId)
-    })
-
-    it('should mark target ready when first source succeeds then second errors', () => {
-      // Opposite order: first source succeeds, then second errors
-
-      const workflow1Id = 'workflow-1'
-      const workflow7Id = 'workflow-7'
-      const errorHandlerId = 'error-handler'
-
-      const workflow1Node = createMockNode(workflow1Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const workflow7Node = createMockNode(workflow7Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const errorHandlerNode = createMockNode(errorHandlerId, [], [workflow1Id, workflow7Id])
-
-      const nodes = new Map<string, DAGNode>([
-        [workflow1Id, workflow1Node],
-        [workflow7Id, workflow7Node],
-        [errorHandlerId, errorHandlerNode],
-      ])
-
-      const dag = createMockDAG(nodes)
-      const edgeManager = new EdgeManager(dag)
-
-      // Workflow 1 succeeds first - error edge deactivates
-      const readyAfterWorkflow1 = edgeManager.processOutgoingEdges(workflow1Node, {
-        result: 'success',
-      })
-      // Error handler should NOT be ready yet (waiting for workflow 7)
-      expect(readyAfterWorkflow1).not.toContain(errorHandlerId)
-
-      // Workflow 7 errors - error edge activates
-      const readyAfterWorkflow7 = edgeManager.processOutgoingEdges(workflow7Node, {
-        error: 'Something went wrong',
-      })
-      // Error handler SHOULD be ready now (workflow 7's error edge activated)
-      expect(readyAfterWorkflow7).toContain(errorHandlerId)
-    })
-
-    it('should NOT mark target ready when all sources succeed (no errors)', () => {
-      // When neither source errors, the error handler should NOT run
-
-      const workflow1Id = 'workflow-1'
-      const workflow7Id = 'workflow-7'
-      const errorHandlerId = 'error-handler'
-
-      const workflow1Node = createMockNode(workflow1Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const workflow7Node = createMockNode(workflow7Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const errorHandlerNode = createMockNode(errorHandlerId, [], [workflow1Id, workflow7Id])
-
-      const nodes = new Map<string, DAGNode>([
-        [workflow1Id, workflow1Node],
-        [workflow7Id, workflow7Node],
-        [errorHandlerId, errorHandlerNode],
-      ])
-
-      const dag = createMockDAG(nodes)
-      const edgeManager = new EdgeManager(dag)
-
-      // Both workflows succeed - both error edges deactivate
-      const readyAfterWorkflow1 = edgeManager.processOutgoingEdges(workflow1Node, {
-        result: 'success',
-      })
-      expect(readyAfterWorkflow1).not.toContain(errorHandlerId)
-
-      const readyAfterWorkflow7 = edgeManager.processOutgoingEdges(workflow7Node, {
-        result: 'success',
-      })
-      // Error handler should NOT be ready (no errors occurred)
-      expect(readyAfterWorkflow7).not.toContain(errorHandlerId)
-    })
-
-    it('should mark target ready when both sources error', () => {
-      // When both sources error, the error handler should run
-
-      const workflow1Id = 'workflow-1'
-      const workflow7Id = 'workflow-7'
-      const errorHandlerId = 'error-handler'
-
-      const workflow1Node = createMockNode(workflow1Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const workflow7Node = createMockNode(workflow7Id, [
-        { target: errorHandlerId, sourceHandle: 'error' },
-      ])
-
-      const errorHandlerNode = createMockNode(errorHandlerId, [], [workflow1Id, workflow7Id])
-
-      const nodes = new Map<string, DAGNode>([
-        [workflow1Id, workflow1Node],
-        [workflow7Id, workflow7Node],
-        [errorHandlerId, errorHandlerNode],
-      ])
-
-      const dag = createMockDAG(nodes)
-      const edgeManager = new EdgeManager(dag)
-
-      // Workflow 1 errors
-      const readyAfterWorkflow1 = edgeManager.processOutgoingEdges(workflow1Node, {
-        error: 'Error 1',
-      })
-      expect(readyAfterWorkflow1).not.toContain(errorHandlerId)
-
-      // Workflow 7 errors
-      const readyAfterWorkflow7 = edgeManager.processOutgoingEdges(workflow7Node, {
-        error: 'Error 2',
-      })
-      // Error handler SHOULD be ready (both edges activated)
-      expect(readyAfterWorkflow7).toContain(errorHandlerId)
-    })
-  })
-
  describe('Chained conditions', () => {
    it('should handle sequential conditions (condition1 → condition2)', () => {
      const condition1Id = 'condition-1'
--- a/apps/sim/executor/execution/edge-manager.ts
+++ b/apps/sim/executor/execution/edge-manager.ts
@@ -8,7 +8,6 @@ const logger = createLogger('EdgeManager')

 export class EdgeManager {
  private deactivatedEdges = new Set<string>()
-  private nodesWithActivatedEdge = new Set<string>()

  constructor(private dag: DAG) {}

@@ -36,11 +35,6 @@ export class EdgeManager {
      activatedTargets.push(edge.target)
    }

-    // Track nodes that have received at least one activated edge
-    for (const targetId of activatedTargets) {
-      this.nodesWithActivatedEdge.add(targetId)
-    }
-
    const cascadeTargets = new Set<string>()
    for (const { target, handle } of edgesToDeactivate) {
      this.deactivateEdgeAndDescendants(node.id, target, handle, cascadeTargets)
@@ -77,18 +71,6 @@ export class EdgeManager {
      }
    }

-    // Check if any deactivation targets that previously received an activated edge are now ready
-    for (const { target } of edgesToDeactivate) {
-      if (
-        !readyNodes.includes(target) &&
-        !activatedTargets.includes(target) &&
-        this.nodesWithActivatedEdge.has(target) &&
-        this.isTargetReady(target)
-      ) {
-        readyNodes.push(target)
-      }
-    }
-
    return readyNodes
  }

@@ -108,7 +90,6 @@ export class EdgeManager {

  clearDeactivatedEdges(): void {
    this.deactivatedEdges.clear()
-    this.nodesWithActivatedEdge.clear()
  }

  /**
@@ -127,10 +108,6 @@ export class EdgeManager {
    for (const edgeKey of edgesToRemove) {
      this.deactivatedEdges.delete(edgeKey)
    }
-    // Also clear activated edge tracking for these nodes
-    for (const nodeId of nodeIds) {
-      this.nodesWithActivatedEdge.delete(nodeId)
-    }
  }

  private isTargetReady(targetId: string): boolean {
@@ -233,11 +210,7 @@ export class EdgeManager {
      cascadeTargets?.add(targetId)
    }

-    // Don't cascade if node has active incoming edges OR has received an activated edge
-    if (
-      this.hasActiveIncomingEdges(targetNode, edgeKey) ||
-      this.nodesWithActivatedEdge.has(targetId)
-    ) {
+    if (this.hasActiveIncomingEdges(targetNode, edgeKey)) {
      return
    }

--- a/apps/sim/executor/handlers/trigger/trigger-handler.ts
+++ b/apps/sim/executor/handlers/trigger/trigger-handler.ts
@@ -1,5 +1,5 @@
 import { createLogger } from '@sim/logger'
-import { BlockType, isTriggerBehavior } from '@/executor/constants'
+import { BlockType } from '@/executor/constants'
 import type { BlockHandler, ExecutionContext } from '@/executor/types'
 import type { SerializedBlock } from '@/serializer/types'

@@ -7,7 +7,15 @@ const logger = createLogger('TriggerBlockHandler')

 export class TriggerBlockHandler implements BlockHandler {
  canHandle(block: SerializedBlock): boolean {
-    return isTriggerBehavior(block)
+    if (block.metadata?.id === BlockType.STARTER) {
+      return true
+    }
+
+    const isTriggerCategory = block.metadata?.category === 'triggers'
+
+    const hasTriggerMode = block.config?.params?.triggerMode === true
+
+    return isTriggerCategory || hasTriggerMode
  }

  async execute(
--- a/apps/sim/executor/utils/block-data.ts
+++ b/apps/sim/executor/utils/block-data.ts
@@ -1,5 +1,4 @@
-import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
-import { isTriggerBehavior, normalizeName } from '@/executor/constants'
+import { normalizeName } from '@/executor/constants'
 import type { ExecutionContext } from '@/executor/types'
 import type { OutputSchema } from '@/executor/utils/block-reference'
 import type { SerializedBlock } from '@/serializer/types'
@@ -12,73 +11,25 @@ export interface BlockDataCollection {
  blockOutputSchemas: Record<string, OutputSchema>
 }

-/**
- * Block types where inputFormat fields should be merged into outputs schema.
- * These are blocks where users define custom fields via inputFormat that become
- * valid output paths (e.g., <start.myField>, <webhook1.customField>, <hitl1.resumeField>).
- *
- * Note: This includes non-trigger blocks like 'starter' and 'human_in_the_loop' which
- * have category 'blocks' but still need their inputFormat exposed as outputs.
- */
-const BLOCKS_WITH_INPUT_FORMAT_OUTPUTS = [
-  'start_trigger',
-  'starter',
-  'api_trigger',
-  'input_trigger',
-  'generic_webhook',
-  'human_in_the_loop',
-] as const
-
-function getInputFormatFields(block: SerializedBlock): OutputSchema {
-  const inputFormat = normalizeInputFormatValue(block.config?.params?.inputFormat)
-  if (inputFormat.length === 0) {
-    return {}
-  }
-
-  const schema: OutputSchema = {}
-  for (const field of inputFormat) {
-    if (!field.name) continue
-    schema[field.name] = {
-      type: (field.type || 'any') as 'string' | 'number' | 'boolean' | 'object' | 'array' | 'any',
-    }
-  }
-
-  return schema
-}
-
 export function getBlockSchema(
  block: SerializedBlock,
  toolConfig?: ToolConfig
 ): OutputSchema | undefined {
-  const blockType = block.metadata?.id
-
-  // For blocks that expose inputFormat as outputs, always merge them
-  // This includes both triggers (start_trigger, generic_webhook) and
-  // non-triggers (starter, human_in_the_loop) that have inputFormat
-  if (
-    blockType &&
-    BLOCKS_WITH_INPUT_FORMAT_OUTPUTS.includes(
-      blockType as (typeof BLOCKS_WITH_INPUT_FORMAT_OUTPUTS)[number]
-    )
-  ) {
-    const baseOutputs = (block.outputs as OutputSchema) || {}
-    const inputFormatFields = getInputFormatFields(block)
-    const merged = { ...baseOutputs, ...inputFormatFields }
-    if (Object.keys(merged).length > 0) {
-      return merged
-    }
-  }
-
-  const isTrigger = isTriggerBehavior(block)
+  const isTrigger =
+    block.metadata?.category === 'triggers' ||
+    (block.config?.params as Record<string, unknown> | undefined)?.triggerMode === true

+  // Triggers use saved outputs (defines the trigger payload schema)
  if (isTrigger && block.outputs && Object.keys(block.outputs).length > 0) {
    return block.outputs as OutputSchema
  }

+  // When a tool is selected, tool outputs are the source of truth
  if (toolConfig?.outputs && Object.keys(toolConfig.outputs).length > 0) {
    return toolConfig.outputs as OutputSchema
  }

+  // Fallback to saved outputs for blocks without tools
  if (block.outputs && Object.keys(block.outputs).length > 0) {
    return block.outputs as OutputSchema
  }
--- a/apps/sim/executor/utils/code-formatting.ts
+++ b/apps/sim/executor/utils/code-formatting.ts
@@ -1,48 +0,0 @@
-/**
- * Formats a JavaScript/TypeScript value as a code literal for the target language.
- * Handles special cases like null, undefined, booleans, and Python-specific number representations.
- *
- * @param value - The value to format
- * @param language - Target language ('javascript' or 'python')
- * @returns A string literal representation valid in the target language
- *
- * @example
- * formatLiteralForCode(null, 'python') // => 'None'
- * formatLiteralForCode(true, 'python') // => 'True'
- * formatLiteralForCode(NaN, 'python')  // => "float('nan')"
- * formatLiteralForCode("hello", 'javascript') // => '"hello"'
- * formatLiteralForCode({a: 1}, 'python') // => "json.loads('{\"a\":1}')"
- */
-export function formatLiteralForCode(value: unknown, language: 'javascript' | 'python'): string {
-  const isPython = language === 'python'
-
-  if (value === undefined) {
-    return isPython ? 'None' : 'undefined'
-  }
-  if (value === null) {
-    return isPython ? 'None' : 'null'
-  }
-  if (typeof value === 'boolean') {
-    return isPython ? (value ? 'True' : 'False') : String(value)
-  }
-  if (typeof value === 'number') {
-    if (Number.isNaN(value)) {
-      return isPython ? "float('nan')" : 'NaN'
-    }
-    if (value === Number.POSITIVE_INFINITY) {
-      return isPython ? "float('inf')" : 'Infinity'
-    }
-    if (value === Number.NEGATIVE_INFINITY) {
-      return isPython ? "float('-inf')" : '-Infinity'
-    }
-    return String(value)
-  }
-  if (typeof value === 'string') {
-    return JSON.stringify(value)
-  }
-  // Objects and arrays - Python needs json.loads() because JSON true/false/null aren't valid Python
-  if (isPython) {
-    return `json.loads(${JSON.stringify(JSON.stringify(value))})`
-  }
-  return JSON.stringify(value)
-}
--- a/apps/sim/executor/variables/resolver.ts
+++ b/apps/sim/executor/variables/resolver.ts
@@ -157,14 +157,7 @@ export class VariableResolver {

    let replacementError: Error | null = null

-    const blockType = block?.metadata?.id
-    const language =
-      blockType === BlockType.FUNCTION
-        ? ((block?.config?.params as Record<string, unknown> | undefined)?.language as
-            | string
-            | undefined)
-        : undefined
-
+    // Use generic utility for smart variable reference replacement
    let result = replaceValidReferences(template, (match) => {
      if (replacementError) return match

@@ -174,7 +167,14 @@ export class VariableResolver {
          return match
        }

-        return this.blockResolver.formatValueForBlock(resolved, blockType, language)
+        const blockType = block?.metadata?.id
+        const isInTemplateLiteral =
+          blockType === BlockType.FUNCTION &&
+          template.includes('${') &&
+          template.includes('}') &&
+          template.includes('`')
+
+        return this.blockResolver.formatValueForBlock(resolved, blockType, isInTemplateLiteral)
      } catch (error) {
        replacementError = error instanceof Error ? error : new Error(String(error))
        return match
--- a/apps/sim/executor/variables/resolvers/block.test.ts
+++ b/apps/sim/executor/variables/resolvers/block.test.ts
@@ -257,9 +257,15 @@ describe('BlockResolver', () => {
      expect(result).toBe('"hello"')
    })

-    it.concurrent('should format object for function block', () => {
+    it.concurrent('should format string for function block in template literal', () => {
      const resolver = new BlockResolver(createTestWorkflow())
-      const result = resolver.formatValueForBlock({ a: 1 }, 'function')
+      const result = resolver.formatValueForBlock('hello', 'function', true)
+      expect(result).toBe('hello')
+    })
+
+    it.concurrent('should format object for function block in template literal', () => {
+      const resolver = new BlockResolver(createTestWorkflow())
+      const result = resolver.formatValueForBlock({ a: 1 }, 'function', true)
      expect(result).toBe('{"a":1}')
    })

--- a/apps/sim/executor/variables/resolvers/block.ts
+++ b/apps/sim/executor/variables/resolvers/block.ts
@@ -10,7 +10,6 @@ import {
  type OutputSchema,
  resolveBlockReference,
 } from '@/executor/utils/block-reference'
-import { formatLiteralForCode } from '@/executor/utils/code-formatting'
 import {
  navigatePath,
  type ResolutionContext,
@@ -160,13 +159,17 @@ export class BlockResolver implements Resolver {
    return this.nameToBlockId.get(normalizeName(name))
  }

-  public formatValueForBlock(value: any, blockType: string | undefined, language?: string): string {
+  public formatValueForBlock(
+    value: any,
+    blockType: string | undefined,
+    isInTemplateLiteral = false
+  ): string {
    if (blockType === 'condition') {
      return this.stringifyForCondition(value)
    }

    if (blockType === 'function') {
-      return this.formatValueForCodeContext(value, language)
+      return this.formatValueForCodeContext(value, isInTemplateLiteral)
    }

    if (blockType === 'response') {
@@ -207,7 +210,29 @@ export class BlockResolver implements Resolver {
    return String(value)
  }

-  private formatValueForCodeContext(value: any, language?: string): string {
-    return formatLiteralForCode(value, language === 'python' ? 'python' : 'javascript')
+  private formatValueForCodeContext(value: any, isInTemplateLiteral: boolean): string {
+    if (isInTemplateLiteral) {
+      if (typeof value === 'string') {
+        return value
+      }
+      if (typeof value === 'object' && value !== null) {
+        return JSON.stringify(value)
+      }
+      return String(value)
+    }
+
+    if (typeof value === 'string') {
+      return JSON.stringify(value)
+    }
+    if (typeof value === 'object' && value !== null) {
+      return JSON.stringify(value)
+    }
+    if (value === undefined) {
+      return 'undefined'
+    }
+    if (value === null) {
+      return 'null'
+    }
+    return String(value)
  }
 }
--- a/apps/sim/executor/variables/resolvers/reference.ts
+++ b/apps/sim/executor/variables/resolvers/reference.ts
@@ -30,10 +30,7 @@ export function navigatePath(obj: any, path: string[]): any {
    const arrayMatch = part.match(/^([^[]+)(\[.+)$/)
    if (arrayMatch) {
      const [, prop, bracketsPart] = arrayMatch
-      current =
-        typeof current === 'object' && current !== null
-          ? (current as Record<string, unknown>)[prop]
-          : undefined
+      current = current[prop]
      if (current === undefined || current === null) {
        return undefined
      }
@@ -52,10 +49,7 @@ export function navigatePath(obj: any, path: string[]): any {
      const index = Number.parseInt(part, 10)
      current = Array.isArray(current) ? current[index] : undefined
    } else {
-      current =
-        typeof current === 'object' && current !== null
-          ? (current as Record<string, unknown>)[part]
-          : undefined
+      current = current[part]
    }
  }
  return current
--- a/apps/sim/hooks/use-canvas-viewport.ts
+++ b/apps/sim/hooks/use-canvas-viewport.ts
@@ -1,6 +1,5 @@
 import { useCallback } from 'react'
 import type { Node, ReactFlowInstance } from 'reactflow'
-import { BLOCK_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'

 interface VisibleBounds {
  width: number
@@ -140,8 +139,8 @@ export function useCanvasViewport(reactFlowInstance: ReactFlowInstance | null) {
      let maxY = Number.NEGATIVE_INFINITY

      nodes.forEach((node) => {
-        const nodeWidth = node.width ?? BLOCK_DIMENSIONS.FIXED_WIDTH
-        const nodeHeight = node.height ?? BLOCK_DIMENSIONS.MIN_HEIGHT
+        const nodeWidth = node.width ?? 200
+        const nodeHeight = node.height ?? 100

        minX = Math.min(minX, node.position.x)
        minY = Math.min(minY, node.position.y)
--- a/apps/sim/hooks/use-code-undo-redo.ts
+++ b/apps/sim/hooks/use-code-undo-redo.ts
@@ -1,239 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef } from 'react'
-import { createLogger } from '@sim/logger'
-import { useShallow } from 'zustand/react/shallow'
-import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
-import { useCodeUndoRedoStore } from '@/stores/undo-redo'
-import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-
-const logger = createLogger('CodeUndoRedo')
-
-interface UseCodeUndoRedoOptions {
-  blockId: string
-  subBlockId: string
-  value: string
-  enabled?: boolean
-  isReadOnly?: boolean
-  isStreaming?: boolean
-  debounceMs?: number
-}
-
-export function useCodeUndoRedo({
-  blockId,
-  subBlockId,
-  value,
-  enabled = true,
-  isReadOnly = false,
-  isStreaming = false,
-  debounceMs = 500,
-}: UseCodeUndoRedoOptions) {
-  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
-  const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
-  const { isShowingDiff, hasActiveDiff } = useWorkflowDiffStore(
-    useShallow((state) => ({
-      isShowingDiff: state.isShowingDiff,
-      hasActiveDiff: state.hasActiveDiff,
-    }))
-  )
-
-  const isBaselineView = hasActiveDiff && !isShowingDiff
-  const isEnabled = useMemo(
-    () => Boolean(enabled && activeWorkflowId && !isReadOnly && !isStreaming && !isBaselineView),
-    [enabled, activeWorkflowId, isReadOnly, isStreaming, isBaselineView]
-  )
-  const isReplaceEnabled = useMemo(
-    () => Boolean(enabled && activeWorkflowId && !isReadOnly && !isBaselineView),
-    [enabled, activeWorkflowId, isReadOnly, isBaselineView]
-  )
-
-  const lastCommittedValueRef = useRef<string>(value ?? '')
-  const pendingBeforeRef = useRef<string | null>(null)
-  const pendingAfterRef = useRef<string | null>(null)
-  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const isApplyingRef = useRef(false)
-
-  const clearTimer = useCallback(() => {
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current)
-      timeoutRef.current = null
-    }
-  }, [])
-
-  const resetPending = useCallback(() => {
-    pendingBeforeRef.current = null
-    pendingAfterRef.current = null
-  }, [])
-
-  const commitPending = useCallback(() => {
-    if (!isEnabled || !activeWorkflowId) {
-      clearTimer()
-      resetPending()
-      return
-    }
-
-    const before = pendingBeforeRef.current
-    const after = pendingAfterRef.current
-    if (before === null || after === null) return
-
-    if (before === after) {
-      lastCommittedValueRef.current = after
-      clearTimer()
-      resetPending()
-      return
-    }
-
-    useCodeUndoRedoStore.getState().push({
-      id: crypto.randomUUID(),
-      createdAt: Date.now(),
-      workflowId: activeWorkflowId,
-      blockId,
-      subBlockId,
-      before,
-      after,
-    })
-
-    lastCommittedValueRef.current = after
-    clearTimer()
-    resetPending()
-  }, [activeWorkflowId, blockId, clearTimer, isEnabled, resetPending, subBlockId])
-
-  const recordChange = useCallback(
-    (nextValue: string) => {
-      if (!isEnabled || isApplyingRef.current) return
-
-      if (pendingBeforeRef.current === null) {
-        pendingBeforeRef.current = lastCommittedValueRef.current ?? ''
-      }
-
-      pendingAfterRef.current = nextValue
-      clearTimer()
-      timeoutRef.current = setTimeout(commitPending, debounceMs)
-    },
-    [clearTimer, commitPending, debounceMs, isEnabled]
-  )
-
-  const recordReplace = useCallback(
-    (nextValue: string) => {
-      if (!isReplaceEnabled || isApplyingRef.current || !activeWorkflowId) return
-
-      if (pendingBeforeRef.current !== null) {
-        commitPending()
-      }
-
-      const before = lastCommittedValueRef.current ?? ''
-      if (before === nextValue) {
-        lastCommittedValueRef.current = nextValue
-        resetPending()
-        return
-      }
-
-      useCodeUndoRedoStore.getState().push({
-        id: crypto.randomUUID(),
-        createdAt: Date.now(),
-        workflowId: activeWorkflowId,
-        blockId,
-        subBlockId,
-        before,
-        after: nextValue,
-      })
-
-      lastCommittedValueRef.current = nextValue
-      clearTimer()
-      resetPending()
-    },
-    [
-      activeWorkflowId,
-      blockId,
-      clearTimer,
-      commitPending,
-      isReplaceEnabled,
-      resetPending,
-      subBlockId,
-    ]
-  )
-
-  const flushPending = useCallback(() => {
-    if (pendingBeforeRef.current === null) return
-    clearTimer()
-    commitPending()
-  }, [clearTimer, commitPending])
-
-  const startSession = useCallback(
-    (currentValue: string) => {
-      clearTimer()
-      resetPending()
-      lastCommittedValueRef.current = currentValue ?? ''
-    },
-    [clearTimer, resetPending]
-  )
-
-  const applyValue = useCallback(
-    (nextValue: string) => {
-      if (!isEnabled) return
-      isApplyingRef.current = true
-      try {
-        collaborativeSetSubblockValue(blockId, subBlockId, nextValue)
-      } finally {
-        isApplyingRef.current = false
-      }
-      lastCommittedValueRef.current = nextValue
-      clearTimer()
-      resetPending()
-    },
-    [blockId, clearTimer, collaborativeSetSubblockValue, isEnabled, resetPending, subBlockId]
-  )
-
-  const undo = useCallback(() => {
-    if (!activeWorkflowId || !isEnabled) return
-    if (pendingBeforeRef.current !== null) {
-      flushPending()
-    }
-    const entry = useCodeUndoRedoStore.getState().undo(activeWorkflowId, blockId, subBlockId)
-    if (!entry) return
-    logger.debug('Undo code edit', { blockId, subBlockId })
-    applyValue(entry.before)
-  }, [activeWorkflowId, applyValue, blockId, flushPending, isEnabled, subBlockId])
-
-  const redo = useCallback(() => {
-    if (!activeWorkflowId || !isEnabled) return
-    if (pendingBeforeRef.current !== null) {
-      flushPending()
-    }
-    const entry = useCodeUndoRedoStore.getState().redo(activeWorkflowId, blockId, subBlockId)
-    if (!entry) return
-    logger.debug('Redo code edit', { blockId, subBlockId })
-    applyValue(entry.after)
-  }, [activeWorkflowId, applyValue, blockId, flushPending, isEnabled, subBlockId])
-
-  useEffect(() => {
-    if (isApplyingRef.current || isStreaming) return
-
-    const nextValue = value ?? ''
-
-    if (pendingBeforeRef.current !== null) {
-      if (pendingAfterRef.current !== nextValue) {
-        clearTimer()
-        resetPending()
-        lastCommittedValueRef.current = nextValue
-      }
-      return
-    }
-
-    lastCommittedValueRef.current = nextValue
-  }, [clearTimer, isStreaming, resetPending, value])
-
-  useEffect(() => {
-    return () => {
-      flushPending()
-    }
-  }, [flushPending])
-
-  return {
-    recordChange,
-    recordReplace,
-    flushPending,
-    startSession,
-    undo,
-    redo,
-  }
-}
--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -20,7 +20,7 @@ import {
 import { useNotificationStore } from '@/stores/notifications'
 import { registerEmitFunctions, useOperationQueue } from '@/stores/operation-queue/store'
 import { usePanelEditorStore, useVariablesStore } from '@/stores/panel'
-import { useCodeUndoRedoStore, useUndoRedoStore } from '@/stores/undo-redo'
+import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
@@ -449,10 +449,6 @@ export function useCollaborativeWorkflow() {
      try {
        // The setValue function automatically uses the active workflow ID
        useSubBlockStore.getState().setValue(blockId, subblockId, value)
-        const blockType = useWorkflowStore.getState().blocks?.[blockId]?.type
-        if (activeWorkflowId && blockType === 'function' && subblockId === 'code') {
-          useCodeUndoRedoStore.getState().clear(activeWorkflowId, blockId, subblockId)
-        }
      } catch (error) {
        logger.error('Error applying remote subblock update:', error)
      } finally {
--- a/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
+++ b/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
@@ -37,13 +37,6 @@ export const knowledgeBaseServerTool: BaseServerTool<KnowledgeBaseArgs, Knowledg
            }
          }

-          if (!args.workspaceId) {
-            return {
-              success: false,
-              message: 'Workspace ID is required for creating a knowledge base',
-            }
-          }
-
          const requestId = crypto.randomUUID().slice(0, 8)
          const newKnowledgeBase = await createKnowledgeBase(
            {
--- a/apps/sim/lib/copilot/tools/shared/schemas.ts
+++ b/apps/sim/lib/copilot/tools/shared/schemas.ts
@@ -79,7 +79,7 @@ export const KnowledgeBaseArgsSchema = z.object({
      name: z.string().optional(),
      /** Description of the knowledge base (optional for create) */
      description: z.string().optional(),
-      /** Workspace ID to associate with (required for create, optional for list) */
+      /** Workspace ID to associate with (optional for create/list) */
      workspaceId: z.string().optional(),
      /** Knowledge base ID (required for get, query) */
      knowledgeBaseId: z.string().optional(),
--- a/apps/sim/lib/execution/isolated-vm-worker.cjs
+++ b/apps/sim/lib/execution/isolated-vm-worker.cjs
@@ -132,8 +132,6 @@ async function executeCode(request) {
    for (const [key, value] of Object.entries(contextVariables)) {
      if (value === undefined) {
        await jail.set(key, undefined)
-      } else if (value === null) {
-        await jail.set(key, null)
      } else {
        await jail.set(key, new ivm.ExternalCopy(value).copyInto())
      }
--- a/apps/sim/lib/knowledge/service.ts
+++ b/apps/sim/lib/knowledge/service.ts
@@ -86,16 +86,18 @@ export async function createKnowledgeBase(
  const kbId = randomUUID()
  const now = new Date()

-  const hasPermission = await getUserEntityPermissions(data.userId, 'workspace', data.workspaceId)
-  if (hasPermission === null) {
-    throw new Error('User does not have permission to create knowledge bases in this workspace')
+  if (data.workspaceId) {
+    const hasPermission = await getUserEntityPermissions(data.userId, 'workspace', data.workspaceId)
+    if (hasPermission === null) {
+      throw new Error('User does not have permission to create knowledge bases in this workspace')
+    }
  }

  const newKnowledgeBase = {
    id: kbId,
    name: data.name,
    description: data.description ?? null,
-    workspaceId: data.workspaceId,
+    workspaceId: data.workspaceId ?? null,
    userId: data.userId,
    tokenCount: 0,
    embeddingModel: data.embeddingModel,
@@ -120,7 +122,7 @@ export async function createKnowledgeBase(
    chunkingConfig: data.chunkingConfig,
    createdAt: now,
    updatedAt: now,
-    workspaceId: data.workspaceId,
+    workspaceId: data.workspaceId ?? null,
    docCount: 0,
  }
 }
--- a/apps/sim/lib/knowledge/types.ts
+++ b/apps/sim/lib/knowledge/types.ts
@@ -32,7 +32,7 @@ export interface KnowledgeBaseWithCounts {
 export interface CreateKnowledgeBaseData {
  name: string
  description?: string
-  workspaceId: string
+  workspaceId?: string
  embeddingModel: 'text-embedding-3-small'
  embeddingDimension: 1536
  chunkingConfig: ChunkingConfig
--- a/apps/sim/lib/workflows/comparison/compare.test.ts
+++ b/apps/sim/lib/workflows/comparison/compare.test.ts
@@ -557,8 +557,7 @@ describe('hasWorkflowChanged', () => {
  })

  describe('InputFormat SubBlock Special Handling', () => {
-    it.concurrent('should ignore collapsed field but detect value changes in inputFormat', () => {
-      // Only collapsed changes - should NOT detect as change
+    it.concurrent('should ignore value and collapsed fields in inputFormat', () => {
      const state1 = createWorkflowState({
        blocks: {
          block1: createBlock('block1', {
@@ -579,8 +578,8 @@ describe('hasWorkflowChanged', () => {
            subBlocks: {
              inputFormat: {
                value: [
-                  { id: 'input1', name: 'Name', value: 'John', collapsed: false },
-                  { id: 'input2', name: 'Age', value: 25, collapsed: true },
+                  { id: 'input1', name: 'Name', value: 'Jane', collapsed: false },
+                  { id: 'input2', name: 'Age', value: 30, collapsed: true },
                ],
              },
            },
@@ -590,32 +589,6 @@ describe('hasWorkflowChanged', () => {
      expect(hasWorkflowChanged(state1, state2)).toBe(false)
    })

-    it.concurrent('should detect value changes in inputFormat', () => {
-      const state1 = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            subBlocks: {
-              inputFormat: {
-                value: [{ id: 'input1', name: 'Name', value: 'John' }],
-              },
-            },
-          }),
-        },
-      })
-      const state2 = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            subBlocks: {
-              inputFormat: {
-                value: [{ id: 'input1', name: 'Name', value: 'Jane' }],
-              },
-            },
-          }),
-        },
-      })
-      expect(hasWorkflowChanged(state1, state2)).toBe(true)
-    })
-
    it.concurrent('should detect actual inputFormat changes', () => {
      const state1 = createWorkflowState({
        blocks: {
@@ -1739,15 +1712,15 @@ describe('hasWorkflowChanged', () => {
  })

  describe('Input Format Field Scenarios', () => {
-    it.concurrent('should not detect change when only inputFormat collapsed changes', () => {
-      // The "collapsed" field in inputFormat is UI-only and should be ignored
+    it.concurrent('should not detect change when inputFormat value is typed and cleared', () => {
+      // The "value" field in inputFormat is UI-only and should be ignored
      const deployedState = createWorkflowState({
        blocks: {
          block1: createBlock('block1', {
            subBlocks: {
              inputFormat: {
                value: [
-                  { id: 'field1', name: 'Name', type: 'string', value: 'test', collapsed: false },
+                  { id: 'field1', name: 'Name', type: 'string', value: '', collapsed: false },
                ],
              },
            },
@@ -1765,7 +1738,7 @@ describe('hasWorkflowChanged', () => {
                    id: 'field1',
                    name: 'Name',
                    type: 'string',
-                    value: 'test',
+                    value: 'typed then cleared',
                    collapsed: true,
                  },
                ],
@@ -1775,40 +1748,10 @@ describe('hasWorkflowChanged', () => {
        },
      })

-      // collapsed is UI-only field - should NOT detect as change
+      // value and collapsed are UI-only fields - should NOT detect as change
      expect(hasWorkflowChanged(currentState, deployedState)).toBe(false)
    })

-    it.concurrent('should detect change when inputFormat value changes', () => {
-      // The "value" field in inputFormat is meaningful and should trigger change detection
-      const deployedState = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            subBlocks: {
-              inputFormat: {
-                value: [{ id: 'field1', name: 'Name', type: 'string', value: '' }],
-              },
-            },
-          }),
-        },
-      })
-
-      const currentState = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            subBlocks: {
-              inputFormat: {
-                value: [{ id: 'field1', name: 'Name', type: 'string', value: 'new value' }],
-              },
-            },
-          }),
-        },
-      })
-
-      // value changes should be detected
-      expect(hasWorkflowChanged(currentState, deployedState)).toBe(true)
-    })
-
    it.concurrent('should detect change when inputFormat field name changes', () => {
      const deployedState = createWorkflowState({
        blocks: {
--- a/apps/sim/lib/workflows/comparison/normalize.test.ts
+++ b/apps/sim/lib/workflows/comparison/normalize.test.ts
@@ -370,7 +370,7 @@ describe('Workflow Normalization Utilities', () => {
      expect(sanitizeInputFormat({} as any)).toEqual([])
    })

-    it.concurrent('should remove collapsed field but keep value', () => {
+    it.concurrent('should remove value and collapsed fields', () => {
      const inputFormat = [
        { id: 'input1', name: 'Name', value: 'John', collapsed: true },
        { id: 'input2', name: 'Age', value: 25, collapsed: false },
@@ -379,13 +379,13 @@ describe('Workflow Normalization Utilities', () => {
      const result = sanitizeInputFormat(inputFormat)

      expect(result).toEqual([
-        { id: 'input1', name: 'Name', value: 'John' },
-        { id: 'input2', name: 'Age', value: 25 },
+        { id: 'input1', name: 'Name' },
+        { id: 'input2', name: 'Age' },
        { id: 'input3', name: 'Email' },
      ])
    })

-    it.concurrent('should preserve all other fields including value', () => {
+    it.concurrent('should preserve all other fields', () => {
      const inputFormat = [
        {
          id: 'input1',
@@ -402,7 +402,6 @@ describe('Workflow Normalization Utilities', () => {
      expect(result[0]).toEqual({
        id: 'input1',
        name: 'Complex Input',
-        value: 'test-value',
        type: 'string',
        required: true,
        validation: { min: 0, max: 100 },
--- a/apps/sim/lib/workflows/comparison/normalize.ts
+++ b/apps/sim/lib/workflows/comparison/normalize.ts
@@ -156,10 +156,10 @@ export function normalizeVariables(variables: unknown): Record<string, Variable>
 }

 /** Input format item with optional UI-only fields */
-type InputFormatItem = Record<string, unknown> & { collapsed?: boolean }
+type InputFormatItem = Record<string, unknown> & { value?: unknown; collapsed?: boolean }

 /**
- * Sanitizes inputFormat array by removing UI-only fields like collapsed
+ * Sanitizes inputFormat array by removing UI-only fields like value and collapsed
 * @param inputFormat - Array of input format configurations
 * @returns Sanitized input format array
 */
@@ -167,7 +167,7 @@ export function sanitizeInputFormat(inputFormat: unknown[] | undefined): Record<
  if (!Array.isArray(inputFormat)) return []
  return inputFormat.map((item) => {
    if (item && typeof item === 'object' && !Array.isArray(item)) {
-      const { collapsed, ...rest } = item as InputFormatItem
+      const { value, collapsed, ...rest } = item as InputFormatItem
      return rest
    }
    return item as Record<string, unknown>
--- a/apps/sim/lib/workflows/variables/variable-manager.test.ts
+++ b/apps/sim/lib/workflows/variables/variable-manager.test.ts
@@ -26,7 +26,7 @@ describe('VariableManager', () => {
    it.concurrent('should handle boolean type variables', () => {
      expect(VariableManager.parseInputForStorage('true', 'boolean')).toBe(true)
      expect(VariableManager.parseInputForStorage('false', 'boolean')).toBe(false)
-      expect(VariableManager.parseInputForStorage('1', 'boolean')).toBe(false)
+      expect(VariableManager.parseInputForStorage('1', 'boolean')).toBe(true)
      expect(VariableManager.parseInputForStorage('0', 'boolean')).toBe(false)
      expect(VariableManager.parseInputForStorage('"true"', 'boolean')).toBe(true)
      expect(VariableManager.parseInputForStorage("'false'", 'boolean')).toBe(false)
@@ -128,7 +128,7 @@ describe('VariableManager', () => {
      expect(VariableManager.resolveForExecution(false, 'boolean')).toBe(false)
      expect(VariableManager.resolveForExecution('true', 'boolean')).toBe(true)
      expect(VariableManager.resolveForExecution('false', 'boolean')).toBe(false)
-      expect(VariableManager.resolveForExecution('1', 'boolean')).toBe(false)
+      expect(VariableManager.resolveForExecution('1', 'boolean')).toBe(true)
      expect(VariableManager.resolveForExecution('0', 'boolean')).toBe(false)
    })

--- a/apps/sim/lib/workflows/variables/variable-manager.ts
+++ b/apps/sim/lib/workflows/variables/variable-manager.ts
@@ -61,7 +61,7 @@ export class VariableManager {
        // Special case for 'anything else' in the test
        if (unquoted === 'anything else') return true
        const normalized = String(unquoted).toLowerCase().trim()
-        return normalized === 'true'
+        return normalized === 'true' || normalized === '1'
      }

      case 'object':
--- a/apps/sim/providers/anthropic/index.ts
+++ b/apps/sim/providers/anthropic/index.ts
@@ -9,7 +9,6 @@ import {
  generateToolUseId,
 } from '@/providers/anthropic/utils'
 import {
-  getMaxOutputTokensForModel,
  getProviderDefaultModel,
  getProviderModels,
  supportsNativeStructuredOutputs,
@@ -179,9 +178,7 @@ export const anthropicProvider: ProviderConfig = {
      model: request.model,
      messages,
      system: systemPrompt,
-      max_tokens:
-        Number.parseInt(String(request.maxTokens)) ||
-        getMaxOutputTokensForModel(request.model, request.stream ?? false),
+      max_tokens: Number.parseInt(String(request.maxTokens)) || 1024,
      temperature: Number.parseFloat(String(request.temperature ?? 0.7)),
    }

--- a/apps/sim/providers/bedrock/index.ts
+++ b/apps/sim/providers/bedrock/index.ts
@@ -20,11 +20,7 @@ import {
  generateToolUseId,
  getBedrockInferenceProfileId,
 } from '@/providers/bedrock/utils'
-import {
-  getMaxOutputTokensForModel,
-  getProviderDefaultModel,
-  getProviderModels,
-} from '@/providers/models'
+import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
 import type {
  ProviderConfig,
  ProviderRequest,
@@ -263,9 +259,7 @@ export const bedrockProvider: ProviderConfig = {

    const inferenceConfig = {
      temperature: Number.parseFloat(String(request.temperature ?? 0.7)),
-      maxTokens:
-        Number.parseInt(String(request.maxTokens)) ||
-        getMaxOutputTokensForModel(request.model, request.stream ?? false),
+      maxTokens: Number.parseInt(String(request.maxTokens)) || 4096,
    }

    const shouldStreamToolCalls = request.streamToolCalls ?? false
--- a/apps/sim/providers/models.ts
+++ b/apps/sim/providers/models.ts
@@ -34,12 +34,6 @@ export interface ModelCapabilities {
  toolUsageControl?: boolean
  computerUse?: boolean
  nativeStructuredOutputs?: boolean
-  maxOutputTokens?: {
-    /** Maximum tokens for streaming requests */
-    max: number
-    /** Safe default for non-streaming requests (to avoid timeout issues) */
-    default: number
-  }
  reasoningEffort?: {
    values: string[]
  }
@@ -619,7 +613,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -634,7 +627,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -648,7 +640,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        },
        capabilities: {
          temperature: { min: 0, max: 1 },
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -663,7 +654,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -678,7 +668,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -692,7 +681,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        },
        capabilities: {
          temperature: { min: 0, max: 1 },
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -707,7 +695,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          computerUse: true,
-          maxOutputTokens: { max: 8192, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -722,7 +709,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          computerUse: true,
-          maxOutputTokens: { max: 8192, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -1669,7 +1655,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -1683,7 +1668,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -1697,7 +1681,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -1711,7 +1694,6 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
        capabilities: {
          temperature: { min: 0, max: 1 },
          nativeStructuredOutputs: true,
-          maxOutputTokens: { max: 64000, default: 8192 },
        },
        contextWindow: 200000,
      },
@@ -2351,31 +2333,3 @@ export function getThinkingLevelsForModel(modelId: string): string[] | null {
  const capability = getThinkingCapability(modelId)
  return capability?.levels ?? null
 }
-
-/**
- * Get the max output tokens for a specific model
- * Returns the model's max capacity for streaming requests,
- * or the model's safe default for non-streaming requests to avoid timeout issues.
- *
- * @param modelId - The model ID
- * @param streaming - Whether the request is streaming (default: false)
- */
-export function getMaxOutputTokensForModel(modelId: string, streaming = false): number {
-  const normalizedModelId = modelId.toLowerCase()
-  const STANDARD_MAX_OUTPUT_TOKENS = 4096
-
-  for (const provider of Object.values(PROVIDER_DEFINITIONS)) {
-    for (const model of provider.models) {
-      const baseModelId = model.id.toLowerCase()
-      if (normalizedModelId === baseModelId || normalizedModelId.startsWith(`${baseModelId}-`)) {
-        const outputTokens = model.capabilities.maxOutputTokens
-        if (outputTokens) {
-          return streaming ? outputTokens.max : outputTokens.default
-        }
-        return STANDARD_MAX_OUTPUT_TOKENS
-      }
-    }
-  }
-
-  return STANDARD_MAX_OUTPUT_TOKENS
-}
--- a/apps/sim/providers/utils.ts
+++ b/apps/sim/providers/utils.ts
@@ -8,7 +8,6 @@ import {
  getComputerUseModels,
  getEmbeddingModelPricing,
  getHostedModels as getHostedModelsFromDefinitions,
-  getMaxOutputTokensForModel as getMaxOutputTokensForModelFromDefinitions,
  getMaxTemperature as getMaxTempFromDefinitions,
  getModelPricing as getModelPricingFromDefinitions,
  getModelsWithReasoningEffort,
@@ -993,18 +992,6 @@ export function getThinkingLevelsForModel(model: string): string[] | null {
  return getThinkingLevelsForModelFromDefinitions(model)
 }

-/**
- * Get max output tokens for a specific model
- * Returns the model's maxOutputTokens capability for streaming requests,
- * or a conservative default (8192) for non-streaming requests to avoid timeout issues.
- *
- * @param model - The model ID
- * @param streaming - Whether the request is streaming (default: false)
- */
-export function getMaxOutputTokensForModel(model: string, streaming = false): number {
-  return getMaxOutputTokensForModelFromDefinitions(model, streaming)
-}
-
 /**
 * Prepare tool execution parameters, separating tool parameters from system parameters
 */
--- a/apps/sim/stores/undo-redo/code-storage.ts
+++ b/apps/sim/stores/undo-redo/code-storage.ts
@@ -1,36 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { del, get, set } from 'idb-keyval'
-import type { StateStorage } from 'zustand/middleware'
-
-const logger = createLogger('CodeUndoRedoStorage')
-
-export const codeUndoRedoStorage: StateStorage = {
-  getItem: async (name: string): Promise<string | null> => {
-    if (typeof window === 'undefined') return null
-    try {
-      const value = await get<string>(name)
-      return value ?? null
-    } catch (error) {
-      logger.warn('IndexedDB read failed', { name, error })
-      return null
-    }
-  },
-
-  setItem: async (name: string, value: string): Promise<void> => {
-    if (typeof window === 'undefined') return
-    try {
-      await set(name, value)
-    } catch (error) {
-      logger.warn('IndexedDB write failed', { name, error })
-    }
-  },
-
-  removeItem: async (name: string): Promise<void> => {
-    if (typeof window === 'undefined') return
-    try {
-      await del(name)
-    } catch (error) {
-      logger.warn('IndexedDB delete failed', { name, error })
-    }
-  },
-}
--- a/apps/sim/stores/undo-redo/code-store.ts
+++ b/apps/sim/stores/undo-redo/code-store.ts
@@ -1,151 +0,0 @@
-import { create } from 'zustand'
-import { createJSONStorage, devtools, persist } from 'zustand/middleware'
-import { codeUndoRedoStorage } from '@/stores/undo-redo/code-storage'
-
-interface CodeUndoRedoEntry {
-  id: string
-  createdAt: number
-  workflowId: string
-  blockId: string
-  subBlockId: string
-  before: string
-  after: string
-}
-
-interface CodeUndoRedoStack {
-  undo: CodeUndoRedoEntry[]
-  redo: CodeUndoRedoEntry[]
-  lastUpdated?: number
-}
-
-interface CodeUndoRedoState {
-  stacks: Record<string, CodeUndoRedoStack>
-  capacity: number
-  push: (entry: CodeUndoRedoEntry) => void
-  undo: (workflowId: string, blockId: string, subBlockId: string) => CodeUndoRedoEntry | null
-  redo: (workflowId: string, blockId: string, subBlockId: string) => CodeUndoRedoEntry | null
-  clear: (workflowId: string, blockId: string, subBlockId: string) => void
-}
-
-const DEFAULT_CAPACITY = 500
-const MAX_STACKS = 50
-
-function getStackKey(workflowId: string, blockId: string, subBlockId: string): string {
-  return `${workflowId}:${blockId}:${subBlockId}`
-}
-
-const initialState = {
-  stacks: {} as Record<string, CodeUndoRedoStack>,
-  capacity: DEFAULT_CAPACITY,
-}
-
-export const useCodeUndoRedoStore = create<CodeUndoRedoState>()(
-  devtools(
-    persist(
-      (set, get) => ({
-        ...initialState,
-        push: (entry) => {
-          if (entry.before === entry.after) return
-
-          const state = get()
-          const key = getStackKey(entry.workflowId, entry.blockId, entry.subBlockId)
-          const currentStacks = { ...state.stacks }
-
-          const stackKeys = Object.keys(currentStacks)
-          if (stackKeys.length >= MAX_STACKS && !currentStacks[key]) {
-            let oldestKey: string | null = null
-            let oldestTime = Number.POSITIVE_INFINITY
-
-            for (const stackKey of stackKeys) {
-              const t = currentStacks[stackKey].lastUpdated ?? 0
-              if (t < oldestTime) {
-                oldestTime = t
-                oldestKey = stackKey
-              }
-            }
-
-            if (oldestKey) {
-              delete currentStacks[oldestKey]
-            }
-          }
-
-          const stack = currentStacks[key] || { undo: [], redo: [] }
-
-          const newUndo = [...stack.undo, entry]
-          if (newUndo.length > state.capacity) {
-            newUndo.shift()
-          }
-
-          currentStacks[key] = {
-            undo: newUndo,
-            redo: [],
-            lastUpdated: Date.now(),
-          }
-
-          set({ stacks: currentStacks })
-        },
-        undo: (workflowId, blockId, subBlockId) => {
-          const key = getStackKey(workflowId, blockId, subBlockId)
-          const state = get()
-          const stack = state.stacks[key]
-          if (!stack || stack.undo.length === 0) return null
-
-          const entry = stack.undo[stack.undo.length - 1]
-          const newUndo = stack.undo.slice(0, -1)
-          const newRedo = [...stack.redo, entry]
-
-          set({
-            stacks: {
-              ...state.stacks,
-              [key]: {
-                undo: newUndo,
-                redo: newRedo.slice(-state.capacity),
-                lastUpdated: Date.now(),
-              },
-            },
-          })
-
-          return entry
-        },
-        redo: (workflowId, blockId, subBlockId) => {
-          const key = getStackKey(workflowId, blockId, subBlockId)
-          const state = get()
-          const stack = state.stacks[key]
-          if (!stack || stack.redo.length === 0) return null
-
-          const entry = stack.redo[stack.redo.length - 1]
-          const newRedo = stack.redo.slice(0, -1)
-          const newUndo = [...stack.undo, entry]
-
-          set({
-            stacks: {
-              ...state.stacks,
-              [key]: {
-                undo: newUndo.slice(-state.capacity),
-                redo: newRedo,
-                lastUpdated: Date.now(),
-              },
-            },
-          })
-
-          return entry
-        },
-        clear: (workflowId, blockId, subBlockId) => {
-          const key = getStackKey(workflowId, blockId, subBlockId)
-          const state = get()
-          const { [key]: _, ...rest } = state.stacks
-          set({ stacks: rest })
-        },
-      }),
-      {
-        name: 'code-undo-redo-store',
-        storage: createJSONStorage(() => codeUndoRedoStorage),
-        partialize: (state) => ({
-          stacks: state.stacks,
-          capacity: state.capacity,
-        }),
-      }
-    ),
-    { name: 'code-undo-redo-store' }
-  )
-)
--- a/apps/sim/stores/undo-redo/index.ts
+++ b/apps/sim/stores/undo-redo/index.ts
@@ -1,4 +1,3 @@
-export { useCodeUndoRedoStore } from './code-store'
 export { runWithUndoRedoRecordingSuspended, useUndoRedoStore } from './store'
 export * from './types'
 export * from './utils'
--- a/apps/sim/tools/browser_use/run_task.ts
+++ b/apps/sim/tools/browser_use/run_task.ts
@@ -5,7 +5,7 @@ import type { ToolConfig, ToolResponse } from '@/tools/types'
 const logger = createLogger('BrowserUseTool')

 const POLL_INTERVAL_MS = 5000
-const MAX_POLL_TIME_MS = 600000 // 10 minutes
+const MAX_POLL_TIME_MS = 180000
 const MAX_CONSECUTIVE_ERRORS = 3

 async function createSessionWithProfile(
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export { PreviewContextMenu } from './preview-context-menu'`
				`@@ -1 +0,0 @@`
				`export { PreviewEditor } from './preview-editor'`
				`@@ -1 +0,0 @@`
				`export { getLeftmostBlockId, PreviewWorkflow } from './preview-workflow'`